5103 files changed, 16910 insertions, 16910 deletions

diff --git a/databases/R-cran-RMySQL/Makefile b/databases/R-cran-RMySQL/Makefile
index ac9d60902674..298f45d46a11 100644
--- a/databases/R-cran-RMySQL/Makefile
+++ b/databases/R-cran-RMySQL/Makefile
@@ -11,7 +11,7 @@ COMMENT=	R interface to the MySQL database
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-DBI>=0.3.1:${PORTSDIR}/databases/R-cran-DBI
+RUN_DEPENDS=	R-cran-DBI>=0.3.1:databases/R-cran-DBI
 
 USE_MYSQL=	yes
 USES=	cran:auto-plist
diff --git a/databases/R-cran-RSQLite.extfuns/Makefile b/databases/R-cran-RSQLite.extfuns/Makefile
index 29bd349dbb70..1c9b747ddf22 100644
--- a/databases/R-cran-RSQLite.extfuns/Makefile
+++ b/databases/R-cran-RSQLite.extfuns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SQLite extension functions for RSQLite
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	R-cran-RSQLite>=0.11.1:${PORTSDIR}/databases/R-cran-RSQLite
+BUILD_DEPENDS=	R-cran-RSQLite>=0.11.1:databases/R-cran-RSQLite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=	cran:auto-plist
diff --git a/databases/R-cran-RSQLite/Makefile b/databases/R-cran-RSQLite/Makefile
index 682c2ee6d4f6..162619bcf68d 100644
--- a/databases/R-cran-RSQLite/Makefile
+++ b/databases/R-cran-RSQLite/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Database Interface R driver for SQLite
 
 LICENSE=	LGPL20
 
-BUILD_DEPENDS=	R-cran-DBI>=0.2.5:${PORTSDIR}/databases/R-cran-DBI
-RUN_DEPENDS=	R-cran-DBI>=0.2.5:${PORTSDIR}/databases/R-cran-DBI
+BUILD_DEPENDS=	R-cran-DBI>=0.2.5:databases/R-cran-DBI
+RUN_DEPENDS=	R-cran-DBI>=0.2.5:databases/R-cran-DBI
 
 USES=	cran:auto-plist
 
diff --git a/databases/R-cran-sqldf/Makefile b/databases/R-cran-sqldf/Makefile
index c9fbecf513e5..ac6179398a12 100644
--- a/databases/R-cran-sqldf/Makefile
+++ b/databases/R-cran-sqldf/Makefile
@@ -12,12 +12,12 @@ COMMENT=	SQL select on R data frames
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	R-cran-proto>=0.3.9.2_6:${PORTSDIR}/devel/R-cran-proto \
-		R-cran-chron>=2.3.42:${PORTSDIR}/devel/R-cran-chron \
-		R-cran-gsubfn>=0.6.4:${PORTSDIR}/devel/R-cran-gsubfn \
-		R-cran-DBI>=0.2.5_6:${PORTSDIR}/databases/R-cran-DBI \
-		R-cran-RSQLite>=0.11.1:${PORTSDIR}/databases/R-cran-RSQLite \
-		R-cran-RSQLite.extfuns>=0.0.1:${PORTSDIR}/databases/R-cran-RSQLite.extfuns
+BUILD_DEPENDS=	R-cran-proto>=0.3.9.2_6:devel/R-cran-proto \
+		R-cran-chron>=2.3.42:devel/R-cran-chron \
+		R-cran-gsubfn>=0.6.4:devel/R-cran-gsubfn \
+		R-cran-DBI>=0.2.5_6:databases/R-cran-DBI \
+		R-cran-RSQLite>=0.11.1:databases/R-cran-RSQLite \
+		R-cran-RSQLite.extfuns>=0.0.1:databases/R-cran-RSQLite.extfuns
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=	cran:auto-plist
diff --git a/databases/akonadi-googledata/Makefile b/databases/akonadi-googledata/Makefile
index 33fee56f1142..693157cd6a95 100644
--- a/databases/akonadi-googledata/Makefile
+++ b/databases/akonadi-googledata/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://libgcal.googlecode.com/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Akonadi Resources for Google Contacts and Calendar
 
-LIB_DEPENDS=	libgcal.so:${PORTSDIR}/deskutils/libgcal
+LIB_DEPENDS=	libgcal.so:deskutils/libgcal
 
 USES=		cmake gettext tar:bzip2
 USE_QT4=	qmake_build rcc_build moc_build uic_build dbus
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 149f2d7923bf..c303f612a304 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Storage server for KDE-Pim
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 # Let process generate meaningful backtrace on core dump.
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
 USE_KDE4=	kdeprefix automoc4 soprano
 USES=		cmake:outsource execinfo shared-mime-info compiler:c++11-lang tar:bzip2
diff --git a/databases/apq-mysql/Makefile b/databases/apq-mysql/Makefile
index aa95818095a6..63be88a9aaf3 100644
--- a/databases/apq-mysql/Makefile
+++ b/databases/apq-mysql/Makefile
@@ -13,10 +13,10 @@ COMMENT=	APQ Ada95 MySQL database driver
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gprbuild:${PORTSDIR}/devel/gprbuild \
-		${LOCALBASE}/lib/gnat/apq.gpr:${PORTSDIR}/databases/apq
-RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:${PORTSDIR}/databases/apq
+BUILD_DEPENDS=	bash:shells/bash \
+		gprbuild:devel/gprbuild \
+		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
+RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 
 USES=		ada tar:bzip2
 USE_MYSQL=	yes
diff --git a/databases/apq-odbc/Makefile b/databases/apq-odbc/Makefile
index 07f7fa7b7b32..0bb26394d8ad 100644
--- a/databases/apq-odbc/Makefile
+++ b/databases/apq-odbc/Makefile
@@ -13,11 +13,11 @@ COMMENT=	APQ Ada95 ODBC database driver
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gprbuild:${PORTSDIR}/devel/gprbuild \
-		${LOCALBASE}/lib/gnat/apq.gpr:${PORTSDIR}/databases/apq
-RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:${PORTSDIR}/databases/apq
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+BUILD_DEPENDS=	bash:shells/bash \
+		gprbuild:devel/gprbuild \
+		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
+RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 USES=		ada tar:bzip2
 HAS_CONFIGURE=	yes
diff --git a/databases/apq-pgsql/Makefile b/databases/apq-pgsql/Makefile
index 1ad0ef1c8b49..6f24de3aaa67 100644
--- a/databases/apq-pgsql/Makefile
+++ b/databases/apq-pgsql/Makefile
@@ -13,10 +13,10 @@ COMMENT=	APQ Ada95 PostgreSQL database driver
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gprbuild:${PORTSDIR}/devel/gprbuild \
-		${LOCALBASE}/lib/gnat/apq.gpr:${PORTSDIR}/databases/apq
-RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:${PORTSDIR}/databases/apq
+BUILD_DEPENDS=	bash:shells/bash \
+		gprbuild:devel/gprbuild \
+		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
+RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 
 USES=		ada tar:bzip2 pgsql
 WANT_PGSQL=	lib
diff --git a/databases/apq/Makefile b/databases/apq/Makefile
index e00193077d6b..6779fbc4e60e 100644
--- a/databases/apq/Makefile
+++ b/databases/apq/Makefile
@@ -13,8 +13,8 @@ COMMENT=	APQ Ada95 database base library
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	bash:shells/bash \
+		gprbuild:devel/gprbuild
 
 USES=		ada tar:bzip2
 PORTDOCS=	README HISTORY
diff --git a/databases/autobackupmysql/Makefile b/databases/autobackupmysql/Makefile
index f2779ba73582..ee84ab7bee63 100644
--- a/databases/autobackupmysql/Makefile
+++ b/databases/autobackupmysql/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.sh
 MAINTAINER=	fw@moov.de
 COMMENT=	Make daily, weekly, and monthly backups of your MySQL databases
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 NO_BUILD=	yes
 PLIST_FILES=	sbin/autobackupmysql.sh
diff --git a/databases/cassandra-cpp-driver/Makefile b/databases/cassandra-cpp-driver/Makefile
index bd9233df8f5a..fe970e25adea 100644
--- a/databases/cassandra-cpp-driver/Makefile
+++ b/databases/cassandra-cpp-driver/Makefile
@@ -10,7 +10,7 @@ COMMENT=	DataStax C/C++ Driver for Apache Cassandra
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libuv.so:${PORTSDIR}/devel/libuv
+LIB_DEPENDS=	libuv.so:devel/libuv
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	datastax
diff --git a/databases/cassandra2/Makefile b/databases/cassandra2/Makefile
index b2b701bfe930..104c54e76df5 100644
--- a/databases/cassandra2/Makefile
+++ b/databases/cassandra2/Makefile
@@ -45,9 +45,9 @@ SUB_FILES=	repaircluster
 
 .include <bsd.port.options.mk>
 
-RUN_DEPENDS+=	${JAVALIBDIR}/snappy-java.jar:${PORTSDIR}/archivers/snappy-java
+RUN_DEPENDS+=	${JAVALIBDIR}/snappy-java.jar:archivers/snappy-java
 
-MX4J_RUN_DEPENDS=	${JAVAJARDIR}/mx4j-tools.jar:${PORTSDIR}/java/mx4j
+MX4J_RUN_DEPENDS=	${JAVAJARDIR}/mx4j-tools.jar:java/mx4j
 CQL_USES=	python:2
 
 PORTDOCS=	javadoc *.txt
diff --git a/databases/casstcl/Makefile b/databases/casstcl/Makefile
index 1374e56baf08..00846dcd340f 100644
--- a/databases/casstcl/Makefile
+++ b/databases/casstcl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tcl language interface to the Cassandra database
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcassandra.so:${PORTSDIR}/databases/cassandra-cpp-driver
+LIB_DEPENDS=	libcassandra.so:databases/cassandra-cpp-driver
 
 USES=		autoreconf tcl:85+
 GNU_CONFIGURE=	yes
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index 7ae3f67a5cbd..2717530402fd 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Relational and transactional database system
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	liblfcbase.so:${PORTSDIR}/devel/lfcbase \
-		liblfcxml.so:${PORTSDIR}/devel/lfcxml
-RUN_DEPENDS=	${LOCALBASE}/bin/sudo:${PORTSDIR}/security/sudo
+LIB_DEPENDS=	liblfcbase.so:devel/lfcbase \
+		liblfcxml.so:devel/lfcxml
+RUN_DEPENDS=	${LOCALBASE}/bin/sudo:security/sudo
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/databases/cegobridge/Makefile b/databases/cegobridge/Makefile
index 8a1944a48608..0b1bdaa75fe5 100644
--- a/databases/cegobridge/Makefile
+++ b/databases/cegobridge/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	http://www.lemke-it.com/
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Imports non-cego database dump files into cego
 
-LIB_DEPENDS=	liblfcbase.so:${PORTSDIR}/devel/lfcbase \
-		liblfcxml.so:${PORTSDIR}/devel/lfcxml \
-		libcego.so:${PORTSDIR}/databases/cego
+LIB_DEPENDS=	liblfcbase.so:devel/lfcbase \
+		liblfcxml.so:devel/lfcxml \
+		libcego.so:databases/cego
 
 LICENSE=	GPLv3
 GNU_CONFIGURE=	yes
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index adad487cee14..c9dffe766b28 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Document database server, accessible via a RESTful JSON API
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libicudata.so:${PORTSDIR}/devel/icu \
-		libmozjs185.so:${PORTSDIR}/lang/spidermonkey185 \
-		libcurl.so:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man \
-		erlang>=15.b.01,2:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erlang>=15.b.01,2:${PORTSDIR}/lang/erlang
+LIB_DEPENDS=	libicudata.so:devel/icu \
+		libmozjs185.so:lang/spidermonkey185 \
+		libcurl.so:ftp/curl
+BUILD_DEPENDS=	${LOCALBASE}/bin/help2man:misc/help2man \
+		erlang>=15.b.01,2:lang/erlang
+RUN_DEPENDS=	erlang>=15.b.01,2:lang/erlang
 
 USERS=		couchdb
 GROUPS=		couchdb
diff --git a/databases/cppdb/Makefile b/databases/cppdb/Makefile
index 7d6a2bee9394..9e8319e81061 100644
--- a/databases/cppdb/Makefile
+++ b/databases/cppdb/Makefile
@@ -63,7 +63,7 @@ PLIST_SUB+=	MYSQL=""
 CMAKE_ARGS+=	-DDISABLE_ODBC:BOOL=ON
 PLIST_SUB+=	ODBC="@comment "
 .else
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 CMAKE_ARGS+=	-DDISABLE_ODBC:BOOL=OFF
 .if ${PORT_OPTIONS:MODBC_INTERNAL}
 CMAKE_ARGS+=	-DODBC_BACKEND_INTERNAL:BOOL=ON
diff --git a/databases/datamodeler/Makefile b/databases/datamodeler/Makefile
index ce0a4d1d08b0..814513361ba7 100644
--- a/databases/datamodeler/Makefile
+++ b/databases/datamodeler/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	oracle
 MAINTAINER=	jjuanino@gmail.com
 COMMENT=	Database modeling tool
 
-EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+EXTRACT_DEPENDS=rpm2cpio.pl:archivers/rpm2cpio
+RUN_DEPENDS=	bash:shells/bash
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile
index 639381849915..484bb1f63ef1 100644
--- a/databases/dbtool/Makefile
+++ b/databases/dbtool/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Store and retrieve data in a key/value format in a hash database
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake shebangfix
 SHEBANG_FILES=	samples/account-db/accdb
@@ -35,8 +35,8 @@ BDB_USE=		bdb=yes
 BDB_CONFIGURE_ON=	--with-berkeley \
 			--with-bdb-include-dir=${BDB_INCLUDE_DIR} \
 			--with-bdb-lib-dir=${BDB_LIB_DIR}
-EXAMPLES_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+EXAMPLES_RUN_DEPENDS=	bash:shells/bash
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ON=	--with-gdbm \
 			--with-gdbm-dir=${LOCALBASE}
 
diff --git a/databases/emma/Makefile b/databases/emma/Makefile
index fd78bff5fee6..3c8e2c3562c4 100644
--- a/databases/emma/Makefile
+++ b/databases/emma/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.fastflo.de/files/emma/downloads/python_src/
 MAINTAINER=	jun-g@daemonfreaks.com
 COMMENT=	Extendable MySQL managing assistant
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb
 
 USES=		python
 USE_GNOME=	pygtk2
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 4113dc6c0f9c..90c77bc3619e 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Data backends for the Evolution integrated mail/PIM suite
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gcr>=3.11:${PORTSDIR}/security/gcr \
-		vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		liboauth.so:${PORTSDIR}/net/liboauth \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libgdata.so:${PORTSDIR}/devel/libgdata \
-		libical.so:${PORTSDIR}/devel/libical \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libtasn1.so:${PORTSDIR}/security/libtasn1 \
-		libsecret-1.so:${PORTSDIR}/security/libsecret
+BUILD_DEPENDS=	gcr>=3.11:security/gcr \
+		vapigen:lang/vala
+LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		liboauth.so:net/liboauth \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libgdata.so:devel/libgdata \
+		libical.so:devel/libical \
+		libnss3.so:security/nss \
+		libtasn1.so:security/libtasn1 \
+		libsecret-1.so:security/libsecret
 
 PORTSCOUT=	limitw:1,even
 
@@ -63,7 +63,7 @@ OPTIONS_DEFINE=	WEATHER KERBEROS
 OPTIONS_DEFAULT=WEATHER KERBEROS
 WEATHER_DESC=	Weather calendar backend
 
-WEATHER_LIB_DEPENDS=	libgweather-3.so:${PORTSDIR}/net/libgweather
+WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
 WEATHER_CONFIGURE_ENABLE=	weather
 
 .include <bsd.port.options.mk>
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index fdbbd29df5f3..2bfd6b5504db 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -22,7 +22,7 @@ LICENSE_FILE_IPL=	${WRKSRC}/builds/install/misc/IPLicense.txt
 LICENSE_PERMS_IDPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_IPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicuuc.so:devel/icu
 
 USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
@@ -72,7 +72,7 @@ IGNORE=		your system does not support sysvipc
 
 .if !defined(CLIENT_ONLY)
 # Server part stuff
-LIB_DEPENDS+=	libfbembed.so:${PORTSDIR}/databases/firebird25-client
+LIB_DEPENDS+=	libfbembed.so:databases/firebird25-client
 
 CONFIGURE_ARGS+=--enable-superserver --without-editline
 
@@ -90,7 +90,7 @@ UDF_SQL=	src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
 PKGINSTALL?=	${PKGDIR}/pkg-install-server
 .else
 # Client part stuff
-LIB_DEPENDS+=	libedit.so.0:${PORTSDIR}/devel/libedit
+LIB_DEPENDS+=	libedit.so.0:devel/libedit
 LDFLAGS+=	-L${LOCALBASE}/lib # to link in lncurses pulled in by libedit
 
 CONFIGURE_ARGS+=	--with-system-editline
diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile
index c05904e76771..6b448406bfb3 100644
--- a/databases/fortytwo-bdb/Makefile
+++ b/databases/fortytwo-bdb/Makefile
@@ -17,7 +17,7 @@ LICENSE=	LGPL21
 USES=		gnustep
 USE_GNUSTEP=	back build
 
-LIB_DEPENDS=	libEncore.so:${PORTSDIR}/devel/fortytwo-encore
+LIB_DEPENDS=	libEncore.so:devel/fortytwo-encore
 DEFAULT_LIBVERSION=	0.1
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_BDB=	43+
diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
index c09f8870bc35..cede15884530 100644
--- a/databases/fpc-gdbm/Makefile
+++ b/databases/fpc-gdbm/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	GDBM
 GDBM_DESC=	Install the GNU database manager
 OPTIONS_DEFAULT=	GDBM
 
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
index 6f3f3c29750a..7c8322525403 100644
--- a/databases/fpc-odbc/Makefile
+++ b/databases/fpc-odbc/Makefile
@@ -16,6 +16,6 @@ EXTRACTUNITDIR=	${WRKUNITDIR}
 OPTIONS_DEFINE=	ODBC
 ODBC_DESC=	Install ODBC library suite for Unix
 
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
index 3fe020119dfa..08be50132c91 100644
--- a/databases/fpc-oracle/Makefile
+++ b/databases/fpc-oracle/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	ORACLE
 ORACLE_DESC=	Install oracle client
 
 ORACLE8_LIB=	${LOCALBASE}/oracle8-client/rdbms/lib
-ORACLE_RUN_DEPENDS=	${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
+ORACLE_RUN_DEPENDS=	${ORACLE8_LIB}/env_rdbms.mk:databases/oracle8-client
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 99880abb5425..e253501bf2b0 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -38,12 +38,12 @@ OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
 ODBCWIDE_DESC=		Enable Wide ODBC Support
 OPENSSL_USE=		OPENSSL=yes
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls
-IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 IODBC_CONFIGURE_ON=	--with-iodbc=${LOCALBASE}
 IODBC_CPPFLAGS=		-I${LOCALBASE}/include/libiodbc
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_CONFIGURE_ON=	--with-unixodbc=${LOCALBASE}
 ODBCWIDE_CONFIGURE_ON=	--enable-odbc-wide
 
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 0a3908e9823a..0b0766384825 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Sybase/Microsoft TDS protocol library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 TDS_VER?=	5.0
 
@@ -36,12 +36,12 @@ OPTIONS_DEFAULT=	OPENSSL MARS UNIXODBC
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
 OPENSSL_USE=		OPENSSL=yes
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls
-IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 IODBC_CONFIGURE_ON=	--with-iodbc=${LOCALBASE}
 IODBC_CPPFLAGS=		-I${LOCALBASE}/include/libiodbc
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_CONFIGURE_ON=	--with-unixodbc=${LOCALBASE}
 MARS_DESC=	Enable MARS code (Experimental)
 MARS_CONFIGURE_ON=	--enable-mars
diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index 779e03be3ea9..e3b0ea07c6d5 100644
--- a/databases/gadfly/Makefile
+++ b/databases/gadfly/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SQL database written in Python
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/kjbuckets.so:${PORTSDIR}/devel/py-kjbuckets
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/kjbuckets.so:devel/py-kjbuckets
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index 1c6b68e23f16..fb897ca5f9d0 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Synchronous multi-master replication engine
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	checkmk:${PORTSDIR}/devel/libcheck \
-		doxygen:${PORTSDIR}/devel/doxygen \
-		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>=0:${PORTSDIR}/textproc/py-cloud_sptheme
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	checkmk:devel/libcheck \
+		doxygen:devel/doxygen \
+		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>=0:textproc/py-cloud_sptheme
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
 USES=		execinfo python:build scons shebangfix
 
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index 8f99c2e4a2a8..4cfdd8a3afaa 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -13,7 +13,7 @@ COMMENT=	MySQL DataStore implementation for GeoServer
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${LOCALBASE}/geoserver/start.jar:${PORTSDIR}/graphics/geoserver
+RUN_DEPENDS=	${LOCALBASE}/geoserver/start.jar:graphics/geoserver
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 67573dff00b0..59649ef19358 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -11,18 +11,18 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GNOME database designer and user interface
 
-BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		itstool:${PORTSDIR}/textproc/itstool \
-		libepc>=0.4.0:${PORTSDIR}/www/libepc \
-		libgda5-mysql>=0:${PORTSDIR}/databases/libgda5-mysql \
-		libgda5-postgresql>=0:${PORTSDIR}/databases/libgda5-postgresql
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libepc-1.0.so:${PORTSDIR}/www/libepc \
-		libgoocanvasmm-2.0.so:${PORTSDIR}/graphics/goocanvasmm2 \
-		libevview3.so:${PORTSDIR}/graphics/evince
-RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		libgda5-mysql>=0:${PORTSDIR}/databases/libgda5-mysql \
-		libgda5-postgresql>=0:${PORTSDIR}/databases/libgda5-postgresql
+BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		itstool:textproc/itstool \
+		libepc>=0.4.0:www/libepc \
+		libgda5-mysql>=0:databases/libgda5-mysql \
+		libgda5-postgresql>=0:databases/libgda5-postgresql
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+		libepc-1.0.so:www/libepc \
+		libgoocanvasmm-2.0.so:graphics/goocanvasmm2 \
+		libevview3.so:graphics/evince
+RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		libgda5-mysql>=0:databases/libgda5-mysql \
+		libgda5-postgresql>=0:databases/libgda5-postgresql
 
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gettext gmake libarchive libtool pathfix \
diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile
index 754fa2e4619f..4807e6875d24 100644
--- a/databases/gnatsweb4/Makefile
+++ b/databases/gnatsweb4/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Gnatsweb, a GNATS web interface
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64
 
 USE_APACHE_RUN=	22+
 
diff --git a/databases/gomdb/Makefile b/databases/gomdb/Makefile
index 11080f1fc660..2fe4d651c61c 100644
--- a/databases/gomdb/Makefile
+++ b/databases/gomdb/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Go wrapper for LMDB - OpenLDAP Lightning Memory-Mapped Database
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go:lang/go
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/databases/gosqlite3/Makefile b/databases/gosqlite3/Makefile
index 2b7ea2bcef84..3c631e307692 100644
--- a/databases/gosqlite3/Makefile
+++ b/databases/gosqlite3/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Go interface for SQLite3
 
 USES=		compiler
 
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 
 GO_PKGNAME=	github.com/kuroneko/${PORTNAME}
 
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 605b263b37f2..b5bb6e81d000 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -25,14 +25,14 @@ COMMENT=	Open source Geographical Information System (GIS)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL.TXT
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	${LOCALBASE}/bin/swig:devel/swig13
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libpng.so:graphics/png \
+		libproj.so:graphics/proj \
+		libtiff.so:graphics/tiff \
+		libfftw3.so:math/fftw3 \
+		libfreetype.so:print/freetype2
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		fortran gettext gmake iconv jpeg perl5 pkgconfig python:2 \
 		readline shebangfix tk
@@ -93,7 +93,7 @@ ATLAS_DESC=		Use ATLAS for BLAS and LAPACK
 ATLAS_USES=		blaslapack:atlas
 ATLAS_USES_OFF=		blaslapack
 DB_DESC=		Database support
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--with-ffmpeg \
 			--with-ffmpeg-includes="${LOCALBASE}/include/libavcodec \
 			 ${LOCALBASE}/include/libavformat \
@@ -107,7 +107,7 @@ MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libs=${LOCALBASE}/lib/mysql
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_ON=	--with-odbc
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgres
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 7ad85d263da4..9e19a8329a7a 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Graphical query tool for PostgreSQL/MySQL/SQLite
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libscintilla.so:${PORTSDIR}/x11-toolkits/scintilla
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 OPTIONS_DEFINE=	AVAHI DOCS
 OPTIONS_MULTI=	DB
@@ -36,7 +36,7 @@ PGSQL_CONFIGURE_WITH=	postgresql
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	libavahi-common.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-common.so:net/avahi-app
 .else
 CONFIGURE_ARGS+=	--without-avahi
 .endif
diff --git a/databases/hamsterdb/Makefile b/databases/hamsterdb/Makefile
index 60515860f4f8..4596635eb91a 100644
--- a/databases/hamsterdb/Makefile
+++ b/databases/hamsterdb/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Lightweight Embedded Database Engine
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-boost=${LOCALBASE}
diff --git a/databases/hbase/Makefile b/databases/hbase/Makefile
index 8b8d898643a6..8856699109cb 100644
--- a/databases/hbase/Makefile
+++ b/databases/hbase/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Hadoop database, a distributed, scalable, big data store
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		cmake:${PORTSDIR}/devel/cmake \
-		${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	bash:shells/bash \
+		cmake:devel/cmake \
+		${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3
+RUN_DEPENDS=	bash:shells/bash \
+		yarn:devel/hadoop2
 
 USES=		cpe
 CPE_VENDOR=	apache
diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index 61a44937b71b..706abf99602f 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Open-source distributed time series database
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	go>=1.5.0:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go>=1.5.0:lang/go
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/databases/innotop/Makefile b/databases/innotop/Makefile
index ab7742602457..86bc19ba6329 100644
--- a/databases/innotop/Makefile
+++ b/databases/innotop/Makefile
@@ -13,12 +13,12 @@ COMMENT=	MySQL and InnoDB monitoring program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-DBI>=1.46:${PORTSDIR}/databases/p5-DBI \
-		p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey
-RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-DBI>=1.46:${PORTSDIR}/databases/p5-DBI \
-		p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-DBI>=1.46:databases/p5-DBI \
+		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-DBI>=1.46:databases/p5-DBI \
+		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/ipa_sdb/Makefile b/databases/ipa_sdb/Makefile
index ceaaf803486e..6687004bae13 100644
--- a/databases/ipa_sdb/Makefile
+++ b/databases/ipa_sdb/Makefile
@@ -13,7 +13,7 @@ COMMENT=	IPA simple database module
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ipa_mod.h:${PORTSDIR}/sysutils/ipa
+BUILD_DEPENDS=	${LOCALBASE}/include/ipa_mod.h:sysutils/ipa
 
 USES=		libtool tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile
index 97d09ef6a582..c0897b94fc58 100644
--- a/databases/isql-viewer/Makefile
+++ b/databases/isql-viewer/Makefile
@@ -14,9 +14,9 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JDBC 2.x compliant database front end
 
-RUN_DEPENDS=	${JYTHON_PREFIX}/${JYTHON_JAR}:${PORTSDIR}/lang/jython \
-		${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc \
-		${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
+RUN_DEPENDS=	${JYTHON_PREFIX}/${JYTHON_JAR}:lang/jython \
+		${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc \
+		${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile
index dd1ea8d5552b..8079a67385e0 100644
--- a/databases/jasperreports/Makefile
+++ b/databases/jasperreports/Makefile
@@ -10,14 +10,14 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-applet-${PORTVERSION}.jar
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JasperReports is a powerful open source Java reporting tool
 
-RUN_DEPENDS=	${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext			\
-		${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j		\
-		${JAVALIBDIR}/crimson.jar:${PORTSDIR}/textproc/crimson		\
-		${JAVALIBDIR}/poi.jar:${PORTSDIR}/textproc/apache-poi		\
-		${JAVALIBDIR}/jfreechart.jar:${PORTSDIR}/java/jfreechart	\
-		${JAVASHAREDIR}/batik/batik.jar:${PORTSDIR}/graphics/batik	\
-		${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils\
-		${JAVALIBDIR}/commons-digester.jar:${PORTSDIR}/textproc/jakarta-commons-digester
+RUN_DEPENDS=	${JAVALIBDIR}/itext.jar:devel/itext			\
+		${JAVALIBDIR}/xalan.jar:textproc/xalan-j		\
+		${JAVALIBDIR}/crimson.jar:textproc/crimson		\
+		${JAVALIBDIR}/poi.jar:textproc/apache-poi		\
+		${JAVALIBDIR}/jfreechart.jar:java/jfreechart	\
+		${JAVASHAREDIR}/batik/batik.jar:graphics/batik	\
+		${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils\
+		${JAVALIBDIR}/commons-digester.jar:textproc/jakarta-commons-digester
 
 OPTIONS_DEFINE=	MYSQL PGSQL ORACLE8 ORACLE9 HSQLDB
 OPTIONS_DEFAULT=MYSQL PGSQL
@@ -40,28 +40,28 @@ PLIST_FILES=	${DISTFILES:S|^|%%JAVAJARDIR%%/|:S|-${PORTVERSION}||}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
+RUN_DEPENDS+=	${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
 .else
-RUN_DEPENDS+=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
+RUN_DEPENDS+=	${JAVALIBDIR}/log4j.jar:devel/log4j
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
+RUN_DEPENDS+=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc
 .endif
 
 
 .if ${PORT_OPTIONS:MORACLE8}
 WITH_ORACLE8=	yes
-RUN_DEPENDS+=	${JAVALIBDIR}/classes12.zip:${PORTSDIR}/databases/jdbc-oracle8i
+RUN_DEPENDS+=	${JAVALIBDIR}/classes12.zip:databases/jdbc-oracle8i
 .endif
 
 .if ${PORT_OPTIONS:MORACLE9}
 WITH_ORACLE9=	yes
-RUN_DEPENDS+=	${JAVALIBDIR}/ojdbc14.jar:${PORTSDIR}/databases/jdbc-oracle9i
+RUN_DEPENDS+=	${JAVALIBDIR}/ojdbc14.jar:databases/jdbc-oracle9i
 .endif
 
 .if ${PORT_OPTIONS:MHSQLDB}
-RUN_DEPENDS+=	${JAVALIBDIR}/hsqldb.jar:${PORTSDIR}/databases/hsqldb
+RUN_DEPENDS+=	${JAVALIBDIR}/hsqldb.jar:databases/hsqldb
 .endif
 
 post-extract:
diff --git a/databases/jdbc-oracle8i/Makefile b/databases/jdbc-oracle8i/Makefile
index ec1eeced43ef..5b33c9ad7958 100644
--- a/databases/jdbc-oracle8i/Makefile
+++ b/databases/jdbc-oracle8i/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	${CLASSES}${EXTRACT_SUFX} ${PATCH_FILE}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The JDBC drivers for Oracle 8i
 
-PATCH_DEPENDS=	${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip
+PATCH_DEPENDS=	${LOCALBASE}/bin/zip:archivers/zip
 
 RESTRICTED=	Must be downloaded direct from Oracle via www interface
 
diff --git a/databases/jlog/Makefile b/databases/jlog/Makefile
index 7e1fba8ee107..d7d18b914957 100644
--- a/databases/jlog/Makefile
+++ b/databases/jlog/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Journaled log library
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	autoconf-2.13:${PORTSDIR}/devel/autoconf213
+BUILD_DEPENDS=	autoconf-2.13:devel/autoconf213
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	omniti-labs
diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile
index 35ff78c29b5b..9fe67dc3644f 100644
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/opennms/JRRD/stable-1.0
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Java native interface (JNI) to RRDtool
 
-LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
+LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 USES=		libtool
 USE_JAVA=	yes
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index 9b633e927c01..80b5c2391923 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Bibliography editor for KDE
 
-LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libqoauth.so:${PORTSDIR}/net/qoauth
+LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4 \
+		libqca.so:devel/qca \
+		libqoauth.so:net/qoauth
 
 USES=		cmake iconv shared-mime-info tar:xz
 USE_GNOME=	libxml2 libxslt
diff --git a/databases/kyototycoon/Makefile b/databases/kyototycoon/Makefile
index b3a4175c0760..998f1a361a9a 100644
--- a/databases/kyototycoon/Makefile
+++ b/databases/kyototycoon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Handy cache/storage server
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libkyotocabinet.so:${PORTSDIR}/databases/kyotocabinet
+LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index def1af8d2c4d..29fd09be000b 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -32,10 +32,10 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
-BUILD_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc \
-			tevent>=0.9.26:${PORTSDIR}/devel/tevent \
-			tdb>=1.3.8,1:${PORTSDIR}/databases/tdb \
-			popt>=0:${PORTSDIR}/devel/popt
+BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc \
+			tevent>=0.9.26:devel/tevent \
+			tdb>=1.3.8,1:databases/tdb \
+			popt>=0:devel/popt
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt \
@@ -47,8 +47,8 @@ CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt \
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 .endif
 
 PLIST_FILES=		bin/ldbedit \
diff --git a/databases/leo_center/Makefile b/databases/leo_center/Makefile
index 24bec32d803b..6dbf0eba1196 100644
--- a/databases/leo_center/Makefile
+++ b/databases/leo_center/Makefile
@@ -16,11 +16,11 @@ GH_TAGNAME=	${PORTVERSION:C/0$//}
 
 DIST_SUBDIR=	leofs
 
-RUN_DEPENDS=	rubygem-haml>=0:${PORTSDIR}/www/rubygem-haml \
-		rubygem-leo_manager_client>=0.4.13:${PORTSDIR}/databases/rubygem-leo_manager_client \
-		rubygem-sinatra-contrib>=0:${PORTSDIR}/www/rubygem-sinatra-contrib \
-		rubygem-sinatra>=1.4.3:${PORTSDIR}/www/rubygem-sinatra \
-		rubygem-thin>=0:${PORTSDIR}/www/rubygem-thin
+RUN_DEPENDS=	rubygem-haml>=0:www/rubygem-haml \
+		rubygem-leo_manager_client>=0.4.13:databases/rubygem-leo_manager_client \
+		rubygem-sinatra-contrib>=0:www/rubygem-sinatra-contrib \
+		rubygem-sinatra>=1.4.3:www/rubygem-sinatra \
+		rubygem-thin>=0:www/rubygem-thin
 
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/databases/leofs/Makefile b/databases/leofs/Makefile
index 5c0c67f741fd..cac5defc342e 100644
--- a/databases/leofs/Makefile
+++ b/databases/leofs/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Highly scalable, fault-tolerant distributed file system
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/erlang17/bin/erlc:${PORTSDIR}/lang/erlang-runtime17 \
-		${LOCALBASE}/bin/cmake:${PORTSDIR}/devel/cmake \
-		${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck
+BUILD_DEPENDS=	${LOCALBASE}/lib/erlang17/bin/erlc:lang/erlang-runtime17 \
+		${LOCALBASE}/bin/cmake:devel/cmake \
+		${LOCALBASE}/lib/libcheck.a:devel/libcheck
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	leo-project
diff --git a/databases/leveldb/Makefile b/databases/leveldb/Makefile
index 8f0096f5d3d9..23cbb3bb1821 100644
--- a/databases/leveldb/Makefile
+++ b/databases/leveldb/Makefile
@@ -28,8 +28,8 @@ SHLIB_MINOR=	${PORTVERSION:E}
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
-GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:${PORTSDIR}/devel/google-perftools
-SNAPPY_LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
+GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
+SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 
 post-patch:
 	@${REINPLACE_CMD} -e '/PLATFORM_IS_LITTLE_ENDIAN/ s|__|_|g' ${WRKSRC}/port/port_posix.h
diff --git a/databases/levigo/Makefile b/databases/levigo/Makefile
index c89d383159a2..4df752a45d9b 100644
--- a/databases/levigo/Makefile
+++ b/databases/levigo/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Levigo is a Go wrapper for LevelDB
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go
-LIB_DEPENDS=	libleveldb.so:${PORTSDIR}/databases/leveldb
+BUILD_DEPENDS=	go:lang/go
+LIB_DEPENDS=	libleveldb.so:databases/leveldb
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index 383f3c25b6a4..b54652002c09 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drivers for libdbi
 
-LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS=	libdbi.so:databases/libdbi
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
@@ -40,7 +40,7 @@ MYSQL_PLIST_FILES=	lib/dbd/libdbdmysql.so
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 PGSQL_PLIST_FILES=	lib/dbd/libdbdpgsql.so
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 SQLITE3_CONFIGURE_WITH=	sqlite3
 SQLITE3_PLIST_FILES=	lib/dbd/libdbdsqlite3.so
 
diff --git a/databases/libdrizzle/Makefile b/databases/libdrizzle/Makefile
index 51195180bfcb..7e3844c37dfe 100644
--- a/databases/libdrizzle/Makefile
+++ b/databases/libdrizzle/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Client and protocol library for the Drizzle database
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 OPTIONS_DEFINE=	DOXYGEN EXAMPLES DOCS
 
@@ -29,7 +29,7 @@ SAMPLE_PROGS=	client pipe_query proxy server simple \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen>=0:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen>=0:devel/doxygen
 ALL_TARGET=	all doxygen
 PLIST_SUB+=	PORTDOCS=""
 .else
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index a42fa6ce8a26..2521e792cebc 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -21,8 +21,8 @@ LIBGDA4_SLAVE?=	no
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libjson-glib-1.0.so:devel/json-glib
 
 USES+=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	gnomeprefix glib20 libxslt intlhack referencehack
@@ -55,7 +55,7 @@ PLIST_SUB=	VERSION=${VERSION}
 .if ${LIBGDA4_SLAVE}=="no"
 .if ${PORT_OPTIONS:MUI}
 CONFIGURE_ARGS+=--with-ui
-BUILD_DEPENDS+=	xml2po:${PORTSDIR}/textproc/gnome-doc-utils
+BUILD_DEPENDS+=	xml2po:textproc/gnome-doc-utils
 USE_GNOME+=	gtk20
 INSTALLS_ICONS=	yes
 PLIST_SUB+=	UI=""
@@ -66,7 +66,7 @@ PLIST_SUB+=	UI="@comment "
 
 .if ${PORT_OPTIONS:MSOUP}
 CONFIGURE_ARGS+=--with-libsoup
-LIB_DEPENDS+=	libsoup-2.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	libsoup-2.so:devel/libsoup
 PLIST_SUB+=	WEB=""
 .else
 CONFIGURE_ARGS+=--without-libsoup
@@ -75,7 +75,7 @@ PLIST_SUB+=	WEB="@comment "
 
 .if ${PORT_OPTIONS:MKEYRING}
 CONFIGURE_ARGS+=--with-gnome-keyring
-LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS+=	libgnome-keyring.so:security/libgnome-keyring
 .else
 CONFIGURE_ARGS+=--without-gnome-keyring
 .endif
@@ -115,7 +115,7 @@ CONFIGURE_ARGS+=	--without-postgres
 
 # MDB (MS Access)
 .if ${LIBGDA4_SLAVE}=="mdb"
-LIB_DEPENDS+=		libmdbsql.so:${PORTSDIR}/databases/mdbtools
+LIB_DEPENDS+=		libmdbsql.so:databases/mdbtools
 CONFIGURE_ARGS+=	--with-mdb=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-mdb
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index 74f74c9a2c26..9ea35a54b0fc 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -17,10 +17,10 @@ LIBGDA5_SLAVE?=	no
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libsoup-2.4.so:devel/libsoup \
+		libjson-glib-1.0.so:devel/json-glib
 
 USES+=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20 libxslt intlhack referencehack
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=	--without-postgres
 
 # MDB (MS Access)
 .if ${LIBGDA5_SLAVE}==mdb
-LIB_DEPENDS+=		libmdbsql.so:${PORTSDIR}/databases/mdbtools
+LIB_DEPENDS+=		libmdbsql.so:databases/mdbtools
 CONFIGURE_ARGS+=	--with-mdb=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-mdb
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 9976bcdbce7d..7c37ca914a64 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX=	-legacy
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for libgda4 library
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	glibmm libgda4
diff --git a/databases/libgdamm5/Makefile b/databases/libgdamm5/Makefile
index ec0eb75b3470..d33bde44d272 100644
--- a/databases/libgdamm5/Makefile
+++ b/databases/libgdamm5/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for libgda5 library
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	libgda5 glibmm
@@ -24,8 +24,8 @@ OPTIONS_DEFINE=	BDB
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBDB} || exists(${LOCALBASE}/libdata/pkgconfig/libgda-bdb-5.0.pc)
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libgda-bdb-5.0.pc:${PORTSDIR}/databases/libgda5-bdb
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libgda-bdb-5.0.pc:${PORTSDIR}/databases/libgda5-bdb
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libgda-bdb-5.0.pc:databases/libgda5-bdb
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libgda-bdb-5.0.pc:databases/libgda5-bdb
 PLIST_SUB+=	BDB=""
 .else
 PLIST_SUB+=	BDB=""
diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index 2692ef411cbf..f5eb0a9a6d34 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -12,8 +12,8 @@ COMMENT=	C and C++ client library to the memcached server
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS?=	libevent.so:${PORTSDIR}/devel/libevent2
-TEST_DEPENDS=	memcached:${PORTSDIR}/databases/memcached
+LIB_DEPENDS?=	libevent.so:devel/libevent2
+TEST_DEPENDS=	memcached:databases/memcached
 
 USES=		autoreconf execinfo gmake pathfix pkgconfig libtool
 USE_LDCONFIG=	yes
@@ -45,7 +45,7 @@ HSIEH_CONFIGURE_ENABLE=		hsieh_hash
 MURMUR_CONFIGURE_ENABLE=	murmur_hash
 
 SASL_CONFIGURE_ENABLE=	sasl
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 PATHFIX_MAKEFILEIN=	include.am
 
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 4dc5c3ae7c7e..7e20d88f79d2 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -11,7 +11,7 @@ COMMENT=	C++ class library and toolset for ODBC access to data sources
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS=	doxygen:devel/doxygen
 
 OPTIONS_DEFINE=	DOCS
 
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-isqlxx
 INSTALL_TARGET=	install-strip
 
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
diff --git a/databases/linux-oracle-instantclient-sdk/Makefile b/databases/linux-oracle-instantclient-sdk/Makefile
index 7997ca1e6c6b..775dff5163e8 100644
--- a/databases/linux-oracle-instantclient-sdk/Makefile
+++ b/databases/linux-oracle-instantclient-sdk/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	oracle
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Oracle 10 InstantClient SDK. Works with Oracle RDBMS 8.1.2+
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/oracle/${ORACLEVERSION}/client/lib/libocci.so.10.1:${PORTSDIR}/databases/linux-oracle-instantclient-basic
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/oracle/${ORACLEVERSION}/client/lib/libocci.so.10.1:databases/linux-oracle-instantclient-basic
 
 NOFETCHFILES=	${DISTNAME}${EXTRACT_SUFX}
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/databases/linux-oracle-instantclient-sqlplus/Makefile b/databases/linux-oracle-instantclient-sqlplus/Makefile
index 7c712220bbeb..105ed09e1442 100644
--- a/databases/linux-oracle-instantclient-sqlplus/Makefile
+++ b/databases/linux-oracle-instantclient-sqlplus/Makefile
@@ -21,7 +21,7 @@ DISTINFO_FILE=		${MASTERDIR}/distinfo.i386
 RESTRICTED=		Packaging prohibited by Oracle license
 
 # base
-RUN_DEPENDS+=		linux-oracle-instantclient-basic>0:${PORTSDIR}/databases/linux-oracle-instantclient-basic
+RUN_DEPENDS+=		linux-oracle-instantclient-basic>0:databases/linux-oracle-instantclient-basic
 
 USES=			zip
 USE_LINUX=		c6
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index 1308b64cffd7..041c4da3a4e2 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -107,8 +107,8 @@ INNODB_CMAKE_OFF=	-DWITHOUT_INNOBASE=1
 MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my__compare.h
 MROONGA_CMAKE_OFF=	-DWITHOUT_MROONGA=1
 OQGRAPH_CMAKE_OFF=	-DWITHOUT_OQGRAPH=1
-OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-			libJudy.so:${PORTSDIR}/devel/judy
+OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+			libJudy.so:devel/judy
 # Currently OQGraph does not build using clang.
 # See See https://mariadb.atlassian.net/browse/MDEV-8051.
 OQGRPAH_USE=		gcc
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index 98da9e31da90..f2c581617b1d 100644
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@@ -121,9 +121,9 @@ ${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO \
 
 GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI=NO
 MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my__compare.h
-OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-			libJudy.so:${PORTSDIR}/devel/judy
-TOKUDB_LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
+OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+			libJudy.so:devel/judy
+TOKUDB_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 TOKUDB_PORTDOCS=	README.md
 TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
 NOT_FOR_ARCHS=		i386
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 01a09f67fb42..21ea25ca4776 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -106,7 +106,7 @@ OQGRAPH_DESC=	Open Query Graph Computation engine
 OQGRAPH_CMAKE_OFF=	-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1
 OQGRAPH_USE=	GCC=yes
 OQGRAPH_CMAKE_ON=	-DWITH_OQGRAPH_STORAGE_ENGINE=1
-OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 MAXKEY_EXTRA_PATCHES=	${FILESDIR}/extra-patch-include_my_compare.h
 .endif
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 3dca9700b28d..91dd2ac84d0b 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Utilities and libraries to export data from MS Access databases (.mdb)
 LICENSE=	GPLv2
 
 # To build man-pages
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
-		txt2man:${PORTSDIR}/textproc/txt2man
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+BUILD_DEPENDS=	gawk:lang/gawk \
+		txt2man:textproc/txt2man
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 OPTIONS_DEFINE=	GNOME DOCS
 OPTIONS_SUB=	yes
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index bd711b8d0f8a..c94cc21778d7 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -14,7 +14,7 @@ COMMENT=	High-performance distributed memory object cache system
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 CONFLICTS=	memcached-1.2*
 
@@ -40,7 +40,7 @@ CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} \
 
 DTRACE_CONFIGURE_ENABLE=	dtrace
 
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ENABLE=	sasl
 SASL_CFLAGS=		-I${LOCALBASE}/include
 SASL_CPPFLAGS+=		${CFLAGS}
@@ -59,7 +59,7 @@ BROKEN=			DTRACE broken with gcc/clang - reported upstream
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS=	xml2rfc:${PORTSDIR}/textproc/xml2rfc
+BUILD_DEPENDS=	xml2rfc:textproc/xml2rfc
 .endif
 
 post-install:
diff --git a/databases/memcacheq/Makefile b/databases/memcacheq/Makefile
index 0dfa69fc5658..f863bab5c7e4 100644
--- a/databases/memcacheq/Makefile
+++ b/databases/memcacheq/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple queue service over Memcache
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USE_CSTD=	gnu89
 CFLAGS+=	-I"${BDB_INCLUDE_DIR}"
diff --git a/databases/monetdb/Makefile b/databases/monetdb/Makefile
index 79e55c7e0fb1..8dea176ca830 100644
--- a/databases/monetdb/Makefile
+++ b/databases/monetdb/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	MonetDB Public License Version 1.1
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GNOME=	libxml2
 
@@ -114,18 +114,18 @@ ODBC_CONFIGURE_ENABLE=		odbc
 PERL_CONFIGURE_WITH=		perl
 RDF_CONFIGURE_ENABLE=		rdf
 
-SPHINXCLIENT_LIB_DEPENDS=	libsphinxclient.so:${PORTSDIR}/textproc/libsphinxclient
-RUBYGEMS_BUILD_DEPENDS=		gem:${PORTSDIR}/devel/ruby-gems
-RUBYGEMS_RUN_DEPENDS=		gem:${PORTSDIR}/devel/ruby-gems
-PYTHON3_BUILD_DEPENDS=		python3:${PORTSDIR}/lang/python3
-PYTHON3_RUN_DEPENDS=		python3:${PORTSDIR}/lang/python3
-CURL_LIB_DEPENDS=		libcurl.so:${PORTSDIR}/ftp/curl
-FITS_LIB_DEPENDS=		libcfitsio.so:${PORTSDIR}/astro/cfitsio
-GEOM_LIB_DEPENDS=		libgeos.so:${PORTSDIR}/graphics/geos
-ODBC_LIB_DEPENDS=		libodbcinst.so:${PORTSDIR}/databases/unixODBC
-PERL_BUILD_DEPENDS=		p5-DBI>=1.08:${PORTSDIR}/databases/p5-DBI
-PERL_RUN_DEPENDS=		p5-DBI>=1.08:${PORTSDIR}/databases/p5-DBI
-RDF_LIB_DEPENDS=		libraptor.so:${PORTSDIR}/textproc/raptor
+SPHINXCLIENT_LIB_DEPENDS=	libsphinxclient.so:textproc/libsphinxclient
+RUBYGEMS_BUILD_DEPENDS=		gem:devel/ruby-gems
+RUBYGEMS_RUN_DEPENDS=		gem:devel/ruby-gems
+PYTHON3_BUILD_DEPENDS=		python3:lang/python3
+PYTHON3_RUN_DEPENDS=		python3:lang/python3
+CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
+FITS_LIB_DEPENDS=		libcfitsio.so:astro/cfitsio
+GEOM_LIB_DEPENDS=		libgeos.so:graphics/geos
+ODBC_LIB_DEPENDS=		libodbcinst.so:databases/unixODBC
+PERL_BUILD_DEPENDS=		p5-DBI>=1.08:databases/p5-DBI
+PERL_RUN_DEPENDS=		p5-DBI>=1.08:databases/p5-DBI
+RDF_LIB_DEPENDS=		libraptor.so:textproc/raptor
 PERL_USES=			perl5
 
 .include <bsd.port.options.mk>
@@ -140,7 +140,7 @@ CATEGORIES+=	math
 
 .if ${PORT_OPTIONS:MJDBC} || ${PORT_OPTIONS:MMEROCONTROL}
 CATEGORIES+=	java
-BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
+BUILD_DEPENDS+=	ant:devel/apache-ant
 USE_JAVA=	yes
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
@@ -214,7 +214,7 @@ CONFIGURE_ARGS+=	-with-password-backend=SHA512
 # Compile chokes with  version of flex on FreeBSD 8 and 9
 # with "unknown flag '-'"
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CONFIGURE_ENV+=	LEX=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index 12d54c3311a3..642b19019776 100644
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -14,15 +14,15 @@ COMMENT=	NOSQL distributed document-oriented database
 LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libsnappy.so:${PORTSDIR}/archivers/snappy \
-		libv8.so:${PORTSDIR}/lang/v8 \
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libsnappy.so:archivers/snappy \
+		libv8.so:lang/v8 \
 # boost 1.52/1.55 from ports make mongod segfaulting with many tests
-# LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+# LIB_DEPENDS+=	libboost_system.so:devel/boost-libs
 # MAKE_ARGS+=	--use-system-boost
 # use bundled yaml
 # MAKE_ARGS+=	--use-system-yaml
-# LIB_DEPENDS+=	libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
+# LIB_DEPENDS+=	libyaml-cpp.so:devel/yaml-cpp
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"
@@ -51,12 +51,12 @@ MAKE_ARGS+=	--ssl
 
 .if ${PORT_OPTIONS:MSASL}
 MAKE_ARGS+=	--use-sasl-client
-LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
 USES+=		python:build
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.5:${PORTSDIR}/databases/pymongo
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.5:databases/pymongo
 TEST_TARGET=	smokeAll smokeCppUnittests
 .	if ${PORT_OPTIONS:MSSL}
 TEST_TARGET+=	smokeSsl
diff --git a/databases/mongodb32-tools/Makefile b/databases/mongodb32-tools/Makefile
index 1d52738977e0..6afe33550746 100644
--- a/databases/mongodb32-tools/Makefile
+++ b/databases/mongodb32-tools/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tools for MongoDB
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	go>0:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go>0:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	SSL SASL
 OPTIONS_DEFAULT=	SSL
 
 SASL_USE=	my_tags=sasl
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 SSL_USE=	openssl=yes my_tags=ssl
 
diff --git a/databases/mongodb32/Makefile b/databases/mongodb32/Makefile
index f96aa6bcd182..9952f1480a09 100644
--- a/databases/mongodb32/Makefile
+++ b/databases/mongodb32/Makefile
@@ -20,11 +20,11 @@ LICENSE_COMB=	multi
 # Bugs when compiled with < Clang 3.7
 #  - https://jira.mongodb.org/browse/SERVER-21217
 #  - https://jira.mongodb.org/browse/SERVER-22740
-BUILD_DEPENDS=	${LOCALBASE}/bin/clang37:${PORTSDIR}/lang/clang37
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libsnappy.so:${PORTSDIR}/archivers/snappy
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:${PORTSDIR}/databases/pymongo
+BUILD_DEPENDS=	${LOCALBASE}/bin/clang37:lang/clang37
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libsnappy.so:archivers/snappy
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo
 
 CPP=	${LOCALBASE}/bin/clang-cpp37
 CC=	${LOCALBASE}/bin/clang37
@@ -38,7 +38,7 @@ CONFLICTS_BUILD=	mongo-cxx-driver
 OPTIONS_DEFINE=		SASL SSL
 OPTIONS_DEFAULT=	SASL SSL
 
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USE=	openssl=yes
diff --git a/databases/mrtg-mysql-load/Makefile b/databases/mrtg-mysql-load/Makefile
index 93af0134f052..5056dbab9d5b 100644
--- a/databases/mrtg-mysql-load/Makefile
+++ b/databases/mrtg-mysql-load/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.bitbybit.dk/mysql/mrtg-mysql-load/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL load analysis fetcher for MRTG
 
-RUN_DEPENDS=	mrtg:${PORTSDIR}/net-mgmt/mrtg
+RUN_DEPENDS=	mrtg:net-mgmt/mrtg
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/databases/mtools-mongodb/Makefile b/databases/mtools-mongodb/Makefile
index b7524c2fe42f..e17706ce7e3c 100644
--- a/databases/mtools-mongodb/Makefile
+++ b/databases/mtools-mongodb/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Setup test environments; parse, filter and visualize MongoDB log files
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=2.0:${PORTSDIR}/sysutils/py-psutil \
-		${PYTHON_PKGNAMEPREFIX}pymongo>0:${PORTSDIR}/databases/pymongo \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil \
+		${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
 
 USE_PYTHON=	autoplist distutils
 USES=		python:2
diff --git a/databases/mtop/Makefile b/databases/mtop/Makefile
index cb25909e3859..79952289317d 100644
--- a/databases/mtop/Makefile
+++ b/databases/mtop/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL Monitoring Tool
 
-RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-Net>=0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-Net>=0:net/p5-Net
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/mydbf2mysql/Makefile b/databases/mydbf2mysql/Makefile
index efd1651c8be0..372211b3140e 100644
--- a/databases/mydbf2mysql/Makefile
+++ b/databases/mydbf2mysql/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	MyDBF2MySQL-${PORTVERSION}
 MAINTAINER=	andrey.polyakov@unix.net
 COMMENT=	Flexible tool for DBF import into MySQL
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
-RUN_DEPENDS+=	ydbf>=0.0.1:${PORTSDIR}/devel/py-ydbf
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
+RUN_DEPENDS+=	ydbf>=0.0.1:devel/py-ydbf
 
 USES=		python tar:bzip2
 USE_PYTHON=	distutils autoplist
diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile
index 473497a11066..dade6fed8e40 100644
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@@ -11,7 +11,7 @@ COMMENT=	MySQL Data Dumper
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CMAKE_ARGS=	-DBUILD_DOCS=OFF -DWITH_BINLOG=OFF
 USE_GNOME=	glib20
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 97d8a933e192..ce6d01a20c1a 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -13,7 +13,7 @@ COMMENT=	MySQL database connector for C++
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
 USE_MYSQL=	51+
 USES=		cmake:outsource
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index e665d4fc823a..9661e8986c59 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -12,7 +12,7 @@ COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
+RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:devel/log4j
 
 USES=		cpe
 CPE_VENDOR=	oracle
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index ec5752ddfc97..846362ada1a4 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	sergey@network-asp.biz
 COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
 
-BUILD_DEPENDS=	unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+BUILD_DEPENDS=	unixODBC>=2.2.14_1:databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 USE_LDCONFIG=	yes
 USE_MYSQL=	yes
diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index be5aeac9d5dd..8d9ea50f54d2 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Monitor, analyze, or transform the communication of MySQL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libglib-2.0.so:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libevent.so:devel/libevent2 \
+		libglib-2.0.so:devel/glib20
 
 CONFIGURE_ARGS+=	--with-lua=lua-${LUA_VER} --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index 33c9f05610ea..e614225df098 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${_MYSQL_SERVER:T:C/-server$/-/}
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Message queue that works as a pluggable storage engine of MySQL
 
-FETCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/${_MYSQL_SERVER}:build
+FETCH_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:build
 
 USES=		gmake perl5 libtool
 USE_MYSQL=	server
diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile
index ea095505d793..78339544ac98 100644
--- a/databases/mysql2odbc/Makefile
+++ b/databases/mysql2odbc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.iodbc.org/downloads/mysql2odbc/
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Openlink MySQL-ODBC Gateway
 
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONFIGURE_ARGS=	--with-unixodbc=${LOCALBASE}
 
 USES=		libtool
diff --git a/databases/mysqldumper/Makefile b/databases/mysqldumper/Makefile
index 61098f3812a2..08d096900b27 100644
--- a/databases/mysqldumper/Makefile
+++ b/databases/mysqldumper/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool for backing up MySQL databases
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-DBI>=1.48:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=1.48:databases/p5-DBI
 
 OPTIONS_DEFINE=	APACHE LIGHTTPD
 OPTIONS_DEFAULT=APACHE
@@ -29,7 +29,7 @@ PLIST_SUB=	WWWGRP=${WWWGRP} WWWOWN=${WWWOWN}
 WRKSRC=		${WRKDIR}/msd${PORTVERSION}
 
 APACHE_USE=		APACHE_RUN=22+
-LIGHTTPD_RUN_DEPENDS=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
+LIGHTTPD_RUN_DEPENDS=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/
diff --git a/databases/mysqlidxchk/Makefile b/databases/mysqlidxchk/Makefile
index 3be0ed29eeb0..b17cff02524e 100644
--- a/databases/mysqlidxchk/Makefile
+++ b/databases/mysqlidxchk/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://hackmysql.com/scripts/
 MAINTAINER=	rdna@rdna.ru
 COMMENT=	Checks MySQL databases/tables for unused indexes
 
-RUN_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 NO_WRKSUBDIR=	yes
 
diff --git a/databases/mysqlreport/Makefile b/databases/mysqlreport/Makefile
index e9edeec43bd7..e038aecdb95e 100644
--- a/databases/mysqlreport/Makefile
+++ b/databases/mysqlreport/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Mysqlreport makes a friendly report of important MySQL status values
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/databases/mysqlsla/Makefile b/databases/mysqlsla/Makefile
index e3a31df88a25..bc46db23c4de 100644
--- a/databases/mysqlsla/Makefile
+++ b/databases/mysqlsla/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Mysqlsla analyzes general, slow, and raw MySQL statement logs
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 
 NO_ARCH=	yes
 USES=		perl5 shebangfix
diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile
index a6f2b6ad9529..73b8871862b7 100644
--- a/databases/mytop/Makefile
+++ b/databases/mytop/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Top clone for MySQL
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-DBD-mysql>1.0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-DBI>=1.13:${PORTSDIR}/databases/p5-DBI \
-		p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-DBD-mysql>1.0:databases/p5-DBD-mysql \
+		p5-DBI>=1.13:databases/p5-DBI \
+		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jzawodn
diff --git a/databases/nagios-check_mongodb/Makefile b/databases/nagios-check_mongodb/Makefile
index 5a0bb6bad4c9..178fa5d0ac61 100644
--- a/databases/nagios-check_mongodb/Makefile
+++ b/databases/nagios-check_mongodb/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}nagios-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Nagios plugin to check mongodb server
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=0:${PORTSDIR}/databases/pymongo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=0:databases/pymongo
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mzupan
diff --git a/databases/nagios-check_postgres_replication/Makefile b/databases/nagios-check_postgres_replication/Makefile
index 225509f4ff97..d5a29c168b7a 100644
--- a/databases/nagios-check_postgres_replication/Makefile
+++ b/databases/nagios-check_postgres_replication/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Nagios plugin to check the lag between a postgresql replica and master
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nagiosplugin>=0:${PORTSDIR}/sysutils/py-nagiosplugin \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>=0:${PORTSDIR}/databases/py-psycopg2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nagiosplugin>=0:sysutils/py-nagiosplugin \
+		${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/databases/nagios-check_redis/Makefile b/databases/nagios-check_redis/Makefile
index c8e14fda2470..74dda55f0239 100644
--- a/databases/nagios-check_redis/Makefile
+++ b/databases/nagios-check_redis/Makefile
@@ -11,9 +11,9 @@ DISTFILES=	# none
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Nagios plugin to check redis server
 
-RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/utils.pm:${PORTSDIR}/net-mgmt/nagios-plugins \
-		p5-Redis>=0:${PORTSDIR}/databases/p5-Redis \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/utils.pm:net-mgmt/nagios-plugins \
+		p5-Redis>=0:databases/p5-Redis \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 
 USES=		perl5
 USE_PERL5=	run
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 4069f4c06fea..c8c577c7e941 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -11,8 +11,8 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full-text search system intended for easy use
 
-BUILD_DEPENDS=	p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic
-RUN_DEPENDS=	p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic
+BUILD_DEPENDS=	p5-File-MMagic>=0:devel/p5-File-MMagic
+RUN_DEPENDS=	p5-File-MMagic>=0:devel/p5-File-MMagic
 
 USES=		cpe gettext iconv libtool perl5
 GNU_CONFIGURE=	yes
diff --git a/databases/ntdb/Makefile b/databases/ntdb/Makefile
index c3eb91e0942e..6452760f4522 100644
--- a/databases/ntdb/Makefile
+++ b/databases/ntdb/Makefile
@@ -44,8 +44,8 @@ PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/ntdb.so
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 .endif
 
 PLIST_FILES+=		bin/ntdbbackup \
diff --git a/databases/openark-kit/Makefile b/databases/openark-kit/Makefile
index 8d123a5c9ee1..6e51ae5c4783 100644
--- a/databases/openark-kit/Makefile
+++ b/databases/openark-kit/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Common utilities for MySQL
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
 
 PROJECTHOST=	openarkkit
 USES=		python
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index fde7df76e11d..f7a0a0041d10 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -36,13 +36,13 @@ MYSQL_LDFLAGS=	-L${LOCALBASE}/lib/mysql
 
 PGSQL_USES=	pgsql
 
-SQLITE_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2
+SQLITE_LIB_DEPENDS=	libsqlite.so:databases/sqlite2
 
 SQLITE3_USE=	SQLITE=3
 
-MSSQL_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
+MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds
 
-SYBASE_LIB_DEPENDS=	libct.so:${PORTSDIR}/databases/freetds
+SYBASE_LIB_DEPENDS=	libct.so:databases/freetds
 
 NLS_USES=		gettext
 NLS_CONFIGURE_DISABLE=	nls
diff --git a/databases/opentsdb/Makefile b/databases/opentsdb/Makefile
index 8ff5b2f79790..f618d78416c1 100644
--- a/databases/opentsdb/Makefile
+++ b/databases/opentsdb/Makefile
@@ -12,11 +12,11 @@ COMMENT=	OpenTSDB is the Scalable Timeseries Database
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		curl:${PORTSDIR}/ftp/curl \
-		gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS=	libhadoop.so:${PORTSDIR}/devel/hadoop2
-RUN_DEPENDS=	hbase>0:${PORTSDIR}/databases/hbase
+BUILD_DEPENDS=	bash:shells/bash \
+		curl:ftp/curl \
+		gawk:lang/gawk
+LIB_DEPENDS=	libhadoop.so:devel/hadoop2
+RUN_DEPENDS=	hbase>0:databases/hbase
 
 USES=		gmake python
 USE_JAVA=	yes
@@ -24,7 +24,7 @@ USE_JAVA=	yes
 OPTIONS_DEFINE=		GNUPLOT
 OPTIONS_DEFAULT=	GNUPLOT
 
-GNUPLOT_RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
 
 HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/databases/oracle_odbc_driver/Makefile b/databases/oracle_odbc_driver/Makefile
index 440542f22041..028a2b8bc3c5 100644
--- a/databases/oracle_odbc_driver/Makefile
+++ b/databases/oracle_odbc_driver/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Oracle Open Source ODBC driver
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONFIGURE_ARGS=	--with-unixODBC=${LOCALBASE}
 
-BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntst8.a:${PORTSDIR}/databases/oracle8-client
-RUN_DEPENDS=	${ORACLE_HOME}/lib/libclntst8.a:${PORTSDIR}/databases/oracle8-client
+BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntst8.a:databases/oracle8-client
+RUN_DEPENDS=	${ORACLE_HOME}/lib/libclntst8.a:databases/oracle8-client
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ORACLE_HOME=	${LOCALBASE}/oracle8-client
diff --git a/databases/p5-Amazon-SimpleDB/Makefile b/databases/p5-Amazon-SimpleDB/Makefile
index 3cbfbe9c5fea..0dae6394c141 100644
--- a/databases/p5-Amazon-SimpleDB/Makefile
+++ b/databases/p5-Amazon-SimpleDB/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Low-level perlish interface for working with Amazon SimpleDB service
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/p5-Amon2-DBI/Makefile b/databases/p5-Amon2-DBI/Makefile
index 50d8c516ec7a..6a2e2452861e 100644
--- a/databases/p5-Amon2-DBI/Makefile
+++ b/databases/p5-Amon2-DBI/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of simple DBI wrapper
 
 RUN_DEPENDS=	\
-	p5-Carp-Clan>0:${PORTSDIR}/devel/p5-Carp-Clan \
-	p5-DBI>=1.616:${PORTSDIR}/databases/p5-DBI \
-	p5-DBIx-TransactionManager>=1.09:${PORTSDIR}/databases/p5-DBIx-TransactionManager \
-	p5-SQL-Interp>=1.10:${PORTSDIR}/databases/p5-SQL-Interp
+	p5-Carp-Clan>0:devel/p5-Carp-Clan \
+	p5-DBI>=1.616:databases/p5-DBI \
+	p5-DBIx-TransactionManager>=1.09:databases/p5-DBIx-TransactionManager \
+	p5-SQL-Interp>=1.10:databases/p5-SQL-Interp
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-Amon2>0:${PORTSDIR}/www/p5-Amon2 \
-	p5-Test-Memory-Cycle>0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+	p5-Amon2>0:www/p5-Amon2 \
+	p5-Test-Memory-Cycle>0:devel/p5-Test-Memory-Cycle
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-AnyEvent-BDB/Makefile b/databases/p5-AnyEvent-BDB/Makefile
index ead749c5a714..a6d6c338db2a 100644
--- a/databases/p5-AnyEvent-BDB/Makefile
+++ b/databases/p5-AnyEvent-BDB/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Truly asynchronous Berkeley DB access
 
-BUILD_DEPENDS=	p5-AnyEvent>=3.81:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-BDB>=1.5:${PORTSDIR}/databases/p5-BDB
+BUILD_DEPENDS=	p5-AnyEvent>=3.81:devel/p5-AnyEvent \
+		p5-BDB>=1.5:databases/p5-BDB
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/p5-AnyEvent-CouchDB/Makefile b/databases/p5-AnyEvent-CouchDB/Makefile
index 525bd13858ca..1648552b3e06 100644
--- a/databases/p5-AnyEvent-CouchDB/Makefile
+++ b/databases/p5-AnyEvent-CouchDB/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Non-blocking CouchDB client based on jquery.couch.js
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	couchdb>=0.9.0:${PORTSDIR}/databases/couchdb \
-		p5-AnyEvent-HTTP>=2.11:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-		p5-CouchDB-View>=0:${PORTSDIR}/databases/p5-CouchDB-View \
-		p5-Data-Dump-Streamer>=0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-Scope-Guard>=0:${PORTSDIR}/devel/p5-Scope-Guard
+BUILD_DEPENDS=	couchdb>=0.9.0:databases/couchdb \
+		p5-AnyEvent-HTTP>=2.11:www/p5-AnyEvent-HTTP \
+		p5-CouchDB-View>=0:databases/p5-CouchDB-View \
+		p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-Scope-Guard>=0:devel/p5-Scope-Guard
 BUILD_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/p5-AnyEvent-DBD-Pg/Makefile b/databases/p5-AnyEvent-DBD-Pg/Makefile
index 75e361118157..cba9ed37cc26 100644
--- a/databases/p5-AnyEvent-DBD-Pg/Makefile
+++ b/databases/p5-AnyEvent-DBD-Pg/Makefile
@@ -10,15 +10,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for AnyEvent interface to DBD::Pg async interface
 
-BUILD_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-DBD-Pg>0:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-common-sense>=3:${PORTSDIR}/devel/p5-common-sense
-RUN_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-DBD-Pg>0:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-common-sense>=3:${PORTSDIR}/devel/p5-common-sense
-TEST_DEPENDS=	p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+BUILD_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-DBD-Pg>0:databases/p5-DBD-Pg \
+		p5-DBI>0:databases/p5-DBI \
+		p5-common-sense>=3:devel/p5-common-sense
+RUN_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-DBD-Pg>0:databases/p5-DBD-Pg \
+		p5-DBI>0:databases/p5-DBI \
+		p5-common-sense>=3:devel/p5-common-sense
+TEST_DEPENDS=	p5-lib-abs>=0.90:devel/p5-lib-abs
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-AnyEvent-Memcached/Makefile b/databases/p5-AnyEvent-Memcached/Makefile
index 4c8d673fcd60..cd0d57961bf3 100644
--- a/databases/p5-AnyEvent-Memcached/Makefile
+++ b/databases/p5-AnyEvent-Memcached/Makefile
@@ -14,20 +14,20 @@ COMMENT=	AnyEvent memcached client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent-Connection>=0.05:${PORTSDIR}/devel/p5-AnyEvent-Connection \
-		p5-AnyEvent>=5.0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32 \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Test-NoWarnings>=1.03:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-TCP>=0.14:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
-RUN_DEPENDS=	p5-AnyEvent-Connection>=0.05:${PORTSDIR}/devel/p5-AnyEvent-Connection \
-		p5-AnyEvent>=5.0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32 \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Test-NoWarnings>=1.03:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-TCP>=0.14:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+BUILD_DEPENDS=	p5-AnyEvent-Connection>=0.05:devel/p5-AnyEvent-Connection \
+		p5-AnyEvent>=5.0:devel/p5-AnyEvent \
+		p5-String-CRC32>=0:devel/p5-String-CRC32 \
+		p5-common-sense>=2:devel/p5-common-sense \
+		p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
+		p5-Test-TCP>=0.14:devel/p5-Test-TCP \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
+RUN_DEPENDS=	p5-AnyEvent-Connection>=0.05:devel/p5-AnyEvent-Connection \
+		p5-AnyEvent>=5.0:devel/p5-AnyEvent \
+		p5-String-CRC32>=0:devel/p5-String-CRC32 \
+		p5-common-sense>=2:devel/p5-common-sense \
+		p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
+		p5-Test-TCP>=0.14:devel/p5-Test-TCP \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/databases/p5-AnyEvent-Redis/Makefile b/databases/p5-AnyEvent-Redis/Makefile
index e3a98ee1d7e9..2c273bd1a856 100644
--- a/databases/p5-AnyEvent-Redis/Makefile
+++ b/databases/p5-AnyEvent-Redis/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	AnyEvent::Redis - Non-blocking Redis client
 
-BUILD_DEPENDS=	p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
+BUILD_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-AnyEvent>=0:devel/p5-AnyEvent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-TCP>=1.03:${PORTSDIR}/devel/p5-Test-TCP \
-		redis>=0:${PORTSDIR}/databases/redis
+TEST_DEPENDS=	p5-Test-Simple>=0.88:devel/p5-Test-Simple \
+		p5-Test-TCP>=1.03:devel/p5-Test-TCP \
+		redis>=0:databases/redis
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile
index d58f0042e642..f232ff08d591 100644
--- a/databases/p5-BDB/Makefile
+++ b/databases/p5-BDB/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Asynchronous Berkeley DB access
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:1.801
diff --git a/databases/p5-BSON/Makefile b/databases/p5-BSON/Makefile
index 93eaf2d7bbc4..4fd8ce34271a 100644
--- a/databases/p5-BSON/Makefile
+++ b/databases/p5-BSON/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Pure Perl implementation of MongoDB BSON serialization
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Int64>=0:${PORTSDIR}/math/p5-Math-Int64 \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS=	p5-Math-Int64>=0:math/p5-Math-Int64 \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile
index 37e7819e3816..18966dc0329c 100644
--- a/databases/p5-BerkeleyDB/Makefile
+++ b/databases/p5-BerkeleyDB/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl5 interface to the Berkeley DB package
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-MLDBM>=0:databases/p5-MLDBM \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USES=		perl5 shebangfix
 USE_BDB=	yes
diff --git a/databases/p5-Bucardo/Makefile b/databases/p5-Bucardo/Makefile
index d3d9ddc5bb6b..d48395b464e5 100644
--- a/databases/p5-Bucardo/Makefile
+++ b/databases/p5-Bucardo/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Asynchronous PostgreSQL replication system
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DBI>=1.51:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-Pg>=2.0:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-Encode-Locale>=0:${PORTSDIR}/converters/p5-Encode-Locale \
-		p5-boolean>=0:${PORTSDIR}/devel/p5-boolean \
-		p5-DBIx-Safe>=1.2.4:${PORTSDIR}/databases/p5-DBIx-Safe
+BUILD_DEPENDS=	p5-DBI>=1.51:databases/p5-DBI \
+		p5-DBD-Pg>=2.0:databases/p5-DBD-Pg \
+		p5-Encode-Locale>=0:converters/p5-Encode-Locale \
+		p5-boolean>=0:devel/p5-boolean \
+		p5-DBIx-Safe>=1.2.4:databases/p5-DBIx-Safe
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=	perl5
diff --git a/databases/p5-CDB_File-Generator/Makefile b/databases/p5-CDB_File-Generator/Makefile
index 2680c87f2458..c0f92310871e 100644
--- a/databases/p5-CDB_File-Generator/Makefile
+++ b/databases/p5-CDB_File-Generator/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate massive sorted CDB files simply
 
-BUILD_DEPENDS=	cdbmake:${PORTSDIR}/databases/cdb \
-		p5-CDB_File>=0:${PORTSDIR}/databases/p5-CDB_File
+BUILD_DEPENDS=	cdbmake:databases/cdb \
+		p5-CDB_File>=0:databases/p5-CDB_File
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-CGI-Session-Driver-memcached/Makefile b/databases/p5-CGI-Session-Driver-memcached/Makefile
index 6e5bea25792d..a0e4b63bfb05 100644
--- a/databases/p5-CGI-Session-Driver-memcached/Makefile
+++ b/databases/p5-CGI-Session-Driver-memcached/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for persistent session data in CGI applications
 
 RUN_DEPENDS=	\
-	p5-CGI-Session>=4:${PORTSDIR}/www/p5-CGI-Session
+	p5-CGI-Session>=4:www/p5-CGI-Session
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Cache-BDB/Makefile b/databases/p5-Cache-BDB/Makefile
index f4e53de17b44..f50e72117dd8 100644
--- a/databases/p5-Cache-BDB/Makefile
+++ b/databases/p5-Cache-BDB/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Object caching wrapper around BerkeleyDB
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
+BUILD_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/p5-Cache-Memcached-Managed/Makefile b/databases/p5-Cache-Memcached-Managed/Makefile
index 8942bce217b4..8a9459b13fbb 100644
--- a/databases/p5-Cache-Memcached-Managed/Makefile
+++ b/databases/p5-Cache-Memcached-Managed/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Provide API for managing cached information
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached
+BUILD_DEPENDS=	p5-Cache-Memcached>=0:databases/p5-Cache-Memcached
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	memcached:${PORTSDIR}/databases/memcached
+TEST_DEPENDS=	memcached:databases/memcached
 
 USES=		perl5
 USE_PERL5=	configure extract
diff --git a/databases/p5-Cache-Memcached-XS/Makefile b/databases/p5-Cache-Memcached-XS/Makefile
index 7e28023dea32..eb5c2de43220 100644
--- a/databases/p5-Cache-Memcached-XS/Makefile
+++ b/databases/p5-Cache-Memcached-XS/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Client library for memcached using libmemcache
 
-LIB_DEPENDS=	libmemcache.so:${PORTSDIR}/databases/libmemcache
+LIB_DEPENDS=	libmemcache.so:databases/libmemcache
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Cache-Memcached-libmemcached/Makefile b/databases/p5-Cache-Memcached-libmemcached/Makefile
index d00b9770426e..73393352fc0d 100644
--- a/databases/p5-Cache-Memcached-libmemcached/Makefile
+++ b/databases/p5-Cache-Memcached-libmemcached/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dliakh@ukr.net
 COMMENT=	Cache::Memcached compatible interface to libmemcached
 
-BUILD_DEPENDS=	p5-Memcached-libmemcached>=0.42.01:${PORTSDIR}/databases/p5-Memcached-libmemcached \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-Memcached-libmemcached>=0.42.01:databases/p5-Memcached-libmemcached \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Cache-Memcached/Makefile b/databases/p5-Cache-Memcached/Makefile
index 057cfbcb0904..9d03ccd231a6 100644
--- a/databases/p5-Cache-Memcached/Makefile
+++ b/databases/p5-Cache-Memcached/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Perl API for memcached, a distributed memory cache daemon
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-String-CRC32>0:${PORTSDIR}/devel/p5-String-CRC32
-RUN_DEPENDS=	p5-String-CRC32>0:${PORTSDIR}/devel/p5-String-CRC32
+BUILD_DEPENDS=	p5-String-CRC32>0:devel/p5-String-CRC32
+RUN_DEPENDS=	p5-String-CRC32>0:devel/p5-String-CRC32
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-AbstractSearch/Makefile b/databases/p5-Class-DBI-AbstractSearch/Makefile
index 37964ee3b3e0..b199b05363a5 100644
--- a/databases/p5-Class-DBI-AbstractSearch/Makefile
+++ b/databases/p5-Class-DBI-AbstractSearch/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Abstract Class::DBI SQL with SQL::Abstract
 
-RUN_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract \
-		p5-SQL-Abstract-Limit>=0:${PORTSDIR}/databases/p5-SQL-Abstract-Limit
+RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-SQL-Abstract>=0:databases/p5-SQL-Abstract \
+		p5-SQL-Abstract-Limit>=0:databases/p5-SQL-Abstract-Limit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-AsForm/Makefile b/databases/p5-Class-DBI-AsForm/Makefile
index 007873cd2c59..b2328e0eb46d 100644
--- a/databases/p5-Class-DBI-AsForm/Makefile
+++ b/databases/p5-Class-DBI-AsForm/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Produce HTML form elements for database columns
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Class-DBI-Plugin-Type>=0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Class-DBI-Plugin-Type>=0:databases/p5-Class-DBI-Plugin-Type
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-AutoLoader/Makefile b/databases/p5-Class-DBI-AutoLoader/Makefile
index 6f6cca08d8a4..54fbeb328fe4 100644
--- a/databases/p5-Class-DBI-AutoLoader/Makefile
+++ b/databases/p5-Class-DBI-AutoLoader/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generates Class::DBI subclasses dynamically
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-Class-DBI-BaseDSN>=0:${PORTSDIR}/databases/p5-Class-DBI-BaseDSN
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-Class-DBI-BaseDSN>=0:databases/p5-Class-DBI-BaseDSN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-BaseDSN/Makefile b/databases/p5-Class-DBI-BaseDSN/Makefile
index 6fb8da7ee1c4..7d14fa9a9443 100644
--- a/databases/p5-Class-DBI-BaseDSN/Makefile
+++ b/databases/p5-Class-DBI-BaseDSN/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DSN sensitive base class
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-Class-DBI-DATA-Schema/Makefile b/databases/p5-Class-DBI-DATA-Schema/Makefile
index 578bc1d6b115..c26abb1b78a4 100644
--- a/databases/p5-Class-DBI-DATA-Schema/Makefile
+++ b/databases/p5-Class-DBI-DATA-Schema/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Execute Class::DBI SQL from DATA sections
 
-RUN_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=0:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-DDL/Makefile b/databases/p5-Class-DBI-DDL/Makefile
index 539acde851a6..04d1616c439e 100644
--- a/databases/p5-Class-DBI-DDL/Makefile
+++ b/databases/p5-Class-DBI-DDL/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DDL for Class-DBI
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-Class-DBI-FromCGI/Makefile b/databases/p5-Class-DBI-FromCGI/Makefile
index 77e1cc6cafa7..ceb5ca0d60ad 100644
--- a/databases/p5-Class-DBI-FromCGI/Makefile
+++ b/databases/p5-Class-DBI-FromCGI/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Update Class::DBI data using CGI::Untaint
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-CGI-Untaint>=0:${PORTSDIR}/www/p5-CGI-Untaint
+RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-CGI-Untaint>=0:www/p5-CGI-Untaint
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-LazyInflate/Makefile b/databases/p5-Class-DBI-LazyInflate/Makefile
index a89ae9497855..0da35100d6ef 100644
--- a/databases/p5-Class-DBI-LazyInflate/Makefile
+++ b/databases/p5-Class-DBI-LazyInflate/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Defer inflating of columns until they are used
 
-BUILD_DEPENDS=	p5-Data-Lazy>=0:${PORTSDIR}/devel/p5-Data-Lazy \
-		p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+BUILD_DEPENDS=	p5-Data-Lazy>=0:devel/p5-Data-Lazy \
+		p5-Class-DBI>=0:databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-Loader-Relationship/Makefile b/databases/p5-Class-DBI-Loader-Relationship/Makefile
index 6b55b2f38111..07e927d8d5e1 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/Makefile
+++ b/databases/p5-Class-DBI-Loader-Relationship/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Easier relationship specification in CDBI::L
 
-BUILD_DEPENDS=	p5-Class-DBI-Loader>=0:${PORTSDIR}/databases/p5-Class-DBI-Loader \
-		p5-Lingua-EN-Inflect-Number>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number
+BUILD_DEPENDS=	p5-Class-DBI-Loader>=0:databases/p5-Class-DBI-Loader \
+		p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-Loader/Makefile b/databases/p5-Class-DBI-Loader/Makefile
index e602c85584eb..7cd4ed68e565 100644
--- a/databases/p5-Class-DBI-Loader/Makefile
+++ b/databases/p5-Class-DBI-Loader/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dynamic definition of Class::DBI sub classes
 
-RUN_DEPENDS=	p5-Class-DBI>=0.89:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-DBI>=1.3:${PORTSDIR}/databases/p5-DBI \
-		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect
+RUN_DEPENDS=	p5-Class-DBI>=0.89:databases/p5-Class-DBI \
+		p5-DBI>=1.3:databases/p5-DBI \
+		p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -22,9 +22,9 @@ USE_PERL5=	configure
 
 OPTIONS_DEFINE=	PGSQL MYSQL SQLITE DOCS
 
-MYSQL_RUN_DEPENDS=	p5-Class-DBI-mysql>=0:${PORTSDIR}/databases/p5-Class-DBI-mysql
-PGSQL_RUN_DEPENDS=	p5-Class-DBI-Pg>=0:${PORTSDIR}/databases/p5-Class-DBI-Pg
-SQLITE_RUN_DEPENDS=	p5-Class-DBI-SQLite>=0:${PORTSDIR}/databases/p5-Class-DBI-SQLite
+MYSQL_RUN_DEPENDS=	p5-Class-DBI-mysql>=0:databases/p5-Class-DBI-mysql
+PGSQL_RUN_DEPENDS=	p5-Class-DBI-Pg>=0:databases/p5-Class-DBI-Pg
+SQLITE_RUN_DEPENDS=	p5-Class-DBI-SQLite>=0:databases/p5-Class-DBI-SQLite
 
 PORTDOCS=	Changes README
 
diff --git a/databases/p5-Class-DBI-Oracle/Makefile b/databases/p5-Class-DBI-Oracle/Makefile
index a3c90f092512..946c72146dce 100644
--- a/databases/p5-Class-DBI-Oracle/Makefile
+++ b/databases/p5-Class-DBI-Oracle/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensions to Class::DBI for Oracle
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-Pager/Makefile b/databases/p5-Class-DBI-Pager/Makefile
index 2349f336e008..614a67ce4843 100644
--- a/databases/p5-Class-DBI-Pager/Makefile
+++ b/databases/p5-Class-DBI-Pager/Makefile
@@ -12,10 +12,10 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pager utility for Class::DBI
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-Data-Page>=0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone
+RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
+		p5-Data-Page>=0:databases/p5-Data-Page \
+		p5-Clone>=0:devel/p5-Clone
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile
index f571cb31d353..56a811102454 100644
--- a/databases/p5-Class-DBI-Pg/Makefile
+++ b/databases/p5-Class-DBI-Pg/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensions to Class::DBI for PostgreSQL
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-DBD-Pg>=0:databases/p5-DBD-Pg
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
index 0f03bd41b453..392de73f8f45 100644
--- a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
+++ b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Get COUNT(*) results with abstract SQL
 
-BUILD_DEPENDS=	p5-Class-DBI-Plugin>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Plugin \
-		p5-Class-DBI>=0.95:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-SQL-Abstract>=1.50:${PORTSDIR}/databases/p5-SQL-Abstract
+BUILD_DEPENDS=	p5-Class-DBI-Plugin>=0.02:databases/p5-Class-DBI-Plugin \
+		p5-Class-DBI>=0.95:databases/p5-Class-DBI \
+		p5-SQL-Abstract>=1.50:databases/p5-SQL-Abstract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
index b5b460b0b133..d96b94581998 100644
--- a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
+++ b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Provides deep_search_where() for Class::DBI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-DBI>=0.96:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-Class-DBI-Plugin>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Plugin \
-		p5-SQL-Abstract>=1.18:${PORTSDIR}/databases/p5-SQL-Abstract
+BUILD_DEPENDS=	p5-Class-DBI>=0.96:databases/p5-Class-DBI \
+		p5-Class-DBI-Plugin>=0.02:databases/p5-Class-DBI-Plugin \
+		p5-SQL-Abstract>=1.18:databases/p5-SQL-Abstract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-Plugin-Iterator/Makefile b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
index 140f6073bcee..e1d72ffe70f4 100644
--- a/databases/p5-Class-DBI-Plugin-Iterator/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	New iterator for p5-Class-DBI
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
-TEST_DEPENDS=	p5-DBD-SQLite>=1.27:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Class-DBI-Pager>=0:${PORTSDIR}/databases/p5-Class-DBI-Pager
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
+TEST_DEPENDS=	p5-DBD-SQLite>=1.27:databases/p5-DBD-SQLite \
+		p5-Class-DBI-Pager>=0:databases/p5-Class-DBI-Pager
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-Plugin-Pager/Makefile b/databases/p5-Class-DBI-Plugin-Pager/Makefile
index 7b7614c71e5d..f6ad4c476824 100644
--- a/databases/p5-Class-DBI-Plugin-Pager/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Pager/Makefile
@@ -10,13 +10,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to paged queries for CDBI
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-SQL-Abstract>=1.61:${PORTSDIR}/databases/p5-SQL-Abstract \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Data-Page>=0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-Class-DBI-Plugin-AbstractCount>=0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-AbstractCount
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-SQL-Abstract>=1.61:databases/p5-SQL-Abstract \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-Data-Page>=0:databases/p5-Data-Page \
+		p5-Class-DBI-Plugin-AbstractCount>=0:databases/p5-Class-DBI-Plugin-AbstractCount
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Text-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Text-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
index b6282c870634..b9b54bf77cd2 100644
--- a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
+++ b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	More complex retrieve_all() for Class::DBI
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-Plugin-Senna/Makefile b/databases/p5-Class-DBI-Plugin-Senna/Makefile
index ac66a4415326..72843646f268 100644
--- a/databases/p5-Class-DBI-Plugin-Senna/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Senna/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Add Instant Fulltext Search Capability With Senna to Class::DBI
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-	p5-Senna>=0:${PORTSDIR}/textproc/p5-Senna
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+	p5-Senna>=0:textproc/p5-Senna
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-Plugin-Type/Makefile b/databases/p5-Class-DBI-Plugin-Type/Makefile
index 4d64b3283c09..c4f79fe99546 100644
--- a/databases/p5-Class-DBI-Plugin-Type/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Type/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Determine type information for columns
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-Plugin/Makefile b/databases/p5-Class-DBI-Plugin/Makefile
index 997e2eae0225..96f7928b686d 100644
--- a/databases/p5-Class-DBI-Plugin/Makefile
+++ b/databases/p5-Class-DBI-Plugin/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Abstract base class for Class::DBI plugins
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-Replication/Makefile b/databases/p5-Class-DBI-Replication/Makefile
index 93332b99b5a1..d23bf9c062a3 100644
--- a/databases/p5-Class-DBI-Replication/Makefile
+++ b/databases/p5-Class-DBI-Replication/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Class::DBI for replicated database
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-SAK/Makefile b/databases/p5-Class-DBI-SAK/Makefile
index 16eb85248f26..33e7771a4622 100644
--- a/databases/p5-Class-DBI-SAK/Makefile
+++ b/databases/p5-Class-DBI-SAK/Makefile
@@ -12,10 +12,10 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Class::DBI Swiss Army Knife (SAK)
 
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-mixin>=0:${PORTSDIR}/devel/p5-mixin
-RUN_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-Class-DBI-AbstractSearch>=0:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \
-		p5-Class-DBI-Pager>=0:${PORTSDIR}/databases/p5-Class-DBI-Pager
+		p5-mixin>=0:devel/p5-mixin
+RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-Class-DBI-AbstractSearch>=0:databases/p5-Class-DBI-AbstractSearch \
+		p5-Class-DBI-Pager>=0:databases/p5-Class-DBI-Pager
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-Class-DBI-SQLite/Makefile b/databases/p5-Class-DBI-SQLite/Makefile
index 7c055e38b291..e60f04b859a7 100644
--- a/databases/p5-Class-DBI-SQLite/Makefile
+++ b/databases/p5-Class-DBI-SQLite/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension to Class::DBI for sqlite
 
-RUN_DEPENDS=	p5-Ima-DBI>=0:${PORTSDIR}/databases/p5-Ima-DBI \
-		p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-SQL-Statement>=0:${PORTSDIR}/databases/p5-SQL-Statement \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone
+RUN_DEPENDS=	p5-Ima-DBI>=0:databases/p5-Ima-DBI \
+		p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-SQL-Statement>=0:databases/p5-SQL-Statement \
+		p5-Clone>=0:devel/p5-Clone
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-Sweet/Makefile b/databases/p5-Class-DBI-Sweet/Makefile
index 3b71c426846a..4a057f6fb145 100644
--- a/databases/p5-Class-DBI-Sweet/Makefile
+++ b/databases/p5-Class-DBI-Sweet/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extra sweet features for Class::DBI
 
-BUILD_DEPENDS=	p5-Class-DBI>=3.0.12:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Data-Page>=0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-SQL-Abstract>=1.55:${PORTSDIR}/databases/p5-SQL-Abstract
+BUILD_DEPENDS=	p5-Class-DBI>=3.0.12:databases/p5-Class-DBI \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Data-Page>=0:databases/p5-Data-Page \
+		p5-SQL-Abstract>=1.55:databases/p5-SQL-Abstract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-ToSax/Makefile b/databases/p5-Class-DBI-ToSax/Makefile
index d6bb70aa21f8..1deb61ab1ec9 100644
--- a/databases/p5-Class-DBI-ToSax/Makefile
+++ b/databases/p5-Class-DBI-ToSax/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension to Class::DBI for sqlite
 
-RUN_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-		p5-NEXT>=0:${PORTSDIR}/devel/p5-NEXT
+RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
+		p5-NEXT>=0:devel/p5-NEXT
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI-Untaint/Makefile b/databases/p5-Class-DBI-Untaint/Makefile
index 383b274f973c..53f0c9034b81 100644
--- a/databases/p5-Class-DBI-Untaint/Makefile
+++ b/databases/p5-Class-DBI-Untaint/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Class::DBI constraints using CGI::Untaint
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-CGI-Untaint>=0:${PORTSDIR}/www/p5-CGI-Untaint
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-CGI-Untaint>=0:www/p5-CGI-Untaint
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-DBI-mysql/Makefile b/databases/p5-Class-DBI-mysql/Makefile
index 80aadd1c8c4e..8d4b312360b9 100644
--- a/databases/p5-Class-DBI-mysql/Makefile
+++ b/databases/p5-Class-DBI-mysql/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensions to Class::DBI for MySQL
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Class-DBI/Makefile b/databases/p5-Class-DBI/Makefile
index 7c5d55478166..a1224937da34 100644
--- a/databases/p5-Class-DBI/Makefile
+++ b/databases/p5-Class-DBI/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple Database Abstraction
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Trigger>=0:${PORTSDIR}/devel/p5-Class-Trigger \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Ima-DBI>=0:${PORTSDIR}/databases/p5-Ima-DBI \
-		p5-UNIVERSAL-moniker>=0:${PORTSDIR}/devel/p5-UNIVERSAL-moniker
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Trigger>=0:devel/p5-Class-Trigger \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Ima-DBI>=0:databases/p5-Ima-DBI \
+		p5-UNIVERSAL-moniker>=0:devel/p5-UNIVERSAL-moniker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Class-Inflate/Makefile b/databases/p5-Class-Inflate/Makefile
index b275d31026d0..3568fb48eab2 100644
--- a/databases/p5-Class-Inflate/Makefile
+++ b/databases/p5-Class-Inflate/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Inflate HASH Object from Values in Database
 
-RUN_DEPENDS=	p5-Devel-Messenger>=0:${PORTSDIR}/devel/p5-Devel-Messenger
+RUN_DEPENDS=	p5-Devel-Messenger>=0:devel/p5-Devel-Messenger
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Debugger>=0:${PORTSDIR}/devel/p5-Test-Debugger
+BUILD_DEPENDS+=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Test-Debugger>=0:devel/p5-Test-Debugger
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-CouchDB-View/Makefile b/databases/p5-CouchDB-View/Makefile
index 25317a570dad..90001d79ad65 100644
--- a/databases/p5-CouchDB-View/Makefile
+++ b/databases/p5-CouchDB-View/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Handle and create CouchDB views in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Dump-Streamer>=0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/databases/p5-DBD-AnyData/Makefile b/databases/p5-DBD-AnyData/Makefile
index c2c262d3183a..95637c054d73 100644
--- a/databases/p5-DBD-AnyData/Makefile
+++ b/databases/p5-DBD-AnyData/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI access to XML, CSV, and other formats
 
-BUILD_DEPENDS=	p5-AnyData>=0.07:${PORTSDIR}/devel/p5-AnyData \
-		p5-DBI>1:${PORTSDIR}/databases/p5-DBI \
-		p5-SQL-Statement>1:${PORTSDIR}/databases/p5-SQL-Statement
+BUILD_DEPENDS=	p5-AnyData>=0.07:devel/p5-AnyData \
+		p5-DBI>1:databases/p5-DBI \
+		p5-SQL-Statement>1:databases/p5-SQL-Statement
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index 46a00cd201b0..a69dc3c79d05 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -13,9 +13,9 @@ COMMENT=	DBI driver for CSV files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.633:${PORTSDIR}/databases/p5-DBI \
-		p5-SQL-Statement>=1.405:${PORTSDIR}/databases/p5-SQL-Statement \
-		p5-Text-CSV_XS>=1.01:${PORTSDIR}/textproc/p5-Text-CSV_XS
+BUILD_DEPENDS=	p5-DBI>=1.633:databases/p5-DBI \
+		p5-SQL-Statement>=1.405:databases/p5-SQL-Statement \
+		p5-Text-CSV_XS>=1.01:textproc/p5-Text-CSV_XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tar:tgz
diff --git a/databases/p5-DBD-Excel/Makefile b/databases/p5-DBD-Excel/Makefile
index 4808b0c10368..361483195a79 100644
--- a/databases/p5-DBD-Excel/Makefile
+++ b/databases/p5-DBD-Excel/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Class for DBI drivers that acts on Excel files
 
-BUILD_DEPENDS=	p5-SQL-Statement>=0:${PORTSDIR}/databases/p5-SQL-Statement \
-		p5-Spreadsheet-ParseExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \
-		p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-SQL-Statement>=0:databases/p5-SQL-Statement \
+		p5-Spreadsheet-ParseExcel>=0:textproc/p5-Spreadsheet-ParseExcel \
+		p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 EXAMPLESDIR?=	${PREFIX}/share/examples/${PORTNAME}
diff --git a/databases/p5-DBD-Google/Makefile b/databases/p5-DBD-Google/Makefile
index 57878e931ab5..f2db29d1d549 100644
--- a/databases/p5-DBD-Google/Makefile
+++ b/databases/p5-DBD-Google/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Treat Google as a datasource for DBI
 
-BUILD_DEPENDS=	p5-Net-Google>=0:${PORTSDIR}/net/p5-Net-Google \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-SQL-Statement>=0:${PORTSDIR}/databases/p5-SQL-Statement \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-Net-Google>=0:net/p5-Net-Google \
+		p5-URI>=0:net/p5-URI \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-SQL-Statement>=0:databases/p5-SQL-Statement \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile
index 46cc3964b8b9..8977788490dd 100644
--- a/databases/p5-DBD-InterBase/Makefile
+++ b/databases/p5-DBD-InterBase/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	yuri@rivera.ru
 COMMENT=	DBI driver for InterBase/Firebird/Yaffil RDBMS server
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_FIREBIRD=	yes
diff --git a/databases/p5-DBD-LDAP/Makefile b/databases/p5-DBD-LDAP/Makefile
index ca746585d0b4..74e0b1b15477 100644
--- a/databases/p5-DBD-LDAP/Makefile
+++ b/databases/p5-DBD-LDAP/Makefile
@@ -13,8 +13,8 @@ COMMENT=	DBI interface for accessing LDAP servers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-perl-ldap>=0.01:${PORTSDIR}/net/p5-perl-ldap \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-perl-ldap>=0.01:net/p5-perl-ldap \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBD-Mock/Makefile b/databases/p5-DBD-Mock/Makefile
index 3bfcd2382297..e94f8eb9e0ce 100644
--- a/databases/p5-DBD-Mock/Makefile
+++ b/databases/p5-DBD-Mock/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Simple mock DBD implementation used for testing
 
-BUILD_DEPENDS=	p5-DBI>=1.3:${PORTSDIR}/databases/p5-DBI \
-		p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Simple>=0.47:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-DBI>=1.3:databases/p5-DBI \
+		p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+		p5-Test-Simple>=0.47:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBD-Multi/Makefile b/databases/p5-DBD-Multi/Makefile
index 6f14711009cc..b338fb9cc4d7 100644
--- a/databases/p5-DBD-Multi/Makefile
+++ b/databases/p5-DBD-Multi/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Manage Multiple Data Sources with Failover and Load Balancing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.19:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Sys-SigAction>=0.10:${PORTSDIR}/devel/p5-Sys-SigAction
+BUILD_DEPENDS=	p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Sys-SigAction>=0.10:devel/p5-Sys-SigAction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-DBD-SQLite>=1.09:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Pod-Simple>=0:${PORTSDIR}/textproc/p5-Pod-Simple \
-		p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-DBD-SQLite>=1.09:databases/p5-DBD-SQLite \
+		p5-Pod-Simple>=0:textproc/p5-Pod-Simple \
+		p5-Test-Exception>=0.21:devel/p5-Test-Exception \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBD-ODBC/Makefile b/databases/p5-DBD-ODBC/Makefile
index 3bbd70cdf398..7fe53e2e556e 100644
--- a/databases/p5-DBD-ODBC/Makefile
+++ b/databases/p5-DBD-ODBC/Makefile
@@ -13,9 +13,9 @@ COMMENT=	DBD module interfacing the ODBC databases
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.609:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.609:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index 1752df067213..1224f00b0840 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI driver for Oracle RDBMS server
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	OCI8 EXAMPLES
@@ -29,13 +29,13 @@ SHEBANG_FILES=	Oracle.ex/*
 PORTVERSION=	1.19
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 ORACLE_HOME=	${LOCALBASE}/oracle8-client
-BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntst8.a:${PORTSDIR}/databases/oracle8-client
+BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntst8.a:databases/oracle8-client
 CONFIGURE_ARGS=	-V 8.1.7
 PLIST_SUB+=	MKTA=''
 .else
 PORTVERSION=	1.14
 ORACLE_HOME=	${LOCALBASE}/oracle7
-BUILD_DEPENDS+=	${ORACLE_HOME}/rdbms/demo/oracle.mk:${PORTSDIR}/databases/oracle7-client
+BUILD_DEPENDS+=	${ORACLE_HOME}/rdbms/demo/oracle.mk:databases/oracle7-client
 CONFIGURE_ARGS=	-m ${ORACLE_HOME}/rdbms/demo/oracle.mk
 PLIST_SUB+=	MKTA='@comment '
 .endif
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index d1dba3db5ab6..ad771a1d06c5 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Provides access to PostgreSQL databases through the DBI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.614:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.614:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 pgsql
diff --git a/databases/p5-DBD-PgLite/Makefile b/databases/p5-DBD-PgLite/Makefile
index 9b31b1956b18..293368aecfad 100644
--- a/databases/p5-DBD-PgLite/Makefile
+++ b/databases/p5-DBD-PgLite/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	PostgreSQL emulation mode for SQLite
 
-RUN_DEPENDS=	p5-DBD-SQLite>=1.0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Text-Iconv>=1.0:${PORTSDIR}/converters/p5-Text-Iconv \
-		p5-DBI>=1.30:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBD-SQLite>=1.0:databases/p5-DBD-SQLite \
+		p5-Text-Iconv>=1.0:converters/p5-Text-Iconv \
+		p5-DBI>=1.30:databases/p5-DBI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBD-PgPP/Makefile b/databases/p5-DBD-PgPP/Makefile
index d6d608401075..f7ca5cdb88d7 100644
--- a/databases/p5-DBD-PgPP/Makefile
+++ b/databases/p5-DBD-PgPP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pure Perl PostgreSQL driver for the DBI
 
-BUILD_DEPENDS+=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS+=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS+=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS+=	p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBD-SQLite/Makefile b/databases/p5-DBD-SQLite/Makefile
index a8b5075f8832..71a2f05a61f4 100644
--- a/databases/p5-DBD-SQLite/Makefile
+++ b/databases/p5-DBD-SQLite/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provides access to SQLite3 databases through the DBI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.57:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.57:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	limit:^[0-9\.]*$$
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	BUNDLED_SQLITE
 OPTIONS_DEFAULT=BUNDLED_SQLITE
 
 BUNDLED_SQLITE_DESC=		Use bundled SQLite (otherwise, from databases/sqlite3)
-BUNDLED_SQLITE_LIB_DEPENDS_OFF=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+BUNDLED_SQLITE_LIB_DEPENDS_OFF=	libsqlite3.so:databases/sqlite3
 BUNDLED_SQLITE_CONFIGURE_OFF=	USE_LOCAL_SQLITE=0 SQLITE_LOCATION=${LOCALBASE}
 
 post-patch-BUNDLED_SQLITE-off:
diff --git a/databases/p5-DBD-SQLite2/Makefile b/databases/p5-DBD-SQLite2/Makefile
index c34ded811e39..3f9ead5be90e 100644
--- a/databases/p5-DBD-SQLite2/Makefile
+++ b/databases/p5-DBD-SQLite2/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Provides access to SQLite2 databases through the DBI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 8b6d6f751169..18968b29b19b 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Sybase DBI driver for Perl 5
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-LIB_DEPENDS=	libct.so:${PORTSDIR}/databases/freetds
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+LIB_DEPENDS=	libct.so:databases/freetds
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 CONFIGURE_ENV=	SYBASE=${LOCALBASE}
 USES=		gettext perl5
diff --git a/databases/p5-DBD-XBase/Makefile b/databases/p5-DBD-XBase/Makefile
index 8f9640ebff96..a932a81f8a69 100644
--- a/databases/p5-DBD-XBase/Makefile
+++ b/databases/p5-DBD-XBase/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides access to XBase (dBase, Fox*) database files through DBI
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBD-cego/Makefile b/databases/p5-DBD-cego/Makefile
index 34ebc3af7d1e..1b2e793e1ecc 100644
--- a/databases/p5-DBD-cego/Makefile
+++ b/databases/p5-DBD-cego/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Cego DBI driver for Perl 5
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-DBI>=1.631:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=1.631:${PORTSDIR}/databases/p5-DBI
-LIB_DEPENDS=	libcego.so:${PORTSDIR}/databases/cego
+BUILD_DEPENDS=	p5-DBI>=1.631:databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=1.631:databases/p5-DBI
+LIB_DEPENDS=	libcego.so:databases/cego
 
 .if defined(.PARSEDIR)
 USES=		gmake
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index ff6cebe5c617..b3d655fa6229 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -13,9 +13,9 @@ COMMENT?=	MySQL driver for the Perl5 Database Interface (DBI)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.08:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.08:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 CONFLICTS_INSTALL?=	p5-DBD-mysql[45][0-9]-[0-9]*
 
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 USES=		perl5
 
 OPTIONS_DEFINE=	SSL
-SSL_BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
+SSL_BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 SSL_RUN_DEPENDS=	${SSL_BUILD_DEPENDS}
 SSL_CONFIGURE_ON=	--ssl
 
diff --git a/databases/p5-DBI-Shell/Makefile b/databases/p5-DBI-Shell/Makefile
index 84279ef7767b..ddcfeae6758e 100644
--- a/databases/p5-DBI-Shell/Makefile
+++ b/databases/p5-DBI-Shell/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interactive command shell for the DBI
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Text-Reform>=0:${PORTSDIR}/textproc/p5-Text-Reform \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-IO-Tee>=0:${PORTSDIR}/devel/p5-IO-Tee
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Text-Reform>=0:textproc/p5-Text-Reform \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+		p5-IO-Tee>=0:devel/p5-IO-Tee
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index 579a8ba2987c..984d4c10078d 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 
 SHEBANG_FILES=	dbixs_rev.pl
 
-PROXY_BUILD_DEPENDS=	p5-PlRPC>=0.2001:${PORTSDIR}/net/p5-PlRPC
-PROXY_RUN_DEPENDS=	p5-PlRPC>=0.2001:${PORTSDIR}/net/p5-PlRPC
+PROXY_BUILD_DEPENDS=	p5-PlRPC>=0.2001:net/p5-PlRPC
+PROXY_RUN_DEPENDS=	p5-PlRPC>=0.2001:net/p5-PlRPC
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBICx-Deploy/Makefile b/databases/p5-DBICx-Deploy/Makefile
index 61851d6deb81..06c00d3c2fd7 100644
--- a/databases/p5-DBICx-Deploy/Makefile
+++ b/databases/p5-DBICx-Deploy/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl 5 module to deploy a DBIx::Class schema
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.07003:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
-RUN_DEPENDS=	p5-DBIx-Class>=0.07003:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator
+BUILD_DEPENDS=	p5-DBIx-Class>=0.07003:databases/p5-DBIx-Class \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
+RUN_DEPENDS=	p5-DBIx-Class>=0.07003:databases/p5-DBIx-Class \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBICx-MapMaker/Makefile b/databases/p5-DBICx-MapMaker/Makefile
index 8267838a9ddf..f5d0ef02e9fd 100644
--- a/databases/p5-DBICx-MapMaker/Makefile
+++ b/databases/p5-DBICx-MapMaker/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl 5 module to automatically create a DBIx::Class mapping table
 
-RUN_DEPENDS=	p5-Moose>=0.39:${PORTSDIR}/devel/p5-Moose
-BUILD_DEPENDS=	p5-DBIx-Class>=0.07003:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBICx-TestDatabase>=0.02:${PORTSDIR}/databases/p5-DBICx-TestDatabase \
-		p5-Moose>=0.39:${PORTSDIR}/devel/p5-Moose
+RUN_DEPENDS=	p5-Moose>=0.39:devel/p5-Moose
+BUILD_DEPENDS=	p5-DBIx-Class>=0.07003:databases/p5-DBIx-Class \
+		p5-DBICx-TestDatabase>=0.02:databases/p5-DBICx-TestDatabase \
+		p5-Moose>=0.39:devel/p5-Moose
 
 USES=		perl5
 USE_PERL5=	configure
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/p5-DBICx-Sugar/Makefile b/databases/p5-DBICx-Sugar/Makefile
index d570c06bcb91..417130c8ceb4 100644
--- a/databases/p5-DBICx-Sugar/Makefile
+++ b/databases/p5-DBICx-Sugar/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Just some syntax sugar for DBIx::Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator
+BUILD_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Modern>=0:${PORTSDIR}/devel/p5-Test-Modern \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBIx-Class-Schema-Loader>=0.07002:${PORTSDIR}/databases/p5-DBIx-Class-Schema-Loader \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-LoadableClass>0:${PORTSDIR}/devel/p5-MooseX-Types-LoadableClass
+TEST_DEPENDS=	p5-Test-Modern>=0:devel/p5-Test-Modern \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBIx-Class-Schema-Loader>=0.07002:databases/p5-DBIx-Class-Schema-Loader \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types-LoadableClass>0:devel/p5-MooseX-Types-LoadableClass
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBICx-TestDatabase/Makefile b/databases/p5-DBICx-TestDatabase/Makefile
index 38b160c8e1b5..1674f0757a8c 100644
--- a/databases/p5-DBICx-TestDatabase/Makefile
+++ b/databases/p5-DBICx-TestDatabase/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Module to create temporary database from a DBIx::Class::Schema
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.07005:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator
-RUN_DEPENDS=	p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-File-Temp>0:${PORTSDIR}/devel/p5-File-Temp
+BUILD_DEPENDS=	p5-DBIx-Class>=0.07005:databases/p5-DBIx-Class \
+		p5-DBD-SQLite>=1.12:databases/p5-DBD-SQLite \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator
+RUN_DEPENDS=	p5-DBD-SQLite>=1.12:databases/p5-DBD-SQLite \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator \
+		p5-File-Temp>0:devel/p5-File-Temp
 
 USES=		perl5
 USE_PERL5=	configure
@@ -28,7 +28,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/p5-DBICx-TxnInsert/Makefile b/databases/p5-DBICx-TxnInsert/Makefile
index cd5b14fda52b..5e8b0f4cad0a 100644
--- a/databases/p5-DBICx-TxnInsert/Makefile
+++ b/databases/p5-DBICx-TxnInsert/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Wrap all inserts into transaction
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBD-Mock>=0:${PORTSDIR}/databases/p5-DBD-Mock
+BUILD_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+		p5-DBD-Mock>=0:databases/p5-DBD-Mock
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Compile>=0.08:${PORTSDIR}/devel/p5-Test-Compile \
-		p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Compile>=0.08:devel/p5-Test-Compile \
+		p5-Test-Pod>=1.22:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index 2ddfe950c134..d420ef575b88 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -12,11 +12,11 @@ DISTNAME=	libdbiwrapper-perl-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for generic DBI database access
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel \
+		p5-IO-stringy>=0:devel/p5-IO-stringy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Abstract/Makefile b/databases/p5-DBIx-Abstract/Makefile
index 66148c60dfeb..f10df94e7805 100644
--- a/databases/p5-DBIx-Abstract/Makefile
+++ b/databases/p5-DBIx-Abstract/Makefile
@@ -12,11 +12,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	nistor@snickers.org
 COMMENT=	DBIx::Abstract - DBI SQL abstraction
 
-BUILD_DEPENDS=	p5-Check-ISA>=0:${PORTSDIR}/devel/p5-Check-ISA \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-Check-ISA>=0:${PORTSDIR}/devel/p5-Check-ISA \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+BUILD_DEPENDS=	p5-Check-ISA>=0:devel/p5-Check-ISA \
+		p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS=	p5-Check-ISA>=0:devel/p5-Check-ISA \
+		p5-DBI>=0:databases/p5-DBI
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Admin-CreateTable/Makefile b/databases/p5-DBIx-Admin-CreateTable/Makefile
index f9b75b2df4c4..1cbe979ffd3a 100644
--- a/databases/p5-DBIx-Admin-CreateTable/Makefile
+++ b/databases/p5-DBIx-Admin-CreateTable/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Create and drop tables, primary indexes, and sequences
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Moo>=1.004002:${PORTSDIR}/devel/p5-Moo
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Moo>=1.004002:devel/p5-Moo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Version>=1.002003:${PORTSDIR}/devel/p5-Test-Version
+TEST_DEPENDS=	p5-Test-Version>=1.002003:devel/p5-Test-Version
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Admin-DSNManager/Makefile b/databases/p5-DBIx-Admin-DSNManager/Makefile
index ed8115b1a68f..a4ba46c4bfe0 100644
--- a/databases/p5-DBIx-Admin-DSNManager/Makefile
+++ b/databases/p5-DBIx-Admin-DSNManager/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Manage a file of DSNs, for both testing and production
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Config-Tiny>=2.12:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Moo>=1.004002:${PORTSDIR}/devel/p5-Moo
+BUILD_DEPENDS=	p5-Config-Tiny>=2.12:devel/p5-Config-Tiny \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-File-Slurp>=9999.13:devel/p5-File-Slurp \
+		p5-Moo>=1.004002:devel/p5-Moo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Version>=1.002003:${PORTSDIR}/devel/p5-Test-Version \
-		p5-Try-Tiny>=0.06:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Test-Version>=1.002003:devel/p5-Test-Version \
+		p5-Try-Tiny>=0.06:lang/p5-Try-Tiny
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Admin-TableInfo/Makefile b/databases/p5-DBIx-Admin-TableInfo/Makefile
index 529210e49790..c51b3218c4df 100644
--- a/databases/p5-DBIx-Admin-TableInfo/Makefile
+++ b/databases/p5-DBIx-Admin-TableInfo/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Wrapper for all of table_info(), column_info(), *_key_info()
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBIx-Admin-CreateTable>=2.10:${PORTSDIR}/databases/p5-DBIx-Admin-CreateTable \
-		p5-DBIx-Admin-DSNManager>=2.01:${PORTSDIR}/databases/p5-DBIx-Admin-DSNManager \
-		p5-Data-Dumper-Concise>=2.022:${PORTSDIR}/devel/p5-Data-Dumper-Concise \
-		p5-Lingua-EN-PluralToSingular>=0.14:${PORTSDIR}/textproc/p5-Lingua-EN-PluralToSingular \
-		p5-Moo>=1.004002:${PORTSDIR}/devel/p5-Moo \
-		p5-Text-TabularDisplay>=1.38:${PORTSDIR}/textproc/p5-Text-TabularDisplay
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-DBIx-Admin-CreateTable>=2.10:databases/p5-DBIx-Admin-CreateTable \
+		p5-DBIx-Admin-DSNManager>=2.01:databases/p5-DBIx-Admin-DSNManager \
+		p5-Data-Dumper-Concise>=2.022:devel/p5-Data-Dumper-Concise \
+		p5-Lingua-EN-PluralToSingular>=0.14:textproc/p5-Lingua-EN-PluralToSingular \
+		p5-Moo>=1.004002:devel/p5-Moo \
+		p5-Text-TabularDisplay>=1.38:textproc/p5-Text-TabularDisplay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Version>=1.002003:${PORTSDIR}/devel/p5-Test-Version
+TEST_DEPENDS=	p5-Test-Version>=1.002003:devel/p5-Test-Version
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-AnyDBD/Makefile b/databases/p5-DBIx-AnyDBD/Makefile
index f485d9d545b9..83c1c41cc40b 100644
--- a/databases/p5-DBIx-AnyDBD/Makefile
+++ b/databases/p5-DBIx-AnyDBD/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBD independent class
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Browse/Makefile b/databases/p5-DBIx-Browse/Makefile
index ad88873f0080..1bd0d380cfa7 100644
--- a/databases/p5-DBIx-Browse/Makefile
+++ b/databases/p5-DBIx-Browse/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBIx::Browse - Perl extension to browse tables
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-AsFdat/Makefile b/databases/p5-DBIx-Class-AsFdat/Makefile
index 892bbeca7a91..397371b3a22a 100644
--- a/databases/p5-DBIx-Class-AsFdat/Makefile
+++ b/databases/p5-DBIx-Class-AsFdat/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension like CDBI::Plugin::AsFdat
 
 RUN_DEPENDS=	\
-	p5-DBIx-Class>0:${PORTSDIR}/databases/p5-DBIx-Class
+	p5-DBIx-Class>0:databases/p5-DBIx-Class
 BUILD_DEPENDS=	\
-	p5-DBIx-Class>0:${PORTSDIR}/databases/p5-DBIx-Class
-TEST_DEPENDS=	p5-Test-Declare>=0:${PORTSDIR}/devel/p5-Test-Declare \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic \
-		p5-DateTime-Format-SQLite>=0:${PORTSDIR}/devel/p5-DateTime-Format-SQLite
+	p5-DBIx-Class>0:databases/p5-DBIx-Class
+TEST_DEPENDS=	p5-Test-Declare>=0:devel/p5-Test-Declare \
+		p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic \
+		p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-BitField/Makefile b/databases/p5-DBIx-Class-BitField/Makefile
index 5297c0adc7e5..4c94ed2a19b6 100644
--- a/databases/p5-DBIx-Class-BitField/Makefile
+++ b/databases/p5-DBIx-Class-BitField/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store multiple boolean fields in one integer field
 
-RUN_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class
+RUN_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class
 BUILD_DEPENDS=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-Candy/Makefile b/databases/p5-DBIx-Class-Candy/Makefile
index e5f39c84055d..c8365e7c5950 100644
--- a/databases/p5-DBIx-Class-Candy/Makefile
+++ b/databases/p5-DBIx-Class-Candy/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Sugar for your favorite ORM, DBIx::Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.08123:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-String-CamelCase>=0:${PORTSDIR}/textproc/p5-String-CamelCase
+BUILD_DEPENDS=	p5-DBIx-Class>=0.08123:databases/p5-DBIx-Class \
+		p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+		p5-String-CamelCase>=0:textproc/p5-String-CamelCase
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/databases/p5-DBIx-Class-Cursor-Cached/Makefile b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
index 4537915f8880..0b6b626dc44f 100644
--- a/databases/p5-DBIx-Class-Cursor-Cached/Makefile
+++ b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Cursor class with built-in caching support
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=6.0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-DBIx-Class>=0.08124:${PORTSDIR}/databases/p5-DBIx-Class
+BUILD_DEPENDS=	p5-Carp-Clan>=6.0:devel/p5-Carp-Clan \
+		p5-DBIx-Class>=0.08124:databases/p5-DBIx-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-CustomPrefetch/Makefile b/databases/p5-DBIx-Class-CustomPrefetch/Makefile
index 20e600922188..3d098ddcbf09 100644
--- a/databases/p5-DBIx-Class-CustomPrefetch/Makefile
+++ b/databases/p5-DBIx-Class-CustomPrefetch/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Custom prefetches for DBIx::Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Load>=0:${PORTSDIR}/devel/p5-Module-Load \
-		p5-DBIx-Class-VirtualColumns>=0:${PORTSDIR}/databases/p5-DBIx-Class-VirtualColumns \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-DBIx-Class>=0.081:${PORTSDIR}/databases/p5-DBIx-Class
-RUN_DEPENDS=	p5-Module-Load>=0:${PORTSDIR}/devel/p5-Module-Load \
-		p5-DBIx-Class-VirtualColumns>=0:${PORTSDIR}/databases/p5-DBIx-Class-VirtualColumns \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-DBIx-Class>=0.081:${PORTSDIR}/databases/p5-DBIx-Class
+BUILD_DEPENDS=	p5-Module-Load>=0:devel/p5-Module-Load \
+		p5-DBIx-Class-VirtualColumns>=0:databases/p5-DBIx-Class-VirtualColumns \
+		p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-DBIx-Class>=0.081:databases/p5-DBIx-Class
+RUN_DEPENDS=	p5-Module-Load>=0:devel/p5-Module-Load \
+		p5-DBIx-Class-VirtualColumns>=0:databases/p5-DBIx-Class-VirtualColumns \
+		p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-DBIx-Class>=0.081:databases/p5-DBIx-Class
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-DateTime-Epoch/Makefile b/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
index 881888a818b6..eb373c937b7b 100644
--- a/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
+++ b/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Automatic inflation/deflation of epoch-based DateTime objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DBIx-Class>=0.08103:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBIx-Class-TimeStamp>=0.07:${PORTSDIR}/databases/p5-DBIx-Class-TimeStamp
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DBIx-Class>=0.08103:databases/p5-DBIx-Class \
+		p5-DBIx-Class-TimeStamp>=0.07:databases/p5-DBIx-Class-TimeStamp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBICx-TestDatabase>=0:${PORTSDIR}/databases/p5-DBICx-TestDatabase \
-		p5-DateTime-Format-SQLite>=0:${PORTSDIR}/devel/p5-DateTime-Format-SQLite
+TEST_DEPENDS=	p5-DBICx-TestDatabase>=0:databases/p5-DBICx-TestDatabase \
+		p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-DeploymentHandler/Makefile b/databases/p5-DBIx-Class-DeploymentHandler/Makefile
index 099324c53b80..e87fe7992a3a 100644
--- a/databases/p5-DBIx-Class-DeploymentHandler/Makefile
+++ b/databases/p5-DBIx-Class-DeploymentHandler/Makefile
@@ -13,19 +13,19 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Carp-Clan>0:${PORTSDIR}/devel/p5-Carp-Clan \
-	p5-Context-Preserve>0:${PORTSDIR}/devel/p5-Context-Preserve \
-	p5-DBIx-Class>=0.08121:${PORTSDIR}/databases/p5-DBIx-Class \
-	p5-Log-Contextual>=0.005005:${PORTSDIR}/devel/p5-Log-Contextual \
-	p5-Method-Signatures-Simple>=0.05:${PORTSDIR}/devel/p5-Method-Signatures-Simple \
-	p5-Moo>=1.003:${PORTSDIR}/devel/p5-Moo \
-	p5-Moose>=1.0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Role-Parameterized>=0.18:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-	p5-SQL-Translator>=0.11005:${PORTSDIR}/databases/p5-SQL-Translator \
-	p5-Sub-Exporter-Progressive>0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive \
-	p5-Text-Brew>=0.02:${PORTSDIR}/textproc/p5-Text-Brew \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-namespace-autoclean>0:${PORTSDIR}/devel/p5-namespace-autoclean
+	p5-Carp-Clan>0:devel/p5-Carp-Clan \
+	p5-Context-Preserve>0:devel/p5-Context-Preserve \
+	p5-DBIx-Class>=0.08121:databases/p5-DBIx-Class \
+	p5-Log-Contextual>=0.005005:devel/p5-Log-Contextual \
+	p5-Method-Signatures-Simple>=0.05:devel/p5-Method-Signatures-Simple \
+	p5-Moo>=1.003:devel/p5-Moo \
+	p5-Moose>=1.0:devel/p5-Moose \
+	p5-MooseX-Role-Parameterized>=0.18:devel/p5-MooseX-Role-Parameterized \
+	p5-SQL-Translator>=0.11005:databases/p5-SQL-Translator \
+	p5-Sub-Exporter-Progressive>0:devel/p5-Sub-Exporter-Progressive \
+	p5-Text-Brew>=0.02:textproc/p5-Text-Brew \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-namespace-autoclean>0:devel/p5-namespace-autoclean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Class-DigestColumns/Makefile b/databases/p5-DBIx-Class-DigestColumns/Makefile
index 0d182d510f90..3690179206e4 100644
--- a/databases/p5-DBIx-Class-DigestColumns/Makefile
+++ b/databases/p5-DBIx-Class-DigestColumns/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Automatic digest columns
 
-RUN_DEPENDS=	p5-DBIx-Class>=0.06002:${PORTSDIR}/databases/p5-DBIx-Class
+RUN_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Class-DynamicDefault/Makefile b/databases/p5-DBIx-Class-DynamicDefault/Makefile
index 990200d7e336..2d50ca4ab054 100644
--- a/databases/p5-DBIx-Class-DynamicDefault/Makefile
+++ b/databases/p5-DBIx-Class-DynamicDefault/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Automatically set and update fields
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.08127:${PORTSDIR}/databases/p5-DBIx-Class
+BUILD_DEPENDS=	p5-DBIx-Class>=0.08127:databases/p5-DBIx-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBICx-TestDatabase>=0:${PORTSDIR}/databases/p5-DBICx-TestDatabase
+TEST_DEPENDS=	p5-DBICx-TestDatabase>=0:databases/p5-DBICx-TestDatabase
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-DynamicSubclass/Makefile b/databases/p5-DBIx-Class-DynamicSubclass/Makefile
index 9c7a05dc718a..46707489ae0c 100644
--- a/databases/p5-DBIx-Class-DynamicSubclass/Makefile
+++ b/databases/p5-DBIx-Class-DynamicSubclass/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Use dynamic subclassing with DBIx::Class
 
-RUN_DEPENDS=	p5-DBIx-Class>=0.07003:${PORTSDIR}/databases/p5-DBIx-Class
+RUN_DEPENDS=	p5-DBIx-Class>=0.07003:databases/p5-DBIx-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Class-EncodeColumns/Makefile b/databases/p5-DBIx-Class-EncodeColumns/Makefile
index 97486c2984b3..59c3c7bce8d5 100644
--- a/databases/p5-DBIx-Class-EncodeColumns/Makefile
+++ b/databases/p5-DBIx-Class-EncodeColumns/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Handle column encodings
 
-RUN_DEPENDS=	p5-DBIx-Class>=0.06002:${PORTSDIR}/databases/p5-DBIx-Class
-BUILD_DEPENDS=	p5-DBIx-Class>=0.06002:${PORTSDIR}/databases/p5-DBIx-Class
+RUN_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class
+BUILD_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-DBIx-Class-EncodedColumn/Makefile b/databases/p5-DBIx-Class-EncodedColumn/Makefile
index 68bdcf00b090..9744e338f290 100644
--- a/databases/p5-DBIx-Class-EncodedColumn/Makefile
+++ b/databases/p5-DBIx-Class-EncodedColumn/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Automatically encode columns
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.06002:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-SQL-Translator>=0.09.003:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-Sub-Name>=0.04:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class \
+		p5-SQL-Translator>=0.09.003:databases/p5-SQL-Translator \
+		p5-Sub-Name>=0.04:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Dir-Self>=0:${PORTSDIR}/devel/p5-Dir-Self \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Dir-Self>=0:devel/p5-Dir-Self \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -30,11 +30,11 @@ OPTIONS_DEFAULT=BLOWFISH OPENPGP
 BLOWFISH_DESC=	Blowfish support
 OPENPGP_DESC=	Crypt::OpenPGP (gpg) support
 
-BLOWFISH_BUILD_DEPENDS=	p5-Crypt-Eksblowfish>=0:${PORTSDIR}/security/p5-Crypt-Eksblowfish
-BLOWFISH_RUN_DEPENDS=	p5-Crypt-Eksblowfish>=0:${PORTSDIR}/security/p5-Crypt-Eksblowfish
-OPENPGP_BUILD_DEPENDS=	p5-Crypt-CAST5_PP>=0:${PORTSDIR}/security/p5-Crypt-CAST5_PP \
-			p5-Crypt-OpenPGP>=0:${PORTSDIR}/security/p5-Crypt-OpenPGP
-OPENPGP_RUN_DEPENDS=	p5-Crypt-CAST5_PP>=0:${PORTSDIR}/security/p5-Crypt-CAST5_PP \
-			p5-Crypt-OpenPGP>=0:${PORTSDIR}/security/p5-Crypt-OpenPGP
+BLOWFISH_BUILD_DEPENDS=	p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish
+BLOWFISH_RUN_DEPENDS=	p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish
+OPENPGP_BUILD_DEPENDS=	p5-Crypt-CAST5_PP>=0:security/p5-Crypt-CAST5_PP \
+			p5-Crypt-OpenPGP>=0:security/p5-Crypt-OpenPGP
+OPENPGP_RUN_DEPENDS=	p5-Crypt-CAST5_PP>=0:security/p5-Crypt-CAST5_PP \
+			p5-Crypt-OpenPGP>=0:security/p5-Crypt-OpenPGP
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBIx-Class-Fixtures/Makefile b/databases/p5-DBIx-Class-Fixtures/Makefile
index 4f4a08451fd1..59afea2c0b99 100644
--- a/databases/p5-DBIx-Class-Fixtures/Makefile
+++ b/databases/p5-DBIx-Class-Fixtures/Makefile
@@ -14,27 +14,27 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Grouped>=0.1001:${PORTSDIR}/devel/p5-Class-Accessor-Grouped \
-	p5-Config-Any>=0.23:${PORTSDIR}/devel/p5-Config-Any \
-	p5-DBIx-Class>=0.08102:${PORTSDIR}/databases/p5-DBIx-Class \
-	p5-DBIx-Class-Schema-Loader>=0.07035:${PORTSDIR}/databases/p5-DBIx-Class-Schema-Loader \
-	p5-Data-Dump-Streamer>=2.05:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-	p5-Data-Visitor>=0.3:${PORTSDIR}/devel/p5-Data-Visitor \
-	p5-DateTime>=1.03:${PORTSDIR}/devel/p5-DateTime \
-	p5-DateTime-Format-MySQL>0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-	p5-DateTime-Format-Pg>0:${PORTSDIR}/devel/p5-DateTime-Format-Pg \
-	p5-DateTime-Format-SQLite>=0.1:${PORTSDIR}/devel/p5-DateTime-Format-SQLite \
-	p5-File-Copy-Recursive>=0.38:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-	p5-Hash-Merge>=0.1:${PORTSDIR}/textproc/p5-Hash-Merge \
-	p5-IO-All>=0.85:${PORTSDIR}/devel/p5-IO-All \
-	p5-YAML-Syck>=1.27:${PORTSDIR}/textproc/p5-YAML-Syck \
-	p5-Path-Class>=0.32:${PORTSDIR}/devel/p5-Path-Class
+	p5-Class-Accessor-Grouped>=0.1001:devel/p5-Class-Accessor-Grouped \
+	p5-Config-Any>=0.23:devel/p5-Config-Any \
+	p5-DBIx-Class>=0.08102:databases/p5-DBIx-Class \
+	p5-DBIx-Class-Schema-Loader>=0.07035:databases/p5-DBIx-Class-Schema-Loader \
+	p5-Data-Dump-Streamer>=2.05:devel/p5-Data-Dump-Streamer \
+	p5-Data-Visitor>=0.3:devel/p5-Data-Visitor \
+	p5-DateTime>=1.03:devel/p5-DateTime \
+	p5-DateTime-Format-MySQL>0:devel/p5-DateTime-Format-MySQL \
+	p5-DateTime-Format-Pg>0:devel/p5-DateTime-Format-Pg \
+	p5-DateTime-Format-SQLite>=0.1:devel/p5-DateTime-Format-SQLite \
+	p5-File-Copy-Recursive>=0.38:devel/p5-File-Copy-Recursive \
+	p5-Hash-Merge>=0.1:textproc/p5-Hash-Merge \
+	p5-IO-All>=0.85:devel/p5-IO-All \
+	p5-YAML-Syck>=1.27:textproc/p5-YAML-Syck \
+	p5-Path-Class>=0.32:devel/p5-Path-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-DBIx-Class-InflateColumn-FS>=0.01007:${PORTSDIR}/databases/p5-DBIx-Class-InflateColumn-FS \
-	p5-Test-Compile>0:${PORTSDIR}/devel/p5-Test-Compile \
-	p5-Test-TempDir-Tiny>0:${PORTSDIR}/devel/p5-Test-TempDir-Tiny
+	p5-DBD-SQLite>=1.12:databases/p5-DBD-SQLite \
+	p5-DBIx-Class-InflateColumn-FS>=0.01007:databases/p5-DBIx-Class-InflateColumn-FS \
+	p5-Test-Compile>0:devel/p5-Test-Compile \
+	p5-Test-TempDir-Tiny>0:devel/p5-Test-TempDir-Tiny
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-FrozenColumns/Makefile b/databases/p5-DBIx-Class-FrozenColumns/Makefile
index 57477c8978b4..20c19eee3371 100644
--- a/databases/p5-DBIx-Class-FrozenColumns/Makefile
+++ b/databases/p5-DBIx-Class-FrozenColumns/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Store virtual columns inside another column
 
-RUN_DEPENDS=	p5-DBIx-Class>=0.07003:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Storable>=2.15:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS=	p5-DBIx-Class>=0.07003:databases/p5-DBIx-Class \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Storable>=2.15:devel/p5-Storable
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Class-Helpers/Makefile b/databases/p5-DBIx-Class-Helpers/Makefile
index 20b48da298fd..912e98be4782 100644
--- a/databases/p5-DBIx-Class-Helpers/Makefile
+++ b/databases/p5-DBIx-Class-Helpers/Makefile
@@ -14,23 +14,23 @@ COMMENT=	Simplify the common case stuff for DBIx::Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-DBIx-Class>=0.08123:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBIx-Class-Candy>=0:${PORTSDIR}/databases/p5-DBIx-Class-Candy \
-		p5-DBIx-Introspector>=0:${PORTSDIR}/databases/p5-DBIx-Introspector \
-		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-String-CamelCase>=0:${PORTSDIR}/textproc/p5-String-CamelCase \
-		p5-Sub-Exporter-Progressive>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive \
-		p5-Text-Brew>=0:${PORTSDIR}/textproc/p5-Text-Brew \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+RUN_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+		p5-DBIx-Class>=0.08123:databases/p5-DBIx-Class \
+		p5-DBIx-Class-Candy>=0:databases/p5-DBIx-Class-Candy \
+		p5-DBIx-Introspector>=0:databases/p5-DBIx-Introspector \
+		p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-String-CamelCase>=0:textproc/p5-String-CamelCase \
+		p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive \
+		p5-Text-Brew>=0:textproc/p5-Text-Brew \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 BUILD_DEPENDS=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DateTime-Format-SQLite>=0:${PORTSDIR}/devel/p5-DateTime-Format-SQLite
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception \
+		p5-Test-Simple>=0:devel/p5-Test-Simple \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
index 0cb90cfd2db8..88256829c8d6 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fw@moov.de
 COMMENT=	Inflate/deflate columns to Authen::Passphrase instances
 
-RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:${PORTSDIR}/databases/p5-DBIx-Class-DynamicDefault \
-		p5-DBIx-Class>=0.08009:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Authen-Passphrase>=0:${PORTSDIR}/security/p5-Authen-Passphrase
-BUILD_DEPENDS:=	p5-DBIx-Class-DynamicDefault>=0.03:${PORTSDIR}/databases/p5-DBIx-Class-DynamicDefault \
-		p5-DBIx-Class>=0.08009:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Authen-Passphrase>=0:${PORTSDIR}/security/p5-Authen-Passphrase
+RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:databases/p5-DBIx-Class-DynamicDefault \
+		p5-DBIx-Class>=0.08009:databases/p5-DBIx-Class \
+		p5-Authen-Passphrase>=0:security/p5-Authen-Passphrase
+BUILD_DEPENDS:=	p5-DBIx-Class-DynamicDefault>=0.03:databases/p5-DBIx-Class-DynamicDefault \
+		p5-DBIx-Class>=0.08009:databases/p5-DBIx-Class \
+		p5-Authen-Passphrase>=0:security/p5-Authen-Passphrase
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
index 54d6e271adb4..1f05b2bfec77 100644
--- a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to {in,de}flate columns to Path::Class::File objects
 
 RUN_DEPENDS=	\
-	p5-DBIx-Class>=0.08:${PORTSDIR}/databases/p5-DBIx-Class \
-	p5-DBIx-Class-UUIDColumns>=0.02005:${PORTSDIR}/databases/p5-DBIx-Class-UUIDColumns \
-	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class
+	p5-DBIx-Class>=0.08:databases/p5-DBIx-Class \
+	p5-DBIx-Class-UUIDColumns>=0.02005:databases/p5-DBIx-Class-UUIDColumns \
+	p5-Path-Class>0:devel/p5-Path-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-DBICx-TestDatabase>=0:${PORTSDIR}/databases/p5-DBICx-TestDatabase
+TEST_DEPENDS=	p5-DBICx-TestDatabase>=0:databases/p5-DBICx-TestDatabase
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-InflateColumn-IP/Makefile b/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
index 0be708ef5b39..a0d0b0a21cb2 100644
--- a/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Component to auto-create NetAddr::IP objects from columns
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.06002:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS=	p5-DBIx-Class>=0.06002:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+BUILD_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class \
+		p5-NetAddr-IP>=4.00.7:net-mgmt/p5-NetAddr-IP
+RUN_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class \
+		p5-NetAddr-IP>=4.00.7:net-mgmt/p5-NetAddr-IP
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-IntrospectableM2M/Makefile b/databases/p5-DBIx-Class-IntrospectableM2M/Makefile
index 3db3acfb0c1c..d46c21396bd8 100644
--- a/databases/p5-DBIx-Class-IntrospectableM2M/Makefile
+++ b/databases/p5-DBIx-Class-IntrospectableM2M/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Introspect many-to-many shortcuts
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-DBIx-Class>=0.06002:${PORTSDIR}/databases/p5-DBIx-Class
+RUN_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-Loader/Makefile b/databases/p5-DBIx-Class-Loader/Makefile
index a8f7337fb3db..72faaea8f34c 100644
--- a/databases/p5-DBIx-Class-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Loader/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dynamic definition of DBIx::Class sub classes
 
-BUILD_DEPENDS=	p5-DBI>=1.3:${PORTSDIR}/databases/p5-DBI \
-		p5-DBIx-Class>=0.04001:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-UNIVERSAL-require>=0.10:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-DBI>=1.3:databases/p5-DBI \
+		p5-DBIx-Class>=0.04001:databases/p5-DBIx-Class \
+		p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+		p5-UNIVERSAL-require>=0.10:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-Migration/Makefile b/databases/p5-DBIx-Class-Migration/Makefile
index 7e27c2373f67..41aa64ea278c 100644
--- a/databases/p5-DBIx-Class-Migration/Makefile
+++ b/databases/p5-DBIx-Class-Migration/Makefile
@@ -13,28 +13,28 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Load>0:${PORTSDIR}/devel/p5-Class-Load \
-	p5-Config-MySQL>=0.02:${PORTSDIR}/devel/p5-Config-MySQL \
-	p5-DBD-SQLite>=1.46:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-DBIx-Class-DeploymentHandler>=0.002215:${PORTSDIR}/databases/p5-DBIx-Class-DeploymentHandler \
-	p5-DBIx-Class-Fixtures>=1.001028:${PORTSDIR}/databases/p5-DBIx-Class-Fixtures \
-	p5-DBIx-Class-Schema-Loader>=0.07042:${PORTSDIR}/databases/p5-DBIx-Class-Schema-Loader \
-	p5-Devel-PartialDump>=0.17:${PORTSDIR}/devel/p5-Devel-PartialDump \
-	p5-File-ShareDir-ProjectDistDir>=1.0.4:${PORTSDIR}/devel/p5-File-ShareDir-ProjectDistDir \
-	p5-JSON-XS>=3.01:${PORTSDIR}/converters/p5-JSON-XS \
-	p5-Moose>=2.1403:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Attribute-ENV>=0.02:${PORTSDIR}/devel/p5-MooseX-Attribute-ENV \
-	p5-MooseX-Getopt>=0.68:${PORTSDIR}/devel/p5-MooseX-Getopt \
-	p5-MooseX-Traits-Pluggable>=0.12:${PORTSDIR}/devel/p5-MooseX-Traits-Pluggable \
-	p5-MooseX-Types>=0.45:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types-LoadableClass>=0.013:${PORTSDIR}/devel/p5-MooseX-Types-LoadableClass \
-	p5-Pod-Parser>=1.63:${PORTSDIR}/textproc/p5-Pod-Parser \
-	p5-SQL-Translator>=0.11021:${PORTSDIR}/databases/p5-SQL-Translator \
-	p5-Text-Brew>=0.02:${PORTSDIR}/textproc/p5-Text-Brew
+	p5-Class-Load>0:devel/p5-Class-Load \
+	p5-Config-MySQL>=0.02:devel/p5-Config-MySQL \
+	p5-DBD-SQLite>=1.46:databases/p5-DBD-SQLite \
+	p5-DBIx-Class-DeploymentHandler>=0.002215:databases/p5-DBIx-Class-DeploymentHandler \
+	p5-DBIx-Class-Fixtures>=1.001028:databases/p5-DBIx-Class-Fixtures \
+	p5-DBIx-Class-Schema-Loader>=0.07042:databases/p5-DBIx-Class-Schema-Loader \
+	p5-Devel-PartialDump>=0.17:devel/p5-Devel-PartialDump \
+	p5-File-ShareDir-ProjectDistDir>=1.0.4:devel/p5-File-ShareDir-ProjectDistDir \
+	p5-JSON-XS>=3.01:converters/p5-JSON-XS \
+	p5-Moose>=2.1403:devel/p5-Moose \
+	p5-MooseX-Attribute-ENV>=0.02:devel/p5-MooseX-Attribute-ENV \
+	p5-MooseX-Getopt>=0.68:devel/p5-MooseX-Getopt \
+	p5-MooseX-Traits-Pluggable>=0.12:devel/p5-MooseX-Traits-Pluggable \
+	p5-MooseX-Types>=0.45:devel/p5-MooseX-Types \
+	p5-MooseX-Types-LoadableClass>=0.013:devel/p5-MooseX-Types-LoadableClass \
+	p5-Pod-Parser>=1.63:textproc/p5-Pod-Parser \
+	p5-SQL-Translator>=0.11021:databases/p5-SQL-Translator \
+	p5-Text-Brew>=0.02:textproc/p5-Text-Brew
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Most>=0.34:${PORTSDIR}/devel/p5-Test-Most \
-	p5-Test-Requires>=0.08:${PORTSDIR}/devel/p5-Test-Requires
+	p5-Test-Most>=0.34:devel/p5-Test-Most \
+	p5-Test-Requires>=0.08:devel/p5-Test-Requires
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-MooseColumns/Makefile b/databases/p5-DBIx-Class-MooseColumns/Makefile
index 3e8763e9e6b8..8e71f009329e 100644
--- a/databases/p5-DBIx-Class-MooseColumns/Makefile
+++ b/databases/p5-DBIx-Class-MooseColumns/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Allow write DBIC add_column definitions as attribute options
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=1.24:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0.09:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-Path-Class>0.16:${PORTSDIR}/devel/p5-Path-Class \
-		p5-MooseX-NonMoose>=0.17:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-IO-All>=0.41:${PORTSDIR}/devel/p5-IO-All
-RUN_DEPENDS=	p5-Moose>=1.24:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0.09:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-Path-Class>0.16:${PORTSDIR}/devel/p5-Path-Class \
-		p5-MooseX-NonMoose>=0.17:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-IO-All>=0.41:${PORTSDIR}/devel/p5-IO-All
-TEST_DEPENDS=	p5-Test-Aggregate>=0.363:${PORTSDIR}/devel/p5-Test-Aggregate \
-		p5-Test-Most>=0.21:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-Differences>=0.4801:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Deep>=0.103:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-DBIx-Class>=0.10:${PORTSDIR}/devel/p5-Test-DBIx-Class
+BUILD_DEPENDS=	p5-Moose>=1.24:devel/p5-Moose \
+		p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean \
+		p5-Path-Class>0.16:devel/p5-Path-Class \
+		p5-MooseX-NonMoose>=0.17:devel/p5-MooseX-NonMoose \
+		p5-IO-All>=0.41:devel/p5-IO-All
+RUN_DEPENDS=	p5-Moose>=1.24:devel/p5-Moose \
+		p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean \
+		p5-Path-Class>0.16:devel/p5-Path-Class \
+		p5-MooseX-NonMoose>=0.17:devel/p5-MooseX-NonMoose \
+		p5-IO-All>=0.41:devel/p5-IO-All
+TEST_DEPENDS=	p5-Test-Aggregate>=0.363:devel/p5-Test-Aggregate \
+		p5-Test-Most>=0.21:devel/p5-Test-Most \
+		p5-Test-Differences>=0.4801:devel/p5-Test-Differences \
+		p5-Test-Deep>=0.103:devel/p5-Test-Deep \
+		p5-Test-DBIx-Class>=0.10:devel/p5-Test-DBIx-Class
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-PassphraseColumn/Makefile b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
index 1826802ac6d7..ac27c06ff10e 100644
--- a/databases/p5-DBIx-Class-PassphraseColumn/Makefile
+++ b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fw@moov.de
 COMMENT=	Automatically hash password/passphrase columns
 
-RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:${PORTSDIR}/databases/p5-DBIx-Class-DynamicDefault \
-		p5-DBIx-Class>=0.08009:${PORTSDIR}/databases/p5-DBIx-Class
+RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:databases/p5-DBIx-Class-DynamicDefault \
+		p5-DBIx-Class>=0.08009:databases/p5-DBIx-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Class-QueryLog/Makefile b/databases/p5-DBIx-Class-QueryLog/Makefile
index 50f791eb8037..3b12c34181b8 100644
--- a/databases/p5-DBIx-Class-QueryLog/Makefile
+++ b/databases/p5-DBIx-Class-QueryLog/Makefile
@@ -15,9 +15,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.070000:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Moo>=2:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-DBIx-Class>=0.070000:databases/p5-DBIx-Class \
+		p5-Moo>=2:devel/p5-Moo \
+		p5-Type-Tiny>=0:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/p5-DBIx-Class-QueryProfiler/Makefile b/databases/p5-DBIx-Class-QueryProfiler/Makefile
index 609d1abd1bcf..3a04fa6c01bc 100644
--- a/databases/p5-DBIx-Class-QueryProfiler/Makefile
+++ b/databases/p5-DBIx-Class-QueryProfiler/Makefile
@@ -14,10 +14,10 @@ COMMENT=	DBIx::Class profiler
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class
-RUN_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class
-TEST_DEPENDS=	p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic
+BUILD_DEPENDS=	p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-DBIx-Class>=0:databases/p5-DBIx-Class
+RUN_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class
+TEST_DEPENDS=	p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
index ead5c5101f67..a664c08ea1a4 100644
--- a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
+++ b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Adds syntactic sugar to skip the fancy objects
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.04001:${PORTSDIR}/databases/p5-DBIx-Class
+BUILD_DEPENDS=	p5-DBIx-Class>=0.04001:databases/p5-DBIx-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
index 1307b082c7a5..33b79da40f88 100644
--- a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
+++ b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Like update_or_create - but recursive
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=6.04:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-DBD-SQLite>=1.21:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBIx-Class>=0.08103:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBIx-Class-IntrospectableM2M>=0:${PORTSDIR}/databases/p5-DBIx-Class-IntrospectableM2M \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-		p5-SQL-Translator>=0.11016:${PORTSDIR}/databases/p5-SQL-Translator
+BUILD_DEPENDS=	p5-Carp-Clan>=6.04:devel/p5-Carp-Clan \
+		p5-DBD-SQLite>=1.21:databases/p5-DBD-SQLite \
+		p5-DBIx-Class>=0.08103:databases/p5-DBIx-Class \
+		p5-DBIx-Class-IntrospectableM2M>=0:databases/p5-DBIx-Class-IntrospectableM2M \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+		p5-Readonly>=1.03:devel/p5-Readonly \
+		p5-SQL-Translator>=0.11016:databases/p5-SQL-Translator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-NonMoose>=0:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Trap>=0.2.2:${PORTSDIR}/devel/p5-Test-Trap \
-		p5-Test-Warn>=0.20:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Trap>=0.2.2:devel/p5-Test-Trap \
+		p5-Test-Warn>=0.20:devel/p5-Test-Warn \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-Schema-Config/Makefile b/databases/p5-DBIx-Class-Schema-Config/Makefile
index 81b8c0302594..bf687392eaf4 100644
--- a/databases/p5-DBIx-Class-Schema-Config/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Config/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Credential Management for DBIx::Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0.23:${PORTSDIR}/devel/p5-Config-Any \
-		p5-DBIx-Class>=0.08100:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-File-HomeDir>0:${PORTSDIR}/devel/p5-File-HomeDir
+BUILD_DEPENDS=	p5-Config-Any>=0.23:devel/p5-Config-Any \
+		p5-DBIx-Class>=0.08100:databases/p5-DBIx-Class \
+		p5-File-HomeDir>0:devel/p5-File-HomeDir
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Config-Any>=0.23:${PORTSDIR}/devel/p5-Config-Any \
-		p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-MockObject>=1.09:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Config-Any>=0.23:devel/p5-Config-Any \
+		p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+		p5-Test-MockObject>=1.09:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index 997084ef3dcb..1e91c33d0297 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -13,32 +13,32 @@ COMMENT=	Dynamic definition of a DBIx::Class::Schema
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Class-Accessor-Grouped>=0.10002:${PORTSDIR}/devel/p5-Class-Accessor-Grouped \
-		p5-Class-C3-Componentised>=1.0008:${PORTSDIR}/devel/p5-Class-C3-Componentised \
-		p5-Class-Inspector>=1.27:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Class-Unload>=0:${PORTSDIR}/devel/p5-Class-Unload \
-		p5-DBIx-Class>=0.08127:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Data-Dump>1.06:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-Lingua-EN-Inflect-Number>=1.1:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
-		p5-Lingua-EN-Inflect-Phrase>=0.02:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Phrase \
-		p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Scope-Guard>=0:${PORTSDIR}/devel/p5-Scope-Guard \
-		p5-String-CamelCase>=0.02:${PORTSDIR}/textproc/p5-String-CamelCase \
-		p5-String-ToIdentifier-EN>=0.05:${PORTSDIR}/textproc/p5-String-ToIdentifier-EN \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
-TEST_DEPENDS=	p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-DBD-SQLite>=1.29:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBIx-Class-IntrospectableM2M>=0:${PORTSDIR}/databases/p5-DBIx-Class-IntrospectableM2M \
-		p5-Moose>=1.12:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-MarkAsMethods>=0.13:${PORTSDIR}/devel/p5-MooseX-MarkAsMethods \
-		p5-MooseX-NonMoose>=0.16:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Warn>=0.21:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+		p5-Class-Accessor-Grouped>=0.10002:devel/p5-Class-Accessor-Grouped \
+		p5-Class-C3-Componentised>=1.0008:devel/p5-Class-C3-Componentised \
+		p5-Class-Inspector>=1.27:devel/p5-Class-Inspector \
+		p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Class-Unload>=0:devel/p5-Class-Unload \
+		p5-DBIx-Class>=0.08127:databases/p5-DBIx-Class \
+		p5-Data-Dump>1.06:devel/p5-Data-Dump \
+		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+		p5-Lingua-EN-Inflect-Number>=1.1:textproc/p5-Lingua-EN-Inflect-Number \
+		p5-Lingua-EN-Inflect-Phrase>=0.02:textproc/p5-Lingua-EN-Inflect-Phrase \
+		p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Scope-Guard>=0:devel/p5-Scope-Guard \
+		p5-String-CamelCase>=0.02:textproc/p5-String-CamelCase \
+		p5-String-ToIdentifier-EN>=0.05:textproc/p5-String-ToIdentifier-EN \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
+TEST_DEPENDS=	p5-Config-General>=0:devel/p5-Config-General \
+		p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
+		p5-DBIx-Class-IntrospectableM2M>=0:databases/p5-DBIx-Class-IntrospectableM2M \
+		p5-Moose>=1.12:devel/p5-Moose \
+		p5-MooseX-MarkAsMethods>=0.13:devel/p5-MooseX-MarkAsMethods \
+		p5-MooseX-NonMoose>=0.16:devel/p5-MooseX-NonMoose \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Warn>=0.21:devel/p5-Test-Warn
 
 OPTIONS_DEFINE=	MYSQL ORACLE PGSQL SQLITE
 ORACLE_DESC=	Enable Oracle backend (experimental)
@@ -48,15 +48,15 @@ USES=		perl5
 USE_PERL5=	configure
 
 MYSQL_USE=		MYSQL=yes
-ORACLE_BUILD_DEPENDS=	p5-DBD-Oracle>=0.19:${PORTSDIR}/databases/p5-DBD-Oracle
-ORACLE_RUN_DEPENDS=	p5-DBD-Oracle>=0.19:${PORTSDIR}/databases/p5-DBD-Oracle
+ORACLE_BUILD_DEPENDS=	p5-DBD-Oracle>=0.19:databases/p5-DBD-Oracle
+ORACLE_RUN_DEPENDS=	p5-DBD-Oracle>=0.19:databases/p5-DBD-Oracle
 PGSQL_USES=		pgsql
 SQLITE_USE=		SQLITE=yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.40:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.40:lang/p5-Scalar-List-Utils
 .endif
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
index 61219e9418e0..208cdab4f9fa 100644
--- a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
+++ b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Enhanced populate method
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Visitor>=0.27:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-DateTimeX-Easy>=0.089:${PORTSDIR}/devel/p5-DateTimeX-Easy \
-		p5-List-MoreUtils>=0.30:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moo>=1.004006:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-HandlesVia>=0.001005:${PORTSDIR}/devel/p5-MooX-HandlesVia \
-		p5-Type-Tiny>=0.042:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-Data-Visitor>=0.27:devel/p5-Data-Visitor \
+		p5-DateTimeX-Easy>=0.089:devel/p5-DateTimeX-Easy \
+		p5-List-MoreUtils>=0.30:lang/p5-List-MoreUtils \
+		p5-Moo>=1.004006:devel/p5-Moo \
+		p5-MooX-HandlesVia>=0.001005:devel/p5-MooX-HandlesVia \
+		p5-Type-Tiny>=0.042:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBIx-Class>=0.08127:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DateTime-Format-SQLite>=0.11:${PORTSDIR}/devel/p5-DateTime-Format-SQLite \
-		p5-Path-Class>=0.23:${PORTSDIR}/devel/p5-Path-Class \
-		p5-SQL-Translator>0.11020:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-YAML-Tiny>=1.48:${PORTSDIR}/textproc/p5-YAML-Tiny
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBIx-Class>=0.08127:databases/p5-DBIx-Class \
+		p5-DateTime-Format-SQLite>=0.11:devel/p5-DateTime-Format-SQLite \
+		p5-Path-Class>=0.23:devel/p5-Path-Class \
+		p5-SQL-Translator>0.11020:databases/p5-SQL-Translator \
+		p5-YAML-Tiny>=1.48:textproc/p5-YAML-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-TimeStamp/Makefile b/databases/p5-DBIx-Class-TimeStamp/Makefile
index d596cee9d65b..7e0d04837349 100644
--- a/databases/p5-DBIx-Class-TimeStamp/Makefile
+++ b/databases/p5-DBIx-Class-TimeStamp/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	DBIx::Class extension to handle date and time based fields
 
-RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:${PORTSDIR}/databases/p5-DBIx-Class-DynamicDefault \
-		p5-DBIx-Class>=0.08009:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DateTime>=0.55:${PORTSDIR}/devel/p5-DateTime \
-		p5-Time-Warp>=0:${PORTSDIR}/devel/p5-Time-Warp \
-		p5-DateTime-Format-MySQL>=0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-		p5-DateTime-Format-SQLite>=0:${PORTSDIR}/devel/p5-DateTime-Format-SQLite
+RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:databases/p5-DBIx-Class-DynamicDefault \
+		p5-DBIx-Class>=0.08009:databases/p5-DBIx-Class \
+		p5-DateTime>=0.55:devel/p5-DateTime \
+		p5-Time-Warp>=0:devel/p5-Time-Warp \
+		p5-DateTime-Format-MySQL>=0:devel/p5-DateTime-Format-MySQL \
+		p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-Tree-NestedSet/Makefile b/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
index ea64c4f52579..b7f074ba6e58 100644
--- a/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
+++ b/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to manage trees of data using the nested set model
 
 RUN_DEPENDS=	\
-	p5-DBIx-Class>=0.08:${PORTSDIR}/databases/p5-DBIx-Class
+	p5-DBIx-Class>=0.08:databases/p5-DBIx-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-DBICx-TestDatabase>=0:${PORTSDIR}/databases/p5-DBICx-TestDatabase \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-DBICx-TestDatabase>=0:databases/p5-DBICx-TestDatabase \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-Tree/Makefile b/databases/p5-DBIx-Class-Tree/Makefile
index 1ba6109e1759..1f06f49fd120 100644
--- a/databases/p5-DBIx-Class-Tree/Makefile
+++ b/databases/p5-DBIx-Class-Tree/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to manipulate and analyze tree structured data
 
 RUN_DEPENDS=	\
-	p5-DBIx-Class>=0.08100:${PORTSDIR}/databases/p5-DBIx-Class
+	p5-DBIx-Class>=0.08100:databases/p5-DBIx-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-UUIDColumns/Makefile b/databases/p5-DBIx-Class-UUIDColumns/Makefile
index 128362594515..6555518004be 100644
--- a/databases/p5-DBIx-Class-UUIDColumns/Makefile
+++ b/databases/p5-DBIx-Class-UUIDColumns/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBIx::Class::UUIDColumns - Implicit uuid columns
 
-BUILD_DEPENDS=	p5-Class-Accessor-Grouped>=0:${PORTSDIR}/devel/p5-Class-Accessor-Grouped \
-		p5-DBD-SQLite>=1.11:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBIx-Class>=0.07005:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID
+BUILD_DEPENDS=	p5-Class-Accessor-Grouped>=0:devel/p5-Class-Accessor-Grouped \
+		p5-DBD-SQLite>=1.11:databases/p5-DBD-SQLite \
+		p5-DBIx-Class>=0.07005:databases/p5-DBIx-Class \
+		p5-Data-UUID>=0:devel/p5-Data-UUID
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Class-VirtualColumns/Makefile b/databases/p5-DBIx-Class-VirtualColumns/Makefile
index b00eaa525b8b..11dffb4bd04f 100644
--- a/databases/p5-DBIx-Class-VirtualColumns/Makefile
+++ b/databases/p5-DBIx-Class-VirtualColumns/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Add virtual columns to DBIx::Class schemata
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Class-C3-XS>=0.02:${PORTSDIR}/devel/p5-Class-C3-XS \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
-RUN_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class
+BUILD_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+		p5-Class-C3-XS>=0.02:devel/p5-Class-C3-XS \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
+RUN_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-WebForm/Makefile b/databases/p5-DBIx-Class-WebForm/Makefile
index ed7c3e4fede6..da7584b61b1c 100644
--- a/databases/p5-DBIx-Class-WebForm/Makefile
+++ b/databases/p5-DBIx-Class-WebForm/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CRUD methods for DBIx::Class
 
-RUN_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Data-FormValidator>=0:${PORTSDIR}/textproc/p5-Data-FormValidator
+RUN_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile
index 399d37e84728..6c848d624ec2 100644
--- a/databases/p5-DBIx-Class/Makefile
+++ b/databases/p5-DBIx-Class/Makefile
@@ -13,50 +13,50 @@ COMMENT=	Extensible and flexible object <-> relational mapper
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Grouped>=0.10012:${PORTSDIR}/devel/p5-Class-Accessor-Grouped \
-		p5-Class-C3-Componentised>=1.0009:${PORTSDIR}/devel/p5-Class-C3-Componentised \
-		p5-Class-Inspector>=1.24:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Class-Method-Modifiers>=1.06:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Config-Any>=0.20:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Context-Preserve>=0.01:${PORTSDIR}/devel/p5-Context-Preserve \
-		p5-DBI>=1.57:${PORTSDIR}/databases/p5-DBI \
-		p5-Data-Compare>=1.2200:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-Data-Dumper-Concise>=2.020:${PORTSDIR}/devel/p5-Data-Dumper-Concise \
-		p5-Data-Page>=2.00:${PORTSDIR}/databases/p5-Data-Page \
-		p5-Devel-GlobalDestruction>=0.09:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Module-Find>=0.07:${PORTSDIR}/devel/p5-Module-Find \
-		p5-Moo>=2:${PORTSDIR}/devel/p5-Moo \
-		p5-Path-Class>=0.18:${PORTSDIR}/devel/p5-Path-Class \
-		p5-SQL-Abstract>=1.81:${PORTSDIR}/databases/p5-SQL-Abstract \
-		p5-Scope-Guard>=0.03:${PORTSDIR}/devel/p5-Scope-Guard \
-		p5-Sub-Name>=0.04:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Try-Tiny>=0.07:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean \
-		p5-strictures>=1.003001:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Class-Accessor-Grouped>=0.10012:devel/p5-Class-Accessor-Grouped \
+		p5-Class-C3-Componentised>=1.0009:devel/p5-Class-C3-Componentised \
+		p5-Class-Inspector>=1.24:devel/p5-Class-Inspector \
+		p5-Class-Method-Modifiers>=1.06:devel/p5-Class-Method-Modifiers \
+		p5-Config-Any>=0.20:devel/p5-Config-Any \
+		p5-Context-Preserve>=0.01:devel/p5-Context-Preserve \
+		p5-DBI>=1.57:databases/p5-DBI \
+		p5-Data-Compare>=1.2200:devel/p5-Data-Compare \
+		p5-Data-Dumper-Concise>=2.020:devel/p5-Data-Dumper-Concise \
+		p5-Data-Page>=2.00:databases/p5-Data-Page \
+		p5-Devel-GlobalDestruction>=0.09:devel/p5-Devel-GlobalDestruction \
+		p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge \
+		p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Module-Find>=0.07:devel/p5-Module-Find \
+		p5-Moo>=2:devel/p5-Moo \
+		p5-Path-Class>=0.18:devel/p5-Path-Class \
+		p5-SQL-Abstract>=1.81:databases/p5-SQL-Abstract \
+		p5-Scope-Guard>=0.03:devel/p5-Scope-Guard \
+		p5-Sub-Name>=0.04:devel/p5-Sub-Name \
+		p5-Try-Tiny>=0.07:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean \
+		p5-strictures>=1.003001:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Class-DBI-Plugin-DeepAbstractSearch>=0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-DeepAbstractSearch \
-		p5-DBD-SQLite>=1.29:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DateTime>=0.55:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-MySQL>=0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-		p5-DateTime-Format-Pg>=0:${PORTSDIR}/devel/p5-DateTime-Format-Pg \
-		p5-DateTime-Format-SQLite>=0:${PORTSDIR}/devel/p5-DateTime-Format-SQLite \
-		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-Math-Base36>=0.07:${PORTSDIR}/math/p5-Math-Base36 \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-JSON>=0:${PORTSDIR}/devel/p5-MooseX-Types-JSON \
-		p5-MooseX-Types-LoadableClass>=0:${PORTSDIR}/devel/p5-MooseX-Types-LoadableClass \
-		p5-MooseX-Types-Path-Class>=0.04:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-SQL-Translator>=0.09.004:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0.21:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-Deep>0.101:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-Time-Piece-MySQL>=0:${PORTSDIR}/databases/p5-Time-Piece-MySQL \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Class-DBI-Plugin-DeepAbstractSearch>=0:databases/p5-Class-DBI-Plugin-DeepAbstractSearch \
+		p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
+		p5-DateTime>=0.55:devel/p5-DateTime \
+		p5-DateTime-Format-MySQL>=0:devel/p5-DateTime-Format-MySQL \
+		p5-DateTime-Format-Pg>=0:devel/p5-DateTime-Format-Pg \
+		p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite \
+		p5-JSON-Any>=0:converters/p5-JSON-Any \
+		p5-Math-Base36>=0.07:math/p5-Math-Base36 \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-MooseX-Types-JSON>=0:devel/p5-MooseX-Types-JSON \
+		p5-MooseX-Types-LoadableClass>=0:devel/p5-MooseX-Types-LoadableClass \
+		p5-MooseX-Types-Path-Class>=0.04:devel/p5-MooseX-Types-Path-Class \
+		p5-SQL-Translator>=0.09.004:databases/p5-SQL-Translator \
+		p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+		p5-Test-Warn>=0.21:devel/p5-Test-Warn \
+		p5-Test-Deep>0.101:devel/p5-Test-Deep \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-Time-Piece>=0:devel/p5-Time-Piece \
+		p5-Time-Piece-MySQL>=0:databases/p5-Time-Piece-MySQL \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 OPTIONS_DEFINE=	SQLT
 SQLT_DESC=	SQL::Translator (generate DDL from schema)
@@ -67,6 +67,6 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ENV=	DBICTEST_NO_SQLITE_CHECK=1
 
-SQLT_RUN_DEPENDS=	p5-SQL-Translator>=0.09.004:${PORTSDIR}/databases/p5-SQL-Translator
+SQLT_RUN_DEPENDS=	p5-SQL-Translator>=0.09.004:databases/p5-SQL-Translator
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBIx-Connector/Makefile b/databases/p5-DBIx-Connector/Makefile
index 15fce4f0f320..44e9ebd4b66d 100644
--- a/databases/p5-DBIx-Connector/Makefile
+++ b/databases/p5-DBIx-Connector/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for fast, safe DBI connection management
 
-RUN_DEPENDS=	p5-DBI>=1.605:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=1.605:databases/p5-DBI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule
+TEST_DEPENDS=	p5-Test-MockModule>=0:devel/p5-Test-MockModule
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-DBIx-ContextualFetch/Makefile b/databases/p5-DBIx-ContextualFetch/Makefile
index dbe0882d550f..2ab1e4f3d8a5 100644
--- a/databases/p5-DBIx-ContextualFetch/Makefile
+++ b/databases/p5-DBIx-ContextualFetch/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Add contextual fetches to DBI
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Custom/Makefile b/databases/p5-DBIx-Custom/Makefile
index 93629b1ea4ba..354a602c9fd5 100644
--- a/databases/p5-DBIx-Custom/Makefile
+++ b/databases/p5-DBIx-Custom/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Customizable DBI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBD-SQLite>=1.25:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=1.60.5:${PORTSDIR}/databases/p5-DBI \
-		p5-Object-Simple>=3.1000:${PORTSDIR}/devel/p5-Object-Simple
+BUILD_DEPENDS=	p5-DBD-SQLite>=1.25:databases/p5-DBD-SQLite \
+		p5-DBI>=1.60.5:databases/p5-DBI \
+		p5-Object-Simple>=3.1000:devel/p5-Object-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-DBHResolver/Makefile b/databases/p5-DBIx-DBHResolver/Makefile
index f57e4d312328..e31bae5dcdc7 100644
--- a/databases/p5-DBIx-DBHResolver/Makefile
+++ b/databases/p5-DBIx-DBHResolver/Makefile
@@ -11,18 +11,18 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to resolve DB connection with many database servers
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-	p5-Config-Any>0:${PORTSDIR}/devel/p5-Config-Any \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-Data-Util>0:${PORTSDIR}/devel/p5-Data-Util \
-	p5-Hash-Merge-Simple>0:${PORTSDIR}/devel/p5-Hash-Merge-Simple \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+	p5-Config-Any>0:devel/p5-Config-Any \
+	p5-DBI>0:databases/p5-DBI \
+	p5-Data-Util>0:devel/p5-Data-Util \
+	p5-Hash-Merge-Simple>0:devel/p5-Hash-Merge-Simple \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+	p5-YAML>0:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Sub-Uplevel>=0:${PORTSDIR}/devel/p5-Sub-Uplevel
+TEST_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+		p5-Sub-Uplevel>=0:devel/p5-Sub-Uplevel
 # TODO: fix test.
 
 USES=		perl5
diff --git a/databases/p5-DBIx-DBSchema/Makefile b/databases/p5-DBIx-DBSchema/Makefile
index e36fc26e2387..f6b8c6224c9d 100644
--- a/databases/p5-DBIx-DBSchema/Makefile
+++ b/databases/p5-DBIx-DBSchema/Makefile
@@ -13,7 +13,7 @@ COMMENT=	OO-interface to database schemas
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/databases/p5-DBIx-DataSource/Makefile b/databases/p5-DBIx-DataSource/Makefile
index f4ec18b617c2..c12741ab2a12 100644
--- a/databases/p5-DBIx-DataSource/Makefile
+++ b/databases/p5-DBIx-DataSource/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Database-independent create and drop functions
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Dump/Makefile b/databases/p5-DBIx-Dump/Makefile
index e558e11875fc..3c8697e9c107 100644
--- a/databases/p5-DBIx-Dump/Makefile
+++ b/databases/p5-DBIx-Dump/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module for dumping database (DBI) data into a variety of formats
 
-BUILD_DEPENDS=	p5-DBI>=1.57:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.57:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS
+		p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Ease/Makefile b/databases/p5-DBIx-Ease/Makefile
index 5a7402560e6f..84d04925bc12 100644
--- a/databases/p5-DBIx-Ease/Makefile
+++ b/databases/p5-DBIx-Ease/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Less-code DBI interactions for all drivers
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Inspector/Makefile b/databases/p5-DBIx-Inspector/Makefile
index 0ee7fbfaeb72..618bb5726a9b 100644
--- a/databases/p5-DBIx-Inspector/Makefile
+++ b/databases/p5-DBIx-Inspector/Makefile
@@ -12,13 +12,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to get information from $dbh
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-DBI>0:databases/p5-DBI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-Simple>=0.94:${PORTSDIR}/devel/p5-Test-Simple
+	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-Simple>=0.94:devel/p5-Test-Simple
 
 USES=	perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-DBIx-Introspector/Makefile b/databases/p5-DBIx-Introspector/Makefile
index fc66af1132f2..9f2d2e4b98a5 100644
--- a/databases/p5-DBIx-Introspector/Makefile
+++ b/databases/p5-DBIx-Introspector/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Detect what database you are connected to
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Moo>=0:devel/p5-Moo
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Log4perl/Makefile b/databases/p5-DBIx-Log4perl/Makefile
index d07262613637..47781150ff33 100644
--- a/databases/p5-DBIx-Log4perl/Makefile
+++ b/databases/p5-DBIx-Log4perl/Makefile
@@ -14,8 +14,8 @@ COMMENT=	For DBI to selectively log SQL, parameters, result-sets, transactions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.500:${PORTSDIR}/databases/p5-DBI \
-		p5-Log-Log4perl>=1.04:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-DBI>=1.500:databases/p5-DBI \
+		p5-Log-Log4perl>=1.04:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-MySQLSequence/Makefile b/databases/p5-DBIx-MySQLSequence/Makefile
index a0f6307ac189..49fe9f5f45f3 100644
--- a/databases/p5-DBIx-MySQLSequence/Makefile
+++ b/databases/p5-DBIx-MySQLSequence/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Proper and correct (emulated) sequence support for MySQL
 
-BUILD_DEPENDS=	p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-Params-Util>=0.26:${PORTSDIR}/devel/p5-Params-Util
-RUN_DEPENDS=	p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-Params-Util>=0.26:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-DBD-mysql>0:databases/p5-DBD-mysql \
+		p5-DBI>0:databases/p5-DBI \
+		p5-Params-Util>=0.26:devel/p5-Params-Util
+RUN_DEPENDS=	p5-DBD-mysql>0:databases/p5-DBD-mysql \
+		p5-DBI>0:databases/p5-DBI \
+		p5-Params-Util>=0.26:devel/p5-Params-Util
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-NoSQL/Makefile b/databases/p5-DBIx-NoSQL/Makefile
index 96d5c181d66f..585aa576beb3 100644
--- a/databases/p5-DBIx-NoSQL/Makefile
+++ b/databases/p5-DBIx-NoSQL/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	NoSQL-ish overlay for an SQL database
 
-BUILD_DEPENDS=	p5-Any-Moose>0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Hash-Merge-Simple>0:${PORTSDIR}/devel/p5-Hash-Merge-Simple \
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-SQL-Translator>0:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-DBIx-Class>=0.08124:${PORTSDIR}/databases/p5-DBIx-Class
+BUILD_DEPENDS=	p5-Any-Moose>0:devel/p5-Any-Moose \
+		p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+		p5-Hash-Merge-Simple>0:devel/p5-Hash-Merge-Simple \
+		p5-JSON>0:converters/p5-JSON \
+		p5-Path-Class>0:devel/p5-Path-Class \
+		p5-SQL-Translator>0:databases/p5-SQL-Translator \
+		p5-Try-Tiny>0:lang/p5-Try-Tiny \
+		p5-DBIx-Class>=0.08124:databases/p5-DBIx-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Password/Makefile b/databases/p5-DBIx-Password/Makefile
index da83a5161c54..5e70fdffa477 100644
--- a/databases/p5-DBIx-Password/Makefile
+++ b/databases/p5-DBIx-Password/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Allows you to create a global password file for DB passwords
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Perlish/Makefile b/databases/p5-DBIx-Perlish/Makefile
index a09cc35664c4..5101c9fd039b 100644
--- a/databases/p5-DBIx-Perlish/Makefile
+++ b/databases/p5-DBIx-Perlish/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perlish interface to SQL databases
 
-BUILD_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-PadWalker>0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-DBI>0:databases/p5-DBI \
+		p5-PadWalker>0:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-QueryLog/Makefile b/databases/p5-DBIx-QueryLog/Makefile
index 54cf330d7ec2..70c80bdc2fa2 100644
--- a/databases/p5-DBIx-QueryLog/Makefile
+++ b/databases/p5-DBIx-QueryLog/Makefile
@@ -13,13 +13,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-Text-ASCIITable>0:${PORTSDIR}/textproc/p5-Text-ASCIITable
+	p5-DBI>0:databases/p5-DBI \
+	p5-Text-ASCIITable>0:textproc/p5-Text-ASCIITable
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-Class-Method-Modifiers>0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+	p5-Class-Method-Modifiers>0:devel/p5-Class-Method-Modifiers \
+	p5-Test-Requires>0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-DBIx-Recordset/Makefile b/databases/p5-DBIx-Recordset/Makefile
index 6afc74be6c1f..ce7fb946a91f 100644
--- a/databases/p5-DBIx-Recordset/Makefile
+++ b/databases/p5-DBIx-Recordset/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for abstraction and simplification of database access
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-RetryOverDisconnects/Makefile b/databases/p5-DBIx-RetryOverDisconnects/Makefile
index 01126f696aa7..39ffd6986852 100644
--- a/databases/p5-DBIx-RetryOverDisconnects/Makefile
+++ b/databases/p5-DBIx-RetryOverDisconnects/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Keeps database connection persistent
 
-BUILD_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-Exception-Class>0:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS=	p5-DBI>0:databases/p5-DBI \
+		p5-Exception-Class>0:devel/p5-Exception-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-SQLEngine/Makefile b/databases/p5-DBIx-SQLEngine/Makefile
index ca4d2be88d12..2d6342180ea9 100644
--- a/databases/p5-DBIx-SQLEngine/Makefile
+++ b/databases/p5-DBIx-SQLEngine/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extends DBI with high-level operations
 
-BUILD_DEPENDS=	p5-Class-MakeMethods>=0:${PORTSDIR}/devel/p5-Class-MakeMethods \
-		p5-Class-MixinFactory>=0:${PORTSDIR}/devel/p5-Class-MixinFactory \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBIx-AnyDBD>=0:${PORTSDIR}/databases/p5-DBIx-AnyDBD
+BUILD_DEPENDS=	p5-Class-MakeMethods>=0:devel/p5-Class-MakeMethods \
+		p5-Class-MixinFactory>=0:devel/p5-Class-MixinFactory \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBIx-AnyDBD>=0:databases/p5-DBIx-AnyDBD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-SQLite-Simple/Makefile b/databases/p5-DBIx-SQLite-Simple/Makefile
index 2ef0e8d27d5d..421fec58138b 100644
--- a/databases/p5-DBIx-SQLite-Simple/Makefile
+++ b/databases/p5-DBIx-SQLite-Simple/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Easy access to SQLite databases using objects
 
-BUILD_DEPENDS=	p5-Class-Gomor>=0:${PORTSDIR}/devel/p5-Class-Gomor \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+BUILD_DEPENDS=	p5-Class-Gomor>=0:devel/p5-Class-Gomor \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Safe/Makefile b/databases/p5-DBIx-Safe/Makefile
index d5831a38e637..3127ad8ed599 100644
--- a/databases/p5-DBIx-Safe/Makefile
+++ b/databases/p5-DBIx-Safe/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Safer access to your database through a DBI database handle
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DBD-Pg>=1.49:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-DBI>=1.490:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBD-Pg>=1.49:databases/p5-DBD-Pg \
+		p5-DBI>=1.490:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index d10dcb618621..fce22ff3550d 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -11,17 +11,17 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	michelle@sorbs.net
 COMMENT=	Perl extension for easy SQL SELECT Statement generation
 
-BUILD_DEPENDS=	p5-Class-ReturnValue>=0:${PORTSDIR}/devel/p5-Class-ReturnValue \
-		p5-Cache-Simple-TimedExpiry>=0:${PORTSDIR}/devel/p5-Cache-Simple-TimedExpiry \
-		p5-Want>=0:${PORTSDIR}/devel/p5-Want \
-		p5-capitalization>=0:${PORTSDIR}/devel/p5-capitalization \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBIx-DBSchema>=0:${PORTSDIR}/databases/p5-DBIx-DBSchema \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Encode>=0:${PORTSDIR}/converters/p5-Encode
+BUILD_DEPENDS=	p5-Class-ReturnValue>=0:devel/p5-Class-ReturnValue \
+		p5-Cache-Simple-TimedExpiry>=0:devel/p5-Cache-Simple-TimedExpiry \
+		p5-Want>=0:devel/p5-Want \
+		p5-capitalization>=0:devel/p5-capitalization \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBIx-DBSchema>=0:databases/p5-DBIx-DBSchema \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Encode>=0:converters/p5-Encode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Sequence/Makefile b/databases/p5-DBIx-Sequence/Makefile
index 159a8f72c5a7..a262f6c797f6 100644
--- a/databases/p5-DBIx-Sequence/Makefile
+++ b/databases/p5-DBIx-Sequence/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	nistor@snickers.org
 COMMENT=	DBIx::Sequence - A simple SQL92 ID generator
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Simple/Makefile b/databases/p5-DBIx-Simple/Makefile
index a3ec7453ecb4..2000c9fb517f 100644
--- a/databases/p5-DBIx-Simple/Makefile
+++ b/databases/p5-DBIx-Simple/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simplified object oriented interface to Perl DBI
 
-BUILD_DEPENDS=	p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI ${TEST_DEPENDS}
+BUILD_DEPENDS=	p5-DBI>=1.21:databases/p5-DBI ${TEST_DEPENDS}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 OPTIONS_DEFINE=		SQL_INTERP SQL_ABSTRACT DBIX_XHTML_TABLE TEXT_TABLE
 SQL_INTERP_DESC=	Interpolate Perl variables into SQL
@@ -24,13 +24,13 @@ TEXT_TABLE_DESC=	Create plain text table from data
 USES=		perl5
 USE_PERL5=	configure
 
-DBIX_XHTML_TABLE_BUILD_DEPENDS=	p5-DBIx-XHTML_Table>=0:${PORTSDIR}/databases/p5-DBIx-XHTML_Table
+DBIX_XHTML_TABLE_BUILD_DEPENDS=	p5-DBIx-XHTML_Table>=0:databases/p5-DBIx-XHTML_Table
 DBIX_XHTML_TABLE_RUN_DEPENDS=	${DBIX_XHTML_TABLE_BUILD_DEPENDS}
-SQL_ABSTRACT_BUILD_DEPENDS=	p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract
+SQL_ABSTRACT_BUILD_DEPENDS=	p5-SQL-Abstract>=0:databases/p5-SQL-Abstract
 SQL_ABSTRACT_RUN_DEPENDS=	${SQL_ABSTRACT_BUILD_DEPENDS}
-SQL_INTERP_BUILD_DEPENDS=	p5-SQL-Interp>=0:${PORTSDIR}/databases/p5-SQL-Interp
+SQL_INTERP_BUILD_DEPENDS=	p5-SQL-Interp>=0:databases/p5-SQL-Interp
 SQL_INTERP_RUN_DEPENDS=		${SQL_INTERP_BUILD_DEPENDS}
-TEXT_TABLE_BUILD_DEPENDS=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
+TEXT_TABLE_BUILD_DEPENDS=	p5-Text-Table>=0:textproc/p5-Text-Table
 TEXT_TABLE_RUN_DEPENDS=		${TEXT_TABLE_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
index 8cfb33b165b4..1c5221bcf7fa 100644
--- a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
+++ b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
@@ -14,14 +14,14 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-DBIx-Skinny>=0.05:${PORTSDIR}/databases/p5-DBIx-Skinny \
-	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-	p5-DateTime-Format-MySQL>0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-	p5-DateTime-Format-Strptime>0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-	p5-DateTime-TimeZone>0:${PORTSDIR}/devel/p5-DateTime-TimeZone
+	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+	p5-DBIx-Skinny>=0.05:databases/p5-DBIx-Skinny \
+	p5-DateTime>0:devel/p5-DateTime \
+	p5-DateTime-Format-MySQL>0:devel/p5-DateTime-Format-MySQL \
+	p5-DateTime-Format-Strptime>0:devel/p5-DateTime-Format-Strptime \
+	p5-DateTime-TimeZone>0:devel/p5-DateTime-TimeZone
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-DBD-Mock>=0:${PORTSDIR}/databases/p5-DBD-Mock
+TEST_DEPENDS=	p5-DBD-Mock>=0:databases/p5-DBD-Mock
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
index 79afb37f589e..d8e7ee2d642a 100644
--- a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
+++ b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of DBIx::DBHResolver mixin for DBIx::Skinny
 
 RUN_DEPENDS=	\
-	p5-DBIx-DBHResolver>0:${PORTSDIR}/databases/p5-DBIx-DBHResolver \
-	p5-DBIx-Skinny>0:${PORTSDIR}/databases/p5-DBIx-Skinny
+	p5-DBIx-DBHResolver>0:databases/p5-DBIx-DBHResolver \
+	p5-DBIx-Skinny>0:databases/p5-DBIx-Skinny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Skinny-Pager/Makefile b/databases/p5-DBIx-Skinny-Pager/Makefile
index 8d580522ead1..26af1f6d0cdb 100644
--- a/databases/p5-DBIx-Skinny-Pager/Makefile
+++ b/databases/p5-DBIx-Skinny-Pager/Makefile
@@ -11,14 +11,14 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of resultset pager for DBIx::Skinny
 
 RUN_DEPENDS=	\
-	p5-DBIx-Skinny>=0.0729:${PORTSDIR}/databases/p5-DBIx-Skinny \
-	p5-Data-Page>0:${PORTSDIR}/databases/p5-Data-Page \
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite
+	p5-DBIx-Skinny>=0.0729:databases/p5-DBIx-Skinny \
+	p5-Data-Page>0:databases/p5-Data-Page \
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-UseAllModules>=0:${PORTSDIR}/devel/p5-Test-UseAllModules \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-UseAllModules>=0:devel/p5-Test-UseAllModules \
+		p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Test-Differences>=0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
index e3e457644eb0..8a827a60080c 100644
--- a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to load schema for DBIx::Skinny
 
 RUN_DEPENDS=	\
-	p5-DBIx-Skinny>=0.0733:${PORTSDIR}/databases/p5-DBIx-Skinny
+	p5-DBIx-Skinny>=0.0733:databases/p5-DBIx-Skinny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Skinny/Makefile b/databases/p5-DBIx-Skinny/Makefile
index cc4229ad99a0..4beaf0231559 100644
--- a/databases/p5-DBIx-Skinny/Makefile
+++ b/databases/p5-DBIx-Skinny/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for simple DBI wrapper/ORMapper
 
 RUN_DEPENDS=	\
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-DBIx-TransactionManager>=1.07:${PORTSDIR}/databases/p5-DBIx-TransactionManager \
-	p5-Class-Load>0:${PORTSDIR}/devel/p5-Class-Load
+	p5-DBI>0:databases/p5-DBI \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-DBIx-TransactionManager>=1.07:databases/p5-DBIx-TransactionManager \
+	p5-Class-Load>0:devel/p5-Class-Load
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Sunny/Makefile b/databases/p5-DBIx-Sunny/Makefile
index a6ca514e9344..0f28236ae9af 100644
--- a/databases/p5-DBIx-Sunny/Makefile
+++ b/databases/p5-DBIx-Sunny/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Simple DBI wrapper supports SQLite and MySQL
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.615:${PORTSDIR}/databases/p5-DBI \
-		p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-DBIx-TransactionManager>=0:${PORTSDIR}/databases/p5-DBIx-TransactionManager \
-		p5-Data-Validator>=0:${PORTSDIR}/devel/p5-Data-Validator
+BUILD_DEPENDS=	p5-DBI>=1.615:databases/p5-DBI \
+		p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-DBIx-TransactionManager>=0:databases/p5-DBIx-TransactionManager \
+		p5-Data-Validator>=0:devel/p5-Data-Validator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=1.31:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-DBD-SQLite>=1.31:databases/p5-DBD-SQLite \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-DBIx-TableHash/Makefile b/databases/p5-DBIx-TableHash/Makefile
index d443b62de3e6..34e3319db2d7 100644
--- a/databases/p5-DBIx-TableHash/Makefile
+++ b/databases/p5-DBIx-TableHash/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tie a hash to a MySQL table + SQL utils
 
-BUILD_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-TransactionManager/Makefile b/databases/p5-DBIx-TransactionManager/Makefile
index 5a44b7a62ef2..ac422f14482a 100644
--- a/databases/p5-DBIx-TransactionManager/Makefile
+++ b/databases/p5-DBIx-TransactionManager/Makefile
@@ -15,8 +15,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-DBI>0:databases/p5-DBI \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Tree/Makefile b/databases/p5-DBIx-Tree/Makefile
index efb77a0de8e6..4f3dd45ae9e7 100644
--- a/databases/p5-DBIx-Tree/Makefile
+++ b/databases/p5-DBIx-Tree/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Perl module for generating a tree from a self-referential table
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-DBI>=1.622:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.622:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=1.37:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=1.37:databases/p5-DBD-SQLite
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-VersionedDDL/Makefile b/databases/p5-DBIx-VersionedDDL/Makefile
index 89e4786eca4a..4999fe02f460 100644
--- a/databases/p5-DBIx-VersionedDDL/Makefile
+++ b/databases/p5-DBIx-VersionedDDL/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Upgrade and downgrade database schemas to a specified version
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBD-SQLite>=1.31:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Moose>=1.21:${PORTSDIR}/devel/p5-Moose \
-		p5-Text-CSV>=1.20:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-MooseX-Attribute-ENV>=0.01:${PORTSDIR}/devel/p5-MooseX-Attribute-ENV \
-		p5-MooseX-Object-Pluggable>=0:${PORTSDIR}/devel/p5-MooseX-Object-Pluggable
-RUN_DEPENDS=	p5-DBD-SQLite>=1.31:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Moose>=1.21:${PORTSDIR}/devel/p5-Moose \
-		p5-Text-CSV>=1.20:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-MooseX-Attribute-ENV>=0.01:${PORTSDIR}/devel/p5-MooseX-Attribute-ENV \
-		p5-MooseX-Object-Pluggable>=0:${PORTSDIR}/devel/p5-MooseX-Object-Pluggable
+BUILD_DEPENDS=	p5-DBD-SQLite>=1.31:databases/p5-DBD-SQLite \
+		p5-Moose>=1.21:devel/p5-Moose \
+		p5-Text-CSV>=1.20:textproc/p5-Text-CSV \
+		p5-MooseX-Attribute-ENV>=0.01:devel/p5-MooseX-Attribute-ENV \
+		p5-MooseX-Object-Pluggable>=0:devel/p5-MooseX-Object-Pluggable
+RUN_DEPENDS=	p5-DBD-SQLite>=1.31:databases/p5-DBD-SQLite \
+		p5-Moose>=1.21:devel/p5-Moose \
+		p5-Text-CSV>=1.20:textproc/p5-Text-CSV \
+		p5-MooseX-Attribute-ENV>=0.01:devel/p5-MooseX-Attribute-ENV \
+		p5-MooseX-Object-Pluggable>=0:devel/p5-MooseX-Object-Pluggable
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Wrapper/Makefile b/databases/p5-DBIx-Wrapper/Makefile
index dc44342c77ff..39e7e7ba35ae 100644
--- a/databases/p5-DBIx-Wrapper/Makefile
+++ b/databases/p5-DBIx-Wrapper/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Wrapper around Perl's DBI module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-XHTML_Table/Makefile b/databases/p5-DBIx-XHTML_Table/Makefile
index a292286830c9..464b501ed9c6 100644
--- a/databases/p5-DBIx-XHTML_Table/Makefile
+++ b/databases/p5-DBIx-XHTML_Table/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Create XHTML tables from SQL queries
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTML-TableExtract>=0:${PORTSDIR}/www/p5-HTML-TableExtract
+TEST_DEPENDS=	p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/databases/p5-DBIx-XML_RDB/Makefile b/databases/p5-DBIx-XML_RDB/Makefile
index 622d8b461dbf..2406d026cbd1 100644
--- a/databases/p5-DBIx-XML_RDB/Makefile
+++ b/databases/p5-DBIx-XML_RDB/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for creating XML from existing DBI datasources
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/databases/p5-DBM-Deep/Makefile b/databases/p5-DBM-Deep/Makefile
index 23df94daea80..e69a939e2c08 100644
--- a/databases/p5-DBM-Deep/Makefile
+++ b/databases/p5-DBM-Deep/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Pure perl persistent multi-level hash/array DBM
 
-BUILD_DEPENDS=	p5-FileHandle-Fmode>=0:${PORTSDIR}/devel/p5-FileHandle-Fmode
-RUN_DEPENDS=	p5-FileHandle-Fmode>=0:${PORTSDIR}/devel/p5-FileHandle-Fmode
+BUILD_DEPENDS=	p5-FileHandle-Fmode>=0:devel/p5-FileHandle-Fmode
+RUN_DEPENDS=	p5-FileHandle-Fmode>=0:devel/p5-FileHandle-Fmode
 
-TEST_DEPENDS=	p5-Test-Deep>=0.095:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0.08:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Deep>=0.095:devel/p5-Test-Deep \
+		p5-Test-Exception>=0.21:devel/p5-Test-Exception \
+		p5-Test-Warn>=0.08:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DWH_File/Makefile b/databases/p5-DWH_File/Makefile
index 2582d4441aee..3aceabbb00d6 100644
--- a/databases/p5-DWH_File/Makefile
+++ b/databases/p5-DWH_File/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store deep and wide hashes in single level tied hash
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Dancer-Plugin-DBIC/Makefile b/databases/p5-Dancer-Plugin-DBIC/Makefile
index bffe85701a92..d0352ab962c1 100644
--- a/databases/p5-Dancer-Plugin-DBIC/Makefile
+++ b/databases/p5-Dancer-Plugin-DBIC/Makefile
@@ -13,17 +13,17 @@ COMMENT=	DBIx::Class interface for Dancer applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class\
-		p5-DBIx-Class-Schema-Loader>=0.07002:${PORTSDIR}/databases/p5-DBIx-Class-Schema-Loader\
-		p5-Dancer>=1.3098:${PORTSDIR}/www/p5-Dancer \
-		p5-DBICx-Sugar>=0:${PORTSDIR}/databases/p5-DBICx-Sugar \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+BUILD_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class\
+		p5-DBIx-Class-Schema-Loader>=0.07002:databases/p5-DBIx-Class-Schema-Loader\
+		p5-Dancer>=1.3098:www/p5-Dancer \
+		p5-DBICx-Sugar>=0:databases/p5-DBICx-Sugar \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp \
-		p5-Module-Load-Conditional>=0.38:${PORTSDIR}/devel/p5-Module-Load-Conditional \
-		p5-MooseX-Types-LoadableClass>0:${PORTSDIR}/devel/p5-MooseX-Types-LoadableClass
+TEST_DEPENDS=	p5-File-Temp>=0:devel/p5-File-Temp \
+		p5-Module-Load-Conditional>=0.38:devel/p5-Module-Load-Conditional \
+		p5-MooseX-Types-LoadableClass>0:devel/p5-MooseX-Types-LoadableClass
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Dancer-Plugin-Database-Core/Makefile b/databases/p5-Dancer-Plugin-Database-Core/Makefile
index 5cba1b3ef669..bef311896600 100644
--- a/databases/p5-Dancer-Plugin-Database-Core/Makefile
+++ b/databases/p5-Dancer-Plugin-Database-Core/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Shared core for D1 and D2 Database plugins
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/databases/p5-Dancer-Plugin-Database/Makefile b/databases/p5-Dancer-Plugin-Database/Makefile
index d5fffb028453..a65fce80515e 100644
--- a/databases/p5-Dancer-Plugin-Database/Makefile
+++ b/databases/p5-Dancer-Plugin-Database/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Easy database connections for Dancer applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Dancer>=1.3050:${PORTSDIR}/www/p5-Dancer \
-		p5-Dancer-Plugin-Database-Core>=0.12:${PORTSDIR}/databases/p5-Dancer-Plugin-Database-Core
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Dancer>=1.3050:www/p5-Dancer \
+		p5-Dancer-Plugin-Database-Core>=0.12:databases/p5-Dancer-Plugin-Database-Core
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/databases/p5-Dancer-Plugin-Redis/Makefile b/databases/p5-Dancer-Plugin-Redis/Makefile
index 58b82dd528d7..dd7e987d1d6d 100644
--- a/databases/p5-Dancer-Plugin-Redis/Makefile
+++ b/databases/p5-Dancer-Plugin-Redis/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Redis database connector for Dancer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer>=0:${PORTSDIR}/www/p5-Dancer \
-		p5-Redis>=1.9550:${PORTSDIR}/databases/p5-Redis
+BUILD_DEPENDS=	p5-Dancer>=0:www/p5-Dancer \
+		p5-Redis>=1.9550:databases/p5-Redis
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.10,0.11,0.12,0.13,0.14
diff --git a/databases/p5-Dancer-Session-Memcached/Makefile b/databases/p5-Dancer-Session-Memcached/Makefile
index aaf810587726..20883ca9ad07 100644
--- a/databases/p5-Dancer-Session-Memcached/Makefile
+++ b/databases/p5-Dancer-Session-Memcached/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Memcached-based session backend for Dancer
 
-BUILD_DEPENDS=	p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached \
-		p5-Dancer>=0:${PORTSDIR}/www/p5-Dancer
-RUN_DEPENDS=	p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached \
-		p5-Dancer>=0:${PORTSDIR}/www/p5-Dancer
+BUILD_DEPENDS=	p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
+		p5-Dancer>=0:www/p5-Dancer
+RUN_DEPENDS=	p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
+		p5-Dancer>=0:www/p5-Dancer
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Dancer2-Plugin-DBIC/Makefile b/databases/p5-Dancer2-Plugin-DBIC/Makefile
index 79910c76ae1e..c5d47778cacd 100644
--- a/databases/p5-Dancer2-Plugin-DBIC/Makefile
+++ b/databases/p5-Dancer2-Plugin-DBIC/Makefile
@@ -13,12 +13,12 @@ COMMENT=	DBIx::Class interface for Dancer2 applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class\
-		p5-DBIx-Class-Schema-Loader>=0.07002:${PORTSDIR}/databases/p5-DBIx-Class-Schema-Loader\
-		p5-DBICx-Sugar>=0:${PORTSDIR}/databases/p5-DBICx-Sugar\
-		p5-Dancer2>=0.153002:${PORTSDIR}/www/p5-Dancer2
+BUILD_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class\
+		p5-DBIx-Class-Schema-Loader>=0.07002:databases/p5-DBIx-Class-Schema-Loader\
+		p5-DBICx-Sugar>=0:databases/p5-DBICx-Sugar\
+		p5-Dancer2>=0.153002:www/p5-Dancer2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/databases/p5-Dancer2-Plugin-Database/Makefile b/databases/p5-Dancer2-Plugin-Database/Makefile
index f5392d93be27..ce5c2ff4f5b1 100644
--- a/databases/p5-Dancer2-Plugin-Database/Makefile
+++ b/databases/p5-Dancer2-Plugin-Database/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Easy database connections for Dancer2 applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer2>=0.166001:${PORTSDIR}/www/p5-Dancer2 \
-		p5-Dancer-Plugin-Database-Core>=0.12:${PORTSDIR}/databases/p5-Dancer-Plugin-Database-Core
+BUILD_DEPENDS=	p5-Dancer2>=0.166001:www/p5-Dancer2 \
+		p5-Dancer-Plugin-Database-Core>=0.12:databases/p5-Dancer-Plugin-Database-Core
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Plack>=1.0032:${PORTSDIR}/www/p5-Plack
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Plack>=1.0032:www/p5-Plack
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/databases/p5-Data-Page/Makefile b/databases/p5-Data-Page/Makefile
index f03f1d9bf185..2d9426760e1b 100644
--- a/databases/p5-Data-Page/Makefile
+++ b/databases/p5-Data-Page/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pager utility for Class::DBI
 
-BUILD_DEPENDS=	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained
+BUILD_DEPENDS=	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-Data-Pageset/Makefile b/databases/p5-Data-Pageset/Makefile
index 481ae4830941..b6810e71a1f4 100644
--- a/databases/p5-Data-Pageset/Makefile
+++ b/databases/p5-Data-Pageset/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Page numbering and page sets
 
-BUILD_DEPENDS=	p5-Data-Page>=2:${PORTSDIR}/databases/p5-Data-Page
+BUILD_DEPENDS=	p5-Data-Page>=2:databases/p5-Data-Page
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Exception-Class-DBI/Makefile b/databases/p5-Exception-Class-DBI/Makefile
index a2f7fc9bf692..75749799a9af 100644
--- a/databases/p5-Exception-Class-DBI/Makefile
+++ b/databases/p5-Exception-Class-DBI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI Exception objects
 
-RUN_DEPENDS=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-DBI>=0:databases/p5-DBI
 
 LICENSE_COMB=	dual
 LICENSE=	ART10 GPLv1
diff --git a/databases/p5-GDBM/Makefile b/databases/p5-GDBM/Makefile
index 8e5625e465e7..eacd9b557723 100644
--- a/databases/p5-GDBM/Makefile
+++ b/databases/p5-GDBM/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	perl
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	GNU Data Base Manager (gdbm) interface
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 EXTRACT_AFTER_ARGS=	${DISTNAME}/ext/GDBM_File ${DISTNAME}/t/lib
 
diff --git a/databases/p5-Genezzo/Makefile b/databases/p5-Genezzo/Makefile
index f2cdc8c7f67f..150ee5249f5e 100644
--- a/databases/p5-Genezzo/Makefile
+++ b/databases/p5-Genezzo/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensible database with SQL and DBI
 
-RUN_DEPENDS=	p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+RUN_DEPENDS=	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/databases/p5-GitDDL-Migrator/Makefile b/databases/p5-GitDDL-Migrator/Makefile
index 6cecfe5d1f8c..38466baf1fd2 100644
--- a/databases/p5-GitDDL-Migrator/Makefile
+++ b/databases/p5-GitDDL-Migrator/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-GitDDL>=0.03:${PORTSDIR}/databases/p5-GitDDL \
-	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse \
-	p5-SQL-Translator>0:${PORTSDIR}/databases/p5-SQL-Translator
+	p5-GitDDL>=0.03:databases/p5-GitDDL \
+	p5-Mouse>0:devel/p5-Mouse \
+	p5-SQL-Translator>0:databases/p5-SQL-Translator
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-GitDDL/Makefile b/databases/p5-GitDDL/Makefile
index 3418b8af2aa9..63da72773d34 100644
--- a/databases/p5-GitDDL/Makefile
+++ b/databases/p5-GitDDL/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-Git-Repository>0:${PORTSDIR}/devel/p5-Git-Repository \
-	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse \
-	p5-SQL-Translator>=0.11016:${PORTSDIR}/databases/p5-SQL-Translator
+	p5-DBI>0:databases/p5-DBI \
+	p5-Git-Repository>0:devel/p5-Git-Repository \
+	p5-Mouse>0:devel/p5-Mouse \
+	p5-SQL-Translator>=0.11016:databases/p5-SQL-Translator
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-GraphViz-DBI/Makefile b/databases/p5-GraphViz-DBI/Makefile
index 3a6e3a737b4c..0b2101c3f74b 100644
--- a/databases/p5-GraphViz-DBI/Makefile
+++ b/databases/p5-GraphViz-DBI/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	GraphViz::DBI - graph database tables and relations
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-GraphViz>=0:graphics/p5-GraphViz
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-GraphViz>=0:graphics/p5-GraphViz
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-HTML-FormHandler-Model-DBIC/Makefile b/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
index 5292c8a4135e..89d73d3593a1 100644
--- a/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
+++ b/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Model class for FormHandler unsing DBIx::Class
 
-BUILD_DEPENDS=	p5-DBIx-Class>0:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBIx-Class-ResultSet-RecursiveUpdate>=0.21:${PORTSDIR}/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate \
-		p5-HTML-FormHandler>=0.34001:${PORTSDIR}/www/p5-HTML-FormHandler \
-		p5-Moose>=2.0007:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0.09:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-DBIx-Class>0:databases/p5-DBIx-Class \
+		p5-DBIx-Class-ResultSet-RecursiveUpdate>=0.21:databases/p5-DBIx-Class-ResultSet-RecursiveUpdate \
+		p5-HTML-FormHandler>=0.34001:www/p5-HTML-FormHandler \
+		p5-Moose>=2.0007:devel/p5-Moose \
+		p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DateTime-Format-MySQL>0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-		p5-DateTime-Format-SQLite>0:${PORTSDIR}/devel/p5-DateTime-Format-SQLite \
-		p5-DateTime-Format-W3CDTF>0:${PORTSDIR}/devel/p5-DateTime-Format-W3CDTF
+TEST_DEPENDS=	p5-DateTime-Format-MySQL>0:devel/p5-DateTime-Format-MySQL \
+		p5-DateTime-Format-SQLite>0:devel/p5-DateTime-Format-SQLite \
+		p5-DateTime-Format-W3CDTF>0:devel/p5-DateTime-Format-W3CDTF
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Ima-DBI/Makefile b/databases/p5-Ima-DBI/Makefile
index a7f4059edb37..a6f1d387797f 100644
--- a/databases/p5-Ima-DBI/Makefile
+++ b/databases/p5-Ima-DBI/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Database connection caching and organization
 
-BUILD_DEPENDS=	p5-DBIx-ContextualFetch>=0:${PORTSDIR}/databases/p5-DBIx-ContextualFetch \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-DBIx-ContextualFetch>=0:databases/p5-DBIx-ContextualFetch \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Iterator-DBI/Makefile b/databases/p5-Iterator-DBI/Makefile
index 007e2c89b55e..507a4b07bcf6 100644
--- a/databases/p5-Iterator-DBI/Makefile
+++ b/databases/p5-Iterator-DBI/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Iterator for returning DBI query results
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
+BUILD_DEPENDS=	p5-Iterator>=0:devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Jifty-DBI/Makefile b/databases/p5-Jifty-DBI/Makefile
index df222284fcec..ed18059c99c0 100644
--- a/databases/p5-Jifty-DBI/Makefile
+++ b/databases/p5-Jifty-DBI/Makefile
@@ -13,32 +13,32 @@ COMMENT=	Jifty::DBI - An object-relational persistence framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached \
-		p5-Cache-Simple-TimedExpiry>=0.21:${PORTSDIR}/devel/p5-Cache-Simple-TimedExpiry \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-ReturnValue>=0.40:${PORTSDIR}/devel/p5-Class-ReturnValue \
-		p5-Class-Trigger>=0.12:${PORTSDIR}/devel/p5-Class-Trigger \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-DBD-SQLite>=1.14:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBIx-DBSchema>=0.34:${PORTSDIR}/databases/p5-DBIx-DBSchema \
-		p5-Data-Page>=2.0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime>=0.34:${PORTSDIR}/devel/p5-DateTime \
-		p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-Object-Declare>=0.22:${PORTSDIR}/devel/p5-Object-Declare \
-		p5-Scalar-Defer>=0.10:${PORTSDIR}/devel/p5-Scalar-Defer \
-		p5-Time-Duration-Parse>=0.06:${PORTSDIR}/devel/p5-Time-Duration-Parse \
-		p5-Time-Duration>=0:${PORTSDIR}/devel/p5-Time-Duration \
-		p5-UNIVERSAL-require>=0.11:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
+		p5-Cache-Simple-TimedExpiry>=0.21:devel/p5-Cache-Simple-TimedExpiry \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-ReturnValue>=0.40:devel/p5-Class-ReturnValue \
+		p5-Class-Trigger>=0.12:devel/p5-Class-Trigger \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-DBD-SQLite>=1.14:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBIx-DBSchema>=0.34:databases/p5-DBIx-DBSchema \
+		p5-Data-Page>=2.0:databases/p5-Data-Page \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime>=0.34:devel/p5-DateTime \
+		p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
+		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+		p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+		p5-Object-Declare>=0.22:devel/p5-Object-Declare \
+		p5-Scalar-Defer>=0.10:devel/p5-Scalar-Defer \
+		p5-Time-Duration-Parse>=0.06:devel/p5-Time-Duration-Parse \
+		p5-Time-Duration>=0:devel/p5-Time-Duration \
+		p5-UNIVERSAL-require>=0.11:devel/p5-UNIVERSAL-require \
+		p5-URI>=0:net/p5-URI \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0.1:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0.1:devel/p5-Test-Warn
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/databases/p5-KyotoCabinet/Makefile b/databases/p5-KyotoCabinet/Makefile
index a6ab7bdef19e..69727885394e 100644
--- a/databases/p5-KyotoCabinet/Makefile
+++ b/databases/p5-KyotoCabinet/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension for KyotoCabinet
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libkyotocabinet.so:${PORTSDIR}/databases/kyotocabinet
+LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/databases/p5-LMDB_File/Makefile b/databases/p5-LMDB_File/Makefile
index ab9e13356db7..854f736be623 100644
--- a/databases/p5-LMDB_File/Makefile
+++ b/databases/p5-LMDB_File/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl wrapper around the OpenLDAP's LMDB
 
 LICENSE=	ART20
 
-LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 CFLAGS+=	-I${LOCALBASE}/include
 USES=		perl5
diff --git a/databases/p5-MLDBM-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile
index 19fc88a46105..8441d6cb890d 100644
--- a/databases/p5-MLDBM-Sync/Makefile
+++ b/databases/p5-MLDBM-Sync/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	MLDBM::Sync - safe concurrent access to MLDBM databases
 
-BUILD_DEPENDS=	p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
+BUILD_DEPENDS=	p5-MLDBM>=0:databases/p5-MLDBM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index fda4d2554095..e343d69e4c1b 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store multi-level hash structure in single level tied hash
 
-BUILD_DEPENDS=	p5-FreezeThaw>=0:${PORTSDIR}/devel/p5-FreezeThaw
+BUILD_DEPENDS=	p5-FreezeThaw>=0:devel/p5-FreezeThaw
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-MR-Tarantool/Makefile b/databases/p5-MR-Tarantool/Makefile
index 7b914aa88191..7beb8ed62810 100644
--- a/databases/p5-MR-Tarantool/Makefile
+++ b/databases/p5-MR-Tarantool/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Driver for an efficient Tarantool/Box NoSQL in-memory storage
 
-BUILD_DEPENDS=	p5-AnyEvent>=7.04:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Class-Singleton>=1.4:${PORTSDIR}/devel/p5-Class-Singleton \
-		p5-Mouse>=1.1:${PORTSDIR}/devel/p5-Mouse \
-		p5-String-CRC32>=1.4:${PORTSDIR}/devel/p5-String-CRC32
+BUILD_DEPENDS=	p5-AnyEvent>=7.04:devel/p5-AnyEvent \
+		p5-Class-Singleton>=1.4:devel/p5-Class-Singleton \
+		p5-Mouse>=1.1:devel/p5-Mouse \
+		p5-String-CRC32>=1.4:devel/p5-String-CRC32
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Mango/Makefile b/databases/p5-Mango/Makefile
index 110a5d966843..8f9c934e0fbd 100644
--- a/databases/p5-Mango/Makefile
+++ b/databases/p5-Mango/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Pure-Perl non-blocking I/O MongoDB driver
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	mongo:${PORTSDIR}/databases/mongodb \
-		p5-Mojolicious>=5.40:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS=	mongo:databases/mongodb \
+		p5-Mojolicious>=5.40:www/p5-Mojolicious
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/p5-Memcached-libmemcached/Makefile b/databases/p5-Memcached-libmemcached/Makefile
index e606dba45199..05f3b93d6e48 100644
--- a/databases/p5-Memcached-libmemcached/Makefile
+++ b/databases/p5-Memcached-libmemcached/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Thin fast full interface to the libmemcached client API
 
-LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Metadata/Makefile b/databases/p5-Metadata/Makefile
index 7023752b44c0..8fd3e041337b 100644
--- a/databases/p5-Metadata/Makefile
+++ b/databases/p5-Metadata/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl implementation of Dublin Core compatible metadata
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-TimeDate>=0:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Mojo-Pg/Makefile b/databases/p5-Mojo-Pg/Makefile
index 30173adce924..899eb35b1bf4 100644
--- a/databases/p5-Mojo-Pg/Makefile
+++ b/databases/p5-Mojo-Pg/Makefile
@@ -14,8 +14,8 @@ COMMENT=	PostgreSQL integration for p5-Mojolicious
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DBD-Pg>=3.5.1:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-Mojolicious>=6.0:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS=	p5-DBD-Pg>=3.5.1:databases/p5-DBD-Pg \
+		p5-Mojolicious>=6.0:www/p5-Mojolicious
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile
index 69dfdc81146c..73fb1f533cc8 100644
--- a/databases/p5-MongoDB/Makefile
+++ b/databases/p5-MongoDB/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Mongo Driver for Perl
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Authen-SCRAM>=0.003:${PORTSDIR}/security/p5-Authen-SCRAM \
-		p5-Class-XSAccessor>0:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-DateTime>=0.78:${PORTSDIR}/devel/p5-DateTime \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Syntax-Keyword-Junction>=0:${PORTSDIR}/devel/p5-Syntax-Keyword-Junction \
-		p5-Throwable>=0:${PORTSDIR}/devel/p5-Throwable \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-boolean>=0:${PORTSDIR}/devel/p5-boolean \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Authen-SCRAM>=0.003:security/p5-Authen-SCRAM \
+		p5-Class-XSAccessor>0:devel/p5-Class-XSAccessor \
+		p5-DateTime>=0.78:devel/p5-DateTime \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Syntax-Keyword-Junction>=0:devel/p5-Syntax-Keyword-Junction \
+		p5-Throwable>=0:devel/p5-Throwable \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-boolean>=0:devel/p5-boolean \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-Config-AutoConf>=0.220:${PORTSDIR}/devel/p5-Config-AutoConf \
-		p5-Path-Tiny>=0.052:${PORTSDIR}/devel/p5-Path-Tiny
-TEST_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-Test-Deep>=0.111:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS+=	p5-Config-AutoConf>=0.220:devel/p5-Config-AutoConf \
+		p5-Path-Tiny>=0.052:devel/p5-Path-Tiny
+TEST_DEPENDS=	p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-Test-Deep>=0.111:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 CFLAGS+=	-DBSON_COMPILATION -DMONGO_USE_64_BIT_INT
 MAKE_JOBS_UNSAFE=	yes
@@ -44,8 +44,8 @@ post-install:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-JSON-PP>=2.27300:${PORTSDIR}/converters/p5-JSON-PP
-RUN_DEPENDS+=	p5-JSON-PP>=2.27300:${PORTSDIR}/converters/p5-JSON-PP
+BUILD_DEPENDS+=	p5-JSON-PP>=2.27300:converters/p5-JSON-PP
+RUN_DEPENDS+=	p5-JSON-PP>=2.27300:converters/p5-JSON-PP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/p5-MySQL-Diff/Makefile b/databases/p5-MySQL-Diff/Makefile
index 9792a9bb5cfc..1e09135d9b90 100644
--- a/databases/p5-MySQL-Diff/Makefile
+++ b/databases/p5-MySQL-Diff/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl module for comparing the table structure of two MySQL databases
 
-BUILD_DEPENDS=	p5-Class-MakeMethods>=0:${PORTSDIR}/devel/p5-Class-MakeMethods \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-Class-MakeMethods>=0:devel/p5-Class-MakeMethods \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-File-Slurp>=0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/databases/p5-Net-Async-CassandraCQL/Makefile b/databases/p5-Net-Async-CassandraCQL/Makefile
index 9cc8d6d16491..e17156dd0ff8 100644
--- a/databases/p5-Net-Async-CassandraCQL/Makefile
+++ b/databases/p5-Net-Async-CassandraCQL/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Use Cassandra databases with IO::Async using CQL
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Compress-Snappy>0:${PORTSDIR}/archivers/p5-Compress-Snappy \
-		p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Future>=0.17:${PORTSDIR}/devel/p5-Future \
-		p5-IO-Async>=0.59:${PORTSDIR}/devel/p5-IO-Async \
-		p5-IO-Socket-IP>0:${PORTSDIR}/net/p5-IO-Socket-IP \
-		p5-Compress-LZ4>0:${PORTSDIR}/archivers/p5-Compress-LZ4 \
-		p5-Protocol-CassandraCQL>=0.11:${PORTSDIR}/databases/p5-Protocol-CassandraCQL
-TEST_DEPENDS=	p5-Test-Identity>0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Refcount>0:${PORTSDIR}/devel/p5-Test-Refcount
+BUILD_DEPENDS=	p5-Compress-Snappy>0:archivers/p5-Compress-Snappy \
+		p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-Future>=0.17:devel/p5-Future \
+		p5-IO-Async>=0.59:devel/p5-IO-Async \
+		p5-IO-Socket-IP>0:net/p5-IO-Socket-IP \
+		p5-Compress-LZ4>0:archivers/p5-Compress-LZ4 \
+		p5-Protocol-CassandraCQL>=0.11:databases/p5-Protocol-CassandraCQL
+TEST_DEPENDS=	p5-Test-Identity>0:devel/p5-Test-Identity \
+		p5-Test-Refcount>0:devel/p5-Test-Refcount
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-ORLite-Migrate/Makefile b/databases/p5-ORLite-Migrate/Makefile
index 2bec8a677a8e..af72521abfb7 100644
--- a/databases/p5-ORLite-Migrate/Makefile
+++ b/databases/p5-ORLite-Migrate/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Light weight SQLite-specific schema migration
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-pushd>=1.00:${PORTSDIR}/devel/p5-File-pushd \
-		p5-IPC-Run3>=0.042:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-ORLite>=1.28:${PORTSDIR}/databases/p5-ORLite \
-		p5-Probe-Perl>=0.01:${PORTSDIR}/sysutils/p5-Probe-Perl \
-		p5-DBI>=1.58:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-SQLite>=1.21:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Params-Util>0.37:${PORTSDIR}/devel/p5-Params-Util \
-		p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
+BUILD_DEPENDS=	p5-File-pushd>=1.00:devel/p5-File-pushd \
+		p5-IPC-Run3>=0.042:devel/p5-IPC-Run3 \
+		p5-ORLite>=1.28:databases/p5-ORLite \
+		p5-Probe-Perl>=0.01:sysutils/p5-Probe-Perl \
+		p5-DBI>=1.58:databases/p5-DBI \
+		p5-DBD-SQLite>=1.21:databases/p5-DBD-SQLite \
+		p5-Params-Util>0.37:devel/p5-Params-Util \
+		p5-File-Which>=0.05:sysutils/p5-File-Which
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-ORLite/Makefile b/databases/p5-ORLite/Makefile
index da7227256ccc..3c8d84619881 100644
--- a/databases/p5-ORLite/Makefile
+++ b/databases/p5-ORLite/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Perl5 extremely light weight SQLite-specific ORM
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBD-SQLite>=1.27:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=1.60.7:${PORTSDIR}/databases/p5-DBI \
-		p5-File-Remove>=1.40:${PORTSDIR}/devel/p5-File-Remove \
-		p5-Params-Util>=0.33:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-DBD-SQLite>=1.27:databases/p5-DBD-SQLite \
+		p5-DBI>=1.60.7:databases/p5-DBI \
+		p5-File-Remove>=1.40:devel/p5-File-Remove \
+		p5-Params-Util>=0.33:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-Test-Script>=1.06:${PORTSDIR}/devel/p5-Test-Script
+TEST_DEPENDS=	p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
+		p5-Test-Script>=1.06:devel/p5-Test-Script
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Oryx/Makefile b/databases/p5-Oryx/Makefile
index 996a2c29d9cd..965954c756dc 100644
--- a/databases/p5-Oryx/Makefile
+++ b/databases/p5-Oryx/Makefile
@@ -11,17 +11,17 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Meta-Model Driven Object Persistance with Multiple Inheritance
 
-BUILD_DEPENDS=	p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract \
-		p5-DBM-Deep>=0:${PORTSDIR}/databases/p5-DBM-Deep \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Class-Date>=0:${PORTSDIR}/devel/p5-Class-Date \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Ima-DBI>=0:${PORTSDIR}/databases/p5-Ima-DBI \
-		p5-Data-Types>=0:${PORTSDIR}/devel/p5-Data-Types \
-		p5-Class-Observable>=0:${PORTSDIR}/devel/p5-Class-Observable
+BUILD_DEPENDS=	p5-SQL-Abstract>=0:databases/p5-SQL-Abstract \
+		p5-DBM-Deep>=0:databases/p5-DBM-Deep \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-Class-Date>=0:devel/p5-Class-Date \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Ima-DBI>=0:databases/p5-Ima-DBI \
+		p5-Data-Types>=0:devel/p5-Data-Types \
+		p5-Class-Observable>=0:devel/p5-Class-Observable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-XML-DOM-Lite>0:${PORTSDIR}/textproc/p5-XML-DOM-Lite \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-XML-DOM-Lite>0:textproc/p5-XML-DOM-Lite \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-POE-Component-DBIAgent/Makefile b/databases/p5-POE-Component-DBIAgent/Makefile
index 2979e795c0d7..e3a2a9b7f890 100644
--- a/databases/p5-POE-Component-DBIAgent/Makefile
+++ b/databases/p5-POE-Component-DBIAgent/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE Component for running asynchronous DBI calls
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-POE-Component-EasyDBI/Makefile b/databases/p5-POE-Component-EasyDBI/Makefile
index c801974d9f10..2b1062c97247 100644
--- a/databases/p5-POE-Component-EasyDBI/Makefile
+++ b/databases/p5-POE-Component-EasyDBI/Makefile
@@ -13,12 +13,12 @@ COMMENT=	POE Component for simplified DBI usage
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.38:${PORTSDIR}/databases/p5-DBI \
-		p5-POE>=0.3101:${PORTSDIR}/devel/p5-POE \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-DBI>=1.38:databases/p5-DBI \
+		p5-POE>=0.3101:devel/p5-POE \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0.08:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0.08:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-POE-Component-LaDBI/Makefile b/databases/p5-POE-Component-LaDBI/Makefile
index 09067b5ae310..71a07c2e309e 100644
--- a/databases/p5-POE-Component-LaDBI/Makefile
+++ b/databases/p5-POE-Component-LaDBI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for asynchronous non-blocking DBI calls in POE
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile
index 7e2b0a57bbdb..2eddf3404a81 100644
--- a/databases/p5-POE-Component-RRDTool/Makefile
+++ b/databases/p5-POE-Component-RRDTool/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE interface to Round Robin Database Tools
 
-BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
-		p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	rrdtool:databases/rrdtool \
+		p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-PostgreSQL-PLPerl-Call/Makefile b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
index 5408632a5143..82285cca25bc 100644
--- a/databases/p5-PostgreSQL-PLPerl-Call/Makefile
+++ b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Simple interface for calling SQL functions from PostgreSQL PL/Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.60.5:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.60.5:databases/p5-DBI
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/databases/p5-Prophet/Makefile b/databases/p5-Prophet/Makefile
index 06f35d258b6c..0bfda7f93e6a 100644
--- a/databases/p5-Prophet/Makefile
+++ b/databases/p5-Prophet/Makefile
@@ -13,35 +13,35 @@ COMMENT=	Distributed database system
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Any-Moose>=0.04:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Config-GitLike>=1.02:${PORTSDIR}/devel/p5-Config-GitLike \
-		p5-DBD-SQLite>=1:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=1:${PORTSDIR}/databases/p5-DBI \
-		p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-File-ShareDir>=1.00:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-HTTP-Server-Simple>=0.40:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-JSON>=2.00:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=2.22:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-MIME-Base64-URLSafe>=0:${PORTSDIR}/converters/p5-MIME-Base64-URLSafe \
-		p5-Module-Refresh>=0:${PORTSDIR}/devel/p5-Module-Refresh \
-		p5-Mouse>=0.21:${PORTSDIR}/devel/p5-Mouse \
-		p5-Net-Bonjour>=0:${PORTSDIR}/dns/p5-Net-Bonjour \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Path-Dispatcher>=0.14:${PORTSDIR}/devel/p5-Path-Dispatcher \
-		p5-Path-Dispatcher-Declarative>=0:${PORTSDIR}/devel/p5-Path-Dispatcher-Declarative \
-		p5-Proc-InvokeEditor>=0:${PORTSDIR}/editors/p5-Proc-InvokeEditor \
-		p5-Template-Declare>=0.35:${PORTSDIR}/textproc/p5-Template-Declare \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl \
-		p5-Time-Progress>=0:${PORTSDIR}/devel/p5-Time-Progress \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-UUID-Tiny>=1.02:${PORTSDIR}/devel/p5-UUID-Tiny \
-		p5-XML-Atom-SimpleFeed>=0:${PORTSDIR}/textproc/p5-XML-Atom-SimpleFeed \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-Any-Moose>=0.04:devel/p5-Any-Moose \
+		p5-Config-GitLike>=1.02:devel/p5-Config-GitLike \
+		p5-DBD-SQLite>=1:databases/p5-DBD-SQLite \
+		p5-DBI>=1:databases/p5-DBI \
+		p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
+		p5-File-ShareDir>=1.00:devel/p5-File-ShareDir \
+		p5-libwww>=0:www/p5-libwww \
+		p5-HTTP-Server-Simple>=0.40:www/p5-HTTP-Server-Simple \
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-JSON>=2.00:converters/p5-JSON \
+		p5-JSON-XS>=2.22:converters/p5-JSON-XS \
+		p5-MIME-Base64-URLSafe>=0:converters/p5-MIME-Base64-URLSafe \
+		p5-Module-Refresh>=0:devel/p5-Module-Refresh \
+		p5-Mouse>=0.21:devel/p5-Mouse \
+		p5-Net-Bonjour>=0:dns/p5-Net-Bonjour \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Path-Dispatcher>=0.14:devel/p5-Path-Dispatcher \
+		p5-Path-Dispatcher-Declarative>=0:devel/p5-Path-Dispatcher-Declarative \
+		p5-Proc-InvokeEditor>=0:editors/p5-Proc-InvokeEditor \
+		p5-Template-Declare>=0.35:textproc/p5-Template-Declare \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl \
+		p5-Time-Progress>=0:devel/p5-Time-Progress \
+		p5-URI>=0:net/p5-URI \
+		p5-UUID-Tiny>=1.02:devel/p5-UUID-Tiny \
+		p5-XML-Atom-SimpleFeed>=0:textproc/p5-XML-Atom-SimpleFeed \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.26:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.26:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-Protocol-CassandraCQL/Makefile b/databases/p5-Protocol-CassandraCQL/Makefile
index 8d53faf9591d..0260d1a5f3fc 100644
--- a/databases/p5-Protocol-CassandraCQL/Makefile
+++ b/databases/p5-Protocol-CassandraCQL/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Wire protocol support functions for Cassandra CQL3
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Compress-Snappy>0:${PORTSDIR}/archivers/p5-Compress-Snappy \
-		p5-IO-Socket-IP>0:${PORTSDIR}/net/p5-IO-Socket-IP \
-		p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-HexString>0:${PORTSDIR}/devel/p5-Test-HexString
+BUILD_DEPENDS=	p5-Compress-Snappy>0:archivers/p5-Compress-Snappy \
+		p5-IO-Socket-IP>0:net/p5-IO-Socket-IP \
+		p5-Test-Fatal>0:devel/p5-Test-Fatal \
+		p5-Test-HexString>0:devel/p5-Test-HexString
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index f661e6ff65c7..f1d4735ba317 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple interface to create and store data in RRD files
 
-BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
+BUILD_DEPENDS=	rrdtool:databases/rrdtool
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Redis/Makefile b/databases/p5-Redis/Makefile
index 766ea1696313..e6a9bf92d4e5 100644
--- a/databases/p5-Redis/Makefile
+++ b/databases/p5-Redis/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Perl binding for Redis database
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-SharedFork>=0:${PORTSDIR}/devel/p5-Test-SharedFork
+TEST_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-SharedFork>=0:devel/p5-Test-SharedFork
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-RedisDB-Parser/Makefile b/databases/p5-RedisDB-Parser/Makefile
index f57fdc8610f2..4833a3887871 100644
--- a/databases/p5-RedisDB-Parser/Makefile
+++ b/databases/p5-RedisDB-Parser/Makefile
@@ -13,7 +13,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-RedisDB/Makefile b/databases/p5-RedisDB/Makefile
index e13475391322..bf8d09daa744 100644
--- a/databases/p5-RedisDB/Makefile
+++ b/databases/p5-RedisDB/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-RedisDB-Parser>=2.21:${PORTSDIR}/databases/p5-RedisDB-Parser \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-RedisDB-Parser>=2.21:databases/p5-RedisDB-Parser \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Relations-Query/Makefile b/databases/p5-Relations-Query/Makefile
index 216c4bad4cd9..3ff0320807f0 100644
--- a/databases/p5-Relations-Query/Makefile
+++ b/databases/p5-Relations-Query/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Object for building queries with DBI/DBD::mysql
 
-BUILD_DEPENDS=	p5-Relations>=0:${PORTSDIR}/databases/p5-Relations
+BUILD_DEPENDS=	p5-Relations>=0:databases/p5-Relations
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-ResourcePool-Resource-DBI/Makefile b/databases/p5-ResourcePool-Resource-DBI/Makefile
index 3bbed15af5b6..fb2aa934ff89 100644
--- a/databases/p5-ResourcePool-Resource-DBI/Makefile
+++ b/databases/p5-ResourcePool-Resource-DBI/Makefile
@@ -13,8 +13,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	ResourcePool::Resource::DBI - A ResourcePool wrapper for DBI
 
-BUILD_DEPENDS=	p5-ResourcePool>=0:${PORTSDIR}/devel/p5-ResourcePool \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-ResourcePool>=0:devel/p5-ResourcePool \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Rose-DB-Object/Makefile b/databases/p5-Rose-DB-Object/Makefile
index c1430d504452..e532f4b4d7f2 100644
--- a/databases/p5-Rose-DB-Object/Makefile
+++ b/databases/p5-Rose-DB-Object/Makefile
@@ -15,17 +15,17 @@ COMMENT=	Extensible, high performance RDBMS-OO mapper
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Clone>=0.29:${PORTSDIR}/devel/p5-Clone \
-		p5-DBI>=1.400:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Rose-DB>=0.763,1:${PORTSDIR}/databases/p5-Rose-DB \
-		p5-Rose-DateTime>=0.532,1:${PORTSDIR}/devel/p5-Rose-DateTime \
-		p5-Rose-Object>=0.854:${PORTSDIR}/devel/p5-Rose-Object \
-		p5-Time-Clock>=1:${PORTSDIR}/devel/p5-Time-Clock
+BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-Clone>=0.29:devel/p5-Clone \
+		p5-DBI>=1.400:databases/p5-DBI \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Rose-DB>=0.763,1:databases/p5-Rose-DB \
+		p5-Rose-DateTime>=0.532,1:devel/p5-Rose-DateTime \
+		p5-Rose-Object>=0.854:devel/p5-Rose-Object \
+		p5-Time-Clock>=1:devel/p5-Time-Clock
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
+TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Rose-DB/Makefile b/databases/p5-Rose-DB/Makefile
index 3ddb06086175..6f9767676cc1 100644
--- a/databases/p5-Rose-DB/Makefile
+++ b/databases/p5-Rose-DB/Makefile
@@ -14,18 +14,18 @@ COMMENT=	DBI wrapper and abstraction layer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Bit-Vector>=6.4:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Clone-PP>=0:${PORTSDIR}/devel/p5-Clone-PP \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-MySQL>=0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-		p5-DateTime-Format-Oracle>=0:${PORTSDIR}/devel/p5-DateTime-Format-Oracle \
-		p5-DateTime-Format-Pg>=0.11:${PORTSDIR}/devel/p5-DateTime-Format-Pg \
-		p5-Rose-DateTime>=0.532,1:${PORTSDIR}/devel/p5-Rose-DateTime \
-		p5-Rose-Object>=0.854:${PORTSDIR}/devel/p5-Rose-Object \
-		p5-SQL-ReservedWords>=0:${PORTSDIR}/databases/p5-SQL-ReservedWords \
-		p5-Time-Clock>=0:${PORTSDIR}/devel/p5-Time-Clock \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-Bit-Vector>=6.4:math/p5-Bit-Vector \
+		p5-Clone-PP>=0:devel/p5-Clone-PP \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-MySQL>=0:devel/p5-DateTime-Format-MySQL \
+		p5-DateTime-Format-Oracle>=0:devel/p5-DateTime-Format-Oracle \
+		p5-DateTime-Format-Pg>=0.11:devel/p5-DateTime-Format-Pg \
+		p5-Rose-DateTime>=0.532,1:devel/p5-Rose-DateTime \
+		p5-Rose-Object>=0.854:devel/p5-Rose-Object \
+		p5-SQL-ReservedWords>=0:databases/p5-SQL-ReservedWords \
+		p5-Time-Clock>=0:devel/p5-Time-Clock \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.7591
diff --git a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
index f04dba894829..49028e2ac9c9 100644
--- a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
+++ b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl 5 module to deploy a DBIx::Class schema
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Rose-DB-Object>=0.7730,1:${PORTSDIR}/databases/p5-Rose-DB-Object \
-		p5-Data-Dump>=1.06:${PORTSDIR}/devel/p5-Data-Dump
+RUN_DEPENDS=	p5-Rose-DB-Object>=0.7730,1:databases/p5-Rose-DB-Object \
+		p5-Data-Dump>=1.06:devel/p5-Data-Dump
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Rose-DBx-Object-Renderer/Makefile b/databases/p5-Rose-DBx-Object-Renderer/Makefile
index 54306dc4ccda..d5e98ff95fde 100644
--- a/databases/p5-Rose-DBx-Object-Renderer/Makefile
+++ b/databases/p5-Rose-DBx-Object-Renderer/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Web UI Rendering for Rose::DB::Object
 
-RUN_DEPENDS=	p5-Rose-DBx-Object-MoreHelpers>=0:${PORTSDIR}/databases/p5-Rose-DBx-Object-MoreHelpers \
-		p5-CGI-FormBuilder>=3.05:${PORTSDIR}/www/p5-CGI-FormBuilder \
-		p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-Lingua-EN-Inflect>0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-Rose-DBx-Object-MoreHelpers>=0:databases/p5-Rose-DBx-Object-MoreHelpers \
+		p5-CGI-FormBuilder>=3.05:www/p5-CGI-FormBuilder \
+		p5-File-Copy-Recursive>0:devel/p5-File-Copy-Recursive \
+		p5-Lingua-EN-Inflect>0:textproc/p5-Lingua-EN-Inflect \
+		p5-Template-Toolkit>0:www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/databases/p5-SQL-Abstract-Limit/Makefile b/databases/p5-SQL-Abstract-Limit/Makefile
index 8c0b16e145f9..49099f9125f5 100644
--- a/databases/p5-SQL-Abstract-Limit/Makefile
+++ b/databases/p5-SQL-Abstract-Limit/Makefile
@@ -12,11 +12,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	SQL Portability layer for LIMIT emulation
 
-RUN_DEPENDS=	p5-SQL-Abstract>=1.24:${PORTSDIR}/databases/p5-SQL-Abstract \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-SQL-Abstract>=1.24:databases/p5-SQL-Abstract \
+		p5-DBI>=0:databases/p5-DBI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-SQL-Abstract-More/Makefile b/databases/p5-SQL-Abstract-More/Makefile
index 4819d343e6ca..96d3db5c0c57 100644
--- a/databases/p5-SQL-Abstract-More/Makefile
+++ b/databases/p5-SQL-Abstract-More/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Extension of SQL::Abstract with more constructs and more flexible API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Scalar-Does>0:${PORTSDIR}/devel/p5-Scalar-Does \
-		p5-SQL-Abstract>=1.73:${PORTSDIR}/databases/p5-SQL-Abstract
+BUILD_DEPENDS=	p5-MRO-Compat>0:devel/p5-MRO-Compat \
+		p5-Params-Validate>0:devel/p5-Params-Validate \
+		p5-Scalar-Does>0:devel/p5-Scalar-Does \
+		p5-SQL-Abstract>=1.73:databases/p5-SQL-Abstract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile b/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
index f672d37803de..aa74b3a0d96a 100644
--- a/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
+++ b/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to add bulk insert for SQL::Abstract
 
 RUN_DEPENDS=	\
-	p5-SQL-Abstract>=1.6:${PORTSDIR}/databases/p5-SQL-Abstract \
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter
+	p5-SQL-Abstract>=1.6:databases/p5-SQL-Abstract \
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-SQL-Abstract/Makefile b/databases/p5-SQL-Abstract/Makefile
index 45b6cbd6208f..aa16e42e09b4 100644
--- a/databases/p5-SQL-Abstract/Makefile
+++ b/databases/p5-SQL-Abstract/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl extension to generate SQL from Perl data structures
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge
+BUILD_DEPENDS=	p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moo>=1.004002:${PORTSDIR}/devel/p5-Moo \
-		p5-Test-Deep>=0.101:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Moo>=1.004002:devel/p5-Moo \
+		p5-Test-Deep>=0.101:devel/p5-Test-Deep \
+		p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-SQL-Interp/Makefile b/databases/p5-SQL-Interp/Makefile
index d138226936c7..4febfdd380c8 100644
--- a/databases/p5-SQL-Interp/Makefile
+++ b/databases/p5-SQL-Interp/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Interpolate Perl variables into SQL with DBI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1:${PORTSDIR}/databases/p5-DBI \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
-RUN_DEPENDS=	p5-DBI>=1:${PORTSDIR}/databases/p5-DBI \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-DBI>=1:databases/p5-DBI \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-DBI>=1:databases/p5-DBI \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-SQL-Maker/Makefile b/databases/p5-SQL-Maker/Makefile
index b91394d289eb..807a1f8d76b4 100644
--- a/databases/p5-SQL-Maker/Makefile
+++ b/databases/p5-SQL-Maker/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+	p5-DBI>0:databases/p5-DBI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+TEST_DEPENDS=	p5-Test-Simple>=0.96:devel/p5-Test-Simple \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 
 USES=	perl5
 USE_PERL5=	modbuildtiny
diff --git a/databases/p5-SQL-ReservedWords/Makefile b/databases/p5-SQL-ReservedWords/Makefile
index f6278f6614af..c733cf68dfaf 100644
--- a/databases/p5-SQL-ReservedWords/Makefile
+++ b/databases/p5-SQL-ReservedWords/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Reserved SQL words by ANSI/ISO
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index c6dc03de7aa8..f9b4def8905d 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl5 module for SQL parsing and processing
 
-RUN_DEPENDS=	p5-Clone>=0.30:${PORTSDIR}/devel/p5-Clone \
-		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util
+RUN_DEPENDS=	p5-Clone>=0.30:devel/p5-Clone \
+		p5-Params-Util>=1.00:devel/p5-Params-Util
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index 7299bf8bc7ca..84aacc7bf8d5 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -14,27 +14,27 @@ COMMENT=	Manipulate structured data definitions (SQL and more)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-DBI>=1.54:${PORTSDIR}/databases/p5-DBI \
-		p5-File-ShareDir>=1:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-List-MoreUtils>=0.09:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moo>=1.000003:${PORTSDIR}/devel/p5-Moo \
-		p5-Package-Variant>=1.001001:${PORTSDIR}/devel/p5-Package-Variant \
-		p5-Parse-RecDescent>=1.967.009:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Spreadsheet-ParseExcel>=0.41:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \
-		p5-Template-Toolkit>=2.20:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Text-ParseWords>=0:${PORTSDIR}/textproc/p5-Text-ParseWords \
-		p5-Text-RecordParser>=0.02:${PORTSDIR}/textproc/p5-Text-RecordParser \
-		p5-Try-Tiny>=0.04:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-XML-Writer>=0.5:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-XML-LibXML>=1.69:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-strictures>=0:${PORTSDIR}/devel/p5-strictures \
-		p5-YAML>=0.66:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+		p5-DBI>=1.54:databases/p5-DBI \
+		p5-File-ShareDir>=1:devel/p5-File-ShareDir \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-List-MoreUtils>=0.09:lang/p5-List-MoreUtils \
+		p5-Moo>=1.000003:devel/p5-Moo \
+		p5-Package-Variant>=1.001001:devel/p5-Package-Variant \
+		p5-Parse-RecDescent>=1.967.009:devel/p5-Parse-RecDescent \
+		p5-Spreadsheet-ParseExcel>=0.41:textproc/p5-Spreadsheet-ParseExcel \
+		p5-Template-Toolkit>=2.20:www/p5-Template-Toolkit \
+		p5-Text-ParseWords>=0:textproc/p5-Text-ParseWords \
+		p5-Text-RecordParser>=0.02:textproc/p5-Text-RecordParser \
+		p5-Try-Tiny>=0.04:lang/p5-Try-Tiny \
+		p5-XML-Writer>=0.5:textproc/p5-XML-Writer \
+		p5-XML-LibXML>=1.69:textproc/p5-XML-LibXML \
+		p5-strictures>=0:devel/p5-strictures \
+		p5-YAML>=0.66:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Test-Differences>=0.61:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Test-Differences>=0.61:devel/p5-Test-Differences \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 OPTIONS_DEFINE=	DIAGRAM
 DIAGRAM_DESC=	Diagram generation support
@@ -43,9 +43,9 @@ REINPLACE_ARGS=	-i ''
 USES=		perl5
 USE_PERL5=	configure
 
-DIAGRAM_BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-			p5-Graph>=0:${PORTSDIR}/math/p5-Graph \
-			p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
+DIAGRAM_BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+			p5-Graph>=0:math/p5-Graph \
+			p5-GraphViz>=0:graphics/p5-GraphViz
 DIAGRAM_RUN_DEPENDS=	${DIAGRAM_BUILD_DEPENDS}
 
 post-patch:
diff --git a/databases/p5-SQLite-Work/Makefile b/databases/p5-SQLite-Work/Makefile
index fbc48e9434f7..45a035ebb0ae 100644
--- a/databases/p5-SQLite-Work/Makefile
+++ b/databases/p5-SQLite-Work/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Report on and update an SQLite database
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Getopt-ArgvFile>=0:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-Text-NeatTemplate>=0:${PORTSDIR}/textproc/p5-Text-NeatTemplate
+BUILD_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Getopt-ArgvFile>=0:devel/p5-Getopt-ArgvFile \
+		p5-Text-NeatTemplate>=0:textproc/p5-Text-NeatTemplate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.0202,0.0501,0.1001,0.1002,0.1003
diff --git a/databases/p5-Search-InvertedIndex/Makefile b/databases/p5-Search-InvertedIndex/Makefile
index cfacdc64bb5e..cd2eabe10f7b 100644
--- a/databases/p5-Search-InvertedIndex/Makefile
+++ b/databases/p5-Search-InvertedIndex/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Manager for inverted index maps
 
-BUILD_DEPENDS=	p5-Class-NamedParms>=0:${PORTSDIR}/devel/p5-Class-NamedParms \
-		p5-Class-ParmList>=0:${PORTSDIR}/devel/p5-Class-ParmList \
-		p5-Tie-DB_File-SplitHash>=0:${PORTSDIR}/devel/p5-Tie-DB_File-SplitHash \
-		p5-Tie-FileLRUCache>=0:${PORTSDIR}/devel/p5-Tie-FileLRUCache
+BUILD_DEPENDS=	p5-Class-NamedParms>=0:devel/p5-Class-NamedParms \
+		p5-Class-ParmList>=0:devel/p5-Class-ParmList \
+		p5-Tie-DB_File-SplitHash>=0:devel/p5-Tie-DB_File-SplitHash \
+		p5-Tie-FileLRUCache>=0:devel/p5-Tie-FileLRUCache
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Search-Namazu/Makefile b/databases/p5-Search-Namazu/Makefile
index 88d3c075205b..b97c3cc4d2af 100644
--- a/databases/p5-Search-Namazu/Makefile
+++ b/databases/p5-Search-Namazu/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Namazu library module for perl
 
-LIB_DEPENDS=	libnmz.so:${PORTSDIR}/databases/namazu2
+LIB_DEPENDS=	libnmz.so:databases/namazu2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Search-Xapian10/Makefile b/databases/p5-Search-Xapian10/Makefile
index 4d2ff189bf15..4c68300d2799 100644
--- a/databases/p5-Search-Xapian10/Makefile
+++ b/databases/p5-Search-Xapian10/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl XS frontend to the Xapian C++ search library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	xapian-core10>=1.0.22:${PORTSDIR}/databases/xapian-core10
+BUILD_DEPENDS=	xapian-core10>=1.0.22:databases/xapian-core10
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-Search-Xapian-1.[^0]*
diff --git a/databases/p5-T2/Makefile b/databases/p5-T2/Makefile
index 04e84b295551..3729520f1ba6 100644
--- a/databases/p5-T2/Makefile
+++ b/databases/p5-T2/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Object Relational mapping system
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Tangram>=0:${PORTSDIR}/devel/p5-Class-Tangram \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object \
-		p5-Tangram>=0:${PORTSDIR}/databases/p5-Tangram
+BUILD_DEPENDS=	p5-Class-Tangram>=0:devel/p5-Class-Tangram \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Set-Object>=0:devel/p5-Set-Object \
+		p5-Tangram>=0:databases/p5-Tangram
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Tangram/Makefile b/databases/p5-Tangram/Makefile
index 4993a83f9801..15fd2225a3e3 100644
--- a/databases/p5-Tangram/Makefile
+++ b/databases/p5-Tangram/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Orthogonal Object Persistence in Relational Databases
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Class-Date>=0:${PORTSDIR}/devel/p5-Class-Date \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Data-Lazy>=0.6:${PORTSDIR}/devel/p5-Data-Lazy \
-		p5-Set-Object>=1.1:${PORTSDIR}/devel/p5-Set-Object
+BUILD_DEPENDS=	p5-Class-Date>=0:devel/p5-Class-Date \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Data-Lazy>=0.6:devel/p5-Data-Lazy \
+		p5-Set-Object>=1.1:devel/p5-Set-Object
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/p5-Template-DBI/Makefile b/databases/p5-Template-DBI/Makefile
index 06ba99570622..a788a328ed49 100644
--- a/databases/p5-Template-DBI/Makefile
+++ b/databases/p5-Template-DBI/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Template::Plugin::DBI - Template interface to the DBI module
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-SQL-Statement>=1.28:${PORTSDIR}/databases/p5-SQL-Statement \
-		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-SQL-Statement>=1.28:databases/p5-SQL-Statement \
+		p5-MLDBM>=0:databases/p5-MLDBM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Teng/Makefile b/databases/p5-Teng/Makefile
index fdea0483b586..3871ec59c66d 100644
--- a/databases/p5-Teng/Makefile
+++ b/databases/p5-Teng/Makefile
@@ -14,22 +14,22 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-DBIx-Inspector>=0.06:${PORTSDIR}/databases/p5-DBIx-Inspector \
-	p5-DBIx-TransactionManager>=1.06:${PORTSDIR}/databases/p5-DBIx-TransactionManager \
-	p5-Data-Page>0:${PORTSDIR}/databases/p5-Data-Page \
-	p5-Data-Page-NoTotalEntries>=0.02:${PORTSDIR}/devel/p5-Data-Page-NoTotalEntries \
-	p5-SQL-Maker>=0.14:${PORTSDIR}/databases/p5-SQL-Maker
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+	p5-Class-Load>=0.06:devel/p5-Class-Load \
+	p5-DBI>0:databases/p5-DBI \
+	p5-DBIx-Inspector>=0.06:databases/p5-DBIx-Inspector \
+	p5-DBIx-TransactionManager>=1.06:databases/p5-DBIx-TransactionManager \
+	p5-Data-Page>0:databases/p5-Data-Page \
+	p5-Data-Page-NoTotalEntries>=0.02:devel/p5-Data-Page-NoTotalEntries \
+	p5-SQL-Maker>=0.14:databases/p5-SQL-Maker
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-Test-Mock-Guard>=0.10:${PORTSDIR}/devel/p5-Test-Mock-Guard \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-SharedFork>=0.06:${PORTSDIR}/devel/p5-Test-SharedFork \
-	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple \
-	p5-Class-Method-Modifiers>0:${PORTSDIR}/devel/p5-Class-Method-Modifiers
+	p5-DBD-SQLite>=1.12:databases/p5-DBD-SQLite \
+	p5-Test-Mock-Guard>=0.10:devel/p5-Test-Mock-Guard \
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-SharedFork>=0.06:devel/p5-Test-SharedFork \
+	p5-Test-Simple>=0.96:devel/p5-Test-Simple \
+	p5-Class-Method-Modifiers>0:devel/p5-Class-Method-Modifiers
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-Test-Cukes/Makefile b/databases/p5-Test-Cukes/Makefile
index aa6c111e0f76..0f48dccb39ad 100644
--- a/databases/p5-Test-Cukes/Makefile
+++ b/databases/p5-Test-Cukes/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	BBD test tool inspired by Cucumber
 
-BUILD_DEPENDS=	p5-Any-Moose>=0.10:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Carp-Assert>=0.20:${PORTSDIR}/devel/p5-Carp-Assert \
-		p5-Exporter-Lite>=0.02:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-Try-Tiny>=0.07:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Any-Moose>=0.10:devel/p5-Any-Moose \
+		p5-Carp-Assert>=0.20:devel/p5-Carp-Assert \
+		p5-Exporter-Lite>=0.02:devel/p5-Exporter-Lite \
+		p5-Try-Tiny>=0.07:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Test-Database/Makefile b/databases/p5-Test-Database/Makefile
index 35331316e65e..9bbe19b57fdb 100644
--- a/databases/p5-Test-Database/Makefile
+++ b/databases/p5-Test-Database/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Database handles ready for testing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-YAML-Tiny>=0:${PORTSDIR}/textproc/p5-YAML-Tiny \
-		p5-File-HomeDir>=0.84:${PORTSDIR}/devel/p5-File-HomeDir
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
+		p5-File-HomeDir>=0.84:devel/p5-File-HomeDir
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Test-DatabaseRow/Makefile b/databases/p5-Test-DatabaseRow/Makefile
index e096f05d0715..4f58204077e2 100644
--- a/databases/p5-Test-DatabaseRow/Makefile
+++ b/databases/p5-Test-DatabaseRow/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple database tests
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/p5-Test-Fixture-DBI/Makefile b/databases/p5-Test-Fixture-DBI/Makefile
index 8fea336858e8..609b8d77dc33 100644
--- a/databases/p5-Test-Fixture-DBI/Makefile
+++ b/databases/p5-Test-Fixture-DBI/Makefile
@@ -13,14 +13,14 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-SQL-Abstract>0:${PORTSDIR}/databases/p5-SQL-Abstract \
-	p5-SQL-Abstract-Plugin-InsertMulti>0:${PORTSDIR}/databases/p5-SQL-Abstract-Plugin-InsertMulti \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-	p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck
+	p5-DBI>0:databases/p5-DBI \
+	p5-SQL-Abstract>0:databases/p5-SQL-Abstract \
+	p5-SQL-Abstract-Plugin-InsertMulti>0:databases/p5-SQL-Abstract-Plugin-InsertMulti \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+	p5-YAML-Syck>0:textproc/p5-YAML-Syck
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Sub-Uplevel>=0:${PORTSDIR}/devel/p5-Sub-Uplevel
+TEST_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Sub-Uplevel>=0:devel/p5-Sub-Uplevel
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/databases/p5-Test-mysqld/Makefile b/databases/p5-Test-mysqld/Makefile
index 7c025f339f29..3596d3fb9e88 100644
--- a/databases/p5-Test-mysqld/Makefile
+++ b/databases/p5-Test-mysqld/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for mysqld test runner
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-	p5-Test-SharedFork>=0.06:${PORTSDIR}/devel/p5-Test-SharedFork
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-File-Copy-Recursive>0:devel/p5-File-Copy-Recursive \
+	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+	p5-Test-SharedFork>=0.06:devel/p5-Test-SharedFork
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-Test-postgresql/Makefile b/databases/p5-Test-postgresql/Makefile
index bb28c3fa276e..a88a4cd8b940 100644
--- a/databases/p5-Test-postgresql/Makefile
+++ b/databases/p5-Test-postgresql/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of postgresql runner for tests
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-DBD-Pg>0:${PORTSDIR}/databases/p5-DBD-Pg
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-DBI>0:databases/p5-DBI \
+	p5-DBD-Pg>0:databases/p5-DBD-Pg
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-SharedFork>=0.06:${PORTSDIR}/devel/p5-Test-SharedFork
+TEST_DEPENDS=	p5-Test-SharedFork>=0.06:devel/p5-Test-SharedFork
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Text-Query-SQL/Makefile b/databases/p5-Text-Query-SQL/Makefile
index 4b9d9275ca65..fb92ec3ba796 100644
--- a/databases/p5-Text-Query-SQL/Makefile
+++ b/databases/p5-Text-Query-SQL/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Text-Query-SQL provides query builders for SQL databases
 
-BUILD_DEPENDS=	p5-Text-Query>=0:${PORTSDIR}/textproc/p5-Text-Query
+BUILD_DEPENDS=	p5-Text-Query>=0:textproc/p5-Text-Query
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+TEST_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure patch
diff --git a/databases/p5-Tie-DBI/Makefile b/databases/p5-Tie-DBI/Makefile
index 6361c995c975..4931d89b3e56 100644
--- a/databases/p5-Tie-DBI/Makefile
+++ b/databases/p5-Tie-DBI/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module implementing Tie hash to a DBI handle
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+BUILD_DEPENDS+=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Tie-LevelDB/Makefile b/databases/p5-Tie-LevelDB/Makefile
index 5fb7ab40e2a9..0ef5f1e02f04 100644
--- a/databases/p5-Tie-LevelDB/Makefile
+++ b/databases/p5-Tie-LevelDB/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl Interface to the Google LevelDB NoSQL database
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libleveldb.so:${PORTSDIR}/databases/leveldb
+LIB_DEPENDS=	libleveldb.so:databases/leveldb
 
 MAKE_ARGS=	CC="${CXX}"
 USE_PERL5=	configure
diff --git a/databases/p5-Time-Piece-MySQL/Makefile b/databases/p5-Time-Piece-MySQL/Makefile
index 3dfe9addc289..d961972facf5 100644
--- a/databases/p5-Time-Piece-MySQL/Makefile
+++ b/databases/p5-Time-Piece-MySQL/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Time::Piece::MySQL - Adds MySQL-specific methods to Time::Piece
 
-BUILD_DEPENDS=	p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece
+BUILD_DEPENDS=	p5-Time-Piece>=0:devel/p5-Time-Piece
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-TokyoCabinet/Makefile b/databases/p5-TokyoCabinet/Makefile
index 7c6c027e51e8..db4497bf56b7 100644
--- a/databases/p5-TokyoCabinet/Makefile
+++ b/databases/p5-TokyoCabinet/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	tokyocabinet-perl-${PORTVERSION}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for TokyoCabinet
 
-LIB_DEPENDS=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-mysql-genocide/Makefile b/databases/p5-mysql-genocide/Makefile
index 6f12b68900d3..08074da362bf 100644
--- a/databases/p5-mysql-genocide/Makefile
+++ b/databases/p5-mysql-genocide/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parallel operation on MySQL processlist
 
-BUILD_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-tokyotyrant/Makefile b/databases/p5-tokyotyrant/Makefile
index 745cb55123c4..eb7deff06754 100644
--- a/databases/p5-tokyotyrant/Makefile
+++ b/databases/p5-tokyotyrant/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-perl-${PORTVERSION}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl5 interface to the TokyoTyrant
 
-BUILD_DEPENDS=	tokyotyrant>=1.1.40:${PORTSDIR}/databases/tokyotyrant
-LIB_DEPENDS=	libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
+BUILD_DEPENDS=	tokyotyrant>=1.1.40:databases/tokyotyrant
+LIB_DEPENDS=	libtokyotyrant.so:databases/tokyotyrant
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	tcrtest.pl ttutest.pl
diff --git a/databases/pear-DB_DataObject/Makefile b/databases/pear-DB_DataObject/Makefile
index 4c266f05e2cb..791e98b43bfc 100644
--- a/databases/pear-DB_DataObject/Makefile
+++ b/databases/pear-DB_DataObject/Makefile
@@ -11,10 +11,10 @@ COMMENT=	SQL Builder, Object Interface to Database Tables
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/docs/LICENCE.txt
 
-BUILD_DEPENDS=	pear-DB>=1.7.0:${PORTSDIR}/databases/pear-DB \
-		pear-Date>=1.4.3:${PORTSDIR}/devel/pear-Date
-RUN_DEPENDS=	pear-DB>=1.7.0:${PORTSDIR}/databases/pear-DB \
-		pear-Date>=1.4.3:${PORTSDIR}/devel/pear-Date
+BUILD_DEPENDS=	pear-DB>=1.7.0:databases/pear-DB \
+		pear-Date>=1.4.3:devel/pear-Date
+RUN_DEPENDS=	pear-DB>=1.7.0:databases/pear-DB \
+		pear-Date>=1.4.3:devel/pear-Date
 
 USES=		pear
 
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	PEAR_MDB2 PEAR_VALIDATE
 PEAR_MDB2_DESC=		PEAR::MDB2 support
 PEAR_VALIDATE_DESC=	PEAR::Validate support
 
-PEAR_MDB2_RUN_DEPENDS=	pear-MDB2>=2.3.0:${PORTSDIR}/databases/pear-MDB2
-PEAR_VALIDATE_RUN_DEPENDS=	pear-Validate>=0.1.1:${PORTSDIR}/devel/pear-Validate
+PEAR_MDB2_RUN_DEPENDS=	pear-MDB2>=2.3.0:databases/pear-MDB2
+PEAR_VALIDATE_RUN_DEPENDS=	pear-Validate>=0.1.1:devel/pear-Validate
 
 .include <bsd.port.mk>
diff --git a/databases/pear-DB_DataObject_FormBuilder/Makefile b/databases/pear-DB_DataObject_FormBuilder/Makefile
index bb2b7e0d6aa2..77ffe353f92d 100644
--- a/databases/pear-DB_DataObject_FormBuilder/Makefile
+++ b/databases/pear-DB_DataObject_FormBuilder/Makefile
@@ -8,17 +8,17 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Automatically build HTML_QuickForm objects using DB_DataObject
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/DB/DataObject.php:${PORTSDIR}/databases/pear-DB_DataObject
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/DB/DataObject.php:${PORTSDIR}/databases/pear-DB_DataObject
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
 
 USES=		pear
 OPTIONS_DEFINE=	PEAR_DATE PEAR_HTML_TABLE
 PEAR_DATE_DESC=	PEAR::Date support
 PEAR_HTML_TABLE_DESC=	PEAR::HTML_Table support
 
-PEAR_DATE_RUN_DEPENDS=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date
-PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table
+PEAR_DATE_RUN_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date
+PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table
 
 .include <bsd.port.mk>
diff --git a/databases/pear-DB_Pager/Makefile b/databases/pear-DB_Pager/Makefile
index 5b4d4cf8bc06..a87e74da284b 100644
--- a/databases/pear-DB_Pager/Makefile
+++ b/databases/pear-DB_Pager/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	databases www pear
 MAINTAINER=	toshiya@saitoh.nu
 COMMENT=	PEAR Database Abstraction Layer
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
 
 USES=	pear
 
diff --git a/databases/pear-DB_QueryTool/Makefile b/databases/pear-DB_QueryTool/Makefile
index 09dc14fb27a6..ac994d4a763c 100644
--- a/databases/pear-DB_QueryTool/Makefile
+++ b/databases/pear-DB_QueryTool/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR OO-interface for easily retrieving and modifying data in a DB
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB \
-		${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB \
-		${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log
 
 USES=	pear
 
diff --git a/databases/pear-DB_Sqlite_Tools/Makefile b/databases/pear-DB_Sqlite_Tools/Makefile
index 7264b1c80803..851fcf000d35 100644
--- a/databases/pear-DB_Sqlite_Tools/Makefile
+++ b/databases/pear-DB_Sqlite_Tools/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	an object oriented interface to backup Sqlite databases
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB \
-		${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB \
-		${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log
 
 USES=	pear
 
diff --git a/databases/pear-DB_Table/Makefile b/databases/pear-DB_Table/Makefile
index 23a286156464..c7006bb8e43c 100644
--- a/databases/pear-DB_Table/Makefile
+++ b/databases/pear-DB_Table/Makefile
@@ -17,8 +17,8 @@ PEAR_HTML_QUICKFORM_DESC=	PEAR::HTML_QuickForm support
 PEAR_DB_DESC=	PEAR::DB support
 PEAR_MDB2_DESC=	PEAR::MDB2 support
 
-PEAR_HTML_QUICKFORM_RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
+PEAR_HTML_QUICKFORM_RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
 
 .include <bsd.port.mk>
diff --git a/databases/pear-DB_ldap/Makefile b/databases/pear-DB_ldap/Makefile
index 25d1ac738380..0a4cf5344e0c 100644
--- a/databases/pear-DB_ldap/Makefile
+++ b/databases/pear-DB_ldap/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	databases net pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR DB compliant interface to LDAP servers
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
 
 USES=		pear
 
diff --git a/databases/pear-DB_ldap2/Makefile b/databases/pear-DB_ldap2/Makefile
index 7dbaf8579762..1f7250a64a2d 100644
--- a/databases/pear-DB_ldap2/Makefile
+++ b/databases/pear-DB_ldap2/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	databases net pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR DB compliant interface to LDAP v2 and v3 database
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
 
 USE_PHP=	ldap
 USES=		pear
diff --git a/databases/pear-DoctrineCommon/Makefile b/databases/pear-DoctrineCommon/Makefile
index f9cb020a80ab..9a8c322f5dbd 100644
--- a/databases/pear-DoctrineCommon/Makefile
+++ b/databases/pear-DoctrineCommon/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Shared code for Doctrine PHP object relational mapper
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/devel/pear-channel-doctrine
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/devel/pear-channel-doctrine
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
 
 USES=	pear
 PEAR_CHANNEL=	doctrine
diff --git a/databases/pear-DoctrineDBAL/Makefile b/databases/pear-DoctrineDBAL/Makefile
index 678e040c1bf0..eb25d2fb5c26 100644
--- a/databases/pear-DoctrineDBAL/Makefile
+++ b/databases/pear-DoctrineDBAL/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Database abstraction layer used to power the ORM package
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/devel/pear-channel-doctrine
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/devel/pear-channel-doctrine \
-	${PEARDIR}/Doctrine/Common/Version.php:${PORTSDIR}/databases/pear-DoctrineCommon \
-	${PEARDIR}/Symfony/Component/Console/Application.php:${PORTSDIR}/devel/pear-Symfony_Component_Console
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \
+	${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \
+	${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console
 
 OPTIONS_DEFINE=	DBLIB MYSQL ODBC PGSQL SQLITE
 OPTIONS_DEFAULT=MYSQL
@@ -31,9 +31,9 @@ PEAR_CHANNEL=	doctrine
 USE_PHP=	pdo
 WANT_PHP_CLI=	yes
 
-DBLIB_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_dblib.so:${PORTSDIR}/databases/php${PHP_VER}-pdo_dblib
+DBLIB_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_dblib.so:databases/php${PHP_VER}-pdo_dblib
 MYSQL_USE=	PHP=pdo_mysql
-ODBC_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:${PORTSDIR}/databases/php${PHP_VER}-pdo_odbc
+ODBC_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:databases/php${PHP_VER}-pdo_odbc
 PGSQL_USE=	PHP=pdo_pgsql
 SQLITE_USE=	PHP=pdo_sqlite
 
diff --git a/databases/pear-DoctrineORM/Makefile b/databases/pear-DoctrineORM/Makefile
index 21fda593ec2b..8296f39c90fc 100644
--- a/databases/pear-DoctrineORM/Makefile
+++ b/databases/pear-DoctrineORM/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Primary package containing the Doctrine ORM
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/devel/pear-channel-doctrine
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/devel/pear-channel-doctrine \
-	${PEARDIR}/Doctrine/Common/Version.php:${PORTSDIR}/databases/pear-DoctrineCommon \
-	${PEARDIR}/Doctrine/DBAL/Version.php:${PORTSDIR}/databases/pear-DoctrineDBAL \
-	${PEARDIR}/Symfony/Component/Console/Application.php:${PORTSDIR}/devel/pear-Symfony_Component_Console \
-	${PEARDIR}/Symfony/Component/Yaml/Yaml.php:${PORTSDIR}/textproc/pear-Symfony_Component_Yaml
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \
+	${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \
+	${PEARDIR}/Doctrine/DBAL/Version.php:databases/pear-DoctrineDBAL \
+	${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console \
+	${PEARDIR}/Symfony/Component/Yaml/Yaml.php:textproc/pear-Symfony_Component_Yaml
 
 USES=	pear
 PEAR_CHANNEL=	doctrine
diff --git a/databases/pear-Horde_Mongo/Makefile b/databases/pear-Horde_Mongo/Makefile
index 45e4248a175e..63770ebca428 100644
--- a/databases/pear-Horde_Mongo/Makefile
+++ b/databases/pear-Horde_Mongo/Makefile
@@ -9,6 +9,6 @@ MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Mongo Configuration
 
 USES=	horde
-#RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/mongo.so:${PORTSDIR}/databases/pecl-mongo
+#RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/mongo.so:databases/pecl-mongo
 
 .include <bsd.port.mk>
diff --git a/databases/pear-MDB/Makefile b/databases/pear-MDB/Makefile
index 414c9f0400e6..1bfd4c228731 100644
--- a/databases/pear-MDB/Makefile
+++ b/databases/pear-MDB/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR unified API for DB access, based on user meta data
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
 
 USES=		pear
 
diff --git a/databases/pear-MDB2_Driver_mysql/Makefile b/databases/pear-MDB2_Driver_mysql/Makefile
index ed3f28f942e2..2cf3b2d3dfc8 100644
--- a/databases/pear-MDB2_Driver_mysql/Makefile
+++ b/databases/pear-MDB2_Driver_mysql/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PEAR MySQL MDB2 driver
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-MDB2>=0:${PORTSDIR}/databases/pear-MDB2
+BUILD_DEPENDS=	pear-MDB2>=0:databases/pear-MDB2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/pear-MDB2_Driver_mysqli/Makefile b/databases/pear-MDB2_Driver_mysqli/Makefile
index 689502775f6f..f49317c2ef1a 100644
--- a/databases/pear-MDB2_Driver_mysqli/Makefile
+++ b/databases/pear-MDB2_Driver_mysqli/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PEAR MySQL MDB2 driver
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-MDB2>=0:${PORTSDIR}/databases/pear-MDB2
+BUILD_DEPENDS=	pear-MDB2>=0:databases/pear-MDB2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/pear-MDB2_Driver_pgsql/Makefile b/databases/pear-MDB2_Driver_pgsql/Makefile
index e32cc70f747c..0d8e7d5828dd 100644
--- a/databases/pear-MDB2_Driver_pgsql/Makefile
+++ b/databases/pear-MDB2_Driver_pgsql/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PEAR pgsql MDB2 driver
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-MDB2>=0:${PORTSDIR}/databases/pear-MDB2
+BUILD_DEPENDS=	pear-MDB2>=0:databases/pear-MDB2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/databases/pear-MDB2_Schema/Makefile b/databases/pear-MDB2_Schema/Makefile
index e0f59a3319c6..52f4641ce818 100644
--- a/databases/pear-MDB2_Schema/Makefile
+++ b/databases/pear-MDB2_Schema/Makefile
@@ -8,14 +8,14 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR XML based database schema manager
 
-BUILD_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2 \
-		${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
-		${PEARDIR}/XML/DTD.php:${PORTSDIR}/textproc/pear-XML_DTD \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2 \
-		${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
-		${PEARDIR}/XML/DTD.php:${PORTSDIR}/textproc/pear-XML_DTD \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2 \
+		${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
+		${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2 \
+		${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
+		${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 USES=	pear
 
diff --git a/databases/pear-MDB_QueryTool/Makefile b/databases/pear-MDB_QueryTool/Makefile
index 632ea7710012..2ac05c480258 100644
--- a/databases/pear-MDB_QueryTool/Makefile
+++ b/databases/pear-MDB_QueryTool/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR OO-interface for easily retrieving and modifying data in a DB
 
-BUILD_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB \
-		${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS:=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB \
-		${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log
+RUN_DEPENDS:=	${PEARDIR}/MDB.php:databases/pear-MDB \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log
 
 USES=	pear
 
diff --git a/databases/pear-Structures_DataGrid_DataSource_Array/Makefile b/databases/pear-Structures_DataGrid_DataSource_Array/Makefile
index 01d40f78c089..9ceacc0aed96 100644
--- a/databases/pear-Structures_DataGrid_DataSource_Array/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_Array/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DataSource driver using arrays
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid
 
 USES=		pear
 
diff --git a/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile b/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
index ec9134b14d94..4fb718458566 100644
--- a/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DataSource driver using CSV files
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
 
 USES=	pear
 
diff --git a/databases/pear-Structures_DataGrid_DataSource_DB/Makefile b/databases/pear-Structures_DataGrid_DataSource_DB/Makefile
index c0e31245ba2c..1423e7400dec 100644
--- a/databases/pear-Structures_DataGrid_DataSource_DB/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_DB/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DB datasource driver for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB \
-		${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/DB.php:databases/pear-DB \
+		${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
 
 USES=	pear
 
diff --git a/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile b/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile
index b465d4097bb4..8709c7b9780f 100644
--- a/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DataSource driver using PEAR::DB and an SQL query
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/DB.php:databases/pear-DB
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/DB.php:databases/pear-DB
 
 USES=	pear
 USE_PHP=	mysql
diff --git a/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile b/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile
index b29b2de883ca..22182b176c89 100644
--- a/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DataSource driver using PEAR::DB_Table
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB/Table.php:${PORTSDIR}/databases/pear-DB_Table
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB/Table.php:${PORTSDIR}/databases/pear-DB_Table
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/DB/Table.php:databases/pear-DB_Table
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/DB/Table.php:databases/pear-DB_Table
 
 USES=	pear
 USE_PHP=	mysql
diff --git a/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile b/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile
index 8af5837f6e55..1a42fcd1a89f 100644
--- a/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DataSource driver using PEAR::DB_DataObject
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB/DataObject.php:${PORTSDIR}/databases/pear-DB_DataObject
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB/DataObject.php:${PORTSDIR}/databases/pear-DB_DataObject
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
 
 USES=	pear
 USE_PHP=	mysql
diff --git a/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile b/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile
index 19052564caff..1d0f2e99623f 100644
--- a/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DataSource driver using PEAR::MDB2 and an SQL query
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/MDB2.php:databases/pear-MDB2
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/MDB2.php:databases/pear-MDB2
 
 USES=	pear
 USE_PHP=	mysql
diff --git a/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile b/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
index 3b654bf5e3e6..1584ba6ee650 100644
--- a/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DataSource driver using PHP Data Objects (PDO) and an SQL query
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
 
 USES=	pear
 
diff --git a/databases/pear-XML_Query2XML/Makefile b/databases/pear-XML_Query2XML/Makefile
index 63cc8abf1ab6..c4958699f327 100644
--- a/databases/pear-XML_Query2XML/Makefile
+++ b/databases/pear-XML_Query2XML/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	databases pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class transform SQL queries into XML data
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
 
 OPTIONS_DEFINE=	PEAR_MDB2 PEAR_NET_LDAP2
 PEAR_MDB2_DESC=	Add support for pear-MDB2
@@ -17,7 +17,7 @@ PEAR_NET_LDAP2_DESC=	Add support for pear-Net_LDAP2
 
 USES=	pear
 
-PEAR_MDB2_BUILD_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-PEAR_NET_LDAP2_BUILD_DEPENDS=	${PEARDIR}/Net/LDAP2.php:${PORTSDIR}/net/pear-Net_LDAP2
+PEAR_MDB2_BUILD_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_NET_LDAP2_BUILD_DEPENDS=	${PEARDIR}/Net/LDAP2.php:net/pear-Net_LDAP2
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-chdb/Makefile b/databases/pecl-chdb/Makefile
index eb4891651c24..1aa08e570331 100644
--- a/databases/pecl-chdb/Makefile
+++ b/databases/pecl-chdb/Makefile
@@ -13,8 +13,8 @@ COMMENT=	CHDB extension
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libcmph.so:${PORTSDIR}/devel/cmph
-RUN_DEPENDS=	${LOCALBASE}/lib/libcmph.so:${PORTSDIR}/devel/cmph
+BUILD_DEPENDS=	${LOCALBASE}/lib/libcmph.so:devel/cmph
+RUN_DEPENDS=	${LOCALBASE}/lib/libcmph.so:devel/cmph
 
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
diff --git a/databases/pecl-drizzle/Makefile b/databases/pecl-drizzle/Makefile
index ea5254fc4a89..07a3aab3f391 100644
--- a/databases/pecl-drizzle/Makefile
+++ b/databases/pecl-drizzle/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PHP wrapper for the libdrizzle library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libdrizzle.so:${PORTSDIR}/databases/libdrizzle
+LIB_DEPENDS=	libdrizzle.so:databases/libdrizzle
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/databases/pecl-leveldb/Makefile b/databases/pecl-leveldb/Makefile
index 2296d131a5de..aa57b2e0a0a8 100644
--- a/databases/pecl-leveldb/Makefile
+++ b/databases/pecl-leveldb/Makefile
@@ -13,7 +13,7 @@ COMMENT=	This extension is a PHP binding for Google LevelDB
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libleveldb.so:${PORTSDIR}/databases/leveldb
+LIB_DEPENDS=	libleveldb.so:databases/leveldb
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/databases/pecl-mdbtools/Makefile b/databases/pecl-mdbtools/Makefile
index d6e90a67edab..ce8131172d82 100644
--- a/databases/pecl-mdbtools/Makefile
+++ b/databases/pecl-mdbtools/Makefile
@@ -14,8 +14,8 @@ COMMENT=	PECL extension for the mdbtools library
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmdb.a:${PORTSDIR}/databases/mdbtools
-RUN_DEPENDS=	${LOCALBASE}/lib/libmdb.a:${PORTSDIR}/databases/mdbtools
+BUILD_DEPENDS=	${LOCALBASE}/lib/libmdb.a:databases/mdbtools
+RUN_DEPENDS=	${LOCALBASE}/lib/libmdb.a:databases/mdbtools
 
 USES=		pkgconfig tar:tgz
 USE_PHP=	yes
diff --git a/databases/pecl-memcached/Makefile b/databases/pecl-memcached/Makefile
index 3ff38facf1aa..4c87e954ce58 100644
--- a/databases/pecl-memcached/Makefile
+++ b/databases/pecl-memcached/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP extension for interfacing with memcached via libmemcached library
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 OPTIONS_DEFINE=	IGBINARY SASL
 IGBINARY_DESC=	Binary serializer support
@@ -30,6 +30,6 @@ IGNORE_WITH_PHP=	70
 IGBINARY_CONFIGURE_ENABLE=	memcached-igbinary
 IGBINARY_USE=		PHP=igbinary
 SASL_CONFIGURE_ENABLE=	memcached-sasl
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-mongo/Makefile b/databases/pecl-mongo/Makefile
index 676a2e50298d..263a722b3e35 100644
--- a/databases/pecl-mongo/Makefile
+++ b/databases/pecl-mongo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PECL classes for Mongo Database Driver
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	re2c>=0.13.4:${PORTSDIR}/devel/re2c
+BUILD_DEPENDS=	re2c>=0.13.4:devel/re2c
 
 USES=		tar:tgz
 USE_PHP=	spl
diff --git a/databases/pecl-rrd/Makefile b/databases/pecl-rrd/Makefile
index 9c4cdaf5576c..61023c6b3805 100644
--- a/databases/pecl-rrd/Makefile
+++ b/databases/pecl-rrd/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP bindings to rrd tool system
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
+LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/databases/pecl-tokyo_tyrant/Makefile b/databases/pecl-tokyo_tyrant/Makefile
index 6fed885cea5a..e4264f640dad 100644
--- a/databases/pecl-tokyo_tyrant/Makefile
+++ b/databases/pecl-tokyo_tyrant/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Wrapper to the Tokyo Tyrant client library
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
+LIB_DEPENDS=	libtokyotyrant.so:databases/tokyotyrant
 
 USES=		pkgconfig tar:tgz
 USE_PHP=	session
diff --git a/databases/percona-toolkit/Makefile b/databases/percona-toolkit/Makefile
index eb12543b8b25..98c5b7966607 100644
--- a/databases/percona-toolkit/Makefile
+++ b/databases/percona-toolkit/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Collection of essential command-line utilities for MySQL
 LICENSE=	ARTPERL10 GPLv2
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		p5-DBD-mysql>=3:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-DBI>=1.46:${PORTSDIR}/databases/p5-DBI \
-		p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	bash:shells/bash \
+		p5-DBD-mysql>=3:databases/p5-DBD-mysql \
+		p5-DBI>=1.46:databases/p5-DBI \
+		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/pg_activity/Makefile b/databases/pg_activity/Makefile
index f6b66961d5a1..aaeb85d8cc72 100644
--- a/databases/pg_activity/Makefile
+++ b/databases/pg_activity/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Htop like application for PostgreSQL server activity monitoring
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=0:${PORTSDIR}/databases/py-psycopg2 \
-		${PYTHON_PKGNAMEPREFIX}psutil>=0:${PORTSDIR}/sysutils/py-psutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2 \
+		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/databases/pg_citus/Makefile b/databases/pg_citus/Makefile
index 5ec7ccaea5ba..3c1b2df6fd4d 100644
--- a/databases/pg_citus/Makefile
+++ b/databases/pg_citus/Makefile
@@ -25,7 +25,7 @@ MAKE_ARGS=	INSTALL="${INSTALL} -c"
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 MAKE_ARGS+=	FLEX=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index 65dd25b297de..c9d604e4d05d 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Powerful PostgreSQL database GUI administration tool and toolkit
 
 LICENSE=	BSD4CLAUSE
 
-RUN_DEPENDS=	${LOCALBASE}/lib/pgtcl/pkgIndex.tcl:${PORTSDIR}/databases/pgtcl
+RUN_DEPENDS=	${LOCALBASE}/lib/pgtcl/pkgIndex.tcl:databases/pgtcl
 
 USES=		pgsql tk:84+ tar:xz
 
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index d3a0df5743f3..d2a9690b819d 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PostgreSQL database design and management system
 
 LICENSE=	PostgreSQL
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 USES=		compiler:c++11-lib gettext gmake pgsql:9.0+
 GNU_CONFIGURE=	yes
diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile
index 2a070a42eba2..70e85126d8e1 100644
--- a/databases/pgbarman/Makefile
+++ b/databases/pgbarman/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Backup and recovery manager for PostgreSQL
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync						\
-		${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2	\
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil	\
-		${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:${PORTSDIR}/devel/py-argh \
-		${PYTHON_PKGNAMEPREFIX}argcomplete>0:${PORTSDIR}/devel/py-argcomplete
+RUN_DEPENDS=	rsync:net/rsync						\
+		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2	\
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil	\
+		${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh \
+		${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete
 
 NO_ARCH=	yes
 
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile
index e0c23b082f8c..86b82bc101e0 100644
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Lightweight connection pooler for PostgreSQL
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
+LIB_DEPENDS=	libevent.so:devel/libevent2
+BUILD_DEPENDS+=	${LOCALBASE}/bin/gsed:textproc/gsed
 
 PORTSCOUT=	site:https://pgbouncer.github.io/downloads/
 
diff --git a/databases/pgloader/Makefile b/databases/pgloader/Makefile
index 1001ff08e6eb..375dd8285e9a 100644
--- a/databases/pgloader/Makefile
+++ b/databases/pgloader/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Import CSV data and Large Object to PostgreSQL
 NO_BUILD=	yes
 USES=		python
 
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:${PORTSDIR}/databases/py-psycopg2
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:databases/py-psycopg2
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/databases/pgpool-II-33/Makefile b/databases/pgpool-II-33/Makefile
index 0dceedf0bfb1..28c1e58293f9 100644
--- a/databases/pgpool-II-33/Makefile
+++ b/databases/pgpool-II-33/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Connection pool server for PostgreSQL
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 USES=		gmake libtool perl5 pgsql
 WANT_PGSQL=	client
@@ -36,7 +36,7 @@ OPTIONS_DEFAULT=	DOCS SSL PAM
 # --with-memcached.
 
 LIBMEMCACHED_DESC=		Build with MemCached support
-LIBMEMCACHED_BUILD_DEPENDS=	libmemcached>=1.0:${PORTSDIR}/databases/libmemcached
+LIBMEMCACHED_BUILD_DEPENDS=	libmemcached>=1.0:databases/libmemcached
 LIBMEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/lib/libmemcached
 
 SSL_DESC=		Build with OpenSSL support
diff --git a/databases/pgpoolAdmin/Makefile b/databases/pgpoolAdmin/Makefile
index 0006e6e03ad5..dce648a88721 100644
--- a/databases/pgpoolAdmin/Makefile
+++ b/databases/pgpoolAdmin/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Web-based administration tool for pgpool-II
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	pgpool:${PORTSDIR}/databases/pgpool-II
+RUN_DEPENDS=	pgpool:databases/pgpool-II
 
 USE_PHP=	mbstring pcre pgsql session
 NO_BUILD=	yes
diff --git a/databases/pgrouting/Makefile b/databases/pgrouting/Makefile
index 2ecfd119c8db..7d8a04317386 100644
--- a/databases/pgrouting/Makefile
+++ b/databases/pgrouting/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Extension to PostGIS to provide geospatial routing functionality
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs\
-		libCGAL.so:${PORTSDIR}/math/cgal \
-		libgmp.so:${PORTSDIR}/math/gmp
-RUN_DEPENDS=	${LOCALBASE}/share/postgresql/contrib/postgis-2.1/postgis.sql:${PORTSDIR}/databases/postgis21
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs\
+		libCGAL.so:math/cgal \
+		libgmp.so:math/gmp
+RUN_DEPENDS=	${LOCALBASE}/share/postgresql/contrib/postgis-2.1/postgis.sql:databases/postgis21
 
 USES=		compiler:features cmake pgsql pkgconfig
 USE_LDCONFIG=	yes
@@ -28,7 +28,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36
-BUILD_DEPENDS+=	clang36:${PORTSDIR}/lang/clang36
+BUILD_DEPENDS+=	clang36:lang/clang36
 CPP=		clang-cpp36
 CC=		clang36
 CXX=		clang++36
diff --git a/databases/pgtop/Makefile b/databases/pgtop/Makefile
index 6669dcaa4183..cadfa049f366 100644
--- a/databases/pgtop/Makefile
+++ b/databases/pgtop/Makefile
@@ -11,9 +11,9 @@ MASTER_SITE_SUBDIR=	CPAN:COSIMO
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Display PostgreSQL performance info like top(1)
 
-RUN_DEPENDS=	p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-DBD-Pg>=1.22:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-DBI>=1.16:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey \
+		p5-DBD-Pg>=1.22:databases/p5-DBD-Pg \
+		p5-DBI>=1.16:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/pguri/Makefile b/databases/pguri/Makefile
index 04f0047e641a..f47b5df90577 100644
--- a/databases/pguri/Makefile
+++ b/databases/pguri/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	databases
 MAINTAINER=	ports@toco-domains.de
 COMMENT=	URI datatype for PostgreSQL
 
-BUILD_DEPENDS=	uriparser>=0.8.0:${PORTSDIR}/net/uriparser
-RUN_DEPENDS=	uriparser>=0.8.0:${PORTSDIR}/net/uriparser
+BUILD_DEPENDS=	uriparser>=0.8.0:net/uriparser
+RUN_DEPENDS=	uriparser>=0.8.0:net/uriparser
 
 USES=		gmake pgsql pkgconfig
 
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index be909403e9b2..f60d023d10ad 100644
--- a/databases/pgworksheet/Makefile
+++ b/databases/pgworksheet/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple PostreSQL GUI front end
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:${PORTSDIR}/databases/py-pyPgSQL
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:databases/py-pyPgSQL
 
 USES=		pgsql python:2 tar:bzip2
 USE_GNOME=	pygtk2
diff --git a/databases/php-mdcached/Makefile b/databases/php-mdcached/Makefile
index 75a784957ba1..f3f62c4d623b 100644
--- a/databases/php-mdcached/Makefile
+++ b/databases/php-mdcached/Makefile
@@ -13,7 +13,7 @@ COMMENT=	The PHP client library for Bullet Cache (mdcached)
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libmdcached.so:${PORTSDIR}/databases/mdcached
+LIB_DEPENDS=	libmdcached.so:databases/mdcached
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/databases/php5-pdo_cassandra/Makefile b/databases/php5-pdo_cassandra/Makefile
index 74590eef3cfc..67a452fcc38c 100644
--- a/databases/php5-pdo_cassandra/Makefile
+++ b/databases/php5-pdo_cassandra/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PDO driver for Apache Cassandra
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mkoppanen
@@ -35,10 +35,10 @@ THRIFT_MINOR_VER=	${THRIFT_PORTVERSION:R:E}
 THRIFT_PATCH_VER=	${THRIFT_PORTVERSION:E}
 
 .if ${THRIFT_MAJOR_VER} >= 0 || ${THRIFT_MINOR_VER} >= 9 || ${THRIFT_PATCH_VER} >= 1
-LIB_DEPENDS+=	libthrift.so:${PORTSDIR}/devel/thrift-cpp
-BUILD_DEPENDS+=	${LOCALBASE}/bin/thrift:${PORTSDIR}/devel/thrift
+LIB_DEPENDS+=	libthrift.so:devel/thrift-cpp
+BUILD_DEPENDS+=	${LOCALBASE}/bin/thrift:devel/thrift
 .else
-LIB_DEPENDS+=	libthrift.so:${PORTSDIR}/devel/thrift
+LIB_DEPENDS+=	libthrift.so:devel/thrift
 .endif
 
 post-configure:
diff --git a/databases/postgis-jdbc/Makefile b/databases/postgis-jdbc/Makefile
index fd59ea7389ca..ca488439e1c6 100644
--- a/databases/postgis-jdbc/Makefile
+++ b/databases/postgis-jdbc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PostGIS spatial data structures for JDBC
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
+RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/databases/postgis20/Makefile b/databases/postgis20/Makefile
index 1a0d9703fee0..6b699deb7334 100644
--- a/databases/postgis20/Makefile
+++ b/databases/postgis20/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Geographic objects support for PostgreSQL databases
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgeos.so:${PORTSDIR}/graphics/geos \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libproj.so:${PORTSDIR}/graphics/proj
+LIB_DEPENDS=	libgeos.so:graphics/geos \
+		libjson-c.so:devel/json-c \
+		libproj.so:graphics/proj
 
 CONFLICTS_INSTALL=	postgis-1.* postgis-2.1.*
 
@@ -57,7 +57,7 @@ NLS_CONFIGURE_WITH=	gettext
 NLS_USES=		gettext
 RASTER_CONFIGURE_OFF=	--without-raster
 RASTER_CONFIGURE_ON=	--with-gdalconfig=${LOCALBASE}/bin/gdal-config --with-raster
-RASTER_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+RASTER_LIB_DEPENDS=	libgdal.so:graphics/gdal
 TOPOLOGY_CONFIGURE_WITH=topology
 
 post-install:
diff --git a/databases/postgis21/Makefile b/databases/postgis21/Makefile
index c665f186b7cc..c20d5b6c0b84 100644
--- a/databases/postgis21/Makefile
+++ b/databases/postgis21/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Geographic objects support for PostgreSQL databases
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-RUN_DEPENDS=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
+LIB_DEPENDS=	libproj.so:graphics/proj \
+		libgeos.so:graphics/geos \
+		libjson-c.so:devel/json-c
+RUN_DEPENDS=	postmaster:databases/postgresql${PGSQL_VER_NODOT}-server
 
 CONFLICTS=	postgis-1.* postgis-2.0.*
 
@@ -41,10 +41,10 @@ LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_USE=	GNOME=gtk20
 RASTER_USES=	alias
 RASTER_CONFIGURE_WITH=	raster
-RASTER_LIB_DEPENDS=		libgdal.so:${PORTSDIR}/graphics/gdal
+RASTER_LIB_DEPENDS=		libgdal.so:graphics/gdal
 RASTER_CONFIGURE_ON=	--with-gdalconfig=${LOCALBASE}/bin/gdal-config
 TOPOLOGY_CONFIGURE_WITH=	topology
-SFCGAL_LIB_DEPENDS=	libSFCGAL.so:${PORTSDIR}/databases/sfcgal
+SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
 SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_CONFIGURE_OFF=	--without-sfcgal
 
diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile
index c13b06d7e9a3..0acc89e71413 100644
--- a/databases/postgresql-odbc/Makefile
+++ b/databases/postgresql-odbc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PostgreSQL ODBC driver
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 USES=		libtool pgsql
 USE_OPENSSL=	yes
diff --git a/databases/postgresql-plv8js/Makefile b/databases/postgresql-plv8js/Makefile
index 25404b0ef341..c588c573d345 100644
--- a/databases/postgresql-plv8js/Makefile
+++ b/databases/postgresql-plv8js/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PL/v8js procedural language for PostgreSQL database
 
 LICENSE=	PostgreSQL
 
-LIB_DEPENDS+=	libv8.so:${PORTSDIR}/lang/v8
+LIB_DEPENDS+=	libv8.so:lang/v8
 
 WRKSRC=		${WRKDIR}/plv8-${PORTVERSION}
 USES=		gmake perl5 pgsql:9.1+
diff --git a/databases/postgresql-repmgr/Makefile b/databases/postgresql-repmgr/Makefile
index f9603f320691..56458036db6f 100644
--- a/databases/postgresql-repmgr/Makefile
+++ b/databases/postgresql-repmgr/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PostgreSQL replication manager
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 USES+=		gmake pgsql:9.0+
 USE_RC_SUBR=	repmgrd
diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile
index 9cca5ec1324d..5f3cacbec482 100644
--- a/databases/postgresql90-contrib/Makefile
+++ b/databases/postgresql90-contrib/Makefile
@@ -8,8 +8,8 @@ PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
+		libxml2.so:textproc/libxml2
 
 MASTERDIR=	${.CURDIR}/../postgresql90-server
 
diff --git a/databases/postgresql90-plperl/Makefile b/databases/postgresql90-plperl/Makefile
index e35abbd7c0b7..41487fb3f463 100644
--- a/databases/postgresql90-plperl/Makefile
+++ b/databases/postgresql90-plperl/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Write SQL functions for PostgreSQL using Perl5
 
-RUN_DEPENDS=	postgres:${PORTSDIR}/databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 
diff --git a/databases/postgresql91-contrib/Makefile b/databases/postgresql91-contrib/Makefile
index c85e76a29ee4..15dcdefbebc2 100644
--- a/databases/postgresql91-contrib/Makefile
+++ b/databases/postgresql91-contrib/Makefile
@@ -8,8 +8,8 @@ PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
+		libxml2.so:textproc/libxml2
 
 MASTERDIR=	${.CURDIR}/../postgresql91-server
 
diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile
index 84e5788492b0..3c7ef2a692b1 100644
--- a/databases/postgresql91-docs/Makefile
+++ b/databases/postgresql91-docs/Makefile
@@ -22,11 +22,11 @@ PGDOCSDIR?=	${PREFIX}/${PGDOCSREL}
 sgmldir=	${LOCALBASE}/share/sgml
 dbdir=		${sgmldir}/docbook
 
-BUILD_DEPENDS+=	onsgmls:${PORTSDIR}/textproc/opensp			\
-		openjade:${PORTSDIR}/textproc/openjade			\
-		${sgmldir}/iso8879/catalog:${PORTSDIR}/textproc/iso8879	\
-		${dbdir}/dsssl/modular/catalog:${PORTSDIR}/textproc/dsssl-docbook-modular \
-		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
+BUILD_DEPENDS+=	onsgmls:textproc/opensp			\
+		openjade:textproc/openjade			\
+		${sgmldir}/iso8879/catalog:textproc/iso8879	\
+		${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \
+		docbook-sgml>0:textproc/docbook-sgml
 
 do-build:
 	${MAKE_CMD} -C ${WRKSRC} html
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 0e72fa72df74..f030b45155f6 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -123,7 +123,7 @@ SSL_CONFIGURE_WITH=openssl
 PAM_CONFIGURE_WITH=	pam
 
 XML_CONFIGURE_WITH=	libxml
-XML_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 TZDATA_CONFIGURE_OFF=--with-system-tzdata=/usr/share/zoneinfo
 
@@ -153,7 +153,7 @@ USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS+=--with-icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 PATCHFILES+=	${ICU_PATCHFILE}:icu
-LIB_DEPENDS+=	libicudata.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicudata.so:devel/icu
 .  endif
 .endif # !SLAVE_ONLY
 
@@ -187,7 +187,7 @@ IGNORE=	requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/lib
 CONFIGURE_ARGS+=--with-krb5
 # Allow defining a home built MIT Kerberos by setting KRB5_HOME
 .    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
-LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=	libkrb5.so:security/krb5
 .    endif
 .   endif
 .  endif
diff --git a/databases/postgresql92-contrib/Makefile b/databases/postgresql92-contrib/Makefile
index a90f71b3397a..021eb9d3b892 100644
--- a/databases/postgresql92-contrib/Makefile
+++ b/databases/postgresql92-contrib/Makefile
@@ -8,8 +8,8 @@ PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
+		libxml2.so:textproc/libxml2
 
 MASTERDIR=	${.CURDIR}/../postgresql92-server
 
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index ac5f29b56242..547a34f7f454 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -124,7 +124,7 @@ SSL_CONFIGURE_WITH=openssl
 PAM_CONFIGURE_WITH=	pam
 
 XML_CONFIGURE_WITH=	libxml
-XML_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 TZDATA_CONFIGURE_OFF=--with-system-tzdata=/usr/share/zoneinfo
 
@@ -154,7 +154,7 @@ USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS+=--with-icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 PATCHFILES+=	${ICU_PATCHFILE}:icu
-LIB_DEPENDS+=	libicudata.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicudata.so:devel/icu
 .  endif
 .endif # !SLAVE_ONLY
 
@@ -188,7 +188,7 @@ IGNORE=	requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/lib
 CONFIGURE_ARGS+=--with-krb5
 # Allow defining a home built MIT Kerberos by setting KRB5_HOME
 .    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
-LIB_DEPENDS+=	libkrb5.so.3:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=	libkrb5.so.3:security/krb5
 .    endif
 .   endif
 .  endif
diff --git a/databases/postgresql93-contrib/Makefile b/databases/postgresql93-contrib/Makefile
index 403a664f8f1d..1214e77be667 100644
--- a/databases/postgresql93-contrib/Makefile
+++ b/databases/postgresql93-contrib/Makefile
@@ -8,8 +8,8 @@ PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
+		libxml2.so:textproc/libxml2
 
 MASTERDIR=	${.CURDIR}/../postgresql93-server
 
diff --git a/databases/postgresql94-contrib/Makefile b/databases/postgresql94-contrib/Makefile
index 7fa9b0e4575b..c6665d33f416 100644
--- a/databases/postgresql94-contrib/Makefile
+++ b/databases/postgresql94-contrib/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	databases
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
+		libxml2.so:textproc/libxml2
 
 MASTERDIR=	${.CURDIR}/../postgresql94-server
 
diff --git a/databases/postgresql95-contrib/Makefile b/databases/postgresql95-contrib/Makefile
index 2dda8ff4df8c..bb60cd3bbe57 100644
--- a/databases/postgresql95-contrib/Makefile
+++ b/databases/postgresql95-contrib/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	databases
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
+		libxml2.so:textproc/libxml2
 
 MASTERDIR=	${.CURDIR}/../postgresql95-server
 
diff --git a/databases/postgresql_autodoc/Makefile b/databases/postgresql_autodoc/Makefile
index f4c97480c167..4bd5cf7ae3ed 100644
--- a/databases/postgresql_autodoc/Makefile
+++ b/databases/postgresql_autodoc/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Automatic documentation generator for postgresql databases
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS=	p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-DBD-Pg>=0:databases/p5-DBD-Pg
 
 USES+=		gmake perl5 shebangfix
 SHEBANG_FILES=	postgresql_autodoc.pl
diff --git a/databases/powerarchitect/Makefile b/databases/powerarchitect/Makefile
index 2739fdb2e6eb..7f72bf5e1fd6 100644
--- a/databases/powerarchitect/Makefile
+++ b/databases/powerarchitect/Makefile
@@ -14,9 +14,9 @@ LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	ORACLE_JDBC MYSQL_JDBC PGSQL_JDBC
 
-ORACLE_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/ojdbc-10.2.0.5.jar:${PORTSDIR}/databases/jdbc-oracle10g
-MYSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
-PGSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
+ORACLE_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/ojdbc-10.2.0.5.jar:databases/jdbc-oracle10g
+MYSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
+PGSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc
 
 USE_JAVA=	yes
 
diff --git a/databases/proftpd-mod_sql_odbc/Makefile b/databases/proftpd-mod_sql_odbc/Makefile
index c56916c9bb11..c2b6c89f221c 100644
--- a/databases/proftpd-mod_sql_odbc/Makefile
+++ b/databases/proftpd-mod_sql_odbc/Makefile
@@ -10,7 +10,7 @@ COMMENT=	ODBC ProFTPD module
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 
 DESCR=		${.CURDIR}/pkg-descr
 
diff --git a/databases/proftpd-mod_sql_tds/Makefile b/databases/proftpd-mod_sql_tds/Makefile
index a9c1c4d1aac9..f10f1ed243ee 100644
--- a/databases/proftpd-mod_sql_tds/Makefile
+++ b/databases/proftpd-mod_sql_tds/Makefile
@@ -16,7 +16,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
-LIB_DEPENDS+=	libsybdb.so.5:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libsybdb.so.5:databases/freetds
 _PROFTPD_MODULE_DISTFILES=	mod_sql_tds-4.13${EXTRACT_SUFX}:sql_tds
 _PROFTPD_MODULE_EXTRACT_ONLY=	mod_sql_tds-4.13${EXTRACT_SUFX}
 _PROFTPD_MODULE_MASTER_SITES=	http://labratsoftware.com/mod_sql_tds/:sql_tds \
diff --git a/databases/puppetdb-terminus/Makefile b/databases/puppetdb-terminus/Makefile
index 838b416ea786..72a8020e4ff9 100644
--- a/databases/puppetdb-terminus/Makefile
+++ b/databases/puppetdb-terminus/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PuppetDB storeconfigs backend terminus module
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	puppet38>=0:${PORTSDIR}/sysutils/puppet38
+BUILD_DEPENDS=	puppet38>=0:sysutils/puppet38
 
 CONFLICTS_INSTALL=	puppetdb-terminus4-*
 USE_RUBY=	yes
diff --git a/databases/puppetdb-terminus4/Makefile b/databases/puppetdb-terminus4/Makefile
index c07be246669b..28990d9ff643 100644
--- a/databases/puppetdb-terminus4/Makefile
+++ b/databases/puppetdb-terminus4/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PuppetDB storeconfigs backend terminus module
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	puppet4>=0:${PORTSDIR}/sysutils/puppet4
+BUILD_DEPENDS=	puppet4>=0:sysutils/puppet4
 
 CONFLICTS_INSTALL=	puppetdb-terminus-*
 USE_RUBY=	yes
diff --git a/databases/puppetdb/Makefile b/databases/puppetdb/Makefile
index 1ddd3e2d8fa9..e8e45d4a1822 100644
--- a/databases/puppetdb/Makefile
+++ b/databases/puppetdb/Makefile
@@ -11,10 +11,10 @@ COMMENT=	PuppetDB storeconfigs backend
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		puppet:${PORTSDIR}/sysutils/puppet38
-BUILD_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	bash:shells/bash \
+		puppet:sysutils/puppet38
+BUILD_DEPENDS=	rubygem-facter>=0:sysutils/rubygem-facter \
+		rubygem-rake>=0:devel/rubygem-rake
 
 USE_RC_SUBR=	puppetdb
 
diff --git a/databases/puppetdb4/Makefile b/databases/puppetdb4/Makefile
index 1ec07c481b8e..9bf2895fb97e 100644
--- a/databases/puppetdb4/Makefile
+++ b/databases/puppetdb4/Makefile
@@ -11,8 +11,8 @@ COMMENT=	PuppetDB storeconfigs backend
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		puppet:${PORTSDIR}/sysutils/puppet4
+RUN_DEPENDS=	bash:shells/bash \
+		puppet:sysutils/puppet4
 
 USE_RC_SUBR=	puppetdb
 
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index 9e69ff0e9c03..a349db49c072 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -12,7 +12,7 @@ COMMENT=	C library to read various Paradox files
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		gmake iconv libtool pathfix perl5
 USE_GNOME=	intltool
@@ -25,8 +25,8 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	MANPAGES NLS
 OPTIONS_SUB=	yes
 
-MANPAGES_BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
-			docbook2man:${PORTSDIR}/textproc/docbook-utils
+MANPAGES_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
+			docbook2man:textproc/docbook-utils
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=	gettext
 
diff --git a/databases/py-Elixir/Makefile b/databases/py-Elixir/Makefile
index 43effeaf1577..b4722e0e5df9 100644
--- a/databases/py-Elixir/Makefile
+++ b/databases/py-Elixir/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Declarative Mapper for SQLAlchemy
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.4.0:${PORTSDIR}/databases/py-sqlalchemy06
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.4.0:databases/py-sqlalchemy06
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-Pyrseas/Makefile b/databases/py-Pyrseas/Makefile
index a2362a814b32..4d90e8a12269 100644
--- a/databases/py-Pyrseas/Makefile
+++ b/databases/py-Pyrseas/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Framework and utilities to upgrade and maintain a relational database
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.2:${PORTSDIR}/databases/py-psycopg2 \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.09:${PORTSDIR}/devel/py-yaml
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.2:databases/py-psycopg2 \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile
index d4b70a7fa758..e142c18f3e96 100644
--- a/databases/py-alembic/Makefile
+++ b/databases/py-alembic/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Database migration tool for SQLAlchemy
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.3:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}mako>=0:${PORTSDIR}/textproc/py-mako
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.3:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index 82beb82e01a5..fbbb26871a12 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Backend storage application for graphite
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:${PORTSDIR}/net/py-txamqp \
-		${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:${PORTSDIR}/databases/py-whisper \
-		${PYTHON_PKGNAMEPREFIX}django18>=1.4:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp \
+		${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper \
+		${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18
 
 USE_PYTHON=	distutils
 USES=		python:2 twisted:run
diff --git a/databases/py-cql/Makefile b/databases/py-cql/Makefile
index d7c531400975..cf0bf4d5f8d3 100644
--- a/databases/py-cql/Makefile
+++ b/databases/py-cql/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python DB-API 2.0 client interface for Cassandra
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/thrift/Thrift.py:${PORTSDIR}/devel/py-thrift
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/thrift/Thrift.py:devel/py-thrift
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/databases/py-django-transaction-hooks/Makefile b/databases/py-django-transaction-hooks/Makefile
index d7f9fe5d2eab..8056e965cbff 100644
--- a/databases/py-django-transaction-hooks/Makefile
+++ b/databases/py-django-transaction-hooks/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Django database backends to register transaction-commit hooks
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6.1:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6.1:www/py-django18
 
 NO_ARCH=	yes
 
diff --git a/databases/py-fdb/Makefile b/databases/py-fdb/Makefile
index a4a0b09ad2c6..e7efe1c108d6 100644
--- a/databases/py-fdb/Makefile
+++ b/databases/py-fdb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Firebird RDBMS bindings for Python
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libfbclient.so:${PORTSDIR}/databases/firebird25-client
+LIB_DEPENDS=	libfbclient.so:databases/firebird25-client
 
 NO_ARCH=	yes
 USES=		python
diff --git a/databases/py-flask-sqlalchemy/Makefile b/databases/py-flask-sqlalchemy/Makefile
index 8a888989ee3f..a4b30cbed69a 100644
--- a/databases/py-flask-sqlalchemy/Makefile
+++ b/databases/py-flask-sqlalchemy/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Adds SQLAlchemy support to Flask
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask \
-	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:${PORTSDIR}/databases/py-sqlalchemy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \
+	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:databases/py-sqlalchemy
 
 USES=	python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index a4e22829432a..259f63b61815 100644
--- a/databases/py-forgetsql/Makefile
+++ b/databases/py-forgetsql/Makefile
@@ -23,8 +23,8 @@ PORTDOCS=	BUGS README TODO
 
 OPTIONS_DEFINE=	DOCS MYSQL PGSQL
 
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
-PGSQL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
+PGSQL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/psycopgmodule.so:databases/py-psycopg
 
 .include <bsd.port.options.mk>
 
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 9006ad977874..ae56c622ad06 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings to the GNU dbm library (Python ${PYTHON_VER})
 
 LICENSE=	PSFL
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 PORTSCOUT=	ignore:1
 
diff --git a/databases/py-geoalchemy/Makefile b/databases/py-geoalchemy/Makefile
index be4d4551679a..9ab681175b90 100644
--- a/databases/py-geoalchemy/Makefile
+++ b/databases/py-geoalchemy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Using SQLAlchemy with Spatial Databases
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6.1:${PORTSDIR}/databases/py-sqlalchemy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6.1:databases/py-sqlalchemy
 
 USE_PYTHON=	autoplist distutils
 USES=		python:2
diff --git a/databases/py-geoalchemy2/Makefile b/databases/py-geoalchemy2/Makefile
index 0e68393105ee..642b6117aa09 100644
--- a/databases/py-geoalchemy2/Makefile
+++ b/databases/py-geoalchemy2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Using SQLAlchemy with Spatial Databases
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy08>=0.8:${PORTSDIR}/databases/py-sqlalchemy-devel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy08>=0.8:databases/py-sqlalchemy-devel
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/databases/py-hiredis/Makefile b/databases/py-hiredis/Makefile
index c9d058a8fe44..fdd0f8c931d2 100644
--- a/databases/py-hiredis/Makefile
+++ b/databases/py-hiredis/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python extension that wraps hiredis
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS=	libhiredis.so:databases/hiredis
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-htsql-mysql/Makefile b/databases/py-htsql-mysql/Makefile
index ace8fc6425df..f505105cef74 100644
--- a/databases/py-htsql-mysql/Makefile
+++ b/databases/py-htsql-mysql/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Database Query Language (MySQL Backend for HTSQL)
 
 LICENSE=	AGPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}htsql>2.3:${PORTSDIR}/databases/py-htsql \
-		${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql \
+		${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-htsql-pgsql/Makefile b/databases/py-htsql-pgsql/Makefile
index ec1409f792c0..6fae021d9d7f 100644
--- a/databases/py-htsql-pgsql/Makefile
+++ b/databases/py-htsql-pgsql/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Database Query Language (PostgreSQL Backend for HTSQL)
 
 LICENSE=	AGPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}htsql>2.3:${PORTSDIR}/databases/py-htsql \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql \
+		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-htsql/Makefile b/databases/py-htsql/Makefile
index a9bc20267e99..3845c27aaf82 100644
--- a/databases/py-htsql/Makefile
+++ b/databases/py-htsql/Makefile
@@ -17,7 +17,7 @@ LICENSE=	AGPLv3
 USES=		python:2
 USE_PYTHON=	distutils autoplist
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 .include <bsd.port.mk>
diff --git a/databases/py-kyotocabinet/Makefile b/databases/py-kyotocabinet/Makefile
index cd2075a70805..e1ac258458ea 100644
--- a/databases/py-kyotocabinet/Makefile
+++ b/databases/py-kyotocabinet/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python binding of kyotocabinet
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libkyotocabinet.so:${PORTSDIR}/databases/kyotocabinet
+LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 
 USE_PYTHON=	autoplist distutils
 USES=		python:3
diff --git a/databases/py-leveldb/Makefile b/databases/py-leveldb/Makefile
index fc237e8d7baf..ce58aef1f669 100644
--- a/databases/py-leveldb/Makefile
+++ b/databases/py-leveldb/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Thread-safe Python binding for LevelDB
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libleveldb.so:${PORTSDIR}/databases/leveldb
+LIB_DEPENDS=	libleveldb.so:databases/leveldb
 
 USE_PYTHON=	autoplist concurrent distutils
 USES=		localbase python tar:xz
diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile
index 814b6cafdc97..b504a3fbb2cd 100644
--- a/databases/py-mycli/Makefile
+++ b/databases/py-mycli/Makefile
@@ -13,13 +13,13 @@ COMMENT=	CLI for MySQL Database with auto-completion and syntax highlighting
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=4.1:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.60:${PORTSDIR}/devel/py-prompt_toolkit \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}pymysql>=0.6.2:${PORTSDIR}/databases/py-pymysql \
-		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.16:${PORTSDIR}/databases/py-sqlparse
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.60:devel/py-prompt_toolkit \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}pymysql>=0.6.2:databases/py-pymysql \
+		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.16:databases/py-sqlparse
 
 NO_ARCH=	yes
 USE_MYSQL=	yes
diff --git a/databases/py-mysql2pgsql/Makefile b/databases/py-mysql2pgsql/Makefile
index 32a76c6213cd..d8c94ec2c92b 100644
--- a/databases/py-mysql2pgsql/Makefile
+++ b/databases/py-mysql2pgsql/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Tool for migrating/converting from MySQL to PostgreSQL
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:${PORTSDIR}/databases/py-MySQLdb \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:${PORTSDIR}/databases/py-psycopg2 \
-		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:${PORTSDIR}/devel/py-termcolor \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb \
+		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2 \
+		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile
index bb467ffb5d0d..2961a5652565 100644
--- a/databases/py-odbc/Makefile
+++ b/databases/py-odbc/Makefile
@@ -16,7 +16,7 @@ LICENSE=	MIT
 USES=		python zip
 USE_PYTHON=	distutils autoplist
 
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
-BUILD_DEPENDS+=	unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
+BUILD_DEPENDS+=	unixODBC>=2.2.14_1:databases/unixODBC
 
 .include <bsd.port.mk>
diff --git a/databases/py-peewee/Makefile b/databases/py-peewee/Makefile
index e6d749ccbe13..ed0a9b7f8c43 100644
--- a/databases/py-peewee/Makefile
+++ b/databases/py-peewee/Makefile
@@ -18,8 +18,8 @@ OPTIONS_DEFAULT=	SQLITE
 USES=		python
 USE_PYTHON=	autoplist distutils
 
-SQLITE_BUILD_DEPENDS=	${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
-MYSQL_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:${PORTSDIR}/databases/py-MySQLdb
-PGSQL_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:${PORTSDIR}/databases/py-psycopg2
+SQLITE_BUILD_DEPENDS=	${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3
+MYSQL_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb
+PGSQL_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2
 
 .include <bsd.port.mk>
diff --git a/databases/py-pgcli/Makefile b/databases/py-pgcli/Makefile
index e95052946803..67e728425a98 100644
--- a/databases/py-pgcli/Makefile
+++ b/databases/py-pgcli/Makefile
@@ -12,14 +12,14 @@ COMMENT=	CLI for Postgres Database with auto-completion and syntax highlighting
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=4.1:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}pgspecial>=1.1.0:${PORTSDIR}/databases/py-pgspecial \
-		${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.46:${PORTSDIR}/devel/py-prompt_toolkit \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.4:${PORTSDIR}/databases/py-psycopg2 \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:${PORTSDIR}/devel/py-setproctitle \
-		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.16:${PORTSDIR}/databases/py-sqlparse
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}pgspecial>=1.1.0:databases/py-pgspecial \
+		${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.46:devel/py-prompt_toolkit \
+		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.4:databases/py-psycopg2 \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle \
+		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.16:databases/py-sqlparse
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/databases/py-pgspecial/Makefile b/databases/py-pgspecial/Makefile
index 3473441676b2..2765c4fe3ae2 100644
--- a/databases/py-pgspecial/Makefile
+++ b/databases/py-pgspecial/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Meta-commands handler for Postgres Database
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=4.1:${PORTSDIR}/devel/py-click
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/databases/py-pickledb/Makefile b/databases/py-pickledb/Makefile
index 46afdb7a1f10..5db420fbad12 100644
--- a/databases/py-pickledb/Makefile
+++ b/databases/py-pickledb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lightweight, fast, and simple key-value store
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/databases/py-pickleshare/Makefile b/databases/py-pickleshare/Makefile
index 90b5aaa055fa..e919474437c9 100644
--- a/databases/py-pickleshare/Makefile
+++ b/databases/py-pickleshare/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tiny shelve-like database with concurrency support
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}path.py>0:${PORTSDIR}/devel/py-path.py
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index 32517da96fb5..2bed21984ce7 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -15,8 +15,8 @@ COMMENT=	High performance Python adapter for PostgreSQL
 DEPRECATED=	This port is obsoleted by databases/py-psycopg2. Last consumer of it marked as deprecated
 EXPIRATION_DATE=	2016-03-25
 
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-BUILD_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
+RUN_DEPENDS=	${DATETIME_DEP}:lang/py-mx-base
+BUILD_DEPENDS=	${DATETIME_DEP}:lang/py-mx-base
 
 USES=		gmake pgsql python
 GNU_CONFIGURE=	yes
diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile
index c040aa4057d5..02fa0a2aa9b0 100644
--- a/databases/py-pyPgSQL/Makefile
+++ b/databases/py-pyPgSQL/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python DB-API 2 compliant library for using PostgreSQL databases
 
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
+RUN_DEPENDS=	${DATETIME_DEP}:lang/py-mx-base
 
 USES=	pgsql python
 USE_PYTHON=	distutils
diff --git a/databases/py-pylibmc/Makefile b/databases/py-pylibmc/Makefile
index 5a87c7c9b27f..de153af8761d 100644
--- a/databases/py-pylibmc/Makefile
+++ b/databases/py-pylibmc/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Quick and small memcached client for Python
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
-TEST_DEPENDS=	memcached:${PORTSDIR}/databases/memcached \
-		nosetests:${PORTSDIR}/devel/py-nose
+LIB_DEPENDS=	libmemcached.so:databases/libmemcached
+TEST_DEPENDS=	memcached:databases/memcached \
+		nosetests:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/databases/py-pymssql/Makefile b/databases/py-pymssql/Makefile
index b982694a5c06..bd02be4c66f7 100644
--- a/databases/py-pymssql/Makefile
+++ b/databases/py-pymssql/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Python database interface for MS-SQL. Version 2
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython \
-		${PYTHON_PKGNAMEPREFIX}setuptools-git>0:${PORTSDIR}/devel/py-setuptools-git
-LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
+BUILD_DEPENDS=	cython:lang/cython \
+		${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git
+LIB_DEPENDS=	libsybdb.so:databases/freetds
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/databases/py-pytc/Makefile b/databases/py-pytc/Makefile
index 1cd3625703ab..62abed9ca02c 100644
--- a/databases/py-pytc/Makefile
+++ b/databases/py-pytc/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Tokyo Cabinet Python bindings
 
-LIB_DEPENDS=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-python-rrdtool/Makefile b/databases/py-python-rrdtool/Makefile
index 057b90294ea6..3d22a48bf7c6 100644
--- a/databases/py-python-rrdtool/Makefile
+++ b/databases/py-python-rrdtool/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Python bindings for RRDTool, the graphing and logging utility
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
+LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 USES=		pkgconfig python
 USE_GNOME=	cairo glib20 libxml2
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index a5f0d0ee9b64..82b27a528023 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtSql API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile
index b5025707b88a..0376b5af78e9 100644
--- a/databases/py-qt5-sql/Makefile
+++ b/databases/py-qt5-sql/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtSql API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/databases/py-queries/Makefile b/databases/py-queries/Makefile
index fd2bd8579c4c..d5822c63a948 100644
--- a/databases/py-queries/Makefile
+++ b/databases/py-queries/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simplified PostgreSQL client built upon Psycopg2
 LICENSE=	BSD3CLAUSE
 LICENSE_FILES=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:${PORTSDIR}/databases/py-psycopg2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/databases/py-rb/Makefile b/databases/py-rb/Makefile
index edab94b51200..5af6d787018d 100644
--- a/databases/py-rb/Makefile
+++ b/databases/py-rb/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Rb - the redis blaster
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.6:${PORTSDIR}/databases/py-redis
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.6:databases/py-redis
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile
index 395c214d01c4..99015d50dd87 100644
--- a/databases/py-redis/Makefile
+++ b/databases/py-redis/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Python client for Redis key-value store
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	redis-server:${PORTSDIR}/databases/redis
+TEST_DEPENDS=	redis-server:databases/redis
 
 OPTIONS_DEFINE=	HIREDIS
 
 HIREDIS_DESC=	High performance response parser (via hiredis)
 
-HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>0:${PORTSDIR}/databases/py-hiredis
+HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>0:databases/py-hiredis
 
 USES=		python
 USE_PYTHON=	distutils autoplist concurrent
diff --git a/databases/py-riak/Makefile b/databases/py-riak/Makefile
index c13b27a3aa6d..9bce28c94ed1 100644
--- a/databases/py-riak/Makefile
+++ b/databases/py-riak/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python client for Riak
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}riak_pb>=2.0.0:${PORTSDIR}/devel/py-riak_pb \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.14:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}riak_pb>=2.0.0:devel/py-riak_pb \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 40f408444b64..a6de18fc6a0a 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python interface to RRDTool, the graphing and logging utility
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
+LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-sqlalchemy-devel/Makefile b/databases/py-sqlalchemy-devel/Makefile
index bbae74f2c7ab..dc513c331ccf 100644
--- a/databases/py-sqlalchemy-devel/Makefile
+++ b/databases/py-sqlalchemy-devel/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Python SQL toolkit and Object Relational Mapper
 LICENSE=	MIT
 
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -32,10 +32,10 @@ OPTIONS_DEFAULT=	SQLITE
 SYBASE_DESC=	Sybase backend
 TESTS_DESC=	Include nose for unit tests
 
-MSSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mssql>0:${PORTSDIR}/databases/py-mssql
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2
-SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-SYBASE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sybase>0:${PORTSDIR}/databases/py-sybase
+MSSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mssql>0:databases/py-mssql
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+SYBASE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sybase>0:databases/py-sybase
 TESTS_BUILD_DEPENDS:=	${TEST_DEPENDS}
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
@@ -53,16 +53,16 @@ AL_PORTDOCS_SUBDIR=	core dialects orm
 
 .if ${PORT_OPTIONS:MMYSQL}
 .if ${PYTHON_VER} < 3.0
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
 #.else
 # At the moment databases/py-pymysql does not build with Python3
 # See https://github.com/petehunt/PyMySQL#python-3-0-support
-#RUN_DEPENDS+=	pymysql>=0.5:${PORTSDIR}/databases/py-pymysql
+#RUN_DEPENDS+=	pymysql>=0.5:databases/py-pymysql
 .endif
 .endif
 
 .if ${PYTHON_REL} < 3300
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock
 .endif
 
 .if ${PYTHON_REL} >= 3000
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index 64c1109d7acd..51ab97bf1005 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Database schema migrations for SQLAlchemy
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}Tempita>0:${PORTSDIR}/textproc/py-Tempita \
-		${PYTHON_PKGNAMEPREFIX}decorator>0:${PORTSDIR}/devel/py-decorator
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}Tempita>0:textproc/py-Tempita \
+		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 0625198afcbe..9ee0fe513187 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python SQL toolkit and Object Relational Mapper
 LICENSE=	MIT
 
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 # Python3 ready
 USES=		python
@@ -45,33 +45,33 @@ AL_PORTDOCS_SUBDIR=	core dialects orm
 .endif
 
 .if ${PORT_OPTIONS:MMSSQL}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pymssql.py:${PORTSDIR}/databases/py-mssql
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pymssql.py:databases/py-mssql
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 .if ${PYTHON_VER} < 3.0
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
 #.else
 # At the moment databases/py-pymysql does not build with Python3
 # See https://github.com/petehunt/PyMySQL#python-3-0-support
-#RUN_DEPENDS+=	pymysql>=0.5:${PORTSDIR}/databases/py-pymysql
+#RUN_DEPENDS+=	pymysql>=0.5:databases/py-pymysql
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MSYBASE}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase
 .endif
 
 post-patch:
diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile
index 00960afa2ad5..9fd961428d35 100644
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@@ -49,27 +49,27 @@ AL_PORTDOCS_SUBDIR=	core dialects orm
 .endif
 
 .if ${PORT_OPTIONS:MMSSQL}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pymssql.py:${PORTSDIR}/databases/py-mssql
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pymssql.py:databases/py-mssql
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} && ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
 .endif
 
 .if ${PORT_OPTIONS:MNOSE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>=1.0.0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>=1.0.0:devel/py-nose
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MSYBASE}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase
 .endif
 
 post-patch:
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index 96ed67f481fa..688bc9e4aa0d 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Standard Python binding to the SQLite3 library (Python ${PYTHON_VER})
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKDIR}/Python-${PORTVERSION}/LICENSE
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 PORTSCOUT=	ignore:1
 
diff --git a/databases/py-sqlite3dbm/Makefile b/databases/py-sqlite3dbm/Makefile
index 19e0f52fbc8f..a26a2d5a2887 100644
--- a/databases/py-sqlite3dbm/Makefile
+++ b/databases/py-sqlite3dbm/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Sqlite-backed dictionary
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-sqlobject/Makefile b/databases/py-sqlobject/Makefile
index 5f10f02ed336..a9839c69b274 100644
--- a/databases/py-sqlobject/Makefile
+++ b/databases/py-sqlobject/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python object for manipulation with SQL table row
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}formencode>=1.2.2:${PORTSDIR}/www/py-formencode
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}formencode>=1.2.2:www/py-formencode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
@@ -27,23 +27,23 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:${PORTSDIR}/databases/py-psycopg2
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:databases/py-psycopg2
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MMSSQL}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pymssql.py:${PORTSDIR}/databases/py-mssql
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pymssql.py:databases/py-mssql
 .endif
 
 .if ${PORT_OPTIONS:MSYBASE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sybase>=0.37:${PORTSDIR}/databases/py-sybase
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sybase>=0.37:databases/py-sybase
 .endif
 
 # currently MaxDB(SAP), ADODB are not supported
diff --git a/databases/py-swift/Makefile b/databases/py-swift/Makefile
index d561317e3989..0e10756a1752 100644
--- a/databases/py-swift/Makefile
+++ b/databases/py-swift/Makefile
@@ -12,20 +12,20 @@ COMMENT=	Highly available, distributed, eventually consistent object/blob store
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:${PORTSDIR}/devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:${PORTSDIR}/www/py-pastedeploy \
-		${PYTHON_PKGNAMEPREFIX}dnspython>=1.10.0:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.8:${PORTSDIR}/net/py-eventlet \
-		${PYTHON_PKGNAMEPREFIX}netifaces>=0:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}swiftclient>=0:${PORTSDIR}/databases/py-swiftclient \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}webob>=0.9.8:${PORTSDIR}/www/py-webob \
-		${PYTHON_PKGNAMEPREFIX}xattr>=0:${PORTSDIR}/devel/py-xattr \
-		memcached>=0:${PORTSDIR}/databases/memcached \
-		rsync>=3.0:${PORTSDIR}/net/rsync
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:www/py-pastedeploy \
+		${PYTHON_PKGNAMEPREFIX}dnspython>=1.10.0:dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.8:net/py-eventlet \
+		${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}swiftclient>=0:databases/py-swiftclient \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}webob>=0.9.8:www/py-webob \
+		${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr \
+		memcached>=0:databases/memcached \
+		rsync>=3.0:net/rsync
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-swiftclient/Makefile b/databases/py-swiftclient/Makefile
index 029fa5855cf8..28020677dbeb 100644
--- a/databases/py-swiftclient/Makefile
+++ b/databases/py-swiftclient/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Python client library for OpenStack Object Storage (Swift)
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:${PORTSDIR}/devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>=2.1.3:${PORTSDIR}/devel/py-futures \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}requests>=1.1:${PORTSDIR}/www/py-requests
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>=2.1.3:devel/py-futures \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index feec2a5e4ceb..39a26d232c5f 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python Database API interface to the Sybase RDBMS
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libct.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS=	libct.so:databases/freetds
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/databases/pypy-gdbm/Makefile b/databases/pypy-gdbm/Makefile
index e85b50d1c59e..95e3e13c1664 100644
--- a/databases/pypy-gdbm/Makefile
+++ b/databases/pypy-gdbm/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	databases python
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	PyPy bindings to the GNU dbm library
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 CFFI_NAME=	ffi
 
diff --git a/databases/pypy-sqlite3/Makefile b/databases/pypy-sqlite3/Makefile
index f40f06567eec..1d87646d56d5 100644
--- a/databases/pypy-sqlite3/Makefile
+++ b/databases/pypy-sqlite3/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	databases python
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Standard PyPy binding to the SQLite3 library
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 CFFI_NAME=	_ffi
 
diff --git a/databases/pyspatialite/Makefile b/databases/pyspatialite/Makefile
index 66e9fd230b23..cc0e262b0d49 100644
--- a/databases/pyspatialite/Makefile
+++ b/databases/pyspatialite/Makefile
@@ -15,10 +15,10 @@ COMMENT=	DB-API 2.0 interface for SQLite 3.x with Spatialite
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libspatialite.so:${PORTSDIR}/databases/spatialite \
-		libgeos_c.so:${PORTSDIR}/graphics/geos \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libfreexl.so:${PORTSDIR}/textproc/freexl
+LIB_DEPENDS=	libspatialite.so:databases/spatialite \
+		libgeos_c.so:graphics/geos \
+		libproj.so:graphics/proj \
+		libfreexl.so:textproc/freexl
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/databases/qdbm-plus/Makefile b/databases/qdbm-plus/Makefile
index 1d883c657b4e..a8a959af2135 100644
--- a/databases/qdbm-plus/Makefile
+++ b/databases/qdbm-plus/Makefile
@@ -14,8 +14,8 @@ COMMENT=	C++ API for QDBM
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
+		libqdbm.so:databases/qdbm
 
 USES=		iconv shebangfix
 SHEBANG_FILES=	xapidoc/installdox
diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index 70a80f81139f..3137fe56d9eb 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Quick Database Manager
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 USES=		iconv
 GNU_CONFIGURE=	yes
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index 2b3bd4d7297e..101519d7c6f8 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	2
 DB=		odbc
 COMMENT=	Qt Open Database Connectivity plugin
 
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 LDFLAGS+=	-lodbc
 
diff --git a/databases/qt5-sqldrivers-odbc/Makefile b/databases/qt5-sqldrivers-odbc/Makefile
index 9d8472a729c0..86e5798e1c14 100644
--- a/databases/qt5-sqldrivers-odbc/Makefile
+++ b/databases/qt5-sqldrivers-odbc/Makefile
@@ -5,6 +5,6 @@ COMMENT=	Qt ${DB_DESC} plugin
 DB=		ODBC
 DB_DESC=	Open Database Connectivity
 
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
diff --git a/databases/qt5-sqldrivers-tds/Makefile b/databases/qt5-sqldrivers-tds/Makefile
index 0997968fb1d4..9a5b223c21c2 100644
--- a/databases/qt5-sqldrivers-tds/Makefile
+++ b/databases/qt5-sqldrivers-tds/Makefile
@@ -3,6 +3,6 @@
 DB=		TDS
 DB_DESC=	TDS Database Connectivity
 
-LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS=	libsybdb.so:databases/freetds
 
 .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 653e5fd1f00d..0dedd3b58705 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -32,7 +32,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
 .if ${PORT_OPTIONS:MTRIB}
 CATEGORIES+=	ruby
 USE_RUBY=	yes
-RUN_DEPENDS=	rubygem-redis>=2.2:${PORTSDIR}/databases/rubygem-redis
+RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
@@ -41,7 +41,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.lua
 .endif
 
 .if ${PORT_OPTIONS:MLUAJIT}
-LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.luajit
 .endif
 
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 81fff28b1b71..015cb889f1e6 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -27,7 +27,7 @@ TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
 .if ${PORT_OPTIONS:MTRIB}
 CATEGORIES+=	ruby
 USE_RUBY=	yes
-RUN_DEPENDS=	rubygem-redis>=2.2:${PORTSDIR}/databases/rubygem-redis
+RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
@@ -36,7 +36,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.lua
 .endif
 
 .if ${PORT_OPTIONS:MLUAJIT}
-LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.luajit
 .endif
 
diff --git a/databases/riak/Makefile b/databases/riak/Makefile
index 305a38725889..a9e958ad1644 100644
--- a/databases/riak/Makefile
+++ b/databases/riak/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Riak is an open source, distributed, noSQL database
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/erlang15/bin/erlc:${PORTSDIR}/lang/erlang-runtime15
+BUILD_DEPENDS=	${LOCALBASE}/lib/erlang15/bin/erlc:lang/erlang-runtime15
 
 USES=		gmake readline shebangfix
 SHEBANG_FILES=	deps/eper/priv/bin/dtop \
diff --git a/databases/riak2/Makefile b/databases/riak2/Makefile
index fd038602b39d..b12a0430bfdd 100644
--- a/databases/riak2/Makefile
+++ b/databases/riak2/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Riak is an open source, distributed, noSQL database
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/riak-erlang/bin/erlc:${PORTSDIR}/lang/erlang-riak
+BUILD_DEPENDS=	${LOCALBASE}/lib/riak-erlang/bin/erlc:lang/erlang-riak
 
 USES=		gmake readline shebangfix
 SHEBANG_FILES=	deps/eper/priv/bin/* \
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index e8b8dc0af346..3d7b0f02815c 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Persistent key-value store for fast storage environments
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgflags.so:${PORTSDIR}/devel/gflags \
-		libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS=	libgflags.so:devel/gflags \
+		libsnappy.so:archivers/snappy
 
 OPTIONS_DEFINE=	DEBUG
 
diff --git a/databases/rrdman/Makefile b/databases/rrdman/Makefile
index 883245df7835..3de105b5a667 100644
--- a/databases/rrdman/Makefile
+++ b/databases/rrdman/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/rrfw/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Apply Holt-Winters prediction parameters to RRD data
 
-BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
+BUILD_DEPENDS=	rrdtool:databases/rrdtool
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	YES
diff --git a/databases/rrdmerge/Makefile b/databases/rrdmerge/Makefile
index 13d031531143..1309da1d49bd 100644
--- a/databases/rrdmerge/Makefile
+++ b/databases/rrdmerge/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Utility to merge existing RRD data from backups into new RRD files
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS=	rrdtool:databases/rrdtool
 
 USES=		python shebangfix tar:tbz2
 SHEBANG_FILES=	rrdmergetree
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 7967f6e6a807..5ca3d8f9d184 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -39,10 +39,10 @@ PERL_DESC=	Build PERL module
 PYTHON_DESC=	Build PYTHON bindings
 RUBY_DESC=	Build RUBY bindings
 
-DEJAVU_RUN_DEPENDS=	dejavu>0:${PORTSDIR}/x11-fonts/dejavu
+DEJAVU_RUN_DEPENDS=	dejavu>0:x11-fonts/dejavu
 GRAPH_CONFIGURE_OFF=	--disable-rrdcgi --disable-rrd_graph
-GRAPH_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-			libpng.so:${PORTSDIR}/graphics/png
+GRAPH_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+			libpng.so:graphics/png
 GRAPH_USE=		GNOME=cairo,pango
 GRAPH_USES=		gnome
 MMAP_CONFIGURE_ENABLE=	mmap
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index 35e325bef054..d32e89a05d39 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -11,9 +11,9 @@ PKGNAMESUFFIX=	12
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Round Robin Database Tools v1.2
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libart_lgpl_2.so:${PORTSDIR}/graphics/libart_lgpl \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libart_lgpl_2.so:graphics/libart_lgpl \
+		libpng.so:graphics/png
 
 CONFLICTS=	rrdtool10-* rrdtool-1.*
 
diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile
index ca35014dc666..546009ac7720 100644
--- a/databases/ruby-gdbm/Makefile
+++ b/databases/ruby-gdbm/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Ruby extension to GDBM library
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-FETCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+FETCH_DEPENDS=	${NONEXISTENT}:${RUBY_PORT}:patch
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 PLIST_FILES=	%%RUBY_ARCHLIBDIR%%/gdbm.so
 USE_RUBY=	yes
diff --git a/databases/ruby-odbc/Makefile b/databases/ruby-odbc/Makefile
index 048ab8dffede..662db56b1d57 100644
--- a/databases/ruby-odbc/Makefile
+++ b/databases/ruby-odbc/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Ruby extension library to use ODBC data sources
 
 OPTIONS_DEFINe=	DOCS EXAMPLES
 
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/databases/ruby-qdbm/Makefile b/databases/ruby-qdbm/Makefile
index fac0cd542a74..ae78d7049dd3 100644
--- a/databases/ruby-qdbm/Makefile
+++ b/databases/ruby-qdbm/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Ruby API for QDBM
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
 
-LIB_DEPENDS=	libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS=	libqdbm.so:databases/qdbm
 
 USES=		iconv shebangfix
 SHEBANG_FILES=	curia/rbcrtest depot/rbdptest myrbdoc villa/rbvltest
diff --git a/databases/ruby-rdbc1/Makefile b/databases/ruby-rdbc1/Makefile
index f808422e7bed..3fd81411909d 100644
--- a/databases/ruby-rdbc1/Makefile
+++ b/databases/ruby-rdbc1/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby Database Connectivity
 
-RUN_DEPENDS=	rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
+RUN_DEPENDS=	rubygem-pg>=0:databases/rubygem-pg
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/databases/ruby-sybct/Makefile b/databases/ruby-sybct/Makefile
index 7f272a1deb80..8e4f1b2ae1b0 100644
--- a/databases/ruby-sybct/Makefile
+++ b/databases/ruby-sybct/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby module for accessing Sybase databases
 
-LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS=	libsybdb.so:databases/freetds
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/databases/ruby-tokyocabinet/Makefile b/databases/ruby-tokyocabinet/Makefile
index 220de65e3150..d5fe5f78e922 100644
--- a/databases/ruby-tokyocabinet/Makefile
+++ b/databases/ruby-tokyocabinet/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	dgerow@afflictions.org
 COMMENT=	Ruby interface to the Tokyo Cabinet DB engine
 
-LIB_DEPENDS=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/databases/rubygem-activemodel/Makefile b/databases/rubygem-activemodel/Makefile
index 5384f998a874..5983eabfc089 100644
--- a/databases/rubygem-activemodel/Makefile
+++ b/databases/rubygem-activemodel/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Toolkit for building modeling frameworks
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-builder>=3.0.0:${PORTSDIR}/devel/rubygem-builder
+RUN_DEPENDS=	rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \
+		rubygem-builder>=3.0.0:devel/rubygem-builder
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-activemodel4/Makefile b/databases/rubygem-activemodel4/Makefile
index 3c7b9f9c226f..a04fc3894261 100644
--- a/databases/rubygem-activemodel4/Makefile
+++ b/databases/rubygem-activemodel4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Toolkit for building modeling frameworks
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-builder32>=3.2.2:${PORTSDIR}/devel/rubygem-builder32
+RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-builder32>=3.2.2:devel/rubygem-builder32
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-activerecord-jdbc-adapter/Makefile b/databases/rubygem-activerecord-jdbc-adapter/Makefile
index 50632276fae8..2c57c35a4f05 100644
--- a/databases/rubygem-activerecord-jdbc-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbc-adapter/Makefile
@@ -12,8 +12,8 @@ COMMENT=	JDBC adapter for ActiveRecord, for use within JRuby on Rails
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	jruby:${PORTSDIR}/lang/jruby \
-		rubygem-activerecord4>=2.2:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS=	jruby:lang/jruby \
+		rubygem-activerecord4>=2.2:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
index 5cf5d32820e8..ae0af6409ff5 100644
--- a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
@@ -12,9 +12,9 @@ COMMENT=	ActiveRecord driver for MySQL using JDBC running under JRuby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	jruby:${PORTSDIR}/lang/jruby \
-		rubygem-activerecord-jdbc-adapter>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activerecord-jdbc-adapter \
-		rubygem-jdbc-mysql>=5.1.22:${PORTSDIR}/databases/rubygem-jdbc-mysql
+RUN_DEPENDS=	jruby:lang/jruby \
+		rubygem-activerecord-jdbc-adapter>=${PORTVERSION}:databases/rubygem-activerecord-jdbc-adapter \
+		rubygem-jdbc-mysql>=5.1.22:databases/rubygem-jdbc-mysql
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-activerecord-mysql-adapter/Makefile b/databases/rubygem-activerecord-mysql-adapter/Makefile
index 0233dfdf263e..48ad9c374fd9 100644
--- a/databases/rubygem-activerecord-mysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-mysql-adapter/Makefile
@@ -11,9 +11,9 @@ COMMENT=	ActiveRecord adapter for MySQL, based on mysql gem
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activerecord>=3.2.9:${PORTSDIR}/databases/rubygem-activerecord \
-		rubygem-activesupport>=3.2.9:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-mysql>=2.9.0:${PORTSDIR}/databases/rubygem-mysql
+RUN_DEPENDS=	rubygem-activerecord>=3.2.9:databases/rubygem-activerecord \
+		rubygem-activesupport>=3.2.9:devel/rubygem-activesupport \
+		rubygem-mysql>=2.9.0:databases/rubygem-mysql
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/databases/rubygem-activerecord-session_store/Makefile b/databases/rubygem-activerecord-session_store/Makefile
index b80dad195aac..685f19206ec3 100644
--- a/databases/rubygem-activerecord-session_store/Makefile
+++ b/databases/rubygem-activerecord-session_store/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Action Dispatch session store backed by an Active Record class
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=4.0.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activerecord4>=4.0.0:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-railties4>=4.0.0:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-actionpack4>=4.0.0:www/rubygem-actionpack4 \
+		rubygem-activerecord4>=4.0.0:databases/rubygem-activerecord4 \
+		rubygem-railties4>=4.0.0:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-activerecord/Makefile b/databases/rubygem-activerecord/Makefile
index 79046ea805af..4f8a76bfba7a 100644
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Object-relational mapping layer for Rails MVC Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activemodel \
-		rubygem-activesupport>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-arel3>=3.0.3:${PORTSDIR}/databases/rubygem-arel3 \
-		rubygem-tzinfo03>=0.3.29:${PORTSDIR}/devel/rubygem-tzinfo03
+RUN_DEPENDS=	rubygem-activemodel>=${PORTVERSION}:databases/rubygem-activemodel \
+		rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \
+		rubygem-arel3>=3.0.3:databases/rubygem-arel3 \
+		rubygem-tzinfo03>=0.3.29:devel/rubygem-tzinfo03
 
 NO_ARCH=	yes
 USE_RUBY=	yes
@@ -29,8 +29,8 @@ SQLITE3_DESC=	Use native SQLite3 bindings
 
 GEM_ENV+=	LANG=en_US.UTF-8
 
-MYSQL_RUN_DEPENDS=	${RUBY_PKGNAMEPREFIX}mysql>=0:${PORTSDIR}/databases/ruby-mysql
-PGSQL_RUN_DEPENDS=	rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
-SQLITE3_RUN_DEPENDS=	rubygem-sqlite3>=1.2.1:${PORTSDIR}/databases/rubygem-sqlite3
+MYSQL_RUN_DEPENDS=	${RUBY_PKGNAMEPREFIX}mysql>=0:databases/ruby-mysql
+PGSQL_RUN_DEPENDS=	rubygem-pg>=0:databases/rubygem-pg
+SQLITE3_RUN_DEPENDS=	rubygem-sqlite3>=1.2.1:databases/rubygem-sqlite3
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord4/Makefile b/databases/rubygem-activerecord4/Makefile
index 5d1af1574d1e..c526c51d8387 100644
--- a/databases/rubygem-activerecord4/Makefile
+++ b/databases/rubygem-activerecord4/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Object-relational mapping layer for Rails MVC Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-arel6>=6.0.0:${PORTSDIR}/databases/rubygem-arel6
+RUN_DEPENDS=	rubygem-activemodel4>=${PORTVERSION}:databases/rubygem-activemodel4 \
+		rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-arel6>=6.0.0:databases/rubygem-arel6
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-after_commit_queue/Makefile b/databases/rubygem-after_commit_queue/Makefile
index 8507786251f4..c57cf12a033c 100644
--- a/databases/rubygem-after_commit_queue/Makefile
+++ b/databases/rubygem-after_commit_queue/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows to run callbacks after transaction is committed
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS?=	rubygem-activerecord4>=3.0:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS?=	rubygem-activerecord4>=3.0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-amalgalite/Makefile b/databases/rubygem-amalgalite/Makefile
index afe53af09806..13ed667c22bd 100644
--- a/databases/rubygem-amalgalite/Makefile
+++ b/databases/rubygem-amalgalite/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Embeds the SQLite database engine in a Ruby extension
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-arrayfields>=4.9:${PORTSDIR}/devel/rubygem-arrayfields
+RUN_DEPENDS=	rubygem-arrayfields>=4.9:devel/rubygem-arrayfields
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/databases/rubygem-arel-helpers/Makefile b/databases/rubygem-arel-helpers/Makefile
index a99501ba336e..74e64b1126fa 100644
--- a/databases/rubygem-arel-helpers/Makefile
+++ b/databases/rubygem-arel-helpers/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Helpers to construct database queries with ActiveRecord and Arel
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activerecord>=3.1.0:${PORTSDIR}/databases/rubygem-activerecord
+RUN_DEPENDS=	rubygem-activerecord>=3.1.0:databases/rubygem-activerecord
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-awesome_nested_set/Makefile b/databases/rubygem-awesome_nested_set/Makefile
index 1e98fbbf9da0..1611a209eb51 100644
--- a/databases/rubygem-awesome_nested_set/Makefile
+++ b/databases/rubygem-awesome_nested_set/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Nested set implementation for Active Record
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.0.0:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=4.0.0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-bigrecord/Makefile b/databases/rubygem-bigrecord/Makefile
index d72cafb742f2..67ba57bdd511 100644
--- a/databases/rubygem-bigrecord/Makefile
+++ b/databases/rubygem-bigrecord/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Intended to work as a drop-in for Rails applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord>=0:${PORTSDIR}/databases/rubygem-activerecord \
-		rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-uuidtools>=2.0.0:${PORTSDIR}/devel/rubygem-uuidtools
+RUN_DEPENDS=	rubygem-activerecord>=0:databases/rubygem-activerecord \
+		rubygem-activesupport>=0:devel/rubygem-activesupport \
+		rubygem-uuidtools>=2.0.0:devel/rubygem-uuidtools
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-couchrest/Makefile b/databases/rubygem-couchrest/Makefile
index 387d4e489fbb..d8be088942c4 100644
--- a/databases/rubygem-couchrest/Makefile
+++ b/databases/rubygem-couchrest/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Provides a simple interface on top of CouchDBs RESTful HTTP API
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-mime-types>=1.15:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-multi_json>=1.7:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rest-client>=1.8.0:${PORTSDIR}/www/rubygem-rest-client
+RUN_DEPENDS=	rubygem-mime-types>=1.15:misc/rubygem-mime-types \
+		rubygem-multi_json>=1.7:devel/rubygem-multi_json \
+		rubygem-rest-client>=1.8.0:www/rubygem-rest-client
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-data_objects/Makefile b/databases/rubygem-data_objects/Makefile
index c1e24d59ee50..d5e6447acb2a 100644
--- a/databases/rubygem-data_objects/Makefile
+++ b/databases/rubygem-data_objects/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Unified Ruby API for popular databases
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.1:${PORTSDIR}/www/rubygem-addressable
+RUN_DEPENDS=	rubygem-addressable>=2.1:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-datamapper/Makefile b/databases/rubygem-datamapper/Makefile
index ee8048932258..6ff4bf14491e 100644
--- a/databases/rubygem-datamapper/Makefile
+++ b/databases/rubygem-datamapper/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Fast, thread-safe, object-relational mapper
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-aggregates>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-aggregates \
-		rubygem-dm-constraints>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-constraints \
-		rubygem-dm-core>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-core \
-		rubygem-dm-migrations>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-migrations \
-		rubygem-dm-serializer>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-serializer \
-		rubygem-dm-timestamps>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-timestamps \
-		rubygem-dm-transactions>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-transactions \
-		rubygem-dm-types>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-types \
-		rubygem-dm-validations>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-validations
+RUN_DEPENDS=	rubygem-dm-aggregates>=${PORTVERSION}:databases/rubygem-dm-aggregates \
+		rubygem-dm-constraints>=${PORTVERSION}:databases/rubygem-dm-constraints \
+		rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core \
+		rubygem-dm-migrations>=${PORTVERSION}:databases/rubygem-dm-migrations \
+		rubygem-dm-serializer>=${PORTVERSION}:databases/rubygem-dm-serializer \
+		rubygem-dm-timestamps>=${PORTVERSION}:databases/rubygem-dm-timestamps \
+		rubygem-dm-transactions>=${PORTVERSION}:databases/rubygem-dm-transactions \
+		rubygem-dm-types>=${PORTVERSION}:databases/rubygem-dm-types \
+		rubygem-dm-validations>=${PORTVERSION}:databases/rubygem-dm-validations
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dbd-mysql/Makefile b/databases/rubygem-dbd-mysql/Makefile
index d85857cb3aa2..784f51c61ac4 100644
--- a/databases/rubygem-dbd-mysql/Makefile
+++ b/databases/rubygem-dbd-mysql/Makefile
@@ -10,8 +10,8 @@ COMMENT=	MySQL driver for DBI-for-Ruby
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	rubygem-dbi>=0:${PORTSDIR}/databases/rubygem-dbi \
-		rubygem-mysql>=0:${PORTSDIR}/databases/rubygem-mysql
+RUN_DEPENDS=	rubygem-dbi>=0:databases/rubygem-dbi \
+		rubygem-mysql>=0:databases/rubygem-mysql
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/databases/rubygem-dbd-odbc/Makefile b/databases/rubygem-dbd-odbc/Makefile
index 4f41cf8a6c9f..e4c104f7036f 100644
--- a/databases/rubygem-dbd-odbc/Makefile
+++ b/databases/rubygem-dbd-odbc/Makefile
@@ -10,8 +10,8 @@ COMMENT=	ODBC driver for DBI-for-Ruby
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	rubygem-dbi>=0:${PORTSDIR}/databases/rubygem-dbi \
-		${RUBY_SITEARCHLIBDIR}/odbc.so:${PORTSDIR}/databases/ruby-odbc
+RUN_DEPENDS=	rubygem-dbi>=0:databases/rubygem-dbi \
+		${RUBY_SITEARCHLIBDIR}/odbc.so:databases/ruby-odbc
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dbd-pg/Makefile b/databases/rubygem-dbd-pg/Makefile
index 51c40854f126..59cf09ca7a7e 100644
--- a/databases/rubygem-dbd-pg/Makefile
+++ b/databases/rubygem-dbd-pg/Makefile
@@ -11,8 +11,8 @@ COMMENT=	PostgreSQL driver for DBI-for-Ruby
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-dbi>=0.4.0:${PORTSDIR}/databases/rubygem-dbi \
-		rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
+RUN_DEPENDS=	rubygem-dbi>=0.4.0:databases/rubygem-dbi \
+		rubygem-pg>=0:databases/rubygem-pg
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-dbd-sqlite3/Makefile b/databases/rubygem-dbd-sqlite3/Makefile
index 10d57e185b12..cfc4b81d2a43 100644
--- a/databases/rubygem-dbd-sqlite3/Makefile
+++ b/databases/rubygem-dbd-sqlite3/Makefile
@@ -11,8 +11,8 @@ COMMENT=	SQLite3 driver for DBI-for-Ruby
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	rubygem-dbi>=0.4.0:${PORTSDIR}/databases/rubygem-dbi \
-		rubygem-sqlite3-ruby>=0:${PORTSDIR}/databases/rubygem-sqlite3-ruby
+RUN_DEPENDS=	rubygem-dbi>=0.4.0:databases/rubygem-dbi \
+		rubygem-sqlite3-ruby>=0:databases/rubygem-sqlite3-ruby
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dbi/Makefile b/databases/rubygem-dbi/Makefile
index 152ffc33b37a..bd4673246bef 100644
--- a/databases/rubygem-dbi/Makefile
+++ b/databases/rubygem-dbi/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Vendor independent interface for accessing databases
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	rubygem-deprecated2>=2.0.1:${PORTSDIR}/devel/rubygem-deprecated2 \
-		rubygem-aspectr>=0:${PORTSDIR}/devel/rubygem-aspectr
+RUN_DEPENDS=	rubygem-deprecated2>=2.0.1:devel/rubygem-deprecated2 \
+		rubygem-aspectr>=0:devel/rubygem-aspectr
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-active_model/Makefile b/databases/rubygem-dm-active_model/Makefile
index 7a3a0bdbf66f..d1dafc9a7528 100644
--- a/databases/rubygem-dm-active_model/Makefile
+++ b/databases/rubygem-dm-active_model/Makefile
@@ -11,8 +11,8 @@ COMMENT=	DM plugin for active_model compliance and thus rails 3 compatibility
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activemodel>=3.0:${PORTSDIR}/databases/rubygem-activemodel \
-		rubygem-dm-core>=1.2.0:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-activemodel>=3.0:databases/rubygem-activemodel \
+		rubygem-dm-core>=1.2.0:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-aggregates/Makefile b/databases/rubygem-dm-aggregates/Makefile
index 2b0680e15684..4c07401d06ce 100644
--- a/databases/rubygem-dm-aggregates/Makefile
+++ b/databases/rubygem-dm-aggregates/Makefile
@@ -11,7 +11,7 @@ COMMENT=	DataMapper plugin providing support for aggregates
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-chunked_query/Makefile b/databases/rubygem-dm-chunked_query/Makefile
index a03a700fcb43..3cde1e522af1 100644
--- a/databases/rubygem-dm-chunked_query/Makefile
+++ b/databases/rubygem-dm-chunked_query/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Allows performing chunked queries
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-aggregates>=1.0:${PORTSDIR}/databases/rubygem-dm-aggregates \
-		rubygem-dm-core>=1.0:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-dm-aggregates>=1.0:databases/rubygem-dm-aggregates \
+		rubygem-dm-core>=1.0:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-constraints/Makefile b/databases/rubygem-dm-constraints/Makefile
index 66d4f6034f53..7cc7b319f82f 100644
--- a/databases/rubygem-dm-constraints/Makefile
+++ b/databases/rubygem-dm-constraints/Makefile
@@ -11,7 +11,7 @@ COMMENT=	DataMapper plugin constraining relationships
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-core/Makefile b/databases/rubygem-dm-core/Makefile
index 9732b25d06ae..f224a83aff81 100644
--- a/databases/rubygem-dm-core/Makefile
+++ b/databases/rubygem-dm-core/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Object/Relational Mapper for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-dm-devise/Makefile b/databases/rubygem-dm-devise/Makefile
index 4a2fbca80cda..d66415d174a8 100644
--- a/databases/rubygem-dm-devise/Makefile
+++ b/databases/rubygem-dm-devise/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Adds DataMapper support to devise
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-devise>=1.3:${PORTSDIR}/devel/rubygem-devise \
-		rubygem-dm-core>=1.0.2:${PORTSDIR}/databases/rubygem-dm-core \
-		rubygem-dm-migrations>=1.0.2:${PORTSDIR}/databases/rubygem-dm-migrations \
-		rubygem-dm-rails>=1.0.2:${PORTSDIR}/databases/rubygem-dm-rails \
-		rubygem-dm-serializer>=1.0.2:${PORTSDIR}/databases/rubygem-dm-serializer \
-		rubygem-dm-timestamps>=1.0.2:${PORTSDIR}/databases/rubygem-dm-timestamps
+RUN_DEPENDS=	rubygem-devise>=1.3:devel/rubygem-devise \
+		rubygem-dm-core>=1.0.2:databases/rubygem-dm-core \
+		rubygem-dm-migrations>=1.0.2:databases/rubygem-dm-migrations \
+		rubygem-dm-rails>=1.0.2:databases/rubygem-dm-rails \
+		rubygem-dm-serializer>=1.0.2:databases/rubygem-dm-serializer \
+		rubygem-dm-timestamps>=1.0.2:databases/rubygem-dm-timestamps
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-dm-do-adapter/Makefile b/databases/rubygem-dm-do-adapter/Makefile
index 03ee09120122..fea7a53b0797 100644
--- a/databases/rubygem-dm-do-adapter/Makefile
+++ b/databases/rubygem-dm-do-adapter/Makefile
@@ -11,8 +11,8 @@ COMMENT=	DataObjects Adapter for DataMapper
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-data_objects>=0.10.6:${PORTSDIR}/databases/rubygem-data_objects \
-		rubygem-dm-core>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-data_objects>=0.10.6:databases/rubygem-data_objects \
+		rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-migrations/Makefile b/databases/rubygem-dm-migrations/Makefile
index fdd924338d46..3e70733c57ab 100644
--- a/databases/rubygem-dm-migrations/Makefile
+++ b/databases/rubygem-dm-migrations/Makefile
@@ -10,7 +10,7 @@ COMMENT=	DataMapper plugin for writing and specifying migrations
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-mysql-adapter/Makefile b/databases/rubygem-dm-mysql-adapter/Makefile
index 3c4f60dade50..45bd9401de9f 100644
--- a/databases/rubygem-dm-mysql-adapter/Makefile
+++ b/databases/rubygem-dm-mysql-adapter/Makefile
@@ -11,8 +11,8 @@ COMMENT=	MySQL Adapter for DataMapper
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-do-adapter \
-		rubygem-do_mysql>=0.10.6:${PORTSDIR}/databases/rubygem-do_mysql
+RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapter \
+		rubygem-do_mysql>=0.10.6:databases/rubygem-do_mysql
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-observer/Makefile b/databases/rubygem-dm-observer/Makefile
index c9cb72772f1f..d6abc8209136 100644
--- a/databases/rubygem-dm-observer/Makefile
+++ b/databases/rubygem-dm-observer/Makefile
@@ -11,7 +11,7 @@ COMMENT=	DataMapper plugin for observing Resources
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-pager/Makefile b/databases/rubygem-dm-pager/Makefile
index 0e90af3cf19f..d096ad847135 100644
--- a/databases/rubygem-dm-pager/Makefile
+++ b/databases/rubygem-dm-pager/Makefile
@@ -11,8 +11,8 @@ COMMENT=	DataMapper Pagination
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-aggregates>=0.10.1:${PORTSDIR}/databases/rubygem-dm-aggregates \
-		rubygem-dm-core>=0.10.1:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-dm-aggregates>=0.10.1:databases/rubygem-dm-aggregates \
+		rubygem-dm-core>=0.10.1:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-paperclip/Makefile b/databases/rubygem-dm-paperclip/Makefile
index 12614be23c12..dd6a56742c67 100644
--- a/databases/rubygem-dm-paperclip/Makefile
+++ b/databases/rubygem-dm-paperclip/Makefile
@@ -11,10 +11,10 @@ COMMENT=	File attachments as attributes for DataMapper
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-core>=1.2.0:${PORTSDIR}/databases/rubygem-dm-core \
-		rubygem-dm-migrations>=1.2.0:${PORTSDIR}/databases/rubygem-dm-migrations \
-		rubygem-dm-validations>=1.2.0:${PORTSDIR}/databases/rubygem-dm-validations \
-		rubygem-extlib>=0:${PORTSDIR}/devel/rubygem-extlib
+RUN_DEPENDS=	rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
+		rubygem-dm-migrations>=1.2.0:databases/rubygem-dm-migrations \
+		rubygem-dm-validations>=1.2.0:databases/rubygem-dm-validations \
+		rubygem-extlib>=0:devel/rubygem-extlib
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-postgres-adapter/Makefile b/databases/rubygem-dm-postgres-adapter/Makefile
index 4f443a06166d..86b9e8fbee1b 100644
--- a/databases/rubygem-dm-postgres-adapter/Makefile
+++ b/databases/rubygem-dm-postgres-adapter/Makefile
@@ -11,8 +11,8 @@ COMMENT=	PostgreSQL Adapter for DataMapper
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-do-adapter \
-		rubygem-do_postgres>=0.10.6:${PORTSDIR}/databases/rubygem-do_postgres
+RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapter \
+		rubygem-do_postgres>=0.10.6:databases/rubygem-do_postgres
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-rails/Makefile b/databases/rubygem-dm-rails/Makefile
index 1a27bc7a2e3d..d7f81d1958fe 100644
--- a/databases/rubygem-dm-rails/Makefile
+++ b/databases/rubygem-dm-rails/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Integrate DataMapper with Rails 3
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-actionpack>=3.0:${PORTSDIR}/www/rubygem-actionpack \
-		rubygem-dm-active_model>=1.2.0:${PORTSDIR}/databases/rubygem-dm-active_model \
-		rubygem-dm-core>=1.2.0:${PORTSDIR}/databases/rubygem-dm-core \
-		rubygem-railties>=3.0:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-actionpack>=3.0:www/rubygem-actionpack \
+		rubygem-dm-active_model>=1.2.0:databases/rubygem-dm-active_model \
+		rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
+		rubygem-railties>=3.0:www/rubygem-railties
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-serializer/Makefile b/databases/rubygem-dm-serializer/Makefile
index b13d07279d63..660a6f8c0899 100644
--- a/databases/rubygem-dm-serializer/Makefile
+++ b/databases/rubygem-dm-serializer/Makefile
@@ -11,11 +11,11 @@ COMMENT=	DataMapper plugin for serializing Resources and Collections
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-dm-core>=1.2.0:${PORTSDIR}/databases/rubygem-dm-core \
-		rubygem-fastercsv>=1.5:${PORTSDIR}/devel/rubygem-fastercsv \
-		rubygem-json>=1.6:${PORTSDIR}/devel/rubygem-json \
-		rubygem-json_pure>=1.6:${PORTSDIR}/devel/rubygem-json_pure \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
+		rubygem-fastercsv>=1.5:devel/rubygem-fastercsv \
+		rubygem-json>=1.6:devel/rubygem-json \
+		rubygem-json_pure>=1.6:devel/rubygem-json_pure \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-dm-timestamps/Makefile b/databases/rubygem-dm-timestamps/Makefile
index a27c76960ae0..c9ddf1aa418d 100644
--- a/databases/rubygem-dm-timestamps/Makefile
+++ b/databases/rubygem-dm-timestamps/Makefile
@@ -11,7 +11,7 @@ COMMENT=	DataMapper plugin for magical timestamps
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-transactions/Makefile b/databases/rubygem-dm-transactions/Makefile
index 41ad7695de86..c7ddc805da48 100644
--- a/databases/rubygem-dm-transactions/Makefile
+++ b/databases/rubygem-dm-transactions/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Makes transaction support available for adapters that support them
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-types/Makefile b/databases/rubygem-dm-types/Makefile
index 32d10226038f..4003110feffe 100644
--- a/databases/rubygem-dm-types/Makefile
+++ b/databases/rubygem-dm-types/Makefile
@@ -13,13 +13,13 @@ COMMENT=	DataMapper plugin providing extra data types
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-bcrypt-ruby>=3.0:${PORTSDIR}/security/rubygem-bcrypt-ruby \
-		rubygem-dm-core>=1.2.0:${PORTSDIR}/databases/rubygem-dm-core \
-		rubygem-fastercsv>=1.5:${PORTSDIR}/devel/rubygem-fastercsv \
-		rubygem-json>=1.6:${PORTSDIR}/devel/rubygem-json \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-stringex>=1.4:${PORTSDIR}/devel/rubygem-stringex \
-		rubygem-uuidtools>=2.1:${PORTSDIR}/devel/rubygem-uuidtools
+RUN_DEPENDS=	rubygem-bcrypt-ruby>=3.0:security/rubygem-bcrypt-ruby \
+		rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
+		rubygem-fastercsv>=1.5:devel/rubygem-fastercsv \
+		rubygem-json>=1.6:devel/rubygem-json \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-stringex>=1.4:devel/rubygem-stringex \
+		rubygem-uuidtools>=2.1:devel/rubygem-uuidtools
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-dm-validations/Makefile b/databases/rubygem-dm-validations/Makefile
index 0133efb5bb4e..552114af1ca2 100644
--- a/databases/rubygem-dm-validations/Makefile
+++ b/databases/rubygem-dm-validations/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Library for performing validations on DM models and pure Ruby object
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-dm-core
+RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-do_mysql/Makefile b/databases/rubygem-do_mysql/Makefile
index 4291e155ca93..b1e1033bba41 100644
--- a/databases/rubygem-do_mysql/Makefile
+++ b/databases/rubygem-do_mysql/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	voldern@hoeggen.net
 COMMENT=	Ruby DataObjects driver for MySQL
 
-RUN_DEPENDS=	rubygem-data_objects>=0.10.13:${PORTSDIR}/databases/rubygem-data_objects
+RUN_DEPENDS=	rubygem-data_objects>=0.10.13:databases/rubygem-data_objects
 
 USE_MYSQL=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-do_postgres/Makefile b/databases/rubygem-do_postgres/Makefile
index 052d81f9e80c..8cc4ed07b428 100644
--- a/databases/rubygem-do_postgres/Makefile
+++ b/databases/rubygem-do_postgres/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	voldern@hoeggen.net
 COMMENT=	Ruby DataObjects driver for PostgreSQL
 
-RUN_DEPENDS=	rubygem-data_objects>=0.10.13:${PORTSDIR}/databases/rubygem-data_objects
+RUN_DEPENDS=	rubygem-data_objects>=0.10.13:databases/rubygem-data_objects
 
 USES+=		pgsql
 
diff --git a/databases/rubygem-do_sqlite3/Makefile b/databases/rubygem-do_sqlite3/Makefile
index f5fa13b43f5f..8b3840b25cd5 100644
--- a/databases/rubygem-do_sqlite3/Makefile
+++ b/databases/rubygem-do_sqlite3/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	RG
 MAINTAINER=	voldern@hoeggen.net
 COMMENT=	Ruby DataObjects driver to the SQLite DB engine version 3
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	rubygem-data_objects>=0.10.13:${PORTSDIR}/databases/rubygem-data_objects
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+RUN_DEPENDS=	rubygem-data_objects>=0.10.13:databases/rubygem-data_objects
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/databases/rubygem-em-redis-unified/Makefile b/databases/rubygem-em-redis-unified/Makefile
index 32c70fb48c8d..4828d7a481c0 100644
--- a/databases/rubygem-em-redis-unified/Makefile
+++ b/databases/rubygem-em-redis-unified/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Eventmachine-based implementation of the Redis protocol
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-eventmachine>=0.12.10:${PORTSDIR}/devel/rubygem-eventmachine
+RUN_DEPENDS=	rubygem-eventmachine>=0.12.10:devel/rubygem-eventmachine
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/databases/rubygem-familia/Makefile b/databases/rubygem-familia/Makefile
index 201912c6a594..21c979615703 100644
--- a/databases/rubygem-familia/Makefile
+++ b/databases/rubygem-familia/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Organize and store ruby objects in Redis
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-gibbler>=0.8.6:${PORTSDIR}/devel/rubygem-gibbler \
-		rubygem-multi_json>=0.0.5:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-redis>=2.1.0:${PORTSDIR}/databases/rubygem-redis \
-		rubygem-storable>=0.8.6:${PORTSDIR}/devel/rubygem-storable \
-		rubygem-uri-redis>=0.4.2:${PORTSDIR}/net/rubygem-uri-redis
+RUN_DEPENDS=	rubygem-gibbler>=0.8.6:devel/rubygem-gibbler \
+		rubygem-multi_json>=0.0.5:devel/rubygem-multi_json \
+		rubygem-redis>=2.1.0:databases/rubygem-redis \
+		rubygem-storable>=0.8.6:devel/rubygem-storable \
+		rubygem-uri-redis>=0.4.2:net/rubygem-uri-redis
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-globalid/Makefile b/databases/rubygem-globalid/Makefile
index 608a20c70ae2..4897445d18b9 100644
--- a/databases/rubygem-globalid/Makefile
+++ b/databases/rubygem-globalid/Makefile
@@ -12,7 +12,7 @@ COMMENT=	URIs for your models makes it easy to pass references around
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=4.1.0:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=4.1.0:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-her/Makefile b/databases/rubygem-her/Makefile
index c524ae73b59c..c425c1c5db9f 100644
--- a/databases/rubygem-her/Makefile
+++ b/databases/rubygem-her/Makefile
@@ -11,10 +11,10 @@ COMMENT=	ORM that maps REST resources to Ruby objects
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=3.0.0:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-activesupport4>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-faraday>=0.8:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-multi_json>=1.7:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-activemodel4>=3.0.0:databases/rubygem-activemodel4 \
+		rubygem-activesupport4>=3.0.0:devel/rubygem-activesupport4 \
+		rubygem-faraday>=0.8:www/rubygem-faraday \
+		rubygem-multi_json>=1.7:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-hiredis/Makefile b/databases/rubygem-hiredis/Makefile
index dbafd56a95ae..0577d480f139 100644
--- a/databases/rubygem-hiredis/Makefile
+++ b/databases/rubygem-hiredis/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby wrapper for hiredis
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	redis>=0:${PORTSDIR}/databases/redis
+RUN_DEPENDS=	redis>=0:databases/redis
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/databases/rubygem-jdbc-mysql/Makefile b/databases/rubygem-jdbc-mysql/Makefile
index d3ef0888846a..52c9411ce04d 100644
--- a/databases/rubygem-jdbc-mysql/Makefile
+++ b/databases/rubygem-jdbc-mysql/Makefile
@@ -11,7 +11,7 @@ COMMENT=	MySQL JDBC driver for JRuby
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	jruby:${PORTSDIR}/lang/jruby
+RUN_DEPENDS=	jruby:lang/jruby
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-memcache/Makefile b/databases/rubygem-memcache/Makefile
index bf07e569b084..2a88d0d002f4 100644
--- a/databases/rubygem-memcache/Makefile
+++ b/databases/rubygem-memcache/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby bindings for libmemcached
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 CONFIGURE_ARGS=	--with-opt-dir=${LOCALBASE}
 GEM_ENV=	EXTERNAL_LIB="yes"
diff --git a/databases/rubygem-openid-redis-store/Makefile b/databases/rubygem-openid-redis-store/Makefile
index fb552621edfc..d5edc4339fcf 100644
--- a/databases/rubygem-openid-redis-store/Makefile
+++ b/databases/rubygem-openid-redis-store/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Redis store for OpenID
 
-RUN_DEPENDS=	rubygem-redis>=0:${PORTSDIR}/databases/rubygem-redis \
-		rubygem-ruby-openid>=0:${PORTSDIR}/net/rubygem-ruby-openid
+RUN_DEPENDS=	rubygem-redis>=0:databases/rubygem-redis \
+		rubygem-ruby-openid>=0:net/rubygem-ruby-openid
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-paranoia/Makefile b/databases/rubygem-paranoia/Makefile
index bad63ba37781..58daa1a1d1d0 100644
--- a/databases/rubygem-paranoia/Makefile
+++ b/databases/rubygem-paranoia/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Soft deletion mapper for activerecord
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS?=	rubygem-activerecord4>=0:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS?=	rubygem-activerecord4>=0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-redis-actionpack/Makefile b/databases/rubygem-redis-actionpack/Makefile
index 6640f2764364..8be6e87c5078 100644
--- a/databases/rubygem-redis-actionpack/Makefile
+++ b/databases/rubygem-redis-actionpack/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Redis session store for ActionPack
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=4:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-redis-store>=1.1.0:${PORTSDIR}/devel/rubygem-redis-store \
-		rubygem-redis-rack>=1.5.0:${PORTSDIR}/www/rubygem-redis-rack
+RUN_DEPENDS=	rubygem-actionpack4>=4:www/rubygem-actionpack4 \
+		rubygem-redis-store>=1.1.0:devel/rubygem-redis-store \
+		rubygem-redis-rack>=1.5.0:www/rubygem-redis-rack
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-redis-namespace/Makefile b/databases/rubygem-redis-namespace/Makefile
index 4ecfeab30633..5356f1e69f4b 100644
--- a/databases/rubygem-redis-namespace/Makefile
+++ b/databases/rubygem-redis-namespace/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby client class for Redis with namespace support
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-redis>=3.0.4:${PORTSDIR}/databases/rubygem-redis
+RUN_DEPENDS=	rubygem-redis>=3.0.4:databases/rubygem-redis
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-rubyrep/Makefile b/databases/rubygem-rubyrep/Makefile
index 12fd5d0609ca..16fa801dd99e 100644
--- a/databases/rubygem-rubyrep/Makefile
+++ b/databases/rubygem-rubyrep/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Multi-master replication and sync for MySQL and PostgreSQL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-BUILD_DEPENDS=	rubygem-activesupport>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-activerecord>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activerecord
-RUN_DEPENDS=	flog>=0:${PORTSDIR}/sysutils/flog \
-		rubygem-activesupport>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-activerecord>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activerecord
+BUILD_DEPENDS=	rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \
+		rubygem-activerecord>=${PORTVERSION}:databases/rubygem-activerecord
+RUN_DEPENDS=	flog>=0:sysutils/flog \
+		rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \
+		rubygem-activerecord>=${PORTVERSION}:databases/rubygem-activerecord
 
 NO_ARCH=	yes
 USE_RUBY=	yes
@@ -33,7 +33,7 @@ OPTIONS_DEFAULT=PGSQL
 
 PLIST_FILES=	bin/rubyrep
 
-PGSQL_RUN_DEPENDS=	rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
-MYSQL_RUN_DEPENDS=	ruby-mysql>=0:${PORTSDIR}/databases/ruby-mysql
+PGSQL_RUN_DEPENDS=	rubygem-pg>=0:databases/rubygem-pg
+MYSQL_RUN_DEPENDS=	ruby-mysql>=0:databases/ruby-mysql
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-seed-fu/Makefile b/databases/rubygem-seed-fu/Makefile
index 9a446b2288dc..04227d924239 100644
--- a/databases/rubygem-seed-fu/Makefile
+++ b/databases/rubygem-seed-fu/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Library to maintain seed datas
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=3.1:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-activesupport4>=3.1:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activerecord4>=3.1:databases/rubygem-activerecord4 \
+		rubygem-activesupport4>=3.1:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-sqlite3-ruby/Makefile b/databases/rubygem-sqlite3-ruby/Makefile
index 5c839bc89f2a..6b550ccfd1d7 100644
--- a/databases/rubygem-sqlite3-ruby/Makefile
+++ b/databases/rubygem-sqlite3-ruby/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Ruby interface to the SQLite DB engine version 3
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	rubygem-sqlite3>=1.3.3:${PORTSDIR}/databases/rubygem-sqlite3
+BUILD_DEPENDS=	swig:devel/swig13
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+RUN_DEPENDS=	rubygem-sqlite3>=1.3.3:databases/rubygem-sqlite3
 
 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
 NO_ARCH=	yes
diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile
index 1837c10d5003..17f4dada1ecb 100644
--- a/databases/rubygem-sqlite3/Makefile
+++ b/databases/rubygem-sqlite3/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby interface to the SQLite DB engine version 3
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS=	swig:devel/swig13
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
 USE_RUBY=	yes
diff --git a/databases/rubygem-state_machines-activemodel/Makefile b/databases/rubygem-state_machines-activemodel/Makefile
index 681f91cf62a7..cce9bbf58281 100644
--- a/databases/rubygem-state_machines-activemodel/Makefile
+++ b/databases/rubygem-state_machines-activemodel/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Support for creating state machines for attributes on ActiveModel
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activemodel4>=4.1:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-state_machines>=0.4.0:${PORTSDIR}/devel/rubygem-state_machines
+RUN_DEPENDS=	rubygem-activemodel4>=4.1:databases/rubygem-activemodel4 \
+		rubygem-state_machines>=0.4.0:devel/rubygem-state_machines
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-state_machines-activerecord/Makefile b/databases/rubygem-state_machines-activerecord/Makefile
index 88ec0e161c7e..71f78d554f03 100644
--- a/databases/rubygem-state_machines-activerecord/Makefile
+++ b/databases/rubygem-state_machines-activerecord/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Support for creating state machines for attributes on ActiveRecord
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.1:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-state_machines-activemodel>=0.3.0:${PORTSDIR}/databases/rubygem-state_machines-activemodel
+RUN_DEPENDS=	rubygem-activerecord4>=4.1:databases/rubygem-activerecord4 \
+		rubygem-state_machines-activemodel>=0.3.0:databases/rubygem-state_machines-activemodel
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/databases/rubygem-tarantool/Makefile b/databases/rubygem-tarantool/Makefile
index 28ba4fcbdbdd..b5ab68590415 100644
--- a/databases/rubygem-tarantool/Makefile
+++ b/databases/rubygem-tarantool/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	RG
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Tarantool KV-storage client
 
-RUN_DEPENDS=	rubygem-bin_utils>=0.0.3:${PORTSDIR}/devel/rubygem-bin_utils \
-		rubygem-iproto>=0.3:${PORTSDIR}/net/rubygem-iproto \
-		rubygem-murmurhash3>=0.1.1:${PORTSDIR}/devel/rubygem-murmurhash3 \
-		rubygem-sumbur>=0.0.2:${PORTSDIR}/devel/rubygem-sumbur
+RUN_DEPENDS=	rubygem-bin_utils>=0.0.3:devel/rubygem-bin_utils \
+		rubygem-iproto>=0.3:net/rubygem-iproto \
+		rubygem-murmurhash3>=0.1.1:devel/rubygem-murmurhash3 \
+		rubygem-sumbur>=0.0.2:devel/rubygem-sumbur
 
 NO_ARCH=	yes
 
diff --git a/databases/sfcgal/Makefile b/databases/sfcgal/Makefile
index eedf8bf3fcaa..d7850b1a7f95 100644
--- a/databases/sfcgal/Makefile
+++ b/databases/sfcgal/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Wrapper library around CGAL for PostGIS
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libCGAL.so:${PORTSDIR}/math/cgal \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	libCGAL.so:math/cgal \
+		libboost_system.so:devel/boost-libs \
+		libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Oslandia
diff --git a/databases/sharedance/Makefile b/databases/sharedance/Makefile
index 2a82cb03fabf..f6c817c41350 100644
--- a/databases/sharedance/Makefile
+++ b/databases/sharedance/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.pureftpd.org/pub/sharedance/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Daemon to centralize keys and associated data
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 CONFIGURE_ARGS=	--with-largefile
 GNU_CONFIGURE=	yes
diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile
index 6d1681619334..1e806127136a 100644
--- a/databases/slony1v2/Makefile
+++ b/databases/slony1v2/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	PostgreSQL master to multiple replicas replication system
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 GNU_CONFIGURE=	yes
 USES=		bison gmake shebangfix tar:bzip2 pgsql
@@ -35,8 +35,8 @@ PERLTOOLS_DESC=	Install perl configuration tools
 PERLTOOLS_USES=	perl5
 PERLTOOLS_CONFIGURE_ENV=	PERL=${PERL}
 PERLTOOLS_CONFIGURE_ON=		--with-perltools=${LOCALBASE}/sbin
-PERLTOOLS_BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-PERLTOOLS_RUN_DEPENDS=		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+PERLTOOLS_BUILD_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
+PERLTOOLS_RUN_DEPENDS=		p5-DBD-Pg>=0:databases/p5-DBD-Pg
 
 .include <bsd.port.options.mk>
 
diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index 6fc7bdbca692..29e1b7b5af77 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -37,12 +37,12 @@ SQLITE_USE=	SQLITE=yes
 SQLITE_CMAKE_ON=	-DWITH_SQLITE3:BOOL=ON
 SQLITE_CMAKE_OFF=	-DWITH_SQLITE3:BOOL=OFF
 
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CMAKE_ON=	-DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so \
 		-DWITH_ODBC:BOOL=ON
 ODBC_CMAKE_OFF=	-DWITH_ODBC:BOOL=OFF
 
-BOOST_LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+BOOST_LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 BOOST_CMAKE_ON=	-DWITH_BOOST:BOOL=ON
 BOOST_CMAKE_OFF=	-DWITH_BOOST:BOOL=OFF
 
diff --git a/databases/spatialite-tools/Makefile b/databases/spatialite-tools/Makefile
index bd9323a61d98..4c4aa41bd137 100644
--- a/databases/spatialite-tools/Makefile
+++ b/databases/spatialite-tools/Makefile
@@ -10,12 +10,12 @@ COMMENT=	Collection of CLI tools supporting SpatiaLite
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgeos_c.so:${PORTSDIR}/graphics/geos \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libfreexl.so:${PORTSDIR}/textproc/freexl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libspatialite.so:${PORTSDIR}/databases/spatialite \
-		libreadosm.so:${PORTSDIR}/astro/readosm
+LIB_DEPENDS=	libgeos_c.so:graphics/geos \
+		libproj.so:graphics/proj \
+		libfreexl.so:textproc/freexl \
+		libexpat.so:textproc/expat2 \
+		libspatialite.so:databases/spatialite \
+		libreadosm.so:astro/readosm
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig iconv
diff --git a/databases/spatialite/Makefile b/databases/spatialite/Makefile
index 3008cb30a91d..4190f44e5170 100644
--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Spatial Extensions for SQLite
 LICENSE=	MPL LGPL20 GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgeos_c.so:${PORTSDIR}/graphics/geos \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libfreexl.so:${PORTSDIR}/textproc/freexl
+LIB_DEPENDS=	libgeos_c.so:graphics/geos \
+		libproj.so:graphics/proj \
+		libfreexl.so:textproc/freexl
 
 WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
@@ -31,7 +31,7 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=LWGEOM
 LWGEOM_DESC=Enable lwgeom (PostGIS) functions
 LWGEOM_CONFIGURE_ENABLE=	lwgeom
-LWGEOM_LIB_DEPENDS=	liblwgeom.so:${PORTSDIR}/databases/postgis21
+LWGEOM_LIB_DEPENDS=	liblwgeom.so:databases/postgis21
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.am
diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile
index f85b345abb3b..ca825b585a79 100644
--- a/databases/spatialite_gui/Makefile
+++ b/databases/spatialite_gui/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Graphical User Interface (GUI) tool supporting SpatiaLite
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgaiagraphics.so:${PORTSDIR}/graphics/libgaiagraphics \
-		libfreexl.so:${PORTSDIR}/textproc/freexl \
-		libspatialite.so:${PORTSDIR}/databases/spatialite
+LIB_DEPENDS=	libgaiagraphics.so:graphics/libgaiagraphics \
+		libfreexl.so:textproc/freexl \
+		libspatialite.so:databases/spatialite
 
 USE_WX=		2.8
 WX_UNICODE=	yes
diff --git a/databases/speedtables/Makefile b/databases/speedtables/Makefile
index 7b4d38da25aa..b68fa25b9cc7 100644
--- a/databases/speedtables/Makefile
+++ b/databases/speedtables/Makefile
@@ -12,8 +12,8 @@ COMMENT=	High-performance memory-resident database
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libtclx8.4.so:${PORTSDIR}/lang/tclX \
-		libboost_graph.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libtclx8.4.so:lang/tclX \
+		libboost_graph.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
@@ -28,7 +28,7 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS PGSQL
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
-PGSQL_LIB_DEPENDS=	libpgtcl2.0.0.so:${PORTSDIR}/databases/postgresql94-pgtcl
+PGSQL_LIB_DEPENDS=	libpgtcl2.0.0.so:databases/postgresql94-pgtcl
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/sql-workbench/Makefile b/databases/sql-workbench/Makefile
index f812f3bc3a5c..e0765f3ec4b4 100644
--- a/databases/sql-workbench/Makefile
+++ b/databases/sql-workbench/Makefile
@@ -22,9 +22,9 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 
 OPTIONS_DEFINE=	DOCS MYSQL_JDBC PGSQL_JDBC ORACLE_JDBC
-ORACLE_JDBC_RUN_DEPENDS=${JAVALIBDIR}/ojdbc-10.2.0.5.jar:${PORTSDIR}/databases/jdbc-oracle10g
-MYSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
-PGSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
+ORACLE_JDBC_RUN_DEPENDS=${JAVALIBDIR}/ojdbc-10.2.0.5.jar:databases/jdbc-oracle10g
+MYSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
+PGSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc
 
 pre-install:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/new_sqlworkbench.sh
diff --git a/databases/sqlcached/Makefile b/databases/sqlcached/Makefile
index 297e13c62dd8..b83c65636e51 100644
--- a/databases/sqlcached/Makefile
+++ b/databases/sqlcached/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ivoras@FreeBSD.org
 COMMENT=	Cache daemon using SQL for data manipulation
 
-LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=	libsqlite.so:databases/sqlite2
 
 USES=		readline ncurses tar:tgz
 
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index 9ff40883948b..f347a17fabe0 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Lightweight database abstraction layer
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libPerformance.so:${PORTSDIR}/devel/performance \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libPerformance.so:devel/performance \
+		libsqlite3.so:databases/sqlite3
 
 USES=		gnustep pgsql
 USE_GNUSTEP=	base build
diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index f8eb07c30eee..0c6e1df8c21b 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	oracle
 MAINTAINER=	mizhka@gmail.com
 COMMENT=	Graphical tool for database development
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		zip
 USE_JAVA=	yes
diff --git a/databases/sqlite-ext-pcre/Makefile b/databases/sqlite-ext-pcre/Makefile
index c01078b66811..c7daf1bd4729 100644
--- a/databases/sqlite-ext-pcre/Makefile
+++ b/databases/sqlite-ext-pcre/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	databases
 MAINTAINER=	vivek@khera.org
 COMMENT=	Regexp function for SQLite based on PCRE library
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 
 USE_SQLITE=	yes
 DIST_SUBDIR=	sqlite-ext
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 1dc87f4d3343..7c65e7f06342 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -157,8 +157,8 @@ EXTENSION_CONFIGURE_ENABLE=	dynamic-extensions
 THREADS_CONFIGURE_ENABLE=	threadsafe
 THREADS_LDFLAGS=		-lpthread
 
-ICU_BUILD_DEPENDS=	${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
-ICU_LIB_DEPENDS=	libicudata.so:${PORTSDIR}/devel/icu
+ICU_BUILD_DEPENDS=	${LOCALBASE}/bin/icu-config:devel/icu
+ICU_LIB_DEPENDS=	libicudata.so:devel/icu
 ICU_CPPFLAGS=	`${LOCALBASE}/bin/icu-config --cppflags` -DSQLITE_ENABLE_ICU=1
 ICU_LDFLAGS=	`${LOCALBASE}/bin/icu-config --ldflags`
 
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index fea3b4cff8c3..466db836de2b 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Admin's GUI tool for Sqlite3
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 
 USES=		cmake
 USE_SQLITE=	yes
diff --git a/databases/sqliteodbc/Makefile b/databases/sqliteodbc/Makefile
index 76e21f131133..ed51f8cf5e1d 100644
--- a/databases/sqliteodbc/Makefile
+++ b/databases/sqliteodbc/Makefile
@@ -13,7 +13,7 @@ LICENSE_NAME=	sqliteodbc own licensing terms (BSD style)
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-sqlite4
@@ -27,11 +27,11 @@ OPTIONS_MULTI_SQLITEVER=	SQLITE SQLITE3
 OPTIONS_DEFAULT=	SQLITE3
 
 OPTIONS_SUB=	yes
-SQLITE_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2
+SQLITE_LIB_DEPENDS=	libsqlite.so:databases/sqlite2
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_CONFIGURE_OFF=	--with-sqlite=/tmp
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-			libxml2.so:${PORTSDIR}/textproc/libxml2
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
+			libxml2.so:textproc/libxml2
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=${LOCALBASE}
 SQLITE3_CONFIGURE_OFF=	--with-sqlite3=/tmp
 
diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile
index 04e8e700d849..a3e2a2eb6862 100644
--- a/databases/sqlitestudio/Makefile
+++ b/databases/sqlitestudio/Makefile
@@ -48,7 +48,7 @@ USE_LDCONFIG=	yes
 
 .if ${COMPILER_TYPE} == clang && (${COMPILER_VERSION} < 37)
 # The reason for clang37 is that previous versions fail to compile with various errors
-BUILD_DEPENDS+=	clang37:${PORTSDIR}/lang/clang37
+BUILD_DEPENDS+=	clang37:lang/clang37
 CPP=		clang-cpp37
 CC=		clang37
 CXX=		clang++37
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 3f94dc5105c9..c86ee1980728 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Persistent DB connection pooling/proxying/load balancing system
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	librudiments.so:${PORTSDIR}/devel/rudiments
+LIB_DEPENDS=	librudiments.so:devel/rudiments
 
 WANT_GNOME=	yes
 USES=		gmake libtool
@@ -89,8 +89,8 @@ ORACLE_CONFIGURE_ENABLE=	oracle
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSQLITE3}
-LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm \
-			libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=		libgdbm.so:databases/gdbm \
+			libsqlite3.so:databases/sqlite3
 CONFIGURE_ARGS+=	--with-gdbm-prefix="${LOCALBASE}" \
 			--with-sqlite-prefix="${LOCALBASE}"
 TOSTRIP+=		libexec/sqlrelay/sqlrconnection_sqlite.so
@@ -124,7 +124,7 @@ CONFIGURE_ARGS+=	--disable-postgresql
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
-LIB_DEPENDS+=		libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc-prefix="${LOCALBASE}"
 TOSTRIP+=		libexec/sqlrelay/sqlrconnection_odbc.so
 .else
@@ -132,7 +132,7 @@ CONFIGURE_ARGS+=	--disable-odbc
 .endif
 
 .if ${PORT_OPTIONS:MFREETDS}
-LIB_DEPENDS+=		libtdsodbc.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=		libtdsodbc.so:databases/freetds
 CONFIGURE_ARGS+=	--with-freetds-prefix="${LOCALBASE}"
 TOSTRIP+=		libexec/sqlrelay/sqlrconnection_freetds.so
 .else
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index de05a77776f5..cb882f71c95e 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Interactive tool for querying Sybase database servers
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libct.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS=	libct.so:databases/freetds
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
diff --git a/databases/tarantool-c/Makefile b/databases/tarantool-c/Makefile
index 7760f88245dc..04809aa008af 100644
--- a/databases/tarantool-c/Makefile
+++ b/databases/tarantool-c/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	databases
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	C client for Tarantool 1.6+
 
-LIB_DEPENDS=	libmsgpuck.so:${PORTSDIR}/devel/msgpuck
+LIB_DEPENDS=	libmsgpuck.so:devel/msgpuck
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}
diff --git a/databases/tcl-Mysql/Makefile b/databases/tcl-Mysql/Makefile
index 45e170116c30..3e851232989b 100644
--- a/databases/tcl-Mysql/Makefile
+++ b/databases/tcl-Mysql/Makefile
@@ -13,7 +13,7 @@ COMMENT=	TCL module for accessing MySQL databases
 
 OPTIONS_DEFINE=	DOCS
 
-PATCH_DEPENDS=	rcsdiff:${PORTSDIR}/devel/rcs
+PATCH_DEPENDS=	rcsdiff:devel/rcs
 
 USE_MYSQL=	41+
 USES=		tcl tar:tgz
diff --git a/databases/tcl-sqlite3/Makefile b/databases/tcl-sqlite3/Makefile
index efb9ffa0f567..45318126d466 100644
--- a/databases/tcl-sqlite3/Makefile
+++ b/databases/tcl-sqlite3/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SQLite extension for Tcl using the Tcl Extension Architecture (TEA)
 
 LICENSE=	PD
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 OPTIONS_DEFINE=	THREADS
 OPTIONS_DEFAULT=	THREADS
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 3c071cdd1d3f..9e0f9618b9af 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -45,8 +45,8 @@ PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/tdb.so \
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 .endif
 
 PLIST_FILES+=		bin/tdbbackup \
diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile
index c21da7fab687..40ce5b61bef9 100644
--- a/databases/tdbc/Makefile
+++ b/databases/tdbc/Makefile
@@ -40,7 +40,7 @@ MYSQL_DISTFILES=	${PORTNAME}mysql${PORTVERSION}${EXTRACT_SUFX}
 
 # ODBC
 ODBC_VARS=		MODULES+=tdbcodbc
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_DISTFILES=		${PORTNAME}odbc${PORTVERSION}${EXTRACT_SUFX}
 
 # PostgreSQL
@@ -52,7 +52,7 @@ PGSQL_DISTFILES=	${PORTNAME}postgres${PORTVERSION}${EXTRACT_SUFX}
 SQLITE_VARS=		MODULES+=tdbcsqlite3
 SQLITE_DISTFILES=	${PORTNAME}sqlite3-${PORTVERSION}${EXTRACT_SUFX}
 SQLITE_PLIST_SUB=	TCL_LIBDIR="${TCL_LIBDIR:S/${LOCALBASE}\///}"
-SQLITE_RUN_DEPENDS=	${LOCALBASE}/lib/sqlite3/pkgIndex.tcl:${PORTSDIR}/databases/tcl-sqlite3
+SQLITE_RUN_DEPENDS=	${LOCALBASE}/lib/sqlite3/pkgIndex.tcl:databases/tcl-sqlite3
 
 .include <bsd.port.options.mk>
 
diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index f5f757a3c89e..7d871d124012 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -50,13 +50,13 @@ CONFIGURE_ARGS+=	--enable-fastest
 # to not confuse with system liblzma
 .if ${PORT_OPTIONS:MLZMA}
 CONFIGURE_ARGS+=	--enable-exlzma
-LIB_DEPENDS+=		liblzma.so.1:${PORTSDIR}/archivers/lzmalib
+LIB_DEPENDS+=		liblzma.so.1:archivers/lzmalib
 .else
 CONFIGURE_ARGS+=	--disable-exlzma
 .endif
 .if ${PORT_OPTIONS:MLZO}
 CONFIGURE_ARGS+=	--enable-exlzo
-LIB_DEPENDS+=		liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS+=		liblzo2.so:archivers/lzo2
 .else
 CONFIGURE_ARGS+=	--disable-exlzo
 .endif
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 33ea034a0517..6e818ad43447 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://fallabs.com/${PORTNAME}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network interface of Tokyo Cabinet
 
-BUILD_DEPENDS=	tokyocabinet>=1.4.20:${PORTSDIR}/databases/tokyocabinet
-LIB_DEPENDS=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+BUILD_DEPENDS=	tokyocabinet>=1.4.20:databases/tokyocabinet
+LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index 7aa539dfe060..41d82670f9c7 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Toolkit for Oracle
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
-		libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	cppunit-config:devel/cppunit
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2 \
+		libpcre.so:devel/pcre
 
 OPTIONS_DEFINE=	PGSQL MYSQL DOCS
 OPTIONS_DEFINE_i386=	ORACLE
@@ -33,14 +33,14 @@ PREFIX2FIX=	doc/help/preferences.texi doc/help/preferences.html
 DOCS_USES=	makeinfo
 DOCS_INFO=	tora
 
-MYSQL_RUN_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
-PGSQL_RUN_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
+MYSQL_RUN_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:databases/qt4-mysql-plugin
+PGSQL_RUN_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:databases/qt4-pgsql-plugin
 
 ORACLE_HOME?=	${LOCALBASE}/oracle8-client
 ORACLE_VER=	8i	# Client version
 
-ORACLE_BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
-ORACLE_RUN_DEPENDS=	${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
+ORACLE_BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntsh.a:databases/oracle8-client
+ORACLE_RUN_DEPENDS=	${ORACLE_HOME}/network/admin/tnsnames.ora:databases/oracle8-client
 ORACLE_CONFIGURE_ON=	--with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu}
 
 post-patch-DOCS-on:
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index 20c711c40661..81e571e248a6 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Universal SQL/Application Server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk\
-		htmldoc:${PORTSDIR}/textproc/htmldoc\
-		flex>2.5.4:${PORTSDIR}/textproc/flex\
-		gperf>=3.0.3:${PORTSDIR}/devel/gperf\
-		unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	gawk:lang/gawk\
+		htmldoc:textproc/htmldoc\
+		flex>2.5.4:textproc/flex\
+		gperf>=3.0.3:devel/gperf\
+		unzip:archivers/unzip
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USES=		gmake libtool readline uidfix
 USE_AUTOTOOLS=	autoheader aclocal
@@ -67,7 +67,7 @@ check:
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
 CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE}
-LIB_DEPENDS+=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.so:graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 .else
 CONFIGURE_ARGS+=--disable-imagemagick
@@ -76,7 +76,7 @@ PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
 
 .if ${PORT_OPTIONS:MIODBC}
 CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
-LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	libiodbc.so:databases/libiodbc
 IODBC_CPPFLAGS=	-I${LOCALBASE}/include/libiodbc
 PLIST_SUB+=	WITH_IODBC=""
 .else
@@ -86,7 +86,7 @@ PLIST_SUB+=	WITH_IODBC="@comment "
 
 .if ${PORT_OPTIONS:MKERBEROS}
 CONFIGURE_ARGS+=--enable-krb=${LOCALBASE}
-LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=	libkrb5.so:security/krb5
 .else
 CONFIGURE_ARGS+=--disable-krb
 .endif
diff --git a/databases/vsqlite/Makefile b/databases/vsqlite/Makefile
index 3d0384d4abab..847ab7303ccd 100644
--- a/databases/vsqlite/Makefile
+++ b/databases/vsqlite/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Well designed and portable SQLite3 Wrapper for C++
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libboost_random.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_random.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vinzenz
diff --git a/databases/wfb2sql/Makefile b/databases/wfb2sql/Makefile
index 16be8f318b81..c96ce0f45d0c 100644
--- a/databases/wfb2sql/Makefile
+++ b/databases/wfb2sql/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CIA World Fact Book to SQL Conversion Utility
 
-BUILD_DEPENDS=	p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General
+BUILD_DEPENDS=	p5-Config-General>=0:devel/p5-Config-General
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile
index da449d173d30..7b05bd1a8c88 100644
--- a/databases/xtrabackup/Makefile
+++ b/databases/xtrabackup/Makefile
@@ -14,15 +14,15 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # quilt is required by build.sh
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		cmake:${PORTSDIR}/devel/cmake \
-		bison:${PORTSDIR}/devel/bison \
-		xxd:${PORTSDIR}/editors/vim-lite
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error
-RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		qpress:${PORTSDIR}/archivers/qpress
+BUILD_DEPENDS=	bash:shells/bash \
+		cmake:devel/cmake \
+		bison:devel/bison \
+		xxd:editors/vim-lite
+LIB_DEPENDS=	libev.so:devel/libev \
+		libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error
+RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		qpress:archivers/qpress
 
 # autotool is in use for 5.1 builds
 USES=		alias autoreconf:build cpe gettext cmake libtool perl5 shebangfix
diff --git a/databases/yasql/Makefile b/databases/yasql/Makefile
index a7cd22237e4f..545d13ff9ba0 100644
--- a/databases/yasql/Makefile
+++ b/databases/yasql/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Yet Another SQL*Plus Replacement
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle \
-		p5-ReadLine-Gnu>0:${PORTSDIR}/devel/p5-ReadLine-Gnu
+RUN_DEPENDS=	p5-DBD-Oracle>0:databases/p5-DBD-Oracle \
+		p5-ReadLine-Gnu>0:devel/p5-ReadLine-Gnu
 
 NO_ARCH=	yes
 
@@ -26,11 +26,11 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=		CSV HIRES READKEY
 
 CSV_DESC=		Support for in/out CSV files
-CSV_BUILD_DEPENDS=	p5-Text-CSV_XS>0:${PORTSDIR}/textproc/p5-Text-CSV_XS
+CSV_BUILD_DEPENDS=	p5-Text-CSV_XS>0:textproc/p5-Text-CSV_XS
 HIRES_DESC=		Support for high resolution benchmarking
-HIRES_BUILD_DEPENDS=	p5-Time-HiRes>0:${PORTSDIR}/devel/p5-Time-HiRes
+HIRES_BUILD_DEPENDS=	p5-Time-HiRes>0:devel/p5-Time-HiRes
 READKEY_DESC=		Better input and output control
-READKEY_BUILD_DEPENDS=	p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
+READKEY_BUILD_DEPENDS=	p5-Term-ReadKey>0:devel/p5-Term-ReadKey
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index be5d337f8550..90958a9bf694 100644
--- a/databases/zodb3/Makefile
+++ b/databases/zodb3/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Z - Object Database for python
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig \
-		${PYTHON_PKGNAMEPREFIX}zdaemon>=0:${PORTSDIR}/sysutils/py-zdaemon \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:${PORTSDIR}/devel/py-zclockfile \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:${PORTSDIR}/devel/py-zope.event
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \
+		${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:devel/py-zclockfile \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:devel/py-zope.event
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/anamnesis/Makefile b/deskutils/anamnesis/Makefile
index 5785f2d5431e..53180934712f 100644
--- a/deskutils/anamnesis/Makefile
+++ b/deskutils/anamnesis/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Clipboard manager that stores all clipboard history
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}gtk2>0:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \
+		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg
 
 USES=		python
 PORTDOCS=	ChangeLog README
diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile
index 6825ff173798..b30a8e34f67f 100644
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 graphical directory tree analyzer
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		vapigen:lang/vala
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index b026ab6d407f..439fe323c666 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Desktop organization tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+LIB_DEPENDS=	libgpgme.so:security/gpgme
 
 USES=		cmake gettext-tools tar:bzip2
 USE_XORG=	xft xpm
diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index 70db6143a47d..3fdfec411ad4 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Note editor designed to remain simple to use
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libtracker-control-1.0.so:sysutils/tracker \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index be046f704be6..fb7922ddeb2a 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Cairo-Dock-Plugins for Cairo-Dock
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-LIB_DEPENDS=	libgldi.so:${PORTSDIR}/deskutils/cairo-dock
+RUN_DEPENDS=	wget:ftp/wget
+LIB_DEPENDS=	libgldi.so:deskutils/cairo-dock
 
 DATADIR=	${PREFIX}/share/cairo-dock
 
@@ -68,16 +68,16 @@ PLUGINS_DESC=		Plug-ins
 ADDON_DESC=		Add On
 #TPI_DESC=		Third Party Interfaces
 
-ALSA_MIXER_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_MIXER_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_MIXER_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_MIXER_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_MIXER_CMAKE_ON=	-Denable-alsa-mixer:BOOL=TRUE
 ALSA_MIXER_CMAKE_OFF=	-Denable-alsa-mixer:BOOL=FALSE
 
-EXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 EXIF_CMAKE_ON=		-Denable-exif-support:BOOL=TRUE
 EXIF_CMAKE_OFF=		-Denable-exif-support:BOOL=FALSE
 
-GMENU_LIB_DEPENDS=	libgnome-menu-3.so:${PORTSDIR}/x11/gnome-menus
+GMENU_LIB_DEPENDS=	libgnome-menu-3.so:x11/gnome-menus
 GMENU_CMAKE_ON=		-Denable-gmenu:BOOL=TRUE
 GMENU_CMAKE_OFF=	-Denable-gmenu:BOOL=FALSE
 
@@ -85,11 +85,11 @@ GMENU_CMAKE_OFF=	-Denable-gmenu:BOOL=FALSE
 GNOME_INTEGRATION_CMAKE_ON=	-Denable-gnome-integration:BOOL=TRUE
 GNOME_INTEGRATION_CMAKE_OFF=	-Denable-gnome-integration:BOOL=FALSE
 
-ICAL_LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+ICAL_LIB_DEPENDS=	libical.so:devel/libical
 ICAL_CMAKE_ON=		-Denable-ical-support:BOOL=TRUE
 ICAL_CMAKE_OFF=		-Denable-ical-support:BOOL=FALSE
 
-IMPULSE_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+IMPULSE_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 IMPULSE_CMAKE_ON=	-Denable-impulse:BOOL=TRUE
 IMPULSE_CMAKE_OFF=	-Denable-impulse:BOOL=FALSE
 
@@ -99,17 +99,17 @@ KDE_INTEGRATION_USE_KDE4=	kdelibs
 KDE_INTEGRATION_CMAKE_ON=	-Denable-kde-integration:BOOL=TRUE
 KDE_INTEGRATION_CMAKE_OFF=	-Denable-kde-integration:BOOL=FALSE
 
-KEYBOARD_INDICATOR_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-				libxklavier.so:${PORTSDIR}/x11/libxklavier
+KEYBOARD_INDICATOR_LIB_DEPENDS=	libexif.so:graphics/libexif \
+				libxklavier.so:x11/libxklavier
 KEYBOARD_INDICATOR_CMAKE_ON=	-Denable-keyboard-indicator:BOOL=TRUE
 KEYBOARD_INDICATOR_CMAKE_OFF=	-Denable-keyboard-indicator:BOOL=FALSE
 
-MAIL_LIB_DEPENDS=	libetpan.so:${PORTSDIR}/mail/libetpan
+MAIL_LIB_DEPENDS=	libetpan.so:mail/libetpan
 MAIL_CMAKE_ON=		-Denable-mail:BOOL=TRUE
 MAIL_CMAKE_OFF=		-Denable-mail:BOOL=FALSE
 
-#MONO_BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
-#MONO_RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
+#MONO_BUILD_DEPENDS=	mono:lang/mono
+#MONO_RUN_DEPENDS=	mono:lang/mono
 #MONO_CMAKE_ON=		-Denable-mono-interface:BOOL=TRUE
 #MONO_CMAKE_OFF=		-Denable-mono-interface:BOOL=FALSE
 CMAKE_ARGS+=		-Denable-mono-interface:BOOL=FALSE
@@ -124,17 +124,17 @@ CMAKE_ARGS+=		-Denable-python-interface:BOOL=FALSE
 #RUBY_CMAKE_OFF=		-Denable-ruby-interface:BOOL=FALSE
 CMAKE_ARGS+=		-Denable-ruby-interface:BOOL=FALSE
 
-SOUND_EFFECTS_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-SOUND_EFFECTS_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+SOUND_EFFECTS_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+SOUND_EFFECTS_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 SOUND_EFFECTS_CMAKE_ON=		-Denable-sound-effects:BOOL=TRUE
 SOUND_EFFECTS_CMAKE_OFF=	-Denable-sound-effects:BOOL=FALSE
 
 # Needs newer vte
-#TERMINAL_LIB_DEPENDS=	vte:${PORTSDIR}/x11-toolkits/vte
+#TERMINAL_LIB_DEPENDS=	vte:x11-toolkits/vte
 #TERMINAL_CMAKE_ON=	-Denable-terminal:BOOL=TRUE
 #TERMINAL_CMAKE_OFF=	-Denable-terminal:BOOL=FALSE
 
-UPOWER_LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower
+UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
 UPOWER_CMAKE_ON=	-Denable-upower-support:BOOL=TRUE
 UPOWER_CMAKE_OFF=	-Denable-upower-support:BOOL=FALSE
 
@@ -143,19 +143,19 @@ UPOWER_CMAKE_OFF=	-Denable-upower-support:BOOL=FALSE
 #VALA_CMAKE_OFF=		-Denable-vala-interface:BOOL=FALSE
 CMAKE_ARGS+=		-Denable-vala-interface:BOOL=FALSE
 
-WEBLETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+WEBLETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 WEBLETS_CMAKE_ON=	-Denable-weblets:BOOL=TRUE
 WEBLETS_CMAKE_OFF=	-Denable-weblets:BOOL=FALSE
 
-XGAMMA_RUN_DEPENDS=	xgamma:${PORTSDIR}/x11/xgamma
+XGAMMA_RUN_DEPENDS=	xgamma:x11/xgamma
 XGAMMA_CMAKE_ON=	-Denable-xgamma:BOOL=TRUE
 XGAMMA_CMAKE_OFF=	-Denable-xgamma:BOOL=FALSE
 
-XFCE_INTEGRATION_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+XFCE_INTEGRATION_LIB_DEPENDS=	libexif.so:graphics/libexif
 XFCE_INTEGRATION_CMAKE_ON=	-Denable-xfce-integration:BOOL=TRUE
 XFCE_INTEGRATION_CMAKE_OFF=	-Denable-xfce-integration:BOOL=FALSE
 
-ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:${PORTSDIR}/sysutils/zeitgeist
+ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
 ZEITGEIST_CMAKE_ON=	-Denable-recent-events:BOOL=TRUE
 ZEITGEIST_CMAKE_OFF=	-Denable-recent-events:BOOL=FALSE
 
diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile
index a368faea8094..f18865d56c00 100644
--- a/deskutils/cairo-dock/Makefile
+++ b/deskutils/cairo-dock/Makefile
@@ -10,12 +10,12 @@ COMMENT=	Cairo-Dock is a light and eye-candy dock
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		sox:${PORTSDIR}/audio/sox
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libcurl.so:ftp/curl \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
+RUN_DEPENDS=	bash:shells/bash \
+		sox:audio/sox
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cairo-Dock
diff --git a/deskutils/caja-extensions/Makefile b/deskutils/caja-extensions/Makefile
index 08b7e425c6e2..6744e847582c 100644
--- a/deskutils/caja-extensions/Makefile
+++ b/deskutils/caja-extensions/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Set of extensions for Caja
 
-LIB_DEPENDS=	libgupnp-1.0.so:${PORTSDIR}/net/gupnp
+LIB_DEPENDS=	libgupnp-1.0.so:net/gupnp
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index d2fe90dea73b..db25674bec1d 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -10,50 +10,50 @@ MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Ebook management application
 
-LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5 \
-		libwmflite.so:${PORTSDIR}/graphics/libwmf \
-		libchm.so:${PORTSDIR}/misc/chmlib \
-		libicudata.so:${PORTSDIR}/devel/icu \
-		libpodofo.so:${PORTSDIR}/graphics/podofo \
-		libmtp.so:${PORTSDIR}/multimedia/libmtp
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt5-core>=0:${PORTSDIR}/devel/py-qt5-core \
-		${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:${PORTSDIR}/x11-toolkits/py-qt5-gui \
-		${PYTHON_PKGNAMEPREFIX}qt5-network>=0:${PORTSDIR}/net/py-qt5-network \
-		${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:${PORTSDIR}/www/py-qt5-webkit \
-		${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:${PORTSDIR}/x11-toolkits/py-qt5-widgets \
-		${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:${PORTSDIR}/www/py-qt5-webkitwidgets \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}apsw>=0:${PORTSDIR}/databases/py-apsw
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}mechanize>=0:${PORTSDIR}/www/py-mechanize \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt5-core>=0:${PORTSDIR}/devel/py-qt5-core \
-		${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:${PORTSDIR}/x11-toolkits/py-qt5-gui \
-		${PYTHON_PKGNAMEPREFIX}qt5-network>=0:${PORTSDIR}/net/py-qt5-network \
-		${PYTHON_PKGNAMEPREFIX}qt5-svg>=0:${PORTSDIR}/graphics/py-qt5-svg \
-		${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:${PORTSDIR}/www/py-qt5-webkit \
-		${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:${PORTSDIR}/x11-toolkits/py-qt5-widgets \
-		${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:${PORTSDIR}/www/py-qt5-webkitwidgets \
-		${PYTHON_PKGNAMEPREFIX}qt5-xmlpatterns>=0:${PORTSDIR}/textproc/py-qt5-xmlpatterns \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}netifaces>=0:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}cssselect>=0:${PORTSDIR}/www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}apsw>=0:${PORTSDIR}/databases/py-apsw \
-		pdftohtml:${PORTSDIR}/graphics/poppler-utils
+LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libpoppler-qt5.so:graphics/poppler-qt5 \
+		libwmflite.so:graphics/libwmf \
+		libchm.so:misc/chmlib \
+		libicudata.so:devel/icu \
+		libpodofo.so:graphics/podofo \
+		libmtp.so:multimedia/libmtp
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt5-core>=0:devel/py-qt5-core \
+		${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:x11-toolkits/py-qt5-gui \
+		${PYTHON_PKGNAMEPREFIX}qt5-network>=0:net/py-qt5-network \
+		${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:www/py-qt5-webkit \
+		${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:x11-toolkits/py-qt5-widgets \
+		${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:www/py-qt5-webkitwidgets \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw
+RUN_DEPENDS=	xdg-open:devel/xdg-utils \
+		${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip \
+		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt5-core>=0:devel/py-qt5-core \
+		${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:x11-toolkits/py-qt5-gui \
+		${PYTHON_PKGNAMEPREFIX}qt5-network>=0:net/py-qt5-network \
+		${PYTHON_PKGNAMEPREFIX}qt5-svg>=0:graphics/py-qt5-svg \
+		${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:www/py-qt5-webkit \
+		${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:x11-toolkits/py-qt5-widgets \
+		${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:www/py-qt5-webkitwidgets \
+		${PYTHON_PKGNAMEPREFIX}qt5-xmlpatterns>=0:textproc/py-qt5-xmlpatterns \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw \
+		pdftohtml:graphics/poppler-utils
 
 USE_RC_SUBR=	calibre
 EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
diff --git a/deskutils/california/Makefile b/deskutils/california/Makefile
index 803a5d7883a5..62c282c78043 100644
--- a/deskutils/california/Makefile
+++ b/deskutils/california/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Calendar client for GNOME 3
 
 IGNORE=		Not compatible with evolution-data-server 3.16.0
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		xdg-open:${PORTSDIR}/devel/xdg-utils
-LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libgdata.so:${PORTSDIR}/devel/libgdata \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		xdg-open:devel/xdg-utils
+LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libsoup-2.4.so:devel/libsoup \
+		libgee-0.8.so:devel/libgee \
+		libgdata.so:devel/libgdata \
+		libgoa-1.0.so:net/gnome-online-accounts
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig tar:xz
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index d65a6842ca18..6daf318cc353 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Qt based tool for offline CD/DVD/disk catalogs
 LICENSE=	GPLv2 MPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	cryptopp>0:${PORTSDIR}/security/cryptopp
-LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libmediainfo.so:${PORTSDIR}/multimedia/libmediainfo \
-		libzen.so:${PORTSDIR}/multimedia/libzen
+BUILD_DEPENDS=	cryptopp>0:security/cryptopp
+LIB_DEPENDS=	libtar.so:devel/libtar \
+		libexif.so:graphics/libexif \
+		libmediainfo.so:multimedia/libmediainfo \
+		libzen.so:multimedia/libzen
 
 CONFIGURE_WRKSRC=	${WRKSRC}/src
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
diff --git a/deskutils/clipit/Makefile b/deskutils/clipit/Makefile
index 75c98f732b95..3d5f37faff14 100644
--- a/deskutils/clipit/Makefile
+++ b/deskutils/clipit/Makefile
@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ON=	localedir=${LOCALBASE}/share/locale
 NLS_CONFIGURE_OFF=	--disable-nls
-XDOTOOL_RUN_DEPENDS+=	xdotool:${PORTSDIR}/x11/xdotool
+XDOTOOL_RUN_DEPENDS+=	xdotool:x11/xdotool
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^itlocaledir =.*|itlocaledir = $$(datarootdir)/locale|' \
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 451bb6d1fd29..ef9584668a0f 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -11,16 +11,16 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Synchronization application for GNOME
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
-		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
-		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
-		xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject \
+		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject \
+		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
+		xdg-open:devel/xdg-utils
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pathfix pkgconfig python:2
@@ -38,8 +38,8 @@ EOG_DESC=	Build Eye-Of-Gnome Plugin
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEOG}
-BUILD_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
-RUN_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
+BUILD_DEPENDS+=	eog:graphics/eog
+RUN_DEPENDS+=	eog:graphics/eog
 CONFIGURE_ARGS+=	--enable-eog-plugin
 .endif
 
diff --git a/deskutils/conkyemail/Makefile b/deskutils/conkyemail/Makefile
index c3b9ddb6f965..21278e8aa008 100644
--- a/deskutils/conkyemail/Makefile
+++ b/deskutils/conkyemail/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Email script for conky
 
-RUN_DEPENDS=	conky:${PORTSDIR}/sysutils/conky
+RUN_DEPENDS=	conky:sysutils/conky
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/deskutils/conkyforecast/Makefile b/deskutils/conkyforecast/Makefile
index dbb62100261f..4ac063ba2d35 100644
--- a/deskutils/conkyforecast/Makefile
+++ b/deskutils/conkyforecast/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Weather forecast script for conky
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	conky:${PORTSDIR}/sysutils/conky \
-		pidof:${PORTSDIR}/sysutils/pidof
+RUN_DEPENDS=	conky:sysutils/conky \
+		pidof:sysutils/pidof
 
 USES=		gettext python fonts
 USE_PYTHON=	distutils
diff --git a/deskutils/dailystrips/Makefile b/deskutils/dailystrips/Makefile
index 8817e20bd92b..f8d522fcf077 100644
--- a/deskutils/dailystrips/Makefile
+++ b/deskutils/dailystrips/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Utility to download or view your favorite online comic strips daily
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-TimeDate>=0:devel/p5-TimeDate
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/deskutils/deforaos-todo/Makefile b/deskutils/deforaos-todo/Makefile
index 9e99c3a8d8d5..5ada09f808ad 100644
--- a/deskutils/deforaos-todo/Makefile
+++ b/deskutils/deforaos-todo/Makefile
@@ -13,9 +13,9 @@ COMMENT=	DeforaOS desktop todo list
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
-BUILD_DEPENDS=	${LOCALBASE}/include/Desktop/Mailer/plugin.h:${PORTSDIR}/mail/deforaos-mailer
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop
+BUILD_DEPENDS=	${LOCALBASE}/include/Desktop/Mailer/plugin.h:mail/deforaos-mailer
 
 USES=		desktop-file-utils pkgconfig
 USE_GNOME=	gtk20
@@ -27,8 +27,8 @@ MAKE_ENV=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
-DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} 's|= data doc|= data|' \
diff --git a/deskutils/devd-notifier/Makefile b/deskutils/devd-notifier/Makefile
index 2ea7451d0f68..6fc43e3119c1 100644
--- a/deskutils/devd-notifier/Makefile
+++ b/deskutils/devd-notifier/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Daemon notifying the user about devd(8) events \
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 USES=		pkgconfig
 PLIST_FILES=	bin/devd-notifier \
diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile
index 947db69e3658..ddc6a0f94def 100644
--- a/deskutils/dosage/Makefile
+++ b/deskutils/dosage/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Application to keep a local mirror of web comics
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 74f042d39ed9..88718b47dbfc 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Blog editor for GNOME
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 OPTIONS_DEFINE=	GTKSPELL
 OPTIONS_DEFAULT=	GTKSPELL
@@ -30,7 +30,7 @@ GCONF_SCHEMAS=	drivel.schemas
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lm
 
-GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 GTKSPELL_CONFIGURE_OFF=	--without-gtkspell
 
 post-patch:
diff --git a/deskutils/easystroke/Makefile b/deskutils/easystroke/Makefile
index 6a6788706d84..2fc5db73d07b 100644
--- a/deskutils/easystroke/Makefile
+++ b/deskutils/easystroke/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Easystroke is a gesture-recognition application for X11
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man \
-		${LOCALBASE}/include/xorg/xserver-properties.h:${PORTSDIR}/x11-servers/xorg-server
-LIB_DEPENDS=	libgtkmm-3.0.so:${PORTSDIR}/x11-toolkits/gtkmm30 \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libboost_serialization.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	help2man:misc/help2man \
+		${LOCALBASE}/include/xorg/xserver-properties.h:x11-servers/xorg-server
+LIB_DEPENDS=	libgtkmm-3.0.so:x11-toolkits/gtkmm30 \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libboost_serialization.so:devel/boost-libs
 
 USE_XORG=	x11 xtst
 USES=		gettext gmake pkgconfig
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	NLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-BUILD_DEPENDS+=	intltool-merge:${PORTSDIR}/textproc/intltool
+BUILD_DEPENDS+=	intltool-merge:textproc/intltool
 PLIST_SUB+=		NLS=""
 ALL_TARGET=		easystroke.desktop all man
 .else
diff --git a/deskutils/etask/Makefile b/deskutils/etask/Makefile
index e75ea3172b47..8aa190e5f0c4 100644
--- a/deskutils/etask/Makefile
+++ b/deskutils/etask/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://members.chello.at/rene.weichselbaum/ \
 MAINTAINER=	dryice@dryice.name
 COMMENT=	Manage your projects or tasks within GNU Emacs
 
-RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf
+RUN_DEPENDS=	xpdf:graphics/xpdf
 
 USE_EMACS=	yes
 USES=		ghostscript:run
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 82cda442bbbd..9161e81dc4dc 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Powerful e-book reader
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libunibreak.so:${PORTSDIR}/textproc/libunibreak
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libfribidi.so:converters/fribidi \
+		libunibreak.so:textproc/libunibreak
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	geometer
diff --git a/deskutils/freemind/Makefile b/deskutils/freemind/Makefile
index 1eca3cc130f6..43ef1d9fd472 100644
--- a/deskutils/freemind/Makefile
+++ b/deskutils/freemind/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Free mind-mapping software written in Java
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
-		zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	unzip:archivers/unzip \
+		zip:archivers/zip
 
 USES=		cpe zip:infozip
 USE_JAVA=	yes
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index f761cca8d746..49c2ea993660 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -18,7 +18,7 @@ MAKE_JOBS_UNSAFE=	yes
 .ifdef WITHOUT_SSL
 MAKE_ARGS+=	WITHOUT_SSL=yes
 .else
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 .endif
 
 post-install:
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index c1c7d13a9f6d..606c54fcfd5f 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GNOME frontend for anyRemote
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	anyremote:${PORTSDIR}/comms/anyremote
+RUN_DEPENDS=	anyremote:comms/anyremote
 
 USES=		gettext python
 USE_GNOME=	pygtk2
diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index dd2b75855278..1d22e5fbc6d0 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -15,11 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 OPTIONS_DEFINE=		MYSQL NLS NOTIFY THUNDERBIRD
 OPTIONS_SUB=		yes
 THUNDERBIRD_DESC=	Thunderbird/Sunbird support
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb
 NLS_USES=		gettext
 NLS_USE=		GNOME=intltool
-NOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>0:${PORTSDIR}/devel/py-notify
-THUNDERBIRD_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+NOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify
+THUNDERBIRD_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 NO_ARCH=	yes
 USES=		python:2,run tar:xz
diff --git a/deskutils/gcalcli/Makefile b/deskutils/gcalcli/Makefile
index 4c38668b6500..4c7901fcd371 100644
--- a/deskutils/gcalcli/Makefile
+++ b/deskutils/gcalcli/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Google Calendar Command Line Interface
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_SITELIBDIR}/gdata/__init__.py:${PORTSDIR}/devel/py-gdata \
-		${PYTHON_SITELIBDIR}/gflags.py:${PORTSDIR}/devel/py-gflags \
-		${PYTHON_SITELIBDIR}/apiclient/__init__.py:${PORTSDIR}/www/py-google-api-python-client \
-		${PYTHON_SITELIBDIR}/httplib2/__init__.py:${PORTSDIR}/www/py-httplib2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_SITELIBDIR}/gdata/__init__.py:devel/py-gdata \
+		${PYTHON_SITELIBDIR}/gflags.py:devel/py-gflags \
+		${PYTHON_SITELIBDIR}/apiclient/__init__.py:www/py-google-api-python-client \
+		${PYTHON_SITELIBDIR}/httplib2/__init__.py:www/py-httplib2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	insanum
@@ -36,9 +36,9 @@ ICS_VCAL_DESC=		enable importing of ics/vcal files
 SIMPLEJSON_DESC=	use simplejson for url shortening
 FUZZYDATES_DESC=	use parsedatetime for fuzzy date parsing
 
-ICS_VCAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject
-SIMPLEJSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson
-FUZZYDATES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:${PORTSDIR}/devel/py-parsedatetime
+ICS_VCAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject
+SIMPLEJSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson
+FUZZYDATES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:devel/py-parsedatetime
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 8f99df78596d..d76fa55e4cee 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Arbitrary precision calculator for Gnome Desktop Environment
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
-RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
+BUILD_DEPENDS=	rarian-sk-config:textproc/rarian
+LIB_DEPENDS=	libmpfr.so:math/mpfr
+RUN_DEPENDS=	rarian-sk-config:textproc/rarian
 
 USES=		desktop-file-utils gmake libtool pathfix pkgconfig \
 		readline shared-mime-info tar:xz
diff --git a/deskutils/gkrellm-reminder2/Makefile b/deskutils/gkrellm-reminder2/Makefile
index cd22c5caee50..6750f8d40630 100644
--- a/deskutils/gkrellm-reminder2/Makefile
+++ b/deskutils/gkrellm-reminder2/Makefile
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GKrellM2 plugin that reminds you of important events
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		pkgconfig
 USE_GNOME=	gtk20
diff --git a/deskutils/gnome-calendar/Makefile b/deskutils/gnome-calendar/Makefile
index bc4d96d5c865..41f2eb9491e7 100644
--- a/deskutils/gnome-calendar/Makefile
+++ b/deskutils/gnome-calendar/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple and beatiful calendar application for GNOME
 
 PORTSCOUT=	limitw:1,even
 
-LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS=	libical.so:devel/libical
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/deskutils/gnome-characters/Makefile b/deskutils/gnome-characters/Makefile
index 84cba5cc77bd..be7a289c70f5 100644
--- a/deskutils/gnome-characters/Makefile
+++ b/deskutils/gnome-characters/Makefile
@@ -12,9 +12,9 @@ COMMENT=	find and insert unusual characters for GNOME 3
 
 PORTSCOUT=	limitw:1,even
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgjs.so:${PORTSDIR}/lang/gjs \
-		libunistring.so:${PORTSDIR}/devel/libunistring
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgjs.so:lang/gjs \
+		libunistring.so:devel/libunistring
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/deskutils/gnome-clocks/Makefile b/deskutils/gnome-clocks/Makefile
index 833b46712370..e5ad9b26d3f7 100644
--- a/deskutils/gnome-clocks/Makefile
+++ b/deskutils/gnome-clocks/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clocks for GNOME 3
 
-BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
-		libgweather-3.so:${PORTSDIR}/net/libgweather
-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+BUILD_DEPENDS=	geoclue>=0:net/geoclue \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libgeocode-glib.so:net/geocode-glib \
+		libgweather-3.so:net/libgweather
+RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 65c880335811..20f7d66168f9 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -9,13 +9,13 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Contacts manager for gnome
 
-BUILD_DEPENDS=	vala>=0.14.0:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libfolks.so:${PORTSDIR}/net-im/folks \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+BUILD_DEPENDS=	vala>=0.14.0:lang/vala
+LIB_DEPENDS=	libgoa-1.0.so:net/gnome-online-accounts \
+		libchamplain-0.12.so:graphics/libchamplain \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libgee-0.8.so:devel/libgee \
+		libfolks.so:net-im/folks \
+		libnotify.so:devel/libnotify
 
 PORTSCOUT=	limitw:1,even
 
@@ -42,11 +42,11 @@ OPTIONS_DEFINE_amd64=	CHEESE
 OPTIONS_DEFAULT_amd64=	CHEESE
 
 CHEESE_CONFIGURE_WITH=	cheese
-CHEESE_LIB_DEPENDS=	libcheese-gtk.so:${PORTSDIR}/multimedia/cheese
+CHEESE_LIB_DEPENDS=	libcheese-gtk.so:multimedia/cheese
 
 MANPAGES_CONFIGURE_ENABLE=	man-pages
 MANPAGES_USE=		GNOME=libxslt:build
-MANPAGES_BUILD_DEPENDS=	docbook-xml>=0:${PORTSDIR}/textproc/docbook-xml \
-			docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
+MANPAGES_BUILD_DEPENDS=	docbook-xml>=0:textproc/docbook-xml \
+			docbook-xsl>=0:textproc/docbook-xsl
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-dictionary/Makefile b/deskutils/gnome-dictionary/Makefile
index 125a105850c9..53e1bb238fcd 100644
--- a/deskutils/gnome-dictionary/Makefile
+++ b/deskutils/gnome-dictionary/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 dictionary lookup application
 
-BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
-		itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc \
+		itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-documents/Makefile b/deskutils/gnome-documents/Makefile
index 66748bf871b4..f0c794b7f0bb 100644
--- a/deskutils/gnome-documents/Makefile
+++ b/deskutils/gnome-documents/Makefile
@@ -12,21 +12,21 @@ COMMENT=	Document manager application designed to work with GNOME 3
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 \
-		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libevview3.so:${PORTSDIR}/graphics/evince \
-		libgdata.so:${PORTSDIR}/devel/libgdata \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libgjs.so:${PORTSDIR}/lang/gjs \
-		libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker \
-		libzapojit-0.0.so:${PORTSDIR}/net/libzapojit
-RUN_DEPENDS=	py2?-dbus>0:${PORTSDIR}/devel/py-dbus \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
-		unoconv:${PORTSDIR}/textproc/unoconv
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libclutter-1.0.so:graphics/clutter \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libevview3.so:graphics/evince \
+		libgdata.so:devel/libgdata \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libgjs.so:lang/gjs \
+		libtracker-sparql-1.0.so:sysutils/tracker \
+		libzapojit-0.0.so:net/libzapojit
+RUN_DEPENDS=	py2?-dbus>0:devel/py-dbus \
+		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
+		unoconv:textproc/unoconv
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-epub-thumbnailer/Makefile b/deskutils/gnome-epub-thumbnailer/Makefile
index eac212a8cfc0..1d75e92d6cf8 100644
--- a/deskutils/gnome-epub-thumbnailer/Makefile
+++ b/deskutils/gnome-epub-thumbnailer/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Thumbnailer for EPub and MOBI books
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common
 
 USES=		autoreconf:build gettext gmake libarchive libtool pathfix pkgconfig
 USE_GNOME=	gdkpixbuf2 gnomedesktop3 gnomeprefix gtk30 \
diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile
index 999e4010844d..40f5ad36f903 100644
--- a/deskutils/gnome-font-viewer/Makefile
+++ b/deskutils/gnome-font-viewer/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 font viewer utility
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/deskutils/gnome-initial-setup/Makefile b/deskutils/gnome-initial-setup/Makefile
index c6a75a0c55e3..a668f6cd7cab 100644
--- a/deskutils/gnome-initial-setup/Makefile
+++ b/deskutils/gnome-initial-setup/Makefile
@@ -10,13 +10,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	First boot setup tool for GNOME 3
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gdm>=3.0.0:${PORTSDIR}/x11/gdm
-LIB_DEPENDS=	libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
-		libpwquality.so:${PORTSDIR}/security/libpwquality \
-		libgweather-3.so:${PORTSDIR}/net/libgweather
-RUN_DEPENDS=	gdm>=3.0.0:${PORTSDIR}/x11/gdm
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
+		gdm>=3.0.0:x11/gdm
+LIB_DEPENDS=	libgoa-1.0.so:net/gnome-online-accounts \
+		libaccountsservice.so:sysutils/accountsservice \
+		libpwquality.so:security/libpwquality \
+		libgweather-3.so:net/libgweather
+RUN_DEPENDS=	gdm>=3.0.0:x11/gdm
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-maps/Makefile b/deskutils/gnome-maps/Makefile
index 7ec61f5d9e6e..e367ab7c3e97 100644
--- a/deskutils/gnome-maps/Makefile
+++ b/deskutils/gnome-maps/Makefile
@@ -10,15 +10,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Map application for GNOME 3
 
-BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain \
-		libfolks.so:${PORTSDIR}/net-im/folks \
-		libgjs.so:${PORTSDIR}/lang/gjs
-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+BUILD_DEPENDS=	geoclue>=0:net/geoclue \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libgeocode-glib.so:net/geocode-glib \
+		libgee-0.8.so:devel/libgee \
+		libchamplain-0.12.so:graphics/libchamplain \
+		libfolks.so:net-im/folks \
+		libgjs.so:lang/gjs
+RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-photos/Makefile b/deskutils/gnome-photos/Makefile
index 54f055dc478b..cc2835201c2c 100644
--- a/deskutils/gnome-photos/Makefile
+++ b/deskutils/gnome-photos/Makefile
@@ -10,18 +10,18 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Photo application for GNOME 3
 
-BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libexempi.so:${PORTSDIR}/textproc/exempi \
-		libgfbgraph-0.2.so:${PORTSDIR}/net/gfbgraph \
-		libgegl-0.3.so:${PORTSDIR}/graphics/gegl3 \
-		libgrilo-0.2.so:${PORTSDIR}/net/grilo \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker \
-		libgjs.so:${PORTSDIR}/lang/gjs \
-		libbabl-0.1.so:${PORTSDIR}/x11/babl \
-		libgdata.so:${PORTSDIR}/devel/libgdata
-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+BUILD_DEPENDS=	geoclue>=0:net/geoclue \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libexempi.so:textproc/exempi \
+		libgfbgraph-0.2.so:net/gfbgraph \
+		libgegl-0.3.so:graphics/gegl3 \
+		libgrilo-0.2.so:net/grilo \
+		libexif.so:graphics/libexif \
+		libtracker-control-1.0.so:sysutils/tracker \
+		libgjs.so:lang/gjs \
+		libbabl-0.1.so:x11/babl \
+		libgdata.so:devel/libgdata
+RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-screenshot/Makefile b/deskutils/gnome-screenshot/Makefile
index eb298d848e43..4fe0ded0455a 100644
--- a/deskutils/gnome-screenshot/Makefile
+++ b/deskutils/gnome-screenshot/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 utility for making picutures of your screen
 
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/deskutils/gnome-search-tool/Makefile b/deskutils/gnome-search-tool/Makefile
index 0942caba9daf..e216aff2e521 100644
--- a/deskutils/gnome-search-tool/Makefile
+++ b/deskutils/gnome-search-tool/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 file search utilities
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 
diff --git a/deskutils/gnome-shell-extension-audio-output-switcher/Makefile b/deskutils/gnome-shell-extension-audio-output-switcher/Makefile
index cd5b82698c31..4c73f33e57be 100644
--- a/deskutils/gnome-shell-extension-audio-output-switcher/Makefile
+++ b/deskutils/gnome-shell-extension-audio-output-switcher/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-shell audio output switcher
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-backslide/Makefile b/deskutils/gnome-shell-extension-backslide/Makefile
index ebf2f494c9a1..acbf6edc2146 100644
--- a/deskutils/gnome-shell-extension-backslide/Makefile
+++ b/deskutils/gnome-shell-extension-backslide/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-shell extension for background slideshow
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 WRKSRC=		${WRKDIR}/LukasKnuth-backslide-7e36a49fc5e1
 
diff --git a/deskutils/gnome-shell-extension-coverflow/Makefile b/deskutils/gnome-shell-extension-coverflow/Makefile
index 503c5247fbb7..0f189855d806 100644
--- a/deskutils/gnome-shell-extension-coverflow/Makefile
+++ b/deskutils/gnome-shell-extension-coverflow/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lets you Alt-Tab windows in a cover-flow manner
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-dashtodock/Makefile b/deskutils/gnome-shell-extension-dashtodock/Makefile
index cf20e6c3b8ae..8fb1cd3090d0 100644
--- a/deskutils/gnome-shell-extension-dashtodock/Makefile
+++ b/deskutils/gnome-shell-extension-dashtodock/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Convert the dash into a dock
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-filesmenu/Makefile b/deskutils/gnome-shell-extension-filesmenu/Makefile
index 2b6b293abd36..fa20546cdb4f 100644
--- a/deskutils/gnome-shell-extension-filesmenu/Makefile
+++ b/deskutils/gnome-shell-extension-filesmenu/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Quickly navigate your file system
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-hidetopbar/Makefile b/deskutils/gnome-shell-extension-hidetopbar/Makefile
index 15ca8c209ae9..e3ee244c2032 100644
--- a/deskutils/gnome-shell-extension-hidetopbar/Makefile
+++ b/deskutils/gnome-shell-extension-hidetopbar/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Hide the topbar except in overview mode
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-lockkeys/Makefile b/deskutils/gnome-shell-extension-lockkeys/Makefile
index 9a4a0e69c16d..5d305d4d68cb 100644
--- a/deskutils/gnome-shell-extension-lockkeys/Makefile
+++ b/deskutils/gnome-shell-extension-lockkeys/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-shell Numlock and Capslock indicator
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-mediaplayer/Makefile b/deskutils/gnome-shell-extension-mediaplayer/Makefile
index 3f0d46300110..ae4318abc6f8 100644
--- a/deskutils/gnome-shell-extension-mediaplayer/Makefile
+++ b/deskutils/gnome-shell-extension-mediaplayer/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MPRIS2 extension for the GNOME3 shell
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf gettext gmake gnome libtool pkgconfig tar:xz
 USE_GNOME=	glib20 intltool
diff --git a/deskutils/gnome-shell-extension-openweather/Makefile b/deskutils/gnome-shell-extension-openweather/Makefile
index 9c83cea39f9d..e687ad472432 100644
--- a/deskutils/gnome-shell-extension-openweather/Makefile
+++ b/deskutils/gnome-shell-extension-openweather/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	OpenWeather extension for the GNOME3 shell
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf gettext gmake gnome libtool pkgconfig tar:xz
 USE_GNOME=	glib20 intltool
diff --git a/deskutils/gnome-shell-extension-overlay-icons/Makefile b/deskutils/gnome-shell-extension-overlay-icons/Makefile
index b059d2a3bd78..b21a04a9a53e 100644
--- a/deskutils/gnome-shell-extension-overlay-icons/Makefile
+++ b/deskutils/gnome-shell-extension-overlay-icons/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Show application icons on the windows overview
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-panel-osd/Makefile b/deskutils/gnome-shell-extension-panel-osd/Makefile
index 3bbe33e9fd05..8c3924df29ba 100644
--- a/deskutils/gnome-shell-extension-panel-osd/Makefile
+++ b/deskutils/gnome-shell-extension-panel-osd/Makefile
@@ -9,9 +9,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	OSD extension for the GNOME3 shell
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf gettext gmake gnome libtool pkgconfig tar:xz
 USE_GNOME=	glib20 intltool
diff --git a/deskutils/gnome-shell-extension-trash/Makefile b/deskutils/gnome-shell-extension-trash/Makefile
index 400643b3ce35..b51710c934cf 100644
--- a/deskutils/gnome-shell-extension-trash/Makefile
+++ b/deskutils/gnome-shell-extension-trash/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-shell trash indicator
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-weather/Makefile b/deskutils/gnome-shell-extension-weather/Makefile
index 7453841f008f..9b1b8c73ffa9 100644
--- a/deskutils/gnome-shell-extension-weather/Makefile
+++ b/deskutils/gnome-shell-extension-weather/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Weather extension for the GNOME3 shell
 
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell
 
 USES=		autoreconf gettext gmake gnome libtool pkgconfig tar:xz
 USE_GNOME=	glib20 intlhack
diff --git a/deskutils/gnome-shell-extra-extensions/Makefile b/deskutils/gnome-shell-extra-extensions/Makefile
index 9bce7a9d681f..7adc9f334258 100644
--- a/deskutils/gnome-shell-extra-extensions/Makefile
+++ b/deskutils/gnome-shell-extra-extensions/Makefile
@@ -10,18 +10,18 @@ COMMENT=	Gnome shell extra extensions metaport
 
 USES=		metaport
 
-RUN_DEPENDS=	gnome-shell-extension-weather>=0:${PORTSDIR}/deskutils/gnome-shell-extension-weather \
-		gnome-shell-extension-openweather>=0:${PORTSDIR}/deskutils/gnome-shell-extension-openweather \
-		gnome-shell-extension-panel-osd>=0:${PORTSDIR}/deskutils/gnome-shell-extension-panel-osd \
-		gnome-shell-extension-mediaplayer>=0:${PORTSDIR}/deskutils/gnome-shell-extension-mediaplayer \
-		gnome-shell-extension-coverflow>=0:${PORTSDIR}/deskutils/gnome-shell-extension-coverflow \
-		gnome-shell-extension-overlay-icons>=0:${PORTSDIR}/deskutils/gnome-shell-extension-overlay-icons \
-		gnome-shell-extension-hidetopbar>=0:${PORTSDIR}/deskutils/gnome-shell-extension-hidetopbar \
-		gnome-shell-extension-lockkeys>=0:${PORTSDIR}/deskutils/gnome-shell-extension-lockkeys \
-		gnome-shell-extension-trash>=0:${PORTSDIR}/deskutils/gnome-shell-extension-trash \
-		gnome-shell-extension-dashtodock>=0:${PORTSDIR}/deskutils/gnome-shell-extension-dashtodock \
-		gnome-shell-extension-audio-output-switcher>=0:${PORTSDIR}/deskutils/gnome-shell-extension-audio-output-switcher \
-		gnome-shell-extension-recent-items>=0:${PORTSDIR}/deskutils/gnome-shell-extension-recent-items \
-		gnome-shell-extension-filesmenu>=0:${PORTSDIR}/deskutils/gnome-shell-extension-filesmenu
+RUN_DEPENDS=	gnome-shell-extension-weather>=0:deskutils/gnome-shell-extension-weather \
+		gnome-shell-extension-openweather>=0:deskutils/gnome-shell-extension-openweather \
+		gnome-shell-extension-panel-osd>=0:deskutils/gnome-shell-extension-panel-osd \
+		gnome-shell-extension-mediaplayer>=0:deskutils/gnome-shell-extension-mediaplayer \
+		gnome-shell-extension-coverflow>=0:deskutils/gnome-shell-extension-coverflow \
+		gnome-shell-extension-overlay-icons>=0:deskutils/gnome-shell-extension-overlay-icons \
+		gnome-shell-extension-hidetopbar>=0:deskutils/gnome-shell-extension-hidetopbar \
+		gnome-shell-extension-lockkeys>=0:deskutils/gnome-shell-extension-lockkeys \
+		gnome-shell-extension-trash>=0:deskutils/gnome-shell-extension-trash \
+		gnome-shell-extension-dashtodock>=0:deskutils/gnome-shell-extension-dashtodock \
+		gnome-shell-extension-audio-output-switcher>=0:deskutils/gnome-shell-extension-audio-output-switcher \
+		gnome-shell-extension-recent-items>=0:deskutils/gnome-shell-extension-recent-items \
+		gnome-shell-extension-filesmenu>=0:deskutils/gnome-shell-extension-filesmenu
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-sound-recorder/Makefile b/deskutils/gnome-sound-recorder/Makefile
index e59e78257052..fb5ff254c3bf 100644
--- a/deskutils/gnome-sound-recorder/Makefile
+++ b/deskutils/gnome-sound-recorder/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME sound recorder application
 
-LIB_DEPENDS=	libgjs.so:${PORTSDIR}/lang/gjs
+LIB_DEPENDS=	libgjs.so:lang/gjs
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-system-log/Makefile b/deskutils/gnome-system-log/Makefile
index 744119a89eec..5abbca4c7dbb 100644
--- a/deskutils/gnome-system-log/Makefile
+++ b/deskutils/gnome-system-log/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 system log viewer
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 
diff --git a/deskutils/gnome-tweak-tool/Makefile b/deskutils/gnome-tweak-tool/Makefile
index df3cb53dc5ac..0b574689e6ab 100644
--- a/deskutils/gnome-tweak-tool/Makefile
+++ b/deskutils/gnome-tweak-tool/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Allows to tweak some hidden settings in GTK3 / GNOME3
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index e6ab770feb2f..826d573916c7 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -11,24 +11,24 @@ COMMENT=	GNOME 3 support utilities
 
 USES=		metaport
 
-RUN_DEPENDS=	baobab>=3.0:${PORTSDIR}/deskutils/baobab \
-		gnome-screenshot>=3.0:${PORTSDIR}/deskutils/gnome-screenshot \
-		gnote>=3.0:${PORTSDIR}/deskutils/gnote \
-		gnome-contacts>=3.0:${PORTSDIR}/deskutils/gnome-contacts \
-		gnome-search-tool>=3.0:${PORTSDIR}/deskutils/gnome-search-tool \
-		gnome-dictionary>=3.0:${PORTSDIR}/deskutils/gnome-dictionary \
-		gnome-system-log>=3.0:${PORTSDIR}/deskutils/gnome-system-log \
-		gnome-font-viewer>=3.0:${PORTSDIR}/deskutils/gnome-font-viewer \
-		gnome-system-monitor>=3.0:${PORTSDIR}/sysutils/gnome-system-monitor \
-		gnome-photos>=3.0:${PORTSDIR}/deskutils/gnome-photos \
-		gnome-clocks>=3.0:${PORTSDIR}/deskutils/gnome-clocks \
-		gnome-maps>=3.0:${PORTSDIR}/deskutils/gnome-maps \
-		gnome-weather>=3.0:${PORTSDIR}/deskutils/gnome-weather \
-		gnome-todo>=3.0:${PORTSDIR}/deskutils/gnome-todo
+RUN_DEPENDS=	baobab>=3.0:deskutils/baobab \
+		gnome-screenshot>=3.0:deskutils/gnome-screenshot \
+		gnote>=3.0:deskutils/gnote \
+		gnome-contacts>=3.0:deskutils/gnome-contacts \
+		gnome-search-tool>=3.0:deskutils/gnome-search-tool \
+		gnome-dictionary>=3.0:deskutils/gnome-dictionary \
+		gnome-system-log>=3.0:deskutils/gnome-system-log \
+		gnome-font-viewer>=3.0:deskutils/gnome-font-viewer \
+		gnome-system-monitor>=3.0:sysutils/gnome-system-monitor \
+		gnome-photos>=3.0:deskutils/gnome-photos \
+		gnome-clocks>=3.0:deskutils/gnome-clocks \
+		gnome-maps>=3.0:deskutils/gnome-maps \
+		gnome-weather>=3.0:deskutils/gnome-weather \
+		gnome-todo>=3.0:deskutils/gnome-todo
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Build Gnome Documents (pulls in tracker)
 
-DOCS_RUN_DEPENDS+=	gnome-documents>=0:${PORTSDIR}/deskutils/gnome-documents
+DOCS_RUN_DEPENDS+=	gnome-documents>=0:deskutils/gnome-documents
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-weather/Makefile b/deskutils/gnome-weather/Makefile
index aa20d5fe9ce4..dbcae031c6f3 100644
--- a/deskutils/gnome-weather/Makefile
+++ b/deskutils/gnome-weather/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Weather application for GNOME 3
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgweather-3.so:${PORTSDIR}/net/libgweather \
-		libgjs.so:${PORTSDIR}/lang/gjs
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgweather-3.so:net/libgweather \
+		libgjs.so:lang/gjs
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index cea3fa576b5e..40792410393f 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -12,12 +12,12 @@ COMMENT=	C++ version of Tomboy, note taking application
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libgtkspell3-3.so:textproc/gtkspell3 \
+		libboost_filesystem.so:devel/boost-libs \
+		libsecret-1.so:security/libsecret \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index e3fab304021d..b35e16d97d2c 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Time tracker for gnome2
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libqof.so:${PORTSDIR}/databases/qof
+LIB_DEPENDS=	libqof.so:databases/qof
 
 USES=		gettext gmake libtool pathfix pkgconfig
 USE_XORG=	xscrnsaver
@@ -38,8 +38,8 @@ OPTIONS_DEFAULT=	GUILE1
 GUILE1_DESC=	Use lang/guile
 GUILE2_DESC=	Use lang/guile2
 
-GUILE1_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
-GUILE2_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+GUILE1_LIB_DEPENDS=	libguile.so:lang/guile
+GUILE2_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 GUILE2_LDFLAGS=		-lm
 
 post-patch:
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index f641f2dd82e3..4c083ee1dd00 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -12,19 +12,19 @@ COMMENT=	GNOME recipe manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:${PORTSDIR}/devel/py-python-distutils-extra \
-		${PYTHON_PKGNAMEPREFIX}elib.intl>0:${PORTSDIR}/textproc/py-elib.intl
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}poppler>=0:${PORTSDIR}/graphics/py-poppler \
-		${PYTHON_PKGNAMEPREFIX}rtf>=0:${PORTSDIR}/print/py-rtf \
-		${PYTHON_PKGNAMEPREFIX}reportlab>0:${PORTSDIR}/print/py-reportlab \
-		${PYTHON_PKGNAMEPREFIX}elib.intl>0:${PORTSDIR}/textproc/py-elib.intl
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \
+		${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler \
+		${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf \
+		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab \
+		${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl
 
 OPTIONS_DEFINE=		IPYTHON
 IPYTHON_DESC=		Interactive shell support
-IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>0:${PORTSDIR}/devel/ipython
+IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython
 
 USES=		gettext python:2
 USE_GNOME=	intltool pygnome2 pygtk2
diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index b9e396d37ed8..ceec5909d7c5 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Lightweight film collection manager
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:${PORTSDIR}/databases/py-sqlalchemy06 \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:databases/py-sqlalchemy06 \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
 
 USE_GNOME=	pygtk2
 USES=		gmake gettext python:2 tar:xz
@@ -25,19 +25,19 @@ OPTIONS_DEFINE=		CHARDET LXML REPORTLAB2
 OPTIONS_DEFAULT=	LXML
 
 CHARDET_DESC=		chardet support
-CHARDET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>=0:${PORTSDIR}/textproc/py-chardet
+CHARDET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet
 
 LXML_DESC=		lxml support
-LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
+LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
 
 REPORTLAB2_DESC=	ReportLab2 support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREPORTLAB2}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab2>=2:${PORTSDIR}/print/py-reportlab2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab2>=2:print/py-reportlab2
 .else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:${PORTSDIR}/print/py-reportlab1
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:print/py-reportlab1
 .endif
 
 post-patch:
diff --git a/deskutils/growl-for-linux/Makefile b/deskutils/growl-for-linux/Makefile
index c38d97f17728..578352e5bd2f 100644
--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Notification system compatible with Growl
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	desktop-file-install:${PORTSDIR}/devel/desktop-file-utils
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	desktop-file-install:devel/desktop-file-utils
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libdbus-glib-1.so:devel/dbus-glib
 
 CONFIGURE_ARGS=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 LIBNOTIFY_DESC=		Use notify-osd for libnotify display plugin
-LIBNOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-LIBNOTIFY_RUN_DEPENDS=	notify-osd>=0.9.29_3:${PORTSDIR}/deskutils/notify-osd
+LIBNOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
+LIBNOTIFY_RUN_DEPENDS=	notify-osd>=0.9.29_3:deskutils/notify-osd
 
 OPTIONS_DEFAULT=LIBNOTIFY
 OPTIONS_DEFINE=	LIBNOTIFY
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index 12ea25928c31..5499d4d486f9 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -10,10 +10,10 @@ COMMENT=	GTD organizer for the GNOME desktop environment
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \
-		${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:${PORTSDIR}/devel/py-liblarch \
-		xset:${PORTSDIR}/x11/xset
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \
+		${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:devel/py-liblarch \
+		xset:x11/xset
 
 USE_GNOME=	pygobject pygtk2
 USES=		gettext desktop-file-utils python:2 shebangfix
@@ -24,7 +24,7 @@ USE_PYTHON=	distutils autoplist
 OPTIONS_DEFINE=		CHEETAH
 CHEETAH_DESC=		Needed for export plugin to work
 OPTIONS_EXCLUDE=	NLS DOCS
-CHEETAH_RUN_DEPENDS=	${LOCALBASE}/bin/cheetah:${PORTSDIR}/devel/py-cheetah
+CHEETAH_RUN_DEPENDS=	${LOCALBASE}/bin/cheetah:devel/py-cheetah
 
 .include <bsd.port.options.mk>
 
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index 57dfbe0d17e5..e66efbc57de2 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Timer for your personal activities
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_XORG=	x11 xscrnsaver
 USE_GNOME=	gtk20
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index e78c6b07ac0f..89b4c8c5af76 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Unicode/ISO10646 character map and font viewer
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 4fb0b3e89657..228592f259f7 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv2
 USES=		gnustep
 USE_GNUSTEP=	back build
 GNU_CONFIGURE=	yes
-LIB_DEPENDS=	libDBKit.so:${PORTSDIR}/deskutils/gworkspace \
-		libPreferencePanes.so:${PORTSDIR}/deskutils/systempreferences
+LIB_DEPENDS=	libDBKit.so:deskutils/gworkspace \
+		libPreferencePanes.so:deskutils/systempreferences
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 USE_SQLITE=	yes
diff --git a/deskutils/gxneur/Makefile b/deskutils/gxneur/Makefile
index c073fb1a1f0a..2d6171657df5 100644
--- a/deskutils/gxneur/Makefile
+++ b/deskutils/gxneur/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GTK frontend for XNeur keyboard layout switcher
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xneur:${PORTSDIR}/deskutils/xneur
-RUN_DEPENDS=	xneur:${PORTSDIR}/deskutils/xneur
+BUILD_DEPENDS=	xneur:deskutils/xneur
+RUN_DEPENDS=	xneur:deskutils/xneur
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index 3453ba814582..0756753767b3 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -54,9 +54,9 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date
+RUN_DEPENDS+=	${PEARDIR}/Date.php:devel/pear-Date
 
-DATE_HOLIDAYS_RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+DATE_HOLIDAYS_RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 TIMEOBJECTS_USE=	HORDE_RUN=timeobjects
 XMLWRITER_USE=	PHP=xmlwriter
diff --git a/deskutils/jjclient/Makefile b/deskutils/jjclient/Makefile
index f3e8bfc25047..15366c94c69a 100644
--- a/deskutils/jjclient/Makefile
+++ b/deskutils/jjclient/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	SF/justjournal/JustJournal%20UNIX%20Client/${PORTVERSION} \
 MAINTAINER=	luke@justjournal.com
 COMMENT=	Command line client for posting JustJournal entries
 
-LIB_DEPENDS+=	libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c
+LIB_DEPENDS+=	libxmlrpc.so:net/xmlrpc-c
 
 PLIST_FILES=	bin/jjclient
 
diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index ffdbb7e1e5b9..cfa7397c8d98 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	SF
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDE viewer for CHM files
 
-LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib \
-		libzip.so:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS=	libchm.so:misc/chmlib \
+		libzip.so:archivers/libzip
 
 USES=		cmake:outsource gettext-tools
 USE_KDE4=	kdeprefix kdelibs automoc4
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 9aef582e36c1..26b15a975b0f 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE PIM tools and services
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libkgapi2.so:${PORTSDIR}/devel/libkgapi \
-		libkolab.so:${PORTSDIR}/devel/libkolab \
-		libkolabxml.so:${PORTSDIR}/textproc/libkolabxml \
-		libkfbapi.so:${PORTSDIR}/net/libkfbapi \
-		libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libkgapi2.so:devel/libkgapi \
+		libkolab.so:devel/libkolab \
+		libkolabxml.so:textproc/libkolabxml \
+		libkfbapi.so:net/libkfbapi \
+		libqjson.so:devel/qjson
 
 CONFLICTS_INSTALL=	kdepim-runtime44-4.*
 
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 14c65abb1b38..bfdc3da2787f 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -11,14 +11,14 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE PIM applications
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-		libassuan.so:${PORTSDIR}/security/libassuan \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee \
-		libkgapi2.so:${PORTSDIR}/devel/libkgapi
-RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime \
-		${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils
+LIB_DEPENDS=	libgpgme.so:security/gpgme \
+		libassuan.so:security/libassuan \
+		libsasl2.so:security/cyrus-sasl2 \
+		libboost_thread.so:devel/boost-libs \
+		libgrantlee_gui.so:devel/grantlee \
+		libkgapi2.so:devel/libkgapi
+RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:deskutils/kdepim4-runtime \
+		${LOCALBASE}/bin/gmd5sum:sysutils/coreutils
 
 CONFLICTS_INSTALL=	kdepim44-4.*
 
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 35616c7dd785..6b763627fe86 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -11,14 +11,14 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE PIM Libraries
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libical.so:${PORTSDIR}/devel/libical \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libprison.so:${PORTSDIR}/graphics/prison \
-		libqjson.so:${PORTSDIR}/devel/qjson
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
+LIB_DEPENDS=	libgpgme.so:security/gpgme \
+		libsasl2.so:security/cyrus-sasl2 \
+		libboost_thread.so:devel/boost-libs \
+		libical.so:devel/libical \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libprison.so:graphics/prison \
+		libqjson.so:devel/qjson
 
 USE_KDE4=	kdelibs akonadi kdeprefix \
 		automoc4 ontologies soprano
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 0afd01fb3a59..15ed9e7ea45e 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Extra plasmoids for KDE SC 4
 
-LIB_DEPENDS=	libqalculate.so:${PORTSDIR}/math/libqalculate \
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libqoauth.so:${PORTSDIR}/net/qoauth \
-		libqjson.so:${PORTSDIR}/devel/qjson
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
+LIB_DEPENDS=	libqalculate.so:math/libqalculate \
+		libqwt.so:x11-toolkits/qwt5 \
+		libqca.so:devel/qca \
+		libqoauth.so:net/qoauth \
+		libqjson.so:devel/qjson
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2
 
 CONFLICTS_INSTALL=	plasma-applet-icontasks-0.[89].*
 
@@ -36,11 +36,11 @@ MARBLE_USE=	KDE4=marble
 MARBLE_CMAKE_OFF=	-DWITH_Marble=off
 
 IBUS_DESC=	Enable IBUS backend for input dialog
-IBUS_LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus
+IBUS_LIB_DEPENDS=	libibus-1.0.so:textproc/ibus
 IBUS_CMAKE_OFF=	-DBUILD_ibus=off
 
 SCIM_DESC=	Enable SCIM backend for input dialog
-SCIM_LIB_DEPENDS=	libscim-1.0.so:${PORTSDIR}/textproc/scim
+SCIM_LIB_DEPENDS=	libscim-1.0.so:textproc/scim
 SCIM_CMAKE_OFF=	-DBUILD_scim=off
 
 post-patch:
diff --git a/deskutils/ladon/Makefile b/deskutils/ladon/Makefile
index 1e5181b4cb14..95f6c5394359 100644
--- a/deskutils/ladon/Makefile
+++ b/deskutils/ladon/Makefile
@@ -14,8 +14,8 @@ BROKEN=		does not build
 DEPRECATED=	Broken for more than 6 months
 EXPIRATION_DATE=	2016-04-15
 
-BUILD_DEPENDS=	npm>0:${PORTSDIR}/www/npm
-RUN_DEPENDS=	npm>0:${PORTSDIR}/www/npm
+BUILD_DEPENDS=	npm>0:www/npm
+RUN_DEPENDS=	npm>0:www/npm
 
 NO_BUILD=	yes
 USE_GITHUB=	yes
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index 2e0071650657..264e7b18fae1 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Open source keystroke launcher
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:devel/xdg-utils
 
 USES=		dos2unix qmake
 DOS2UNIX_FILES=	readme.lyx readme.txt
diff --git a/deskutils/libgcal/Makefile b/deskutils/libgcal/Makefile
index f5061616de1a..708c2b191cd8 100644
--- a/deskutils/libgcal/Makefile
+++ b/deskutils/libgcal/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Library allowing communication with Google calendar and contacts
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libxml2.so:textproc/libxml2
 
 USES=		cmake tar:bzip2
 CMAKE_ARGS=	-DLIB_INSTALL_DIR="${LOCALBASE}/lib" \
diff --git a/deskutils/libopensync-plugin-vformat-devel/Makefile b/deskutils/libopensync-plugin-vformat-devel/Makefile
index d8f5aafbad6a..9863a47b7a30 100644
--- a/deskutils/libopensync-plugin-vformat-devel/Makefile
+++ b/deskutils/libopensync-plugin-vformat-devel/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Vformat plugin for the OpenSync framework
 
-LIB_DEPENDS=	libopensync.so:${PORTSDIR}/devel/libopensync
+LIB_DEPENDS=	libopensync.so:devel/libopensync
 
 USES=		cmake iconv pkgconfig tar:bzip2
 CMAKE_ARGS+=	-Wno-dev
diff --git a/deskutils/libstreamanalyzer/Makefile b/deskutils/libstreamanalyzer/Makefile
index 95fe312af6d4..8b0f14ad91f1 100644
--- a/deskutils/libstreamanalyzer/Makefile
+++ b/deskutils/libstreamanalyzer/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	${STRIGI_MASTER_SITES}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi desktop search: streamanalyzer library
 
-LIB_DEPENDS=	libavcodec${FFMPEG_SUFFIX}.so:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
-		libclucene-core.so:${PORTSDIR}/textproc/clucene \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libstreams.so:${PORTSDIR}/deskutils/libstreams
+LIB_DEPENDS=	libavcodec${FFMPEG_SUFFIX}.so:multimedia/ffmpeg${FFMPEG_SUFFIX} \
+		libclucene-core.so:textproc/clucene \
+		libexiv2.so:graphics/exiv2 \
+		libstreams.so:deskutils/libstreams
 
 USES=		pkgconfig iconv
 USE_GNOME=	libxml2
diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile
index 780765b77af9..a32e7d7f51fb 100644
--- a/deskutils/ljit/Makefile
+++ b/deskutils/ljit/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GUI tool to help LiveJournal users post images
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libcurl.so:ftp/curl
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index 67693aaac937..570e14824a84 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://andy-shev.github.com/LogJam/download/
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	GTK2 interface to livejournals, ie www.livejournal.com
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libdbus-glib-1.so:devel/dbus-glib
 
 OPTIONS_DEFINE=	GTKSPELL SQLITE XMMS GTKHTML RSVG
 OPTIONS_DEFAULT=	GTKSPELL
@@ -30,13 +30,13 @@ CONFIGURE_ARGS=	--program-transform-name="s/$$//"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 GTKSPELL_CONFIGURE_WITH=	gtkspell
 
 SQLITE_CONFIGURE_WITH=	sqlite3
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
-XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_LIB_DEPENDS=	libxmms.so:multimedia/xmms
 XMMS_CONFIGURE_WITH=	xmms
 
 GTKHTML_USE=	GNOME=gtkhtml3
diff --git a/deskutils/mate-notification-daemon/Makefile b/deskutils/mate-notification-daemon/Makefile
index 710f07400102..8fcdfb38d1e6 100644
--- a/deskutils/mate-notification-daemon/Makefile
+++ b/deskutils/mate-notification-daemon/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Send small notifications to your desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libcanberra-gtk.so:audio/libcanberra \
+		libnotify.so:devel/libnotify
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/mate-utils/Makefile b/deskutils/mate-utils/Makefile
index be595482043b..bdad8eec1a59 100644
--- a/deskutils/mate-utils/Makefile
+++ b/deskutils/mate-utils/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE support utilities
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
+		libcanberra-gtk.so:audio/libcanberra
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index c2abdafcedd4..e1820d1a4fb4 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -23,10 +23,10 @@ LIBS+=		-L${LOCALBASE}/lib -lX11
 OPTIONS_DEFINE=	CURL DOCS GTOP
 OPTIONS_DEFAULT=	CURL GTOP
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=	--disable-curl
 
-GTOP_LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
+GTOP_LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop
 GTOP_CONFIGURE_OFF=	--disable-gtop
 
 post-patch:
diff --git a/deskutils/multisync-backup/Makefile b/deskutils/multisync-backup/Makefile
index f051c4c9696b..ea608f581afe 100644
--- a/deskutils/multisync-backup/Makefile
+++ b/deskutils/multisync-backup/Makefile
@@ -6,7 +6,7 @@ PORTNAME=	multisync-backup
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multisync backup plugin
 
-RUN_DEPENDS=	multisync:${PORTSDIR}/deskutils/multisync
+RUN_DEPENDS=	multisync:deskutils/multisync
 
 DISTINFO_FILE=	${MASTERDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
diff --git a/deskutils/multisync-syncml/Makefile b/deskutils/multisync-syncml/Makefile
index 7f68b9103053..fcfc20c396e7 100644
--- a/deskutils/multisync-syncml/Makefile
+++ b/deskutils/multisync-syncml/Makefile
@@ -6,7 +6,7 @@ PORTNAME=	multisync-syncml
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multisync plugin for SyncML targets
 
-RUN_DEPENDS=	multisync:${PORTSDIR}/deskutils/multisync
+RUN_DEPENDS=	multisync:deskutils/multisync
 
 DISTINFO_FILE=	${MASTERDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
diff --git a/deskutils/myitcrm/Makefile b/deskutils/myitcrm/Makefile
index decc58ce1b2e..6cb751121b53 100644
--- a/deskutils/myitcrm/Makefile
+++ b/deskutils/myitcrm/Makefile
@@ -31,8 +31,8 @@ PHPMOD_DESC=	Use PHP module for Apache
 NGINX_DESC=	Use Nginx
 
 APACHE_USE=	APACHE_RUN=22+
-LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
-NGINX_RUN_DEPENDS=	nginx:${PORTSDIR}/www/nginx
+LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
+NGINX_RUN_DEPENDS=	nginx:www/nginx
 
 .include <bsd.port.options.mk>
 
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index f8e53ad1b8d0..6347262d96aa 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Notes-taking application based on Qt 4
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 5575cc0852f5..4f1b4fe00008 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Extension for Nautilus to configure programs to launch on files
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libunique-3.0.so:${PORTSDIR}/x11-toolkits/libunique3
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libgtop-2.0.so:devel/libgtop \
+		libunique-3.0.so:x11-toolkits/libunique3
 
 USES=		gettext gmake libtool pkgconfig tar:xz
 USE_GNOME=	gtk30 intltool nautilus3
diff --git a/deskutils/nemo-extensions/Makefile b/deskutils/nemo-extensions/Makefile
index 15d49a327576..0e8299638769 100644
--- a/deskutils/nemo-extensions/Makefile
+++ b/deskutils/nemo-extensions/Makefile
@@ -10,24 +10,24 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gustau.perez@gmail.com
 COMMENT=	File manager extensions for the Cinnamon desktop
 
-BUILD_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		gtkdocize:${PORTSDIR}/textproc/gtk-doc \
-		rst2html:${PORTSDIR}/textproc/py-docutils \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop \
-		libnemo-extension.so:${PORTSDIR}/x11-fm/nemo \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libexempi.so:${PORTSDIR}/textproc/exempi \
-		libcjs.so:${PORTSDIR}/lang/cjs \
-		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
-		libevdocument3.so:${PORTSDIR}/graphics/evince \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
-		libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		gtkdocize:textproc/gtk-doc \
+		rst2html:textproc/py-docutils \
+		gnome-autogen.sh:devel/gnome-common \
+		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libcinnamon-desktop.so:x11/cinnamon-desktop \
+		libnemo-extension.so:x11-fm/nemo \
+		libnotify.so:devel/libnotify \
+		libexempi.so:textproc/exempi \
+		libcjs.so:lang/cjs \
+		libclutter-1.0.so:graphics/clutter \
+		libevdocument3.so:graphics/evince \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libclutter-gst-2.0.so:multimedia/clutter-gst \
+		libmusicbrainz5.so:audio/libmusicbrainz5
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
diff --git a/deskutils/note/Makefile b/deskutils/note/Makefile
index 4cc791208727..245e97fc7599 100644
--- a/deskutils/note/Makefile
+++ b/deskutils/note/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Console based tool to handle encrypted notes
 
 LICENSE=	GPLv1
 
-RUN_DEPENDS=	p5-YAML>=0.1:${PORTSDIR}/textproc/p5-YAML \
-		p5-Crypt-IDEA>=1.0:${PORTSDIR}/security/p5-Crypt-IDEA
+RUN_DEPENDS=	p5-YAML>=0.1:textproc/p5-YAML \
+		p5-Crypt-IDEA>=1.0:security/p5-Crypt-IDEA
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index d6e4e9320a84..1435bd05d55f 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Send small notifications to your desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile
index 00b49f3ab0a3..20683f3dc1ea 100644
--- a/deskutils/notify-osd/Makefile
+++ b/deskutils/notify-osd/Makefile
@@ -14,9 +14,9 @@ COMMENT=	On-screen-display notification agent using libnotify
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libnotify.so:devel/libnotify
+RUN_DEPENDS=	dbus-daemon:devel/dbus
 
 CONFLICTS=	xfce4-notification-daemon-[0-9]*
 
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 071bc0a88602..5e04ca222034 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Calendar application for the Xfce Desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS=	libpopt.so:devel/popt \
+	libdbus-glib-1.so:devel/dbus-glib \
+	libical.so:devel/libical
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -27,7 +27,7 @@ USE_XFCE=	panel
 
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=	NOTIFY
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=	libnotify
 
 CFLAGS+=	-I${LOCALBASE}/include/libical
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index bdae6abe0809..c166e0b1c175 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Personal organizer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libgringotts.so:${PORTSDIR}/security/libgringotts \
-		libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libical.so:devel/libical \
+		libnotify.so:devel/libnotify \
+		libgringotts.so:security/libgringotts \
+		libgtkspell.so:textproc/gtkspell \
+		libwebkitgtk-1.0.so:www/webkit-gtk2
 
 USES=		gettext gmake libarchive pkgconfig
 USE_GNOME=	gtk20 libxml2
diff --git a/deskutils/osynctool/Makefile b/deskutils/osynctool/Makefile
index ce660585b6ea..a4521dbdaf14 100644
--- a/deskutils/osynctool/Makefile
+++ b/deskutils/osynctool/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/ \
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Command line client for the OpenSync framework
 
-LIB_DEPENDS=	libopensync.so:${PORTSDIR}/devel/libopensync
+LIB_DEPENDS=	libopensync.so:devel/libopensync
 
 CONFLICTS=	msynctool-0.2*
 
diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile
index b34e7c68fb6c..c841b1f020e8 100644
--- a/deskutils/owncloudclient/Makefile
+++ b/deskutils/owncloudclient/Makefile
@@ -11,8 +11,8 @@ COMMENT=	OwnCloud Desktop Syncing Client
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify \
-		libqt5keychain.so:${PORTSDIR}/security/qtkeychain-qt5
+LIB_DEPENDS=	libinotify.so:devel/libinotify \
+		libqt5keychain.so:security/qtkeychain-qt5
 
 USES=		cmake:outsource compiler:c++11-lib gmake iconv localbase \
 		pkgconfig sqlite
@@ -31,7 +31,7 @@ GH_PROJECT=	client
 
 OPTIONS_DEFINE=		DEBUG DOCS
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_USE=		tex=dvipsk:build,latex:build
 DOCS_CMAKE_ON=		-DWITH_DOC:BOOL=ON
 
diff --git a/deskutils/p5-Data-ICal/Makefile b/deskutils/p5-Data-ICal/Makefile
index ba895de04ce9..9e7da7611b4e 100644
--- a/deskutils/p5-Data-ICal/Makefile
+++ b/deskutils/p5-Data-ICal/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Data::ICal - Generates iCalendar (RFC 2445) calendar files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-ReturnValue>=0:${PORTSDIR}/devel/p5-Class-ReturnValue \
-		p5-Text-vFile-asData>=0:${PORTSDIR}/devel/p5-Text-vFile-asData
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-ReturnValue>=0:devel/p5-Class-ReturnValue \
+		p5-Text-vFile-asData>=0:devel/p5-Text-vFile-asData
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-LongString>=0:devel/p5-Test-LongString \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/deskutils/p5-Goo/Makefile b/deskutils/p5-Goo/Makefile
index 3d2ed8c2387a..4106b9bac65f 100644
--- a/deskutils/p5-Goo/Makefile
+++ b/deskutils/p5-Goo/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Stick Things together with The Goo
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Auto>=0:${PORTSDIR}/devel/p5-Config-Auto \
-		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-File-Grep>=0:${PORTSDIR}/devel/p5-File-Grep \
-		p5-File-NCopy>=0:${PORTSDIR}/devel/p5-File-NCopy \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		perltidy:${PORTSDIR}/devel/p5-Perl-Tidy \
-		p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Text-FormatTable>=0:${PORTSDIR}/textproc/p5-Text-FormatTable
+BUILD_DEPENDS=	p5-Config-Auto>=0:devel/p5-Config-Auto \
+		p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-File-Grep>=0:devel/p5-File-Grep \
+		p5-File-NCopy>=0:devel/p5-File-NCopy \
+		p5-libwww>=0:www/p5-libwww \
+		perltidy:devel/p5-Perl-Tidy \
+		p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Text-FormatTable>=0:textproc/p5-Text-FormatTable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/deskutils/p5-ZConf-BGSet/Makefile b/deskutils/p5-ZConf-BGSet/Makefile
index d5389ca2c1a1..1e53a99bb289 100644
--- a/deskutils/p5-ZConf-BGSet/Makefile
+++ b/deskutils/p5-ZConf-BGSet/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Background management utility and Perl module that uses ZConf
 
-BUILD_DEPENDS=	p5-Image-Size-FillFullSelect>=0.1.0:${PORTSDIR}/graphics/p5-Image-Size-FillFullSelect \
-		p5-ZConf>=:${PORTSDIR}/net/p5-ZConf \
-		${LOCALBASE}/bin/hsetroot:${PORTSDIR}/graphics/hsetroot \
-		p5-Imager-AverageGray>=0.0.0:${PORTSDIR}/graphics/p5-Imager-AverageGray \
-		p5-X11-Resolution>=0.0.0:${PORTSDIR}/x11/p5-X11-Resolution \
-		p5-String-ShellQuote>=1.04:${PORTSDIR}/textproc/p5-String-ShellQuote
+BUILD_DEPENDS=	p5-Image-Size-FillFullSelect>=0.1.0:graphics/p5-Image-Size-FillFullSelect \
+		p5-ZConf>=:net/p5-ZConf \
+		${LOCALBASE}/bin/hsetroot:graphics/hsetroot \
+		p5-Imager-AverageGray>=0.0.0:graphics/p5-Imager-AverageGray \
+		p5-X11-Resolution>=0.0.0:x11/p5-X11-Resolution \
+		p5-String-ShellQuote>=1.04:textproc/p5-String-ShellQuote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
index a6ef39a1e25c..be27e78335f2 100644
--- a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
+++ b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	The GTK GUI backend for ZConf::Runner
 
-BUILD_DEPENDS=	p5-ZConf>=0:${PORTSDIR}/net/p5-ZConf \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-ZConf-Runner>=0:${PORTSDIR}/deskutils/p5-ZConf-Runner \
-		p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo
+BUILD_DEPENDS=	p5-ZConf>=0:net/p5-ZConf \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2 \
+		p5-ZConf-Runner>=0:deskutils/p5-ZConf-Runner \
+		p5-File-MimeInfo>=0:devel/p5-File-MimeInfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/deskutils/p5-ZConf-Runner/Makefile b/deskutils/p5-ZConf-Runner/Makefile
index 120751386484..5ae026197cbd 100644
--- a/deskutils/p5-ZConf-Runner/Makefile
+++ b/deskutils/p5-ZConf-Runner/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Run a file using a chosen method, desktop entry, or mimetype
 
-BUILD_DEPENDS=	p5-ZConf>=6.1.0:${PORTSDIR}/net/p5-ZConf \
-		p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-Curses-UI>=0.9609:${PORTSDIR}/devel/p5-Curses-UI \
-		p5-ZConf-GUI>=1.0.3:${PORTSDIR}/devel/p5-ZConf-GUI \
-		p5-String-ShellQuote>=1.04:${PORTSDIR}/textproc/p5-String-ShellQuote
+BUILD_DEPENDS=	p5-ZConf>=6.1.0:net/p5-ZConf \
+		p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
+		p5-Curses-UI>=0.9609:devel/p5-Curses-UI \
+		p5-ZConf-GUI>=1.0.3:devel/p5-ZConf-GUI \
+		p5-String-ShellQuote>=1.04:textproc/p5-String-ShellQuote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/deskutils/phpcollab/Makefile b/deskutils/phpcollab/Makefile
index f455e4e93557..50208ffaaa15 100644
--- a/deskutils/phpcollab/Makefile
+++ b/deskutils/phpcollab/Makefile
@@ -27,7 +27,7 @@ MYSQL_USE=	PHP=mysql MYSQL=yes
 PGSQL_USE=	PHP=pgsql,pdo_pgsql
 PGSQL_USES=	pgsql
 APACHE_USE=	APACHE_RUN=22
-LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/ww/lighttpd
+LIGHTTPD_RUN_DEPENDS=	lighttpd:ww/lighttpd
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 000f9589d39a..5a4460468f2d 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -14,29 +14,29 @@ COMMENT=	Personal search and metasearch for the Free Desktop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	desktop-file-install:${PORTSDIR}/devel/desktop-file-utils \
-		update-mime-database:${PORTSDIR}/misc/shared-mime-info
-LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core		\
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24	\
-		libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat	\
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib		\
-		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26	\
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs		\
-		libexecinfo.so:${PORTSDIR}/devel/libexecinfo		\
-		libexif.so:${PORTSDIR}/graphics/libexif			\
-		libexiv2.so:${PORTSDIR}/graphics/exiv2			\
-		libgmime-2.4.so:${PORTSDIR}/mail/gmime24		\
-		libtag.so:${PORTSDIR}/audio/taglib			\
-		libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info	\
-		antiword:${PORTSDIR}/textproc/antiword			\
-		xdg-open:${PORTSDIR}/devel/xdg-utils			\
-		${LOCALBASE}/libexec/xpdf/pdftotext:${PORTSDIR}/graphics/xpdf	\
-		catppt:${PORTSDIR}/textproc/catdoc			\
-		unzip:${PORTSDIR}/archivers/unzip			\
-		unrtf:${PORTSDIR}/textproc/unrtf			\
-		catdvi:${PORTSDIR}/print/catdvi				\
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	desktop-file-install:devel/desktop-file-utils \
+		update-mime-database:misc/shared-mime-info
+LIB_DEPENDS=	libxapian.so:databases/xapian-core		\
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24	\
+		libexttextcat-2.0.so:textproc/libexttextcat	\
+		libdbus-glib-1.so:devel/dbus-glib		\
+		libxml++-2.6.so:textproc/libxml++26	\
+		libboost_thread.so:devel/boost-libs		\
+		libexecinfo.so:devel/libexecinfo		\
+		libexif.so:graphics/libexif			\
+		libexiv2.so:graphics/exiv2			\
+		libgmime-2.4.so:mail/gmime24		\
+		libtag.so:audio/taglib			\
+		libcurl.so:ftp/curl
+RUN_DEPENDS=	update-mime-database:misc/shared-mime-info	\
+		antiword:textproc/antiword			\
+		xdg-open:devel/xdg-utils			\
+		${LOCALBASE}/libexec/xpdf/pdftotext:graphics/xpdf	\
+		catppt:textproc/catdoc			\
+		unzip:archivers/unzip			\
+		unrtf:textproc/unrtf			\
+		catdvi:print/catdvi				\
+		bash:shells/bash
 
 PROJECTHOST=	${PORTNAME}-search
 
@@ -61,7 +61,7 @@ DEBUG_CONFIGURE_ON=	--enable-debug=yes
 
 CHMLIB_CONFIGURE_ON=	--enable-chmlib=yes
 CHMLIB_CONFIGURE_OFF=	--disable-chmlib
-CHMLIB_LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
+CHMLIB_LIB_DEPENDS=	libchm.so:misc/chmlib
 
 INSTALLS_ICONS=	yes
 
diff --git a/deskutils/plans/Makefile b/deskutils/plans/Makefile
index 7a88cf5b0dd8..f3f2d6348eea 100644
--- a/deskutils/plans/Makefile
+++ b/deskutils/plans/Makefile
@@ -27,7 +27,7 @@ COMMENT=	Good Web Calendar
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session
+BUILD_DEPENDS=	p5-CGI-Session>=0:www/p5-CGI-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix zip
diff --git a/deskutils/plasma-applet-qstardict/Makefile b/deskutils/plasma-applet-qstardict/Makefile
index cbcdb8e424ae..5e7711a99f43 100644
--- a/deskutils/plasma-applet-qstardict/Makefile
+++ b/deskutils/plasma-applet-qstardict/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	plasma-applet-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dictionary plasma applet for KDE
 
-RUN_DEPENDS=	${QSTARDICT_PLUGIN_PATH}/libstardict.so:${PORTSDIR}/textproc/qstardict
+RUN_DEPENDS=	${QSTARDICT_PLUGIN_PATH}/libstardict.so:textproc/qstardict
 
 USES=		cmake tar:bzip2
 USE_QT4=	qmake_build uic_build moc_build rcc_build
diff --git a/deskutils/plasma-applet-simpleweatherforecast/Makefile b/deskutils/plasma-applet-simpleweatherforecast/Makefile
index 6c360edb4ddd..928fda8bfcca 100644
--- a/deskutils/plasma-applet-simpleweatherforecast/Makefile
+++ b/deskutils/plasma-applet-simpleweatherforecast/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	92149-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Weather plasma applet for KDE4
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 USES=		cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs
diff --git a/deskutils/py-bugwarrior/Makefile b/deskutils/py-bugwarrior/Makefile
index cd20e5fe763b..bdbc59cf606b 100644
--- a/deskutils/py-bugwarrior/Makefile
+++ b/deskutils/py-bugwarrior/Makefile
@@ -13,37 +13,37 @@ COMMENT=	Sync issue & bug tracking systems with taskwarrior
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twiggy>0:${PORTSDIR}/devel/py-twiggy \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}taskw>=0.8:${PORTSDIR}/deskutils/py-taskw \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}keyring>0:${PORTSDIR}/security/py-keyring \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}pycurl>0:${PORTSDIR}/ftp/py-pycurl \
-		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:${PORTSDIR}/devel/py-dogpile.cache \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:${PORTSDIR}/devel/py-lockfile \
-		${PYTHON_PKGNAMEPREFIX}click>0:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \
+		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile \
+		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 OPTIONS_DEFINE=		BUGZILLA JIRA PHABRICATOR
 OPTIONS_DEFAULT=	BUGZILLA PHABRICATOR
 
 BUGZILLA_DESC=			Enable Bugzilla support
-BUGZILLA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:${PORTSDIR}/devel/py-python-bugzilla
+BUGZILLA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla
 
 JIRA_DESC=			Enabla Atlassian Jira support
-JIRA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}jira>0:${PORTSDIR}/devel/py-jira
+JIRA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira
 
 PHABRICATOR_DESC=		Enable Phabricator support
-PHABRICATOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phabricator>0:${PORTSDIR}/devel/py-phabricator
+PHABRICATOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator
 
 TRAC_DESC=			Enable Trac support
-TRAC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}offtrac>0:${PORTSDIR}/devel/py-offtrac
+TRAC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/deskutils/py-khal/Makefile b/deskutils/py-khal/Makefile
index f3ae0d8852f3..59b04512b4d6 100644
--- a/deskutils/py-khal/Makefile
+++ b/deskutils/py-khal/Makefile
@@ -13,17 +13,17 @@ COMMENT=	CalDAV-based calendar
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}icalendar>=3.8.2:${PORTSDIR}/devel/py-icalendar \
-		${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:${PORTSDIR}/devel/py-urwid \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:${PORTSDIR}/devel/py-xdg \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2014.10:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.3:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:${PORTSDIR}/devel/py-tzlocal \
-		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0.4.3:${PORTSDIR}/deskutils/py-vdirsyncer \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}pkginfo>0:${PORTSDIR}/sysutils/py-pkginfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}icalendar>=3.8.2:devel/py-icalendar \
+		${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2014.10:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.3:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal \
+		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0.4.3:deskutils/py-vdirsyncer \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}pkginfo>0:sysutils/py-pkginfo
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/deskutils/py-pycarddav/Makefile b/deskutils/py-pycarddav/Makefile
index 8c31f6ebbe28..8d7d44696e77 100644
--- a/deskutils/py-pycarddav/Makefile
+++ b/deskutils/py-pycarddav/Makefile
@@ -13,12 +13,12 @@ COMMENT=	CardDAV based address book tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:${PORTSDIR}/devel/py-urwid \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0.8.0:${PORTSDIR}/deskutils/py-vobject \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:${PORTSDIR}/devel/py-xdg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0.8.0:deskutils/py-vobject \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/deskutils/py-pystash/Makefile b/deskutils/py-pystash/Makefile
index a650ce631514..372449f9255a 100644
--- a/deskutils/py-pystash/Makefile
+++ b/deskutils/py-pystash/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Save your code snippets in the cloud from the command line
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:${PORTSDIR}/devel/py-args \
-		${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:${PORTSDIR}/devel/py-clint \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:${PORTSDIR}/devel/py-xerox
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args \
+		${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:devel/py-clint \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:devel/py-xerox
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/py-taskw/Makefile b/deskutils/py-taskw/Makefile
index 04add2f1b18e..693499d165d7 100644
--- a/deskutils/py-taskw/Makefile
+++ b/deskutils/py-taskw/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Python bindings for your taskwarrior database
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/deskutils/py-vdirsyncer/Makefile b/deskutils/py-vdirsyncer/Makefile
index d6381e700899..77a7c4a38b49 100644
--- a/deskutils/py-vdirsyncer/Makefile
+++ b/deskutils/py-vdirsyncer/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Synchronize calendars and contacts
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:${PORTSDIR}/devel/py-setuptools_scm
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.4:${PORTSDIR}/devel/py-atomicwrites \
-		${PYTHON_PKGNAMEPREFIX}click>=3.2:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}icalendar>=3.6:${PORTSDIR}/devel/py-icalendar \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.1.3:${PORTSDIR}/www/py-requests-toolbelt
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.4:devel/py-atomicwrites \
+		${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}icalendar>=3.6:devel/py-icalendar \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.1.3:www/py-requests-toolbelt
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/deskutils/py-vobject/Makefile b/deskutils/py-vobject/Makefile
index 285b91a5d467..3cf435077ba8 100644
--- a/deskutils/py-vobject/Makefile
+++ b/deskutils/py-vobject/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jun-g@daemonfreaks.com
 COMMENT=	ICalendar library
 
-RUN_DEPENDS=	py*-dateutil>=1.1:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	py*-dateutil>=1.1:devel/py-dateutil
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index e69f70a717f5..5bda3497151c 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	PyBookReader-${PORTVERSION}
 MAINTAINER=	ufo@februality.com
 COMMENT=	Program for reading e-books
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index ddf36c1ded2b..32b6005c64d2 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Desktop panel written in Python
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libImlib2.so:graphics/imlib2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index fe51c50c2b4b..1fe2d71b5ffb 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Personal full text search package, based on Xapian
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core
-RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
-		antiword:${PORTSDIR}/textproc/antiword \
-		catdoc:${PORTSDIR}/textproc/catdoc \
-		wpd2html:${PORTSDIR}/textproc/libwpd010 \
-		unrtf:${PORTSDIR}/textproc/unrtf
+LIB_DEPENDS=	libxapian.so:databases/xapian-core
+RUN_DEPENDS=	unrar:archivers/unrar \
+		antiword:textproc/antiword \
+		catdoc:textproc/catdoc \
+		wpd2html:textproc/libwpd010 \
+		unrtf:textproc/unrtf
 
 USES=		bison gmake iconv shebangfix
 SHEBANG_FILES=	filters/rclimg filters/rclpdf desktop/hotrecoll.py
@@ -35,18 +35,18 @@ OPTIONS_DEFINE=		ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS PYTHON \
 OPTIONS_DEFAULT=	ASPELL IMAGE PDF PS PYTHON SOUND QT4 X11MON
 OPTIONS_SUB=		yes
 
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_WITH=	aspell
 CHM_DESC=		CHM via CHMLIB
-CHM_RUN_DEPENDS=	pychm>0:${PORTSDIR}/textproc/pychm
-DJVU_RUN_DEPENDS=	djvutxt:${PORTSDIR}/graphics/djvulibre
+CHM_RUN_DEPENDS=	pychm>0:textproc/pychm
+DJVU_RUN_DEPENDS=	djvutxt:graphics/djvulibre
 IMAGE_DESC=		Store personal tags or textual descriptions in images
-IMAGE_RUN_DEPENDS=	exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool
+IMAGE_RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 KONQUEROR_DESC=		Konqueror webarchive format with Python
-KONQUEROR_RUN_DEPENDS=	kwebkitpart>0:${PORTSDIR}/www/kwebkitpart
+KONQUEROR_RUN_DEPENDS=	kwebkitpart>0:www/kwebkitpart
 LATEX_USE=		tex=dvipsk:run,latex:run
-PDF_RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf
-PS_RUN_DEPENDS=		pstotext:${PORTSDIR}/print/pstotext
+PDF_RUN_DEPENDS=	xpdf:graphics/xpdf
+PS_RUN_DEPENDS=		pstotext:print/pstotext
 PYTHON_USES=		python
 PYTHON_CONFIGURE_ENABLE=	python-module
 PYTHON_PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
@@ -59,8 +59,8 @@ QT4_CONFIGURE_ENABLE=	qtgui
 QT4_CONFIGURE_ENV=	QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \
 			QTDIR="${QT_PREFIX}"
 QT4_VARS=		QT_NONSTANDARD=yes
-SOUND_RUN_DEPENDS=	mutagen-pony:${PORTSDIR}/audio/py-mutagen \
-			pykaraoke:${PORTSDIR}/audio/py-karaoke
+SOUND_RUN_DEPENDS=	mutagen-pony:audio/py-mutagen \
+			pykaraoke:audio/py-karaoke
 X11MON_DESC=		X11 session monitoring support
 X11MON_USES=		fam
 X11MON_USE=		xorg=ice,sm,x11
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index 97cdeffe8c5f..e005fc37deb1 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Modern journal written in Python
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:${PORTSDIR}/www/py-webkitgtk \
-		${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk \
+		${LOCALBASE}/bin/xdg-open:devel/xdg-utils \
+		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet
 
 USES=		desktop-file-utils gettext python:2
 
diff --git a/deskutils/remind/Makefile b/deskutils/remind/Makefile
index 25c5fdf0220a..bd0a36ef3958 100644
--- a/deskutils/remind/Makefile
+++ b/deskutils/remind/Makefile
@@ -29,7 +29,7 @@ PLIST_FILES=	bin/rem \
 
 .if ${PORT_OPTIONS:MTCLTK}
 USES=		tk
-RUN_DEPENDS+=	dtplite:${PORTSDIR}/devel/tcllib
+RUN_DEPENDS+=	dtplite:devel/tcllib
 PLIST_FILES+=	bin/cm2rem.tcl bin/tkremind
 .endif
 
diff --git a/deskutils/rolo/Makefile b/deskutils/rolo/Makefile
index 4ae9a2f9d907..73ae67f4cfa3 100644
--- a/deskutils/rolo/Makefile
+++ b/deskutils/rolo/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text-based contact management software
 
-LIB_DEPENDS=	libvc.so:${PORTSDIR}/devel/libvc
+LIB_DEPENDS=	libvc.so:devel/libvc
 
 USES=		ncurses tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile
index 38b007daf7c5..96bdad6468ae 100644
--- a/deskutils/rox-memo/Makefile
+++ b/deskutils/rox-memo/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	memo-${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Appointment/TODO management for the ROX desktop
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
 
 USES=		python tar:bzip2
 
diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index a77cb019c2e3..a0f3555a71c5 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Addressbook for the GNOME 2 desktop
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS=	libnotify.so:devel/libnotify
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme
 
 USES=		desktop-file-utils gmake libtool pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/rubygem-shellplay/Makefile b/deskutils/rubygem-shellplay/Makefile
index 9d80bb48b59b..c57b46d0b777 100644
--- a/deskutils/rubygem-shellplay/Makefile
+++ b/deskutils/rubygem-shellplay/Makefile
@@ -11,10 +11,10 @@ COMMENT=	CLI tool for shell-based presentations
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-paint>=1.0.0:${PORTSDIR}/devel/rubygem-paint \
-	rubygem-cliprompt>=0.1.2:${PORTSDIR}/devel/rubygem-cliprompt \
-	rubygem-configstruct>=0.1.0:${PORTSDIR}/devel/rubygem-configstruct \
-	rubygem-shell2html>=0.0.5:${PORTSDIR}/textproc/rubygem-shell2html
+RUN_DEPENDS=	rubygem-paint>=1.0.0:devel/rubygem-paint \
+	rubygem-cliprompt>=0.1.2:devel/rubygem-cliprompt \
+	rubygem-configstruct>=0.1.0:devel/rubygem-configstruct \
+	rubygem-shell2html>=0.0.5:textproc/rubygem-shell2html
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/deskutils/rubygem-taskjuggler/Makefile b/deskutils/rubygem-taskjuggler/Makefile
index b0b4e12f5ccb..cfc0c1c7a984 100644
--- a/deskutils/rubygem-taskjuggler/Makefile
+++ b/deskutils/rubygem-taskjuggler/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Project management tool for UNIX based operating systems
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-mail>=2.4.3:${PORTSDIR}/mail/rubygem-mail \
-		rubygem-term-ansicolor>=1.0.7:${PORTSDIR}/devel/rubygem-term-ansicolor
+RUN_DEPENDS=	rubygem-mail>=2.4.3:mail/rubygem-mail \
+		rubygem-term-ansicolor>=1.0.7:devel/rubygem-term-ansicolor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/deskutils/shutter/Makefile b/deskutils/shutter/Makefile
index cf06dc4ae245..56590ded9d06 100644
--- a/deskutils/shutter/Makefile
+++ b/deskutils/shutter/Makefile
@@ -13,38 +13,38 @@ COMMENT=	Screenshot tool
 LICENSE=	GPLv3 GPLv2 # the latter for some shipped cursors
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	ImageMagick>=6.9.3.1,1:${PORTSDIR}/graphics/ImageMagick \
-		librsvg2>=2.40.6:${PORTSDIR}/graphics/librsvg2 \
-		p5-File-BaseDir>=0.03:${PORTSDIR}/devel/p5-File-BaseDir \
-		p5-File-Copy-Recursive>=0.38_1:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Spec-Native>=1.003_1:${PORTSDIR}/devel/p5-File-Spec-Native \
-		p5-File-Which>=1.09:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-Gnome2-VFS>=1.082:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
-		p5-Gnome2-Wnck>=0.16:${PORTSDIR}/x11-toolkits/p5-Gnome2-Wnck \
-		p5-Gnome2>=1.045:${PORTSDIR}/x11-toolkits/p5-Gnome2 \
-		p5-Goo-Canvas>=0.06:${PORTSDIR}/devel/p5-Goo-Canvas \
-		p5-Gtk2-ImageView>=0.05:${PORTSDIR}/x11-toolkits/p5-Gtk2-ImageView \
-		p5-Gtk2-Unique>=0.05:${PORTSDIR}/x11-toolkits/p5-Gtk2-Unique \
-		p5-Gtk2>=1.2491:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-JSON-XS>=3.01:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-JSON>=2.90:${PORTSDIR}/converters/p5-JSON \
-		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Net-DBus>=1.0.0:${PORTSDIR}/devel/p5-Net-DBus \
-		p5-Net-Dropbox-API>=1.9:${PORTSDIR}/net/p5-Net-Dropbox-API \
-		p5-Net-OAuth>=0.28:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-Path-Class>=0.35:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Proc-ProcessTable>=0.51:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-Proc-Simple>=1.31:${PORTSDIR}/devel/p5-Proc-Simple \
-		p5-Sort-Naturally>=1.03:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		p5-WWW-Mechanize>=1.74:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-X11-Protocol>=0.56:${PORTSDIR}/x11/p5-X11-Protocol \
-		p5-XML-Simple>=2.20:${PORTSDIR}/textproc/p5-XML-Simple \
-		xdg-utils>=1.0.2.20130919:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	ImageMagick>=6.9.3.1,1:graphics/ImageMagick \
+		librsvg2>=2.40.6:graphics/librsvg2 \
+		p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \
+		p5-File-Copy-Recursive>=0.38_1:devel/p5-File-Copy-Recursive \
+		p5-File-Spec-Native>=1.003_1:devel/p5-File-Spec-Native \
+		p5-File-Which>=1.09:sysutils/p5-File-Which \
+		p5-Gnome2-VFS>=1.082:x11-toolkits/p5-Gnome2-VFS \
+		p5-Gnome2-Wnck>=0.16:x11-toolkits/p5-Gnome2-Wnck \
+		p5-Gnome2>=1.045:x11-toolkits/p5-Gnome2 \
+		p5-Goo-Canvas>=0.06:devel/p5-Goo-Canvas \
+		p5-Gtk2-ImageView>=0.05:x11-toolkits/p5-Gtk2-ImageView \
+		p5-Gtk2-Unique>=0.05:x11-toolkits/p5-Gtk2-Unique \
+		p5-Gtk2>=1.2491:x11-toolkits/p5-Gtk2 \
+		p5-JSON-XS>=3.01:converters/p5-JSON-XS \
+		p5-JSON>=2.90:converters/p5-JSON \
+		p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
+		p5-Net-DBus>=1.0.0:devel/p5-Net-DBus \
+		p5-Net-Dropbox-API>=1.9:net/p5-Net-Dropbox-API \
+		p5-Net-OAuth>=0.28:net/p5-Net-OAuth \
+		p5-Path-Class>=0.35:devel/p5-Path-Class \
+		p5-Proc-ProcessTable>=0.51:devel/p5-Proc-ProcessTable \
+		p5-Proc-Simple>=1.31:devel/p5-Proc-Simple \
+		p5-Sort-Naturally>=1.03:textproc/p5-Sort-Naturally \
+		p5-WWW-Mechanize>=1.74:www/p5-WWW-Mechanize \
+		p5-X11-Protocol>=0.56:x11/p5-X11-Protocol \
+		p5-XML-Simple>=2.20:textproc/p5-XML-Simple \
+		xdg-utils>=1.0.2.20130919:devel/xdg-utils
 
 INSTALLS_ICONS=	yes
 
 METADATA_DESC=	Enable Shutter to write Metadata
-METADATA_RUN_DEPENDS=	p5-Image-ExifTool>=9.76:${PORTSDIR}/graphics/p5-Image-ExifTool
+METADATA_RUN_DEPENDS=	p5-Image-ExifTool>=9.76:graphics/p5-Image-ExifTool
 
 NO_BUILD=	yes
 
diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile
index d26929682cf7..fb9b90a8c1fb 100644
--- a/deskutils/silence/Makefile
+++ b/deskutils/silence/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Information management tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate
+RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepart.so:editors/kate
 
 USES=		cmake
 USE_KDE4=	kdelibs kdeprefix automoc4
diff --git a/deskutils/simpleagenda/Makefile b/deskutils/simpleagenda/Makefile
index 4861bc42ce72..7b99f7ac9d63 100644
--- a/deskutils/simpleagenda/Makefile
+++ b/deskutils/simpleagenda/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	SimpleAgenda-${PORTVERSION}
 MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	simple calendar and agenda application
 
-LIB_DEPENDS+=	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS+=	libical.so:devel/libical
 
 LICENSE=	GPLv2
 
diff --git a/deskutils/spice-gtk/Makefile b/deskutils/spice-gtk/Makefile
index 8ead98fccbb5..ade31dac7c32 100644
--- a/deskutils/spice-gtk/Makefile
+++ b/deskutils/spice-gtk/Makefile
@@ -17,16 +17,16 @@ USE_GNOME=	gnomeprefix gtk20 gtk30 intltool introspection:build
 USES=		cpe gmake jpeg libtool pkgconfig tar:bzip2 pathfix python
 CPE_VENDOR=	redhat
 
-BUILD_DEPENDS=	spice-protocol>=0.12.10:${PORTSDIR}/devel/spice-protocol \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:${PORTSDIR}/devel/py-pyparsing
-RUN_DEPENDS=	spice-protocol>=0.12.10:${PORTSDIR}/devel/spice-protocol
+BUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol \
+		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing
+RUN_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
 
 .if defined(SPICE_SLAVE)
 PORTREVISION=	1
 CATEGORIES+=	python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:${PORTSDIR}/x11-toolkits/py-gtk2
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2
 CONFIGURE_ARGS+=	--with-python
 PLIST_FILES+=	%%PYTHON_SITELIBDIR%%/SpiceClientGtk.so
 .endif
@@ -58,10 +58,10 @@ NOAUDIO_DESC=		Disable audio backend
 GSTREAMER_CONFIGURE_ON=	--with-audio=gstreamer
 GSTREAMER_USE=	GSTREAMER1=yes
 PULSEAUDIO_CONFIGURE_ON=	--with-audio=pulse
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 NOAUDIO_CONFIGURE_ON=		--with-audio=no
 SASL_CONFIGURE_WITH=		sasl=yes
-SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 .include <bsd.port.mk>
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index cbf73c3ce0f6..2b6f7382b709 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -19,15 +19,15 @@ OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 .include <${.CURDIR}/Makefile.common>
 
 .if ${PORT_OPTIONS:MCLIENT}
-RUN_DEPENDS+=	${LOCALBASE}/bin/strigiclient:${PORTSDIR}/deskutils/strigiclient
+RUN_DEPENDS+=	${LOCALBASE}/bin/strigiclient:deskutils/strigiclient
 .endif
 
 .if ${PORT_OPTIONS:MDAEMON}
-RUN_DEPENDS+=	${LOCALBASE}/bin/strigidaemon:${PORTSDIR}/deskutils/strigidaemon
+RUN_DEPENDS+=	${LOCALBASE}/bin/strigidaemon:deskutils/strigidaemon
 .endif
 
 .if ${PORT_OPTIONS:MUTILITIES}
-RUN_DEPENDS+=	${LOCALBASE}/bin/xmlindexer:${PORTSDIR}/deskutils/strigiutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/xmlindexer:deskutils/strigiutils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/strigiclient/Makefile b/deskutils/strigiclient/Makefile
index cbf1be911f7c..374d222cffda 100644
--- a/deskutils/strigiclient/Makefile
+++ b/deskutils/strigiclient/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	${STRIGI_MASTER_SITES}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi desktop search: Qt4 GUI
 
-LIB_DEPENDS=	libstreams.so:${PORTSDIR}/deskutils/libstreams \
-		libstreamanalyzer.so:${PORTSDIR}/deskutils/libstreamanalyzer \
-		libsearchclient.so:${PORTSDIR}/deskutils/strigidaemon
+LIB_DEPENDS=	libstreams.so:deskutils/libstreams \
+		libstreamanalyzer.so:deskutils/libstreamanalyzer \
+		libsearchclient.so:deskutils/strigidaemon
 
 USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
 USE_LDCONFIG=	yes
diff --git a/deskutils/strigidaemon/Makefile b/deskutils/strigidaemon/Makefile
index d81c438ff017..992c70043f14 100644
--- a/deskutils/strigidaemon/Makefile
+++ b/deskutils/strigidaemon/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	${STRIGI_MASTER_SITES}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi desktop search: daemon
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libstreams.so:${PORTSDIR}/deskutils/libstreams \
-		libstreamanalyzer.so:${PORTSDIR}/deskutils/libstreamanalyzer
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libstreams.so:deskutils/libstreams \
+		libstreamanalyzer.so:deskutils/libstreamanalyzer
 
 USES=		fam pkgconfig
 USE_GNOME=	libxml2
diff --git a/deskutils/strigiutils/Makefile b/deskutils/strigiutils/Makefile
index e08e43adc9a6..2980fd9087c1 100644
--- a/deskutils/strigiutils/Makefile
+++ b/deskutils/strigiutils/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	${STRIGI_MASTER_SITES}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi desktop search: utilities
 
-LIB_DEPENDS=	libstreams.so:${PORTSDIR}/deskutils/libstreams \
-		libstreamanalyzer.so:${PORTSDIR}/deskutils/libstreamanalyzer
+LIB_DEPENDS=	libstreams.so:deskutils/libstreams \
+		libstreamanalyzer.so:deskutils/libstreamanalyzer
 
 .include <${.CURDIR}/../strigi/Makefile.common>
 .include <bsd.port.mk>
diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
index 560e837eea35..3d17dcad0048 100644
--- a/deskutils/superswitcher/Makefile
+++ b/deskutils/superswitcher/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Alt-Tab replacement
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USES=		gmake pkgconfig
 USE_GNOME=	gconf2 intltool libwnck
diff --git a/deskutils/surrealtodo/Makefile b/deskutils/surrealtodo/Makefile
index 3ab488e8702a..6e5b8419d2fc 100644
--- a/deskutils/surrealtodo/Makefile
+++ b/deskutils/surrealtodo/Makefile
@@ -35,7 +35,7 @@ USE_PHP+=	pgsql
 USE_APACHE_RUN=	22
 .endif
 .if ${PORT_OPTIONS:MLIGHTTPD}
-RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
+RUN_DEPENDS+=	lighttpd:www/lighttpd
 .endif
 
 do-install:
diff --git a/deskutils/syncthing-gtk/Makefile b/deskutils/syncthing-gtk/Makefile
index b5096601b859..4019e60e13a6 100644
--- a/deskutils/syncthing-gtk/Makefile
+++ b/deskutils/syncthing-gtk/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Python based GUI for Syncthing
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing
diff --git a/deskutils/tagutils/Makefile b/deskutils/tagutils/Makefile
index edcfe41558b2..69d50d9ec0cb 100644
--- a/deskutils/tagutils/Makefile
+++ b/deskutils/tagutils/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://releases.chipx86.com/leaftag/tagutils/
 MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Command line tool for tagging files
 
-LIB_DEPENDS=	libleaftag.so:${PORTSDIR}/devel/libleaftag
+LIB_DEPENDS=	libleaftag.so:devel/libleaftag
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig
diff --git a/deskutils/taskd/Makefile b/deskutils/taskd/Makefile
index d7e9fcdef50f..318b7c0e5179 100644
--- a/deskutils/taskd/Makefile
+++ b/deskutils/taskd/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Multi-user server for taskwarrior
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libgnutls.so:security/gnutls
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake:outsource compiler:c++11-lib shebangfix
 SHEBANG_FILES=	demo/client/case* \
diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index 862b04cb40ae..66a4806ff842 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Feature-rich command-line todo list manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 USES=		compiler:c++11-lib cmake python:test shebangfix
 
diff --git a/deskutils/thinkingrock/Makefile b/deskutils/thinkingrock/Makefile
index 376b8a46f9c5..59cf6b8244f9 100644
--- a/deskutils/thinkingrock/Makefile
+++ b/deskutils/thinkingrock/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	tr-${PORTVERSION}
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Application for collecting and processing your thoughts
 
-RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \
-		${LOCALBASE}/bin/xdg-email:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:devel/xdg-utils \
+		${LOCALBASE}/bin/xdg-email:devel/xdg-utils
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/deskutils/todo/Makefile b/deskutils/todo/Makefile
index 24e09c7d9b6e..8a10ed33f565 100644
--- a/deskutils/todo/Makefile
+++ b/deskutils/todo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Todo.txt Manager
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 CONFLICTS_INSTALL=	devtodo-[0-9]*
 
diff --git a/deskutils/tomboy-plugin-latex/Makefile b/deskutils/tomboy-plugin-latex/Makefile
index 1cea44cb189b..af144f57f11c 100644
--- a/deskutils/tomboy-plugin-latex/Makefile
+++ b/deskutils/tomboy-plugin-latex/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	tomboy-latex-${PORTVERSION}
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	LaTeX math plugin for Tomboy
 
-BUILD_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
-RUN_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
+BUILD_DEPENDS=	tomboy:deskutils/tomboy
+RUN_DEPENDS=	tomboy:deskutils/tomboy
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
diff --git a/deskutils/tomboy-plugin-reminder/Makefile b/deskutils/tomboy-plugin-reminder/Makefile
index 4aab62cc11b8..c208d33bb3a9 100644
--- a/deskutils/tomboy-plugin-reminder/Makefile
+++ b/deskutils/tomboy-plugin-reminder/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	tomboy-reminder-${PORTVERSION}
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Automatically open notes at a given date and time
 
-BUILD_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
-RUN_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
+BUILD_DEPENDS=	tomboy:deskutils/tomboy
+RUN_DEPENDS=	tomboy:deskutils/tomboy
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
diff --git a/deskutils/tomboy-plugin-todo/Makefile b/deskutils/tomboy-plugin-todo/Makefile
index 799b3472dc6f..1431fc4e0e71 100644
--- a/deskutils/tomboy-plugin-todo/Makefile
+++ b/deskutils/tomboy-plugin-todo/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	tomboy-todo-${PORTVERSION}
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Highlight FIXME, TODO, and XXX in your notes
 
-BUILD_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
-RUN_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
+BUILD_DEPENDS=	tomboy:deskutils/tomboy
+RUN_DEPENDS=	tomboy:deskutils/tomboy
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 6ad1f74e01c0..59745d4c698a 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Personal note taking system for the GNOME desktop
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
-		mautil:${PORTSDIR}/devel/mono-addins
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
-		mautil:${PORTSDIR}/devel/mono-addins
+LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:devel/dbus-sharp-glib \
+		mautil:devel/mono-addins
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:devel/dbus-sharp-glib \
+		mautil:devel/mono-addins
 
 USES=		cpe gettext gmake libtool mono pathfix pkgconfig tar:xz
 USE_GNOME=	intlhack gnomeprefix gnomedocutils gnomesharp20
@@ -40,8 +40,8 @@ PORTSCOUT=	limitw:1,even
 
 .if ${PORT_OPTIONS:MEVOLUTION}
 CONFIGURE_ARGS+=--enable-evolution
-BUILD_DEPENDS+=	${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:${PORTSDIR}/mail/gmime26-sharp
-RUN_DEPENDS+=	${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:${PORTSDIR}/mail/gmime26-sharp
+BUILD_DEPENDS+=	${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:mail/gmime26-sharp
+RUN_DEPENDS+=	${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:mail/gmime26-sharp
 PLIST_SUB+=	EVOLUTION=""
 .else
 CONFIGURE_ARGS+=--disable-evolution
diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index cc1d68f0ce16..8ed522223932 100644
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	On-Screen-Display for hotkeys of IBM ThinkPads
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+LIB_DEPENDS=	libxosd.so:misc/xosd
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 98e22f049397..3aaa7d109f23 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Structured information storage program
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
-		aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS=	aspell:textproc/aspell
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:net/py-qt4-network \
+		aspell:textproc/aspell
 
 WRKSRC=		${WRKDIR}/TreeLine
 USE_QT4=	# empty
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index b87667eedfbe..95b0f7a759b1 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK frontend for VirtualBox
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xpcom/vboxxpcom.py:${PORTSDIR}/emulators/virtualbox-ose
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xpcom/vboxxpcom.py:emulators/virtualbox-ose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index db9205c9b262..8e24f7f43df3 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Toolkit to interact with virtualization capabilities
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:${PORTSDIR}/textproc/py-libxml2 \
-		vte3>=0:${PORTSDIR}/x11-toolkits/vte3 \
-		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:${PORTSDIR}/www/py-urlgrabber \
-		${PYTHON_PKGNAMEPREFIX}libvirt>=0:${PORTSDIR}/devel/py-libvirt \
-		gtk-vnc>=0.4.4:${PORTSDIR}/net/gtk-vnc \
-		libvirt-glib>=0.1.9:${PORTSDIR}/devel/libvirt-glib \
-		libosinfo>=0:${PORTSDIR}/devel/libosinfo \
-		spice-gtk>=0.26:${PORTSDIR}/deskutils/spice-gtk
+LIB_DEPENDS=	libvirt.so:devel/libvirt
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2 \
+		vte3>=0:x11-toolkits/vte3 \
+		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr \
+		${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:www/py-urlgrabber \
+		${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt \
+		gtk-vnc>=0.4.4:net/gtk-vnc \
+		libvirt-glib>=0.1.9:devel/libvirt-glib \
+		libosinfo>=0:devel/libosinfo \
+		spice-gtk>=0.26:deskutils/spice-gtk
 
 PYDISTUTILS_INSTALLNOSINGLE=	yes
 PYDISTUTILS_CONFIGURE_TARGET=	configure
diff --git a/deskutils/vit/Makefile b/deskutils/vit/Makefile
index b8ef58b5a656..5f3e4abc7af3 100644
--- a/deskutils/vit/Makefile
+++ b/deskutils/vit/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Curses-based interface to taskwarrior
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes \
-		task:${PORTSDIR}/deskutils/taskwarrior
+RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes \
+		task:deskutils/taskwarrior
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/deskutils/vnc2flv/Makefile b/deskutils/vnc2flv/Makefile
index 788c18408fd9..c08e4fec563d 100644
--- a/deskutils/vnc2flv/Makefile
+++ b/deskutils/vnc2flv/Makefile
@@ -15,7 +15,7 @@ USES=		python
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	X11
-X11_RUN_DEPENDS=x11vnc:${PORTSDIR}/net/x11vnc
+X11_RUN_DEPENDS=x11vnc:net/x11vnc
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/flvscreen.so
diff --git a/deskutils/wammu/Makefile b/deskutils/wammu/Makefile
index 521b6d85d4e7..cccd124d4efb 100644
--- a/deskutils/wammu/Makefile
+++ b/deskutils/wammu/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GUI manager of contacts, todos, calendar, and messages in your phone
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libGammu.so:${PORTSDIR}/comms/gammu
+LIB_DEPENDS=	libGammu.so:comms/gammu
 
 USES=		gettext pkgconfig python tar:bz2
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/wyrd/Makefile b/deskutils/wyrd/Makefile
index 1222466d1057..4ee3933e0776 100644
--- a/deskutils/wyrd/Makefile
+++ b/deskutils/wyrd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Text-based front-end to Remind
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	remind:${PORTSDIR}/deskutils/remind
+RUN_DEPENDS=	remind:deskutils/remind
 
 USES=		gmake ncurses
 USE_OCAML=	yes
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 4ef9a27dff46..c36c64e6424e 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Windows HTML Help (.chm) viewer for UNIX
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
+LIB_DEPENDS=	libchm.so:misc/chmlib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 35f498e853e0..cfd01f79bcf8 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Notes plugin for the Xfce panel
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	libunique-1.0.so:x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index 0146f41c0e42..bd6d39c9d7a4 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Port of Gnome's notification-daemon for the Xfce desktop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
+LIB_DEPENDS=	libsexy.so:x11-toolkits/libsexy \
+		libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	dbus-daemon:devel/dbus
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 978d283fbdb5..b9b3e8c2ef0f 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Visually-appealing notification daemon for Xfce
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libnotify.so:devel/libnotify
 
 USES=		gmake libtool pkgconfig gettext-tools xfce tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 6995782f4728..b3d08fe0ad89 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Thumbnail service for Xfce desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libdbus-glib-1.so:devel/dbus-glib
 
 USES=		pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2
 GNU_CONFIGURE=	yes
@@ -38,20 +38,20 @@ GSTREAMER_DESC=	GStreamer (1.0) thumbnailer plugin
 
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-FONTS_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FONTS_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FONTS_CONFIGURE_ENABLE=	font-thumbnailer
-JPEG_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+JPEG_LIB_DEPENDS=	libexif.so:graphics/libexif
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg-thumbnailer
-FFMPEG_LIB_DEPENDS=	libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
+FFMPEG_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg-thumbnailer
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 POPPLER_CONFIGURE_ENABLE=	poppler-thumbnailer
 GSTREAMER_USE=	gstreamer1=yes
 GSTREAMER_CONFIGURE_ENABLE=	gstreamer-thumbnailer
 ODF_USE=	gnome=libgsf
 ODF_CONFIGURE_ENABLE=	odf-thumbnailer
-COVER_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+COVER_LIB_DEPENDS=	libcurl.so:ftp/curl
 COVER_CONFIGURE_ENABLE=	cover-thumbnailer
 OPTIONS_SUB=	yes
 
diff --git a/deskutils/xfce4-volumed-pulse/Makefile b/deskutils/xfce4-volumed-pulse/Makefile
index 54114101eadb..f4cedd72948c 100644
--- a/deskutils/xfce4-volumed-pulse/Makefile
+++ b/deskutils/xfce4-volumed-pulse/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Volume management daemon for Xfce using PulseAudio
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio \
-	libnotify.so:${PORTSDIR}/devel/libnotify \
-	libkeybinder.so:${PORTSDIR}/x11/keybinder
+LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
+	libnotify.so:devel/libnotify \
+	libkeybinder.so:x11/keybinder
 
 USES=	pkgconfig gmake xfce tar:bz2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile
index 2d1cf7965776..0c794283c32d 100644
--- a/deskutils/xfce4-volumed/Makefile
+++ b/deskutils/xfce4-volumed/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Volume management daemon for the Xfce desktop
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libkeybinder.so:${PORTSDIR}/x11/keybinder
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libkeybinder.so:x11/keybinder
 
 USES=		pkgconfig gmake xfce tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 126f86b3ba06..8bec75c59235 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Keyboard layout switching plugin for the Xfce panel
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxklavier.so:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	libxklavier.so:x11/libxklavier
 
 GNU_CONFIGURE=	yes
 USES=		gettext pkgconfig gmake xfce tar:bzip2
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index f279ca460957..d4399296ac63 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Auto keyboard switcher
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libpcre.so:devel/pcre
 
 USES=		compiler:nestedfct iconv libtool localbase pathfix pkgconfig
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -39,11 +39,11 @@ NLS_CONFIGURE_ENABLE=	nls
 X11_USE=		XORG=x11
 X11_CONFIGURE_WITH=	x
 
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ON=	--with-spell=aspell
 ASPELL_CONFIGURE_OFF=	--with-spell=no --without-aspell
 
-XOSD_LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+XOSD_LIB_DEPENDS=	libxosd.so:misc/xosd
 XOSD_CONFIGURE_WITH=	xosd
 
 .include <bsd.port.options.mk>
diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index 3e0458174180..1ffc3e69960e 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Virtual note-pad system for your X11 desktop
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme
 
 OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_SUB=	yes
diff --git a/deskutils/xrolo/Makefile b/deskutils/xrolo/Makefile
index 32306efa1a40..1c0cb6058a09 100644
--- a/deskutils/xrolo/Makefile
+++ b/deskutils/xrolo/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}.v2p6
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Electronic Rolodex
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/xrolo
 
diff --git a/deskutils/zim/Makefile b/deskutils/zim/Makefile
index 1d7fe00b7d5b..e73892d60164 100644
--- a/deskutils/zim/Makefile
+++ b/deskutils/zim/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Desktop wiki editor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg \
-		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \
+		xdg-open:devel/xdg-utils \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 NO_ARCH=	yes
 
@@ -27,20 +27,20 @@ OPTIONS_DEFINE=		BZR DITAA GIT GNUPLOT GNUR GRAPHVIZ LATEX \
 			MERCURIAL SCROT
 
 DITAA_DESC=		Diagram editor support
-DITAA_RUN_DEPENDS=	ditaa:${PORTSDIR}/graphics/ditaa
+DITAA_RUN_DEPENDS=	ditaa:graphics/ditaa
 BZR_DESC=		Version control for notebooks using bzr
-BZR_RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BZR_RUN_DEPENDS=	bzr:devel/bzr
 GIT_DESC=		Version control for notebooks using git
-GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
-GNUPLOT_RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+GIT_RUN_DEPENDS=	git:devel/git
+GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
 GNUR_DESC=		Support of plot editor based on GNU R
-GNUR_RUN_DEPENDS=	R:${PORTSDIR}/math/R
-GRAPHVIZ_RUN_DEPENDS=	fdp:${PORTSDIR}/graphics/graphviz
+GNUR_RUN_DEPENDS=	R:math/R
+GRAPHVIZ_RUN_DEPENDS=	fdp:graphics/graphviz
 LATEX_USE=		tex=latex:run
 MERCURIAL_DESC=		Version control for notebooks using hg
-MERCURIAL_RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial
+MERCURIAL_RUN_DEPENDS=	hg:devel/mercurial
 SCROT_DESC=		Screenshot taking and inserting support
-SCROT_RUN_DEPENDS=	scrot:${PORTSDIR}/graphics/scrot
+SCROT_RUN_DEPENDS=	scrot:graphics/scrot
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/devel/ChipmunkPhysics/Makefile b/devel/ChipmunkPhysics/Makefile
index ce609de3d6db..4b60a744cb83 100644
--- a/devel/ChipmunkPhysics/Makefile
+++ b/devel/ChipmunkPhysics/Makefile
@@ -26,7 +26,7 @@ PORTEXAMPLES=	*.c *.h
 
 DEMOS_DESC=	Install the demo program (requires GLFW and GLEW)
 DEMOS_USE=		GL=glew
-DEMOS_LIB_DEPENDS=	libglfw.so:${PORTSDIR}/graphics/glfw2
+DEMOS_LIB_DEPENDS=	libglfw.so:graphics/glfw2
 DEMOS_CMAKE_OFF=	-DBUILD_DEMOS=OFF
 
 post-install-DOCS-on:
diff --git a/devel/R-cran-bit64/Makefile b/devel/R-cran-bit64/Makefile
index 0586ac91ba2c..02c403507f4d 100644
--- a/devel/R-cran-bit64/Makefile
+++ b/devel/R-cran-bit64/Makefile
@@ -11,7 +11,7 @@ COMMENT=	S3 Class for Vectors of 64bit Integers
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-bit>=1.1.12:${PORTSDIR}/devel/R-cran-bit
+RUN_DEPENDS=	R-cran-bit>=1.1.12:devel/R-cran-bit
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-caTools/Makefile b/devel/R-cran-caTools/Makefile
index ea5fd6814507..efa4016855e3 100644
--- a/devel/R-cran-caTools/Makefile
+++ b/devel/R-cran-caTools/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tools: moving window statistics, GIF, Base64, ROC AUC, etc
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	R-cran-bitops>0:${PORTSDIR}/devel/R-cran-bitops
+RUN_DEPENDS=	R-cran-bitops>0:devel/R-cran-bitops
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-caret/Makefile b/devel/R-cran-caret/Makefile
index 84b2c4637c04..11aec86741a1 100644
--- a/devel/R-cran-caret/Makefile
+++ b/devel/R-cran-caret/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Classification and Regression Training
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-ggplot2>0:${PORTSDIR}/graphics/R-cran-ggplot2 \
-		R-cran-car>0:${PORTSDIR}/math/R-cran-car \
-		R-cran-foreach>0:${PORTSDIR}/devel/R-cran-foreach \
-		R-cran-plyr>0:${PORTSDIR}/devel/R-cran-plyr \
-		R-cran-reshape2>0:${PORTSDIR}/devel/R-cran-reshape2
+RUN_DEPENDS=	R-cran-ggplot2>0:graphics/R-cran-ggplot2 \
+		R-cran-car>0:math/R-cran-car \
+		R-cran-foreach>0:devel/R-cran-foreach \
+		R-cran-plyr>0:devel/R-cran-plyr \
+		R-cran-reshape2>0:devel/R-cran-reshape2
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-doParallel/Makefile b/devel/R-cran-doParallel/Makefile
index e38e85190787..03cbee92e502 100644
--- a/devel/R-cran-doParallel/Makefile
+++ b/devel/R-cran-doParallel/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Foreach parallel adaptor for the parallel package
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-foreach>=1.2.0:${PORTSDIR}/devel/R-cran-foreach \
-		R-cran-iterators>=1.0.0:${PORTSDIR}/devel/R-cran-iterators
+RUN_DEPENDS=	R-cran-foreach>=1.2.0:devel/R-cran-foreach \
+		R-cran-iterators>=1.0.0:devel/R-cran-iterators
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-evaluate/Makefile b/devel/R-cran-evaluate/Makefile
index 19b4e6f1bd22..6f50f1e289d2 100644
--- a/devel/R-cran-evaluate/Makefile
+++ b/devel/R-cran-evaluate/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Parsing and Evaluation Tools
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-stringr>=0.6.2:${PORTSDIR}/textproc/R-cran-stringr
+RUN_DEPENDS=	R-cran-stringr>=0.6.2:textproc/R-cran-stringr
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-foreach/Makefile b/devel/R-cran-foreach/Makefile
index 2c62831ca393..d290c417b780 100644
--- a/devel/R-cran-foreach/Makefile
+++ b/devel/R-cran-foreach/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Foreach looping construct for R
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	R-cran-iterators>=1.0.0:${PORTSDIR}/devel/R-cran-iterators
+RUN_DEPENDS=	R-cran-iterators>=1.0.0:devel/R-cran-iterators
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-gdata/Makefile b/devel/R-cran-gdata/Makefile
index 1fc980f4c934..fc94e520d860 100644
--- a/devel/R-cran-gdata/Makefile
+++ b/devel/R-cran-gdata/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Various R programming tools for data manipulation
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-gtools>0:${PORTSDIR}/devel/R-cran-gtools
+RUN_DEPENDS=	R-cran-gtools>0:devel/R-cran-gtools
 
 USES=		cran:auto-plist perl5 shebangfix
 USE_PERL5=	run
diff --git a/devel/R-cran-gsubfn/Makefile b/devel/R-cran-gsubfn/Makefile
index 60a22a9473a9..0286ae02a93f 100644
--- a/devel/R-cran-gsubfn/Makefile
+++ b/devel/R-cran-gsubfn/Makefile
@@ -12,7 +12,7 @@ COMMENT=	R package used for string matching, substitution and parsing
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-proto>=0.3.9.2_6:${PORTSDIR}/devel/R-cran-proto
+RUN_DEPENDS=	R-cran-proto>=0.3.9.2_6:devel/R-cran-proto
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-itertools/Makefile b/devel/R-cran-itertools/Makefile
index 1536fcc2a185..63856ce80ead 100644
--- a/devel/R-cran-itertools/Makefile
+++ b/devel/R-cran-itertools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Iterator Tools for R
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-iterators>=1.0.0:${PORTSDIR}/devel/R-cran-iterators
+RUN_DEPENDS=	R-cran-iterators>=1.0.0:devel/R-cran-iterators
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-memoise/Makefile b/devel/R-cran-memoise/Makefile
index 6e90d9c13c94..261189ab410e 100644
--- a/devel/R-cran-memoise/Makefile
+++ b/devel/R-cran-memoise/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Memoise functions for R
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-digest>=0.6.3:${PORTSDIR}/security/R-cran-digest
+RUN_DEPENDS=	R-cran-digest>=0.6.3:security/R-cran-digest
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-microbenchmark/Makefile b/devel/R-cran-microbenchmark/Makefile
index 6f96f83076bb..3ea01703fafd 100644
--- a/devel/R-cran-microbenchmark/Makefile
+++ b/devel/R-cran-microbenchmark/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Infrastructure to measure the execution time of R expressions
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	R-cran-ggplot2>0:${PORTSDIR}/graphics/R-cran-ggplot2
+RUN_DEPENDS=	R-cran-ggplot2>0:graphics/R-cran-ggplot2
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-pkgmaker/Makefile b/devel/R-cran-pkgmaker/Makefile
index ffb9b17474d7..ede0eca421d3 100644
--- a/devel/R-cran-pkgmaker/Makefile
+++ b/devel/R-cran-pkgmaker/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Package development utilities
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-registry>0:${PORTSDIR}/devel/R-cran-registry \
-		R-cran-digest>0:${PORTSDIR}/security/R-cran-digest \
-		R-cran-stringr>0:${PORTSDIR}/textproc/R-cran-stringr \
-		R-cran-xtable>0:${PORTSDIR}/textproc/R-cran-xtable
+RUN_DEPENDS=	R-cran-registry>0:devel/R-cran-registry \
+		R-cran-digest>0:security/R-cran-digest \
+		R-cran-stringr>0:textproc/R-cran-stringr \
+		R-cran-xtable>0:textproc/R-cran-xtable
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-plyr/Makefile b/devel/R-cran-plyr/Makefile
index 1b59f00ee5a3..888341d52249 100644
--- a/devel/R-cran-plyr/Makefile
+++ b/devel/R-cran-plyr/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME_HW=	Hadley Wickham COPYRIGHT
 LICENSE_FILE_HW=	${WRKSRC}/LICENSE
 LICENSE_PERMS_HW=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-randomForest/Makefile b/devel/R-cran-randomForest/Makefile
index c66d025f4174..90ad9c78740b 100644
--- a/devel/R-cran-randomForest/Makefile
+++ b/devel/R-cran-randomForest/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Classification based on a forest of trees using random inputs
 
-RUN_DEPENDS=	R-cran-RColorBrewer>=1.0.5_6:${PORTSDIR}/graphics/R-cran-RColorBrewer
+RUN_DEPENDS=	R-cran-RColorBrewer>=1.0.5_6:graphics/R-cran-RColorBrewer
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-reshape/Makefile b/devel/R-cran-reshape/Makefile
index bea57d862d1c..fe08ab473f0e 100644
--- a/devel/R-cran-reshape/Makefile
+++ b/devel/R-cran-reshape/Makefile
@@ -12,7 +12,7 @@ COMMENT=	R package for flexibly restructuring and aggregating data
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-plyr>0:${PORTSDIR}/devel/R-cran-plyr
+RUN_DEPENDS=	R-cran-plyr>0:devel/R-cran-plyr
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-reshape2/Makefile b/devel/R-cran-reshape2/Makefile
index fc7684dceb07..41510b670702 100644
--- a/devel/R-cran-reshape2/Makefile
+++ b/devel/R-cran-reshape2/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Flexibly reshape data: a reboot of the reshape package
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-plyr>=1.8.1:${PORTSDIR}/devel/R-cran-plyr \
-		R-cran-stringr>0:${PORTSDIR}/textproc/R-cran-stringr \
-		R-cran-Rcpp>0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-plyr>=1.8.1:devel/R-cran-plyr \
+		R-cran-stringr>0:textproc/R-cran-stringr \
+		R-cran-Rcpp>0:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-rngtools/Makefile b/devel/R-cran-rngtools/Makefile
index 4a5330e05554..5f1fb577398f 100644
--- a/devel/R-cran-rngtools/Makefile
+++ b/devel/R-cran-rngtools/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Utility functions for working with Random Number Generators
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	R-cran-pkgmaker>=0.20:${PORTSDIR}/devel/R-cran-pkgmaker
+RUN_DEPENDS=	R-cran-pkgmaker>=0.20:devel/R-cran-pkgmaker
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-tidyr/Makefile b/devel/R-cran-tidyr/Makefile
index c43c74828028..4fe2ca912cbd 100644
--- a/devel/R-cran-tidyr/Makefile
+++ b/devel/R-cran-tidyr/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Easily tidy data with spread and gather functions
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-dplyr>=0.4:${PORTSDIR}/math/R-cran-dplyr \
-		R-cran-stringi>0:${PORTSDIR}/textproc/R-cran-stringi \
-		R-cran-lazyeval>0:${PORTSDIR}/math/R-cran-lazyeval \
-		R-cran-magrittr>0:${PORTSDIR}/devel/R-cran-magrittr \
-		R-cran-Rcpp>0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-dplyr>=0.4:math/R-cran-dplyr \
+		R-cran-stringi>0:textproc/R-cran-stringi \
+		R-cran-lazyeval>0:math/R-cran-lazyeval \
+		R-cran-magrittr>0:devel/R-cran-magrittr \
+		R-cran-Rcpp>0:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/devel/abi-compliance-checker/Makefile b/devel/abi-compliance-checker/Makefile
index 3d3de371b651..d6971e2eb388 100644
--- a/devel/abi-compliance-checker/Makefile
+++ b/devel/abi-compliance-checker/Makefile
@@ -18,11 +18,11 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	lvc
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS?=	exctags:${PORTSDIR}/devel/ctags
+BUILD_DEPENDS?=	exctags:devel/ctags
 .else
 USE_PERL5=	run
 .endif
-RUN_DEPENDS?=	exctags:${PORTSDIR}/devel/ctags
+RUN_DEPENDS?=	exctags:devel/ctags
 USE_GCC=	any
 
 NO_BUILD=	yes
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index edf6dbc0c0be..847854e82740 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -42,7 +42,7 @@ OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=		yes
 
 FLTK_DESC=		FLTK GUI toolkit
-FLTK_LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_MAKE_ENV=		fl=1
 QT4_USE=		QT4=corelib,gui,moc_build
 QT4_MAKE_ENV=		qt=1 qt4=1 QTDIR="${QT_PREFIX}"
@@ -53,7 +53,7 @@ SSL_MAKE_ENV=		ssl=1
 TK_USES=		tk
 TK_MAKE_ENV=		tk=1
 TRIO_DESC=		Trio portable string functions
-TRIO_BUILD_DEPENDS=	trio>=0:${PORTSDIR}/devel/trio
+TRIO_BUILD_DEPENDS=	trio>=0:devel/trio
 TRIO_MAKE_ENV=		trio=1
 X11_USE=		XORG=xt
 X11_MAKE_ENV=		xt=1
diff --git a/devel/ada-util/Makefile b/devel/ada-util/Makefile
index 912b2e1d378b..77ed8d055ba3 100644
--- a/devel/ada-util/Makefile
+++ b/devel/ada-util/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Utility library for Ada 2005 applications
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
-		${LOCALBASE}/lib/gnat/ahven.gpr:${PORTSDIR}/devel/ahven
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	gprbuild:devel/gprbuild \
+		${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		ada gmake
 USE_GITHUB=	yes
diff --git a/devel/adabooch/Makefile b/devel/adabooch/Makefile
index 41bc2541b50c..fb001ae6e345 100644
--- a/devel/adabooch/Makefile
+++ b/devel/adabooch/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Ada 95 Booch Components
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake tar:bzip2
 HAS_CONFIGURE=	yes
diff --git a/devel/adime/Makefile b/devel/adime/Makefile
index 42acf4ad5175..102819d41537 100644
--- a/devel/adime/Makefile
+++ b/devel/adime/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate Allegro dialogs in a simple way
 
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS=	liballeg.so:devel/allegro
 
 USES=	gmake
 
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 682c12114712..ac2b980f4e0b 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Transaction-based software configuration management system
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	tkdiff:${PORTSDIR}/textproc/tkdiff
+LIB_DEPENDS=	libcurl.so:ftp/curl
+RUN_DEPENDS=	tkdiff:textproc/tkdiff
 
 USES=		gettext ghostscript perl5 tk
 USE_GNOME=	libxml2
diff --git a/devel/afay/Makefile b/devel/afay/Makefile
index af27f2354f4c..e2e738beb8b1 100644
--- a/devel/afay/Makefile
+++ b/devel/afay/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	Arcadia-UC-Irvine
 LICENSE_FILE=	${WRKSRC}/afay/aflex/README
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USES=		ada tar:tgz
 NO_WRKSUBDIR=	yes
diff --git a/devel/ahven/Makefile b/devel/ahven/Makefile
index 1be62e1aa010..bb0e623edb37 100644
--- a/devel/ahven/Makefile
+++ b/devel/ahven/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ada unit test framework
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	adactl:${PORTSDIR}/lang/adacontrol
+BUILD_DEPENDS=	adactl:lang/adacontrol
 
 USES=		ada gmake
 MAKE_ENV=	OS_VERSION=unix
@@ -23,8 +23,8 @@ NO_OPTIONS_SORT=	yes
 TRACE_DESC=		Build with GNAT-specific symbolic tracing functionality
 
 DOCS_USES=		python:build
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:${PORTSDIR}/textproc/py-sphinxcontrib-adadomain
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
+			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:textproc/py-sphinxcontrib-adadomain
 TRACE_EXTRA_PATCHES=	${FILESDIR}/extra-src_ahven-framework.adb
 
 do-build:
diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile
index 50606d2242e2..5ac9f9aca82e 100644
--- a/devel/aifad/Makefile
+++ b/devel/aifad/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Machine learning system
 
 LICENSE=	LGPL21+
 
-BUILD_DEPENDS=	menhir:${PORTSDIR}/devel/menhir \
-		ocaml-cfg>0:${PORTSDIR}/devel/ocaml-cfg \
-		ocaml-pcre>0:${PORTSDIR}/devel/ocaml-pcre \
-		ocaml-res>0:${PORTSDIR}/devel/ocaml-res
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	menhir:devel/menhir \
+		ocaml-cfg>0:devel/ocaml-cfg \
+		ocaml-pcre>0:devel/ocaml-pcre \
+		ocaml-res>0:devel/ocaml-res
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmottl
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index f4acb6073ddb..ee7336756ae2 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -17,11 +17,11 @@ COMMENT=	Cross-platform library for games and multimedia programming
 LICENSE=	ZLIB BSD3CLAUSE
 LICENSE_COMB=	dual
 
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libphysfs.so:${PORTSDIR}/devel/physfs
+LIB_DEPENDS+=	libjack.so:audio/jack \
+		libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis \
+		libFLAC.so:audio/flac \
+		libphysfs.so:devel/physfs
 
 USES=		cmake gmake jpeg openal:soft pkgconfig
 USE_XORG=	x11 xpm xext xcursor xxf86vm xxf86dga
@@ -60,11 +60,11 @@ DOCSDIR2=	${DOCSDIR}/docs
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/pandoc:${PORTSDIR}/textproc/hs-pandoc
-ALSA_LIB_DEPENDS=	libasound.so.2:${PORTSDIR}/audio/alsa-lib
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/pandoc:textproc/hs-pandoc
+ALSA_LIB_DEPENDS=	libasound.so.2:audio/alsa-lib
 ALSA_CMAKE_ON=		-DWANT_ALSA=on
 ALSA_CMAKE_OFF=		-DWANT_ALSA=off
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DWANT_PULSEAUDIO=on
 PULSEAUDIO_CMAKE_OFF=	-DWANT_PULSEAUDIO=off
 
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index ceb70e406997..85773cb92f36 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -13,8 +13,8 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	koalative@gmail.com
 COMMENT=	Cross-platform library for games and multimedia programming
 
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis
 
 USES=		cmake gmake makeinfo pkgconfig
 USE_XORG=	x11 xpm xext xcursor xxf86vm xxf86dga
@@ -49,13 +49,13 @@ OPTIONS_SUB=	yes
 
 EXAMPLES_CMAKE_ON=	-DWANT_EXAMPLES=on
 EXAMPLES_CMAKE_OFF=	-DWANT_EXAMPLES=off
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_ON=		-DWANT_ALSA=on
 ALSA_CMAKE_OFF=		-DWANT_ALSA=off
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_ON=		-DWANT_JACK=on
 JACK_CMAKE_OFF=		-DWANT_JACK=off
-OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_CMAKE_ON=		-DWANT_LOGG=on
 OGG_CMAKE_OFF=		-DWANT_LOGG=of
 
diff --git a/devel/alog/Makefile b/devel/alog/Makefile
index 3599cbc3db1b..b740feba12f3 100644
--- a/devel/alog/Makefile
+++ b/devel/alog/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Stackable logging framework for Ada
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada tar:bzip2
 ALL_TARGET=	all
@@ -26,9 +26,9 @@ TEST_DESC=	Run unit test suite before installation
 NO_OPTIONS_SORT=yes
 
 DOCS_USES=		gmake
-DOCS_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-			source-highlight:${PORTSDIR}/textproc/source-highlight
-TEST_BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/ahven.gpr:${PORTSDIR}/devel/ahven
+DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+			source-highlight:textproc/source-highlight
+TEST_BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
index 907248e748ca..1f6ef8e6f6be 100644
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Extra anjuta 3 plugins
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libanjuta-3.so:${PORTSDIR}/devel/anjuta
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libanjuta-3.so:devel/anjuta
 
 USES=		gettext gmake libtool pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 5dde9877b731..ce6f102ee95f 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -11,18 +11,18 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated Development Environment for C and C++
 
-BUILD_DEPENDS=	autogen:${PORTSDIR}/devel/autogen \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgdl-3.so:${PORTSDIR}/x11-toolkits/gdl
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
-		autogen:${PORTSDIR}/devel/autogen \
-		automake>=0:${PORTSDIR}/devel/automake \
-		autoconf>=0:${PORTSDIR}/devel/autoconf \
-		libtool>=2.4:${PORTSDIR}/devel/libtool \
-		gdb>=7.10:${PORTSDIR}/devel/gdb \
-		gmake:${PORTSDIR}/devel/gmake \
-		yelp>=3.0.0:${PORTSDIR}/x11/yelp
+BUILD_DEPENDS=	autogen:devel/autogen \
+		itstool:textproc/itstool
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		libgdl-3.so:x11-toolkits/gdl
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
+		autogen:devel/autogen \
+		automake>=0:devel/automake \
+		autoconf>=0:devel/autoconf \
+		libtool>=2.4:devel/libtool \
+		gdb>=7.10:devel/gdb \
+		gmake:devel/gmake \
+		yelp>=3.0.0:x11/yelp
 
 PORTSCOUT=	limitw:1,even
 
@@ -84,24 +84,24 @@ VALA_DESC=	Vala support
 GLADE_DESC=	Build glade plugin
 TERMINAL_DESC=	Build build-in terminal
 
-GLADE_LIB_DEPENDS=	libgladeui-2.so:${PORTSDIR}/devel/glade
+GLADE_LIB_DEPENDS=	libgladeui-2.so:devel/glade
 GLADE_CONFIGURE_ENABLE=	plugin-glade
 
 TERMINAL_USE=	GNOME=vte3
 TERMINAL_CONFIGURE_ENABLE=	plugin-terminal
 
-SVN_BUILD_DEPENDS=	svn:${PORTSDIR}/devel/subversion
-SVN_LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
-			libserf-1.so:${PORTSDIR}/www/serf
-SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+SVN_BUILD_DEPENDS=	svn:devel/subversion
+SVN_LIB_DEPENDS=	libapr-1.so:devel/apr1 \
+			libserf-1.so:www/serf
+SVN_RUN_DEPENDS=	svn:devel/subversion
 SVN_CONFIGURE_ENABLE=	plugin-subversion
 
-DEVHELP_LIB_DEPENDS=	libdevhelp-3.so:${PORTSDIR}/devel/devhelp
+DEVHELP_LIB_DEPENDS=	libdevhelp-3.so:devel/devhelp
 DEVHELP_CONFIGURE_ENBABLE=	plugin-devhelp
 
 VALA_VER=		0.30
-VALA_BUILD_DEPENDS=	vala>=${VALA_VER}<${VALA_VER}.99:${PORTSDIR}/lang/vala
-VALA_RUN_DEPENDS=	vala>=${VALA_VER}<${VALA_VER}.99:${PORTSDIR}/lang/vala
+VALA_BUILD_DEPENDS=	vala>=${VALA_VER}<${VALA_VER}.99:lang/vala
+VALA_RUN_DEPENDS=	vala>=${VALA_VER}<${VALA_VER}.99:lang/vala
 VALA_CONFIGURE_ENABLE=	vala
 
 post-patch:
diff --git a/devel/api-sanity-autotest/Makefile b/devel/api-sanity-autotest/Makefile
index e6cf6094d6be..40d4d1976560 100644
--- a/devel/api-sanity-autotest/Makefile
+++ b/devel/api-sanity-autotest/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Quickly generate sanity tests for the API of a C/C++ shared library
 LICENSE=	LGPL20 GPLv2
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:${PORTSDIR}/devel/abi-compliance-checker
+RUN_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:devel/abi-compliance-checker
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${PORTNAME}.pl
@@ -20,7 +20,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	lvc
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:${PORTSDIR}/devel/abi-compliance-checker
+BUILD_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:devel/abi-compliance-checker
 .else
 USE_PERL5=	run
 .endif
diff --git a/devel/apiextractor/Makefile b/devel/apiextractor/Makefile
index 55ef029a73b8..20684ea037dc 100644
--- a/devel/apiextractor/Makefile
+++ b/devel/apiextractor/Makefile
@@ -11,7 +11,7 @@ COMMENT=	API Extractor library to build PySide
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PySide
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile
index 0e6da925c747..a137755a4e11 100644
--- a/devel/appstream-glib/Makefile
+++ b/devel/appstream-glib/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Library to help with AppStream metadata
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
-		gcab:${PORTSDIR}/archivers/gcab
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libyaml.so:${PORTSDIR}/textproc/libyaml \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	gcab:${PORTSDIR}/archivers/gcab
+BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc \
+		gcab:archivers/gcab
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libyaml.so:textproc/libyaml \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+RUN_DEPENDS=	gcab:archivers/gcab
 
 USES=		gettext gperf gmake gnome libarchive libtool pathfix \
 		pkgconfig sqlite tar:xz
@@ -40,8 +40,8 @@ OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 MANPAGES_CONFIGURE_ENABLE=	man
-MANPAGE_BUILD_DEPENDS=	docbook-xml>=0:${PORTSDIR}/textproc/docbook-xml \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
+MANPAGE_BUILD_DEPENDS=	docbook-xml>=0:textproc/docbook-xml \
+		docbook-xsl>=0:textproc/docbook-xsl
 MANPAGES_USE=	GNOME=libxslt:build
 
 .include <bsd.port.options.mk>
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index b35d6f6bd5e3..93fb1b81aa6f 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Apache Portability Library
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		iconv pathfix libtool cpe
 USE_LDCONFIG=	yes
@@ -41,11 +41,11 @@ SSL_DESC=		OpenSSL crypto driver
 
 # APR-Util Options
 BDB_USE=		BDB=5+
-FREETDS_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 LDAP_USE=		OPENLDAP=yes
 MYSQL_USE=		MYSQL=yes
-NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+NSS_LIB_DEPENDS=	libnss3.so:security/nss
 PGSQL_USES=		pgsql
 SQLITE_USES=		sqlite
 SSL_USE=		OPENSSL=yes
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 100299c6c71d..2e6641c1cc96 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Apache Portability Library
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 NO_PACKAGE=	yes
 
@@ -51,7 +51,7 @@ DEVRANDOM_CONFIGURE_WITH=	devrandom
 # APR-Util Options
 BDB_USE=		BDB=48+
 GDBM_CONFIGURE_WITH=	gdbm=${LOCALBASE}
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 IPV6_CONFIGURE_ENABLE=	ipv6
 MYSQL_CFLAGS=		-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
 MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}
@@ -69,7 +69,7 @@ SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_WITH=	openssl=${OPENSSLBASE}
 SSL_CPPFLAGS=		-I${OPENSSLINC}
 SSL_LDFLAGS=		-L${OPENSSLLIB}
-NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+NSS_LIB_DEPENDS=	libnss3.so:security/nss
 NSS_CPPFLAGS=		-I${LOCALBASE}/include/nss
 NSS_LDFLAGS=		-L${LOCALBASE}/lib/nss
 NSS_CONFIGURE_WITH=	nss=${LOCALBASE}
diff --git a/devel/arcanist/Makefile b/devel/arcanist/Makefile
index ed3dcb297d0b..4394ad7dbc62 100644
--- a/devel/arcanist/Makefile
+++ b/devel/arcanist/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 CONFLICTS=	arc-*
 
 PHP_DESTDIR=	lib/php/arcanist
-RUN_DEPENDS=	php5-libphutil>0:${PORTSDIR}/devel/libphutil
+RUN_DEPENDS=	php5-libphutil>0:devel/libphutil
 USE_PHP=	curl dom json simplexml
 USE_GITHUB=	yes
 NO_BUILD=	yes
diff --git a/devel/arduino-glcd/Makefile b/devel/arduino-glcd/Makefile
index 3ae0d0dec8f0..f14cb0851d36 100644
--- a/devel/arduino-glcd/Makefile
+++ b/devel/arduino-glcd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GLCD Graphical LCD Library
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	arduino:${PORTSDIR}/devel/arduino
+RUN_DEPENDS=	arduino:devel/arduino
 
 WRKSRC=		${WRKDIR}/glcd
 USES=		zip dos2unix
diff --git a/devel/arduino-irremote/Makefile b/devel/arduino-irremote/Makefile
index 99adbeadb34a..c7605ceb535a 100644
--- a/devel/arduino-irremote/Makefile
+++ b/devel/arduino-irremote/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Multi-protocol infrared remote library for the Arduino
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	arduino:${PORTSDIR}/devel/arduino
+RUN_DEPENDS=	arduino:devel/arduino
 
 WRKSRC=		${WRKDIR}/IRremote
 USES=		zip dos2unix
diff --git a/devel/arduino-mk/Makefile b/devel/arduino-mk/Makefile
index f3ff981c4a8a..d87d1bb89e44 100644
--- a/devel/arduino-mk/Makefile
+++ b/devel/arduino-mk/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Build Arduino sketches from the command line
 LICENSE=	LGPL21
 
 # gmake is needed to use the port, not to build it
-RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		arduino:${PORTSDIR}/devel/arduino
-PATCH_DEPENDS=	${LOCALBASE}/arduino/lib/version.txt:${PORTSDIR}/devel/arduino
+RUN_DEPENDS=	gmake:devel/gmake \
+		p5-YAML>=0:textproc/p5-YAML \
+		arduino:devel/arduino
+PATCH_DEPENDS=	${LOCALBASE}/arduino/lib/version.txt:devel/arduino
 
 USES=		shebangfix
 SHEBANG_FILES=	bin/ard-parse-boards bin/ard-reset-arduino
diff --git a/devel/arduino/Makefile b/devel/arduino/Makefile
index 8f1be4ef8e79..9141883af1de 100644
--- a/devel/arduino/Makefile
+++ b/devel/arduino/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-linux32
 MAINTAINER=	leres@ee.lbl.gov
 COMMENT=	Open-source electronics prototyping platform
 
-RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:${PORTSDIR}/comms/rxtx \
-		${LOCALBASE}/bin/avrdude:${PORTSDIR}/devel/avrdude \
-		${LOCALBASE}/avr/include/avr/io.h:${PORTSDIR}/devel/avr-libc
+RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:comms/rxtx \
+		${LOCALBASE}/bin/avrdude:devel/avrdude \
+		${LOCALBASE}/avr/include/avr/io.h:devel/avr-libc
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		dos2unix tar:tgz
diff --git a/devel/arm-none-eabi-gcc492/Makefile b/devel/arm-none-eabi-gcc492/Makefile
index 56f62ef17d64..4454ee37a12c 100644
--- a/devel/arm-none-eabi-gcc492/Makefile
+++ b/devel/arm-none-eabi-gcc492/Makefile
@@ -14,11 +14,11 @@ COMMENT=	GNU Compiler Collection for bare metal arm cross-development
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
-RUN_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
+RUN_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
 
 USES=	compiler gmake iconv libtool makeinfo tar:bzip2
 PLIST_SUB=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
diff --git a/devel/arm-none-eabi-gdb/Makefile b/devel/arm-none-eabi-gdb/Makefile
index bcbdb0870522..f7d8bb657297 100644
--- a/devel/arm-none-eabi-gdb/Makefile
+++ b/devel/arm-none-eabi-gdb/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	gdb-${PORTVERSION}
 
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	GNU GDB for the arm bare metal target
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake tar:xz iconv gmake libtool 
 
diff --git a/devel/art/Makefile b/devel/art/Makefile
index 3113c8cf8655..8ada2a30af37 100644
--- a/devel/art/Makefile
+++ b/devel/art/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Resource tracing, debugging, and profiling tool
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
+LIB_DEPENDS=	libxml++-2.6.so:textproc/libxml++26
 
 USES=	gmake pkgconfig
 
diff --git a/devel/artifactory/Makefile b/devel/artifactory/Makefile
index ac51b896a9b6..b3b2445ba17d 100644
--- a/devel/artifactory/Makefile
+++ b/devel/artifactory/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LESSER
 LICENSE_FILE_APACHE20=	${WRKSRC}/tomcat/LICENSE
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-oss-${PORTVERSION}
 
diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile
index cceaf4e0bb09..98dc9d8e39b7 100644
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	i386
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 USES=		gmake
 USE_GCC=	any
diff --git a/devel/atlassian-plugin-sdk/Makefile b/devel/atlassian-plugin-sdk/Makefile
index ffdfe3e91750..315ad9f79a53 100644
--- a/devel/atlassian-plugin-sdk/Makefile
+++ b/devel/atlassian-plugin-sdk/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	https://maven.atlassian.com/content/repositories/atlassian-public/
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Atlassian Plugin SDK
 
-RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
+RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index e692abd9e93e..09cb64088c84 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -10,10 +10,10 @@ DISTNAME=	autoconf-${PORTVERSION}
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Automatically configure source code on many Un*x platforms
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		help2man:${PORTSDIR}/misc/help2man
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper
+BUILD_DEPENDS=	gm4:devel/m4 \
+		help2man:misc/help2man
+RUN_DEPENDS=	gm4:devel/m4 \
+		autoconf-wrapper:devel/autoconf-wrapper
 
 BUILD_VERSION=	2.69
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 8837d78b5905..47ccf8cea573 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -15,9 +15,9 @@ PKGNAMESUFFIX=	213
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Automatically configure source code on many Un*x platforms (legacy 2.13)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper
+BUILD_DEPENDS=	gm4:devel/m4
+RUN_DEPENDS=	gm4:devel/m4 \
+		autoconf-wrapper:devel/autoconf-wrapper
 
 BUILD_VERSION=	2.13
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index 2cd186270fd3..25b216dbb22a 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Automatic Dia XML - from Source Code and Data
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason
+BUILD_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-HTML-Mason>=0:www/p5-HTML-Mason
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
@@ -32,9 +32,9 @@ OPTIONS_DEFAULT=	GRAPHVIZ SPRINGGRAPH VCG
 SPRINGGRAPH_DESC=	SpringGraph support
 VCG_DESC=		VCG support
 
-GRAPHVIZ_RUN_DEPENDS=	p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
-SPRINGGRAPH_RUN_DEPENDS=	p5-SpringGraph>=0:${PORTSDIR}/graphics/p5-SpringGraph
-VCG_RUN_DEPENDS=	p5-VCG>=0:${PORTSDIR}/graphics/p5-VCG
+GRAPHVIZ_RUN_DEPENDS=	p5-GraphViz>=0:graphics/p5-GraphViz
+SPRINGGRAPH_RUN_DEPENDS=	p5-SpringGraph>=0:graphics/p5-SpringGraph
+VCG_RUN_DEPENDS=	p5-VCG>=0:graphics/p5-VCG
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 08526e3cdbae..628aaffd8557 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tool designed to simplify the creation and maintenance of programs
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 
 USES=		gmake libtool pathfix perl5 pkgconfig shebangfix tar:xz
 USE_PERL5=	build
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 058a40c2ab75..637813c4ad96 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	GNU
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	GNU Standards-compliant Makefile generator
 
-BUILD_DEPENDS=	autoconf-2.69:${PORTSDIR}/devel/autoconf
-RUN_DEPENDS=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
-		automake-wrapper:${PORTSDIR}/devel/automake-wrapper
+BUILD_DEPENDS=	autoconf-2.69:devel/autoconf
+RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
+		automake-wrapper:devel/automake-wrapper
 
 BUILD_VERSION=	1.15
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile
index 984a0743f041..06af96a58e1d 100644
--- a/devel/autotools/Makefile
+++ b/devel/autotools/Makefile
@@ -13,10 +13,10 @@ DISTFILES=	# none
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Autotools meta-port
 
-RUN_DEPENDS=	libtoolize:${PORTSDIR}/devel/libtool \
-		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
-		autoconf-2.69:${PORTSDIR}/devel/autoconf \
-		automake-1.15:${PORTSDIR}/devel/automake
+RUN_DEPENDS=	libtoolize:devel/libtool \
+		autoconf-2.13:devel/autoconf213 \
+		autoconf-2.69:devel/autoconf \
+		automake-1.15:devel/automake
 
 PLIST_FILES=	share/${PORTNAME}
 NO_BUILD=	yes
diff --git a/devel/avr-gcc-devel/Makefile b/devel/avr-gcc-devel/Makefile
index 9865f68c521e..4b280da834b0 100644
--- a/devel/avr-gcc-devel/Makefile
+++ b/devel/avr-gcc-devel/Makefile
@@ -15,13 +15,13 @@ COMMENT=	FSF GCC 4.x for Atmel AVR 8-bit RISC cross-development
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libmpc.so:${PORTSDIR}/math/mpc
-RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils
+BUILD_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils
+LIB_DEPENDS=	libmpfr.so:math/mpfr \
+		libgmp.so:math/gmp \
+		libmpc.so:math/mpc
+RUN_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 8c0eb3d2f6b0..56bd04c3455d 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -13,13 +13,13 @@ COMMENT=	FSF GCC 4.x for Atmel AVR 8-bit RISC cross-development
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libmpc.so:${PORTSDIR}/math/mpc
-RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils
+BUILD_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils
+LIB_DEPENDS=	libmpfr.so:math/mpfr \
+		libgmp.so:math/gmp \
+		libmpc.so:math/mpc
+RUN_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of
diff --git a/devel/avr-gdb/Makefile b/devel/avr-gdb/Makefile
index e4517e06559b..bf78d1a2b113 100644
--- a/devel/avr-gdb/Makefile
+++ b/devel/avr-gdb/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	gdb-${PORTVERSION}
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	GNU GDB for the AVR target
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake ncurses tar:bzip2
 
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 4a6178f508b4..80df5b9d4956 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -14,12 +14,12 @@ COMMENT=	C and math library for the Atmel AVR controller family
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils \
-		avr-gcc:${PORTSDIR}/devel/avr-gcc
-RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils \
-		avr-gcc:${PORTSDIR}/devel/avr-gcc
+BUILD_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils \
+		avr-gcc:devel/avr-gcc
+RUN_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils \
+		avr-gcc:devel/avr-gcc
 
 OPTIONS_DEFINE=	DOXYGEN
 
@@ -31,10 +31,10 @@ OPTIONS_DEFINE=	DOXYGEN
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 USE_TEX=	latex:build
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
-		fig2dev:${PORTSDIR}/print/transfig \
-		jpegtopnm:${PORTSDIR}/graphics/netpbm \
-		dvips:${PORTSDIR}/print/tex-dvipsk
+BUILD_DEPENDS+=	doxygen:devel/doxygen \
+		fig2dev:print/transfig \
+		jpegtopnm:graphics/netpbm \
+		dvips:print/tex-dvipsk
 .endif
 
 USES=		gettext-tools tar:bzip2 gmake
diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index a09a3fa4bf49..fb0a25fd25a9 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -21,7 +21,7 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	FTDI
 OPTIONS_DEFAULT=	FTDI
 FTDI_DESC=	libftdi support
-FTDI_LIB_DEPENDS=	libftdi1.so:${PORTSDIR}/devel/libftdi1
+FTDI_LIB_DEPENDS=	libftdi1.so:devel/libftdi1
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/avro-cpp/Makefile b/devel/avro-cpp/Makefile
index b70c04455941..f70258c1700c 100644
--- a/devel/avro-cpp/Makefile
+++ b/devel/avro-cpp/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Data serialization system for C++
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
 USES=		cmake python:build
 USE_LDCONFIG=	yes
diff --git a/devel/avro/Makefile b/devel/avro/Makefile
index d21ac6817882..172df723a0bf 100644
--- a/devel/avro/Makefile
+++ b/devel/avro/Makefile
@@ -19,8 +19,8 @@ PYTHON_DESC=	Install Python library
 
 OPTIONS_DEFAULT=C CPP PYTHON
 
-C_LIB_DEPENDS=		libavro.so:${PORTSDIR}/devel/avro-c
-CPP_LIB_DEPENDS=	libavrocpp.so:${PORTSDIR}/devel/avro-cpp
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}avro:${PORTSDIR}/devel/py-avro
+C_LIB_DEPENDS=		libavro.so:devel/avro-c
+CPP_LIB_DEPENDS=	libavrocpp.so:devel/avro-cpp
+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}avro:devel/py-avro
 
 .include <bsd.port.mk>
diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile
index 46ed617c4273..5a46764d9153 100644
--- a/devel/awscli/Makefile
+++ b/devel/awscli/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Universal Command Line Interface for Amazon Web Services
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.4.5:${PORTSDIR}/devel/py-botocore \
-		${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:${PORTSDIR}/devel/py-colorama \
-		${PYTHON_PKGNAMEPREFIX}s3transfer>=0.0.1:${PORTSDIR}/net/py-s3transfer \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:${PORTSDIR}/security/py-rsa
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.4.5:devel/py-botocore \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama \
+		${PYTHON_PKGNAMEPREFIX}s3transfer>=0.0.1:net/py-s3transfer \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:security/py-rsa
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
@@ -23,7 +23,7 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 2700
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/bbfreeze/Makefile b/devel/bbfreeze/Makefile
index 60066ae76c0f..97e41a621b21 100644
--- a/devel/bbfreeze/Makefile
+++ b/devel/bbfreeze/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module to create standalone executables from Python scripts
 
 LICENSE=	ZLIB
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:${PORTSDIR}/math/py-altgraph \
-		${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:${PORTSDIR}/devel/bbfreeze-loader
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph \
+		${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:devel/bbfreeze-loader
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/beautifyphp/Makefile b/devel/beautifyphp/Makefile
index e6f4a437ab6e..2d45f1f2ae30 100644
--- a/devel/beautifyphp/Makefile
+++ b/devel/beautifyphp/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	beautify_php_${PORTVERSION}
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	PEAR beautifier for PHP4
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/bennugd-modules/Makefile b/devel/bennugd-modules/Makefile
index 6ebd411309d7..fa94aa1d3b29 100644
--- a/devel/bennugd-modules/Makefile
+++ b/devel/bennugd-modules/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	bennugd-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	High level open source game development suite, modules
 
-LIB_DEPENDS=	libbgdrtm.so:${PORTSDIR}/devel/bennugd-core \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libbgdrtm.so:devel/bennugd-core \
+		libpng.so:graphics/png
 
 USES=		tar:bzip2 dos2unix pkgconfig libtool
 USE_SDL=	sdl mixer
diff --git a/devel/bicyclerepair/Makefile b/devel/bicyclerepair/Makefile
index 54f66509e454..40485a9b7628 100644
--- a/devel/bicyclerepair/Makefile
+++ b/devel/bicyclerepair/Makefile
@@ -16,7 +16,7 @@ USE_PYTHON=	distutils
 OPTIONS_DEFINE=	DOCS
 
 .if defined(EMACS_PORT_NAME)
-RUN_DEPENDS+=	${LOCALBASE}/bin/pymacs-services:${PORTSDIR}/devel/pymacs
+RUN_DEPENDS+=	${LOCALBASE}/bin/pymacs-services:devel/pymacs
 .endif
 
 post-install:
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 6ab66c4fbff9..6781e6252100 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -14,8 +14,8 @@ COMMENT?=	GNU binary tools
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:${PORTSDIR}/math/gmp \
-		${LOCALBASE}/lib/libmpfr.so:${PORTSDIR}/math/mpfr
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:math/gmp \
+		${LOCALBASE}/lib/libmpfr.so:math/mpfr
 
 CONFLICTS=	libbfd-[0-9]*
 
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index ee501c70b993..dfb8dea0579c 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Parser generator from FSF, (mostly) compatible with Yacc
 
-BUILD_DEPENDS=	m4>=1.4.16,1:${PORTSDIR}/devel/m4
-RUN_DEPENDS=	m4>=1.4.16,1:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	m4>=1.4.16,1:devel/m4
+RUN_DEPENDS=	m4>=1.4.16,1:devel/m4
 
 OPTIONS_DEFINE=	EXAMPLES NLS
 
diff --git a/devel/bisoncpp/Makefile b/devel/bisoncpp/Makefile
index a8bcec61bba5..f2546e404999 100644
--- a/devel/bisoncpp/Makefile
+++ b/devel/bisoncpp/Makefile
@@ -11,9 +11,9 @@ COMMENT=	LALR(1) parser generator that generates C++ classes
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
-		yodl>=3.0:${PORTSDIR}/textproc/yodl \
-		libbobcat>=3.18:${PORTSDIR}/devel/libbobcat
+BUILD_DEPENDS=	icmake:devel/icmake \
+		yodl>=3.0:textproc/yodl \
+		libbobcat>=3.18:devel/libbobcat
 
 DOCSDIR=	${PREFIX}/share/doc/bisonc++
 PORTDOCS=	*
diff --git a/devel/bncsutil-ghost++/Makefile b/devel/bncsutil-ghost++/Makefile
index ba2f1c701060..75ec002b5444 100644
--- a/devel/bncsutil-ghost++/Makefile
+++ b/devel/bncsutil-ghost++/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Utility library for Battle.net clients in C++
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 PROJECTHOST=	ghostplusplus
 PROJECTVERSION=	17.1
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 564493b1865f..b71452ad688d 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -19,7 +19,7 @@ LICENSE_NAME=	Boehm-Demers-Weiser Garbage Collector License
 LICENSE_TEXT=	License can be found at http://www.hboehm.info/gc/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops
+BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 
 GNU_CONFIGURE=	yes
 USES=		cpe libtool pathfix pkgconfig
@@ -41,7 +41,7 @@ PLIST_FILES=	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
 		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.0.3,} \
 		libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
-RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:${PORTSDIR}/devel/boehm-gc
+RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:devel/boehm-gc
 . if ${GC_VARIANT} == "redirect"
 CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc
 . endif
diff --git a/devel/boost-all/Makefile b/devel/boost-all/Makefile
index cd7975a86955..20afde0070e5 100644
--- a/devel/boost-all/Makefile
+++ b/devel/boost-all/Makefile
@@ -15,9 +15,9 @@ PYTHON_DESC=	Boost.Python - interfacing Python and C++
 
 .include "common.mk"
 
-LIBRARIES_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_thread.so:${PORTSDIR}/devel/boost-libs
-JAM_RUN_DEPENDS=	${LOCALBASE}/bin/bjam:${PORTSDIR}/devel/boost-jam
-PYTHON_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_python.so:${PORTSDIR}/devel/boost-python-libs
-DOCS_RUN_DEPENDS=	${LOCALBASE}/share/doc/boost/doc/html/index.html:${PORTSDIR}/devel/boost-docs
+LIBRARIES_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_thread.so:devel/boost-libs
+JAM_RUN_DEPENDS=	${LOCALBASE}/bin/bjam:devel/boost-jam
+PYTHON_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_python.so:devel/boost-python-libs
+DOCS_RUN_DEPENDS=	${LOCALBASE}/share/doc/boost/doc/html/index.html:devel/boost-docs
 
 .include <bsd.port.mk>
diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index 11cbe43a0ac5..9263ed7c2b4f 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	10
 
 COMMENT=	Free portable C++ libraries (without Boost.Python)
 
-BUILD_DEPENDS+=	bjam:${PORTSDIR}/devel/boost-jam
+BUILD_DEPENDS+=	bjam:devel/boost-jam
 
 OPTIONS_DEFINE=		VERBOSE_BUILD DEBUG OPTIMIZED_CFLAGS
 OPTIONS_MULTI=		LOCALE
@@ -19,7 +19,7 @@ ICU_DESC=		Boost.Regex/Locale with ICU unicode support
 ICONV_USES=		iconv
 ICONV_VARS=		BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX}
 ICONV_VARS_OFF=		BJAM_ARGS+=boost.locale.iconv=off
-ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_VARS=		BJAM_ARGS+=-sICU_PATH=${LOCALBASE}
 ICU_VARS_OFF=		BJAM_ARGS+=boost.locale.icu=off
 
diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile
index e09d3c30a6b5..4985a8ccdb03 100644
--- a/devel/boost-python-libs/Makefile
+++ b/devel/boost-python-libs/Makefile
@@ -18,9 +18,9 @@ MAKE_ENV+=	PYTHON_ROOT="${LOCALBASE}"\
 		PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\
 		PYTHON_LIB_PATH="${PYTHON_LIBDIR}"
 
-LIB_DEPENDS+=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS+=	libboost_thread.so:devel/boost-libs
 
-BUILD_DEPENDS+=	${BJAM}:${PORTSDIR}/devel/boost-jam
+BUILD_DEPENDS+=	${BJAM}:devel/boost-jam
 
 do-build:
 	@${ECHO_CMD} "using python : " ${PYTHON_VER} " : " ${PYTHON_CMD} " : " ${PYTHON_INCLUDEDIR} ";" >> ${WRKSRC}/tools/build/v2/site-config.jam
diff --git a/devel/boost_build/Makefile b/devel/boost_build/Makefile
index 49cb6b9c02ae..3dd58ec08ff1 100644
--- a/devel/boost_build/Makefile
+++ b/devel/boost_build/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extensible cross-platform build tool suite
 
 LICENSE=	BSL
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bjam:${PORTSDIR}/devel/boost-jam
+RUN_DEPENDS=	${LOCALBASE}/bin/bjam:devel/boost-jam
 
 USES=		tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME:S/_/-/g}
diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
index c34ca1477e52..24667c1d0332 100644
--- a/devel/bpython/Makefile
+++ b/devel/bpython/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Fancy interface to the Python interpreter
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:${PORTSDIR}/devel/py-curtsies \
-		${PYTHON_PKGNAMEPREFIX}greenlet>=0:${PORTSDIR}/devel/py-greenlet \
-		${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:devel/py-curtsies \
+		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet \
+		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six
 
 OPTIONS_DEFINE=	EXAMPLES NLS
 OPTIONS_SUB=	yes
diff --git a/devel/bsdowl/Makefile b/devel/bsdowl/Makefile
index 53b4f2a409f2..3b9bbfa823c8 100644
--- a/devel/bsdowl/Makefile
+++ b/devel/bsdowl/Makefile
@@ -14,8 +14,8 @@ LICENSE_NAME=	CeCILL B, Version 1.0
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	gm:${PORTSDIR}/graphics/GraphicsMagick
-BUILD_DEPENDS=	gm:${PORTSDIR}/graphics/GraphicsMagick
+BUILD_DEPENDS=	gm:graphics/GraphicsMagick
+BUILD_DEPENDS=	gm:graphics/GraphicsMagick
 
 USES=		tar:xz uidfix
 
diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile
index e8b8cc390a2c..9bcfcea3eaa6 100644
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@@ -12,18 +12,18 @@ LICENSE=	MPL
 
 # see Bugzilla/Install/Requirements.pm
 RUN_DEPENDS=	\
-		p5-CGI>=3.51:${PORTSDIR}/www/p5-CGI \
-		p5-DBI>=1.614:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime-TimeZone>=1.64:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-DateTime>=0.75:${PORTSDIR}/devel/p5-DateTime \
-		p5-Email-MIME>=1.904:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Send>=2.04:${PORTSDIR}/mail/p5-Email-Send \
-		p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
-		p5-List-MoreUtils>=0.32:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Math-Random-ISAAC>=1.001:${PORTSDIR}/math/p5-Math-Random-ISAAC \
-		p5-Template-Toolkit>=2.24:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-TimeDate>=2.23:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=1.55:${PORTSDIR}/net/p5-URI
+		p5-CGI>=3.51:www/p5-CGI \
+		p5-DBI>=1.614:databases/p5-DBI \
+		p5-DateTime-TimeZone>=1.64:devel/p5-DateTime-TimeZone \
+		p5-DateTime>=0.75:devel/p5-DateTime \
+		p5-Email-MIME>=1.904:mail/p5-Email-MIME \
+		p5-Email-Send>=2.04:mail/p5-Email-Send \
+		p5-Encode-Detect>=0:converters/p5-Encode-Detect \
+		p5-List-MoreUtils>=0.32:lang/p5-List-MoreUtils \
+		p5-Math-Random-ISAAC>=1.001:math/p5-Math-Random-ISAAC \
+		p5-Template-Toolkit>=2.24:www/p5-Template-Toolkit \
+		p5-TimeDate>=2.23:devel/p5-TimeDate \
+		p5-URI>=1.55:net/p5-URI
 
 USES=		cpe perl5
 USE_PERL5=	run
@@ -44,9 +44,9 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} >= 501800
 # PR 194782: silence Module::Pluggable deprecated warnings
-RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:${PORTSDIR}/devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
 # PR 196060,196100: explicitly depend on textproc/p5-Text-Tabv
-RUN_DEPENDS+=	p5-Text-Tabs+Wrap>=2013.0523:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+RUN_DEPENDS+=	p5-Text-Tabs+Wrap>=2013.0523:textproc/p5-Text-Tabs+Wrap
 .endif
 
 .if ${PORT_OPTIONS:MMODPERL}
@@ -55,113 +55,113 @@ USE_APACHE_RUN=	22+
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
-RUN_DEPENDS+=	p5-DBD-Pg>=3.4.2:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
-RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:${PORTSDIR}/databases/p5-DBD-SQLite \
-		sqlite3>=3:${PORTSDIR}/databases/sqlite3
+RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
+		sqlite3>=3:databases/sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MGRAPH_REPORTS}
-RUN_DEPENDS+=	p5-GD>=1.20:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil \
-		p5-Template-GD>=0:${PORTSDIR}/www/p5-Template-GD
+RUN_DEPENDS+=	p5-GD>=1.20:graphics/p5-GD \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \
+		p5-Template-GD>=0:www/p5-Template-GD
 .endif
 
 .if ${PORT_OPTIONS:MCHARTING_MODULES}
-RUN_DEPENDS+=	p5-Chart>=2.4.10:${PORTSDIR}/graphics/p5-Chart
+RUN_DEPENDS+=	p5-Chart>=2.4.10:graphics/p5-Chart
 .endif
 
 .if ${PORT_OPTIONS:MPATCH_VIEWER}
-RUN_DEPENDS+=	p5-PatchReader>=0.9.6:${PORTSDIR}/devel/p5-PatchReader \
-		interdiff:${PORTSDIR}/misc/patchutils
+RUN_DEPENDS+=	p5-PatchReader>=0.9.6:devel/p5-PatchReader \
+		interdiff:misc/patchutils
 .endif
 
 .if ${PORT_OPTIONS:MMORE_HTML}
-RUN_DEPENDS+=	p5-HTML-Parser>=3.67:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber
+RUN_DEPENDS+=	p5-HTML-Parser>=3.67:www/p5-HTML-Parser \
+		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber
 .endif
 
 .if ${PORT_OPTIONS:MINBOUND_EMAIL}
-RUN_DEPENDS+=	p5-Email-MIME-Attachment-Stripper>=0:${PORTSDIR}/mail/p5-Email-MIME-Attachment-Stripper \
-		p5-Email-Reply>=0:${PORTSDIR}/mail/p5-Email-Reply \
-		p5-HTML-FormatText-WithLinks>=0.13:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks
+RUN_DEPENDS+=	p5-Email-MIME-Attachment-Stripper>=0:mail/p5-Email-MIME-Attachment-Stripper \
+		p5-Email-Reply>=0:mail/p5-Email-Reply \
+		p5-HTML-FormatText-WithLinks>=0.13:textproc/p5-HTML-FormatText-WithLinks
 .endif
 
 .if ${PORT_OPTIONS:MMAIL_QUEUEING}
-RUN_DEPENDS+=	p5-TheSchwartz>=1.10:${PORTSDIR}/devel/p5-TheSchwartz \
-		p5-Daemon-Generic>=0:${PORTSDIR}/net/p5-Daemon-Generic \
-		p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp
+RUN_DEPENDS+=	p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
+		p5-Daemon-Generic>=0:net/p5-Daemon-Generic \
+		p5-File-Slurp>=9999.13:devel/p5-File-Slurp
 .endif
 
 .if ${PORT_OPTIONS:MMOVE_BUGZ}
-RUN_DEPENDS+=	p5-MIME-Tools>=5.406:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS+=	p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 .endif
 
 .if ${PORT_OPTIONS:MBMP2PNG}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .endif
 
 # Note: XML-RPC and JSON-RPC are deprecated in favor of REST
 # and will likely be removed in the Bugzilla 7.0 release.
 .if ${PORT_OPTIONS:MXMLRPC} || ${PORT_OPTIONS:MJSONRPC}
-RUN_DEPENDS+=	p5-Test-Taint>=1.06:${PORTSDIR}/devel/p5-Test-Taint
+RUN_DEPENDS+=	p5-Test-Taint>=1.06:devel/p5-Test-Taint
 .endif
 
 .if ${PORT_OPTIONS:MXMLRPC}
-RUN_DEPENDS+=	p5-XMLRPC-Lite>=0.712:${PORTSDIR}/net/p5-XMLRPC-Lite
+RUN_DEPENDS+=	p5-XMLRPC-Lite>=0.712:net/p5-XMLRPC-Lite
 # XXX SOAP::Lite can be removed if upstream officially depends on
 # XMLRPC::Lite>=0.717, see Bugzilla/Install/Requirements.pm
-RUN_DEPENDS+=	p5-SOAP-Lite>=0.712:${PORTSDIR}/net/p5-SOAP-Lite
+RUN_DEPENDS+=	p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite
 .endif
 
 .if ${PORT_OPTIONS:MJSONRPC}
-RUN_DEPENDS+=	p5-JSON-RPC>=0:${PORTSDIR}/devel/p5-JSON-RPC \
-		p5-JSON-XS>=2.0:${PORTSDIR}/converters/p5-JSON-XS
+RUN_DEPENDS+=	p5-JSON-RPC>=0:devel/p5-JSON-RPC \
+		p5-JSON-XS>=2.0:converters/p5-JSON-XS
 .endif
 
 .if ${PORT_OPTIONS:MMODPERL}
-RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+		p5-Apache-DBI>=0:www/p5-Apache-DBI
 .endif
 
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+=	dot:graphics/graphviz
 .endif
 
 .if ${PORT_OPTIONS:MEXPORT_IMPORT}
-RUN_DEPENDS+=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS+=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS+=	p5-perl-ldap>=0:net/p5-perl-ldap
 .endif
 
 .if ${PORT_OPTIONS:MRADIUS}
-RUN_DEPENDS+=	p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
+RUN_DEPENDS+=	p5-Authen-Radius>=0:security/p5-Authen-Radius
 .endif
 
 .if ${PORT_OPTIONS:MSMTP_AUTH}
-RUN_DEPENDS+=	p5-Authen-SASL>=2.16:${PORTSDIR}/security/p5-Authen-SASL
+RUN_DEPENDS+=	p5-Authen-SASL>=2.16:security/p5-Authen-SASL
 .endif
 
 .if ${PORT_OPTIONS:MSMTP_SSL}
-RUN_DEPENDS+=	p5-Net-SMTP-SSL>=1.01:${PORTSDIR}/mail/p5-Net-SMTP-SSL
+RUN_DEPENDS+=	p5-Net-SMTP-SSL>=1.01:mail/p5-Net-SMTP-SSL
 .endif
 
 .if ${PORT_OPTIONS:MMIME_SNIFF}
-RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy
+RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
+		p5-IO-stringy>=2.110:devel/p5-IO-stringy
 .endif
 
 post-extract:
diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile
index afa28faa0b80..f210b10761f5 100644
--- a/devel/bugzilla50/Makefile
+++ b/devel/bugzilla50/Makefile
@@ -13,20 +13,20 @@ LICENSE=	MPL
 
 # see Bugzilla/Install/Requirements.pm
 RUN_DEPENDS=	\
-		p5-CGI>=3.51:${PORTSDIR}/www/p5-CGI \
-		p5-DBI>=1.614:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime-TimeZone>=1.64:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-DateTime>=0.75:${PORTSDIR}/devel/p5-DateTime \
-		p5-Email-MIME>=1.904:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Sender>=1.300011:${PORTSDIR}/mail/p5-Email-Sender \
-		p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
-		p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-JSON-XS>=2.01:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-List-MoreUtils>=0.32:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Math-Random-ISAAC>=1.001:${PORTSDIR}/math/p5-Math-Random-ISAAC \
-		p5-Template-Toolkit>=2.24:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-TimeDate>=2.23:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=1.55:${PORTSDIR}/net/p5-URI
+		p5-CGI>=3.51:www/p5-CGI \
+		p5-DBI>=1.614:databases/p5-DBI \
+		p5-DateTime-TimeZone>=1.64:devel/p5-DateTime-TimeZone \
+		p5-DateTime>=0.75:devel/p5-DateTime \
+		p5-Email-MIME>=1.904:mail/p5-Email-MIME \
+		p5-Email-Sender>=1.300011:mail/p5-Email-Sender \
+		p5-Encode-Detect>=0:converters/p5-Encode-Detect \
+		p5-File-Slurp>=9999.13:devel/p5-File-Slurp \
+		p5-JSON-XS>=2.01:converters/p5-JSON-XS \
+		p5-List-MoreUtils>=0.32:lang/p5-List-MoreUtils \
+		p5-Math-Random-ISAAC>=1.001:math/p5-Math-Random-ISAAC \
+		p5-Template-Toolkit>=2.24:www/p5-Template-Toolkit \
+		p5-TimeDate>=2.23:devel/p5-TimeDate \
+		p5-URI>=1.55:net/p5-URI
 
 USES=		cpe perl5
 USE_PERL5=	run
@@ -47,9 +47,9 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} >= 501800
 # PR 194782: silence Module::Pluggable deprecated warnings
-RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:${PORTSDIR}/devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
 # PR 196060,196100: explicitly depend on textproc/p5-Text-Tabv
-RUN_DEPENDS+=	p5-Text-Tabs+Wrap>=2013.0523:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+RUN_DEPENDS+=	p5-Text-Tabs+Wrap>=2013.0523:textproc/p5-Text-Tabs+Wrap
 .endif
 
 .if ${PORT_OPTIONS:MMODPERL}
@@ -58,115 +58,115 @@ USE_APACHE_RUN=	22+
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql:91+
-RUN_DEPENDS+=	p5-DBD-Pg>=3.4.2:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
-RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:${PORTSDIR}/databases/p5-DBD-SQLite \
-		sqlite3>=3:${PORTSDIR}/databases/sqlite3
+RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
+		sqlite3>=3:databases/sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MGRAPH_REPORTS}
-RUN_DEPENDS+=	p5-GD>=1.20:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil \
-		p5-Template-GD>=0:${PORTSDIR}/www/p5-Template-GD
+RUN_DEPENDS+=	p5-GD>=1.20:graphics/p5-GD \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \
+		p5-Template-GD>=0:www/p5-Template-GD
 .endif
 
 .if ${PORT_OPTIONS:MCHARTING_MODULES}
-RUN_DEPENDS+=	p5-Chart>=2.4.10:${PORTSDIR}/graphics/p5-Chart
+RUN_DEPENDS+=	p5-Chart>=2.4.10:graphics/p5-Chart
 .endif
 
 .if ${PORT_OPTIONS:MPATCH_VIEWER}
-RUN_DEPENDS+=	p5-PatchReader>=0.9.6:${PORTSDIR}/devel/p5-PatchReader \
-		interdiff:${PORTSDIR}/misc/patchutils
+RUN_DEPENDS+=	p5-PatchReader>=0.9.6:devel/p5-PatchReader \
+		interdiff:misc/patchutils
 .endif
 
 .if ${PORT_OPTIONS:MMORE_HTML}
-RUN_DEPENDS+=	p5-HTML-Parser>=3.67:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber
+RUN_DEPENDS+=	p5-HTML-Parser>=3.67:www/p5-HTML-Parser \
+		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber
 .endif
 
 .if ${PORT_OPTIONS:MINBOUND_EMAIL}
-RUN_DEPENDS+=	p5-Email-MIME-Attachment-Stripper>=0:${PORTSDIR}/mail/p5-Email-MIME-Attachment-Stripper \
-		p5-Email-Reply>=0:${PORTSDIR}/mail/p5-Email-Reply \
-		p5-HTML-FormatText-WithLinks>=0.13:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks
+RUN_DEPENDS+=	p5-Email-MIME-Attachment-Stripper>=0:mail/p5-Email-MIME-Attachment-Stripper \
+		p5-Email-Reply>=0:mail/p5-Email-Reply \
+		p5-HTML-FormatText-WithLinks>=0.13:textproc/p5-HTML-FormatText-WithLinks
 .endif
 
 .if ${PORT_OPTIONS:MMAIL_QUEUEING}
-RUN_DEPENDS+=	p5-TheSchwartz>=1.10:${PORTSDIR}/devel/p5-TheSchwartz \
-		p5-Daemon-Generic>=0:${PORTSDIR}/net/p5-Daemon-Generic
+RUN_DEPENDS+=	p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
+		p5-Daemon-Generic>=0:net/p5-Daemon-Generic
 .endif
 
 .if ${PORT_OPTIONS:MMOVE_BUGZ}
-RUN_DEPENDS+=	p5-MIME-Tools>=5.406:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS+=	p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 .endif
 
 .if ${PORT_OPTIONS:MBMP2PNG}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .endif
 
 # Note: XML-RPC and JSON-RPC are deprecated in favor of REST
 # and will likely be removed in the Bugzilla 7.0 release.
 .if ${PORT_OPTIONS:MXMLRPC} || ${PORT_OPTIONS:MJSONRPC} || ${PORT_OPTIONS:MREST}
-RUN_DEPENDS+=	p5-Test-Taint>=1.06:${PORTSDIR}/devel/p5-Test-Taint
+RUN_DEPENDS+=	p5-Test-Taint>=1.06:devel/p5-Test-Taint
 .endif
 
 .if ${PORT_OPTIONS:MXMLRPC}
-RUN_DEPENDS+=	p5-XMLRPC-Lite>=0.712:${PORTSDIR}/net/p5-XMLRPC-Lite
+RUN_DEPENDS+=	p5-XMLRPC-Lite>=0.712:net/p5-XMLRPC-Lite
 # XXX SOAP::Lite can be removed if upstream officially depends on
 # XMLRPC::Lite>=0.717, see Bugzilla/Install/Requirements.pm
-RUN_DEPENDS+=	p5-SOAP-Lite>=0.712:${PORTSDIR}/net/p5-SOAP-Lite
+RUN_DEPENDS+=	p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite
 .endif
 
 .if ${PORT_OPTIONS:MJSONRPC} || ${PORT_OPTIONS:MREST}
-RUN_DEPENDS+=	p5-JSON-RPC>=0:${PORTSDIR}/devel/p5-JSON-RPC
+RUN_DEPENDS+=	p5-JSON-RPC>=0:devel/p5-JSON-RPC
 .endif
 
 .if ${PORT_OPTIONS:MMODPERL}
-RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+		p5-Apache-DBI>=0:www/p5-Apache-DBI
 .endif
 
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+=	dot:graphics/graphviz
 .endif
 
 .if ${PORT_OPTIONS:MEXPORT_IMPORT}
-RUN_DEPENDS+=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS+=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS+=	p5-perl-ldap>=0:net/p5-perl-ldap
 .endif
 
 .if ${PORT_OPTIONS:MRADIUS}
-RUN_DEPENDS+=	p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
+RUN_DEPENDS+=	p5-Authen-Radius>=0:security/p5-Authen-Radius
 .endif
 
 .if ${PORT_OPTIONS:MSMTP_AUTH}
-RUN_DEPENDS+=	p5-Authen-SASL>=2.16:${PORTSDIR}/security/p5-Authen-SASL
+RUN_DEPENDS+=	p5-Authen-SASL>=2.16:security/p5-Authen-SASL
 .endif
 
 .if ${PORT_OPTIONS:MSMTP_SSL}
-RUN_DEPENDS+=	p5-Net-SMTP-SSL>=1.01:${PORTSDIR}/mail/p5-Net-SMTP-SSL
+RUN_DEPENDS+=	p5-Net-SMTP-SSL>=1.01:mail/p5-Net-SMTP-SSL
 .endif
 
 .if ${PORT_OPTIONS:MMIME_SNIFF}
-RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy
+RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
+		p5-IO-stringy>=2.110:devel/p5-IO-stringy
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
-RUN_DEPENDS+=	p5-Cache-Memcached>=1.30:${PORTSDIR}/databases/p5-Cache-Memcached
+RUN_DEPENDS+=	p5-Cache-Memcached>=1.30:databases/p5-Cache-Memcached
 .endif
 
 post-extract:
diff --git a/devel/build/Makefile b/devel/build/Makefile
index 465ae92f91e3..711be8c80f28 100644
--- a/devel/build/Makefile
+++ b/devel/build/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Massively-parallel build system implemented on top of GNU make
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake tar:bzip2
diff --git a/devel/buildbot-slave/Makefile b/devel/buildbot-slave/Makefile
index 621d33769975..a7ae475f82b8 100644
--- a/devel/buildbot-slave/Makefile
+++ b/devel/buildbot-slave/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Continuous Integration Framework (Slave)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=8.0.0:${PORTSDIR}/devel/py-twisted
-TEST_DEPENDS=	trial:${PORTSDIR}/devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=8.0.0:devel/py-twisted
+TEST_DEPENDS=	trial:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/buildbot/Makefile b/devel/buildbot/Makefile
index ff4331217d20..bf86972ad689 100644
--- a/devel/buildbot/Makefile
+++ b/devel/buildbot/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Continuous Integration Framework (Master)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=11.0.0:${PORTSDIR}/devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:${PORTSDIR}/databases/py-sqlalchemy-migrate \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-TEST_DEPENDS=	trial:${PORTSDIR}/devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}boto>0:${PORTSDIR}/devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}txrequests>0:${PORTSDIR}/www/py-txrequests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=11.0.0:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+TEST_DEPENDS=	trial:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
+		${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/buildtool-doc/Makefile b/devel/buildtool-doc/Makefile
index 8d80f60eec4f..1cd124534029 100644
--- a/devel/buildtool-doc/Makefile
+++ b/devel/buildtool-doc/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	SF/buildtool/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Buildtool User's and Developer's manuals
 
-BUILD_DEPENDS=	${BUILDTOOL}:${PORTSDIR}/devel/buildtool \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		xmlcatalog:${PORTSDIR}/textproc/libxml2 \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		${DOCBOOK_XSL}:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	${BUILDTOOL}:devel/buildtool \
+		xsltproc:textproc/libxslt \
+		xmlcatalog:textproc/libxml2 \
+		docbook-xml>0:textproc/docbook-xml \
+		${DOCBOOK_XSL}:textproc/docbook-xsl
 
 BUILDTOOL=	${LOCALBASE}/bin/buildtool
 CONFIGURE_ARGS=	--prefix=${STAGEDIR}${PREFIX} --dir-doc=${STAGEDIR}${DOCSDIR} \
diff --git a/devel/busybee/Makefile b/devel/busybee/Makefile
index 07c11f5cb184..53445bbe7286 100644
--- a/devel/busybee/Makefile
+++ b/devel/busybee/Makefile
@@ -11,8 +11,8 @@ COMMENT=	High-performance messaging layer
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libe.so:${PORTSDIR}/devel/libe
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libpo6.pc:${PORTSDIR}/devel/libpo6
+LIB_DEPENDS=	libe.so:devel/libe
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libpo6.pc:devel/libpo6
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/bzr-builder/Makefile b/devel/bzr-builder/Makefile
index 0f9ab86a4c23..f344fbcaa2a0 100644
--- a/devel/bzr-builder/Makefile
+++ b/devel/bzr-builder/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Bzr plugin to construct a bzr branch based on a "recipe"
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-colo/Makefile b/devel/bzr-colo/Makefile
index e93d54942779..589434a8f8e9 100644
--- a/devel/bzr-colo/Makefile
+++ b/devel/bzr-colo/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Plugin for bzr to support colocated branches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index 4f3b7db42547..d50479faede2 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Desktop application for using bzr
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:${PORTSDIR}/devel/qbzr \
-		bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:devel/qbzr \
+		bzr:devel/bzr
 
 USES=		gettext python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/bzr-externals/Makefile b/devel/bzr-externals/Makefile
index 3895af8e85fd..1ec19fe34216 100644
--- a/devel/bzr-externals/Makefile
+++ b/devel/bzr-externals/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Support external branches like svn:externals
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/externals
 
diff --git a/devel/bzr-fastimport/Makefile b/devel/bzr-fastimport/Makefile
index b8940ced5214..6cbec84116ac 100644
--- a/devel/bzr-fastimport/Makefile
+++ b/devel/bzr-fastimport/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Provide fast loading of revision control data into bzr
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_SITELIBDIR}/fastimport/__init__.py:${PORTSDIR}/devel/py-fastimport
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr \
+		${PYTHON_SITELIBDIR}/fastimport/__init__.py:devel/py-fastimport
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-git/Makefile b/devel/bzr-git/Makefile
index 8371d449c65b..87a40b2949c3 100644
--- a/devel/bzr-git/Makefile
+++ b/devel/bzr-git/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Plugin for bzr to work with git trees
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:${PORTSDIR}/devel/dulwich \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr \
+		${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:devel/dulwich \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 7809be1059ab..11ed4347dd43 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -13,9 +13,9 @@ COMMENT=	GTK interface to Bazaar-NG VCS
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_PKGNAMEPREFIX}cairo>=0:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr \
+		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo
 
 
 USES=		desktop-file-utils python
diff --git a/devel/bzr-loom/Makefile b/devel/bzr-loom/Makefile
index a734d5db51cc..54277ee22d61 100644
--- a/devel/bzr-loom/Makefile
+++ b/devel/bzr-loom/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Bazaar plugin to assist in developing focused patches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-pipeline/Makefile b/devel/bzr-pipeline/Makefile
index 3baa5ffb1a12..0689cf5776a4 100644
--- a/devel/bzr-pipeline/Makefile
+++ b/devel/bzr-pipeline/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Bzr tools for working with a sequence of branches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/bzr-rewrite/Makefile b/devel/bzr-rewrite/Makefile
index 88c2d5b39d31..9f3dbc26738f 100644
--- a/devel/bzr-rewrite/Makefile
+++ b/devel/bzr-rewrite/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Bzr plugin that provides rewriting existing revisions
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-scmproj/Makefile b/devel/bzr-scmproj/Makefile
index c3714100aaed..e39fb794a351 100644
--- a/devel/bzr-scmproj/Makefile
+++ b/devel/bzr-scmproj/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Organise and manage a collection of bzr branches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/bzr-stats/Makefile b/devel/bzr-stats/Makefile
index 5064dc09d1d8..8d3637164a21 100644
--- a/devel/bzr-stats/Makefile
+++ b/devel/bzr-stats/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://launchpadlibrarian.net/65203347/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple statistics plugin for bzr
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 LICENSE=	GPLv2
 
diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index 4a2f28615540..5e308db668c8 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Plugin for bzr to work with svn
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/subvertpy/__init__.py:${PORTSDIR}/devel/py-subvertpy \
-		bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS+=	bzr:devel/bzr
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/subvertpy/__init__.py:devel/py-subvertpy \
+		bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
diff --git a/devel/bzr-upload/Makefile b/devel/bzr-upload/Makefile
index ac21eaf5f081..9adeec085f16 100644
--- a/devel/bzr-upload/Makefile
+++ b/devel/bzr-upload/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bzr plugin to incrementally upload changes to a dumb server
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index da3c62043354..8a413f248300 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -11,15 +11,15 @@ MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Distributed version control system by Canonical
 
 # Often not needed, but it's cheap insurance
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython:lang/cython
 
 OPTIONS_DEFINE=	SFTP CA_BUNDLE
 SFTP_DESC=	Paramiko for SFTP support
 CA_BUNDLE_DESC=	Include CA bundle for SSL cert validation
 OPTIONS_DEFAULT=	SFTP CA_BUNDLE
 
-SFTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=0:${PORTSDIR}/security/py-paramiko
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+SFTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	bzr
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index 772f203f0767..3d7204bdd518 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extensions to devel/bzr
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 OPTIONS_DEFINE=	GRAPHVIZ RSYNC
 GRAPHVIZ_DESC=	graphviz for graph-ancestry
@@ -23,7 +23,7 @@ USES=		python
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	BzrTools
 
-GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
-RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
+RSYNC_RUN_DEPENDS=	rsync:net/rsync
 
 .include <bsd.port.mk>
diff --git a/devel/c2mdoc/Makefile b/devel/c2mdoc/Makefile
index 58f5067504ec..e7efe7bf3bd4 100644
--- a/devel/c2mdoc/Makefile
+++ b/devel/c2mdoc/Makefile
@@ -11,7 +11,7 @@ DISTFILES=
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Script to generate mdoc(7) markup from C functions
 
-RUN_DEPENDS=	cproto:${PORTSDIR}/devel/cproto
+RUN_DEPENDS=	cproto:devel/cproto
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/caf/Makefile b/devel/caf/Makefile
index 38e95b13df01..2ba26ddcd1b9 100644
--- a/devel/caf/Makefile
+++ b/devel/caf/Makefile
@@ -56,8 +56,8 @@ regression-test: test
 
 .if ${OSVERSION} < 1001000
 # require clang & libc++
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 \
-		${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:lang/clang34 \
+		${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
 CXXFLAGS+=	-stdlib=libc++ -I${LOCALBASE}/include/c++/v1 -L${LOCALBASE}/lib
 .endif
 
diff --git a/devel/cargo/Makefile b/devel/cargo/Makefile
index 36ca63b98989..cb2fd5c867b5 100644
--- a/devel/cargo/Makefile
+++ b/devel/cargo/Makefile
@@ -56,11 +56,11 @@ CARGO_REGISTRY_CUR_HASH=	88ac128001ac3a9a
 
 # We don't USES=cmake here, because cmake is not Cargo's build system.
 # It's used by a bundled dependency (libgit2).
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake \
-		${RUST_PORT:T}>=1.5.0:${PORTSDIR}/${RUST_PORT}
-LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	rustc:${PORTSDIR}/${RUST_PORT}
+BUILD_DEPENDS=	cmake:devel/cmake \
+		${RUST_PORT:T}>=1.5.0:${RUST_PORT}
+LIB_DEPENDS=	libssh2.so:security/libssh2 \
+		libcurl.so:ftp/curl
+RUN_DEPENDS=	rustc:${RUST_PORT}
 RUST_PORT?=	lang/rust
 
 USES=		gmake python:-2.7,build pkgconfig
diff --git a/devel/catch/Makefile b/devel/catch/Makefile
index d681a256a126..f203ca837943 100644
--- a/devel/catch/Makefile
+++ b/devel/catch/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Header-only test framework for C++
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
-TEST_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
+TEST_DEPENDS=	cmake:devel/cmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	philsquared
diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 1a8c9bb0856d..4d35f485bfd3 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical front end for cscope and cscope clones
 
-RUN_DEPENDS=	cscope:${PORTSDIR}/devel/cscope
+RUN_DEPENDS=	cscope:devel/cscope
 
 USES+=		tk:run
 NO_BUILD=	yes
diff --git a/devel/ccons/Makefile b/devel/ccons/Makefile
index 658e55a45178..62ae6672b7f5 100644
--- a/devel/ccons/Makefile
+++ b/devel/ccons/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Interactive Console for the C Programming Language
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	llvm-config33:${PORTSDIR}/devel/llvm33 \
-		clang++33:${PORTSDIR}/lang/clang33
-RUN_DEPENDS=	clang++33:${PORTSDIR}/lang/clang33
-LIB_DEPENDS=	libncurses.so:${PORTSDIR}/devel/ncurses
+BUILD_DEPENDS=	llvm-config33:devel/llvm33 \
+		clang++33:lang/clang33
+RUN_DEPENDS=	clang++33:lang/clang33
+LIB_DEPENDS=	libncurses.so:devel/ncurses
 
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		cmake libedit
diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile
index 1e461773c9de..8c27fb17fbec 100644
--- a/devel/ccrtp/Makefile
+++ b/devel/ccrtp/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Implementation of the real-time transport protocol
 
-LIB_DEPENDS=	libcommoncpp.so:${PORTSDIR}/devel/ucommon \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libcommoncpp.so:devel/ucommon \
+		libgcrypt.so:security/libgcrypt
 
 GNU_CONFIGURE=	yes
 USES=		gmake gettext libtool iconv pkgconfig
diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index 927a144829d9..45135de0eca6 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Curses-based interface to the GNU Debugger
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	help2man:misc/help2man
 
 USES=		makeinfo readline
 
diff --git a/devel/cgprof/Makefile b/devel/cgprof/Makefile
index ebc5d56122ef..8df1a5338620 100644
--- a/devel/cgprof/Makefile
+++ b/devel/cgprof/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://mvertes.free.fr/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates colored graphs for profiled executables using gcc and gprof
 
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
-		dotty:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	gawk:lang/gawk \
+		dotty:graphics/graphviz
 
 NO_BUILD=	yes
 MAKE_ENV=	prefix=${PREFIX}
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index aafa11ff6051..9ae6926f8d40 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java Windowing Toolkit for Text Terminals
 
-BUILD_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
-RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
+BUILD_DEPENDS=	gmake:devel/gmake
+RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/cheritrace-devel/Makefile b/devel/cheritrace-devel/Makefile
index 5ef1f00998ef..010087c51aed 100644
--- a/devel/cheritrace-devel/Makefile
+++ b/devel/cheritrace-devel/Makefile
@@ -13,8 +13,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-CHERI
 GH_TAGNAME=	a7ddf11
 
-BUILD_DEPENDS+=	llvm-config-cheri:${PORTSDIR}/devel/llvm-cheri
-LIB_DEPENDS+=	libLLVMCore.so:${PORTSDIR}/devel/llvm-cheri
+BUILD_DEPENDS+=	llvm-config-cheri:devel/llvm-cheri
+LIB_DEPENDS+=	libLLVMCore.so:devel/llvm-cheri
 
 CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config-cheri
 
diff --git a/devel/cherivis-devel/Makefile b/devel/cherivis-devel/Makefile
index 1ca8b1d09b44..e94b74944b08 100644
--- a/devel/cherivis-devel/Makefile
+++ b/devel/cherivis-devel/Makefile
@@ -17,7 +17,7 @@ GH_ACCOUNT=	CTSRD-CHERI
 GH_PROJECT=	CheriVis
 GH_TAGNAME=	98c6c04
 
-LIB_DEPENDS+=	libcheritrace.so:${PORTSDIR}/devel/cheritrace-devel
+LIB_DEPENDS+=	libcheritrace.so:devel/cheritrace-devel
 
 USE_GNUSTEP=		back build
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
diff --git a/devel/chruby/Makefile b/devel/chruby/Makefile
index 1e6bc80a6913..b1c21808b575 100644
--- a/devel/chruby/Makefile
+++ b/devel/chruby/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Changes the current Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 PLIST_FILES=	bin/chruby-exec share/chruby/auto.sh share/chruby/chruby.sh
 
diff --git a/devel/cl-alexandria-sbcl/Makefile b/devel/cl-alexandria-sbcl/Makefile
index 17a56e1a143a..11d380641212 100644
--- a/devel/cl-alexandria-sbcl/Makefile
+++ b/devel/cl-alexandria-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Collection of portable public domain utilities for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:${PORTSDIR}/devel/cl-alexandria
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:${PORTSDIR}/devel/cl-alexandria
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-asdf/bsd.cl-asdf.mk b/devel/cl-asdf/bsd.cl-asdf.mk
index 57370b4b32aa..2437cd690f45 100644
--- a/devel/cl-asdf/bsd.cl-asdf.mk
+++ b/devel/cl-asdf/bsd.cl-asdf.mk
@@ -50,19 +50,19 @@ USE_CLISP=	yes
 .endif # defined(FASL_TARGET)
 
 .if defined(USE_SBCL)
-BUILD_DEPENDS+=	sbcl:${PORTSDIR}/lang/sbcl
-RUN_DEPENDS+=	sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS+=	sbcl:lang/sbcl
+RUN_DEPENDS+=	sbcl:lang/sbcl
 .elif defined(USE_CLISP)
-BUILD_DEPENDS+=	clisp:${PORTSDIR}/lang/clisp
-RUN_DEPENDS+=	clisp:${PORTSDIR}/lang/clisp
+BUILD_DEPENDS+=	clisp:lang/clisp
+RUN_DEPENDS+=	clisp:lang/clisp
 .endif # defined(USE_CLISP)
 
 .if defined(USE_ASDF)
 # Even if the Common Lisp compiler already has a bundled ASDF framework,
 # we still need the asdf-init file.
 
-BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-asdf
-RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-asdf
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
 
 .endif # defined(USE_ASDF)
 
@@ -70,8 +70,8 @@ RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-a
 .if defined(USE_SBCL)
 # SBCL already has a bundled ASDF framework
 .elif defined(USE_CLISP)
-BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp
-RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:devel/cl-asdf-clisp
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:devel/cl-asdf-clisp
 .endif # defined(USE_CLISP)
 .endif # defined(USE_ASDF_FASL)
 
diff --git a/devel/cl-cffi-sbcl/Makefile b/devel/cl-cffi-sbcl/Makefile
index 5e292affb2ca..cf98f39e1561 100644
--- a/devel/cl-cffi-sbcl/Makefile
+++ b/devel/cl-cffi-sbcl/Makefile
@@ -9,10 +9,10 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable foreign function interface for Common Lisp
 
-BUILD_DEPENDS=	cl-cffi>=0:${PORTSDIR}/devel/cl-cffi \
-		cl-alexandria-sbcl>=0:${PORTSDIR}/devel/cl-alexandria-sbcl \
-		cl-trivial-features-sbcl>=0:${PORTSDIR}/devel/cl-trivial-features-sbcl \
-		cl-babel-sbcl>=0:${PORTSDIR}/converters/cl-babel-sbcl
+BUILD_DEPENDS=	cl-cffi>=0:devel/cl-cffi \
+		cl-alexandria-sbcl>=0:devel/cl-alexandria-sbcl \
+		cl-trivial-features-sbcl>=0:devel/cl-trivial-features-sbcl \
+		cl-babel-sbcl>=0:converters/cl-babel-sbcl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_ASDF_FASL=	yes
diff --git a/devel/cl-cffi/Makefile b/devel/cl-cffi/Makefile
index 1f5402f11666..48d848227a5b 100644
--- a/devel/cl-cffi/Makefile
+++ b/devel/cl-cffi/Makefile
@@ -20,9 +20,9 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable foreign function interface for Common Lisp
 
-BUILD_DEPENDS=	cl-alexandria>=0:${PORTSDIR}/devel/cl-alexandria \
-		cl-trivial-features>=0:${PORTSDIR}/devel/cl-trivial-features \
-		cl-babel>=0:${PORTSDIR}/converters/cl-babel
+BUILD_DEPENDS=	cl-alexandria>=0:devel/cl-alexandria \
+		cl-trivial-features>=0:devel/cl-trivial-features \
+		cl-babel>=0:converters/cl-babel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile
index 51578bd39c4b..d8e33072b228 100644
--- a/devel/cl-infix-sbcl/Makefile
+++ b/devel/cl-infix-sbcl/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Lisp macro to read math statements in infix notation
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:${PORTSDIR}/devel/cl-infix
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:${PORTSDIR}/devel/cl-infix
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:devel/cl-infix
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:devel/cl-infix
 
 NO_CDROM=	No fees or compensation can be charged
 
diff --git a/devel/cl-port-sbcl/Makefile b/devel/cl-port-sbcl/Makefile
index 84d429c0aed3..631799faa1f9 100644
--- a/devel/cl-port-sbcl/Makefile
+++ b/devel/cl-port-sbcl/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Cross-Lisp portability package
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:devel/cl-port
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:devel/cl-port
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-split-sequence-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile
index 70b4210a6b5a..3ae45da4295d 100644
--- a/devel/cl-split-sequence-sbcl/Makefile
+++ b/devel/cl-split-sequence-sbcl/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Partitioning Common Lisp sequences
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:devel/cl-split-sequence
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:devel/cl-split-sequence
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-trivial-features-sbcl/Makefile b/devel/cl-trivial-features-sbcl/Makefile
index e949f3417761..b472016dcee3 100644
--- a/devel/cl-trivial-features-sbcl/Makefile
+++ b/devel/cl-trivial-features-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Ensures consistent *FEATURES* in Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:${PORTSDIR}/devel/cl-trivial-features
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:${PORTSDIR}/devel/cl-trivial-features
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:devel/cl-trivial-features
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:devel/cl-trivial-features
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-trivial-gray-streams-sbcl/Makefile b/devel/cl-trivial-gray-streams-sbcl/Makefile
index 382f5753e10d..c27a5b3bafa3 100644
--- a/devel/cl-trivial-gray-streams-sbcl/Makefile
+++ b/devel/cl-trivial-gray-streams-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Thin compatibility layer for Gray streams
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:${PORTSDIR}/devel/cl-trivial-gray-streams
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:${PORTSDIR}/devel/cl-trivial-gray-streams
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:devel/cl-trivial-gray-streams
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:devel/cl-trivial-gray-streams
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-uffi-sbcl/Makefile b/devel/cl-uffi-sbcl/Makefile
index 130769d74e1f..17d9a29d76ca 100644
--- a/devel/cl-uffi-sbcl/Makefile
+++ b/devel/cl-uffi-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Universal Foreign Function Interface for Common Lisp (SBCL binaries)
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/uffi/uffi.asd:${PORTSDIR}/devel/cl-uffi
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/uffi/uffi.asd:${PORTSDIR}/devel/cl-uffi
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/uffi/uffi.asd:devel/cl-uffi
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/uffi/uffi.asd:devel/cl-uffi
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 5895e7099852..ccfb5aaa1ef8 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Cross-platform game SDK
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libmikmod.so:audio/libmikmod \
+		libvorbis.so:audio/libvorbis \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libpcre.so:devel/pcre
 
 USES=		execinfo gmake jpeg libtool pathfix pkgconfig sqlite tar:tgz
 USE_GCC=	yes
diff --git a/devel/clanlib1/Makefile b/devel/clanlib1/Makefile
index 7c18e6050c76..093b008c5de4 100644
--- a/devel/clanlib1/Makefile
+++ b/devel/clanlib1/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Cross-platform game SDK
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libmikmod.so:audio/libmikmod \
+		libvorbis.so:audio/libvorbis
 
 USES=		alias gmake jpeg libtool pathfix pkgconfig tar:tgz
 USE_XORG=	x11 xi
diff --git a/devel/clanlib22/Makefile b/devel/clanlib22/Makefile
index 048490115bb1..75f3e98ab763 100644
--- a/devel/clanlib22/Makefile
+++ b/devel/clanlib22/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Cross-platform game SDK
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libmikmod.so:audio/libmikmod \
+		libvorbis.so:audio/libvorbis \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libpcre.so:devel/pcre
 
 USES=		gmake jpeg libtool pathfix pkgconfig sqlite tar:tgz
 USE_XORG=	x11
diff --git a/devel/clewn/Makefile b/devel/clewn/Makefile
index a661b7d3e468..5a20883c1e26 100644
--- a/devel/clewn/Makefile
+++ b/devel/clewn/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/OldFiles/${PORTNAME}-${PORTVERSION}/
 MAINTAINER=	giacomomariani@yahoo.it
 COMMENT=	Clewn provides Gdb support within Vim
 
-RUN_DEPENDS=	vim:${PORTSDIR}/editors/vim
+RUN_DEPENDS=	vim:editors/vim
 
 USES=		gmake ncurses readline
 GNU_CONFIGURE=	yes
diff --git a/devel/clinfo/Makefile b/devel/clinfo/Makefile
index 108983190ba3..e3468036ffe6 100644
--- a/devel/clinfo/Makefile
+++ b/devel/clinfo/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenCL info program like glxinfo is for libGL
 
-BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
-LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd
+BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
+LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Oblomov
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index af66b7a2e99d..969d73afd746 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -19,10 +19,10 @@ USE_EMACS=	yes
 
 NO_BUILD=	yes
 
-RUN_DEPENDS+=	clojure-mode.el>0:${PORTSDIR}/lang/clojure-mode.el \
-		dash.el>0:${PORTSDIR}/devel/dash.el \
-		epl.el>0:${PORTSDIR}/devel/epl.el \
-		pkg-info.el>0:${PORTSDIR}/devel/pkg-info.el
+RUN_DEPENDS+=	clojure-mode.el>0:lang/clojure-mode.el \
+		dash.el>0:devel/dash.el \
+		epl.el>0:devel/epl.el \
+		pkg-info.el>0:devel/pkg-info.el
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/cider-client.el \
diff --git a/devel/cloudabi-toolchain/Makefile b/devel/cloudabi-toolchain/Makefile
index 5d051a73bc8e..1b3d8b33cca3 100644
--- a/devel/cloudabi-toolchain/Makefile
+++ b/devel/cloudabi-toolchain/Makefile
@@ -12,10 +12,10 @@ COMMENT=	C and C++ toolchain for CloudABI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	clang${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX} \
-		pkgconf:${PORTSDIR}/devel/pkgconf \
-		aarch64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-aarch64 \
-		x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-x86_64
+RUN_DEPENDS=	clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} \
+		pkgconf:devel/pkgconf \
+		aarch64-unknown-cloudabi-ld:devel/cloudabi-binutils-aarch64 \
+		x86_64-unknown-cloudabi-ld:devel/cloudabi-binutils-x86_64
 
 LLVM_SUFFIX=	38
 
diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
index 83d67c708394..ab7f51e81125 100644
--- a/devel/cmake-doc/Makefile
+++ b/devel/cmake-doc/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
 DISTINFO_FILE=	${PORTSDIR}/devel/cmake/distinfo
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 NO_ARCH=	yes
 USES=		cmake:outsource
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index a1c7a90ba3bc..580242c8e6b0 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Qt-based GUI for CMake
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2
 
 USE_QT5=	core gui widgets buildtools_build qmake_build
 USES=		cmake:run desktop-file-utils libarchive shared-mime-info
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 820aef1ca4d0..07617b92d0f4 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -29,12 +29,12 @@ OPTIONS_SUB=	yes
 USES+=		libarchive
 HAS_CONFIGURE=	yes
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp
-RUN_DEPENDS=	${LOCALBASE}/share/cmake/Modules/CMake.cmake:${PORTSDIR}/devel/cmake-modules
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libjsoncpp.so:devel/jsoncpp
+RUN_DEPENDS=	${LOCALBASE}/share/cmake/Modules/CMake.cmake:devel/cmake-modules
 
-MANPAGES_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_ON=	--sphinx-man
 .endif
 
diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index 67712b2f7e40..36073f5f7a80 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Program matching and transformation engine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-BUILD_DEPENDS=	menhir:${PORTSDIR}/devel/menhir \
-		ocaml-parmap>=0:${PORTSDIR}/devel/ocaml-parmap \
-		ocaml-pcre>=0:${PORTSDIR}/devel/ocaml-pcre
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	menhir:devel/menhir \
+		ocaml-parmap>=0:devel/ocaml-parmap \
+		ocaml-pcre>=0:devel/ocaml-pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_OCAML=	3.0+
 USE_OCAML_CAMLP4=yes
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 40dbac0af068..3640ad56ef55 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Open source, cross-platform, free C/C++ IDE
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
-		librsync.so:${PORTSDIR}/net/librsync
+BUILD_DEPENDS=	zip:archivers/zip
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libhunspell-1.3.so:textproc/hunspell \
+		librsync.so:net/librsync
 
 USES=		compiler desktop-file-utils fam:gamin libtool pathfix \
 		pkgconfig shared-mime-info
diff --git a/devel/colorgcc/Makefile b/devel/colorgcc/Makefile
index e1d964114aa7..5440babc9864 100644
--- a/devel/colorgcc/Makefile
+++ b/devel/colorgcc/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Perl script to colorize the terminal output of GCC
 
-RUN_DEPENDS=	p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
+RUN_DEPENDS=	p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		shebangfix
diff --git a/devel/colormake/Makefile b/devel/colormake/Makefile
index 10e87c0455c4..dbb775c84d37 100644
--- a/devel/colormake/Makefile
+++ b/devel/colormake/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://bre.klaki.net/programs/colormake/
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Wrapper to color gmake output
 
-RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	gmake:devel/gmake \
+		bash:shells/bash
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/devel/commit-patch/Makefile b/devel/commit-patch/Makefile
index 0d02b243728c..cf9c75923f29 100644
--- a/devel/commit-patch/Makefile
+++ b/devel/commit-patch/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Commit patches or partial workspace changes to a VCS repository
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	interdiff:${PORTSDIR}/misc/patchutils \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+RUN_DEPENDS=	interdiff:misc/patchutils \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 
 USE_GITHUB=	yes
 USES=		gmake perl5 shebangfix
diff --git a/devel/compiler-rt-devel/Makefile b/devel/compiler-rt-devel/Makefile
index 53b661fbba86..0d9a3aea8c22 100644
--- a/devel/compiler-rt-devel/Makefile
+++ b/devel/compiler-rt-devel/Makefile
@@ -16,7 +16,7 @@ USES=		cmake:outsource compiler:c++11-lib ninja
 
 BROKEN=	relies on incompatible stdarg.h from clang
 
-BUILD_DEPENDS=	llvm-config${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+BUILD_DEPENDS=	llvm-config${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}/
 CMAKE_ARGS=	-DLLVM_CONFIG_PATH=${LOCALBASE}/bin/llvm-config${LLVM_SUFFIX}
diff --git a/devel/compiler-rt/Makefile b/devel/compiler-rt/Makefile
index d455ea8c2bd1..b9aa7756fdac 100644
--- a/devel/compiler-rt/Makefile
+++ b/devel/compiler-rt/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/brooks
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Compiler runtime library with Blocks support
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS=	cmake:devel/cmake
 
 CONFIGURE_WRKSRC=	${WRKDIR}/build
 BUILD_WRKSRC=		${WRKDIR}/build
@@ -50,7 +50,7 @@ SVN_REV!=	svn info ${LLVM_SVN}/ | ${GREP} Revision | cut -d' ' -f2
 .endif
 
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
index eead2542c70d..098d310ce8c8 100644
--- a/devel/compiz-bcop/Makefile
+++ b/devel/compiz-bcop/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/ \
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Code generator for Compiz Fusion Plugins
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
+		${LOCALBASE}/bin/getopt:misc/getopt
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/configkit/Makefile b/devel/configkit/Makefile
index 8d419b6b6f96..0d8f0e4c3a77 100644
--- a/devel/configkit/Makefile
+++ b/devel/configkit/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Somewhat prototypical facility for generating CLI interfaces
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libphk.a:${PORTSDIR}/devel/libphk
+BUILD_DEPENDS=	${LOCALBASE}/lib/libphk.a:devel/libphk
 
 WRKSRC=		${WRKDIR}/ConfigKit
 USES=		uidfix
diff --git a/devel/cons-test/Makefile b/devel/cons-test/Makefile
index 50e5033e51c9..7305e283ab39 100644
--- a/devel/cons-test/Makefile
+++ b/devel/cons-test/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Test bed for `Cons' development
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/cons:${PORTSDIR}/devel/cons
+RUN_DEPENDS=	${LOCALBASE}/bin/cons:devel/cons
 
 USES=		perl5 tar:tgz
 WRKSRC=		${WRKDIR}/cons-${PORTVERSION}/test
diff --git a/devel/cpan-upload-http/Makefile b/devel/cpan-upload-http/Makefile
index 40e7f2aff2ba..10037eeb1bd1 100644
--- a/devel/cpan-upload-http/Makefile
+++ b/devel/cpan-upload-http/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl script to upload one or more files to CPAN, using PAUSE
 
 RUN_DEPENDS=	\
-	p5-AppConfig-Std>=1.05:${PORTSDIR}/devel/p5-AppConfig-Std \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
+	p5-AppConfig-Std>=1.05:devel/p5-AppConfig-Std \
+	p5-libwww>0:www/p5-libwww \
+	p5-Term-ReadKey>0:devel/p5-Term-ReadKey
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile
index 6729cc73957f..0ba0d7a58071 100644
--- a/devel/cpan-upload/Makefile
+++ b/devel/cpan-upload/Makefile
@@ -11,9 +11,9 @@ MASTER_SITE_SUBDIR=	CPAN:NEILB/scripts
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Script for uploading distributions to CPAN
 
-RUN_DEPENDS=	p5-AppConfig-Std>=1.05:${PORTSDIR}/devel/p5-AppConfig-Std \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-AppConfig-Std>=1.05:devel/p5-AppConfig-Std \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/cpp-netlib/Makefile b/devel/cpp-netlib/Makefile
index 0db18aa39969..04537640ff55 100644
--- a/devel/cpp-netlib/Makefile
+++ b/devel/cpp-netlib/Makefile
@@ -14,7 +14,7 @@ COMMENT=		Cross-platform, standards compliant networking library
 LICENSE=		BSL
 LICENSE_FILE=		${WRKSRC}/LICENSE_1_0.txt
 
-BUILD_DEPENDS=		boost-libs>0:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=		boost-libs>0:devel/boost-libs
 
 USES=			cmake:outsource
 USE_LDCONFIG=		yes
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 5d7827ce4ebb..5a1ca29bfa84 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Static analysis of C/C++ code
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtinyxml2.so:${PORTSDIR}/textproc/tinyxml2
+LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2
 
 USES=		compiler:c++11-lib execinfo gmake tar:bzip2
 USE_CXXSTD=	c++11
@@ -32,15 +32,15 @@ MATCHCOMPILER_DESC=	Build-time optimizations via Python
 RULES_DESC=		User-defined rule support (requires PCRE)
 
 MANPAGES_ALL_TARGET=	man
-MANPAGES_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 MANPAGES_MAKE_ENV=	DB2MAN="${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl"
 MANPAGES_PLIST_FILES=	man/man1/cppcheck.1.gz
 
 MATCHCOMPILER_MAKE_ENV=	SRCDIR=build
 MATCHCOMPILER_USES=	python:2,build
 
-RULES_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+RULES_LIB_DEPENDS=	libpcre.so:devel/pcre
 RULES_MAKE_ENV=		HAVE_RULES=yes
 
 post-patch:
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index 348286a89cde..21f0bacd9444 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -12,8 +12,8 @@ LICENSE=	LGPL21
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENABLE=	dot doxygen html-docs
 DOXYGEN_CONFIGURE_ON=	--htmldir="${DOCSDIR}/html"
 
diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile
index 05f104adf9ef..a9d36efdb8f0 100644
--- a/devel/creduce/Makefile
+++ b/devel/creduce/Makefile
@@ -8,16 +8,16 @@ MASTER_SITES=	http://embed.cs.utah.edu/creduce/
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Produces small test cases
 
-BUILD_DEPENDS=	llvm-config37:${PORTSDIR}/devel/llvm37
-RUN_DEPENDS=	llvm-config37:${PORTSDIR}/devel/llvm37 \
-		topformflat:${PORTSDIR}/devel/delta \
-		astyle:${PORTSDIR}/devel/astyle \
-		p5-Benchmark-Timer>=0:${PORTSDIR}/devel/p5-Benchmark-Timer \
-		p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		devel/p5-Sys-Cpu>=0:${PORTSDIR}/devel/p5-Sys-Cpu \
-		p5-Getopt-Tabular>=0:${PORTSDIR}/devel/p5-Getopt-Tabular
+BUILD_DEPENDS=	llvm-config37:devel/llvm37
+RUN_DEPENDS=	llvm-config37:devel/llvm37 \
+		topformflat:devel/delta \
+		astyle:devel/astyle \
+		p5-Benchmark-Timer>=0:devel/p5-Benchmark-Timer \
+		p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		devel/p5-Sys-Cpu>=0:devel/p5-Sys-Cpu \
+		p5-Getopt-Tabular>=0:devel/p5-Getopt-Tabular
 
 GNU_CONFIGURE=	yes
 CONFIGURE_FLAGS=	--with-llvm=${LOCALBASE}
diff --git a/devel/critcl/Makefile b/devel/critcl/Makefile
index c85ff44f7511..40469972bdb4 100644
--- a/devel/critcl/Makefile
+++ b/devel/critcl/Makefile
@@ -13,8 +13,8 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	${LOCALBASE}/lib/Trf/pkgIndex.tcl:${PORTSDIR}/devel/tcl-trf	\
-		${LOCALBASE}/lib/tcllib/cmdline/pkgIndex.tcl:${PORTSDIR}/devel/tcllib
+RUN_DEPENDS=	${LOCALBASE}/lib/Trf/pkgIndex.tcl:devel/tcl-trf	\
+		${LOCALBASE}/lib/tcllib/cmdline/pkgIndex.tcl:devel/tcllib
 
 USES+=		tcl:85+
 USE_GITHUB=	yes
diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index a396a5703332..0b23e57c078b 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	${DISTNAME}-neutral${EXTRACT_SUFX} \
 MAINTAINER=	dds@FreeBSD.org
 COMMENT=	Source code analyzer and refactoring browser for C program collections
 
-LIB_DEPENDS+=	libc.so.6:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS+=	libc.so.6:misc/compat6x
 
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
diff --git a/devel/ctypes.sh/Makefile b/devel/ctypes.sh/Makefile
index c0ba8d7b64ee..6451a0f932da 100644
--- a/devel/ctypes.sh/Makefile
+++ b/devel/ctypes.sh/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Foreign function interface for bash
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 USES=		libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile
index c9846521a4ad..8ba9df27dceb 100644
--- a/devel/cutter/Makefile
+++ b/devel/cutter/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Unit Testing Framework for C and C++
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libpangocairo-1.0.so:x11-toolkits/pango
 
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc
@@ -34,7 +34,7 @@ regression-test: build
 .if ${PORT_OPTIONS:MGOFFICE}
 CONFIGURE_ARGS+=--enable-goffice
 # the 0.8 is part of the library name don't remove it.
-LIB_DEPENDS+=	libgoffice-0.8.so:${PORTSDIR}/devel/goffice
+LIB_DEPENDS+=	libgoffice-0.8.so:devel/goffice
 PLIST_SUB+=	GOFFICE=""
 .else
 CONFIGURE_ARGS+=--disable-goffice
@@ -42,12 +42,12 @@ PLIST_SUB+=	GOFFICE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLCOV}
-RUN_DEPENDS+=	lcov:${PORTSDIR}/devel/lcov
+RUN_DEPENDS+=	lcov:devel/lcov
 .endif
 
 .if ${PORT_OPTIONS:MSOUP}
 CONFIGURE_ARGS+=--enable-libsoup
-LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 PLIST_SUB+=	SOUP=""
 .else
 CONFIGURE_ARGS+=--disable-libsoup
diff --git a/devel/cvs-syncmail/Makefile b/devel/cvs-syncmail/Makefile
index 6637938bf7a3..90fc0e019660 100644
--- a/devel/cvs-syncmail/Makefile
+++ b/devel/cvs-syncmail/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	bin/${DISTNAME}
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
-RUN_DEPENDS=	cvs:${PORTSDIR}/devel/cvs
+RUN_DEPENDS=	cvs:devel/cvs
 .endif
 
 do-extract:
diff --git a/devel/cvs2darcs/Makefile b/devel/cvs2darcs/Makefile
index e4e94dc544c1..24199e744921 100644
--- a/devel/cvs2darcs/Makefile
+++ b/devel/cvs2darcs/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Convert CVS module to darcs repository
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	cvs:${PORTSDIR}/devel/cvs \
-		darcs:${PORTSDIR}/devel/hs-darcs \
-		cvsps:${PORTSDIR}/devel/cvsps \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	cvs:devel/cvs \
+		darcs:devel/hs-darcs \
+		cvsps:devel/cvsps \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile
index dcf644f5a1df..c01c548693a7 100644
--- a/devel/cvs2html/Makefile
+++ b/devel/cvs2html/Makefile
@@ -26,7 +26,7 @@ SHEBANG_FILES=	${PORTNAME}
 
 .if ${OPSYS} == FreeBSD
 # DragonFly has CVS in base and devel/cvs doesn't build there
-RUN_DEPENDS=	cvs:${PORTSDIR}/devel/cvs
+RUN_DEPENDS=	cvs:devel/cvs
 .endif
 
 do-extract:
diff --git a/devel/cvschangelogbuilder/Makefile b/devel/cvschangelogbuilder/Makefile
index 2050a829b46f..3c3910fd5655 100644
--- a/devel/cvschangelogbuilder/Makefile
+++ b/devel/cvschangelogbuilder/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utility to generate changelogs and reports from a CVS repository
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.TXT
 
-RUN_DEPENDS=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
+RUN_DEPENDS=	p5-GD-Graph>=0:graphics/p5-GD-Graph
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${PORTNAME}.pl
diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile
index ebbf293a16ef..ba1d10ad0c43 100644
--- a/devel/cvsd/Makefile
+++ b/devel/cvsd/Makefile
@@ -28,8 +28,8 @@ PORTDOCS=	FAQ NEWS README
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 1000000
-BUILD_DEPENDS+=	cvs:${PORTSDIR}/devel/cvs
-RUN_DEPENDS+=	cvs:${PORTSDIR}/devel/cvs
+BUILD_DEPENDS+=	cvs:devel/cvs
+RUN_DEPENDS+=	cvs:devel/cvs
 .endif
 
 do-install:
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 15507a6e4807..7cb450908903 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Graph the life story of a file under CVS or RCS
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
index 2387ce05f845..db2df712daa3 100644
--- a/devel/cvsmonitor/Makefile
+++ b/devel/cvsmonitor/Makefile
@@ -10,32 +10,32 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Stable
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Monitor activity on a CVS Repository
 
-BUILD_DEPENDS=	p5-Time-Duration>=0:${PORTSDIR}/devel/p5-Time-Duration \
-		p5-Class-Autouse>=0:${PORTSDIR}/devel/p5-Class-Autouse \
-		p5-Class-Default>=0:${PORTSDIR}/devel/p5-Class-Default \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Class-Handle>=0:${PORTSDIR}/devel/p5-Class-Handle \
-		p5-Sort-Versions>=0:${PORTSDIR}/devel/p5-Sort-Versions \
-		p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-HTTP-BrowserDetect>=0:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
-		p5-Validate-Net>=0:${PORTSDIR}/net/p5-Validate-Net \
-		p5-Chart-Math-Axis>=0:${PORTSDIR}/math/p5-Chart-Math-Axis \
-		p5-File-NCopy>=0:${PORTSDIR}/devel/p5-File-NCopy \
-		p5-File-Remove>=0:${PORTSDIR}/devel/p5-File-Remove \
-		p5-File-Flat>=0:${PORTSDIR}/devel/p5-File-Flat \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Array-Window>=0:${PORTSDIR}/devel/p5-Array-Window \
-		p5-Number-Compare>=0:${PORTSDIR}/math/p5-Number-Compare \
-		p5-Text-Glob>=0:${PORTSDIR}/textproc/p5-Text-Glob \
-		p5-XML-Generator>=0:${PORTSDIR}/textproc/p5-XML-Generator \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
+BUILD_DEPENDS=	p5-Time-Duration>=0:devel/p5-Time-Duration \
+		p5-Class-Autouse>=0:devel/p5-Class-Autouse \
+		p5-Class-Default>=0:devel/p5-Class-Default \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-Class-Handle>=0:devel/p5-Class-Handle \
+		p5-Sort-Versions>=0:devel/p5-Sort-Versions \
+		p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
+		p5-Net-Telnet>=0:net/p5-Net-Telnet \
+		p5-HTTP-BrowserDetect>=0:www/p5-HTTP-BrowserDetect \
+		p5-Validate-Net>=0:net/p5-Validate-Net \
+		p5-Chart-Math-Axis>=0:math/p5-Chart-Math-Axis \
+		p5-File-NCopy>=0:devel/p5-File-NCopy \
+		p5-File-Remove>=0:devel/p5-File-Remove \
+		p5-File-Flat>=0:devel/p5-File-Flat \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Time-modules>=0:devel/p5-Time-modules \
+		p5-URI>=0:net/p5-URI \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-Array-Window>=0:devel/p5-Array-Window \
+		p5-Number-Compare>=0:math/p5-Number-Compare \
+		p5-Text-Glob>=0:textproc/p5-Text-Glob \
+		p5-XML-Generator>=0:textproc/p5-XML-Generator \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/cvsplot/Makefile b/devel/cvsplot/Makefile
index 513fc3238f7a..83f3c5cabe83 100644
--- a/devel/cvsplot/Makefile
+++ b/devel/cvsplot/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Perl script which analyses the history of a CVS-managed project
 
-RUN_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
+		gnuplot:math/gnuplot
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/cvsplot
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index f9d6dae97296..d7e1b6b06909 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -13,18 +13,18 @@ PKGNAMESUFFIX=	3
 MAINTAINER=	noackjr@alumni.rice.edu
 COMMENT=	WWW CGI script to browse CVS repository trees version 3
 
-RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-URI>=0:net/p5-URI
 
 # The following extra dependencies are optional, but CVSweb works the
 # best with them.
-RUN_DEPENDS+=	p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-String-Ediff>=0:${PORTSDIR}/devel/p5-String-Ediff \
-		cvsgraph:${PORTSDIR}/devel/cvsgraph
+RUN_DEPENDS+=	p5-MIME-Types>=0:mail/p5-MIME-Types \
+		p5-String-Ediff>=0:devel/p5-String-Ediff \
+		cvsgraph:devel/cvsgraph
 
 # Use PAPERSIZE to avoid a stale dependency on Enscript.
 PAPERSIZE?=	letter
-RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-${PAPERSIZE}
+RUN_DEPENDS+=	enscript:print/enscript-${PAPERSIZE}
 
 CONFLICTS=	cvsweb-2.*
 
diff --git a/devel/d-feet/Makefile b/devel/d-feet/Makefile
index efae109140e3..3c41de306d1b 100644
--- a/devel/d-feet/Makefile
+++ b/devel/d-feet/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	thinker@codemud.net
 COMMENT=	D-Feet is a D-Bus debugger python introspection by John (J5) Palmieri
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 USES=		gettext gmake gnome perl5 pkgconfig python tar:xz
 USE_GNOME=	gtk30 intlhack introspection:build libxml2:build libwnck3
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index 85c6b802acae..e3abc9cdf974 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-glib/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib bindings for the D-BUS messaging system
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 GNU_CONFIGURE=	yes
 USES=		cpe gettext gmake libtool pathfix pkgconfig
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index 3f0513c1795e..cb3ea9cb6f07 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt D-Bus inter-process communication module
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 USES=		pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build corelib xml
diff --git a/devel/dbus-qt5/Makefile b/devel/dbus-qt5/Makefile
index 505cadaee2c0..be289520ce81 100644
--- a/devel/dbus-qt5/Makefile
+++ b/devel/dbus-qt5/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt D-Bus inter-process communication module
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 USE_QT5=	core qmake_build buildtools_build
 QT_DIST=	base
diff --git a/devel/dbus-sharp-glib/Makefile b/devel/dbus-sharp-glib/Makefile
index 6f1a6fd4c6f7..ab02401fc298 100644
--- a/devel/dbus-sharp-glib/Makefile
+++ b/devel/dbus-sharp-glib/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	GHC
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	D-Bus for .NET: GLib integration module
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:${PORTSDIR}/devel/dbus-sharp
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:${PORTSDIR}/devel/dbus-sharp
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:devel/dbus-sharp
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:devel/dbus-sharp
 
 USES=		gmake pathfix pkgconfig
 USE_GITHUB=	yes
diff --git a/devel/dbus-tcl/Makefile b/devel/dbus-tcl/Makefile
index 716011fae3f0..4115b8758d63 100644
--- a/devel/dbus-tcl/Makefile
+++ b/devel/dbus-tcl/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tcl interface to the D-Bus messaging system
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-BUILD_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
+BUILD_DEPENDS=	dtplite:devel/tcllib
 
 OPTIONS_DEFINE=	DOCS
 DOCSDIR=	${PREFIX}/share/doc/dbus
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index ea507149aff3..661846f9b8d5 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Message bus system for inter-application communication
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 PORTSCOUT=	limitw:1,even
 
@@ -43,7 +43,7 @@ OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 X11_DESC=	Support X11 Desktop Environments
 
-MANPAGES_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto
 MANPAGES_CONFIGURE_ENABLE=	xml-docs
 X11_USE=	xorg=ice,sm,x11
 X11_CONFIGURE_WITH=	x
diff --git a/devel/dcmtk/Makefile b/devel/dcmtk/Makefile
index a5850b42ac29..49aafe82a006 100644
--- a/devel/dcmtk/Makefile
+++ b/devel/dcmtk/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://dicom.offis.de/pub/dicom/offis/software/${PORTNAME}/${PORTNA
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit to work with DICOM objects
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile
index 8880223168c7..b50395829166 100644
--- a/devel/dconf-editor/Makefile
+++ b/devel/dconf-editor/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Configuration database editor for GNOME
 
-BUILD_DEPENDS=	dconf>=0.23.2:${PORTSDIR}/devel/dconf \
-		vala>=0.18.1:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libdconf.so:${PORTSDIR}/devel/dconf
+BUILD_DEPENDS=	dconf>=0.23.2:devel/dconf \
+		vala>=0.18.1:lang/vala
+LIB_DEPENDS=	libdconf.so:devel/dconf
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 50a88338169f..0977416d9886 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Configuration database system for GNOME
 
-BUILD_DEPENDS=	vala>=0.18.1:${PORTSDIR}/lang/vala \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+BUILD_DEPENDS=	vala>=0.18.1:lang/vala \
+		docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index f796d7b5117b..f964cfcf4e24 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Model to synchronize multiple instances over DBus
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libicutu.so:${PORTSDIR}/devel/icu
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libicutu.so:devel/icu
 
 USES=		gmake libtool pkgconfig pathfix python:2
 GNU_CONFIGURE=	yes
diff --git a/devel/deforaos-libsystem/Makefile b/devel/deforaos-libsystem/Makefile
index b8da4bc8665d..f332adb3dad4 100644
--- a/devel/deforaos-libsystem/Makefile
+++ b/devel/deforaos-libsystem/Makefile
@@ -25,9 +25,9 @@ MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
-DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+	gtkdoc-check:textproc/gtk-doc
 
 BROKEN_FreeBSD_9=	This port works only on FreeBSD 10 and newer
 
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index f478838309fb..34a89945f19c 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Developer help browser for GNOME 3
 
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/dfuife-curses/Makefile b/devel/dfuife-curses/Makefile
index 14513086972e..6b0e6e1ac159 100644
--- a/devel/dfuife-curses/Makefile
+++ b/devel/dfuife-curses/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://people.xmms2.org/~alex/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DFUI curses frontend
 
-LIB_DEPENDS=	libaura3.so:${PORTSDIR}/devel/libaura \
-		libdfui4.so:${PORTSDIR}/devel/libdfui
+LIB_DEPENDS=	libaura3.so:devel/libaura \
+		libdfui4.so:devel/libdfui
 
 USES=	tar:bzip2
 
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 1ad95b75f462..09e601031c44 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Graphic development lightweight API
 LICENSE=	LGPL21
 
 BROKEN=		Does not fetch
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	FREETYPE X11 SDL UNIQUE TEST DOCS
 UNIQUE_DESC=	Unique (WM Module)
@@ -49,8 +49,8 @@ CONFIGURE_ARGS=	--disable-osx --disable-extra-warnings --disable-profiling \
 		--with-inputdrivers=all --with-smooth-scaling \
 		--with-dither-rgb16=advanced
 
-DOCS_BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+DOCS_BUILD_DEPENDS=	man2html:textproc/man2html
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
 X11_USE=	XORG=x11,xext,xproto
 X11_CONFIGURE_ENABLE=	--x11
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index 3cac1753614d..9a44c5802697 100644
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Graphical frontend to the objdump disassembler
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>0:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:${PORTSDIR}/www/py-webkitgtk
-LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk
+LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 4723ecc2b300..0eec8e25aef8 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Distribute compilation of C(++) code acrosss machines on a network
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 GNU_CONFIGURE=	yes
 USES=		alias gmake tar:bzip2
@@ -56,7 +56,7 @@ GTK_DESC=	Monitor based on GTK
 LLVMLINK_DESC=	Create llvm compiler links if llvm is installed
 
 AVAHI_CONFIGURE_WITH=	avahi
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 DOCS_PLIST_FILES=	${README_FILES:S|^|${DOCSDIR_REL}/|}
 DOCS_PLIST_FILES+=	${DOC_FILES:S|^|${DOCSDIR_REL}/|}
 GNOME_CONFIGURE_WITH=	gnome
diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index bf4218fd4655..8b207eddc883 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel elisp
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Distel extends Emacs Lisp with Erlang-style message passing
 
-BUILD_DEPENDS+=	erlc:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS+=	erlc:lang/erlang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	massemanet
diff --git a/devel/ditrack/Makefile b/devel/ditrack/Makefile
index 20231df19a38..02f2fe0c9563 100644
--- a/devel/ditrack/Makefile
+++ b/devel/ditrack/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tracking system based on Subversion repository
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	svn:devel/subversion
 
 USES=		python tar:tgz
 USE_PYTHON=	distutils
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 8b6d7918a595..6fd5ba8dcdad 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	GRAPHVIZ LATEX QT4 DOCS
 OPTIONS_DEFAULT=	GRAPHVIZ LATEX
 QT4_DESC=	Install Doxywizard GUI
 
-GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
 
 LATEX_USE=	TEX=base,dvipsk,pdftex
 
@@ -42,7 +42,7 @@ QT4_PLIST_FILES=	bin/doxywizard
 
 DOCS_USES=		ghostscript:build
 DOCS_ALL_TARGET=	docs
-DOCS_BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+DOCS_BUILD_DEPENDS=	dot:graphics/graphviz
 DOCS_CMAKE_ON=		-Dbuild_doc:BOOLEAN=ON
 DOCS_CMAKE_OFF=		-Dbuild_doc:BOOLEAN=OFF
 DOCS_PLIST_FILES=	man/man1/doxygen.1.gz \
@@ -55,7 +55,7 @@ PORTDOCS=		*
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/devel/dparser/Makefile b/devel/dparser/Makefile
index 14d8c0eaa729..851fcaa55bbb 100644
--- a/devel/dparser/Makefile
+++ b/devel/dparser/Makefile
@@ -29,7 +29,7 @@ PLIST_FILES=	bin/make_dparser include/dparse.h include/dparse_tables.h \
 OPTIONS_DEFINE=	BOEHM DOCS
 BOEHM_DESC=	Boehm garbage collector support
 
-BOEHM_LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
+BOEHM_LIB_DEPENDS=	libgc.so:devel/boehm-gc
 BOEHM_MAKE_ARGS=	D_USE_GC=1 \
 			GC_CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
 BOEHM_VARS=		LIBDPARSE=libdparse_gc.a
diff --git a/devel/dprog/Makefile b/devel/dprog/Makefile
index 819088eef8bb..54d195206356 100644
--- a/devel/dprog/Makefile
+++ b/devel/dprog/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.daimi.au.dk/~mailund/dprog/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Language for specifying dynamic programming algorithms
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
diff --git a/devel/dragon/Makefile b/devel/dragon/Makefile
index 1010c131f3ff..976f4c80f7b5 100644
--- a/devel/dragon/Makefile
+++ b/devel/dragon/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.lemke-it.com/
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Combined C++ scanner/parser generator for LR compliant grammars
 
-LIB_DEPENDS=	liblfcbase.so:${PORTSDIR}/devel/lfcbase
+LIB_DEPENDS=	liblfcbase.so:devel/lfcbase
 
 LICENSE=	GPLv3
 GNU_CONFIGURE=	yes
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index a3061d15f17d..f0c02dad8916 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -17,8 +17,8 @@ LICENSE=	GPLv2
 # fails to build in presence if installed self
 CONFLICTS_BUILD=	${PORTNAME}${PYTHON_PKGNAMESUFFIX}-[0-9]*
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/dwarfdump/Makefile b/devel/dwarfdump/Makefile
index f230aa9d8501..1cc7b3be9fc2 100644
--- a/devel/dwarfdump/Makefile
+++ b/devel/dwarfdump/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	libdwarf-${PORTVERSION}
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Tool to display DWARF debugging information in ELF files
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdwarf.a:${PORTSDIR}/devel/libdwarf
+BUILD_DEPENDS=	${LOCALBASE}/lib/libdwarf.a:devel/libdwarf
 
 WRKSRC=		${WRKDIR}/dwarf-${PORTVERSION}/dwarfdump
 
diff --git a/devel/easygit/Makefile b/devel/easygit/Makefile
index af311a6a7d62..283408778e9d 100644
--- a/devel/easygit/Makefile
+++ b/devel/easygit/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	# none
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy wrapper for git
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 DISTREVISION=	0 # bump this if distfile is changed inplace
 
diff --git a/devel/eblob/Makefile b/devel/eblob/Makefile
index d24a0010bdb3..e31847afa7e2 100644
--- a/devel/eblob/Makefile
+++ b/devel/eblob/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Append-only low-level I/O library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zloidemon
@@ -33,7 +33,7 @@ CMAKE_ARGS+=	-DWITH_ASSERTS=OFF
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-LIB_DEPENDS+=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS+=	libboost_python.so:devel/boost-python-libs
 USES+=		python
 CMAKE_ARGS+=	-DWITH_PYTHON=ON
 PLIST_SUB+=	PYTHON="" PYTHON_VER=${PYTHON_VER}
@@ -43,7 +43,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSNAPPY}
-LIB_DEPENDS+=	libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS+=	libsnappy.so:archivers/snappy
 CMAKE_ARGS+=	-DWITH_SNAPPY=ON
 .else
 CMAKE_ARGS+=	-DWITH_SNAPPY=OFF
diff --git a/devel/edb/Makefile b/devel/edb/Makefile
index 6fb6e03f5f7f..2e948667a562 100644
--- a/devel/edb/Makefile
+++ b/devel/edb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Cross-platform x86/x86-64 debugger based on Qt 4
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		qmake tar:tgz
 USE_QT4=	gui network xml moc_build rcc_build uic_build
diff --git a/devel/efivar/Makefile b/devel/efivar/Makefile
index 46c414f06655..718becf7d035 100644
--- a/devel/efivar/Makefile
+++ b/devel/efivar/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Tools and library to manipulate EFI variables
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USE_GCC=	yes
 USE_GITHUB=	yes
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 68327ee8333d..82cc85a31763 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Enlightenment Foundation Libraries
 LICENSE=	BSD2CLAUSE LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libdbus-1.so:devel/dbus \
+		libsndfile.so:audio/libsndfile
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
@@ -51,42 +51,42 @@ PHYSICS_DESC=		Physics effects
 IBUS_DESC=		Intelligent Input Bus
 SCIM_DESC=		Smart Common Input Method
 
-AVAHI_LIB_DEPENDS=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=		avahi
 
-FRIBIDI_LIB_DEPENDS=		libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=		libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	fribidi
 
-HARFBUZZ_LIB_DEPENDS=		libharfbuzz.so:${PORTSDIR}/print/harfbuzz
+HARFBUZZ_LIB_DEPENDS=		libharfbuzz.so:print/harfbuzz
 HARFBUZZ_CONFIGURE_ENABLE=	harfbuzz
 
 NLS_USES=			gettext-runtime
 NLS_CONFIGURE_ENABLE=		nls
 
-PHYSICS_LIB_DEPENDS=		libBulletDynamics.so:${PORTSDIR}/devel/bullet
+PHYSICS_LIB_DEPENDS=		libBulletDynamics.so:devel/bullet
 PHYSICS_CONFIGURE_ENABLE=	physics
 
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
 
 GSTREAMER_USE=			GSTREAMER1=core
 GSTREAMER_CONFIGURE_ENABLE=	gstreamer1
 
-LIBXINE_LIB_DEPENDS=		libxine.so:${PORTSDIR}/multimedia/libxine
+LIBXINE_LIB_DEPENDS=		libxine.so:multimedia/libxine
 LIBXINE_CONFIGURE_ENABLE=	xine
 
-V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_CONFIGURE_ENABLE=		v4l2
 
-IBUS_LIB_DEPENDS=		libibus-1.0.so:${PORTSDIR}/textproc/ibus
+IBUS_LIB_DEPENDS=		libibus-1.0.so:textproc/ibus
 
-SCIM_LIB_DEPENDS=		libscim-1.0.so:${PORTSDIR}/textproc/scim
+SCIM_LIB_DEPENDS=		libscim-1.0.so:textproc/scim
 SCIM_CONFIGURE_ENABLE=		scim
 
-OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
 OPENJPEG_CONFIGURE_ENABLE=	image-loader-jp2k
 
-WEBP_LIB_DEPENDS=		libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=		image-loader-webp
 
 OPENGL_USE=			GL=gl
@@ -135,7 +135,7 @@ USES+=				lua
 CONFIGURE_ARGS+=		--enable-lua-old
 PLIST_SUB+=			ELUA="@comment "
 .else
-LIB_DEPENDS+=			libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS+=			libluajit-5.1.so:lang/luajit
 PLIST_SUB+=			ELUA=""
 .endif
 
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index f5772e6adbeb..4ea9f110cd2d 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://hal.freedesktop.org/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	D-Bus bindings for GObject
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USE_GNOME=	glib20
 USES=		gettext gmake libtool:keepla pathfix pkgconfig
@@ -23,9 +23,9 @@ CONFIGURE_ARGS=	--localstatedir=/var
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-BUILD_DEPENDS+=	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS+=	docbook-sgml>0:textproc/docbook-sgml \
+		xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wl,--as-needed||' \
diff --git a/devel/eiffelstudio/Makefile b/devel/eiffelstudio/Makefile
index 275805afb61d..f7e79eca62da 100644
--- a/devel/eiffelstudio/Makefile
+++ b/devel/eiffelstudio/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Eiffel${PORTVERSION:S/.//}_gpl_64493-freebsd-${EIFFEL_ARCH}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complete Integrated Development Environment for Eiffel
 
-LIB_DEPENDS=	libc.so.6:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS=	libc.so.6:misc/compat6x
 
 USES=		shebangfix
 SHEBANG_FILES=	library/event/example/gen_action_sequences \
diff --git a/devel/eric4/Makefile b/devel/eric4/Makefile
index 3a32ec189b51..114425652efa 100644
--- a/devel/eric4/Makefile
+++ b/devel/eric4/Makefile
@@ -7,14 +7,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:${PORTSDIR}/devel/py-qt4-qscintilla2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:devel/py-qt4-qscintilla2
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:${PORTSDIR}/devel/py-qt4-help \
-		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
+		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \
+		${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:devel/py-qt4-help \
+		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3
 
 USES=		desktop-file-utils
 INSTALL_CMD=	install.py -c -f eric4config.freebsd -i ${STAGEDIR}
diff --git a/devel/eric4/Makefile.inc b/devel/eric4/Makefile.inc
index b526cc63f091..8734204a10f8 100644
--- a/devel/eric4/Makefile.inc
+++ b/devel/eric4/Makefile.inc
@@ -16,7 +16,7 @@ COMMENT=	Full featured Python and Ruby editor and IDE based on Qt4
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS?=	${PREFIX}/bin/eric4:${PORTSDIR}/devel/eric4
+RUN_DEPENDS?=	${PREFIX}/bin/eric4:devel/eric4
 
 I18N_LANG?=	ru
 INSTALL_CMD?=	install-i18n.py -p ${STAGEDIR}
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 6ffec945d7d0..b8578561581b 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -4,15 +4,15 @@
 CATEGORIES=	devel python
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:${PORTSDIR}/devel/py-qt4-qscintilla2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:devel/py-qt4-qscintilla2
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sql \
-		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:${PORTSDIR}/devel/py-qt4-help \
-		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:databases/py-qt4-sql \
+		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \
+		${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:devel/py-qt4-help \
+		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3
 
 USES=		desktop-file-utils
 INSTALL_CMD=	install.py -c -f eric6config.freebsd -i ${STAGEDIR}
diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc
index 19ca5b3bd60f..42acaf69a56f 100644
--- a/devel/eric6/Makefile.inc
+++ b/devel/eric6/Makefile.inc
@@ -16,7 +16,7 @@ COMMENT=	Full featured Python and Ruby editor and IDE based on Qt4
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS?=	${PREFIX}/bin/eric6:${PORTSDIR}/devel/eric6
+RUN_DEPENDS?=	${PREFIX}/bin/eric6:devel/eric6
 
 I18N_LANG?=	ru
 INSTALL_CMD?=	install-i18n.py -p ${STAGEDIR}
diff --git a/devel/eris/Makefile b/devel/eris/Makefile
index 1d3635bfc0b2..3cf1d330ee4d 100644
--- a/devel/eris/Makefile
+++ b/devel/eris/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	SF/worldforge/Eris%201.4%20%28client%20lib%29/${PORTVERSION}/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	WorldForge client entity library
 
-LIB_DEPENDS=	libAtlas-0.6.so:${PORTSDIR}/devel/atlas-devel \
-		libskstream-0.3.so:${PORTSDIR}/net/skstream \
-		libwfmath-1.0.so:${PORTSDIR}/math/wfmath \
-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libmercator-0.3.so:${PORTSDIR}/devel/mercator
+LIB_DEPENDS=	libAtlas-0.6.so:devel/atlas-devel \
+		libskstream-0.3.so:net/skstream \
+		libwfmath-1.0.so:math/wfmath \
+		libsigc-2.0.so:devel/libsigc++20 \
+		libmercator-0.3.so:devel/mercator
 
 CONFIGURE_ARGS= --disable-silent-rules
 GNU_CONFIGURE=	yes
diff --git a/devel/erlang-common_lib/Makefile b/devel/erlang-common_lib/Makefile
index 6fb752c3426c..dc204972a9f6 100644
--- a/devel/erlang-common_lib/Makefile
+++ b/devel/erlang-common_lib/Makefile
@@ -8,9 +8,9 @@ PKGNAMEPREFIX=	erlang-
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Library of commonly used Erlang functions
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
-		txt2tags:${PORTSDIR}/textproc/txt2tags
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erlc:lang/erlang \
+		txt2tags:textproc/txt2tags
+RUN_DEPENDS=	erl:lang/erlang
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/devel/erlang-esdl/Makefile b/devel/erlang-esdl/Makefile
index a9c33c334074..e44abf6f6b0b 100644
--- a/devel/erlang-esdl/Makefile
+++ b/devel/erlang-esdl/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	erlang
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Library for accessing SDL and OpenGL through Erlang
 
-BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/erlang-exmpp/Makefile b/devel/erlang-exmpp/Makefile
index 1e00b9f59e17..1994a9b38d41 100644
--- a/devel/erlang-exmpp/Makefile
+++ b/devel/erlang-exmpp/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Fast and scalable library for XMPP written in Erlang/OTP
 
 LICENSE=	EPL
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	erlc:lang/erlang
+RUN_DEPENDS=	erl:lang/erlang
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libxml2.so:textproc/libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	processone
diff --git a/devel/erlang-oserl/Makefile b/devel/erlang-oserl/Makefile
index b9e385466465..215aeed20722 100644
--- a/devel/erlang-oserl/Makefile
+++ b/devel/erlang-oserl/Makefile
@@ -8,10 +8,10 @@ PKGNAMEPREFIX=	erlang-
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	SMPP library for Erlang
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
-		txt2tags:${PORTSDIR}/textproc/txt2tags
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		erlang-common_lib>=3.3.4:${PORTSDIR}/devel/erlang-common_lib
+BUILD_DEPENDS=	erlc:lang/erlang \
+		txt2tags:textproc/txt2tags
+RUN_DEPENDS=	erl:lang/erlang \
+		erlang-common_lib>=3.3.4:devel/erlang-common_lib
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile
index 30a87c49d48c..0b4ac6a68058 100644
--- a/devel/etcd/Makefile
+++ b/devel/etcd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Highly-available key value store and service discovery
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 CONFLICTS_INSTALL=coreos-etcdctl-0.*
 
diff --git a/devel/euca2ools/Makefile b/devel/euca2ools/Makefile
index 28f07394a01e..40e59d4472a8 100644
--- a/devel/euca2ools/Makefile
+++ b/devel/euca2ools/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Eucalyptus Command Line Tools
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:${PORTSDIR}/www/py-requestbuilder \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:www/py-requestbuilder \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
 
 USES=		python:2.7
 USE_GITHUB=	yes
diff --git a/devel/eventxx/Makefile b/devel/eventxx/Makefile
index 0d02041de3ff..2b44718b6694 100644
--- a/devel/eventxx/Makefile
+++ b/devel/eventxx/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://proj.llucax.com.ar/home/eventxx/releases/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for libevent
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/evolution-gconf-tools/Makefile b/devel/evolution-gconf-tools/Makefile
index d6e92168070d..4c36394d0169 100644
--- a/devel/evolution-gconf-tools/Makefile
+++ b/devel/evolution-gconf-tools/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://people.redhat.com/dmalcolm/evolution-gconf-tools/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Scripts to make it easier to work with Evolution's configuration
 
-RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
+RUN_DEPENDS=	evolution:mail/evolution
 
 GNU_CONFIGURE=	yes
 USES=		python
diff --git a/devel/fastcrc/Makefile b/devel/fastcrc/Makefile
index 7e61115f5276..bdcccd32d534 100644
--- a/devel/fastcrc/Makefile
+++ b/devel/fastcrc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.whizkidtech.redprince.net/fports/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast CRC routines
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index 94cdd35a50b7..9ae476dd730e 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Facebook Bassline
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libthrift.so:${PORTSDIR}/devel/thrift-cpp
-BUILD_DEPENDS=	thrift:${PORTSDIR}/devel/thrift
+LIB_DEPENDS=	libthrift.so:devel/thrift-cpp
+BUILD_DEPENDS=	thrift:devel/thrift
 
 ACLOCAL_ARGS=	-I ./aclocal
 AUTOMAKE_ARGS=	-a
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index a469e7ad51e5..0b78403cb5e4 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Utilities to maintain file history, do file comparisons, and merges
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexplain.so:${PORTSDIR}/devel/libexplain
+LIB_DEPENDS=	libexplain.so:devel/libexplain
 
 OPTIONS_DEFINE=	NLS
 
diff --git a/devel/florist-gpl/Makefile b/devel/florist-gpl/Makefile
index 69f6718fded1..2feb1fe42d26 100644
--- a/devel/florist-gpl/Makefile
+++ b/devel/florist-gpl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	POSIX Ada binding, IEEE Standards 1003.5(b,c)
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake
 GNU_CONFIGURE=	yes
diff --git a/devel/flyspray/Makefile b/devel/flyspray/Makefile
index 0cdcb255a607..860b6f074229 100644
--- a/devel/flyspray/Makefile
+++ b/devel/flyspray/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://flyspray.org/packed/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple, easy-to-use web based bug tracking system
 
-RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb
+RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:databases/adodb
 
 USE_PHP=	pcre session zlib xml gd
 USES=		dos2unix zip
@@ -52,7 +52,7 @@ PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 MYSQL_USE=	PHP=mysql
 MYSQLI_USE=	PHP=mysqli
 PGSQL_USE=	PHP=pgsql
-GRAPHVIZ_RUN_DEPENDS=	${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz
+GRAPHVIZ_RUN_DEPENDS=	${LOCALBASE}/bin/dot:graphics/graphviz
 
 post-patch:
 	@${CP} ${PKGDIR}/files/README.FreeBSD ${WRKSRC}/docs/
diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile
index a87ab40ce03b..7e0d614b59f1 100644
--- a/devel/fnccheck/Makefile
+++ b/devel/fnccheck/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Profiling library/utilities for C/C++ programs
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libbfd.so:${PORTSDIR}/devel/libbfd
+LIB_DEPENDS=	libbfd.so:devel/libbfd
 
 USES=		autoreconf libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index efeff2c91524..d47d96580a95 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}%20${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CORBA 2.0 ORB written in Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 USES=		python
 USE_PYTHON=	distutils noegginfo
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index a739008137b1..9de1ec7c09c4 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -29,7 +29,7 @@ FUSE_DESC=	Enable fossil fusefs command
 JSON_CONFIGURE_ON=	--json
 STATIC_CONFIGURE_ON=	--static
 FUSE_CONFIGURE_OFF=	--disable-fusefs
-FUSE_LIB_DEPENDS=	libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
+FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
 FUSE_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 post-install:
diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile
index 297b1015e1fc..cb852e97d10d 100644
--- a/devel/fpc-bfd/Makefile
+++ b/devel/fpc-bfd/Makefile
@@ -14,6 +14,6 @@ MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR=	${WRKUNITDIR}
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/binutils
+RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:devel/binutils
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-dbus/Makefile b/devel/fpc-dbus/Makefile
index ecc240e106c7..8647e86e0659 100644
--- a/devel/fpc-dbus/Makefile
+++ b/devel/fpc-dbus/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	DBUS
 DBUS_DESC=	Install dbus library
 OPTIONS_DEFAULT=	DBUS
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-newt/Makefile b/devel/fpc-newt/Makefile
index deefa92aab52..b3c85014cb90 100644
--- a/devel/fpc-newt/Makefile
+++ b/devel/fpc-newt/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	NEWT
 NEWT_DESC=	Install newt library
 OPTIONS_DEFAULT=	NEWT
 
-NEWT_LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
+NEWT_LIB_DEPENDS=	libnewt.so:devel/newt
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/frama-c/Makefile b/devel/frama-c/Makefile
index 852a09c9e81d..8dd5b664b706 100644
--- a/devel/frama-c/Makefile
+++ b/devel/frama-c/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Extensible platform for source-code analysis of C
 
 LICENSE=	LGPL21
 
-EXTRACT_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-ocamlgraph
-RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-ocamlgraph
+EXTRACT_DEPENDS=	gtar:archivers/gtar
+BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:math/ocaml-ocamlgraph
+RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:math/ocaml-ocamlgraph
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/devel/freeocl/Makefile b/devel/freeocl/Makefile
index 06f3b17a1450..dd740307e728 100644
--- a/devel/freeocl/Makefile
+++ b/devel/freeocl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Free Open Computing Language (OpenCL) implementation for CPU
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops \
-		${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
+BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
+		${LOCALBASE}/include/CL/opencl.h:devel/opencl
 
 CONFLICTS=	ocl-icd[0-9]* opencl-icd[0-9]* pocl[0-9]*
 
diff --git a/devel/fstrm/Makefile b/devel/fstrm/Makefile
index 05f8f81789dc..4bb387e44623 100644
--- a/devel/fstrm/Makefile
+++ b/devel/fstrm/Makefile
@@ -12,7 +12,7 @@ COMMENT=		Implementation of the Frame Streams data transport protocol in C
 LICENSE=		APACHE20
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-LIB_DEPENDS=		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=		libevent.so:devel/libevent2
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		farsightsec
@@ -23,7 +23,7 @@ USE_LDCONFIG=		yes
 
 OPTIONS_DEFINE=		DOXYGEN
 DOXYGEN_DESC=		Use doxygen for docs
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	html-local
 
 PORTDOCS=		*
diff --git a/devel/fuel/Makefile b/devel/fuel/Makefile
index f7adbafb2223..81c083a00f39 100644
--- a/devel/fuel/Makefile
+++ b/devel/fuel/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GUI front-end to fossil SCM tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/fossil:${PORTSDIR}/devel/fossil
+RUN_DEPENDS=	${LOCALBASE}/bin/fossil:devel/fossil
 
 USES=		qmake
 USE_QT4=	corelib gui \
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index 485995d99972..a0b5733d6d18 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -41,7 +41,7 @@ CPPFLAGS+=	-DUSE_GAMIN_POLLER=1
 .if ${PORT_OPTIONS:MLIBINOTIFY}
 CONFIGURE_ARGS+=--enable-inotify
 LIBS+=		-linotify
-LIB_DEPENDS+=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS+=	libinotify.so:devel/libinotify
 .else
 CONFIGURE_ARGS+=--disable-inotify
 .endif
diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index 4cf9b7feb63f..79d064321da2 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -19,9 +19,9 @@ COMMENT=	UML modeling environment written in Python
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:${PORTSDIR}/devel/py-nose
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}zope.component>3.4.0:${PORTSDIR}/devel/py-zope.component
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}zope.component>3.4.0:devel/py-zope.component
 
 USE_GNOME=	pygtk2
 USES=		python
diff --git a/devel/gauche-readline/Makefile b/devel/gauche-readline/Makefile
index 6be96cec41b1..bf72c9106318 100644
--- a/devel/gauche-readline/Makefile
+++ b/devel/gauche-readline/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	gauche
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Pure gauche/scheme implementation of the Readline library
 
-RUN_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
-BUILD_DEPENDS=	gauche-config:${PORTSDIR}/lang/gauche
+RUN_DEPENDS=	gosh:lang/gauche
+BUILD_DEPENDS=	gauche-config:lang/gauche
 
 GAUCHE_LIBDIR=	share/gauche/site/lib
 GAUCHE_FILES=	readline/history.scm readline/keymap.scm readline/term-util.scm
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index e7f0e3858206..1ab801435d78 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-devel-${PORTVERSION:R}-${PORTVERSION:E}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Genetic Algorithm Utility Library
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS=	libslang.so:devel/libslang2
 
 USES=		gmake libtool tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 72b1fafaa63f..8668f13176d9 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GUI builder for the GTK+ toolkit
 LICENSE=	LGPL21+ # source mentions LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:${PORTSDIR}/x11-toolkits/py-kiwi
-BUILD_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:${PORTSDIR}/x11-toolkits/py-kiwi
+RUN_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:x11-toolkits/py-kiwi
+BUILD_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:x11-toolkits/py-kiwi
 
 USES=		desktop-file-utils gettext python
 USE_GNOME=	pygtk2
diff --git a/devel/gb/Makefile b/devel/gb/Makefile
index 2dfa738e3b6f..91168f046421 100644
--- a/devel/gb/Makefile
+++ b/devel/gb/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Project based build tool for Go
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	constabulary
diff --git a/devel/gcc-arm-embedded/Makefile b/devel/gcc-arm-embedded/Makefile
index 1b0016fbbb16..0822a7d0a8d4 100644
--- a/devel/gcc-arm-embedded/Makefile
+++ b/devel/gcc-arm-embedded/Makefile
@@ -21,16 +21,16 @@ PDF_DESC=	Install PDF documentation (requires TeX, it is huge)
 PYGDB_DESC=	Build and install pyhon-enabled gdb in addition to standard one
 
 PURE_LIB_DEPENDS_OFF=	\
-			libexpat.so:${PORTSDIR}/textproc/expat2 \
-			libgmp.so:${PORTSDIR}/math/gmp \
-			libmpfr.so:${PORTSDIR}/math/mpfr \
-			libmpc.so:${PORTSDIR}/math/mpc \
-			libisl.so:${PORTSDIR}/devel/isl \
-			libcloog-isl.so:${PORTSDIR}/math/cloog \
-			libelf.so:${PORTSDIR}/devel/libelf
+			libexpat.so:textproc/expat2 \
+			libgmp.so:math/gmp \
+			libmpfr.so:math/mpfr \
+			libmpc.so:math/mpc \
+			libisl.so:devel/isl \
+			libcloog-isl.so:math/cloog \
+			libelf.so:devel/libelf
 
 PDF_USE=		TEX=base:build,tex:build,dvipsk:build
-PDF_BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo
+PDF_BUILD_DEPENDS=	texi2dvi:print/texinfo
 OPTIONS_SUB=		yes
 PYGDB_USES=		python:2
 
diff --git a/devel/gcc-msp430-ti-toolchain/Makefile b/devel/gcc-msp430-ti-toolchain/Makefile
index d94a1b462bcf..582400e61df0 100644
--- a/devel/gcc-msp430-ti-toolchain/Makefile
+++ b/devel/gcc-msp430-ti-toolchain/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Complete gcc-based toolcahin for TI MSP430 uC
 LICENSE=	GPLv2 LGPL20 LGPL21 GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	expect:${PORTSDIR}/lang/expect \
-		flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	expect:lang/expect \
+		flex:textproc/flex
 
 OPTIONS_DEFINE=	INSIGHT PURE
 OPTIONS_DEFAULT=
@@ -35,9 +35,9 @@ INSIGHT_USE=			XORG=x11
 PURE_CONFIGURE_OFF=	--with-gmp=${PREFIX} \
 			--with-mprf=${PREFIX} \
 			--with-mpc=${PREFIX}
-PURE_LIB_DEPENDS_OFF=	libgmp.so:${PORTSDIR}/math/gmp \
-			libmpfr.so:${PORTSDIR}/math/mpfr \
-			libmpc.so:${PORTSDIR}/math/mpc
+PURE_LIB_DEPENDS_OFF=	libgmp.so:math/gmp \
+			libmpfr.so:math/mpfr \
+			libmpc.so:math/mpc
 PURE_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-libgui_configure \
 			${PATCHDIR}/extra-patch-gdb_configure
 
@@ -59,7 +59,7 @@ MAKE_JOBS_UNSAFE=	yes
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MPURE} && ${PORT_OPTIONS:MINSIGHT}
-RUN_DEPENDS+=		iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
+RUN_DEPENDS+=		iwidgets>0:x11-toolkits/iwidgets
 USES+=			tk:84+
 CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} \
 			--with-tk=${TK_LIBDIR}
diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile
index 206b90025506..9e1a60036ac6 100644
--- a/devel/gccmakedep/Makefile
+++ b/devel/gccmakedep/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Create dependencies in makefiles using 'gcc -M'
 
 XORG_CAT=	util
 
-BUILD_DEPENDS=	tradcpp:${PORTSDIR}/devel/tradcpp
+BUILD_DEPENDS=	tradcpp:devel/tradcpp
 
 PLIST_FILES=	bin/gccmakedep man/man1/gccmakedep.1.gz
 CONFIGURE_ENV+=	ac_cv_path_RAWCPP=tradcpp
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index ff4180e74280..cc9f7ebb0bb5 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -20,8 +20,8 @@ USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libpolkit-gobject-1.so:sysutils/polkit
 
 USES+=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	orbit2 gtk20 libxml2 \
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 6ed9f1891d00..b3ddc99d7ff3 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for gconf2 API library
 
-LIB_DEPENDS=	libglibmm-2.4.so:${PORTSDIR}/devel/glibmm
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		${LOCALBASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libglibmm-2.4.so:devel/glibmm
+BUILD_DEPENDS=	gm4:devel/m4 \
+		${LOCALBASE}/lib/libgtkmm-2.4.so.1:x11-toolkits/gtkmm24
 
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_XORG=	x11
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 9abc999612b2..36b90c542250 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GNU GDB of newer version than comes with the system
 
 LICENSE=	GPLv3
 
-TEST_DEPENDS=	runtest:${PORTSDIR}/misc/dejagnu
+TEST_DEPENDS=	runtest:misc/dejagnu
 
 TEST_TARGET=	check
 USES=		cpe iconv gmake libtool tar:xz
@@ -57,10 +57,10 @@ BASE_READLINE_CFLAGS=	-D_rl_echoing_p=readline_echoing_p
 BUNDLED_READLINE_CONFIGURE_OFF=	--with-system-readline
 DEBUG_CFLAGS=		-g
 EXPAT_CONFIGURE_WITH=	expat
-EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 GUILE_CONFIGURE_WITH=	guile
 GUILE_USES=		pkgconfig
-GUILE_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 PORT_READLINE_USES=	readline:port
 PYTHON_CONFIGURE_ON=	--with-python=${PYTHON_CMD}
 PYTHON_CONFIGURE_OFF=	--without-python
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index 4a1c42cd9fff..ccfdc1a24315 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -43,8 +43,8 @@ CFLAGS+=	-Dreadline_echoing_p=_rl_echoing_p
 .if ${PORT_OPTIONS:MINSIGHT}
 PKGNAMESUFFIX=	-insight
 USES+=		tk
-LIB_DEPENDS=	libitk.so:${PORTSDIR}/x11-toolkits/itk
-RUN_DEPENDS=	iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
+LIB_DEPENDS=	libitk.so:x11-toolkits/itk
+RUN_DEPENDS=	iwidgets>0:x11-toolkits/iwidgets
 DISTFILES+=	gdbtk-6.6${EXTRACT_SUFX}:gdbtk
 PLIST_SUB+=	INSIGHT=''
 EXTRA_PATCHES=	${FILESDIR}/itcl33-patch \
diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index 8db998e2b406..97a0e08a01f8 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Grassroots DICOM library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15 \
+		libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=		DOXYGEN
 OPTIONS_RADIO=		VTK
 OPTIONS_RADIO_VTK=	VTK5 VTK6
 OPTIONS_SUB=		yes
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			docbook-xsl-ns>0:${PORTSDIR}/textproc/docbook-xsl-ns
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			docbook-xsl-ns>0:textproc/docbook-xsl-ns
 DOXYGEN_USES=		ghostscript
 DOXYGEN_USE=		gnome=libxslt:build tex=latex:build
 DOXYGEN_CMAKE_ON=	-DGDCM_DOCUMENTATION:BOOL=ON \
@@ -31,11 +31,11 @@ DOXYGEN_CMAKE_ON=	-DGDCM_DOCUMENTATION:BOOL=ON \
 DOXYGEN_CMAKE_OFF=	-DGDCM_DOCUMENTATION:BOOL=OFF
 
 VTK5_DESC=		Build VTK 5 integration classes
-VTK5_LIB_DEPENDS=	libvtkHybrid.so:${PORTSDIR}/math/vtk5
+VTK5_LIB_DEPENDS=	libvtkHybrid.so:math/vtk5
 VTK5_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=ON \
 			-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK5_VERSION}
 VTK6_DESC=		Build VTK 6 integration classes
-VTK6_LIB_DEPENDS=	libvtkCommonCore-${VTK6_VERSION}.so:${PORTSDIR}/math/vtk6
+VTK6_LIB_DEPENDS=	libvtkCommonCore-${VTK6_VERSION}.so:math/vtk6
 VTK6_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=ON \
 			-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK6_VERSION}
 
diff --git a/devel/geany-plugin-ctags/Makefile b/devel/geany-plugin-ctags/Makefile
index 183c4ab98d38..666132402a04 100644
--- a/devel/geany-plugin-ctags/Makefile
+++ b/devel/geany-plugin-ctags/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
+RUN_DEPENDS=	exctags:devel/ctags
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-devhelp/Makefile b/devel/geany-plugin-devhelp/Makefile
index a207317ce68e..b22277713dc2 100644
--- a/devel/geany-plugin-devhelp/Makefile
+++ b/devel/geany-plugin-devhelp/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwnck-1.so:x11-toolkits/libwnck \
+		libwebkitgtk-1.0.so:www/webkit-gtk2
 
 USE_GNOME=	gconf2
 
diff --git a/devel/geany-plugin-gendoc/Makefile b/devel/geany-plugin-gendoc/Makefile
index 634b4af14d73..e137594248a8 100644
--- a/devel/geany-plugin-gendoc/Makefile
+++ b/devel/geany-plugin-gendoc/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libctpl.so:${PORTSDIR}/textproc/ctpl
-RUN_DEPENDS=	${LOCALBASE}/bin/rst2html:${PORTSDIR}/textproc/py-docutils
+LIB_DEPENDS=	libctpl.so:textproc/ctpl
+RUN_DEPENDS=	${LOCALBASE}/bin/rst2html:textproc/py-docutils
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-geniuspaste/Makefile b/devel/geany-plugin-geniuspaste/Makefile
index 19cc5e172e41..3736e5f52bad 100644
--- a/devel/geany-plugin-geniuspaste/Makefile
+++ b/devel/geany-plugin-geniuspaste/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-git-changebar/Makefile b/devel/geany-plugin-git-changebar/Makefile
index be24ea56cc88..1f474b0e32bf 100644
--- a/devel/geany-plugin-git-changebar/Makefile
+++ b/devel/geany-plugin-git-changebar/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-markdown/Makefile b/devel/geany-plugin-markdown/Makefile
index 1d6156eb8e89..7cc32b2c2556 100644
--- a/devel/geany-plugin-markdown/Makefile
+++ b/devel/geany-plugin-markdown/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-multiterm/Makefile b/devel/geany-plugin-multiterm/Makefile
index d9199a261d7c..4d2e79601057 100644
--- a/devel/geany-plugin-multiterm/Makefile
+++ b/devel/geany-plugin-multiterm/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 USE_GNOME=	vte
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
diff --git a/devel/geany-plugin-pg/Makefile b/devel/geany-plugin-pg/Makefile
index b4daffd04a9b..ce9573605dd5 100644
--- a/devel/geany-plugin-pg/Makefile
+++ b/devel/geany-plugin-pg/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
-RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
+LIB_DEPENDS=	libgpgme.so:security/gpgme
+RUN_DEPENDS=	gpg2:security/gnupg
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-spellcheck/Makefile b/devel/geany-plugin-spellcheck/Makefile
index 1b2d26b926e4..55e22db41456 100644
--- a/devel/geany-plugin-spellcheck/Makefile
+++ b/devel/geany-plugin-spellcheck/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-updatechecker/Makefile b/devel/geany-plugin-updatechecker/Makefile
index 2f934b4d23e7..194e7c0f2a06 100644
--- a/devel/geany-plugin-updatechecker/Makefile
+++ b/devel/geany-plugin-updatechecker/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-vc/Makefile b/devel/geany-plugin-vc/Makefile
index 3c81b98e0c9e..2dca198ce3cf 100644
--- a/devel/geany-plugin-vc/Makefile
+++ b/devel/geany-plugin-vc/Makefile
@@ -11,7 +11,7 @@ OPTIONS_DEFINE=	GTKSPELL
 OPTIONS_DEFAULT=	GTKSPELL
 
 GTKSPELL_DESC=	Spell checking support via GtkSpell
-GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 GTKSPELL_CONFIGURE_ENABLE=	gtkspell
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
diff --git a/devel/geany-plugin-webhelper/Makefile b/devel/geany-plugin-webhelper/Makefile
index 666b2b07c918..84e9c7e94e0e 100644
--- a/devel/geany-plugin-webhelper/Makefile
+++ b/devel/geany-plugin-webhelper/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugins/Makefile b/devel/geany-plugins/Makefile
index 5d097c05056f..f2d9e4a291f7 100644
--- a/devel/geany-plugins/Makefile
+++ b/devel/geany-plugins/Makefile
@@ -19,9 +19,9 @@ NO_OPTIONS_SORT=	yes
 
 .for plugin in ${GEANY_PLUGINS_ALL}
 ${plugin:tu}_DESC=	${${plugin}_DESC}
-${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:${PORTSDIR}/devel/geany-plugin-${plugin}
+${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}
 .endfor
 
-NLS_RUN_DEPENDS=	geany-plugins-l10n>=0:${PORTSDIR}/devel/geany-plugins-l10n
+NLS_RUN_DEPENDS=	geany-plugins-l10n>=0:devel/geany-plugins-l10n
 
 .include <bsd.port.mk>
diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common
index c2b043d11028..9a327a8d2ffb 100644
--- a/devel/geany-plugins/files/Makefile.common
+++ b/devel/geany-plugins/files/Makefile.common
@@ -6,8 +6,8 @@ MASTER_SITES=	http://plugins.geany.org/geany-plugins/
 DISTNAME=	geany-plugins-${PORTVERSION}
 DISTINFO_FILE=	${.CURDIR}/../../devel/geany-plugins/distinfo
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany
-RUN_DEPENDS+=	${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany
+BUILD_DEPENDS+=	${LOCALBASE}/bin/geany:devel/geany
+RUN_DEPENDS+=	${LOCALBASE}/bin/geany:devel/geany
 
 GNU_CONFIGURE=	yes
 USES+=		gettext-tools gmake libtool pkgconfig tar:bzip2
diff --git a/devel/gearmand-devel/Makefile b/devel/gearmand-devel/Makefile
index d97cfbdec6c5..973e492a2222 100644
--- a/devel/gearmand-devel/Makefile
+++ b/devel/gearmand-devel/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Gearman C Server and Library
 
-BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs \
-		${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs \
+		${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
+LIB_DEPENDS=	libevent.so:devel/libevent2 \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 CONFLICTS=	p5-Gearman-Server-1.* gearmand-1.0.*
 
@@ -48,15 +48,15 @@ TOKYOCAB_DESC=	Tokyo Cabinet support for persistent queue
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDRIZZLE}
-LIB_DEPENDS+=		libdrizzleso:${PORTSDIR}/databases/libdrizzle
+LIB_DEPENDS+=		libdrizzleso:databases/libdrizzle
 CONFIGURE_ARGS+=	--enable-libdrizzle
 .else
 CONFIGURE_ARGS+=	--disable-libdrizzle
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
-LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
-BUILD_DEPENDS+=		memcached>=0:${PORTSDIR}/databases/memcached
+LIB_DEPENDS+=		libmemcached.so:databases/libmemcached
+BUILD_DEPENDS+=		memcached>=0:databases/memcached
 CONFIGURE_ARGS+=	--enable-libmemcached
 # This hack is required for the test programs invoked by configure,
 # in the event that libmemcached was compiled with SASL support.
@@ -89,15 +89,15 @@ CONFIGURE_ARGS+=	--disable-libpq
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-BUILD_DEPENDS+=		sqlite3>=3.0.0:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS+=		sqlite3>=3.0.0:databases/sqlite3
+LIB_DEPENDS+=		libsqlite3.so:databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MTOKYOCAB}
-LIB_DEPENDS+=		libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=		libtokyocabinet.so:databases/tokyocabinet
 CONFIGURE_ARGS+=	--enable-libtokyocabinet
 CONFIGURE_ENV+=		LIBTOKYOCABINET_CPPFLAGS=-I${LOCALBASE}/include \
 			LIBTOKYOCABINET_LDFLAGS=-L${LOCALBASE}/lib
@@ -106,7 +106,7 @@ CONFIGURE_ARGS+=	--disable-libtokyocabinet
 .endif
 
 .if ${PORT_OPTIONS:MHIREDIS}
-LIB_DEPENDS+=		libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=		libhiredis.so:databases/hiredis
 CONFIGURE_ARGS+=	--enable-hires
 CONFIGURE_ENV+=		LIBHIREDIS_CPPFLAGS=-I${LOCALBASE}/include/hiredis \
 			LIBHIREDIS_LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile
index ca355a09c6a1..44417ad3f809 100644
--- a/devel/gearmand/Makefile
+++ b/devel/gearmand/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Gearman C Server and Library
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs \
-		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
+LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
+		libevent.so:devel/libevent2 \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 CONFLICTS=	p5-Gearman-Server-1.* gearmand-1.1.*
 
@@ -46,15 +46,15 @@ TOKYOCAB_DESC=	Tokyo Cabinet support for persistent queue
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDRIZZLE}
-LIB_DEPENDS+=		libdrizzle.so:${PORTSDIR}/databases/libdrizzle
+LIB_DEPENDS+=		libdrizzle.so:databases/libdrizzle
 CONFIGURE_ARGS+=	--enable-libdrizzle
 .else
 CONFIGURE_ARGS+=	--disable-libdrizzle
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
-LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
-BUILD_DEPENDS+=		memcached>=0:${PORTSDIR}/databases/memcached
+LIB_DEPENDS+=		libmemcached.so:databases/libmemcached
+BUILD_DEPENDS+=		memcached>=0:databases/memcached
 CONFIGURE_ARGS+=	--enable-libmemcached
 # This hack is required for the test programs invoked by configure,
 # in the event that libmemcached was compiled with SASL support.
@@ -87,15 +87,15 @@ CONFIGURE_ARGS+=	--disable-libpq
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-BUILD_DEPENDS+=		sqlite3>=3.0.0:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS+=		sqlite3>=3.0.0:databases/sqlite3
+LIB_DEPENDS+=		libsqlite3.so:databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MTOKYOCAB}
-LIB_DEPENDS+=		libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=		libtokyocabinet.so:databases/tokyocabinet
 CONFIGURE_ARGS+=	--enable-libtokyocabinet
 CONFIGURE_ENV+=		LIBTOKYOCABINET_CPPFLAGS=-I${LOCALBASE}/include \
 			LIBTOKYOCABINET_LDFLAGS=-L${LOCALBASE}/lib
@@ -104,7 +104,7 @@ CONFIGURE_ARGS+=	--disable-libtokyocabinet
 .endif
 
 .if ${PORT_OPTIONS:MHIREDIS}
-LIB_DEPENDS+=		libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=		libhiredis.so:databases/hiredis
 CONFIGURE_ARGS+=	--enable-hires
 CONFIGURE_ENV+=		LIBHIREDIS_CPPFLAGS=-I${LOCALBASE}/include/hiredis \
 			LIBHIREDIS_LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/gecode/Makefile b/devel/gecode/Makefile
index df092d628e61..990f9971f021 100644
--- a/devel/gecode/Makefile
+++ b/devel/gecode/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generic Constraint Development Environment
 LICENSE=	BSL MIT
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	libmpfr.so:math/mpfr
 
 USES=		bison gmake perl5
 USE_PERL5=	build
diff --git a/devel/generatorrunner/Makefile b/devel/generatorrunner/Makefile
index c63a7070d195..62fd691679c8 100644
--- a/devel/generatorrunner/Makefile
+++ b/devel/generatorrunner/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Tool to create binding generators for C++ and Qt libraries
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libapiextractor.so:${PORTSDIR}/devel/apiextractor
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+LIB_DEPENDS=	libapiextractor.so:devel/apiextractor
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
diff --git a/devel/geoip-java/Makefile b/devel/geoip-java/Makefile
index 9c3f01d69367..d332f586f7ce 100644
--- a/devel/geoip-java/Makefile
+++ b/devel/geoip-java/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java bindings for GeoIP API
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	GeoIP>=1.4.8:${PORTSDIR}/net/GeoIP
+RUN_DEPENDS=	GeoIP>=1.4.8:net/GeoIP
 
 PKGNAMESUFFIX:=	-java
 USES=		zip
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index 7f2772ac1678..03c0932af64c 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -13,10 +13,10 @@ COMMENT=	GTK+ frontend for git version control system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		itstool:${PORTSDIR}/textproc/itstool
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+BUILD_DEPENDS=	git:devel/git \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		itstool:textproc/itstool
+RUN_DEPENDS=	git:devel/git
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_DEFAULT=	NLS
diff --git a/devel/git-bzr-ng/Makefile b/devel/git-bzr-ng/Makefile
index c89a3dab0f63..4fa69b52027c 100644
--- a/devel/git-bzr-ng/Makefile
+++ b/devel/git-bzr-ng/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Bi-directional git to bzr bridge
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git \
-		bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_SITELIBDIR}/bzrlib/plugins/fastimport/__init__.py:${PORTSDIR}/devel/bzr-fastimport
+RUN_DEPENDS=	git:devel/git \
+		bzr:devel/bzr \
+		${PYTHON_SITELIBDIR}/bzrlib/plugins/fastimport/__init__.py:devel/bzr-fastimport
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	termie
diff --git a/devel/git-codereview/Makefile b/devel/git-codereview/Makefile
index 33820bf8aa2f..e6e600be1e7e 100644
--- a/devel/git-codereview/Makefile
+++ b/devel/git-codereview/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Command-line tool for working with Gerrit
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
diff --git a/devel/git-cvs/Makefile b/devel/git-cvs/Makefile
index fb4536cfae27..f84244f0e3e1 100644
--- a/devel/git-cvs/Makefile
+++ b/devel/git-cvs/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel python
 MAINTAINER=	mp39590@gmail.com
 COMMENT=	Tool to incrementally import changesets from CVS into Git
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rcsparse>0:${PORTSDIR}/devel/py-rcsparse \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rcsparse>0:devel/py-rcsparse \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
diff --git a/devel/git-extras/Makefile b/devel/git-extras/Makefile
index 3c4557b7d2d1..2f2ebee7bc8d 100644
--- a/devel/git-extras/Makefile
+++ b/devel/git-extras/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Sub-commands for repo summary, repl, changelog population, and more
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	git:devel/git \
+		bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tj
diff --git a/devel/git-merge-changelog/Makefile b/devel/git-merge-changelog/Makefile
index f41482a5391a..fa0b26b7df05 100644
--- a/devel/git-merge-changelog/Makefile
+++ b/devel/git-merge-changelog/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Git "merge" driver for GNU style ChangeLog files
 
 EXTRACT_DEPENDS=	${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR}	\
-			automake-1.15:${PORTSDIR}/devel/automake		\
-			autoconf-2.69:${PORTSDIR}/devel/autoconf
+			automake-1.15:devel/automake		\
+			autoconf-2.69:devel/autoconf
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile
index f43cf883025e..a35a6bdc7bbe 100644
--- a/devel/git-modes/Makefile
+++ b/devel/git-modes/Makefile
@@ -27,8 +27,8 @@ OPTIONS_DEFINE=	DOCS GIT_SUBVERSION
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 PLIST_SUB=	ELISPDIR=${ELISPDIR}
 GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:${PORTSDIR}/devel/git
+GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
+GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:devel/git
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/git-review/Makefile b/devel/git-review/Makefile
index e46f3175a2d3..b818f1ae3e61 100644
--- a/devel/git-review/Makefile
+++ b/devel/git-review/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Allow to push code to review and interact with a Gerrit server
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git \
-		${PYTHON_PKGNAMEPREFIX}requests>2.4:${PORTSDIR}/www/py-requests
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr
+RUN_DEPENDS=	git:devel/git \
+		${PYTHON_PKGNAMEPREFIX}requests>2.4:www/py-requests
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/git/Makefile b/devel/git/Makefile
index c7527aa1adbc..15998b487237 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -59,21 +59,21 @@ NLS_MAKE_ARGS_OFF=	NO_GETTEXT=yes
 
 PERL_USES=		perl5
 PERL_MAKE_ENV=		PERL_PATH=${PERL}
-PERL_BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
-PERL_RUN_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
+PERL_BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error
+PERL_RUN_DEPENDS=	p5-Error>=0:lang/p5-Error
 PERL_MAKE_ARGS_OFF=	NO_PERL=1
 
 SEND_EMAIL_IMPLIES=	PERL
-SEND_EMAIL_RUN_DEPENDS= p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \
-			p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
+SEND_EMAIL_RUN_DEPENDS= p5-Net-SMTP-SSL>=0:mail/p5-Net-SMTP-SSL \
+			p5-Authen-SASL>=0:security/p5-Authen-SASL
 
 ICONV_USES=		iconv
 ICONV_MAKE_ARGS_OFF=	NO_ICONV=1
 
 CURL_MAKE_ENV=		CURLDIR=${LOCALBASE}
-CURL_BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-CURL_RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-CURL_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+CURL_BUILD_DEPENDS=	curl:ftp/curl
+CURL_RUN_DEPENDS=	curl:ftp/curl
+CURL_LIB_DEPENDS=	libexpat.so:textproc/expat2
 CURL_MAKE_ARGS_OFF=	NO_CURL=1 NO_EXPAT=1
 
 HTMLDOCS_DISTFILES=	${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX}
@@ -87,14 +87,14 @@ GUI_MAKE_ARGS_OFF=	NO_TCLTK=yes
 # to have git use devel/subversion18 it will be brought in through
 # devel/p5-subversion if you set WITH_SUBVERSION_VER=18. Otherwise
 # devel/subversion will be brought in.
-SVN_RUN_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-			p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+SVN_RUN_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+			p5-subversion>=0:devel/p5-subversion
 
-CONTRIB_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
-			asciidoc:${PORTSDIR}/textproc/asciidoc \
-			docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+CONTRIB_BUILD_DEPENDS=	xmlto:textproc/xmlto \
+			asciidoc:textproc/asciidoc \
+			docbook-xml>0:textproc/docbook-xml
 
-CVS_RUN_DEPENDS=	cvsps:${PORTSDIR}/devel/cvsps
+CVS_RUN_DEPENDS=	cvsps:devel/cvsps
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/gitflow/Makefile b/devel/gitflow/Makefile
index 2fdd705f0581..e4e2dfe42849 100644
--- a/devel/gitflow/Makefile
+++ b/devel/gitflow/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Git extensions to provide high-level repository operations
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt
+RUN_DEPENDS=	${LOCALBASE}/bin/getopt:misc/getopt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nbari
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index ba9bc3704d74..e83011d6ad9c 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -12,15 +12,15 @@ COMMENT=	GTK-based git repository viewer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libgit2-glib-1.0.so:${PORTSDIR}/devel/libgit2-glib \
-		libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
-		libsecret-1.so:${PORTSDIR}/security/libsecret
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		valac:${PORTSDIR}/lang/vala
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libgee-0.8.so:devel/libgee \
+		libgit2-glib-1.0.so:devel/libgit2-glib \
+		libpeas-1.0.so:devel/libpeas \
+		libgtkspell3-3.so:textproc/gtkspell3 \
+		libsecret-1.so:security/libsecret
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		valac:lang/vala
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 CONFLICTS=	gitg0-[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/devel/gitg0/Makefile b/devel/gitg0/Makefile
index 6913a463bc23..e528b49cc671 100644
--- a/devel/gitg0/Makefile
+++ b/devel/gitg0/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GTK-based git repository viewer (gtk2 version)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 CONFLICTS=	gitg-[0-9]*
 
diff --git a/devel/github-backup-utils/Makefile b/devel/github-backup-utils/Makefile
index 626b80bd9e1d..d33bab52e005 100644
--- a/devel/github-backup-utils/Makefile
+++ b/devel/github-backup-utils/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	devel
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	GitHub Enterprise Backup Utilities
 
-RUN_DEPENDS=	git>0:${PORTSDIR}/devel/git \
-		rsync>0:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	git>0:devel/git \
+		rsync>0:net/rsync
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	github
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index a51001f91b10..027eed0ff2d2 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	ports@toco-domains.de
 COMMENT=	GitLab Shell handles git commands for GitLab
 
-BUILD_DEPENDS=	ruby>=2.1.5:${PORTSDIR}/lang/ruby21 \
-		gem:${PORTSDIR}/devel/ruby-gems
+BUILD_DEPENDS=	ruby>=2.1.5:lang/ruby21 \
+		gem:devel/ruby-gems
 
 USERS=		git
 GROUPS=		git
diff --git a/devel/gitlist/Makefile b/devel/gitlist/Makefile
index 44f75edff086..831d67a2e3cb 100644
--- a/devel/gitlist/Makefile
+++ b/devel/gitlist/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Web based Git repository browser written in PHP
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 PLIST=		${WRKDIR}/plist
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index de50661d53b9..29dcfa7b26cb 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Access control layer on top of git
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+RUN_DEPENDS=	git>=0:devel/git \
+		p5-JSON>=0:converters/p5-JSON
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sitaramc
diff --git a/devel/gitolite2/Makefile b/devel/gitolite2/Makefile
index deb95088ddaf..33c00ad0c0a0 100644
--- a/devel/gitolite2/Makefile
+++ b/devel/gitolite2/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Access control layer on top of git
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
-RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git>=0:devel/git
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sitaramc
diff --git a/devel/gitphp/Makefile b/devel/gitphp/Makefile
index 4744a39ad9e2..eadcbaeb6deb 100644
--- a/devel/gitphp/Makefile
+++ b/devel/gitphp/Makefile
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:${PORTSDIR}/textproc/pecl-xdiff
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:textproc/pecl-xdiff
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/devel/gittrac/Makefile b/devel/gittrac/Makefile
index 0a3530c98f79..165be07ef283 100644
--- a/devel/gittrac/Makefile
+++ b/devel/gittrac/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 
 COMMENT=	Web-Based Bug And Patch-Set Tracking System For Git
 
-RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git>=0:devel/git
 
 MASTERDIR=	${.CURDIR}/../cvstrac
 MAKE_ARGS=	APPNAME=gittrac
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 2bd636e3f73e..90abd5a877b3 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	User interface builder for GTK+ 3
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 CONFLICTS=	glade3-3.*
 PORTSCOUT=	limitw:1,even
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 8f2530b0ceca..262c2403387d 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	User interface builder for GTK+
 
-LIB_DEPENDS=	librarian.so:${PORTSDIR}/textproc/rarian
+LIB_DEPENDS=	librarian.so:textproc/rarian
 
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index f18e50141a85..b903036aec1f 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -17,8 +17,8 @@ PORTSCOUT=	limitw:1,even
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		libffi.so:devel/libffi
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -78,7 +78,7 @@ GLIB_ARCH=	${ARCH}
 CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL}
 
 .if ${PORT_OPTIONS:MCOLLATION_FIX}
-LIB_DEPENDS+=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicui18n.so:devel/icu
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 		${FILESDIR}/extra-patch-glib_gunicollate.c
 # Disable it until someone can figure why it causes net-im/pidgin crashed.
diff --git a/devel/glibmm-reference/Makefile b/devel/glibmm-reference/Makefile
index 4e9069ab32f7..ff2472464370 100644
--- a/devel/glibmm-reference/Makefile
+++ b/devel/glibmm-reference/Makefile
@@ -3,8 +3,8 @@
 
 PORTREVISION=	0
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:${PORTSDIR}/devel/glibmm \
-		gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:devel/glibmm \
+		gm4:devel/m4
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 4c4369d08592..e4473faed5f6 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -18,7 +18,7 @@ PLIST_SUB=	VERSION="2.4"
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES+=		gettext gmake libtool pathfix perl5 pkgconfig
 USE_GNOME=	glib20 libsigc++20
diff --git a/devel/glog/Makefile b/devel/glog/Makefile
index edf6d2f422db..19035040eed7 100644
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library of C++ classes for flexible logging
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgflags.so:${PORTSDIR}/devel/gflags
+LIB_DEPENDS=	libgflags.so:devel/gflags
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/gnatcoll/Makefile b/devel/gnatcoll/Makefile
index 07e91d4bf2cd..2f21f867c31d 100644
--- a/devel/gnatcoll/Makefile
+++ b/devel/gnatcoll/Makefile
@@ -13,11 +13,11 @@ COMMENT=	GNAT Component Collection from Adacore
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \
-		gnat_util>=20140422:${PORTSDIR}/lang/gnat_util
-LIB_DEPENDS=	libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 \
-		libgmp.so:${PORTSDIR}/math/gmp
-RUN_DEPENDS=	gnat_util>=20140422:${PORTSDIR}/lang/gnat_util
+BUILD_DEPENDS=	gprbuild>=20120510:devel/gprbuild \
+		gnat_util>=20140422:lang/gnat_util
+LIB_DEPENDS=	libgtkada.so:x11-toolkits/gtkada3 \
+		libgmp.so:math/gmp
+RUN_DEPENDS=	gnat_util>=20140422:lang/gnat_util
 
 USES=		ada gmake pkgconfig python
 USE_GNOME=	pygobject3
@@ -32,7 +32,7 @@ MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 OPTIONS_DEFINE=		READLINE SYSLOG PGSQL ICONV DOCS EXAMPLES
 OPTIONS_DEFAULT=	READLINE SYSLOG
 OPTIONS_SUB=		yes
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 SYSLOG_CONFIGURE_ENABLE=	syslog
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL}
diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile
index 35fe45ab1731..f0e0c5ee1ef3 100644
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@@ -12,14 +12,14 @@ COMMENT=	IDE for writing software for GNOME
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	intltool-update:${PORTSDIR}/textproc/intltool \
-		llvm-config35:${PORTSDIR}/devel/llvm35 \
-		clang35:${PORTSDIR}/lang/clang35
-LIB_DEPENDS=	libgit2-glib-1.0.so:${PORTSDIR}/devel/libgit2-glib \
-		libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libdevhelp-3.so:${PORTSDIR}/devel/devhelp \
-		libgjs.so:${PORTSDIR}/lang/gjs \
-		libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	intltool-update:textproc/intltool \
+		llvm-config35:devel/llvm35 \
+		clang35:lang/clang35
+LIB_DEPENDS=	libgit2-glib-1.0.so:devel/libgit2-glib \
+		libpeas-1.0.so:devel/libpeas \
+		libdevhelp-3.so:devel/devhelp \
+		libgjs.so:lang/gjs \
+		libpcre.so:devel/pcre
 
 BROKEN_FreeBSD_9=	Does not builds
 
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 755335f4eee5..f76280957537 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Common automake macros for GNOME 3
 
-BUILD_DEPENDS=	autoconf-archive>=0:${PORTSDIR}/devel/autoconf-archive
-RUN_DEPENDS=	autoconf-archive>=0:${PORTSDIR}/devel/autoconf-archive
+BUILD_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive
+RUN_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive
 
 USES=		gmake gnome pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 94da0f86e05b..df1615f94237 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -15,7 +15,7 @@ USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
+RUN_DEPENDS=	update-mime-database:misc/shared-mime-info
 
 USES+=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gconf2 gnomemimedata intlhack referencehack
@@ -50,18 +50,18 @@ USES+=		fam
 .endif
 
 .if exists(${LOCALBASE}/lib/libkrb5.so)
-LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	libkrb5.so:security/heimdal
 .endif
 
 .if ${PORT_OPTIONS:MHAL}
 CONFIGURE_ARGS+=--enable-hal
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	libhal.so:sysutils/hal
 .else
 CONFIGURE_ARGS+=--disable-hal
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS+=	libsmbclient.so:net/samba-libsmbclient
 PLIST_SUB+=	SAMBA=""
 .else
 PLIST_SUB+=	SAMBA="@comment "
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=--disable-samba
 .endif
 
 .if ${PORT_OPTIONS:MMDNS}
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
 .else
 CONFIGURE_ARGS+=--disable-avahi
 .endif
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 69f71d6a3431..090d9a1ae403 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for gnomevfs2 library
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	glibmm gnomevfs2
diff --git a/devel/gnu-efi/Makefile b/devel/gnu-efi/Makefile
index eeb865474f61..73dd2e45ebb9 100644
--- a/devel/gnu-efi/Makefile
+++ b/devel/gnu-efi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	SDK for EFI applications
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:devel/binutils
 
 USES=		gmake tar:bz2
 USE_GCC=	yes
diff --git a/devel/gnulib/Makefile b/devel/gnulib/Makefile
index 7cea2b8f10bd..d44ed6104049 100644
--- a/devel/gnulib/Makefile
+++ b/devel/gnulib/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-stable
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU portability library
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
 USES=		gmake perl5 shebangfix
 SHEBANG_FILES=	check-module
diff --git a/devel/go-bindata/Makefile b/devel/go-bindata/Makefile
index 796982e32751..5d08880d52cc 100644
--- a/devel/go-bindata/Makefile
+++ b/devel/go-bindata/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generates Go code from any file
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jteeuwen
diff --git a/devel/go-pretty/Makefile b/devel/go-pretty/Makefile
index 57a8248e03dc..637c5554f1a1 100644
--- a/devel/go-pretty/Makefile
+++ b/devel/go-pretty/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	LOCAL/gblach/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pretty-printing package for go values
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:${PORTSDIR}/textproc/go-text
-RUN_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:${PORTSDIR}/textproc/go-text
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:textproc/go-text
+RUN_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:textproc/go-text
 
 GO_PKGNAME=	github.com/kr/pretty
 
diff --git a/devel/go-slices/Makefile b/devel/go-slices/Makefile
index f935138f94df..54230c7c890c 100644
--- a/devel/go-slices/Makefile
+++ b/devel/go-slices/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Go library for slice-based datatypes
 
 #LICENSE=	MIT based, with no-evli clause
 
-BUILD_DEPENDS=	go-raw>0:${PORTSDIR}/devel/go-raw
+BUILD_DEPENDS=	go-raw>0:devel/go-raw
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	feyeleanor
diff --git a/devel/go-termbox/Makefile b/devel/go-termbox/Makefile
index 73c4d18b5c8b..265dadbc0cbb 100644
--- a/devel/go-termbox/Makefile
+++ b/devel/go-termbox/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Pure Go termbox implementation
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/mattn/go-runewidth.a:${PORTSDIR}/devel/go-runewidth
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/mattn/go-runewidth.a:devel/go-runewidth
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nsf
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 47d5ab7237f4..34b4af84dd51 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Generate interface introspection data for GObject libraries
 
 # we need cairo otherwise the generated Cairo gir is broken
-BUILD_DEPENDS=	cairo-trace:${PORTSDIR}/graphics/cairo
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+BUILD_DEPENDS=	cairo-trace:graphics/cairo
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/godep/Makefile b/devel/godep/Makefile
index a8c881410364..3ad3f39240e0 100644
--- a/devel/godep/Makefile
+++ b/devel/godep/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Godep helps build packages reproducibly
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tools
diff --git a/devel/godot/Makefile b/devel/godot/Makefile
index acca3dcdddb1..83178ea54ef0 100644
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Game engine and development environment
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libasound.so:audio/alsa-lib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	okamstudio
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 40e0916dcb0d..e7be879a1f90 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	ignore:1
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix intlhack gtk20 libgsf
diff --git a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile
index b2785163c19e..39c4c33b0957 100644
--- a/devel/google-gdata/Makefile
+++ b/devel/google-gdata/Makefile
@@ -12,7 +12,7 @@ COMMENT=	DOT NET library for the Google Data API
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:${PORTSDIR}/devel/newtonsoft-json
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:devel/newtonsoft-json
 
 USES=		dos2unix gmake mono
 DOS2UNIX_FILES=	Makefile misc/gdata-sharp-core.pc.in
diff --git a/devel/goprotobuf/Makefile b/devel/goprotobuf/Makefile
index 28958cbfaeae..6b28cde27237 100644
--- a/devel/goprotobuf/Makefile
+++ b/devel/goprotobuf/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Go support for Google's protocol buffers
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
+RUN_DEPENDS=	protoc:devel/protobuf
 
 GO_PKGNAME=	github.com/golang/protobuf
 GO_TARGET=	${GO_PKGNAME}/proto \
diff --git a/devel/gprbuild/Makefile b/devel/gprbuild/Makefile
index cdb6432fec16..c9d81580f6d6 100644
--- a/devel/gprbuild/Makefile
+++ b/devel/gprbuild/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Adacore multi-language software build tool
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	xmlada>=4.4:${PORTSDIR}/textproc/xmlada
+BUILD_DEPENDS=	xmlada>=4.4:textproc/xmlada
 
 YEAR=		2015
 SNAPSHOT=	20150506
diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 6ff4246e0df0..f716f87f249a 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -14,16 +14,16 @@ COMMENT=	GNAT Programming Studio - IDE for Ada and many other languages
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
-		xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
-		gnatcoll>=2015:${PORTSDIR}/devel/gnatcoll \
-		templates_parser>11:${PORTSDIR}/textproc/templates_parser
-LIB_DEPENDS=	libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3
-RUN_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
-		gdb${PORTGDB}:${PORTSDIR}/devel/gdb \
-		gprbuild:${PORTSDIR}/devel/gprbuild \
-		${PYTHON_PKGNAMEPREFIX}pep8>0:${PORTSDIR}/devel/pep8 \
-		${PYTHON_PKGNAMEPREFIX}jedi>0:${PORTSDIR}/devel/py-jedi
+BUILD_DEPENDS=	gprbuild:devel/gprbuild \
+		xmlada>=4.4:textproc/xmlada \
+		gnatcoll>=2015:devel/gnatcoll \
+		templates_parser>11:textproc/templates_parser
+LIB_DEPENDS=	libgtkada.so:x11-toolkits/gtkada3
+RUN_DEPENDS=	rsvg-convert:graphics/librsvg2 \
+		gdb${PORTGDB}:devel/gdb \
+		gprbuild:devel/gprbuild \
+		${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \
+		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi
 
 GNU_CONFIGURE=	yes
 USES=		ada:run gmake perl5 pkgconfig python
@@ -45,7 +45,7 @@ PORTGDB=	${GDBVER:S/.//}
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES
 OPTIONS_SUB=		yes
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL}
 CONFIGURE_ENV+=		AWK=/usr/bin/awk
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index 307c9b9ea283..7db1e3c47bc7 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Software simulator for Microchip PIC microcontrollers
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
-RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
+BUILD_DEPENDS=	gpasm:devel/gputils
+LIB_DEPENDS=	libpopt.so:devel/popt
+RUN_DEPENDS=	gpasm:devel/gputils
 
 USES=		gmake libtool pathfix pkgconfig readline
 USE_GNOME=	glib20
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=		DOCS EXAMPLES GTK2
 OPTIONS_DEFAULT=	GTK2
 OPTIONS_SUB=		yes
 
-GTK2_LIB_DEPENDS=	libgtkextra-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtkextra2
+GTK2_LIB_DEPENDS=	libgtkextra-x11-2.0.so:x11-toolkits/gtkextra2
 GTK2_USE=		gnome=gtk20
 GTK2_CONFIGURE_ENABLE=	gui
 GTK2_DESKTOP_ENTRIES=	"GPSim" "" "" "gpsim" "Development;GTK;" ""
diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 3e3ca27c9f6f..de911e7f5fa9 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/gputils-${PORTVERSION:R}
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=2.5.35:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=2.5.35:textproc/flex
 CONFIGURE_ARGS+=LEX=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index 0a97c38a58c5..1236b9ff9628 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Collection of globally shared GSetting schemas
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11-fonts/cantarell-fonts
+RUN_DEPENDS=	${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:x11-fonts/cantarell-fonts
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index 1132deea92b3..a70c9163ebf6 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -21,9 +21,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 OPTIONS_RADIO=	SSL
 OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	OPENSSL
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-			libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-			libgpg-error.so:${PORTSDIR}/security/libgpg-error
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
+			libgcrypt.so:security/libgcrypt \
+			libgpg-error.so:security/libgpg-error
 GNUTLS_CONFIGURE_ON=	--enable-gnutls
 GNUTLS_LDFLAGS=		-L${LOCALBASE}/lib
 OPENSSL_CONFIGURE_ENABLE=	ssl
diff --git a/devel/gtgt/Makefile b/devel/gtgt/Makefile
index 56b633fbefba..5ea1ad81f2c7 100644
--- a/devel/gtgt/Makefile
+++ b/devel/gtgt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General (or GNU) template generation tools
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 LICENSE=	GPLv2+ # though COPYING has GPLv3
 
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 33c1afc540d9..9aa74363635f 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -11,14 +11,14 @@ COMMENT=	GNOME application for creating GNU gettext translation files
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		itstool:${PORTSDIR}/textproc/itstool \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libgdl-3.so:${PORTSDIR}/x11-toolkits/gdl \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
-RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		itstool:textproc/itstool \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libpeas-1.0.so:devel/libpeas \
+		libgdl-3.so:x11-toolkits/gdl \
+		libjson-glib-1.0.so:devel/json-glib
+RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USE_GNOME=	intlhack gnomeprefix gtk30 libgda5 gtksourceview3 libxml2 \
 		introspection:build
@@ -46,9 +46,9 @@ DICT_DESC=	Build dictionary plugin
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDICT}
-BUILD_DEPENDS+=	gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary
-LIB_DEPENDS+=	libgdict-1.0.so:${PORTSDIR}/deskutils/gnome-dictionary
-RUN_DEPENDS+=	gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary
+BUILD_DEPENDS+=	gnome-dictionary>=3.4.0:deskutils/gnome-dictionary
+LIB_DEPENDS+=	libgdict-1.0.so:deskutils/gnome-dictionary
+RUN_DEPENDS+=	gnome-dictionary>=3.4.0:deskutils/gnome-dictionary
 GLIB_SCHEMAS+=	org.gnome.gtranslator.plugins.dictionary.gschema.xml
 CONFIGURE_ARGS+=--with-dictionary
 PLIST_SUB+=	DICT=""
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 56e5314484e1..ec54f8d44290 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -35,7 +35,7 @@ PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MALLEGRO}
-LIB_DEPENDS+=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS+=	liballeg.so:devel/allegro
 CONFIGURE_ARGS+=--enable-allegro
 PLIST_SUB+=	ALLEGRO=""
 .else
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index b546513e82a6..e06a8fc2f67d 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://cactus.rulez.org/projects/guikachu/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Resource editor for PalmOS(tm) systems
 
-LIB_DEPENDS=	libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26 \
-		libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm
+LIB_DEPENDS=	libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26 \
+		libgnomevfsmm-2.6.so:devel/gnome-vfsmm
 
 USES=		gmake pathfix pkgconfig shared-mime-info desktop-file-utils
 USE_GNOME=	gnomeprefix intlhack libgnomeui
diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile
index 0fadd60d4376..6fc717cd4e8e 100644
--- a/devel/guile-lib/Makefile
+++ b/devel/guile-lib/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Repository of useful code written in Guile Scheme
 
-BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
+BUILD_DEPENDS=	guile:lang/guile
+RUN_DEPENDS=	guile:lang/guile
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/devel/guiloader-c++/Makefile b/devel/guiloader-c++/Makefile
index 792a06b913f7..4e9b7cebb0e6 100644
--- a/devel/guiloader-c++/Makefile
+++ b/devel/guiloader-c++/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ binding to the GuiLoader library
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libguiloader.so:${PORTSDIR}/devel/guiloader \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:devel/boost-libs
+LIB_DEPENDS=	libguiloader.so:devel/guiloader \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 PROJECTHOST=	nothing-personal
 USES=		gettext libtool pathfix pkgconfig tar:bzip2
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 7dd6922bee4c..ce11742dbc39 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -11,12 +11,12 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME virtual file system
 
-BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgcr-base-3.so:${PORTSDIR}/security/gcr \
-		libsecret-1.so:${PORTSDIR}/security/libsecret
+BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libgcrypt.so:security/libgcrypt \
+		libgcr-base-3.so:security/gcr \
+		libsecret-1.so:security/libsecret
 
 PORTSCOUT=	limitw:1,even
 
@@ -53,25 +53,25 @@ GOOGLE_DESC=	Google backend
 FUSE_USES=	fuse
 FUSE_CONFIGURE_ENABLE=	fuse
 
-SAMBA_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SAMBA_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SAMBA_CONFIGURE_ENABLE=	samba
 
-CDDA_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDDA_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDDA_CONFIGURE_ENABLE=	cdda
 
-GPHOTO2_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 GPHOTO2_CONFIGURE_ENABLE=	gphoto2
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
-AFC_LIB_DEPENDS=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice \
-			libplist.so:${PORTSDIR}/devel/libplist
+AFC_LIB_DEPENDS=	libimobiledevice.so:comms/libimobiledevice \
+			libplist.so:devel/libplist
 AFC_CONFIGURE_ENABLE=	afc
 
 GOOGLE_CONFIGURE_ENABLE=	google
-GOOGLE_LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata \
-			libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts
+GOOGLE_LIB_DEPENDS=	libgdata.so:devel/libgdata \
+			libgoa-1.0.so:net/gnome-online-accounts
 
 .include <bsd.port.options.mk>
 
@@ -84,8 +84,8 @@ GLIB_SCHEMAS+=	org.gnome.system.dns_sd.gschema.xml
 .endif
 
 .if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA}
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
-RUN_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+LIB_DEPENDS+=	libhal.so:sysutils/hal
+RUN_DEPENDS+=	gnome-mount:sysutils/gnome-mount
 PLIST_SUB+=	HAL=""
 .else
 CONFIGURE_ARGS+=--disable-hal
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index bb9d39955711..509f9b8f805a 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -12,8 +12,8 @@ COMMENT?=	Multi-platform helper library for networking and security applications
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls
 
 USES=		gettext gmake iconv libtool pathfix pkgconfig
 USE_OPENSSL=	yes
@@ -32,8 +32,8 @@ PLIST_SUB=	GWEN_SHLIB_VER="${GWEN_SHLIB_VER}"
 .if !defined(SLAVEPORT)
 OPTIONS_DEFINE=			DOXYGEN MEMDEBUG
 
-DOXYGEN_BUILD_DEPENDS=		doxygen:${PORTSDIR}/devel/doxygen \
-				dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen \
+				dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENABLE=	full-doc
 
 MEMDEBUG_DESC=			Enable memory debugger statistic
@@ -43,12 +43,12 @@ MEMDEBUG_CONFIGURE_ENABLE=	memtrace
 .include <bsd.port.options.mk>
 
 .if defined(SLAVEPORT)
-LIB_DEPENDS+=	libgwenhywfar.so:${PORTSDIR}/devel/gwenhywfar
+LIB_DEPENDS+=	libgwenhywfar.so:devel/gwenhywfar
 BUILD_WRKSRC=	${WRKSRC}/gui
 INSTALL_WRKSRC=	${WRKSRC}/gui/${SLAVEPORT}
 
 .  if ${SLAVEPORT}=="fox16"
-LIB_DEPENDS+=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
+LIB_DEPENDS+=	libFOX-1.6.so:x11-toolkits/fox16
 CONFIGURE_ARGS+=--with-fox-includes=${LOCALBASE}/include/fox-1.6 \
 		--with-fox-libs=${LOCALBASE}/lib
 .  endif
diff --git a/devel/hachoir-parser/Makefile b/devel/hachoir-parser/Makefile
index e2ec19dce883..1130e4166cb7 100644
--- a/devel/hachoir-parser/Makefile
+++ b/devel/hachoir-parser/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Parsers of most common file formats
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:${PORTSDIR}/devel/hachoir-core
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:${PORTSDIR}/devel/hachoir-core
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:devel/hachoir-core
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:devel/hachoir-core
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index 0a4c47b452a5..9ff3d518453e 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Apache Map/Reduce framework
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	gmake:${PORTSDIR}/devel/gmake \
-		gsed:${PORTSDIR}/textproc/gsed
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	gmake:devel/gmake \
+		gsed:textproc/gsed
+RUN_DEPENDS=	bash:shells/bash
 
 CONFLICTS_INSTALL=	hadoop2-2*
 
diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile
index 7f5f971b63ea..d5fb645501e0 100644
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@@ -23,12 +23,12 @@ COMMENT=	Apache Map/Reduce framework
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3 \
-		cmake:${PORTSDIR}/devel/cmake \
-		${LOCALBASE}/protobuf25/bin/protoc:${PORTSDIR}/devel/protobuf25
-LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		ssid:${PORTSDIR}/sysutils/ssid
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3 \
+		cmake:devel/cmake \
+		${LOCALBASE}/protobuf25/bin/protoc:devel/protobuf25
+LIB_DEPENDS=	libsnappy.so:archivers/snappy
+RUN_DEPENDS=	bash:shells/bash \
+		ssid:sysutils/ssid
 
 BROKEN_FreeBSD_9=	fails to build
 
diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index f8cf2c5571fa..36b8d22af0dc 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Mercurial extension to pull from or push to a Git repository
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=*:${PORTSDIR}/devel/dulwich \
-		mercurial>=*:${PORTSDIR}/devel/mercurial
+RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=*:devel/dulwich \
+		mercurial>=*:devel/mercurial
 
 PORTDOCS=	README.md
 
diff --git a/devel/hgreviewboard/Makefile b/devel/hgreviewboard/Makefile
index 41bdd5f08f13..835c3a830356 100644
--- a/devel/hgreviewboard/Makefile
+++ b/devel/hgreviewboard/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Mercurial reviewboard extension
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial \
-		rbt:${PORTSDIR}/devel/rbtools
+RUN_DEPENDS=	hg:devel/mercurial \
+		rbt:devel/rbtools
 
 WRKSRC=		${WRKDIR}/ccaughie-hgreviewboard-e461a0baf62d
 USES=		python
diff --git a/devel/hgsvn/Makefile b/devel/hgsvn/Makefile
index f1ea706bb247..496f9fcf1114 100644
--- a/devel/hgsvn/Makefile
+++ b/devel/hgsvn/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Scripts to work locally on Subversion checkouts using Mercurial
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion \
-		hg:${PORTSDIR}/devel/mercurial
+RUN_DEPENDS=	svn:devel/subversion \
+		hg:devel/mercurial
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile
index 6b9bcbedd121..45e9389d1c3d 100644
--- a/devel/hgview/Makefile
+++ b/devel/hgview/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Fast Mercurial log navigator written in pyqt4
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>0:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}mx-base>0:${PORTSDIR}/lang/py-mx-base \
-		${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils
-BUILD_DEPENDS=	hg:${PORTSDIR}/devel/mercurial \
-		pyrcc4:${PORTSDIR}/textproc/py-qt4-xml \
-		xmlto:${PORTSDIR}/textproc/xmlto \
-		asciidoc:${PORTSDIR}/textproc/asciidoc
+RUN_DEPENDS=	hg:devel/mercurial \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>0:devel/py-qt4-qscintilla2 \
+		${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base \
+		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils
+BUILD_DEPENDS=	hg:devel/mercurial \
+		pyrcc4:textproc/py-qt4-xml \
+		xmlto:textproc/xmlto \
+		asciidoc:textproc/asciidoc
 
 NO_ARCH=	yes
 USE_PYTHON=	distutils
diff --git a/devel/hive/Makefile b/devel/hive/Makefile
index 8440e25483ef..5971bf02d119 100644
--- a/devel/hive/Makefile
+++ b/devel/hive/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for data warehousing on top of Hadoop
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3 \
-		bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3 \
+		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash \
+		yarn:devel/hadoop2
 
 USES=		cpe
 CPE_VENDOR=	apache
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 65fc81cd2dc5..54cd8d9fa7eb 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -31,7 +31,7 @@ FLAGS_ENABLE=		library executable
 
 CURL_DESC=		Use libcurl for HTTP support
 CURL_FLAG_ENABLE=	curl
-CURL_FLAG_LIB=		libcurl.so:${PORTSDIR}/ftp/curl
+CURL_FLAG_LIB=		libcurl.so:ftp/curl
 
 HTTP_DESC=		Use the pure HTTP package
 HTTP_FLAG_ENABLE=	http
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index fe5f1a734d17..95ef2c76d532 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -23,13 +23,13 @@ USE_PERL5=	build
 
 MAN1PAGES=	git-annex.1 git-annex-shell.1
 
-BUILD_DEPENDS+=	rsync:${PORTSDIR}/net/rsync \
-		git:${PORTSDIR}/devel/git \
-		gsha256sum:${PORTSDIR}/sysutils/coreutils
+BUILD_DEPENDS+=	rsync:net/rsync \
+		git:devel/git \
+		gsha256sum:sysutils/coreutils
 
-RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync \
-		git:${PORTSDIR}/devel/git \
-		gsha256sum:${PORTSDIR}/sysutils/coreutils
+RUN_DEPENDS+=	rsync:net/rsync \
+		git:devel/git \
+		gsha256sum:sysutils/coreutils
 
 EXECUTABLE=	git-annex git-annex-shell
 STANDALONE=	yes
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 25f4c3f68826..3b55f6aed5a7 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Haskell binding to inotify
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index 6a05960f629b..5a103a4c373c 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	network
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 10c0a3c5e1fa..5bcbdb735e50 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Small, efficient, and portable regex library for Perl 5 compatible
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 1fd6fa86a606..0fb235064b94 100644
--- a/devel/hs-text-icu/Makefile
+++ b/devel/hs-text-icu/Makefile
@@ -11,7 +11,7 @@ LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	text>=0.9.1.0
 
-LIB_DEPENDS+=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicui18n.so:devel/icu
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hub/Makefile b/devel/hub/Makefile
index ee95c67efee4..d5887127502e 100644
--- a/devel/hub/Makefile
+++ b/devel/hub/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Introduces git to GitHub
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	go:lang/go \
+		bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	github
diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile
index 9e03bd3cfad1..3104f0fb0a89 100644
--- a/devel/hwloc/Makefile
+++ b/devel/hwloc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Portable Hardware Locality software package
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpciaccess.so:${PORTSDIR}/devel/libpciaccess
+LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
@@ -35,7 +35,7 @@ OPTIONS_SUB=	yes
 
 CAIRO_CONFIGURE_OFF=	--disable-cairo --without-x
 CAIRO_CONFIGURE_ON=	--enable-cairo --with-x
-CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 CAIRO_USE=		XORG=x11
 
 post-install:
diff --git a/devel/hyperscan/Makefile b/devel/hyperscan/Makefile
index 326ce6fd374d..a9e9e51e5916 100644
--- a/devel/hyperscan/Makefile
+++ b/devel/hyperscan/Makefile
@@ -12,7 +12,7 @@ COMMENT=	High-performance multiple regex matching library
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	ragel:${PORTSDIR}/devel/ragel
+BUILD_DEPENDS=	ragel:devel/ragel
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	01org
diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index cc9bb93c2643..68a27437c70d 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -14,12 +14,12 @@ LICENSE=		GPLv2
 SLAVE_PORT?=		no
 
 .if ${SLAVE_PORT} == "no"
-LIB_DEPENDS=		libexpat.so:${PORTSDIR}/textproc/expat2 \
-			libmcpp.so:${PORTSDIR}/devel/mcpp
+LIB_DEPENDS=		libexpat.so:textproc/expat2 \
+			libmcpp.so:devel/mcpp
 USE_OPENSSL=		yes
 .else
 LIB_VRS=		${PORTVERSION:R:S|.||g}
-LIB_DEPENDS+=		libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
+LIB_DEPENDS+=		libIce.so.${LIB_VRS}:devel/ice
 PLIST_SUB+=		LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 .endif
 
@@ -31,7 +31,7 @@ USES+=			iconv gmake
 
 .if ${PORT_OPTIONS:MTEST} && ${SLAVE_PORT} == "no"
 USES+=			python:build
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:${PORTSDIR}/security/py-passlib
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib
 .endif
 
 WRKSRC=			${WRKDIR}/ice-${PORTVERSION}
diff --git a/devel/icmake/Makefile b/devel/icmake/Makefile
index 4c46d09e9f2d..81ee6ac9eaa4 100644
--- a/devel/icmake/Makefile
+++ b/devel/icmake/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Intelligent C-like Maker
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS=	bash:shells/bash \
+		gsed:textproc/gsed
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
diff --git a/devel/ifd-test/Makefile b/devel/ifd-test/Makefile
index b424dd67200c..95000f44f7d0 100644
--- a/devel/ifd-test/Makefile
+++ b/devel/ifd-test/Makefile
@@ -12,7 +12,7 @@ COMMENT=	IFD Test Suite for PC/SC Lite
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		gmake
 NOMAN=
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index fe04f68743c2..fb80a142dd14 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	devel
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Imake and other utilities from X.Org
 
-BUILD_DEPENDS=	tradcpp:${PORTSDIR}/devel/tradcpp
-RUN_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep \
-		makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
+BUILD_DEPENDS=	tradcpp:devel/tradcpp
+RUN_DEPENDS=	gccmakedep:devel/gccmakedep \
+		makedepend:devel/makedepend \
+		${LOCALBASE}/lib/X11/config/xorg.cf:x11/xorg-cf-files
 
 USES=	shebangfix perl5 pkgconfig
 USE_PERL5=	run
diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile
index c8eb3071bd1f..4590c96d6e50 100644
--- a/devel/include-what-you-use/Makefile
+++ b/devel/include-what-you-use/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tool for use with clang to analyze #includes in C and C++ source files
 LICENSE=	NCSA
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-BUILD_DEPENDS=	clang37:${PORTSDIR}/devel/llvm37
-RUN_DEPENDS=	clang37:${PORTSDIR}/devel/llvm37
+BUILD_DEPENDS=	clang37:devel/llvm37
+RUN_DEPENDS=	clang37:devel/llvm37
 
 USES=		cmake:outsource ncurses python:run
 USE_GITHUB=	yes
diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index ad224b1a482d..cd4cc0e695f7 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Enhanced Interactive Python shell
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2:${PORTSDIR}/databases/py-sqlite3
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pexpect>=2:${PORTSDIR}/misc/py-pexpect \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=2:${PORTSDIR}/databases/py-sqlite3
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pexpect>=2:misc/py-pexpect \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -32,20 +32,20 @@ ZMQ_DESC=		ZMQ support (parallel computing, qt console, notebook)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:graphics/py-qt4-svg \
+		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments
 .endif
 
 .if ${PORT_OPTIONS:MHTML_NOTEBOOK}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=2.0:${PORTSDIR}/www/py-tornado \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:${PORTSDIR}/devel/py-jsonschema \
-		${PYTHON_PKGNAMEPREFIX}mistune>=0:${PORTSDIR}/textproc/py-mistune
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \
+		${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune
 .endif
 
 .if ${PORT_OPTIONS:MZMQ} || ${PORT_OPTIONS:MHTML_NOTEBOOK}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.4:${PORTSDIR}/net/py-pyzmq
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.4:net/py-pyzmq
 .endif
 
 post-install:
diff --git a/devel/isl/Makefile b/devel/isl/Makefile
index fb242e4ebe30..d3569f7a588a 100644
--- a/devel/isl/Makefile
+++ b/devel/isl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Integer Set Library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS=	--with-gmp-prefix=${LOCALBASE}
 GNU_CONFIGURE=	yes
diff --git a/devel/itext/Makefile b/devel/itext/Makefile
index 6a742106c808..f1a1ef62eb5b 100644
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Java-PDF Library
 LICENSE=	MPL LGPL20
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle \
-		${JAVAJARDIR}/dom4j.jar:${PORTSDIR}/textproc/dom4j \
-		${JAVAJARDIR}/pdf-renderer.jar:${PORTSDIR}/print/pdf-renderer
-RUN_DEPENDS=	${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle \
-		${JAVAJARDIR}/dom4j.jar:${PORTSDIR}/textproc/dom4j \
-		${JAVAJARDIR}/pdf-renderer.jar:${PORTSDIR}/print/pdf-renderer
+BUILD_DEPENDS=	${JAVAJARDIR}/bcmail.jar:java/bouncycastle \
+		${JAVAJARDIR}/dom4j.jar:textproc/dom4j \
+		${JAVAJARDIR}/pdf-renderer.jar:print/pdf-renderer
+RUN_DEPENDS=	${JAVAJARDIR}/bcmail.jar:java/bouncycastle \
+		${JAVAJARDIR}/dom4j.jar:textproc/dom4j \
+		${JAVAJARDIR}/pdf-renderer.jar:print/pdf-renderer
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/jakarta-commons-configuration/Makefile b/devel/jakarta-commons-configuration/Makefile
index 028270d17bd3..cbfe62f5ce9e 100644
--- a/devel/jakarta-commons-configuration/Makefile
+++ b/devel/jakarta-commons-configuration/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Java package for the reading of configuration/preferences files
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils \
-		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
-		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
+		${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \
+		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/jakarta-commons-io/Makefile b/devel/jakarta-commons-io/Makefile
index e31b9de8c9d7..8c0ac6758e59 100644
--- a/devel/jakarta-commons-io/Makefile
+++ b/devel/jakarta-commons-io/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of I/O utilities for Java
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
+BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:java/junit
 
 ALL_TARGET=	dist
 JAVA_VERSION=	1.6+
diff --git a/devel/jiic/Makefile b/devel/jiic/Makefile
index 8cd8eb14f2c4..a0d09bf85cbe 100644
--- a/devel/jiic/Makefile
+++ b/devel/jiic/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Streaming-based Java implementation of ISO 9660
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${JAVALIBDIR}/sabre.jar:${PORTSDIR}/devel/sabre
-RUN_DEPENDS=	${JAVALIBDIR}/sabre.jar:${PORTSDIR}/devel/sabre
+BUILD_DEPENDS=	${JAVALIBDIR}/sabre.jar:devel/sabre
+RUN_DEPENDS=	${JAVALIBDIR}/sabre.jar:devel/sabre
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_JAVA=	yes
diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile
index 8afad59505ff..d0773ac67ca5 100644
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Utility to work with JTAG-aware boards
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${OPENWINCE_INCLUDE_DEP}:${PORTSDIR}/devel/openwince-include
+BUILD_DEPENDS=	${OPENWINCE_INCLUDE_DEP}:devel/openwince-include
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index 88802f0c7329..8142797a2ebf 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}r2695-src
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	Makefile framework
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 USES=		autoreconf:build gmake makeinfo
 
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index 7e5d10f95185..ac43d2d54cce 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -20,9 +20,9 @@ SHEBANG_FILES=	converters/op2calltree converters/dprof2calltree \
 OPTIONS_DEFINE=	DOT VALGRIND
 
 DOT_DESC=		Use GraphViz/dot to render call graphs
-DOT_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+DOT_RUN_DEPENDS=	dot:graphics/graphviz
 
 VALGRIND_DESC=		Install devel/valgrind
-VALGRIND_RUN_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind
+VALGRIND_RUN_DEPENDS=	valgrind:devel/valgrind
 
 .include <bsd.port.mk>
diff --git a/devel/kdebindings4/Makefile b/devel/kdebindings4/Makefile
index 506362d9502f..124459fd8681 100644
--- a/devel/kdebindings4/Makefile
+++ b/devel/kdebindings4/Makefile
@@ -17,11 +17,11 @@ PERL_DESC=	Perl bindings
 PERL_USE=	KDE4=perlkde_run
 
 PYTHON_DESC=	Python bindings
-PYTHON_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/krosspython.so:${PORTSDIR}/devel/py-krosspython
+PYTHON_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/krosspython.so:devel/py-krosspython
 PYTHON_USE=	KDE4=pykde4_run,pykdeuic4_run
 
 RUBY_DESC=	Ruby bindings
-RUBY_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/krossruby.so:${PORTSDIR}/devel/ruby-krossruby
+RUBY_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/krossruby.so:devel/ruby-krossruby
 RUBY_USE=	KDE4=korundum_run
 
 .include <bsd.port.mk>
diff --git a/devel/kdesdk4-kioslaves/Makefile b/devel/kdesdk4-kioslaves/Makefile
index f03bbabf6c0e..8796aba59917 100644
--- a/devel/kdesdk4-kioslaves/Makefile
+++ b/devel/kdesdk4-kioslaves/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	SDK related KIO slaves
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 
 USES=		cmake:outsource perl5 shebangfix tar:xz
 USE_KDE4=	kdelibs kdeprefix automoc4
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index df8bc8d33b7c..7e9aef3b0ab9 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -29,51 +29,51 @@ OPTIONS_DEFINE=	CERVISIA \
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CERVISIA_DESC=		CVS frontend
-CERVISIA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/cervisia:${PORTSDIR}/devel/cervisia
+CERVISIA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/cervisia:devel/cervisia
 
 DEVUTILS_DESC=		KDE development utilities
-DEVUTILS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kuiviewer:${PORTSDIR}/devel/kde-dev-utils
+DEVUTILS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kuiviewer:devel/kde-dev-utils
 
 DEVSCRIPTS_DESC=	KDE development scripts
-DEVSCRIPTS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kdekillall:${PORTSDIR}/devel/kde-dev-scripts
+DEVSCRIPTS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kdekillall:devel/kde-dev-scripts
 
 DOLPHIN_DESC=		Plugins for Dolphin file manager
-DOLPHIN_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/fileviewgitplugin.so:${PORTSDIR}/devel/dolphin-plugins
+DOLPHIN_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/fileviewgitplugin.so:devel/dolphin-plugins
 
 KAPPTEMPLATE_DESC=	Template generator
-KAPPTEMPLATE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kapptemplate:${PORTSDIR}/devel/kapptemplate
+KAPPTEMPLATE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kapptemplate:devel/kapptemplate
 
 KATE_DESC=		KDE advanced text editor
 KATE_USE=		KDE4=kate_run
 
 KATE_PATE_DESC=		Support for Python plugins in Kate
-KATE_PATE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepateplugin.so:${PORTSDIR}/editors/kate-plugin-pate
+KATE_PATE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepateplugin.so:editors/kate-plugin-pate
 
 KCACHEGRIND_DESC=	Profiler frontend
-KCACHEGRIND_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcachegrind:${PORTSDIR}/devel/kcachegrind
+KCACHEGRIND_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcachegrind:devel/kcachegrind
 
 KIOSLAVES_DESC=		SDK related KIO slaves
-KIOSLAVES_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kio_svn.so:${PORTSDIR}/devel/kdesdk4-kioslaves
+KIOSLAVES_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kio_svn.so:devel/kdesdk4-kioslaves
 
 KOMPARE_DESC=		Diff/Patch frontend
-KOMPARE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kompare:${PORTSDIR}/textproc/kompare
+KOMPARE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kompare:textproc/kompare
 
 LOKALIZE_DESC=		Computer-aided translation system
-LOKALIZE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/lokalize:${PORTSDIR}/devel/lokalize
+LOKALIZE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/lokalize:devel/lokalize
 
 OKTETA_DESC=		Hex editor
-OKTETA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/okteta:${PORTSDIR}/devel/okteta
+OKTETA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/okteta:devel/okteta
 
 POXML_DESC=		Tools to translate DocBook XML using gettext
-POXML_RUN_DEPENDS=	${KDE4_PREFIX}/bin/po2xml:${PORTSDIR}/devel/poxml
+POXML_RUN_DEPENDS=	${KDE4_PREFIX}/bin/po2xml:devel/poxml
 
 STRIGI_DESC=		Strigi analyzers for SDK file formats
-STRIGI_RUN_DEPENDS=	${KDE4_PREFIX}/lib/strigi/strigila_diff.so:${PORTSDIR}/devel/kdesdk4-strigi-analyzers
+STRIGI_RUN_DEPENDS=	${KDE4_PREFIX}/lib/strigi/strigila_diff.so:devel/kdesdk4-strigi-analyzers
 
 THUMBNAILER_DESC=	Thumbnail generator for gettext po files
-THUMBNAILER_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/pothumbnail.so:${PORTSDIR}/devel/kdesdk4-thumbnailers
+THUMBNAILER_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/pothumbnail.so:devel/kdesdk4-thumbnailers
 
 UMBRELLO_DESC=		UML modeller
-UMBRELLO_RUN_DEPENDS=	${KDE4_PREFIX}/bin/umbrello:${PORTSDIR}/devel/umbrello
+UMBRELLO_RUN_DEPENDS=	${KDE4_PREFIX}/bin/umbrello:devel/umbrello
 
 .include <bsd.port.mk>
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 7fb62afa0b6c..ffa489caaa71 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -11,7 +11,7 @@ COMMENT=	KDE frontend for Subversion
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 
 CONFLICTS=	qsvn-[0-9]*
 
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index f313a751fc05..a9e5a6fe121f 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plugin extensible IDE for KDE
 
-LIB_DEPENDS=	libkdevplatforminterfaces.so:${PORTSDIR}/devel/kdevplatform
-RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
+LIB_DEPENDS=	libkdevplatforminterfaces.so:devel/kdevplatform
+RUN_DEPENDS=	gmake:devel/gmake
 
 USE_KDE4=	kdelibs kdeprefix workspace automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build \
@@ -24,12 +24,12 @@ OPTIONS_DEFAULT=	OKTETA PHP
 OPTIONS_SUB=	yes
 
 OKTETA_DESC=	Hex editing support via Okteta
-OKTETA_LIB_DEPENDS=	libokteta1core.so:${PORTSDIR}/devel/okteta
+OKTETA_LIB_DEPENDS=	libokteta1core.so:devel/okteta
 OKTETA_CMAKE_OFF=	-DWITH_LibOktetaKasten:BOOL=OFF
 OKTETA_CMAKE_ON=	-DWITH_LibOktetaKasten:BOOL=ON
 
 PHP_DESC=	PHP support for KDevelop
-PHP_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphplanguagesupport.so:${PORTSDIR}/devel/kdevelop-php
+PHP_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphplanguagesupport.so:devel/kdevelop-php
 
 NLS_USES=	gettext
 NLS_CMAKE_OFF=	-DBUILD_po:BOOL=FALSE
diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
index cfe41df540b9..0de8cf77310c 100644
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Parser-generator from KDevplatform
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 USES=		bison cmake:outsource compiler:c++11-lib tar:bzip2
 USE_KDE4=	automoc4 kdelibs kdeprefix
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index a8667611e08f..b75b5de88618 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	PHP documentation for KDevelop
 
-LIB_DEPENDS=	libkdevplatforminterfaces.so:${PORTSDIR}/devel/kdevplatform
+LIB_DEPENDS=	libkdevplatforminterfaces.so:devel/kdevplatform
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index fa8e733c8285..05db25a27f5c 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -9,8 +9,8 @@ DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	PHP support for KDevelop
 
-LIB_DEPENDS=	libkdevplatforminterfaces.so:${PORTSDIR}/devel/kdevplatform
-BUILD_DEPENDS=	${KDE4_PREFIX}/bin/kdev-pg-qt:${PORTSDIR}/devel/kdevelop-pg-qt
+LIB_DEPENDS=	libkdevplatforminterfaces.so:devel/kdevplatform
+BUILD_DEPENDS=	${KDE4_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=	PHPDOCS
 OPTIONS_SUB=	yes
 
 PHPDOCS_DESC=	Integrate with PHP.net documentation
-PHPDOCS_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphpdocs.so:${PORTSDIR}/devel/kdevelop-php-docs
+PHPDOCS_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphpdocs.so:devel/kdevelop-php-docs
 
 NLS_USES=	gettext
 NLS_CMAKE_OFF=	-DBUILD_po:BOOL=Off
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 9c7db676d0a7..0e6e77ec5eae 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -11,10 +11,10 @@ DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Set of libraries for KDE IDE-like programs
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libqjson.so:${PORTSDIR}/devel/qjson \
-		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion \
+		libboost_thread.so:devel/boost-libs \
+		libqjson.so:devel/qjson \
+		libgrantlee_gui.so:devel/grantlee
 
 USE_KDE4=	kate_run kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build \
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 673b942f52e4..89abef8ade6f 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple Sprite engine written in C++
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile
index 5b70ca811733..9a7fdbd2398d 100644
--- a/devel/kyua/Makefile
+++ b/devel/kyua/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Testing framework for infrastructure software
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	liblutok.so:${PORTSDIR}/devel/lutok
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	liblutok.so:devel/lutok
+LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]*
@@ -31,8 +31,8 @@ OPTIONS_DEFAULT=TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
-TEST_BUILD_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
-TEST_RUN_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
+TEST_BUILD_DEPENDS=	atf>=0.21:devel/atf
+TEST_RUN_DEPENDS=	atf>=0.21:devel/atf
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index 9e8eef64533f..adfecab25180 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	libLASi-${PORTVERSION}
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	C++ stream output interface for creating Postscript documents
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
@@ -28,7 +28,7 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_DATADIR:PATH=${DATADIR}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:devel/doxygen
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmake+modules+lasi.cmake
 .endif
diff --git a/devel/lcov/Makefile b/devel/lcov/Makefile
index 8857b9e619d9..1fc860ff7ea8 100644
--- a/devel/lcov/Makefile
+++ b/devel/lcov/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Linux Test Project GCOV extension
 
 LICENSE=	GPLv1
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/devel/leiningen/Makefile b/devel/leiningen/Makefile
index 99d49c52e051..a00bffa82003 100644
--- a/devel/leiningen/Makefile
+++ b/devel/leiningen/Makefile
@@ -21,7 +21,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS+=	bash:shells/bash
 
 PLIST_FILES=	bin/lein \
 		etc/bash_completion.d/_lein.bash \
diff --git a/devel/lfcxml/Makefile b/devel/lfcxml/Makefile
index b5c6d14c1317..bc04cbf8f0fb 100644
--- a/devel/lfcxml/Makefile
+++ b/devel/lfcxml/Makefile
@@ -10,7 +10,7 @@ COMMENT=	C++ XML library, used for databases/cego
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	liblfcbase.so:${PORTSDIR}/devel/lfcbase
+LIB_DEPENDS=	liblfcbase.so:devel/lfcbase
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/libarea/Makefile b/devel/libarea/Makefile
index 4c9bb53f867d..8520fd7c66a8 100644
--- a/devel/libarea/Makefile
+++ b/devel/libarea/Makefile
@@ -10,8 +10,8 @@ COMMENT=	CAM-related software for profile and pocketing operations
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	python-config:${PORTSDIR}/lang/python
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+BUILD_DEPENDS=	python-config:lang/python
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Heeks
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index 8b1d101d63f7..71f771348ec1 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/ofset/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library to share image and audio files between projects
 
-BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+BUILD_DEPENDS=	texi2html:textproc/texi2html
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		gettext gmake libtool:keepla makeinfo pathfix pkgconfig
 USE_GNOME=	gnomeprefix glib20 libxml2
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 6fe587f17f2c..a5fa310161c4 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Library of assorted spiffy things
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libImlib2.so:graphics/imlib2
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile
index e8fb27d9f96b..22700c86c550 100644
--- a/devel/libbobcat/Makefile
+++ b/devel/libbobcat/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Brokken's Own Base Classes And Templates
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
-		yodl>=3.0:${PORTSDIR}/textproc/yodl
+BUILD_DEPENDS=	icmake:devel/icmake \
+		yodl>=3.0:textproc/yodl
 
 USE_GCC=	4.9+
 USE_XORG=	x11
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index a0eb2c0e3596..e95ea76ff64b 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -16,7 +16,7 @@ USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig perl5
 USE_LDCONFIG=	yes
diff --git a/devel/libc++/Makefile b/devel/libc++/Makefile
index 2b4974eec8b7..bf1a0d558b39 100644
--- a/devel/libc++/Makefile
+++ b/devel/libc++/Makefile
@@ -28,7 +28,7 @@ CXXRT_LIB=	/usr/lib/libcxxrt.so
 .else
 CXXRT_INCS=	${LOCALBASE}/include/cxxrt/
 CXXRT_LIB=	${LOCALBASE}/lib/libcxxrt.so
-LIB_DEPENDS+=	libcxxrt.so:${PORTSDIR}/devel/libcxxrt
+LIB_DEPENDS+=	libcxxrt.so:devel/libcxxrt
 .endif
 
 .include <bsd.port.options.mk>
@@ -44,7 +44,7 @@ SVN_REV!=       LC_ALL=C svn info http://llvm.org/svn/llvm-project/ | ${GREP} Re
 .endif
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+= svn:devel/subversion
 
 post-patch:
 	# remove .orig files because they can get installed in stagedir
diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile
index e452d74f681a..812a0c59bd8c 100644
--- a/devel/libccid/Makefile
+++ b/devel/libccid/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generic USB CCID (Chip/Smart Card Interface Devices) driver
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		perl5 pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile
index 7edd06ac4b19..806a277f382e 100644
--- a/devel/libchipcard/Makefile
+++ b/devel/libchipcard/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library for easy access to chipcards
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite \
-		libgwenhywfar.so:${PORTSDIR}/devel/gwenhywfar
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite \
+		libgwenhywfar.so:devel/gwenhywfar
 
 USES=		gmake libtool
 USE_OPENSSL=	yes
@@ -34,8 +34,8 @@ GWEN_SHLIB_VER=	60
 
 OPTIONS_DEFINE=			DOXYGEN MEMDEBUG
 
-DOXYGEN_BUILD_DEPENDS=		doxygen:${PORTSDIR}/devel/doxygen \
-				dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen \
+				dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENABLE=	full-doc
 
 MEMDEBUG_DESC=			Enable memory debugger statistic
diff --git a/devel/libclaw/Makefile b/devel/libclaw/Makefile
index cec665a3a969..a192ba39149c 100644
--- a/devel/libclaw/Makefile
+++ b/devel/libclaw/Makefile
@@ -13,8 +13,8 @@ COMMENT=	C++ Library Absolutely Wonderful
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libpng.so:graphics/png
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:devel/boost-libs
 
 USES=		cmake gettext jpeg
 CMAKE_ARGS=	-DCLAW_CMAKE_MODULES_INSTALL_PATH="${DATADIR}/cmake"
diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile
index 8a5dfc422454..5c606271ec5c 100644
--- a/devel/libclc/Makefile
+++ b/devel/libclc/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Required library functions for OpenCL C programming language
 
-BUILD_DEPENDS=	clang${LLVMVER}:${PORTSDIR}/devel/llvm${LLVMVER} \
-		libedit>=0:${PORTSDIR}/devel/libedit
+BUILD_DEPENDS=	clang${LLVMVER}:devel/llvm${LLVMVER} \
+		libedit>=0:devel/libedit
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	llvm-mirror
diff --git a/devel/libconcurrent/Makefile b/devel/libconcurrent/Makefile
index 175c9690fd65..c2d9cd7e9fe9 100644
--- a/devel/libconcurrent/Makefile
+++ b/devel/libconcurrent/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tiny asymmetric-coroutine library
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sharow
diff --git a/devel/libcrossguid/Makefile b/devel/libcrossguid/Makefile
index 6d36db08731d..b178ead96829 100644
--- a/devel/libcrossguid/Makefile
+++ b/devel/libcrossguid/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Minimal and cross platform C++ GUID library
 LICENSE=	MIT
 LICENSE_FILES=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	graeme-hill
diff --git a/devel/libcutl/Makefile b/devel/libcutl/Makefile
index da61d9250c86..70051aa1fccf 100644
--- a/devel/libcutl/Makefile
+++ b/devel/libcutl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	C++ utility library with generic and independent components
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libdap/Makefile b/devel/libdap/Makefile
index 8f65af9a7e04..cc0616377fae 100644
--- a/devel/libdap/Makefile
+++ b/devel/libdap/Makefile
@@ -13,9 +13,9 @@ COMMENT=	SDK which contains an implementation of DAP 2.0 and 3.1
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index f6a0e6a9cf23..441392e434a0 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -28,7 +28,7 @@ OPTIONS_SUB=		YES
 DOXYGEN_DESC=		Build documentation (requires doxygen)
 DOXYGEN_CMAKE_ON=	-DWITH_DOC:BOOL=TRUE
 DOXYGEN_CMAKE_OFF=	-DWITH_DOC:BOOL=FALSE
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	DOXYGEN
diff --git a/devel/libdbusmenu-qt5/Makefile b/devel/libdbusmenu-qt5/Makefile
index f284523e8191..4c525688db8b 100644
--- a/devel/libdbusmenu-qt5/Makefile
+++ b/devel/libdbusmenu-qt5/Makefile
@@ -28,7 +28,7 @@ OPTIONS_SUB=		YES
 DOXYGEN_DESC=		Build documentation (requires doxygen)
 DOXYGEN_CMAKE_ON=	-DWITH_DOC:BOOL=TRUE
 DOXYGEN_CMAKE_OFF=	-DWITH_DOC:BOOL=FALSE
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	DOXYGEN
diff --git a/devel/libdbusmenu/Makefile b/devel/libdbusmenu/Makefile
index 49685d1dd0be..85e0031bf3c9 100644
--- a/devel/libdbusmenu/Makefile
+++ b/devel/libdbusmenu/Makefile
@@ -16,9 +16,9 @@ LICENSE_COMB=	multi
 LICENSE_DISTFILES=	${WRKSRC}/COPYING-GPL3 ${WRKSRC}/COPYING.2.1 \
 	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala \
-		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+BUILD_DEPENDS=	vapigen:lang/vala \
+		gtkdoc-check:textproc/gtk-doc
+LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig pathfix libtool
diff --git a/devel/libdfui/Makefile b/devel/libdfui/Makefile
index 68c826e47268..2046afe08433 100644
--- a/devel/libdfui/Makefile
+++ b/devel/libdfui/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Abstract user interface protocol library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libaura3.so:${PORTSDIR}/devel/libaura
+LIB_DEPENDS=	libaura3.so:devel/libaura
 
 USES=	tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/devel/libdistance/Makefile b/devel/libdistance/Makefile
index 5652cc2f2429..4c92cb5cd458 100644
--- a/devel/libdistance/Makefile
+++ b/devel/libdistance/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Compute the distance between two pieces of data
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS=	swig2.0:devel/swig20
 
 USES+=		fakeroot pkgconfig tcl
 USE_LDCONFIG=	yes
diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile
index d106b1739293..0233a64a1f74 100644
--- a/devel/libdlna/Makefile
+++ b/devel/libdlna/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://libdlna.geexbox.org/releases/ \
 MAINTAINER=	malus.x@gmail.com
 COMMENT=	Reference DLNA open-source implementation
 
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 
 HAS_CONFIGURE=	yes
 USES=		tar:bzip2 gmake pkgconfig
diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile
index 07291d48afc6..18769f257095 100644
--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://monkey.org/~provos/
 MAINTAINER=	oz@nixil.net
 COMMENT=	Provides a non-blocking thread-safe API for resolving DNS names
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:devel/libevent2
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/libe/Makefile b/devel/libe/Makefile
index cb4745d3715e..6e4aef912341 100644
--- a/devel/libe/Makefile
+++ b/devel/libe/Makefile
@@ -12,7 +12,7 @@ COMMENT=	High-performance datastructures and utilities for C++
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libpo6.pc:${PORTSDIR}/devel/libpo6
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libpo6.pc:devel/libpo6
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig
diff --git a/devel/libee/Makefile b/devel/libee/Makefile
index e239bb42b22b..0dcf67fcd4c6 100644
--- a/devel/libee/Makefile
+++ b/devel/libee/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.libee.org/files/download/
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Event expression library inspired by CEE
 
-LIB_DEPENDS=	libestr.so:${PORTSDIR}/devel/libestr
+LIB_DEPENDS=	libestr.so:devel/libestr
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/libepp-nicbr/Makefile b/devel/libepp-nicbr/Makefile
index af65dcccbed8..a9cd06ce8d03 100644
--- a/devel/libepp-nicbr/Makefile
+++ b/devel/libepp-nicbr/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Partial Extensible Provisioning Protocol to .br domains
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
+LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 
 USES=		gmake
 USE_OPENSSL=	yes
diff --git a/devel/libevdev/Makefile b/devel/libevdev/Makefile
index 98141381e289..1342dfad8fa8 100644
--- a/devel/libevdev/Makefile
+++ b/devel/libevdev/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Linux Event Device library
 LICENSE=	MIT # without linux/*.h
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
-RUN_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
+RUN_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 
 USES=		gmake libtool pathfix python:build tar:xz
 EXTRACT_AFTER_ARGS=	--exclude include # v4l_compat
diff --git a/devel/libevt/Makefile b/devel/libevt/Makefile
index cd7df29914b7..2ea0db8b31d5 100644
--- a/devel/libevt/Makefile
+++ b/devel/libevt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library and tooling to access the Windows Event Log (EVT) format
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libregf.so:${PORTSDIR}/devel/libregf
+LIB_DEPENDS=	libregf.so:devel/libregf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libregf=${LOCALBASE}
diff --git a/devel/libevtx/Makefile b/devel/libevtx/Makefile
index 0efb72338d6a..2aa5444d4227 100644
--- a/devel/libevtx/Makefile
+++ b/devel/libevtx/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library and tooling to access the Windows XML Event Log (EVTX) format
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libregf.so:${PORTSDIR}/devel/libregf
+LIB_DEPENDS=	libregf.so:devel/libregf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libregf=${LOCALBASE}
diff --git a/devel/libewf/Makefile b/devel/libewf/Makefile
index 7b4bb39c625c..e407ab31d0b1 100644
--- a/devel/libewf/Makefile
+++ b/devel/libewf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library for support of the Expert Witness Compression Format (EWF)
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		fuse gettext iconv libtool:keepla pathfix pkgconfig python:2
 USE_LDCONFIG=	yes
diff --git a/devel/libexplain/Makefile b/devel/libexplain/Makefile
index 99d061a0edb0..ebdb0e216b22 100644
--- a/devel/libexplain/Makefile
+++ b/devel/libexplain/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Library which may be used to explain Unix and Linux system call errors
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
-RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
+BUILD_DEPENDS=	gsed:textproc/gsed
+RUN_DEPENDS=	lsof:sysutils/lsof
 
 USES=		bison gettext ghostscript:build gmake iconv libtool:build
 GNU_CONFIGURE=	yes
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 1731c7b09d8b..f86be437e258 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Foreign Function Interface
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	runtest:${PORTSDIR}/misc/dejagnu
+TEST_DEPENDS=	runtest:misc/dejagnu
 
 USES=		libtool pathfix
 USE_LDCONFIG=	yes
diff --git a/devel/libfreefare/Makefile b/devel/libfreefare/Makefile
index ecf969c65e0b..7f2a4ffcefd6 100644
--- a/devel/libfreefare/Makefile
+++ b/devel/libfreefare/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://${PORTNAME}.googlecode.com/files/ \
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	MIFARE contactless tag access library
 
-LIB_DEPENDS=	libnfc.so:${PORTSDIR}/devel/libnfc
+LIB_DEPENDS=	libnfc.so:devel/libnfc
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index 2b1bf301a126..d42906f93c88 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -23,13 +23,13 @@ OPTIONS_DEFAULT=BOOST PYTHON
 OPTIONS_SUB=	yes
 
 BOOST_DESC=		C++ bindings (requires Boost)
-BOOST_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+BOOST_LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 BOOST_CMAKE_ON=		-DFTDIPP:BOOL=ON
 BOOST_CMAKE_OFF=	-DFTDIPP:BOOL=OFF
 BOOST_CXXFLAGS=		-I${LOCALBASE}/include
 
 PYTHON_DESC=		Python bindings
-PYTHON_BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+PYTHON_BUILD_DEPENDS=	swig2.0:devel/swig20
 PYTHON_CMAKE_ON=	-DPYTHON_BINDINGS:BOOL=ON
 PYTHON_CMAKE_OFF=	-DPYTHON_BINDINGS:BOOL=OFF
 PYTHON_USES=		python
diff --git a/devel/libftdi1/Makefile b/devel/libftdi1/Makefile
index 636b02e06c10..133a56109328 100644
--- a/devel/libftdi1/Makefile
+++ b/devel/libftdi1/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Library (using libusb) to talk to FTDI chips
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse
+LIB_DEPENDS=	libconfuse.so:devel/libconfuse
 
 OPTIONS_DEFINE=		PYTHON BOOST DOCS EXAMPLES
 OPTIONS_DEFAULT=	PYTHON BOOST DOCS EXAMPLES
@@ -41,14 +41,14 @@ CMAKE_ARGS+=	-DEXAMPLES:BOOL=false
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python:2
 CMAKE_ARGS+=	-DPYTHON_BINDINGS:BOOL=true
-BUILD_DEPENDS+=	swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS+=	swig2.0:devel/swig20
 .else
 CMAKE_ARGS+=	-DPYTHON_BINDINGS:BOOL=false
 .endif
 
 .if ${PORT_OPTIONS:MBOOST}
 CMAKE_ARGS+=		-DFTDIPP:BOOL=true
-LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS+=	libboost_system.so:devel/boost-libs
 .else
 CMAKE_ARGS+=		-DFTDIPP:BOOL=false
 .endif
diff --git a/devel/libg19draw/Makefile b/devel/libg19draw/Makefile
index 26257ba72dc5..4f3a302bae1e 100644
--- a/devel/libg19draw/Makefile
+++ b/devel/libg19draw/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/g19linux/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	armin@frozen-zone.org
 COMMENT=	G19 draw library
 
-LIB_DEPENDS=	libg19.so:${PORTSDIR}/devel/libg19 \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libg19.so:devel/libg19 \
+		libfreetype.so:print/freetype2
 
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -pthread"
 
diff --git a/devel/libgalago/Makefile b/devel/libgalago/Makefile
index 523cdff7f8ea..f996f32bdfdb 100644
--- a/devel/libgalago/Makefile
+++ b/devel/libgalago/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.galago-project.org/files/releases/source/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Galago desktop presence library
 
-LIB_PC_DEPENDS=	dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
+LIB_PC_DEPENDS=	dbus-glib-1.pc:devel/dbus-glib
 
 BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 1f0c5e4ce61c..ab2e673ad951 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -9,15 +9,15 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GLib based implimentation of the GData protocol
 
-BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
-		vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libuhttpmock-0.0.so:${PORTSDIR}/net/uhttpmock \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		liboauth.so:${PORTSDIR}/net/liboauth
-RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		gtkdoc-check:textproc/gtk-doc \
+		vapigen:lang/vala
+LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libuhttpmock-0.0.so:net/uhttpmock \
+		libgcr-3.so:security/gcr \
+		liboauth.so:net/liboauth
+RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 gnomeprefix intlhack \
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 522fb272dee5..bedf9f26973b 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GObject collection library
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/libgit2-glib/Makefile b/devel/libgit2-glib/Makefile
index a06a8cbab9b8..e17147db8d94 100644
--- a/devel/libgit2-glib/Makefile
+++ b/devel/libgit2-glib/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Glib wrapper library around the libgit2 git access library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala \
-		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+BUILD_DEPENDS=	vapigen:lang/vala \
+		gtkdoc-check:textproc/gtk-doc
+LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		compiler:c11 gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 gnomeprefix gtk30 intlhack introspection
diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile
index 3e5a56d74225..0267e18f331f 100644
--- a/devel/libgit2/Makefile
+++ b/devel/libgit2/Makefile
@@ -24,12 +24,12 @@ OPTIONS_DEFAULT=SSH THREADS CURL
 SSH_DESC=	Enable SSH support through libssh2
 CURL_DESC=	Enable HTTP support through cURL
 
-SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 SSH_CMAKE_ON=		-DUSE_SSH=ON
 SSH_CMAKE_OFF=		-DUSE_SSH=OFF
 THREADS_CMAKE_ON=	-DTHREADSAFE=ON
 THREADS_CMAKE_OFF=	-DTHREADSAFE=OFF
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_ON=		-DCURL=ON
 CURL_CMAKE_OFF=		-DCURL=OFF
 
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 5b901d35dd9a..888b27bd27df 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -17,7 +17,7 @@ USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-RUN_DEPENDS=	xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
 
 GNU_CONFIGURE=	yes
 USES+=		gmake libtool:keepla pathfix pkgconfig
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 6729c0c0cc13..aedf6e83fd94 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -14,8 +14,8 @@ COMMENT=	C++ wrapper for libglade2 library
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
+BUILD_DEPENDS=	gm4:devel/m4
 
 USE_XORG=	x11 ice
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
diff --git a/devel/libgpkg/Makefile b/devel/libgpkg/Makefile
index d9c69de4db00..14ee336dee32 100644
--- a/devel/libgpkg/Makefile
+++ b/devel/libgpkg/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/luciad-libgpkg-c56e3708453e
 
 GEOS_CMAKE_OFF=		-DGPKG_GEOS=OFF
 GEOS_CMAKE_ON=		-DGPKG_GEOS=ON
-GEOS_LIB_DEPENDS=	libgeos_c.so:${PORTSDIR}/graphics/geos
+GEOS_LIB_DEPENDS=	libgeos_c.so:graphics/geos
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gpkg/libgpkg.a ${STAGEDIR}${PREFIX}/lib/
diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile
index fa3f4920bdd5..099731d4b5a4 100644
--- a/devel/libgutenfetch/Makefile
+++ b/devel/libgutenfetch/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	johntabularasa@users.sf.net
 COMMENT=	Library that allows application developers to connect to PG
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libhid/Makefile b/devel/libhid/Makefile
index c81261841553..4db39f3a5a71 100644
--- a/devel/libhid/Makefile
+++ b/devel/libhid/Makefile
@@ -10,9 +10,9 @@ 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:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/bin/swig1.3:${PORTSDIR}/devel/swig13
+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
diff --git a/devel/libical-glib/Makefile b/devel/libical-glib/Makefile
index 5b9b72e42b14..58a77f2c37c8 100644
--- a/devel/libical-glib/Makefile
+++ b/devel/libical-glib/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Introspection bindings for libical
 
-LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS=	libical.so:devel/libical
 
 USES=		compiler:c11 gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 introspection:build libxml2
diff --git a/devel/libiqxmlrpc/Makefile b/devel/libiqxmlrpc/Makefile
index 98f587ecd1bc..e113ffc19eca 100644
--- a/devel/libiqxmlrpc/Makefile
+++ b/devel/libiqxmlrpc/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Free, object-oriented XML-RPC implementation written in C++
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=
 
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CMAKE_ARGS_OFF=	-Dbuild_docs=off
 
 USE_GNOME=	libxml2
diff --git a/devel/libisofs/Makefile b/devel/libisofs/Makefile
index c43e99d1eed4..3e3e95738688 100644
--- a/devel/libisofs/Makefile
+++ b/devel/libisofs/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Libburnia ISO9660 filesystem creation library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libburn.so:${PORTSDIR}/devel/libburn
+LIB_DEPENDS=	libburn.so:devel/libburn
 
 GNU_CONFIGURE=	yes
 USES=		iconv libtool
diff --git a/devel/libkgapi/Makefile b/devel/libkgapi/Makefile
index b4db2f383059..573eb5cd9785 100644
--- a/devel/libkgapi/Makefile
+++ b/devel/libkgapi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	KDE-based library for accessing various Google services
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 USES=		cmake:outsource tar:bzip2
 USE_KDE4=	automoc4 kdelibs kdeprefix pimlibs
diff --git a/devel/libklel/Makefile b/devel/libklel/Makefile
index 5d7732c9f8e5..ec6cacea7ab9 100644
--- a/devel/libklel/Makefile
+++ b/devel/libklel/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	klm@uidzero.org
 COMMENT=	KoreLogic Expression Language library
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 USES=		perl5 libtool
diff --git a/devel/libkolab/Makefile b/devel/libkolab/Makefile
index ae015ee1148a..5f29e4864861 100644
--- a/devel/libkolab/Makefile
+++ b/devel/libkolab/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Advanced Kolab Object Handling Library
 # itself to be LGPL3-licensed (and so are all the installed headers).
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libkolabxml.so:${PORTSDIR}/textproc/libkolabxml
+LIB_DEPENDS=	libkolabxml.so:textproc/libkolabxml
 
 # TODO: Conditionally enable the bindings based on OPTIONs.
 CMAKE_ARGS=	-DBUILD_TESTS:BOOL=OFF \
diff --git a/devel/liblangtag/Makefile b/devel/liblangtag/Makefile
index 85186794557e..676a6aff9ad3 100644
--- a/devel/liblangtag/Makefile
+++ b/devel/liblangtag/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Interface library to access tags for identifying languages
 LICENSE=	LGPL3 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/liblas/Makefile b/devel/liblas/Makefile
index 82698df8bc3d..95d076eac631 100644
--- a/devel/liblas/Makefile
+++ b/devel/liblas/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Library For Reading And Writing LAS-Format Data
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/devel/liblnk/Makefile b/devel/liblnk/Makefile
index 7c572d2be23c..5127849fbd0b 100644
--- a/devel/liblnk/Makefile
+++ b/devel/liblnk/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library and tools to access the Windows shortcut file (LNK) format
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libfwsi.so:${PORTSDIR}/devel/libfwsi
+LIB_DEPENDS=	libfwsi.so:devel/libfwsi
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libfwsi=${LOCALBASE}
diff --git a/devel/liblognorm/Makefile b/devel/liblognorm/Makefile
index b6d4f62c8777..ef6768d6afcb 100644
--- a/devel/liblognorm/Makefile
+++ b/devel/liblognorm/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Log normalizer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c \
-		libestr.so:${PORTSDIR}/devel/libestr
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+LIB_DEPENDS=	libjson-c.so:devel/json-c \
+		libestr.so:devel/libestr
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/devel/liblouis/Makefile b/devel/liblouis/Makefile
index 636330a99eda..4007c0a141f6 100644
--- a/devel/liblouis/Makefile
+++ b/devel/liblouis/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Open-source Braille Translator And Back-translator
 
 LICENSE=	LGPL3+
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	help2man:misc/help2man
 
 USES=		autoreconf gmake libtool pathfix
 USE_GITHUB=	yes
diff --git a/devel/liblouisxml/Makefile b/devel/liblouisxml/Makefile
index 328784dd9bd7..38cdae10b3ff 100644
--- a/devel/liblouisxml/Makefile
+++ b/devel/liblouisxml/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Library Provide Complete Braille Transcription Services
 LICENSE=	LGPL3+ GPLv3+
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	liblouis.so:${PORTSDIR}/devel/liblouis
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
+LIB_DEPENDS=	liblouis.so:devel/liblouis
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig
diff --git a/devel/libmatheval/Makefile b/devel/libmatheval/Makefile
index f75d6cac98d4..9c94832e5175 100644
--- a/devel/libmatheval/Makefile
+++ b/devel/libmatheval/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Library to evaluate mathematical functions
 
-BUILD_DEPENDS=	flex>=2.5.39_1:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+BUILD_DEPENDS=	flex>=2.5.39_1:textproc/flex
+LIB_DEPENDS=	libguile.so:lang/guile
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LEXLIB=-lfl_pic MAKEINFO="makeinfo --no-split"
diff --git a/devel/libmcs/Makefile b/devel/libmcs/Makefile
index db64a8614488..bc25c5d5ec33 100644
--- a/devel/libmcs/Makefile
+++ b/devel/libmcs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://distfiles.atheme.org/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	BSD licenced configuration database system
 
-LIB_DEPENDS=	libmowgli.so:${PORTSDIR}/devel/libmowgli
+LIB_DEPENDS=	libmowgli.so:devel/libmowgli
 
 OPTIONS_DEFINE=	GCONF
 OPTIONS_DEFAULT=	GCONF
diff --git a/devel/libmpsse/Makefile b/devel/libmpsse/Makefile
index 95a65168af5a..832de412ed54 100644
--- a/devel/libmpsse/Makefile
+++ b/devel/libmpsse/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Open source library for SPI/I2C control via FTDI chips
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
-LIB_DEPENDS=	libftdi.so:${PORTSDIR}/devel/libftdi
+BUILD_DEPENDS=	swig2.0:devel/swig20
+LIB_DEPENDS=	libftdi.so:devel/libftdi
 
 USES=		gmake pkgconfig python:2
 USE_AUTOTOOLS=	autoconf
diff --git a/devel/libmsocket/Makefile b/devel/libmsocket/Makefile
index 17bf1520586e..b9e01d9d8b47 100644
--- a/devel/libmsocket/Makefile
+++ b/devel/libmsocket/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/kageki/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Socket abstraction library for C programmers
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 OPTIONS_DEFINE=	DEBUG
 
diff --git a/devel/libmtdev/Makefile b/devel/libmtdev/Makefile
index ec8d52b8401f..6028ee34d462 100644
--- a/devel/libmtdev/Makefile
+++ b/devel/libmtdev/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Multitouch Protocol Translation Library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
-RUN_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
+RUN_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 
 USES=		libtool pathfix tar:bz2
 GNU_CONFIGURE=	yes
diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile
index 9dcb09453d4f..bd4f0216e46b 100644
--- a/devel/libnfc/Makefile
+++ b/devel/libnfc/Makefile
@@ -85,8 +85,8 @@ PN53X_USB_DRIVER=
 CONFIGURE_ARGS+=--with-drivers="${ACR122_PCSC_DRIVER}${ACR122_USB_DRIVER}${ACR122S_DRIVER}${ARYGON_DRIVER}${PN532_I2C_DRIVER}${PN532_SPI_DRIVER}${PN532_UART_DRIVER}${PN53X_USB_DRIVER}"
 
 .if ${PORT_OPTIONS:MACR122_PCSC}
-LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
-RUN_DEPENDS+=	${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so:${PORTSDIR}/devel/libccid
+LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
+RUN_DEPENDS+=	${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so:devel/libccid
 .endif
 
 post-install:
diff --git a/devel/libnsutils/Makefile b/devel/libnsutils/Makefile
index 30c85f60b9e7..8a4f397668e6 100644
--- a/devel/libnsutils/Makefile
+++ b/devel/libnsutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	NetSurf generalised utility library
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
 
 USES=	gmake
 USE_LDCONFIG=	yes
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 46ffdadf66de..535734bf8773 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Wrapping library to the System Tools Backends
 
-BUILD_DEPENDS=	system-tools-backends:${PORTSDIR}/sysutils/system-tools-backends
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libhal.so:${PORTSDIR}/sysutils/hal
-RUN_DEPENDS=	system-tools-backends:${PORTSDIR}/sysutils/system-tools-backends
+BUILD_DEPENDS=	system-tools-backends:sysutils/system-tools-backends
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libhal.so:sysutils/hal
+RUN_DEPENDS=	system-tools-backends:sysutils/system-tools-backends
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig tar:bzip2
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 31d90194d27a..327a0ce8c383 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Low-level event loop management library for POSIX-based OS
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns \
-		libwwwcore.so:${PORTSDIR}/www/libwww
+LIB_DEPENDS=	libadns.so:dns/adns \
+		libwwwcore.so:www/libwww
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libwww
diff --git a/devel/libopencm3/Makefile b/devel/libopencm3/Makefile
index 0d7cb033b949..01fde26eb77c 100644
--- a/devel/libopencm3/Makefile
+++ b/devel/libopencm3/Makefile
@@ -9,7 +9,7 @@ COMMENT=	LGPLv3 Cortex-M0/M3/M4 runtime library
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${LOCALBASE}/gcc-arm-embedded-${TOOLCHAIN_FULL_VERSION}/bin/arm-none-eabi-gcc:${PORTSDIR}/devel/gcc-arm-embedded
+BUILD_DEPENDS=	${LOCALBASE}/gcc-arm-embedded-${TOOLCHAIN_FULL_VERSION}/bin/arm-none-eabi-gcc:devel/gcc-arm-embedded
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libopencm3
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 7089f01a75c4..451654f061b7 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/ \
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	PIM data synchronization framework
 
-BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libexslt.so:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	swig1.3:devel/swig13
+LIB_DEPENDS=	libexslt.so:textproc/libxslt
 
 CONFLICTS=	libopensync-0.22*
 
diff --git a/devel/libopensync022/Makefile b/devel/libopensync022/Makefile
index 88222f39c76a..5aa9602ecfb1 100644
--- a/devel/libopensync022/Makefile
+++ b/devel/libopensync022/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	022
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Freedesktop synchronization framework
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 BROKEN=		unfetchable
 SWIG_LANGUAGES=	python
diff --git a/devel/libopkele/Makefile b/devel/libopkele/Makefile
index 4e3ca4e9106d..fd34fbfb5186 100644
--- a/devel/libopkele/Makefile
+++ b/devel/libopkele/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES=	http://kin.klever.net/dist/
 MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	C++ implementation of an OpenID decentralized identity system
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libtidy.so:${PORTSDIR}/www/tidy-lib \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpcre.so:devel/pcre \
+		libexpat.so:textproc/expat2 \
+		libtidy.so:www/tidy-lib \
+		libxslt.so:textproc/libxslt
 
 USE_LDCONFIG=	yes
 USES=		libtool gmake pkgconfig compiler:c++11-lang
diff --git a/devel/liborcus/Makefile b/devel/liborcus/Makefile
index e35bc968f958..9aa207d97505 100644
--- a/devel/liborcus/Makefile
+++ b/devel/liborcus/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Standalone file import filter library for spreadsheet documents
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/include/mdds/global.hpp:${PORTSDIR}/devel/mdds
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/mdds/global.hpp:devel/mdds
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 USES=		compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz
diff --git a/devel/liborcus07/Makefile b/devel/liborcus07/Makefile
index 94605b75f4cc..93906e0bfbe5 100644
--- a/devel/liborcus07/Makefile
+++ b/devel/liborcus07/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Standalone file import filter library for spreadsheet documents
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/include/mdds/global.hpp:${PORTSDIR}/devel/mdds
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/mdds/global.hpp:devel/mdds
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 BROKEN_sparc64=	cannot link with boost
 
diff --git a/devel/libosinfo/Makefile b/devel/libosinfo/Makefile
index 4960b126220c..5535372d4187 100644
--- a/devel/libosinfo/Makefile
+++ b/devel/libosinfo/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	https://fedorahosted.org/releases/l/i/libosinfo/
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Library for managing OS information for virtualization
 
-LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
-BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
-		${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids
+LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome
+BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids \
+		${LOCALBASE}/share/usbids/usb.ids:misc/usbids
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake libtool pathfix pkgconfig
diff --git a/devel/libosmo-abis/Makefile b/devel/libosmo-abis/Makefile
index 88f6123ab674..301f77c75428 100644
--- a/devel/libosmo-abis/Makefile
+++ b/devel/libosmo-abis/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Shared code regarding the A-bis interface between BTS and BSC
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore \
-		libortp.so:${PORTSDIR}/net/ortp
+LIB_DEPENDS=	libosmocore.so:devel/libosmocore \
+		libortp.so:net/ortp
 
 USES=		autoreconf gmake libtool pathfix pkgconfig
 PATHFIX_MAKEFILEIN=Makefile.am
diff --git a/devel/libosmo-netif/Makefile b/devel/libosmo-netif/Makefile
index 7655e2479ef4..da5e0148dc5c 100644
--- a/devel/libosmo-netif/Makefile
+++ b/devel/libosmo-netif/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library containing common/shared code regarding network interface
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore \
-		libosmoabis.so:${PORTSDIR}/devel/libosmo-abis
+LIB_DEPENDS=	libosmocore.so:devel/libosmocore \
+		libosmoabis.so:devel/libosmo-abis
 
 USES=		autoreconf libtool pathfix pkgconfig
 PATHFIX_MAKEFILEIN=Makefile.am
diff --git a/devel/libosmo-sccp/Makefile b/devel/libosmo-sccp/Makefile
index 4687e9d2fb35..2bc9636c6f6d 100644
--- a/devel/libosmo-sccp/Makefile
+++ b/devel/libosmo-sccp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SCCP network layer protocol implementation
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore
+LIB_DEPENDS=	libosmocore.so:devel/libosmocore
 
 CONFLICTS_INSTALL=libmtp-[0-9]* # lib/libmtp.a
 
diff --git a/devel/libosmocore/Makefile b/devel/libosmocore/Makefile
index 02a3ab4cfbe8..de35400c4b5f 100644
--- a/devel/libosmocore/Makefile
+++ b/devel/libosmocore/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Common library for all Osmocom projects
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		alias autoreconf execinfo gmake libtool pathfix pkgconfig
 PATHFIX_MAKEFILEIN=Makefile.am
@@ -23,8 +23,8 @@ INSTALL_TARGET=	install-strip
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOXYGEN
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENV_OFF=ac_cv_path_DOXYGEN=false
 
 post-patch:
diff --git a/devel/libpafe-ruby/Makefile b/devel/libpafe-ruby/Makefile
index 8e000b554355..be85056084b7 100644
--- a/devel/libpafe-ruby/Makefile
+++ b/devel/libpafe-ruby/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Ruby binding for libpafe
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpafe.so:${PORTSDIR}/devel/libpafe
+LIB_DEPENDS=	libpafe.so:devel/libpafe
 
 USE_RUBY=		yes
 USE_RUBY_EXTCONF=	yes
diff --git a/devel/libparserutils/Makefile b/devel/libparserutils/Makefile
index 4e1229932ae7..0dff09b8c673 100644
--- a/devel/libparserutils/Makefile
+++ b/devel/libparserutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lexer/parser utility functions for NetSurf
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
 
 USES=		gmake iconv localbase pkgconfig
 USE_LDCONFIG=	yes
diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile
index d0f9a4894ebd..dd6e86d8dc22 100644
--- a/devel/libpci/Makefile
+++ b/devel/libpci/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PCI configuration space I/O made easy
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
 
 ALL_TARGET=	lib/libpci.a
 CPPFLAGS+=	-fPIC
diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index c864d9178c0a..83d56e5ee13e 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Generic PCI access library
 
-BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
 
 CONFIGURE_ARGS+=	--with-pciids-path=${LOCALBASE}/share/pciids
 
diff --git a/devel/libpdel/Makefile b/devel/libpdel/Makefile
index e1d101bae35b..f374b45decbc 100644
--- a/devel/libpdel/Makefile
+++ b/devel/libpdel/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/archie
 MAINTAINER=	mav@alkar.net
 COMMENT=	Packet Design multi-purpose C library for embedded applications
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
 
 USE_LDCONFIG=	yes
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 8ea2ca1b390f..cef5b2790262 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -11,14 +11,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	Next evolution of the Gedit plugins engine
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 
 LIBPEAS_SLAVE?=	no
 
 .if ${LIBPEAS_SLAVE} == no
 PORTSCOUT=	limitw:1,even
 .else
-LIB_DEPENDS+=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas
+LIB_DEPENDS+=	libpeas-1.0.so:devel/libpeas
 PORTSCOUT=	ignore:1
 .endif
 
diff --git a/devel/libpololu-avr/Makefile b/devel/libpololu-avr/Makefile
index b6ee7b6eba24..c6746fd8029a 100644
--- a/devel/libpololu-avr/Makefile
+++ b/devel/libpololu-avr/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Support libraries for Pololu robots
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	avr-gcc:${PORTSDIR}/devel/avr-gcc \
-		${LOCALBASE}/avr/lib/libc.a:${PORTSDIR}/devel/avr-libc
+BUILD_DEPENDS=	avr-gcc:devel/avr-gcc \
+		${LOCALBASE}/avr/lib/libc.a:devel/avr-libc
 
 USES=		gmake zip
 
diff --git a/devel/libqb/Makefile b/devel/libqb/Makefile
index 2079fd51ec83..09da590a747d 100644
--- a/devel/libqb/Makefile
+++ b/devel/libqb/Makefile
@@ -26,7 +26,7 @@ INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOXYGEN
 OPTIONS_SUB=	yes
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 post-install:
 	${MKDIR} ${STAGEDIR}${QB_SOCKET_DIR}
diff --git a/devel/libqxt/Makefile b/devel/libqxt/Makefile
index def13178f567..97a5daa325fc 100644
--- a/devel/libqxt/Makefile
+++ b/devel/libqxt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extension library for Qt
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USE_BDB=	44+
 USES=		tar:bzip2
@@ -43,8 +43,8 @@ PLIST_SUB+=	SHVER_1=${PORTVERSION} \
 OPTIONS_DEFAULT=	AVAHI
 OPTIONS_SINGLE=		ZEROCONF
 OPTIONS_SINGLE_ZEROCONF=	AVAHI MDNSRESPONDER
-AVAHI_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/avahi-libdns
-MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 
 STRIP_FILES=	lib/qxt/lib*.so.${PORTVERSION} \
 		${QT_PLUGINDIR_REL}/designer/libQxtDesignerPlugins.so
diff --git a/devel/libr3/Makefile b/devel/libr3/Makefile
index 4fba748a4455..a25a146d5452 100644
--- a/devel/libr3/Makefile
+++ b/devel/libr3/Makefile
@@ -10,9 +10,9 @@ COMMENT=	URL router library with high performance
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libcheck.so:${PORTSDIR}/devel/libcheck \
-		libgvc.so:${PORTSDIR}/graphics/graphviz \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libcheck.so:devel/libcheck \
+		libgvc.so:graphics/graphviz \
+		libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-graphviz
diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 078056d1c825..914406f91149 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Library used by rusxmms for language autodetection
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librcd.so:${PORTSDIR}/devel/librcd \
-		libenca.so:${PORTSDIR}/converters/enca \
-		libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	librcd.so:devel/librcd \
+		libenca.so:converters/enca \
+		libaspell.so:textproc/aspell
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
@@ -39,7 +39,7 @@ BDB_USE=		BDB=41+
 
 TRANSLATE_DESC=			Online translation support
 TRANSLATE_CONFIGURE_ENABLE=	libtranslate
-TRANSLATE_LIB_DEPENDS=		libtranslate.so:${PORTSDIR}/textproc/libtranslate
+TRANSLATE_LIB_DEPENDS=		libtranslate.so:textproc/libtranslate
 
 TOOLS_DESC=		Recode configuration utility
 TOOLS_EXTRA_PATCHES=	${FILESDIR}/extrapatch-rcc-config
diff --git a/devel/libregf/Makefile b/devel/libregf/Makefile
index 0be226b842fb..bcf259b588ae 100644
--- a/devel/libregf/Makefile
+++ b/devel/libregf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library and tools to support the Windows NT Registry File format
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libfwsi.so:${PORTSDIR}/devel/libfwsi
+LIB_DEPENDS=	libfwsi.so:devel/libfwsi
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libfwsi=${LOCALBASE}
diff --git a/devel/librelp/Makefile b/devel/librelp/Makefile
index b4b32d845559..9e1ce8a83931 100644
--- a/devel/librelp/Makefile
+++ b/devel/librelp/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.rsyslog.com/librelp/
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Reliable event logging protocol library
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/devel/librest/Makefile b/devel/librest/Makefile
index 7d41cf96211a..36ebcef6538a 100644
--- a/devel/librest/Makefile
+++ b/devel/librest/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Easy access to RESTful web services
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	ca_root_nss>0:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
@@ -25,9 +25,9 @@ PORTEXAMPLES=	*.c
 OPTIONS_DEFINE=	GNOME EXAMPLES
 OPTIONS_DEFAULT=	GNOME
 
-GNOME_LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
+GNOME_LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome
 GNOME_CONFIGURE_OFF=	--without-gnome
-GNOME_LIB_DEPENDS_OFF=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+GNOME_LIB_DEPENDS_OFF=	libsoup-2.4.so:devel/libsoup
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/devel/librevisa-vish/Makefile b/devel/librevisa-vish/Makefile
index 0e7efe490924..e1ce710e1763 100644
--- a/devel/librevisa-vish/Makefile
+++ b/devel/librevisa-vish/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	vish-${PORTVERSION}
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Open Source VISA shell for interfacing test and measurement equipment
 
-LIB_DEPENDS=	libvisa.so:${PORTSDIR}/devel/librevisa
+LIB_DEPENDS=	libvisa.so:devel/librevisa
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/devel/librolegen/Makefile b/devel/librolegen/Makefile
index b144794893cc..5bb3321fa6e1 100644
--- a/devel/librolegen/Makefile
+++ b/devel/librolegen/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Library to dynamically generate webOS system bus role files
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/cmake/Modules/webOS/webOS.cmake:${PORTSDIR}/devel/cmake-modules-webos
+BUILD_DEPENDS=	${LOCALBASE}/share/cmake/Modules/webOS/webOS.cmake:devel/cmake-modules-webos
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeWebOS
diff --git a/devel/libruin/Makefile b/devel/libruin/Makefile
index f2fecf306fdd..6abe792ac317 100644
--- a/devel/libruin/Makefile
+++ b/devel/libruin/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Renderer for User Interfaces in Ncurses
 
-BUILD_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:${PORTSDIR}/devel/guile-lib
-RUN_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:${PORTSDIR}/devel/guile-lib
+BUILD_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:devel/guile-lib
+RUN_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:devel/guile-lib
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libsearpc/Makefile b/devel/libsearpc/Makefile
index 4c1a0318e2cf..fcfe07608c3a 100644
--- a/devel/libsearpc/Makefile
+++ b/devel/libsearpc/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Simple RPC framework based on GObject System in C
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
-		libgobject-2.0.so:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libjansson.so:devel/jansson \
+		libgobject-2.0.so:devel/glib20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index 64862a9b18b2..2bd66bb435ec 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Callback Framework for C++
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index 5cd60efb0438..893ce3314882 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extension of libSigC++
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12
+BUILD_DEPENDS=	gm4:devel/m4
+LIB_DEPENDS=	libsigc-1.2.so:devel/libsigc++12
 
 OPTIONS_DEFINE=	STATIC
 
diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile
index 7831a45a9970..ffec7f46bf62 100644
--- a/devel/libsigrok/Makefile
+++ b/devel/libsigrok/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Framework for hardware logic analyzers, core library
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libserialport.so:${PORTSDIR}/devel/libserialport \
-		libzip.so:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS=	libserialport.so:devel/libserialport \
+		libzip.so:archivers/libzip
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix libtool pkgconfig
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 08e9585dc9ec..891febf2ad1f 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -36,12 +36,12 @@ ONIG_DESC=	Oniguruma support
 PORTDOCS=	*
 
 PCRE_CONFIGURE_WITH=	pcre
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PNG_CONFIGURE_WITH=	png
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 ICONV_USES=		iconv
 ONIG_CONFIGURE_WITH=	onig
-ONIG_LIB_DEPENDS=	libonig.so:${PORTSDIR}/devel/oniguruma4
+ONIG_LIB_DEPENDS=	libonig.so:devel/oniguruma4
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/libsmpp34/Makefile b/devel/libsmpp34/Makefile
index 8716a453337f..ec664a2f1119 100644
--- a/devel/libsmpp34/Makefile
+++ b/devel/libsmpp34/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Provide an implementation of SMPP-3.4 protocol for PDUs handling
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USES=		autoreconf libtool gmake
 
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 00a7dd1b66cd..d622722fc7ef 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	SOAP (Simple Object Access Protocol) implementation in C
 
-BUILD_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
+BUILD_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+RUN_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
 
 USES=		tar:xz
 PORTSCOUT=	limitw:1,even
@@ -37,7 +37,7 @@ PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
 
 .if defined(SOUP_SLAVE)
 USE_SQLITE=	yes
-LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 CONFIGURE_ARGS+=--with-gnome
 .else
 CONFIGURE_ARGS+=--without-gnome
diff --git a/devel/libtermkey/Makefile b/devel/libtermkey/Makefile
index a330461a0866..1849c7e54527 100644
--- a/devel/libtermkey/Makefile
+++ b/devel/libtermkey/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Easy processing of keyboard entry from terminal-based programs
 LICENSE=	MIT
 
 USES=		gmake libtool:build ncurses pkgconfig
-LIB_DEPENDS=	libunibilium.so:${PORTSDIR}/devel/unibilium
+LIB_DEPENDS=	libunibilium.so:devel/unibilium
 USE_LDCONFIG=	yes
 MAKE_ARGS=	MANDIR=${MANPREFIX}/man
 
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index 5d2aa8355ee2..d741118944cb 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Thai language support library
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdatrie.so:${PORTSDIR}/devel/libdatrie
+LIB_DEPENDS=	libdatrie.so:devel/libdatrie
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
@@ -22,7 +22,7 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	DOXYGEN
 OPTIONS_SUB=	yes
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENABLE=	doxygen-doc
 
 .include <bsd.port.mk>
diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile
index 81b2f1688d09..bdd4a29dd1c5 100644
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	TI calculator file types library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libticonv.so:${PORTSDIR}/converters/libticonv
+LIB_DEPENDS=	libticonv.so:converters/libticonv
 
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 2be46e804953..2b2d159d50cd 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Generic shared library support script
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
+RUN_DEPENDS=	gm4:devel/m4
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-ltdl-install
diff --git a/devel/libuninum/Makefile b/devel/libuninum/Makefile
index 98ae7856cb49..d9b647a92ce2 100644
--- a/devel/libuninum/Makefile
+++ b/devel/libuninum/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://billposer.org/Software/Downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for converting Unicode strings to numbers
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libuv/Makefile b/devel/libuv/Makefile
index dc0cfe00ed19..8ace2bd8e690 100644
--- a/devel/libuv/Makefile
+++ b/devel/libuv/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME=	NODE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-TEST_DEPENDS=	gyp:${PORTSDIR}/devel/py-gyp-devel	\
-		gmake:${PORTSDIR}/devel/gmake
+TEST_DEPENDS=	gyp:devel/py-gyp-devel	\
+		gmake:devel/gmake
 
 USES=		autoreconf libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile
index b0c163087965..cfecae795bb7 100644
--- a/devel/libvanessa_adt/Makefile
+++ b/devel/libvanessa_adt/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	vanessa_adt-${PORTVERSION}
 MAINTAINER=	thomas@bsdunix.ch
 COMMENT=	Library that provides ADTs (queues, dynamic arrays, and more)
 
-LIB_DEPENDS=	libvanessa_logger.so:${PORTSDIR}/devel/libvanessa_logger
+LIB_DEPENDS=	libvanessa_logger.so:devel/libvanessa_logger
 
 USE_LDCONFIG=	yes
 
diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile
index a5d5045f0d05..cdd1ea2b8259 100644
--- a/devel/libvanessa_socket/Makefile
+++ b/devel/libvanessa_socket/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	vanessa_socket-${PORTVERSION}
 MAINTAINER=	thomas@bsdunix.ch
 COMMENT=	Library that provides a simple layer for TCP/IP socket operations
 
-LIB_DEPENDS=	libvanessa_logger.so:${PORTSDIR}/devel/libvanessa_logger \
-		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libvanessa_logger.so:devel/libvanessa_logger \
+		libpopt.so:devel/popt
 
 USES=		libtool pathfix tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index 151e77d8e898..b572aeb2d952 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Glib bindings for Libvirt virtualization API
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	libvirt.so:devel/libvirt
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection
diff --git a/devel/libvirt-java/Makefile b/devel/libvirt-java/Makefile
index 36a61738a2bb..a63977c1a6d6 100644
--- a/devel/libvirt-java/Makefile
+++ b/devel/libvirt-java/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Java bindings for Libvirt virtualization API
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
-BUILD_DEPENDS=	jna>=4.0:${PORTSDIR}/devel/jna \
-		junit>=4.8.2:${PORTSDIR}/java/junit
+LIB_DEPENDS=	libvirt.so:devel/libvirt
+BUILD_DEPENDS=	jna>=4.0:devel/jna \
+		junit>=4.8.2:java/junit
 
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 85005e82914a..549e43cf8fcb 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Toolkit to interact with virtualization capabilities
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libssh2.so:${PORTSDIR}/security/libssh2
-BUILD_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq \
-		xsltproc:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq \
-		dmidecode:${PORTSDIR}/sysutils/dmidecode
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libgcrypt.so:security/libgcrypt \
+		libxml2.so:textproc/libxml2 \
+		libssh2.so:security/libssh2
+BUILD_DEPENDS=	dnsmasq:dns/dnsmasq \
+		xsltproc:textproc/libxslt
+RUN_DEPENDS=	dnsmasq:dns/dnsmasq \
+		dmidecode:sysutils/dmidecode
 
 OPTIONS_DEFINE=	DOCS GNUTLS NLS QEMU SASL
 OPTIONS_DEFAULT=	GNUTLS
@@ -42,24 +42,24 @@ BHYVE_CONFIGURE_WITH=	bhyve
 
 QEMU_CONFIGURE_WITH=	qemu yajl
 QEMU_CFLAGS=	-I${LOCALBASE}/include
-QEMU_LIB_DEPENDS=	libyajl.so:${PORTSDIR}/devel/yajl
-QEMU_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode \
-			qemu-io:${PORTSDIR}/emulators/qemu-devel
+QEMU_LIB_DEPENDS=	libyajl.so:devel/yajl
+QEMU_RUN_DEPENDS=	dmidecode:sysutils/dmidecode \
+			qemu-io:emulators/qemu-devel
 
 GNUTLS_CONFIGURE_ON=	--with-gnutls=${LOCALBASE}
 GNUTLS_CONFIGURE_OFF=	--without-gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 
 SASL_CONFIGURE_WITH=	sasl
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 XEN_CONFIGURE_WITH=	libxl
 XEN_CFLAGS=	-I${LOCALBASE}/include
-XEN_LIB_DEPENDS=	libxenlight.so:${PORTSDIR}/sysutils/xen-tools
+XEN_LIB_DEPENDS=	libxenlight.so:sysutils/xen-tools
 
 VARDIR=		/var
 
diff --git a/devel/libwfut/Makefile b/devel/libwfut/Makefile
index f602d54ae2fb..4624d583ba50 100644
--- a/devel/libwfut/Makefile
+++ b/devel/libwfut/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/worldforge/libwfut%20%28updates%20library%29/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	WorldForge update library
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
+		libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=--without-python
 GNU_CONFIGURE=	yes
diff --git a/devel/libxs/Makefile b/devel/libxs/Makefile
index f835db2ae2cb..4c3becd377a0 100644
--- a/devel/libxs/Makefile
+++ b/devel/libxs/Makefile
@@ -52,9 +52,9 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xmlto:${PORTSDIR}/textproc/xmlto \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS+=	asciidoc:textproc/asciidoc \
+		xmlto:textproc/xmlto \
+		docbook-xml>0:textproc/docbook-xml
 
 .else
 CONFIGURE_ARGS+=	--without-documentation
@@ -68,7 +68,7 @@ CFLAGS+=		-fPIC
 
 .if ${PORT_OPTIONS:MEXTERNAL}
 CONFIGURE_ARGS+=	--with-system-pgm
-LIB_DEPENDS+=		libpgm.so:${PORTSDIR}/net/openpgm
+LIB_DEPENDS+=		libpgm.so:net/openpgm
 .endif
 
 .if ${PORT_OPTIONS:MPLUGINS}
diff --git a/devel/libzookeeper/Makefile b/devel/libzookeeper/Makefile
index 75b2c9353b01..4bf7841bfe34 100644
--- a/devel/libzookeeper/Makefile
+++ b/devel/libzookeeper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C client interface to Zookeeper server
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/devel/cppunit
+LIB_DEPENDS=	libcppunit.so:devel/cppunit
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	uses x86 assembly
diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile
index e76efedaa16a..f22bbe873e8f 100644
--- a/devel/libzrtpcpp/Makefile
+++ b/devel/libzrtpcpp/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU/ccrtp
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	ZRTP extension for GNU ccRTP
 
-LIB_DEPENDS=	libccrtp.so:${PORTSDIR}/devel/ccrtp \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libccrtp.so:devel/ccrtp \
+		libgcrypt.so:security/libgcrypt
 
 USES=		cmake pkgconfig
 USE_OPENSSL=	yes
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 9cffbf1495df..06059808413f 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Routines to access raw VBI capture devices
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libunicode.so:${PORTSDIR}/devel/libunicode
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libunicode.so:devel/libunicode
 
 USES=		iconv libtool localbase pathfix tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/devel/linux-c6-devtools/Makefile b/devel/linux-c6-devtools/Makefile
index f1876d9a4f2b..bbde6142d0e7 100644
--- a/devel/linux-c6-devtools/Makefile
+++ b/devel/linux-c6-devtools/Makefile
@@ -23,7 +23,7 @@ COMMENT=	Linux compilers and base libraries (CentOS ${LINUX_DIST_VER})
 
 # LICENSE=	Various GNU
 
-RUN_DEPENDS+=	linux-${USE_LINUX}-libgfortran>0:${PORTSDIR}/devel/linux-c6-libgfortran
+RUN_DEPENDS+=	linux-${USE_LINUX}-libgfortran>0:devel/linux-c6-libgfortran
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	c6
diff --git a/devel/linux_libusb/Makefile b/devel/linux_libusb/Makefile
index 64dd3d834aa8..3d6f1a1780d0 100644
--- a/devel/linux_libusb/Makefile
+++ b/devel/linux_libusb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/nox
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Linux-compatibility libusb
 
-BUILD_DEPENDS=	${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux-c6-devtools
+BUILD_DEPENDS=	${LINUXBASE}/usr/bin/gcc:devel/linux-c6-devtools
 
 USES=		tar:bzip2
 ONLY_FOR_ARCHS=	i386 amd64
@@ -68,7 +68,7 @@ do-install:
 	${LN} -f ${STAGEDIR}${PREFIX}/usr/lib/libusb.so ${STAGEDIR}${PREFIX}/usr/lib/libusb-0.1.so.4
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-#FETCH_DEPENDS+=		svn:${PORTSDIR}/devel/subversion
+#FETCH_DEPENDS+=		svn:devel/subversion
 SVN?=		svnlite
 
 do-fetch:
diff --git a/devel/lldb37/Makefile b/devel/lldb37/Makefile
index afb23d735cb8..3976401f5ce8 100644
--- a/devel/lldb37/Makefile
+++ b/devel/lldb37/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM Debugger (use devel/llvm${LLVM_SUFFIX})
 
-RUN_DEPENDS+=	lldb${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	lldb${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	37
 
diff --git a/devel/lldb38/Makefile b/devel/lldb38/Makefile
index 576a13ed4904..71fc5d3c2c18 100644
--- a/devel/lldb38/Makefile
+++ b/devel/lldb38/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM Debugger (use devel/llvm${LLVM_SUFFIX})
 
-RUN_DEPENDS+=	lldb${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	lldb${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	38
 
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 882e9a78649a..ebdbbd37344d 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -46,13 +46,13 @@ DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 LIT_DESC=		Install lit and FileCheck test tools
 LLDB_DESC=		Install lldb, the LLVM debugger (ignore on 9.x)
-LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LLDB_BUILD_DEPENDS=	swig:devel/swig13
 LLDB_GH_PROJECT=	lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 LLVM_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index eb838f4243c2..05b988f4bfc3 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -58,7 +58,7 @@ LLD_DESC=		Install lld, the LLVM linker
 LLD_GH_PROJECT=		lld:lld
 LLD_GH_TAGNAME=		${LLD_COMMIT}:lld
 LLDB_DESC=		Install lldb, the LLVM debugger (ignored on 9.x)
-LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LLDB_BUILD_DEPENDS=	swig:devel/swig13
 LLDB_GH_PROJECT=	lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
@@ -67,11 +67,11 @@ OPENMP_GH_PROJECT=	openmp:openmp
 OPENMP_GH_TAGNAME=	${OPENMP_COMMIT}:openmp
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
-GOLD_BUILD_DEPENDS=	ld.gold:${PORTSDIR}/devel/binutils
+GOLD_BUILD_DEPENDS=	ld.gold:devel/binutils
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 LLVM_RELEASE=	3.8.0
 
diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index a19e7d2b749e..3ec30f1786c8 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -96,12 +96,12 @@ RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+=	cmake:devel/cmake
 PORTDATA+=	cmake
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -119,8 +119,8 @@ USES+=			python:-2.9,build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=		ld.gold:devel/binutils
+RUN_DEPENDS+=		ld.gold:devel/binutils
 CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
 .endif
diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile
index 9459961546e3..bba4898c4bb6 100644
--- a/devel/llvm34/Makefile
+++ b/devel/llvm34/Makefile
@@ -101,12 +101,12 @@ RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+=	cmake:devel/cmake
 PORTDATA+=	cmake
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -124,8 +124,8 @@ USES+=			python:build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=		ld.gold:devel/binutils
+RUN_DEPENDS+=		ld.gold:devel/binutils
 CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
 .endif
diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile
index 65cb3c7571e8..0f300fff9500 100644
--- a/devel/llvm35/Makefile
+++ b/devel/llvm35/Makefile
@@ -97,12 +97,12 @@ RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+=	cmake:devel/cmake
 PORTDATA+=	cmake
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -120,8 +120,8 @@ USES+=			python:build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=		ld.gold:devel/binutils
+RUN_DEPENDS+=		ld.gold:devel/binutils
 CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
 .endif
diff --git a/devel/llvm36/Makefile b/devel/llvm36/Makefile
index 34311cb8f90a..eefe16f2185a 100644
--- a/devel/llvm36/Makefile
+++ b/devel/llvm36/Makefile
@@ -107,12 +107,12 @@ RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+=	cmake:devel/cmake
 PORTDATA+=	cmake
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -130,8 +130,8 @@ USES+=			python:build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=		ld.gold:devel/binutils
+RUN_DEPENDS+=		ld.gold:devel/binutils
 CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
 .endif
diff --git a/devel/llvm37/Makefile b/devel/llvm37/Makefile
index 1653d1a6c846..de7144bc0b9f 100644
--- a/devel/llvm37/Makefile
+++ b/devel/llvm37/Makefile
@@ -64,13 +64,13 @@ LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_DESC=		Install lldb, the LLVM debugger (ignored on 9.x)
-LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LLDB_BUILD_DEPENDS=	swig:devel/swig13
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
-GOLD_BUILD_DEPENDS=	ld.gold:${PORTSDIR}/devel/binutils
+GOLD_BUILD_DEPENDS=	ld.gold:devel/binutils
 
 # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
 .for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP
@@ -79,7 +79,7 @@ WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
 
@@ -241,7 +241,7 @@ NOT_FOR_ARCH=	ia64
 
 .if ${PYTHON_REL} < 3400
 LLDB_BUILD_DEPENDS+= \
-	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .if ${PORT_OPTIONS:MLLDB} && ${PYTHON_REL} >= 3000
diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile
index 43eb2c030e61..6dcc04987255 100644
--- a/devel/llvm38/Makefile
+++ b/devel/llvm38/Makefile
@@ -59,13 +59,13 @@ LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_DESC=		Install lldb, the LLVM debugger (ignored on 9.x)
-LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LLDB_BUILD_DEPENDS=	swig:devel/swig13
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
-GOLD_BUILD_DEPENDS=	ld.gold:${PORTSDIR}/devel/binutils
+GOLD_BUILD_DEPENDS=	ld.gold:devel/binutils
 
 # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
 .for option in CLANG EXTRAS LLD LLDB OPENMP
@@ -74,7 +74,7 @@ WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
 
@@ -200,7 +200,7 @@ PORTDOCS+=	lld
 
 .if ${PYTHON_REL} < 3400
 LLDB_BUILD_DEPENDS+= \
-	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .if ${PORT_OPTIONS:MLLDB} && ${PYTHON_REL} >= 3000
diff --git a/devel/lmdbg/Makefile b/devel/lmdbg/Makefile
index 90f14305c82f..fc2f45563d26 100644
--- a/devel/lmdbg/Makefile
+++ b/devel/lmdbg/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Lightweight malloc debugger
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	mk-configure>=0.24:${PORTSDIR}/devel/mk-configure
-LIB_DEPENDS=	libJudy.so:${PORTSDIR}/devel/judy
-RUN_DEPENDS=	runawk:${PORTSDIR}/lang/runawk \
-		${LOCALBASE}/bin/pipestatus:${PORTSDIR}/devel/pipestatus
+BUILD_DEPENDS=	mk-configure>=0.24:devel/mk-configure
+LIB_DEPENDS=	libJudy.so:devel/judy
+RUN_DEPENDS=	runawk:lang/runawk \
+		${LOCALBASE}/bin/pipestatus:devel/pipestatus
 
 USE_LDCONFIG=	yes
 
diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile
index bd27b6685db3..bea13104f8cc 100644
--- a/devel/log4c/Makefile
+++ b/devel/log4c/Makefile
@@ -15,7 +15,7 @@ LICENSE=	LGPL21
 OPTIONS_DEFINE=	EXPAT
 OPTIONS_DEFAULT=EXPAT
 EXPAT_CONFIGURE_WITH=	expat
-EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		libtool pathfix
 GNU_CONFIGURE=	yes
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index d69cd53d54c0..a5b67a74acb3 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=		DOXYGEN
 OPTIONS_SUB=		yes
 
-DOXYGEN_BUILD_DEPENDS=		doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENABLE=	doxygen
 
 post-patch:
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index 58a80b948894..1608090a6f80 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -14,7 +14,7 @@ COMMENT=	C++ port of the Log4j project
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS=	libapr-1.so:devel/apr1
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env
@@ -25,10 +25,10 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	BOOST DOXYGEN
 
-BOOST_BUILD_DEPENDS=	${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost-libs
+BOOST_BUILD_DEPENDS=	${LOCALBASE}/include/boost/regex.hpp:devel/boost-libs
 
 DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
-DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|-dpR|-pr|' \
diff --git a/devel/lokalize/Makefile b/devel/lokalize/Makefile
index 82c2d7e85d33..f44a96e29aae 100644
--- a/devel/lokalize/Makefile
+++ b/devel/lokalize/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Computer-aided translation system
 
-LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource tar:xz
diff --git a/devel/love/Makefile b/devel/love/Makefile
index 00ffd873ccbd..6251f7b4b575 100644
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Open-source 2D game engine
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpg123.so:${PORTSDIR}/audio/mpg123 \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libphysfs.so:${PORTSDIR}/devel/physfs \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS=	libmodplug.so:audio/libmodplug \
+		libmpg123.so:audio/mpg123 \
+		libvorbisfile.so:audio/libvorbis \
+		libphysfs.so:devel/physfs \
+		libfreetype.so:print/freetype2 \
+		libtheora.so:multimedia/libtheora
 
 USES=		compiler:c++11-lib desktop-file-utils gmake libtool \
 		localbase openal pkgconfig shared-mime-info
@@ -38,7 +38,7 @@ OPTIONS_DEFAULT_i386=	LUAJIT
 OPTIONS_DEFAULT_amd64=	LUAJIT
 
 LUAJIT_DESC=	Use luajit
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_CONFIGURE_ON=	--with-lua=luajit
 LUAJIT_USES_OFF=	lua
 LUAJIT_CONFIGURE_OFF=	--with-lua=lua \
diff --git a/devel/love07/Makefile b/devel/love07/Makefile
index afea7c4776a8..42f251826593 100644
--- a/devel/love07/Makefile
+++ b/devel/love07/Makefile
@@ -13,13 +13,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-linux-src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open-source 2D game engine
 
-LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpg123.so:${PORTSDIR}/audio/mpg123 \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libphysfs.so:${PORTSDIR}/devel/physfs \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libIL.so:graphics/devil \
+		libmodplug.so:audio/libmodplug \
+		libmpg123.so:audio/mpg123 \
+		libvorbisfile.so:audio/libvorbis \
+		libphysfs.so:devel/physfs \
+		libfreetype.so:print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 PORTSCOUT=	limit:^0\.7\.
 
diff --git a/devel/love08/Makefile b/devel/love08/Makefile
index fe9827ecf50c..15016a37347f 100644
--- a/devel/love08/Makefile
+++ b/devel/love08/Makefile
@@ -13,13 +13,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-linux-src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open-source 2D game engine
 
-LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpg123.so:${PORTSDIR}/audio/mpg123 \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libphysfs.so:${PORTSDIR}/devel/physfs \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libIL.so:graphics/devil \
+		libmodplug.so:audio/libmodplug \
+		libmpg123.so:audio/mpg123 \
+		libvorbisfile.so:audio/libvorbis \
+		libphysfs.so:devel/physfs \
+		libfreetype.so:print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 PORTSCOUT=	limit:^0\.8\.
 
diff --git a/devel/love5/Makefile b/devel/love5/Makefile
index 343cc09128f4..6ed811fd6652 100644
--- a/devel/love5/Makefile
+++ b/devel/love5/Makefile
@@ -11,10 +11,10 @@ PKGNAMESUFFIX=	5
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open-source 2D game engine
 
-LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
-		libphysfs.so:${PORTSDIR}/devel/physfs \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libIL.so:graphics/devil \
+		libphysfs.so:devel/physfs \
+		libfreetype.so:print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USES=		tar:bzip2 gmake dos2unix lua:51
 USE_SDL=	sdl mixer
diff --git a/devel/lua-alien/Makefile b/devel/lua-alien/Makefile
index a0ab4e0a8180..b8a7eeb01e65 100644
--- a/devel/lua-alien/Makefile
+++ b/devel/lua-alien/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lua -> C FFI
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/devel/luabind/Makefile b/devel/luabind/Makefile
index ae133d67fcf0..d19b1f648c2a 100644
--- a/devel/luabind/Makefile
+++ b/devel/luabind/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library that helps you create bindings between C++ and Lua
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 
 USES=		lua:51
 USE_LDCONFIG=	yes
diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 05bc0027ba26..6fcbe64b0a99 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -23,8 +23,8 @@ OPTIONS_DEFAULT=TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
-TEST_BUILD_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
-TEST_RUN_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
+TEST_BUILD_DEPENDS=	atf>=0.21:devel/atf
+TEST_RUN_DEPENDS=	atf>=0.21:devel/atf
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index b580300f3b38..9e5342b672b1 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -10,14 +10,14 @@ MASTER_SITES=	SAVANNAH/m17n
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Library for the multilingual text handling
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
-		m17n-db>=1.6.4:${PORTSDIR}/devel/m17n-db
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libgd.so:${PORTSDIR}/graphics/gd \
-		libotf.so:${PORTSDIR}/print/libotf
-RUN_DEPENDS=	m17n-db>=1.6.4:${PORTSDIR}/devel/m17n-db
+BUILD_DEPENDS=	bison:devel/bison \
+		m17n-db>=1.6.4:devel/m17n-db
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libfribidi.so:converters/fribidi \
+		libgd.so:graphics/gd \
+		libotf.so:print/libotf
+RUN_DEPENDS=	m17n-db>=1.6.4:devel/m17n-db
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -36,14 +36,14 @@ ANTHY_DESC=	Kana-Kanji conversion support via Anthy
 ISPELL_DESC=	Spell checking support via Ispell
 THAI_DESC=	Thai language support via libThai
 
-ANTHY_LIB_DEPENDS=	libanthy.so:${PORTSDIR}/japanese/anthy
+ANTHY_LIB_DEPENDS=	libanthy.so:japanese/anthy
 ANTHY_CONFIGURE_OFF+=	--without-anthy
 
-ISPELL_BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
-ISPELL_RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
+ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_CONFIGURE_OFF=	HAVE_ISPELL=no
 
-THAI_LIB_DEPENDS=	libthai.so:${PORTSDIR}/devel/libthai
+THAI_LIB_DEPENDS=	libthai.so:devel/libthai
 THAI_CONFIGURE_OFF=	--without-libthai
 
 post-patch:
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index c1bf3a0b8b47..6458aaf0b65a 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -22,7 +22,7 @@ EXAMPLESDIR=	share/examples/gm4
 
 OPTIONS_DEFINE=			LIBSIGSEGV EXAMPLES
 LIBSIGSEGV_DESC=		Use alternative page fault handler (GNU libsigsegv)
-LIBSIGSEGV_LIB_DEPENDS=		libsigsegv.so:${PORTSDIR}/devel/libsigsegv
+LIBSIGSEGV_LIB_DEPENDS=		libsigsegv.so:devel/libsigsegv
 LIBSIGSEGV_CONFIGURE_ON=	--with-libsigsegv-prefix=${LOCALBASE}
 LIBSIGSEGV_CONFIGURE_OFF=	--without-libsigsegv-prefix
 
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 3558297fd860..2a45a8471b76 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Interface to Git for Emacs
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	dash.el>=2.12.1:${PORTSDIR}/devel/dash.el \
-		with-editor-${EMACS_PORT_NAME}>=2.5.0:${PORTSDIR}/editors/with-editor
-RUN_DEPENDS=	dash.el>=2.12.1:${PORTSDIR}/devel/dash.el \
-		with-editor-${EMACS_PORT_NAME}>=2.5.0:${PORTSDIR}/editors/with-editor
+BUILD_DEPENDS=	dash.el>=2.12.1:devel/dash.el \
+		with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor
+RUN_DEPENDS=	dash.el>=2.12.1:devel/dash.el \
+		with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor
 
 USE_GITHUB=	yes
 
@@ -26,10 +26,10 @@ NO_ARCH=	yes
 
 OPTIONS_DEFINE=			DOCS GIT_SUBVERSION
 GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
-GIT_SUBVERSION_BUILD_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
-GIT_SUBVERSION_BUILD_DEPENDS_OFF=	git>0:${PORTSDIR}/devel/git
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:${PORTSDIR}/devel/git
+GIT_SUBVERSION_BUILD_DEPENDS=	git-subversion>0:devel/git-subversion
+GIT_SUBVERSION_BUILD_DEPENDS_OFF=	git>0:devel/git
+GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
+GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:devel/git
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/matreshka/Makefile b/devel/matreshka/Makefile
index 2609c5ce03c9..a2ee7c3c3581 100644
--- a/devel/matreshka/Makefile
+++ b/devel/matreshka/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ada framework for information systems development
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake pkgconfig
 HAS_CONFIGURE=	yes
diff --git a/devel/maven-ant-tasks/Makefile b/devel/maven-ant-tasks/Makefile
index 417a0b00d89d..8ea3e3615937 100644
--- a/devel/maven-ant-tasks/Makefile
+++ b/devel/maven-ant-tasks/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows Maven artifact handling to be used from within an Ant build
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
+RUN_DEPENDS=	ant:devel/apache-ant
 
 USE_JAVA=	1.6+
 
diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile
index f17231ffce25..330ddeefcd53 100644
--- a/devel/maven3/Makefile
+++ b/devel/maven3/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java project management tool, 3.x branch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
+RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USES=		cpe
 CPE_PRODUCT=	maven
diff --git a/devel/maven31/Makefile b/devel/maven31/Makefile
index 3bc886d91cba..a927dcb3571c 100644
--- a/devel/maven31/Makefile
+++ b/devel/maven31/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Java project management tool, 3.1.x branch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
+RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USES=		cpe
 CPE_PRODUCT=	maven
diff --git a/devel/maven33/Makefile b/devel/maven33/Makefile
index 7489dd3cb1c8..92bb95ab0a15 100644
--- a/devel/maven33/Makefile
+++ b/devel/maven33/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java project management tool, 3.3.x branch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
+RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USES=		cpe
 CPE_PRODUCT=	maven
diff --git a/devel/mercator/Makefile b/devel/mercator/Makefile
index b63fa29fd538..bc638da7bde4 100644
--- a/devel/mercator/Makefile
+++ b/devel/mercator/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/worldforge/Mercator%20%28terrain%20lib%29/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Procedural terrain library
 
-LIB_DEPENDS=	libwfmath-1.0.so:${PORTSDIR}/math/wfmath
+LIB_DEPENDS=	libwfmath-1.0.so:math/wfmath
 
 CONFIGURE_ARGS=	--disable-silent-rules
 USES=		libtool pathfix pkgconfig compiler:c++11-lib
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 34571c055d48..4246dd75d810 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -20,7 +20,7 @@ OPTIONS_DEFAULT=DATA
 OPTIONS_SUB=	yes
 
 CA_BUNDLE_DESC=		Install CA Certificates
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 FREEBSD_DESC=		Patches used internally by the FreeBSD Project
 FREEBSD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-authormapsuffix
 NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-setup.py
diff --git a/devel/mercurialeclipse/Makefile b/devel/mercurialeclipse/Makefile
index 214c152d7e1f..f3d9a0867683 100644
--- a/devel/mercurialeclipse/Makefile
+++ b/devel/mercurialeclipse/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	Mercurial plugin for the Eclipse IDE Framework
 
-RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
+RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:java/eclipse
 
 PLIST_SUB=	VER=${PORTVERSION}
 
diff --git a/devel/mingw32-directx/Makefile b/devel/mingw32-directx/Makefile
index 8d8896a00090..2427001741bb 100644
--- a/devel/mingw32-directx/Makefile
+++ b/devel/mingw32-directx/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-devel
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DirectX header files for use with MinGW
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		mingwm10.dll:${PORTSDIR}/devel/mingw32-bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 85807f3c2ae7..83fcf7fc7e4d 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -14,12 +14,12 @@ COMMENT=	FSF gcc-4 for Windows cross-development
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
-		mingwm10.dll:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt
-RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
+BUILD_DEPENDS=	${PKGNAMEPREFIX}as:devel/${PKGNAMEPREFIX}binutils \
+		mingwm10.dll:devel/${PKGNAMEPREFIX}bin-msvcrt
+RUN_DEPENDS=	${PKGNAMEPREFIX}as:devel/${PKGNAMEPREFIX}binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
 
 GCCVERSION=	4.8.1
 
diff --git a/devel/mingw32-libffi/Makefile b/devel/mingw32-libffi/Makefile
index 36e46083f1d5..e3c578b3b149 100644
--- a/devel/mingw32-libffi/Makefile
+++ b/devel/mingw32-libffi/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	mingw32-
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The libffi library cross-compiled for MinGW32
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		${LOCALBASE}/mingw32/include/stdlib.h:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt
 
 SSP_UNSAFE=	fails to link
 GNU_CONFIGURE=	yes
diff --git a/devel/mingw32-libyaml/Makefile b/devel/mingw32-libyaml/Makefile
index cbe953335e15..0d2dc0ed9f54 100644
--- a/devel/mingw32-libyaml/Makefile
+++ b/devel/mingw32-libyaml/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	repacked
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The libyaml library cross-compiled for MinGW32
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		${LOCALBASE}/mingw32/include/stdlib.h:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/mingw32
diff --git a/devel/mingw32-openssl/Makefile b/devel/mingw32-openssl/Makefile
index d02b2105fc18..b24eb11c3c97 100644
--- a/devel/mingw32-openssl/Makefile
+++ b/devel/mingw32-openssl/Makefile
@@ -14,10 +14,10 @@ DIST_SUBDIR=	${DISTNAME}
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The OpenSSL library cross-compiled for MinGW32
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		${LOCALBASE}/mingw32/include/stdlib.h:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt \
-		${LOCALBASE}/mingw32/lib/libz.a:${PORTSDIR}/devel/mingw32-zlib
+BUILD_DEPENDS=	makedepend:devel/makedepend \
+		${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt \
+		${LOCALBASE}/mingw32/lib/libz.a:devel/mingw32-zlib
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	apps/tsget
diff --git a/devel/mingw32-pdcurses/Makefile b/devel/mingw32-pdcurses/Makefile
index fbd313288a8a..30e046c9be09 100644
--- a/devel/mingw32-pdcurses/Makefile
+++ b/devel/mingw32-pdcurses/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	PDCurses-${PORTVERSION}
 MAINTAINER= ports@FreeBSD.org
 COMMENT=	Curses and Panel terminal library for Windows
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		mingwm10.dll:${PORTSDIR}/devel/mingw32-bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 USES=		gmake
 MAKEFILE=	gccwin32.mak
diff --git a/devel/mingw32-pthreads/Makefile b/devel/mingw32-pthreads/Makefile
index 136b11e59445..a1da84be152d 100644
--- a/devel/mingw32-pthreads/Makefile
+++ b/devel/mingw32-pthreads/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-w32-${PORTVERSION:S/./-/g}-release
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POSIX threads library for Windows compiled with MinGW32
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		mingwm10.dll:${PORTSDIR}/devel/mingw32-bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 USES=		gmake
 
diff --git a/devel/mingw32-zlib/Makefile b/devel/mingw32-zlib/Makefile
index 44fde263465c..65396f1c3d5c 100644
--- a/devel/mingw32-zlib/Makefile
+++ b/devel/mingw32-zlib/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	mingw32-
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The zlib library cross-compiled for MinGW32
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		${LOCALBASE}/mingw32/include/sys/types.h:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		${LOCALBASE}/mingw32/include/sys/types.h:devel/${PKGNAMEPREFIX}bin-msvcrt
 
 USES=		tar:xz gmake
 MAKEFILE=	win32/Makefile.gcc
diff --git a/devel/mk-configure/Makefile b/devel/mk-configure/Makefile
index f05cbe04add6..35be9cb7aa12 100644
--- a/devel/mk-configure/Makefile
+++ b/devel/mk-configure/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Lightweight, easy to use replacement for GNU autotools
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${BMAKE}:${PORTSDIR}/devel/bmake
+BUILD_DEPENDS=	${BMAKE}:devel/bmake
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		bmkdep:${PORTSDIR}/devel/bmkdep
+		bmkdep:devel/bmkdep
 
 BMAKE?=		${LOCALBASE}/bin/bmake
 INSTALL_TARGET=	installdirs install install-doc
diff --git a/devel/mkcmd/Makefile b/devel/mkcmd/Makefile
index 05271e8b967c..2ea60d6584af 100644
--- a/devel/mkcmd/Makefile
+++ b/devel/mkcmd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.physics.purdue.edu/pub/pundits/ \
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Command-line parser and manual page generator
 
-BUILD_DEPENDS=	makeme:${PORTSDIR}/devel/msrc0
+BUILD_DEPENDS=	makeme:devel/msrc0
 
 MAKE_FLAGS=
 MAKEFILE=
diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile
index e716a395a571..2596a582b12e 100644
--- a/devel/mm-common/Makefile
+++ b/devel/mm-common/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Common build infrastructure for the GNOME C++ binding libraries
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake pathfix tar:xz
 GNU_CONFIGURE=	yes
diff --git a/devel/mongo-c-driver/Makefile b/devel/mongo-c-driver/Makefile
index 917626c635c4..be2c3f8d5d28 100644
--- a/devel/mongo-c-driver/Makefile
+++ b/devel/mongo-c-driver/Makefile
@@ -10,8 +10,8 @@ COMMENT=	C Driver for MongoDB
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libbson-1.0.so:${PORTSDIR}/devel/libbson
-LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libbson-1.0.so:devel/libbson
+LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
diff --git a/devel/mongo-cxx-driver/Makefile b/devel/mongo-cxx-driver/Makefile
index 2f704f7fe3b9..3b09f086162f 100644
--- a/devel/mongo-cxx-driver/Makefile
+++ b/devel/mongo-cxx-driver/Makefile
@@ -11,14 +11,14 @@ COMMENT=	C++ Driver for MongoDB
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=         SCRAM-SHA-1
 OPTIONS_DEFAULT=        SCRAM-SHA-1
 
-SCRAM-SHA-1_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SCRAM-SHA-1_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SCRAM-SHA-1_MAKE_ARGS=		--use-sasl-client --ssl
 SCRAM-SHA-1_DESC=	SCRAM-SHA-1 authentication mechanism support.
 
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 61e81203f3f9..d859d5799bb8 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -11,10 +11,10 @@ DISTFILES=	${DISTNAME}-0${EXTRACT_SUFX}
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	IDE for the .NET platform
 
-BUILD_DEPENDS=	mautil:${PORTSDIR}/devel/mono-addins
-RUN_DEPENDS=	${LOCALBASE}/lib/libgdiplus.a:${PORTSDIR}/x11-toolkits/libgdiplus \
-		exctags:${PORTSDIR}/devel/ctags \
-		mautil:${PORTSDIR}/devel/mono-addins
+BUILD_DEPENDS=	mautil:devel/mono-addins
+RUN_DEPENDS=	${LOCALBASE}/lib/libgdiplus.a:x11-toolkits/libgdiplus \
+		exctags:devel/ctags \
+		mautil:devel/mono-addins
 
 BROKEN=		GUI does not start
 DEPRECATED=	Broken for more than 6 months
@@ -34,9 +34,9 @@ GIT_DESC=	git support
 
 MONOEXT_CONFIGURE_ENABLE=monoextensions
 GIT_CONFIGURE_ENABLE=git
-GIT_RUN_DEPENDS=git:${PORTSDIR}/devel/git
+GIT_RUN_DEPENDS=git:devel/git
 SVN_CONFIGURE_ENABLE=subversion
-SVN_RUN_DEPENDS=svn:${PORTSDIR}/devel/subversion
+SVN_RUN_DEPENDS=svn:devel/subversion
 
 # Restrict to stable (even) versions, indicated by the second component.
 PORTSCOUT=	limitw:1,even
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 6ed8f50250bc..1d0f7e43e4f7 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -15,10 +15,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz \
-		mtn:${PORTSDIR}/devel/monotone \
-		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
+RUN_DEPENDS+=	dot:graphics/graphviz \
+		mtn:devel/monotone \
+		lablgtk2:x11-toolkits/ocaml-lablgtk2
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 8eb1788eb290..ce8ca04746d5 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Distributed version control system with digital signatures
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libbotan-1.10.so:${PORTSDIR}/security/botan110
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libidn.so:dns/libidn \
+		libsqlite3.so:databases/sqlite3 \
+		libbotan-1.10.so:security/botan110
 
 SUB_FILES=	pkg-message
 USES=		cpe gmake iconv localbase lua:51 makeinfo perl5 \
diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile
index 20afaae6a825..aeb7887fac34 100644
--- a/devel/mpatrol/Makefile
+++ b/devel/mpatrol/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER= ports@FreeBSD.org
 COMMENT=	Dynamic memory debugging and profiling library
 
-LIB_DEPENDS=	libelf.so.0:${PORTSDIR}/devel/libelf
+LIB_DEPENDS=	libelf.so.0:devel/libelf
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/build/unix
 
diff --git a/devel/msp430-debug-stack/Makefile b/devel/msp430-debug-stack/Makefile
index d22adc830832..80100a71a25f 100644
--- a/devel/msp430-debug-stack/Makefile
+++ b/devel/msp430-debug-stack/Makefile
@@ -18,8 +18,8 @@ COMMENT=	TI MSP430 debugging interface library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libhidapi.so:${PORTSDIR}/comms/hidapi
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
+		libhidapi.so:comms/hidapi
 
 BROKEN_FreeBSD_9=	does not build (internal compiler error)
 
diff --git a/devel/mspdebug/Makefile b/devel/mspdebug/Makefile
index 12e49a9e42fd..9c090e49f17c 100644
--- a/devel/mspdebug/Makefile
+++ b/devel/mspdebug/Makefile
@@ -21,7 +21,7 @@ LIBMSP430_DESC=		Use TI libmsp430 USB driver
 READLINE_USES=		readline pkgconfig
 READLINE_MAKE_ARGS_OFF=	WITHOUT_READLINE=1
 
-LIBMSP430_LIB_DEPENDS=	libmsp430.so:${PORTSDIR}/devel/msp430-debug-stack
+LIBMSP430_LIB_DEPENDS=	libmsp430.so:devel/msp430-debug-stack
 
 USES=		gmake
 
diff --git a/devel/mtbl/Makefile b/devel/mtbl/Makefile
index a858db30cb70..c31b9733c003 100644
--- a/devel/mtbl/Makefile
+++ b/devel/mtbl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Immutable sorted string table library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	liblz4.so:${PORTSDIR}/archivers/liblz4 \
-		libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
+		libsnappy.so:archivers/snappy
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile
index 32ef18d89055..e3b27a3d0c54 100644
--- a/devel/ncnf/Makefile
+++ b/devel/ncnf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic configuration management library
 
-LIB_DEPENDS=	libstrfunc.so:${PORTSDIR}/devel/libstrfunc
+LIB_DEPENDS=	libstrfunc.so:devel/libstrfunc
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/ndesk-dbus-glib/Makefile b/devel/ndesk-dbus-glib/Makefile
index d1487291c99c..f31fb2ce6263 100644
--- a/devel/ndesk-dbus-glib/Makefile
+++ b/devel/ndesk-dbus-glib/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.ndesk.org/archive/ndesk-dbus/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib main loop integration for Managed D-Bus
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
 
 USES=		gmake mono pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/netsurf-buildsystem/Makefile b/devel/netsurf-buildsystem/Makefile
index bfcf21b76fa8..3b8b7479848c 100644
--- a/devel/netsurf-buildsystem/Makefile
+++ b/devel/netsurf-buildsystem/Makefile
@@ -12,7 +12,7 @@ COMMENT=	NetSurf project buildsystem
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 MAKE_ENV+=	COMPONENT_TYPE=lib-shared \
 
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 9af10543ede9..ed721657f8e4 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Not Eriks Windowing Toolkit: console I/O handling library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2 \
-		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libslang.so:devel/libslang2 \
+		libpopt.so:devel/popt
 
 USES=		gmake ncurses
 GNU_CONFIGURE=	yes
diff --git a/devel/ninja-ide/Makefile b/devel/ninja-ide/Makefile
index 96bc25bc2593..ad283257472b 100644
--- a/devel/ninja-ide/Makefile
+++ b/devel/ninja-ide/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Cross-platform integrated development environment (IDE)
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:${PORTSDIR}/www/py-qt4-webkit
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-declarative>=4.10.2:${PORTSDIR}/devel/py-qt4-declarative \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:${PORTSDIR}/www/py-qt4-webkit
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:www/py-qt4-webkit
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-declarative>=4.10.2:devel/py-qt4-declarative \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:www/py-qt4-webkit
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/node-thrift/Makefile b/devel/node-thrift/Makefile
index e8091306d0e8..036bdf2ceb07 100644
--- a/devel/node-thrift/Makefile
+++ b/devel/node-thrift/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	node-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Node.js bindings for the Apache Thrift RPC system
 
-RUN_DEPENDS=	node:${PORTSDIR}/www/node
+RUN_DEPENDS=	node:www/node
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/devel/notify-sharp/Makefile b/devel/notify-sharp/Makefile
index bc76e1a08377..05183bb2fa36 100644
--- a/devel/notify-sharp/Makefile
+++ b/devel/notify-sharp/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://romain.blogreen.org/distfiles/
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	C\# client library for notification-daemon
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
-		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:devel/ndesk-dbus-glib
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:devel/ndesk-dbus-glib \
+		${LOCALBASE}/libexec/notification-daemon:deskutils/notification-daemon
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 28b9c5c4d075..7fc912a6a514 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME=	noweb
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	icont:${PORTSDIR}/lang/icon
-RUN_DEPENDS=	iconx:${PORTSDIR}/lang/icon
+BUILD_DEPENDS=	icont:lang/icon
+RUN_DEPENDS=	iconx:lang/icon
 
 USES=		tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
diff --git a/devel/nsgenbind/Makefile b/devel/nsgenbind/Makefile
index 67c6700b8934..09eeb42da617 100644
--- a/devel/nsgenbind/Makefile
+++ b/devel/nsgenbind/Makefile
@@ -12,8 +12,8 @@ COMMENT=	NetSurf Generator for JavaScript bindings
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem \
-		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem \
+		${LOCALBASE}/bin/flex:textproc/flex
 
 USES=	bison gmake
 
diff --git a/devel/nxt-python/Makefile b/devel/nxt-python/Makefile
index 91674083050e..5b0767ac5aef 100644
--- a/devel/nxt-python/Makefile
+++ b/devel/nxt-python/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python interface for the Lego Mindstorms NXT robot
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>=0:${PORTSDIR}/devel/py-usb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>=0:devel/py-usb
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/obby/Makefile b/devel/obby/Makefile
index 3f54a980bd00..46f9cf4e9038 100644
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library for synced document buffers
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libnet6.so:${PORTSDIR}/net/net6
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
+		libnet6.so:net/net6
 
 USES=		pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/objecthash/Makefile b/devel/objecthash/Makefile
index 53ca70f8fcb0..a1c29a230bd6 100644
--- a/devel/objecthash/Makefile
+++ b/devel/objecthash/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Cross-language way to cryptographically hash JSON objects
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libicudata.so:${PORTSDIR}/devel/icu \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	libicudata.so:devel/icu \
+		libjson-c.so:devel/json-c
 
 BROKEN_FreeBSD_9=	does not build on FreeBSD < 10.x
 
diff --git a/devel/ocaml-annexlib/Makefile b/devel/ocaml-annexlib/Makefile
index da0f6b50a53b..0313126b3e4e 100644
--- a/devel/ocaml-annexlib/Makefile
+++ b/devel/ocaml-annexlib/Makefile
@@ -13,8 +13,8 @@ COMMENT=	OCaml subroutines collection
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
-RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
+BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
+RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile
index 5086782420a0..10403728c39e 100644
--- a/devel/ocaml-cfg/Makefile
+++ b/devel/ocaml-cfg/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library for manipulation of context-free grammars
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	menhir:${PORTSDIR}/devel/menhir
+BUILD_DEPENDS=	menhir:devel/menhir
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmottl
diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile
index 723d6dac8567..8a54aa5260c6 100644
--- a/devel/ocaml-extlib/Makefile
+++ b/devel/ocaml-extlib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Complete - yet small - standard library for OCaml
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	cppo:${PORTSDIR}/devel/ocaml-cppo
+BUILD_DEPENDS=	cppo:devel/ocaml-cppo
 
 WRKSRC_SUBDIR=	src
 
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 756d36f4914e..ed18d12744fe 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=TOOLBOX
 OPTIONS_SUB=	yes
 TOOLBOX_DESC=	Include toolbox interface (requires OCaml with TK)
 TOOLBOX_CONFIGURE_ON=	-with-toolbox
-TOOLBOX_RUN_DEPENDS=	labltk:${PORTSDIR}/x11-toolkits/ocaml-labltk
+TOOLBOX_RUN_DEPENDS=	labltk:x11-toolkits/ocaml-labltk
 TOOLBOX_BUILD_DEPENDS=	${TOOLBOX_RUN_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/devel/ocaml-ipaddr/Makefile b/devel/ocaml-ipaddr/Makefile
index c52a09327ddd..b55e8564e8bc 100644
--- a/devel/ocaml-ipaddr/Makefile
+++ b/devel/ocaml-ipaddr/Makefile
@@ -8,8 +8,8 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	OCaml library for manipulation of IP address representations
 
-BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:${PORTSDIR}/devel/ocaml-sexplib
-RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:${PORTSDIR}/devel/ocaml-sexplib
+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib
+RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mirage
diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile
index ea3860277af1..f50015e38b81 100644
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Cooperative threading library for OCaml
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${SA_DIR}/react/react.a:${PORTSDIR}/devel/ocaml-react \
-		${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
-RUN_DEPENDS=	${SA_DIR}/react/react.a:${PORTSDIR}/devel/ocaml-react \
-		${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
+BUILD_DEPENDS=	${SA_DIR}/react/react.a:devel/ocaml-react \
+		${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
+RUN_DEPENDS=	${SA_DIR}/react/react.a:devel/ocaml-react \
+		${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ocsigen
@@ -45,8 +45,8 @@ OPTIONS_DEFINE=		DOCS
 DOCS_CONFIGURE_ENABLE=	docs
 DOCS_CONFIGURE_ON=	--docdir ${STAGEDIR}${DOCSDIR}
 # For some reason, ocaml-text is needed when building documentation
-DOCS_BUILD_DEPENDS=	${SA_DIR}/text/text.a:${PORTSDIR}/textproc/ocaml-text
-DOCS_RUN_DEPENDS=	${SA_DIR}/text/text.a:${PORTSDIR}/textproc/ocaml-text
+DOCS_BUILD_DEPENDS=	${SA_DIR}/text/text.a:textproc/ocaml-text
+DOCS_RUN_DEPENDS=	${SA_DIR}/text/text.a:textproc/ocaml-text
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \
diff --git a/devel/ocaml-magic/Makefile b/devel/ocaml-magic/Makefile
index a8f176187b69..872b1a80a203 100644
--- a/devel/ocaml-magic/Makefile
+++ b/devel/ocaml-magic/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 # This really is overzealous but I work this way
 .if !exists(/usr/lib/libmagic.so)
-LIB_DEPENDS+=	libmagic.so:${PORTSDIR}/sysutils/file
+LIB_DEPENDS+=	libmagic.so:sysutils/file
 .endif
 
 post-install:
diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
index 1d1bb293879b..f82147c56f35 100644
--- a/devel/ocaml-opam/Makefile
+++ b/devel/ocaml-opam/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Source-based package manager for OCaml
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=		camlp4:${PORTSDIR}/devel/ocaml-camlp4
+RUN_DEPENDS=		camlp4:devel/ocaml-camlp4
 
 USES=		gmake
 USE_OCAML=	yes
@@ -34,12 +34,12 @@ HG_DESC=		Remote repository synchronized with mercurial
 DARCS_DESC=		Remote repository synchronized with darcs
 ASPCUD_DESC=		Use aspcud as an external dependencies solver
 
-WGET_RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
-GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
-HG_RUN_DEPENDS=		hg:${PORTSDIR}/devel/mercurial
-DARCS_RUN_DEPENDS=	darcs:${PORTSDIR}/devel/hs-darcs
-ASPCUD_RUN_DEPENDS=	aspcud:${PORTSDIR}/math/aspcud
+WGET_RUN_DEPENDS=	wget:ftp/wget
+RSYNC_RUN_DEPENDS=	rsync:net/rsync
+GIT_RUN_DEPENDS=	git:devel/git
+HG_RUN_DEPENDS=		hg:devel/mercurial
+DARCS_RUN_DEPENDS=	darcs:devel/hs-darcs
+ASPCUD_RUN_DEPENDS=	aspcud:math/aspcud
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index 2701752ecd64..2e9646847e10 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Perl compatible regular expressions for Objective Caml
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmottl
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index f672dc3c954f..f61839403002 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	OCaml interface to the SDL
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	ocaml-lablgl>0:${PORTSDIR}/graphics/ocaml-lablgl
+BUILD_DEPENDS=	ocaml-lablgl>0:graphics/ocaml-lablgl
 
 OPTIONS_DEFINE=	SDL_GFX SDL_IMAGE SDL_MIXER SDL_TTF DOCS
 OPTIONS_DEFAULT=SDL_GFX SDL_IMAGE SDL_MIXER SDL_TTF
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index cad1977579d5..f8a5f9150b66 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -15,8 +15,8 @@ LICENSE_COMB=	multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.txt
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE-Tywith.txt
 
-BUILD_DEPENDS=	ocaml-type_conv>=0:${PORTSDIR}/devel/ocaml-type_conv
-RUN_DEPENDS=	ocaml-type_conv>=0:${PORTSDIR}/devel/ocaml-type_conv
+BUILD_DEPENDS=	ocaml-type_conv>=0:devel/ocaml-type_conv
+RUN_DEPENDS=	ocaml-type_conv>=0:devel/ocaml-type_conv
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/ocfpcsc/Makefile b/devel/ocfpcsc/Makefile
index c1017f5bdbd5..d958d7c44be7 100644
--- a/devel/ocfpcsc/Makefile
+++ b/devel/ocfpcsc/Makefile
@@ -18,7 +18,7 @@ LICENSE_NAME=	IBM OpenCard Framework
 LICENSE_FILE=	${FILESDIR}/IBMOCF
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		gmake
 USE_JAVA=	yes
diff --git a/devel/ocl-icd/Makefile b/devel/ocl-icd/Makefile
index 2393328f9aba..a0db5ecc5e12 100644
--- a/devel/ocl-icd/Makefile
+++ b/devel/ocl-icd/Makefile
@@ -11,7 +11,7 @@ COMMENT=	OpenCL Installable Client Driver
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
+BUILD_DEPENDS=	opencl>=0:devel/opencl
 
 CONFLICTS=	freeocl-[0-9]* opencl-icd-[0-9]*
 
@@ -31,8 +31,8 @@ OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
-MANPAGES_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
-			asciidoc:${PORTSDIR}/textproc/asciidoc
+MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto \
+			asciidoc:textproc/asciidoc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' \
diff --git a/devel/okteta/Makefile b/devel/okteta/Makefile
index d5aba3946a24..06f4e67d2db2 100644
--- a/devel/okteta/Makefile
+++ b/devel/okteta/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE hex editor
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	libqca.so:devel/qca
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource shared-mime-info tar:xz
diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile
index 004c62648297..c489fc0f891a 100644
--- a/devel/omniNotify/Makefile
+++ b/devel/omniNotify/Makefile
@@ -15,9 +15,9 @@ COMMENT=	CORBA Notification Service (CosNotification) for omniORB
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libomniORB4.so:${PORTSDIR}/devel/omniORB-4.1
+LIB_DEPENDS=	libomniORB4.so:devel/omniORB-4.1
 # parts of omniORB4-4.1 source tree is required to build
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB-4.1:patch
+BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB-4.1:patch
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_WRKSRC=	${WRKSRC}/build
diff --git a/devel/oozie/Makefile b/devel/oozie/Makefile
index fb2b22be7787..07b6e2dc6505 100644
--- a/devel/oozie/Makefile
+++ b/devel/oozie/Makefile
@@ -19,11 +19,11 @@ COMMENT=	Workflow scheduler for Hadoop
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3 \
-		yarn:${PORTSDIR}/devel/hadoop2 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3 \
+		yarn:devel/hadoop2 \
+		zip:archivers/zip
+RUN_DEPENDS=	bash:shells/bash \
+		yarn:devel/hadoop2
 
 USES=		shebangfix
 USE_JAVA=	yes
diff --git a/devel/open-beagle/Makefile b/devel/open-beagle/Makefile
index 206b6dfd198f..05b89806f3dc 100644
--- a/devel/open-beagle/Makefile
+++ b/devel/open-beagle/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET=	install-strip
 PACCVERSION=	1.3.1b
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} PACCVERSION=${PACCVERSION}
-BUILD_DEPENDS+=	gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS+=	gsed:textproc/gsed
 
 #unfortunately, some important sed statements rely on GNU sed behavior, and can't be
 #easily changed to call GNU sed by means of the configure script
diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 89b5b4b07845..87f5665f2404 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Fast and powerful code search and cross-reference engine
 LICENSE=	CDDL APACHE20
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
+RUN_DEPENDS=	exctags:devel/ctags
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
@@ -31,12 +31,12 @@ OPTIONS_SINGLE=		AS
 OPTIONS_SINGLE_AS=	TOMCAT7 TOMCAT6 RESIN3
 OPTIONS_DEFAULT=	TOMCAT6
 
-TOMCAT6_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-TOMCAT6_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-TOMCAT7_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-TOMCAT7_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RESIN3_BUILD_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3
-RESIN3_RUN_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3
+TOMCAT6_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6
+TOMCAT6_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6
+TOMCAT7_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7
+TOMCAT7_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7
+RESIN3_BUILD_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:www/resin3
+RESIN3_RUN_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:www/resin3
 
 JARFILE=	${DATADIR}/opengrok.jar
 LIBFILES=	ant.jar \
diff --git a/devel/openocd/Makefile b/devel/openocd/Makefile
index 39fc37ab02f9..87b39a8e5baa 100644
--- a/devel/openocd/Makefile
+++ b/devel/openocd/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Open On-Chip Debugger
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-werror
@@ -279,17 +279,17 @@ CONFIGURE_ARGS+=	--disable-minidriver-dummy
 
 .if ${PORT_OPTIONS:MCMSISDAP}
 CONFIGURE_ARGS+=	--enable-cmsis-dap
-LIB_DEPENDS+=		libhidapi.so:${PORTSDIR}/comms/hidapi
+LIB_DEPENDS+=		libhidapi.so:comms/hidapi
 .else
 CONFIGURE_ARGS+=	--disable-cmsis-dap
 .endif
 
 .if defined(WITH_LIBFTDI)
-LIB_DEPENDS+=		libftdi.so:${PORTSDIR}/devel/libftdi
+LIB_DEPENDS+=		libftdi.so:devel/libftdi
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=		doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=		doxygen:devel/doxygen
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/openvex/Makefile b/devel/openvex/Makefile
index 15f3fb268282..355ab06d05b1 100644
--- a/devel/openvex/Makefile
+++ b/devel/openvex/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Open source firmware for Vex robotics controllers
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	sdcc:${PORTSDIR}/lang/sdcc \
-		gpasm:${PORTSDIR}/devel/gputils
-RUN_DEPENDS=	vexctl:${PORTSDIR}/devel/roboctl \
-		sdcc:${PORTSDIR}/lang/sdcc \
-		gpasm:${PORTSDIR}/devel/gputils
+BUILD_DEPENDS=	sdcc:lang/sdcc \
+		gpasm:devel/gputils
+RUN_DEPENDS=	vexctl:devel/roboctl \
+		sdcc:lang/sdcc \
+		gpasm:devel/gputils
 
 USES+=		tar:xz
 
diff --git a/devel/osc/Makefile b/devel/osc/Makefile
index 5df32159d8d3..1bd8d8ff5bd3 100644
--- a/devel/osc/Makefile
+++ b/devel/osc/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Command Line Interface to work with an openSUSE Build Service
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>0:${PORTSDIR}/www/py-urlgrabber
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>0:${PORTSDIR}/www/py-urlgrabber
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \
+		${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openSUSE
@@ -35,7 +35,7 @@ CA_BUNDLE_DESC=	Install CA Certificates
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCA_BUNDLE}
-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 CA_PATH=	${LOCALBASE}/share/certs/ca-root-nss.crt
 .else
 CA_PATH=	/etc/ssl
diff --git a/devel/ossp-al/Makefile b/devel/ossp-al/Makefile
index c54783dece98..438951fe6513 100644
--- a/devel/ossp-al/Makefile
+++ b/devel/ossp-al/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	ossp-
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Defines an abstract type of buffer that can move data without copying
 
-LIB_DEPENDS=	libex.so:${PORTSDIR}/devel/ossp-ex
+LIB_DEPENDS=	libex.so:devel/ossp-ex
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/ossp-cfg/Makefile b/devel/ossp-cfg/Makefile
index 2bb27909c456..16d21c7df466 100644
--- a/devel/ossp-cfg/Makefile
+++ b/devel/ossp-cfg/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	ossp-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for parsing arbitrary C/C++-style configuration files
 
-LIB_DEPENDS=	libex.so:${PORTSDIR}/devel/ossp-ex
+LIB_DEPENDS=	libex.so:devel/ossp-ex
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/ossp-val/Makefile b/devel/ossp-val/Makefile
index 6a0f03ab80c9..2af4897c4cde 100644
--- a/devel/ossp-val/Makefile
+++ b/devel/ossp-val/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	ossp-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flexible name to value mapping library for C variables
 
-LIB_DEPENDS=	libex.so:${PORTSDIR}/devel/ossp-ex
+LIB_DEPENDS=	libex.so:devel/ossp-ex
 
 USES=		gmake libtool
 USE_LDCONFIG=	yes
diff --git a/devel/p4.el/Makefile b/devel/p4.el/Makefile
index e004db0629a9..2e6f16750370 100644
--- a/devel/p4.el/Makefile
+++ b/devel/p4.el/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perforce-Emacs Integration
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 1779689bc860..6c235a5cac28 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce server
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 RESTRICTED=	Restricted distribution
 
diff --git a/devel/p4delta/Makefile b/devel/p4delta/Makefile
index 6a3d96679e64..ffb5942700ef 100644
--- a/devel/p4delta/Makefile
+++ b/devel/p4delta/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Summarizes and manages differences between local files and Perforce
 
-RUN_DEPENDS=	${LOCALBASE}/bin/p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	${LOCALBASE}/bin/p4:devel/p4
 
 USE_RUBY=	yes
 NO_BUILD=	yes
diff --git a/devel/p4genpatch/Makefile b/devel/p4genpatch/Makefile
index b47d348ceb21..1e7b24dfd71f 100644
--- a/devel/p4genpatch/Makefile
+++ b/devel/p4genpatch/Makefile
@@ -10,7 +10,7 @@ DISTFILES=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Helper scripts for generating RCS patches from Perforce
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index 4c596cbaba84..d0a20d29358e 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce server
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 RESTRICTED=	Restricted distribution
 
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index e8003ef993a2..ac92708f4ab8 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -34,7 +34,7 @@ USE_RC_SUBR=	p4web
 
 # 10.x (and higher) needs compat libs
 .if ${OSVERSION} >= 1000054
-LIB_DEPENDS+=	libstdc++.so.6:${PORTSDIR}/misc/compat9x
+LIB_DEPENDS+=	libstdc++.so.6:misc/compat9x
 .endif
 
 # Figure out what to install
diff --git a/devel/p5-AI-Pathfinding-AStar/Makefile b/devel/p5-AI-Pathfinding-AStar/Makefile
index 445d06400fa5..2392ec074a04 100644
--- a/devel/p5-AI-Pathfinding-AStar/Makefile
+++ b/devel/p5-AI-Pathfinding-AStar/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl implementation of the A* pathfinding algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Heap>=0:${PORTSDIR}/devel/p5-Heap
+BUILD_DEPENDS=	p5-Heap>=0:devel/p5-Heap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AI-Prolog/Makefile b/devel/p5-AI-Prolog/Makefile
index 4c8c62fe878a..cc5c628bb0e9 100644
--- a/devel/p5-AI-Prolog/Makefile
+++ b/devel/p5-AI-Prolog/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for logic programming
 
-RUN_DEPENDS=	p5-aliased>=0.11:${PORTSDIR}/devel/p5-aliased \
-		p5-Clone>=0.15:${PORTSDIR}/devel/p5-Clone \
-		p5-Exporter-Tidy>=0.06:${PORTSDIR}/devel/p5-Exporter-Tidy \
-		p5-Hash-AsObject>=0.05:${PORTSDIR}/devel/p5-Hash-AsObject \
-		p5-Regexp-Common>=2.119:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Text-Quote>=0.03:${PORTSDIR}/textproc/p5-Text-Quote \
-		p5-Term-ReadKey>=2.21:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-aliased>=0.11:devel/p5-aliased \
+		p5-Clone>=0.15:devel/p5-Clone \
+		p5-Exporter-Tidy>=0.06:devel/p5-Exporter-Tidy \
+		p5-Hash-AsObject>=0.05:devel/p5-Hash-AsObject \
+		p5-Regexp-Common>=2.119:textproc/p5-Regexp-Common \
+		p5-Text-Quote>=0.03:textproc/p5-Text-Quote \
+		p5-Term-ReadKey>=2.21:devel/p5-Term-ReadKey
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ARGV-Struct/Makefile b/devel/p5-ARGV-Struct/Makefile
index c6d6baeb009d..0d6235f3d098 100644
--- a/devel/p5-ARGV-Struct/Makefile
+++ b/devel/p5-ARGV-Struct/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
+	p5-Moose>0:devel/p5-Moose
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Acme-Damn/Makefile b/devel/p5-Acme-Damn/Makefile
index f399a93d3c3e..7ef3d8edb7c7 100644
--- a/devel/p5-Acme-Damn/Makefile
+++ b/devel/p5-Acme-Damn/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	Unblessing perl objects
 
-RUN_DEPENDS=	p5-Test-Exception>=0.29:${PORTSDIR}/devel/p5-Test-Exception
+RUN_DEPENDS=	p5-Test-Exception>=0.29:devel/p5-Test-Exception
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Agent/Makefile b/devel/p5-Agent/Makefile
index 40dca303385c..f0798e3e793f 100644
--- a/devel/p5-Agent/Makefile
+++ b/devel/p5-Agent/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module that provides a foundation for software agent developers
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Class-Tom>=0:${PORTSDIR}/devel/p5-Class-Tom
+BUILD_DEPENDS=	p5-Class-Tom>=0:devel/p5-Class-Tom
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Accounting/Makefile b/devel/p5-Algorithm-Accounting/Makefile
index 633a247ecadb..45696d844605 100644
--- a/devel/p5-Algorithm-Accounting/Makefile
+++ b/devel/p5-Algorithm-Accounting/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Generate accounting statistic for general logs
 
-BUILD_DEPENDS=	p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-Perl6-Form>=0:${PORTSDIR}/devel/p5-Perl6-Form \
-		p5-FreezeThaw>=0:${PORTSDIR}/devel/p5-FreezeThaw \
-		p5-Array-Compare>=0:${PORTSDIR}/misc/p5-Array-Compare \
-		p5-Array-Iterator>=0:${PORTSDIR}/devel/p5-Array-Iterator \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-Imager-Graph>=0:${PORTSDIR}/graphics/p5-Imager-Graph \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-Perl6-Form>=0:devel/p5-Perl6-Form \
+		p5-FreezeThaw>=0:devel/p5-FreezeThaw \
+		p5-Array-Compare>=0:misc/p5-Array-Compare \
+		p5-Array-Iterator>=0:devel/p5-Array-Iterator \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-Imager-Graph>=0:graphics/p5-Imager-Graph \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Annotate/Makefile b/devel/p5-Algorithm-Annotate/Makefile
index 28826e27fcae..68848c4c685e 100644
--- a/devel/p5-Algorithm-Annotate/Makefile
+++ b/devel/p5-Algorithm-Annotate/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Represent a series of changes in annotate form
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Bucketizer/Makefile b/devel/p5-Algorithm-Bucketizer/Makefile
index 95f76124fb2e..8252ec6e739f 100644
--- a/devel/p5-Algorithm-Bucketizer/Makefile
+++ b/devel/p5-Algorithm-Bucketizer/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Distribute sized items to buckets with limited size
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Permute>=0:${PORTSDIR}/devel/p5-Algorithm-Permute \
-		p5-Sysadm-Install>=0.23:${PORTSDIR}/sysutils/p5-Sysadm-Install
+BUILD_DEPENDS=	p5-Algorithm-Permute>=0:devel/p5-Algorithm-Permute \
+		p5-Sysadm-Install>=0.23:sysutils/p5-Sysadm-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Cron/Makefile b/devel/p5-Algorithm-Cron/Makefile
index 71719e43e8d5..0d2827f03181 100644
--- a/devel/p5-Algorithm-Cron/Makefile
+++ b/devel/p5-Algorithm-Cron/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Abstract implementation of the cron(8) scheduling algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS:=	p5-Time-timegm>=0:${PORTSDIR}/devel/p5-Time-timegm
+BUILD_DEPENDS:=	p5-Time-timegm>=0:devel/p5-Time-timegm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Dependency-Objects/Makefile b/devel/p5-Algorithm-Dependency-Objects/Makefile
index 43afa3516f65..38fa80280ef9 100644
--- a/devel/p5-Algorithm-Dependency-Objects/Makefile
+++ b/devel/p5-Algorithm-Dependency-Objects/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Implementation of an Object Dependency Algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object
+BUILD_DEPENDS=	p5-Set-Object>=0:devel/p5-Set-Object
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Algorithm-Dependency/Makefile b/devel/p5-Algorithm-Dependency/Makefile
index c19057fdffaa..ed39559323ba 100644
--- a/devel/p5-Algorithm-Dependency/Makefile
+++ b/devel/p5-Algorithm-Dependency/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Base class for implementing various dependency trees
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=0.31:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Params-Util>=0.31:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-ClassAPI>=0.6:${PORTSDIR}/devel/p5-Test-ClassAPI
+TEST_DEPENDS=	p5-Test-ClassAPI>=0.6:devel/p5-Test-ClassAPI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Algorithm-Evolutionary/Makefile b/devel/p5-Algorithm-Evolutionary/Makefile
index 911db1f0a93c..43ec0668d030 100644
--- a/devel/p5-Algorithm-Evolutionary/Makefile
+++ b/devel/p5-Algorithm-Evolutionary/Makefile
@@ -13,23 +13,23 @@ COMMENT=	Library for doing evolutionary computation in Perl
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Algorithm-Permute>=0.01:${PORTSDIR}/devel/p5-Algorithm-Permute \
-		p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Clone>=0.31:${PORTSDIR}/devel/p5-Clone \
-		p5-GD>=2.17:${PORTSDIR}/graphics/p5-GD \
-		p5-Math-Random>=0.63:${PORTSDIR}/math/p5-Math-Random \
-		p5-Object-Array>=0:${PORTSDIR}/devel/p5-Object-Array \
-		p5-Sort-Key>=0:${PORTSDIR}/devel/p5-Sort-Key \
-		p5-Statistics-Basic>=1.6:${PORTSDIR}/math/p5-Statistics-Basic \
-		p5-String-Random>=0:${PORTSDIR}/devel/p5-String-Random \
-		p5-Tree-DAG_Node>=1.04:${PORTSDIR}/devel/p5-Tree-DAG_Node \
-		p5-XML-LibXML>=1.5:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Parser>=2.40:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Parser-Style-EasyTree>=0:${PORTSDIR}/textproc/p5-XML-Parser-Style-EasyTree \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Algorithm-Permute>=0.01:devel/p5-Algorithm-Permute \
+		p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-Clone>=0.31:devel/p5-Clone \
+		p5-GD>=2.17:graphics/p5-GD \
+		p5-Math-Random>=0.63:math/p5-Math-Random \
+		p5-Object-Array>=0:devel/p5-Object-Array \
+		p5-Sort-Key>=0:devel/p5-Sort-Key \
+		p5-Statistics-Basic>=1.6:math/p5-Statistics-Basic \
+		p5-String-Random>=0:devel/p5-String-Random \
+		p5-Tree-DAG_Node>=1.04:devel/p5-Tree-DAG_Node \
+		p5-XML-LibXML>=1.5:textproc/p5-XML-LibXML \
+		p5-XML-Parser>=2.40:textproc/p5-XML-Parser \
+		p5-XML-Parser-Style-EasyTree>=0:textproc/p5-XML-Parser-Style-EasyTree \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Pod-Escapes>=0:${PORTSDIR}/textproc/p5-Pod-Escapes \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Pod-Escapes>=0:textproc/p5-Pod-Escapes \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Algorithm-FloodControl/Makefile b/devel/p5-Algorithm-FloodControl/Makefile
index 4a515a9217ad..cafa9d55f788 100644
--- a/devel/p5-Algorithm-FloodControl/Makefile
+++ b/devel/p5-Algorithm-FloodControl/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Robot protection
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Cache-FastMmap>=0:${PORTSDIR}/devel/p5-Cache-FastMmap \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-IncludeExclude/Makefile b/devel/p5-Algorithm-IncludeExclude/Makefile
index f101a2f413b5..d19e93185872 100644
--- a/devel/p5-Algorithm-IncludeExclude/Makefile
+++ b/devel/p5-Algorithm-IncludeExclude/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Build and evaluate include/exclude lists
 
-BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Interval2Prefix/Makefile b/devel/p5-Algorithm-Interval2Prefix/Makefile
index 81d8e238341d..4caab9958c46 100644
--- a/devel/p5-Algorithm-Interval2Prefix/Makefile
+++ b/devel/p5-Algorithm-Interval2Prefix/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Generate prefixes from intervals
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Algorithm-Merge/Makefile b/devel/p5-Algorithm-Merge/Makefile
index f3f0e73ca697..eced66b3d789 100644
--- a/devel/p5-Algorithm-Merge/Makefile
+++ b/devel/p5-Algorithm-Merge/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Three-way merge and diff
 
-RUN_DEPENDS=	p5-Algorithm-Diff>=1.15:${PORTSDIR}/devel/p5-Algorithm-Diff
+RUN_DEPENDS=	p5-Algorithm-Diff>=1.15:devel/p5-Algorithm-Diff
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Alien-SDL/Makefile b/devel/p5-Alien-SDL/Makefile
index 5aa37429767a..ddcc2ff96ff9 100644
--- a/devel/p5-Alien-SDL/Makefile
+++ b/devel/p5-Alien-SDL/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Detect and get configuration setting for SDL
 LICENSE=	GPLv2
 
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-Text-Patch>=1.4:${PORTSDIR}/textproc/p5-Text-Patch
-RUN_DEPENDS=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+		p5-Text-Patch>=1.4:textproc/p5-Text-Patch
+RUN_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 USES=		perl5
 USE_PERL5=	modbuild
@@ -26,8 +26,8 @@ CONFIGURE_ARGS=	--with-sdl-config=${SDL_CONFIG}
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502000
-BUILD_DEPENDS+=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract
-RUN_DEPENDS+=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract
+BUILD_DEPENDS+=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract
+RUN_DEPENDS+=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Alzabo/Makefile b/devel/p5-Alzabo/Makefile
index 11d3fe95317b..a551cea08b51 100644
--- a/devel/p5-Alzabo/Makefile
+++ b/devel/p5-Alzabo/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Data modelling tool and RDBMS-OO mapper
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-BUILD_DEPENDS=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Class-Factory-Util>=0:${PORTSDIR}/devel/p5-Class-Factory-Util \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Class-Factory-Util>=0:devel/p5-Class-Factory-Util \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Any-Daemon/Makefile b/devel/p5-Any-Daemon/Makefile
index 0f69743c4c87..def2d400f243 100644
--- a/devel/p5-Any-Daemon/Makefile
+++ b/devel/p5-Any-Daemon/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Provides basic needs for a daemon
 
 LICENSE=	ART10
 
-RUN_DEPENDS:=	p5-Log-Report-Optional>=0:${PORTSDIR}/devel/p5-Log-Report-Optional \
-		p5-File-Spec-Native>=0:${PORTSDIR}/devel/p5-File-Spec-Native
+RUN_DEPENDS:=	p5-Log-Report-Optional>=0:devel/p5-Log-Report-Optional \
+		p5-File-Spec-Native>=0:devel/p5-File-Spec-Native
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Any-Moose-Convert/Makefile b/devel/p5-Any-Moose-Convert/Makefile
index 0c02c81b5f3f..1aa1cd82249b 100644
--- a/devel/p5-Any-Moose-Convert/Makefile
+++ b/devel/p5-Any-Moose-Convert/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Convert Moose libraries to Mouse ones, or vice versa
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PerlIO-Util>=0:${PORTSDIR}/devel/p5-PerlIO-Util
+BUILD_DEPENDS=	p5-PerlIO-Util>=0:devel/p5-PerlIO-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \
-		p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
+TEST_DEPENDS=	p5-Moose>=0.90:devel/p5-Moose \
+		p5-Mouse>=0.40:devel/p5-Mouse
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Any-Moose/Makefile b/devel/p5-Any-Moose/Makefile
index cbff23cbba57..861a167330af 100644
--- a/devel/p5-Any-Moose/Makefile
+++ b/devel/p5-Any-Moose/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension for/to use Moose or Mouse modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-#TEST_DEPENDS=	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
+#TEST_DEPENDS=	p5-Moose>0:devel/p5-Moose
 
 USES=		perl5
 USE_PERL5=	configure
@@ -27,13 +27,13 @@ MOUSE_DESC=	Use Mouse
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMOOSE}
-BUILD_DEPENDS+=	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
-RUN_DEPENDS+=	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS+=	p5-Moose>0:devel/p5-Moose
+RUN_DEPENDS+=	p5-Moose>0:devel/p5-Moose
 .endif
 
 .if ${PORT_OPTIONS:MMOUSE}
-BUILD_DEPENDS+=	p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
-RUN_DEPENDS+=	p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS+=	p5-Mouse>=0.40:devel/p5-Mouse
+RUN_DEPENDS+=	p5-Mouse>=0.40:devel/p5-Mouse
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-AnyEvent-AIO/Makefile b/devel/p5-AnyEvent-AIO/Makefile
index 05e960a18f67..bb5d67f76498 100644
--- a/devel/p5-AnyEvent-AIO/Makefile
+++ b/devel/p5-AnyEvent-AIO/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Asynchronous file and directory I/O with AnyEvent
 
-BUILD_DEPENDS=	p5-AnyEvent>=3.4:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-IO-AIO>=3.0:${PORTSDIR}/devel/p5-IO-AIO
+BUILD_DEPENDS=	p5-AnyEvent>=3.4:devel/p5-AnyEvent \
+		p5-IO-AIO>=3.0:devel/p5-IO-AIO
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AnyEvent-Connection/Makefile b/devel/p5-AnyEvent-Connection/Makefile
index 9e229e631081..bfec7a56ad10 100644
--- a/devel/p5-AnyEvent-Connection/Makefile
+++ b/devel/p5-AnyEvent-Connection/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Base class for TCP connectful clients
 
-BUILD_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Object-Event>=1.21:${PORTSDIR}/devel/p5-Object-Event \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Test-NoWarnings>=1.03:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-TCP>=0.14:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
-RUN_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Object-Event>=1.21:${PORTSDIR}/devel/p5-Object-Event \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Object-Event>=1.21:devel/p5-Object-Event \
+		p5-common-sense>=2:devel/p5-common-sense \
+		p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
+		p5-Test-TCP>=0.14:devel/p5-Test-TCP \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
+RUN_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Object-Event>=1.21:devel/p5-Object-Event \
+		p5-common-sense>=2:devel/p5-common-sense
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AnyEvent-DBI-Abstract/Makefile b/devel/p5-AnyEvent-DBI-Abstract/Makefile
index da660ceb184b..25715fcb5d7c 100644
--- a/devel/p5-AnyEvent-DBI-Abstract/Makefile
+++ b/devel/p5-AnyEvent-DBI-Abstract/Makefile
@@ -14,8 +14,8 @@ COMMENT=	AnyEvent::DBI + SQL::Abstract
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent-DBI>=0:${PORTSDIR}/devel/p5-AnyEvent-DBI \
-		p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract
+BUILD_DEPENDS=	p5-AnyEvent-DBI>=0:devel/p5-AnyEvent-DBI \
+		p5-SQL-Abstract>=0:databases/p5-SQL-Abstract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-DBI/Makefile b/devel/p5-AnyEvent-DBI/Makefile
index 3bd353990c63..c66fcaac1b1e 100644
--- a/devel/p5-AnyEvent-DBI/Makefile
+++ b/devel/p5-AnyEvent-DBI/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Asynchronous DBI access
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=4.15:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-DBI>=1.0:${PORTSDIR}/databases/p5-DBI \
-		p5-common-sense>=3.3:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-AnyEvent>=4.15:devel/p5-AnyEvent \
+		p5-DBI>=1.0:databases/p5-DBI \
+		p5-common-sense>=3.3:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-DBus/Makefile b/devel/p5-AnyEvent-DBus/Makefile
index 0acca0aac072..92e2ccc847a3 100644
--- a/devel/p5-AnyEvent-DBus/Makefile
+++ b/devel/p5-AnyEvent-DBus/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Seamlessly integrate Net::DBus into AnyEvent
 
-BUILD_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Net-DBus>=0.33:${PORTSDIR}/devel/p5-Net-DBus \
-		p5-common-sense>=3.2:${PORTSDIR}/devel/p5-common-sense
-RUN_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Net-DBus>=0.33:${PORTSDIR}/devel/p5-Net-DBus \
-		p5-common-sense>=3.2:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Net-DBus>=0.33:devel/p5-Net-DBus \
+		p5-common-sense>=3.2:devel/p5-common-sense
+RUN_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Net-DBus>=0.33:devel/p5-Net-DBus \
+		p5-common-sense>=3.2:devel/p5-common-sense
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AnyEvent-Filesys-Notify/Makefile b/devel/p5-AnyEvent-Filesys-Notify/Makefile
index b501bbed620a..e5de3f927531 100644
--- a/devel/p5-AnyEvent-Filesys-Notify/Makefile
+++ b/devel/p5-AnyEvent-Filesys-Notify/Makefile
@@ -14,18 +14,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moo>=1.003001:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-late>=0.014:${PORTSDIR}/devel/p5-MooX-late \
-	p5-MooX-Types-MooseLike>=0.25:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-	p5-AnyEvent>=7.05:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-Path-Iterator-Rule>=1.005:${PORTSDIR}/devel/p5-Path-Iterator-Rule \
-	p5-Try-Tiny>=0.18:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-namespace-autoclean>=0.24:${PORTSDIR}/devel/p5-namespace-autoclean \
-	p5-IO-KQueue>=0.34:${PORTSDIR}/devel/p5-IO-KQueue
+	p5-Moo>=1.003001:devel/p5-Moo \
+	p5-MooX-late>=0.014:devel/p5-MooX-late \
+	p5-MooX-Types-MooseLike>=0.25:devel/p5-MooX-Types-MooseLike \
+	p5-AnyEvent>=7.05:devel/p5-AnyEvent \
+	p5-Path-Iterator-Rule>=1.005:devel/p5-Path-Iterator-Rule \
+	p5-Try-Tiny>=0.18:lang/p5-Try-Tiny \
+	p5-namespace-autoclean>=0.24:devel/p5-namespace-autoclean \
+	p5-IO-KQueue>=0.34:devel/p5-IO-KQueue
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-AnyEvent-Gearman/Makefile b/devel/p5-AnyEvent-Gearman/Makefile
index 4be69dbb6e3f..3d494e19829b 100644
--- a/devel/p5-AnyEvent-Gearman/Makefile
+++ b/devel/p5-AnyEvent-Gearman/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Asynchronous Gearman client/worker module for AnyEvent applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-Foreign>=0:${PORTSDIR}/devel/p5-MouseX-Foreign \
-		p5-Object-Container>=0:${PORTSDIR}/devel/p5-Object-Container \
-		p5-Object-Event>=0:${PORTSDIR}/devel/p5-Object-Event
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-Foreign>=0:devel/p5-MouseX-Foreign \
+		p5-Object-Container>=0:devel/p5-Object-Container \
+		p5-Object-Event>=0:devel/p5-Object-Event
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-AnyEvent-Graphite/Makefile b/devel/p5-AnyEvent-Graphite/Makefile
index 0212f6bf5b0e..e0a70da59f57 100644
--- a/devel/p5-AnyEvent-Graphite/Makefile
+++ b/devel/p5-AnyEvent-Graphite/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Non-blocking Graphite client
 
-RUN_DEPENDS=	p5-AnyEvent>=4.15:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-AnyEvent-SNMP>=1.0:${PORTSDIR}/net-mgmt/p5-AnyEvent-SNMP
+RUN_DEPENDS=	p5-AnyEvent>=4.15:devel/p5-AnyEvent \
+		p5-AnyEvent-SNMP>=1.0:net-mgmt/p5-AnyEvent-SNMP
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-I3/Makefile b/devel/p5-AnyEvent-I3/Makefile
index 85719ef47a8b..b85db53345ef 100644
--- a/devel/p5-AnyEvent-I3/Makefile
+++ b/devel/p5-AnyEvent-I3/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Communicate with the i3 window manager
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
-RUN_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-JSON-XS>=0:converters/p5-JSON-XS
+RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-JSON-XS>=0:converters/p5-JSON-XS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AnyEvent-MessagePack/Makefile b/devel/p5-AnyEvent-MessagePack/Makefile
index 3ab213ea39f9..5cd61650fa59 100644
--- a/devel/p5-AnyEvent-MessagePack/Makefile
+++ b/devel/p5-AnyEvent-MessagePack/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of AnyEvent for MessagePack
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>=7.02:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-Data-MessagePack>=0.46:${PORTSDIR}/devel/p5-Data-MessagePack \
-	p5-Data-MessagePack-Stream>=0.07:${PORTSDIR}/devel/p5-Data-MessagePack-Stream
+	p5-AnyEvent>=7.02:devel/p5-AnyEvent \
+	p5-Data-MessagePack>=0.46:devel/p5-Data-MessagePack \
+	p5-Data-MessagePack-Stream>=0.07:devel/p5-Data-MessagePack-Stream
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-RPC/Makefile b/devel/p5-AnyEvent-RPC/Makefile
index d8fe5dd22f37..923012c23e37 100644
--- a/devel/p5-AnyEvent-RPC/Makefile
+++ b/devel/p5-AnyEvent-RPC/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Abstract framework for RPC clients
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-XML-Hash-LX>=0.05:${PORTSDIR}/textproc/p5-XML-Hash-LX \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-AnyEvent-HTTP>=1.43:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Test-NoWarnings>=1.03:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-TCP>=0.14:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-XML-Hash-LX>=0.05:textproc/p5-XML-Hash-LX \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+		p5-AnyEvent-HTTP>=1.43:www/p5-AnyEvent-HTTP \
+		p5-libwww>=0:www/p5-libwww \
+		p5-common-sense>=2:devel/p5-common-sense \
+		p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
+		p5-Test-TCP>=0.14:devel/p5-Test-TCP \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-Run/Makefile b/devel/p5-AnyEvent-Run/Makefile
index 09d12ccaad12..5c749c615c80 100644
--- a/devel/p5-AnyEvent-Run/Makefile
+++ b/devel/p5-AnyEvent-Run/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Run a process or coderef asynchronously
 
-RUN_DEPENDS=	p5-AnyEvent>=4.15:${PORTSDIR}/devel/p5-AnyEvent
+RUN_DEPENDS=	p5-AnyEvent>=4.15:devel/p5-AnyEvent
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-Subprocess/Makefile b/devel/p5-AnyEvent-Subprocess/Makefile
index f496e3faba69..fdc1f4e25ad7 100644
--- a/devel/p5-AnyEvent-Subprocess/Makefile
+++ b/devel/p5-AnyEvent-Subprocess/Makefile
@@ -14,24 +14,24 @@ COMMENT=	Flexible, OO, asynchronous process spawning and management
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=5.2:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-EV>=4.0:${PORTSDIR}/devel/p5-EV \
-		p5-Event-Join>=0.05:${PORTSDIR}/devel/p5-Event-Join \
-		p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>=1.15:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-MooseX-Types>=0.19:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Signal>=0:${PORTSDIR}/devel/p5-MooseX-Types-Signal \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-AnyEvent>=5.2:devel/p5-AnyEvent \
+		p5-EV>=4.0:devel/p5-EV \
+		p5-Event-Join>=0.05:devel/p5-Event-Join \
+		p5-IO-Tty>=0:devel/p5-IO-Tty \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-Moose>=1.15:devel/p5-Moose \
+		p5-MooseX-Clone>=0:devel/p5-MooseX-Clone \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
+		p5-MooseX-Types>=0.19:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Signal>=0:devel/p5-MooseX-Types-Signal \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -39,7 +39,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-AnyEvent-Task/Makefile b/devel/p5-AnyEvent-Task/Makefile
index 96576bd373b7..0b84f465578c 100644
--- a/devel/p5-AnyEvent-Task/Makefile
+++ b/devel/p5-AnyEvent-Task/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Client/server-based asynchronous worker pool
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Callback-Frame>=0:${PORTSDIR}/devel/p5-Callback-Frame \
-		p5-Guard>=0:${PORTSDIR}/devel/p5-Guard \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Log-Defer>=0.300:${PORTSDIR}/devel/p5-Log-Defer \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Callback-Frame>=0:devel/p5-Callback-Frame \
+		p5-Guard>=0:devel/p5-Guard \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Log-Defer>=0.300:devel/p5-Log-Defer \
+		p5-common-sense>=0:devel/p5-common-sense
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-AnyEvent-Worker/Makefile b/devel/p5-AnyEvent-Worker/Makefile
index e1863850fa79..9261c66c4090 100644
--- a/devel/p5-AnyEvent-Worker/Makefile
+++ b/devel/p5-AnyEvent-Worker/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Manage blocking task in external process
 
-BUILD_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Test-NoWarnings>=1.03:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-TCP>=0.14:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+BUILD_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Storable>=0:devel/p5-Storable \
+		p5-common-sense>=2:devel/p5-common-sense \
+		p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
+		p5-Test-TCP>=0.14:devel/p5-Test-TCP \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent/Makefile b/devel/p5-AnyEvent/Makefile
index 11bb0a2b9f60..21842e51f9a6 100644
--- a/devel/p5-AnyEvent/Makefile
+++ b/devel/p5-AnyEvent/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Provide framework for multiple event loops
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Canary-Stability>=0:${PORTSDIR}/devel/p5-Canary-Stability
-TEST_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-Canary-Stability>=0:devel/p5-Canary-Stability
+TEST_DEPENDS=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-AnyMQ/Makefile b/devel/p5-AnyMQ/Makefile
index 478e3f97a0f4..8aa9da49e239 100644
--- a/devel/p5-AnyMQ/Makefile
+++ b/devel/p5-AnyMQ/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Non-blocking message queue system based on AnyEvent
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-MouseX-NativeTraits>=0:${PORTSDIR}/devel/p5-MouseX-NativeTraits \
-		p5-MouseX-Traits>=0:${PORTSDIR}/devel/p5-MouseX-Traits
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-MouseX-NativeTraits>=0:devel/p5-MouseX-NativeTraits \
+		p5-MouseX-Traits>=0:devel/p5-MouseX-Traits
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-App-Build/Makefile b/devel/p5-App-Build/Makefile
index 9afdfa9d4188..b48f7e3c8fd8 100644
--- a/devel/p5-App-Build/Makefile
+++ b/devel/p5-App-Build/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	Alex.Bakhtin@gmail.com
 COMMENT=	Build and install Perl applications
 
-RUN_DEPENDS=	p5-App-Options>=0:${PORTSDIR}/devel/p5-App-Options \
-		p5-Module-Build>=0.28:${PORTSDIR}/devel/p5-Module-Build
-BUILD_DEPENDS=	p5-Test-Differences>=0.47:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-App-Options>=0:${PORTSDIR}/devel/p5-App-Options \
-		p5-Module-Build>=0.28:${PORTSDIR}/devel/p5-Module-Build
+RUN_DEPENDS=	p5-App-Options>=0:devel/p5-App-Options \
+		p5-Module-Build>=0.28:devel/p5-Module-Build
+BUILD_DEPENDS=	p5-Test-Differences>=0.47:devel/p5-Test-Differences \
+		p5-App-Options>=0:devel/p5-App-Options \
+		p5-Module-Build>=0.28:devel/p5-Module-Build
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-App-CLI-Extension/Makefile b/devel/p5-App-CLI-Extension/Makefile
index fde3622bc158..bad816d4eaaa 100644
--- a/devel/p5-App-CLI-Extension/Makefile
+++ b/devel/p5-App-CLI-Extension/Makefile
@@ -13,11 +13,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension for App::CLI extension module
 
-BUILD_DEPENDS=	p5-App-CLI>=0.313:${PORTSDIR}/devel/p5-App-CLI \
-		p5-Class-Accessor-Grouped>=0.10000:${PORTSDIR}/devel/p5-Class-Accessor-Grouped \
-		p5-Error>=0.17000:${PORTSDIR}/lang/p5-Error \
-		p5-MRO-Compat>=0.11:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-UNIVERSAL-require>=0.13:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-App-CLI>=0.313:devel/p5-App-CLI \
+		p5-Class-Accessor-Grouped>=0.10000:devel/p5-Class-Accessor-Grouped \
+		p5-Error>=0.17000:lang/p5-Error \
+		p5-MRO-Compat>=0.11:devel/p5-MRO-Compat \
+		p5-UNIVERSAL-require>=0.13:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-App-Cache/Makefile b/devel/p5-App-Cache/Makefile
index 5d64a27a2aad..4e871b9e38fa 100644
--- a/devel/p5-App-Cache/Makefile
+++ b/devel/p5-App-Cache/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy application-level caching
 
-RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-App-Cmd/Makefile b/devel/p5-App-Cmd/Makefile
index d07a91adbaac..d756f5597749 100644
--- a/devel/p5-App-Cmd/Makefile
+++ b/devel/p5-App-Cmd/Makefile
@@ -13,20 +13,20 @@ COMMENT=	App::Cmd - Write command line apps with less suffering
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0.13:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Getopt-Long-Descriptive>=0.084:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-IO-TieCombine>=0:${PORTSDIR}/devel/p5-IO-TieCombine \
-		p5-String-RewritePrefix>=0:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Module-Pluggable>=5.1:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS=	p5-Capture-Tiny>=0.13:devel/p5-Capture-Tiny \
+		p5-Class-Load>=0.06:devel/p5-Class-Load \
+		p5-Getopt-Long-Descriptive>=0.084:devel/p5-Getopt-Long-Descriptive \
+		p5-IO-TieCombine>=0:devel/p5-IO-TieCombine \
+		p5-String-RewritePrefix>=0:textproc/p5-String-RewritePrefix \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
-		p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
-		p5-IPC-Cmd>=0:${PORTSDIR}/devel/p5-IPC-Cmd \
-		p5-ExtUtils-MakeMaker>=6.4:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Data-Dumper>=0:devel/p5-Data-Dumper \
+		p5-PathTools>=0:devel/p5-PathTools \
+		p5-IPC-Cmd>=0:devel/p5-IPC-Cmd \
+		p5-ExtUtils-MakeMaker>=6.4:devel/p5-ExtUtils-MakeMaker
 
 USES=		perl5
 USE_PERL5=	configure
@@ -35,8 +35,8 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-Getopt-Long>=2.39:${PORTSDIR}/devel/p5-Getopt-Long
-RUN_DEPENDS+=	p5-Getopt-Long>=2.39:${PORTSDIR}/devel/p5-Getopt-Long
+BUILD_DEPENDS+=	p5-Getopt-Long>=2.39:devel/p5-Getopt-Long
+RUN_DEPENDS+=	p5-Getopt-Long>=2.39:devel/p5-Getopt-Long
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-App-GitGot/Makefile b/devel/p5-App-GitGot/Makefile
index 001f18ddf238..8dabd0862ee6 100644
--- a/devel/p5-App-GitGot/Makefile
+++ b/devel/p5-App-GitGot/Makefile
@@ -15,30 +15,30 @@ COMMENT=	Tool to make it easier to manage multiple git repositories
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Config-INI>=0:${PORTSDIR}/devel/p5-Config-INI \
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-Git-Wrapper>=0.042:${PORTSDIR}/devel/p5-Git-Wrapper \
-		p5-IO-Prompt-Simple>=0:${PORTSDIR}/devel/p5-IO-Prompt-Simple \
-		p5-List-AllUtils>=0.09:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-Moo>=2:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-HandlesVia>=0.001008:${PORTSDIR}/devel/p5-MooX-HandlesVia \
-		p5-Net-GitHub>=0:${PORTSDIR}/net/p5-Net-GitHub \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-PerlX-Maybe>=0:${PORTSDIR}/devel/p5-PerlX-Maybe \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-App-Cmd>=0:devel/p5-App-Cmd \
+		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Config-INI>=0:devel/p5-Config-INI \
+		p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-Git-Wrapper>=0.042:devel/p5-Git-Wrapper \
+		p5-IO-Prompt-Simple>=0:devel/p5-IO-Prompt-Simple \
+		p5-List-AllUtils>=0.09:devel/p5-List-AllUtils \
+		p5-Moo>=2:devel/p5-Moo \
+		p5-MooX-HandlesVia>=0.001008:devel/p5-MooX-HandlesVia \
+		p5-Net-GitHub>=0:net/p5-Net-GitHub \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-PerlX-Maybe>=0:devel/p5-PerlX-Maybe \
+		p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-File>=0:${PORTSDIR}/devel/p5-Test-File
+TEST_DEPENDS=	p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-File>=0:devel/p5-Test-File
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-App-GitHub/Makefile b/devel/p5-App-GitHub/Makefile
index f90903a3765e..dbea9ff0375c 100644
--- a/devel/p5-App-GitHub/Makefile
+++ b/devel/p5-App-GitHub/Makefile
@@ -14,9 +14,9 @@ COMMENT=	GitHub Command Tools
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-XS>=2.3:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Net-GitHub>=0.12:${PORTSDIR}/net/p5-Net-GitHub
+BUILD_DEPENDS=	p5-JSON-XS>=2.3:converters/p5-JSON-XS \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Net-GitHub>=0.12:net/p5-Net-GitHub
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-App-SD/Makefile b/devel/p5-App-SD/Makefile
index ed9a77bf869d..200b6e134772 100644
--- a/devel/p5-App-SD/Makefile
+++ b/devel/p5-App-SD/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Peer-to-peer replicated distributed issue tracker
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-DateTime>=:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Natural>=0:${PORTSDIR}/devel/p5-DateTime-Format-Natural \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Prophet>=0:${PORTSDIR}/databases/p5-Prophet \
-		p5-Test-Script-Run>=0.02:${PORTSDIR}/devel/p5-Test-Script-Run
+BUILD_DEPENDS=	p5-DateTime>=:devel/p5-DateTime \
+		p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Prophet>=0:databases/p5-Prophet \
+		p5-Test-Script-Run>=0.02:devel/p5-Test-Script-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -31,21 +31,21 @@ HIVEMINDER_DESC=	Enable huveminder sync
 TRAC_DESC=		Enable trac sync
 RT_DESC=		Enable rt sync
 
-GITHUB_BUILD_DEPENDS=	p5-Net-GitHub>=0.18:${PORTSDIR}/net/p5-Net-GitHub
-GITHUB_RUN_DEPENDS=	p5-Net-GitHub>=0.18:${PORTSDIR}/net/p5-Net-GitHub
+GITHUB_BUILD_DEPENDS=	p5-Net-GitHub>=0.18:net/p5-Net-GitHub
+GITHUB_RUN_DEPENDS=	p5-Net-GitHub>=0.18:net/p5-Net-GitHub
 
-GOOGLECODE_BUILD_DEPENDS=	p5-Net-Google-Code>=0.14:${PORTSDIR}/net/p5-Net-Google-Code
-GOOGLECODE_RUN_DEPENDS=		p5-Net-Google-Code>=0.14:${PORTSDIR}/net/p5-Net-Google-Code
+GOOGLECODE_BUILD_DEPENDS=	p5-Net-Google-Code>=0.14:net/p5-Net-Google-Code
+GOOGLECODE_RUN_DEPENDS=		p5-Net-Google-Code>=0.14:net/p5-Net-Google-Code
 
-HIVEMINDER_BUILD_DEPENDS=	p5-Net-Jifty>=0.09:${PORTSDIR}/net/p5-Net-Jifty \
-				p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-				p5-Email-MIME>=0:${PORTSDIR}/mail/p5-Email-MIME
+HIVEMINDER_BUILD_DEPENDS=	p5-Net-Jifty>=0.09:net/p5-Net-Jifty \
+				p5-Email-Address>=0:mail/p5-Email-Address \
+				p5-Email-MIME>=0:mail/p5-Email-MIME
 HIVEMINDER_RUN_DEPENDS=		${HIVEMINDER_BUILD_DEPENDS}
 
-TRAC_BUILD_DEPENDS=	p5-Net-Trac>=0.13:${PORTSDIR}/www/p5-Net-Trac
-TRAC_RUN_DEPENDS=	p5-Net-Trac>=0.13:${PORTSDIR}/www/p5-Net-Trac
+TRAC_BUILD_DEPENDS=	p5-Net-Trac>=0.13:www/p5-Net-Trac
+TRAC_RUN_DEPENDS=	p5-Net-Trac>=0.13:www/p5-Net-Trac
 
-RT_BUILD_DEPENDS=	p5-RT-Client-REST>=0:${PORTSDIR}/www/p5-RT-Client-REST
-RT_RUN_DEPENDS=		p5-RT-Client-REST>=0:${PORTSDIR}/www/p5-RT-Client-REST
+RT_BUILD_DEPENDS=	p5-RT-Client-REST>=0:www/p5-RT-Client-REST
+RT_RUN_DEPENDS=		p5-RT-Client-REST>=0:www/p5-RT-Client-REST
 
 .include <bsd.port.mk>
diff --git a/devel/p5-App-SVN-Bisect/Makefile b/devel/p5-App-SVN-Bisect/Makefile
index 62fc2ad22564..fba5408e5ce7 100644
--- a/devel/p5-App-SVN-Bisect/Makefile
+++ b/devel/p5-App-SVN-Bisect/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Binary search through svn revisions
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-IO-All>0:${PORTSDIR}/devel/p5-IO-All \
-		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS=	p5-IO-All>0:devel/p5-IO-All \
+		p5-YAML-Syck>0:textproc/p5-YAML-Syck \
+		${LOCALBASE}/bin/svn:devel/subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Output>=0:devel/p5-Test-Output
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-App-Trace/Makefile b/devel/p5-App-Trace/Makefile
index e6800b3dcdc6..1538873520e0 100644
--- a/devel/p5-App-Trace/Makefile
+++ b/devel/p5-App-Trace/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Embedded debug statements, including call/return tracing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Options>=0:${PORTSDIR}/devel/p5-App-Options
+BUILD_DEPENDS=	p5-App-Options>=0:devel/p5-App-Options
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-App-cpanoutdated/Makefile b/devel/p5-App-cpanoutdated/Makefile
index 79888a0f24af..5b9c19b31897 100644
--- a/devel/p5-App-cpanoutdated/Makefile
+++ b/devel/p5-App-cpanoutdated/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Detect outdated CPAN modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CPAN-DistnameInfo>=0.10:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-local-lib>=0:${PORTSDIR}/devel/p5-local-lib
+BUILD_DEPENDS=	p5-CPAN-DistnameInfo>=0.10:devel/p5-CPAN-DistnameInfo \
+		p5-libwww>=0:www/p5-libwww \
+		p5-local-lib>=0:devel/p5-local-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-App-local-lib-helper/Makefile b/devel/p5-App-local-lib-helper/Makefile
index 6f9182cceb0f..d507cb8f8b1b 100644
--- a/devel/p5-App-local-lib-helper/Makefile
+++ b/devel/p5-App-local-lib-helper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Make it easy to run code against a local-lib
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS:=	p5-local-lib>=2.000004:${PORTSDIR}/devel/p5-local-lib
+BUILD_DEPENDS:=	p5-local-lib>=2.000004:devel/p5-local-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-App-perlbrew/Makefile b/devel/p5-App-perlbrew/Makefile
index 17222a6cc121..e318644a5ced 100644
--- a/devel/p5-App-perlbrew/Makefile
+++ b/devel/p5-App-perlbrew/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Perl Environment manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-CPAN-Perl-Releases>=1.94:${PORTSDIR}/devel/p5-CPAN-Perl-Releases \
-		p5-Capture-Tiny>=0.25:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Devel-PatchPerl>=1.28:${PORTSDIR}/devel/p5-Devel-PatchPerl \
-		p5-Pod-Usage>=1.64:${PORTSDIR}/devel/p5-Pod-Usage \
-		p5-local-lib>=2.000014:${PORTSDIR}/devel/p5-local-lib
+BUILD_DEPENDS=	p5-CPAN-Perl-Releases>=1.94:devel/p5-CPAN-Perl-Releases \
+		p5-Capture-Tiny>=0.25:devel/p5-Capture-Tiny \
+		p5-Devel-PatchPerl>=1.28:devel/p5-Devel-PatchPerl \
+		p5-Pod-Usage>=1.64:devel/p5-Pod-Usage \
+		p5-local-lib>=2.000014:devel/p5-local-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-All>=0.51:${PORTSDIR}/devel/p5-IO-All \
-		p5-Path-Class>=0.33:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Test-Exception>=0.32:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-NoWarnings>=1.04:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Output>=1.03:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Spec>=0.47:${PORTSDIR}/devel/p5-Test-Spec
+TEST_DEPENDS=	p5-IO-All>=0.51:devel/p5-IO-All \
+		p5-Path-Class>=0.33:devel/p5-Path-Class \
+		p5-Test-Exception>=0.32:devel/p5-Test-Exception \
+		p5-Test-NoWarnings>=1.04:devel/p5-Test-NoWarnings \
+		p5-Test-Output>=1.03:devel/p5-Test-Output \
+		p5-Test-Spec>=0.47:devel/p5-Test-Spec
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -34,11 +34,11 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Pod-Parser>=1.62:${PORTSDIR}/textproc/p5-Pod-Parser
-RUN_DEPENDS+=	p5-Pod-Parser>=1.62:${PORTSDIR}/textproc/p5-Pod-Parser
-TEST_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-File-Temp>=0.23.04:${PORTSDIR}/devel/p5-File-Temp \
-		p5-Test-Simple>=1.001.002:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Pod-Parser>=1.62:textproc/p5-Pod-Parser
+RUN_DEPENDS+=	p5-Pod-Parser>=1.62:textproc/p5-Pod-Parser
+TEST_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:devel/p5-ExtUtils-MakeMaker \
+		p5-File-Temp>=0.23.04:devel/p5-File-Temp \
+		p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-App-scan_prereqs_cpanfile/Makefile b/devel/p5-App-scan_prereqs_cpanfile/Makefile
index 3f2af735935c..5b1aaf70f18f 100644
--- a/devel/p5-App-scan_prereqs_cpanfile/Makefile
+++ b/devel/p5-App-scan_prereqs_cpanfile/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Module-CPANfile>=0.9020:${PORTSDIR}/devel/p5-Module-CPANfile \
-	p5-Perl-PrereqScanner-Lite>=0.21:${PORTSDIR}/devel/p5-Perl-PrereqScanner-Lite
+	p5-Module-CPANfile>=0.9020:devel/p5-Module-CPANfile \
+	p5-Perl-PrereqScanner-Lite>=0.21:devel/p5-Perl-PrereqScanner-Lite
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AppConfig-Std/Makefile b/devel/p5-AppConfig-Std/Makefile
index c1ddf1ef45cb..ec2af3e4cf06 100644
--- a/devel/p5-AppConfig-Std/Makefile
+++ b/devel/p5-AppConfig-Std/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Subclass of AppConfig that provides standard options
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-AppConfig>=1.52:${PORTSDIR}/devel/p5-AppConfig
+RUN_DEPENDS=	p5-AppConfig>=1.52:devel/p5-AppConfig
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Array-Iterator/Makefile b/devel/p5-Array-Iterator/Makefile
index 84433f1a11e9..4c5a217f9d45 100644
--- a/devel/p5-Array-Iterator/Makefile
+++ b/devel/p5-Array-Iterator/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Set of array iterators
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile
index 856ace7af313..d0a405df00c1 100644
--- a/devel/p5-Array-Window/Makefile
+++ b/devel/p5-Array-Window/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Calculate windows/subsets/pages of arrays
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=0.12:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Params-Util>=0.12:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Async-Interrupt/Makefile b/devel/p5-Async-Interrupt/Makefile
index 67c9b23175fb..3c2751334924 100644
--- a/devel/p5-Async-Interrupt/Makefile
+++ b/devel/p5-Async-Interrupt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Allow C/XS libraries to interrupt perl asynchronously
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Async-MergePoint/Makefile b/devel/p5-Async-MergePoint/Makefile
index 18adfca96a43..ad0dd042da60 100644
--- a/devel/p5-Async-MergePoint/Makefile
+++ b/devel/p5-Async-MergePoint/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	johan@stromnet.se
 COMMENT=	Perl modules that resynchronise diverged control flow
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 8a7bf53022c0..b6ce46dc924d 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perform exit processing for a program or object
 LICENSE=	ART10
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Attribute-Persistent/Makefile b/devel/p5-Attribute-Persistent/Makefile
index 16a8be799adc..c6dcc1d0d8e0 100644
--- a/devel/p5-Attribute-Persistent/Makefile
+++ b/devel/p5-Attribute-Persistent/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Attribute::Persistent - Really lazy persistence
 
-BUILD_DEPENDS=	p5-Attribute-Handlers-Prospective>=0:${PORTSDIR}/devel/p5-Attribute-Handlers-Prospective \
-		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
-RUN_DEPENDS=	p5-Attribute-Handlers-Prospective>=0:${PORTSDIR}/devel/p5-Attribute-Handlers-Prospective
+BUILD_DEPENDS=	p5-Attribute-Handlers-Prospective>=0:devel/p5-Attribute-Handlers-Prospective \
+		p5-MLDBM>=0:databases/p5-MLDBM
+RUN_DEPENDS=	p5-Attribute-Handlers-Prospective>=0:devel/p5-Attribute-Handlers-Prospective
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-C/Makefile b/devel/p5-B-C/Makefile
index 91d7f660a42b..4a3a19465ac4 100644
--- a/devel/p5-B-C/Makefile
+++ b/devel/p5-B-C/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl compiler's C backend
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Flags>=0:${PORTSDIR}/devel/p5-B-Flags \
-		p5-Opcodes>=0:${PORTSDIR}/devel/p5-Opcodes \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-B-Flags>=0:devel/p5-B-Flags \
+		p5-Opcodes>=0:devel/p5-Opcodes \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-B-Compiling/Makefile b/devel/p5-B-Compiling/Makefile
index 107be3478870..a04c64daf62f 100644
--- a/devel/p5-B-Compiling/Makefile
+++ b/devel/p5-B-Compiling/Makefile
@@ -13,7 +13,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-B-Deobfuscate/Makefile b/devel/p5-B-Deobfuscate/Makefile
index 6c4fed13fbde..af031e29d93e 100644
--- a/devel/p5-B-Deobfuscate/Makefile
+++ b/devel/p5-B-Deobfuscate/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension to B::Deparse for use in de-obfuscating source code
 
-RUN_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-B-Keywords>=0:${PORTSDIR}/devel/p5-B-Keywords
+RUN_DEPENDS=	p5-YAML>=0:textproc/p5-YAML \
+		p5-B-Keywords>=0:devel/p5-B-Keywords
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-B-Hooks-EndOfScope/Makefile b/devel/p5-B-Hooks-EndOfScope/Makefile
index b878910691af..ead30f3dbefd 100644
--- a/devel/p5-B-Hooks-EndOfScope/Makefile
+++ b/devel/p5-B-Hooks-EndOfScope/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Execute code after a scope finished compilation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Implementation>=0.05:${PORTSDIR}/devel/p5-Module-Implementation \
-		p5-Sub-Exporter-Progressive>=0.001006:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive \
-		p5-Variable-Magic>=0.48:${PORTSDIR}/devel/p5-Variable-Magic
+BUILD_DEPENDS=	p5-Module-Implementation>=0.05:devel/p5-Module-Implementation \
+		p5-Sub-Exporter-Progressive>=0.001006:devel/p5-Sub-Exporter-Progressive \
+		p5-Variable-Magic>=0.48:devel/p5-Variable-Magic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-B-Hooks-OP-Annotation/Makefile b/devel/p5-B-Hooks-OP-Annotation/Makefile
index 61ca8a456d57..4ca251d3cbb2 100644
--- a/devel/p5-B-Hooks-OP-Annotation/Makefile
+++ b/devel/p5-B-Hooks-OP-Annotation/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Annotate and delegate hooked OPs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.304:devel/p5-ExtUtils-Depends
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile b/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
index aa00b972766a..a5a500d07565 100644
--- a/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
+++ b/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
@@ -11,12 +11,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to invoke callback on construction of entersub OPs
 
 RUN_DEPENDS=	\
-	p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-	p5-B-Utils>0:${PORTSDIR}/devel/p5-B-Utils
+	p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check \
+	p5-B-Utils>0:devel/p5-B-Utils
 BUILD_DEPENDS=	\
-	p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-	p5-B-Utils>0:${PORTSDIR}/devel/p5-B-Utils \
-	p5-ExtUtils-Depends>0:${PORTSDIR}/devel/p5-ExtUtils-Depends
+	p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check \
+	p5-B-Utils>0:devel/p5-B-Utils \
+	p5-ExtUtils-Depends>0:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-Hooks-OP-Check/Makefile b/devel/p5-B-Hooks-OP-Check/Makefile
index 0dcdf4d34c0b..977e76e66f24 100644
--- a/devel/p5-B-Hooks-OP-Check/Makefile
+++ b/devel/p5-B-Hooks-OP-Check/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Wrap OP check callbacks
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-B-Hooks-OP-PPAddr/Makefile b/devel/p5-B-Hooks-OP-PPAddr/Makefile
index c924ce6315a0..468b783f0117 100644
--- a/devel/p5-B-Hooks-OP-PPAddr/Makefile
+++ b/devel/p5-B-Hooks-OP-PPAddr/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Hook into opcode execution
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-Hooks-Parser/Makefile b/devel/p5-B-Hooks-Parser/Makefile
index 25a062457124..843d4fec6357 100644
--- a/devel/p5-B-Hooks-Parser/Makefile
+++ b/devel/p5-B-Hooks-Parser/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to perls parser variables
 
-BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
-RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0:${PORTSDIR}/devel/p5-B-Hooks-OP-Check
-TEST_DEPENDS=	p5-B-Hooks-EndOfScope>=0.05:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0:devel/p5-B-Hooks-OP-Check \
+		p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
+RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0:devel/p5-B-Hooks-OP-Check
+TEST_DEPENDS=	p5-B-Hooks-EndOfScope>=0.05:devel/p5-B-Hooks-EndOfScope \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-OPCheck/Makefile b/devel/p5-B-OPCheck/Makefile
index 542998636ef0..b97f71638ca4 100644
--- a/devel/p5-B-OPCheck/Makefile
+++ b/devel/p5-B-OPCheck/Makefile
@@ -13,10 +13,10 @@ COMMENT=	PL_check hacks using Perl callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Utils>=0.08:${PORTSDIR}/devel/p5-B-Utils \
-		p5-Scope-Guard>=0:${PORTSDIR}/devel/p5-Scope-Guard
+BUILD_DEPENDS=	p5-B-Utils>=0.08:devel/p5-B-Utils \
+		p5-Scope-Guard>=0:devel/p5-Scope-Guard
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-Utils/Makefile b/devel/p5-B-Utils/Makefile
index 64274e464ab1..5a5752384a98 100644
--- a/devel/p5-B-Utils/Makefile
+++ b/devel/p5-B-Utils/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Helper functions for op tree manipulation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.301:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.301:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-BZ-Client/Makefile b/devel/p5-BZ-Client/Makefile
index be9cfab0c9cd..5d8b0229a420 100644
--- a/devel/p5-BZ-Client/Makefile
+++ b/devel/p5-BZ-Client/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Client for the Bugzilla web services API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601
+TEST_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Benchmark-Timer/Makefile b/devel/p5-Benchmark-Timer/Makefile
index 6c3d4031bc2c..85329b6e6833 100644
--- a/devel/p5-Benchmark-Timer/Makefile
+++ b/devel/p5-Benchmark-Timer/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Code benchmarking tool
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Module-Install>0:devel/p5-Module-Install \
+		p5-URI>=0:net/p5-URI
 
 OPTIONS_DEFINE=	SAMPLE
 OPTIONS_DEFAULT=	SAMPLE
 SAMPLE_DESC=	Statistical Sampling Support
-SAMPLE_BUILD_DEPENDS=	p5-Statistics-TTest>1:${PORTSDIR}/math/p5-Statistics-TTest
+SAMPLE_BUILD_DEPENDS=	p5-Statistics-TTest>1:math/p5-Statistics-TTest
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Best/Makefile b/devel/p5-Best/Makefile
index 9a59bc6ef829..2d48e0fd1281 100644
--- a/devel/p5-Best/Makefile
+++ b/devel/p5-Best/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Fallbackable module loader
 
-BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Bread-Board-Declare/Makefile b/devel/p5-Bread-Board-Declare/Makefile
index 00e84cb4db87..cae34bd00971 100644
--- a/devel/p5-Bread-Board-Declare/Makefile
+++ b/devel/p5-Bread-Board-Declare/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Create Bread::Board containers as normal Moose objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Bread-Board>=0.22:${PORTSDIR}/devel/p5-Bread-Board \
-		p5-Class-Load>=0.07:${PORTSDIR}/devel/p5-Class-Load \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moose>=2.0200:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Bread-Board>=0.22:devel/p5-Bread-Board \
+		p5-Class-Load>=0.07:devel/p5-Class-Load \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Moose>=2.0200:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Bread-Board/Makefile b/devel/p5-Bread-Board/Makefile
index 9cc049963a42..49a08caf93eb 100644
--- a/devel/p5-Bread-Board/Makefile
+++ b/devel/p5-Bread-Board/Makefile
@@ -15,16 +15,16 @@ COMMENT=	Solderless way to wire up your application components
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=2.1200:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.05:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-MooseX-Params-Validate>=0.14:${PORTSDIR}/devel/p5-MooseX-Params-Validate \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=2.1200:devel/p5-Moose \
+		p5-MooseX-Clone>=0.05:devel/p5-MooseX-Clone \
+		p5-MooseX-Params-Validate>=0.14:devel/p5-MooseX-Params-Validate \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Form-Sensible>=0:${PORTSDIR}/devel/p5-Form-Sensible \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Form-Sensible>=0:devel/p5-Form-Sensible \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index 8a4c99a22a4f..08e43bcabe76 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to scan C language files for easily recognized constructs
 
-BUILD_DEPENDS=	p5-Data-Flow>=0:${PORTSDIR}/devel/p5-Data-Flow
+BUILD_DEPENDS=	p5-Data-Flow>=0:devel/p5-Data-Flow
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CBOR-XS/Makefile b/devel/p5-CBOR-XS/Makefile
index 489bca7ac64c..d306a3fa6a06 100644
--- a/devel/p5-CBOR-XS/Makefile
+++ b/devel/p5-CBOR-XS/Makefile
@@ -17,8 +17,8 @@ LICENSE=	GPLv3
 USES=		perl5
 USE_PERL5=	configure
 
-BUILD_DEPENDS=	p5-Types-Serialiser>=0:${PORTSDIR}/devel/p5-Types-Serialiser \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
+		p5-common-sense>=0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 post-stage:
diff --git a/devel/p5-CHI-Driver-DBI/Makefile b/devel/p5-CHI-Driver-DBI/Makefile
index 915f94e43f65..77b2f8e79358 100644
--- a/devel/p5-CHI-Driver-DBI/Makefile
+++ b/devel/p5-CHI-Driver-DBI/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jeremybbaggs@gmail.com
 COMMENT=	Use DBI for CHI unified cache interface storage
 
-BUILD_DEPENDS=	p5-CHI>=0.241:${PORTSDIR}/devel/p5-CHI \
-		p5-DBI>=1.26:${PORTSDIR}/databases/p5-DBI \
-		p5-Moose>=0.66:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-CHI>=0.241:devel/p5-CHI \
+		p5-DBI>=1.26:databases/p5-DBI \
+		p5-Moose>=0.66:devel/p5-Moose \
+		p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CHI/Makefile b/devel/p5-CHI/Makefile
index 08177f5850ef..21442c3cf2fd 100644
--- a/devel/p5-CHI/Makefile
+++ b/devel/p5-CHI/Makefile
@@ -14,26 +14,26 @@ COMMENT=	Perl extension for unified cache interface
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
-	p5-Carp-Assert>=0.20:${PORTSDIR}/devel/p5-Carp-Assert \
-	p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \
-	p5-Digest-JHash>0:${PORTSDIR}/security/p5-Digest-JHash \
-	p5-Hash-MoreUtils>0:${PORTSDIR}/devel/p5-Hash-MoreUtils \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-	p5-List-MoreUtils>=0.13:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Log-Any>=0.08:${PORTSDIR}/devel/p5-Log-Any \
-	p5-Moo>=1.003:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-Types-MooseLike>=0.23:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-	p5-MooX-Types-MooseLike-Numeric>0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike-Numeric \
-	p5-String-RewritePrefix>0:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-	p5-Task-Weaken>0:${PORTSDIR}/devel/p5-Task-Weaken \
-	p5-Time-Duration>=1.06:${PORTSDIR}/devel/p5-Time-Duration \
-	p5-Time-Duration-Parse>=0.03:${PORTSDIR}/devel/p5-Time-Duration-Parse \
-	p5-Try-Tiny>=0.05:${PORTSDIR}/lang/p5-Try-Tiny
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+	p5-Carp-Assert>=0.20:devel/p5-Carp-Assert \
+	p5-Data-UUID>0:devel/p5-Data-UUID \
+	p5-Digest-JHash>0:security/p5-Digest-JHash \
+	p5-Hash-MoreUtils>0:devel/p5-Hash-MoreUtils \
+	p5-JSON>0:converters/p5-JSON \
+	p5-List-MoreUtils>=0.13:lang/p5-List-MoreUtils \
+	p5-Log-Any>=0.08:devel/p5-Log-Any \
+	p5-Moo>=1.003:devel/p5-Moo \
+	p5-MooX-Types-MooseLike>=0.23:devel/p5-MooX-Types-MooseLike \
+	p5-MooX-Types-MooseLike-Numeric>0:devel/p5-MooX-Types-MooseLike-Numeric \
+	p5-String-RewritePrefix>0:textproc/p5-String-RewritePrefix \
+	p5-Task-Weaken>0:devel/p5-Task-Weaken \
+	p5-Time-Duration>=1.06:devel/p5-Time-Duration \
+	p5-Time-Duration-Parse>=0.03:devel/p5-Time-Duration-Parse \
+	p5-Try-Tiny>=0.05:lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-TimeDate>=0:devel/p5-TimeDate
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Changes/Makefile b/devel/p5-CPAN-Changes/Makefile
index 451daa2d2b45..e944d225b419 100644
--- a/devel/p5-CPAN-Changes/Makefile
+++ b/devel/p5-CPAN-Changes/Makefile
@@ -20,8 +20,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-version>=0.99.06:${PORTSDIR}/devel/p5-version
-RUN_DEPENDS+=	p5-version>=0.99.06:${PORTSDIR}/devel/p5-version
+BUILD_DEPENDS+=	p5-version>=0.99.06:devel/p5-version
+RUN_DEPENDS+=	p5-version>=0.99.06:devel/p5-version
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-CPAN-Checksums/Makefile b/devel/p5-CPAN-Checksums/Makefile
index 1df938baaa1c..cc2fbd624893 100644
--- a/devel/p5-CPAN-Checksums/Makefile
+++ b/devel/p5-CPAN-Checksums/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to write a CHECKSUMS file for a directory as on CPAN
 
-BUILD_DEPENDS=	p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-Module-Signature>=0:${PORTSDIR}/security/p5-Module-Signature
-RUN_DEPENDS=	p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-Module-Signature>=0:${PORTSDIR}/security/p5-Module-Signature
-TEST_DEPENDS=	p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2
+BUILD_DEPENDS=	p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-Module-Signature>=0:security/p5-Module-Signature
+RUN_DEPENDS=	p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-Module-Signature>=0:security/p5-Module-Signature
+TEST_DEPENDS=	p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Inject/Makefile b/devel/p5-CPAN-Inject/Makefile
index 323662a300db..373c09e6255c 100644
--- a/devel/p5-CPAN-Inject/Makefile
+++ b/devel/p5-CPAN-Inject/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Base class for injecting distributions into CPAN sources
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-chmod>=0.30:${PORTSDIR}/devel/p5-File-chmod \
-		p5-Params-Util>=0.21:${PORTSDIR}/devel/p5-Params-Util \
-		p5-CPAN-Checksums>=1.05:${PORTSDIR}/devel/p5-CPAN-Checksums
+BUILD_DEPENDS=	p5-File-chmod>=0.30:devel/p5-File-chmod \
+		p5-Params-Util>=0.21:devel/p5-Params-Util \
+		p5-CPAN-Checksums>=1.05:devel/p5-CPAN-Checksums
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Script-Run>=1.02:${PORTSDIR}/devel/p5-Test-Script-Run \
-		p5-File-Remove>=0.34:${PORTSDIR}/devel/p5-File-Remove \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-Test-Script>=1.02:${PORTSDIR}/devel/p5-Test-Script
+TEST_DEPENDS=	p5-Test-Script-Run>=1.02:devel/p5-Test-Script-Run \
+		p5-File-Remove>=0.34:devel/p5-File-Remove \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-Test-Script>=1.02:devel/p5-Test-Script
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Meta-Check/Makefile b/devel/p5-CPAN-Meta-Check/Makefile
index 82631f19b074..8d90f7368876 100644
--- a/devel/p5-CPAN-Meta-Check/Makefile
+++ b/devel/p5-CPAN-Meta-Check/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Verify requirements in a CPAN::Meta object
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Metadata>=1.000023:${PORTSDIR}/devel/p5-Module-Metadata
+BUILD_DEPENDS=	p5-Module-Metadata>=1.000023:devel/p5-Module-Metadata
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
@@ -23,13 +23,13 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements
-RUN_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements
+BUILD_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements
+RUN_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements
 .endif
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-CPAN-Meta>=2.132830:${PORTSDIR}/devel/p5-CPAN-Meta
-RUN_DEPENDS+=	p5-CPAN-Meta>=2.132830:${PORTSDIR}/devel/p5-CPAN-Meta
+BUILD_DEPENDS+=	p5-CPAN-Meta>=2.132830:devel/p5-CPAN-Meta
+RUN_DEPENDS+=	p5-CPAN-Meta>=2.132830:devel/p5-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-CPAN-Meta-Requirements/Makefile b/devel/p5-CPAN-Meta-Requirements/Makefile
index 1f1911414e53..032894ee031c 100644
--- a/devel/p5-CPAN-Meta-Requirements/Makefile
+++ b/devel/p5-CPAN-Meta-Requirements/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-TEST_DEPENDS+=	p5-CPAN-Meta>=2.120900:${PORTSDIR}/devel/p5-CPAN-Meta
+TEST_DEPENDS+=	p5-CPAN-Meta>=2.120900:devel/p5-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-CPAN-Meta/Makefile b/devel/p5-CPAN-Meta/Makefile
index 76281f178269..eb9a96cd1040 100644
--- a/devel/p5-CPAN-Meta/Makefile
+++ b/devel/p5-CPAN-Meta/Makefile
@@ -20,15 +20,15 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-		p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
-RUN_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-		p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
+BUILD_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements \
+		p5-CPAN-Meta-YAML>=0.008:devel/p5-CPAN-Meta-YAML
+RUN_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements \
+		p5-CPAN-Meta-YAML>=0.008:devel/p5-CPAN-Meta-YAML
 .endif
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Parse-CPAN-Meta>=1.44.14:${PORTSDIR}/devel/p5-Parse-CPAN-Meta
-RUN_DEPENDS+=	p5-Parse-CPAN-Meta>=1.44.14:${PORTSDIR}/devel/p5-Parse-CPAN-Meta
+BUILD_DEPENDS+=	p5-Parse-CPAN-Meta>=1.44.14:devel/p5-Parse-CPAN-Meta
+RUN_DEPENDS+=	p5-Parse-CPAN-Meta>=1.44.14:devel/p5-Parse-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-CPAN-Mini/Makefile b/devel/p5-CPAN-Mini/Makefile
index a6f40cc3860a..3db3bb94592b 100644
--- a/devel/p5-CPAN-Mini/Makefile
+++ b/devel/p5-CPAN-Mini/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	CPAN::Mini - create a minimal mirror of CPAN
 
-RUN_DEPENDS=	p5-File-HomeDir>=0.57:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-libwww>=5:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-File-HomeDir>=0.57:devel/p5-File-HomeDir \
+		p5-libwww>=5:www/p5-libwww \
+		p5-URI>=1:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Recent-Uploads/Makefile b/devel/p5-CPAN-Recent-Uploads/Makefile
index 4dad56ee1aad..9b7d6e2c9530 100644
--- a/devel/p5-CPAN-Recent-Uploads/Makefile
+++ b/devel/p5-CPAN-Recent-Uploads/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Find the distributions recently uploaded to CPAN
 
-RUN_DEPENDS=	p5-libwww>=5.835:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1.56:${PORTSDIR}/net/p5-URI \
-		p5-YAML-Syck>=1.15:${PORTSDIR}/textproc/p5-YAML-Syck
+RUN_DEPENDS=	p5-libwww>=5.835:www/p5-libwww \
+		p5-URI>=1.56:net/p5-URI \
+		p5-YAML-Syck>=1.15:textproc/p5-YAML-Syck
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-Reporter-Smoker/Makefile b/devel/p5-CPAN-Reporter-Smoker/Makefile
index 4456c2effd60..d4c61256423e 100644
--- a/devel/p5-CPAN-Reporter-Smoker/Makefile
+++ b/devel/p5-CPAN-Reporter-Smoker/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Turnkey CPAN Testers smoking
 
-BUILD_DEPENDS=	p5-CPAN-Reporter>0:${PORTSDIR}/devel/p5-CPAN-Reporter \
-		p5-Probe-Perl>0:${PORTSDIR}/sysutils/p5-Probe-Perl \
-		p5-Test-Reporter>0:${PORTSDIR}/devel/p5-Test-Reporter \
-		p5-Term-Title>0:${PORTSDIR}/devel/p5-Term-Title
+BUILD_DEPENDS=	p5-CPAN-Reporter>0:devel/p5-CPAN-Reporter \
+		p5-Probe-Perl>0:sysutils/p5-Probe-Perl \
+		p5-Test-Reporter>0:devel/p5-Test-Reporter \
+		p5-Term-Title>0:devel/p5-Term-Title
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-Reporter/Makefile b/devel/p5-CPAN-Reporter/Makefile
index 689a0dc56460..9be5c5b818fa 100644
--- a/devel/p5-CPAN-Reporter/Makefile
+++ b/devel/p5-CPAN-Reporter/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Adds CPAN Testers reporting to CPAN.pm
 
-BUILD_DEPENDS=	p5-Capture-Tiny>0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Config-Tiny>0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Devel-Autoflush>0:${PORTSDIR}/devel/p5-Devel-Autoflush \
-		p5-File-HomeDir>0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-IPC-Cmd>=0.76:${PORTSDIR}/devel/p5-IPC-Cmd \
-		p5-Probe-Perl>0:${PORTSDIR}/sysutils/p5-Probe-Perl \
-		p5-Test-Reporter>1.54:${PORTSDIR}/devel/p5-Test-Reporter
+BUILD_DEPENDS=	p5-Capture-Tiny>0:devel/p5-Capture-Tiny \
+		p5-Config-Tiny>0:devel/p5-Config-Tiny \
+		p5-Devel-Autoflush>0:devel/p5-Devel-Autoflush \
+		p5-File-HomeDir>0:devel/p5-File-HomeDir \
+		p5-IPC-Cmd>=0.76:devel/p5-IPC-Cmd \
+		p5-Probe-Perl>0:sysutils/p5-Probe-Perl \
+		p5-Test-Reporter>1.54:devel/p5-Test-Reporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-SQLite/Makefile b/devel/p5-CPAN-SQLite/Makefile
index f24a06954ff6..322d7a1a6a7c 100644
--- a/devel/p5-CPAN-SQLite/Makefile
+++ b/devel/p5-CPAN-SQLite/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	Search CPAN using a SQLite database
 
-BUILD_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite	\
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-CPAN-DistnameInfo>=0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-		p5-IO-Zlib>=0:${PORTSDIR}/archivers/p5-IO-Zlib \
-		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools
+BUILD_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite	\
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-CPAN-DistnameInfo>=0:devel/p5-CPAN-DistnameInfo \
+		p5-IO-Zlib>=0:archivers/p5-IO-Zlib \
+		p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-libwww>=0:www/p5-libwww \
+		p5-PathTools>=0:devel/p5-PathTools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-Site/Makefile b/devel/p5-CPAN-Site/Makefile
index 3be9c3434fb6..89c0724b9e55 100644
--- a/devel/p5-CPAN-Site/Makefile
+++ b/devel/p5-CPAN-Site/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Extend CPAN with private packages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Tar>=1.00:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-CPAN-Checksums>=0:${PORTSDIR}/devel/p5-CPAN-Checksums \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-IO-Zlib>=0:${PORTSDIR}/archivers/p5-IO-Zlib \
-		p5-Log-Report>=0.25:${PORTSDIR}/devel/p5-Log-Report
-RUN_DEPENDS=	p5-Archive-Tar>=1.00:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-CPAN-Checksums>=0:${PORTSDIR}/devel/p5-CPAN-Checksums \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-IO-Zlib>=0:${PORTSDIR}/archivers/p5-IO-Zlib \
-		p5-Log-Report>=0.25:${PORTSDIR}/devel/p5-Log-Report
+BUILD_DEPENDS=	p5-Archive-Tar>=1.00:archivers/p5-Archive-Tar \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-CPAN-Checksums>=0:devel/p5-CPAN-Checksums \
+		p5-libwww>=0:www/p5-libwww \
+		p5-IO-Zlib>=0:archivers/p5-IO-Zlib \
+		p5-Log-Report>=0.25:devel/p5-Log-Report
+RUN_DEPENDS=	p5-Archive-Tar>=1.00:archivers/p5-Archive-Tar \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-CPAN-Checksums>=0:devel/p5-CPAN-Checksums \
+		p5-libwww>=0:www/p5-libwww \
+		p5-IO-Zlib>=0:archivers/p5-IO-Zlib \
+		p5-Log-Report>=0.25:devel/p5-Log-Report
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Testers-Report/Makefile b/devel/p5-CPAN-Testers-Report/Makefile
index 501d0e1ec79e..97d26aa4d0bc 100644
--- a/devel/p5-CPAN-Testers-Report/Makefile
+++ b/devel/p5-CPAN-Testers-Report/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	CPAN Testers report object
 
-BUILD_DEPENDS=	p5-Metabase-Fact>0:${PORTSDIR}/devel/p5-Metabase-Fact
+BUILD_DEPENDS=	p5-Metabase-Fact>0:devel/p5-Metabase-Fact
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-Uploader/Makefile b/devel/p5-CPAN-Uploader/Makefile
index 45f7880ceb45..0cc4ff4da99e 100644
--- a/devel/p5-CPAN-Uploader/Makefile
+++ b/devel/p5-CPAN-Uploader/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0.084:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-LWP-Protocol-https>=1:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0.084:devel/p5-Getopt-Long-Descriptive \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-LWP-Protocol-https>=1:www/p5-LWP-Protocol-https \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-CPAN-YACSmoke/Makefile b/devel/p5-CPAN-YACSmoke/Makefile
index 301ebd66a6cf..6c38722e1f18 100644
--- a/devel/p5-CPAN-YACSmoke/Makefile
+++ b/devel/p5-CPAN-YACSmoke/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Yet Another CPAN Smoke Tester
 
-RUN_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-File-HomeDir>=0.06:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Regexp-Assemble>=0.06:${PORTSDIR}/devel/p5-Regexp-Assemble \
-		p5-Sort-Versions>=1.5:${PORTSDIR}/devel/p5-Sort-Versions \
-		p5-Test-Reporter>=1.25:${PORTSDIR}/devel/p5-Test-Reporter \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-File-HomeDir>=0.06:devel/p5-File-HomeDir \
+		p5-Regexp-Assemble>=0.06:devel/p5-Regexp-Assemble \
+		p5-Sort-Versions>=1.5:devel/p5-Sort-Versions \
+		p5-Test-Reporter>=1.25:devel/p5-Test-Reporter \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index f72372126bc8..7b6b96fce305 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Ameliorated interface to the CPAN
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Signature>=0:${PORTSDIR}/security/p5-Module-Signature
+BUILD_DEPENDS=	p5-Module-Signature>=0:security/p5-Module-Signature
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	TEST_REPORTER YAML
@@ -27,10 +27,10 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-TEST_REPORTER_BUILD_DEPENDS=	p5-Test-Reporter>=0:${PORTSDIR}/devel/p5-Test-Reporter
-TEST_REPORTER_RUN_DEPENDS=	p5-Test-Reporter>=0:${PORTSDIR}/devel/p5-Test-Reporter
-YAML_BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-YAML_RUN_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_REPORTER_BUILD_DEPENDS=	p5-Test-Reporter>=0:devel/p5-Test-Reporter
+TEST_REPORTER_RUN_DEPENDS=	p5-Test-Reporter>=0:devel/p5-Test-Reporter
+YAML_BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
+YAML_RUN_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
 
 post-patch:
 	@${REINPLACE_CMD} -e '/install_script/d' ${WRKSRC}/Makefile.PL
diff --git a/devel/p5-CPS/Makefile b/devel/p5-CPS/Makefile
index 1874d3a09b05..2282ed88db4b 100644
--- a/devel/p5-CPS/Makefile
+++ b/devel/p5-CPS/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Manage flow of control in Continuation-Passing Style
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>0:${PORTSDIR}/devel/p5-Future
+BUILD_DEPENDS=	p5-Future>0:devel/p5-Future
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Identity>0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Refcount>0:${PORTSDIR}/devel/p5-Test-Refcount \
-		p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Identity>0:devel/p5-Test-Identity \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Refcount>0:devel/p5-Test-Refcount \
+		p5-Test-Fatal>0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Cache-AgainstFile/Makefile b/devel/p5-Cache-AgainstFile/Makefile
index eeeb782a1886..669a993d343d 100644
--- a/devel/p5-Cache-AgainstFile/Makefile
+++ b/devel/p5-Cache-AgainstFile/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Cache data structures parsed from files, watching for updates
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Log-Trace>=0:${PORTSDIR}/devel/p5-Log-Trace
+BUILD_DEPENDS=	p5-Log-Trace>=0:devel/p5-Log-Trace
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Assertions>=0:${PORTSDIR}/devel/p5-Test-Assertions
+TEST_DEPENDS=	p5-Test-Assertions>=0:devel/p5-Test-Assertions
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index dbaf16bf1d34..99314b873e61 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl Cache interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache \
-		p5-Digest-SHA1>=2.02:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Error>=0.15:${PORTSDIR}/lang/p5-Error \
-		p5-IPC-ShareLite>=0.09:${PORTSDIR}/devel/p5-IPC-ShareLite
+BUILD_DEPENDS=	p5-Cache>=0:devel/p5-Cache \
+		p5-Digest-SHA1>=2.02:security/p5-Digest-SHA1 \
+		p5-Error>=0.15:lang/p5-Error \
+		p5-IPC-ShareLite>=0.09:devel/p5-IPC-ShareLite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Cache-LRU/Makefile b/devel/p5-Cache-LRU/Makefile
index b4bd5706262f..765b603197ce 100644
--- a/devel/p5-Cache-LRU/Makefile
+++ b/devel/p5-Cache-LRU/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Simple, fast implementation of an in-memory LRU cache
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Cache-Memcached-Tie/Makefile b/devel/p5-Cache-Memcached-Tie/Makefile
index fc88f2999031..0fb88eb9c2c9 100644
--- a/devel/p5-Cache-Memcached-Tie/Makefile
+++ b/devel/p5-Cache-Memcached-Tie/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use Cache::Memcached::Fast like hash
 
-BUILD_DEPENDS=	p5-Cache-Memcached-Fast>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Fast
+BUILD_DEPENDS=	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile
index 1cdd125aaf52..bf8863df8d8a 100644
--- a/devel/p5-Cache/Makefile
+++ b/devel/p5-Cache/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl Cache interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-NFSLock>=1.2:${PORTSDIR}/devel/p5-File-NFSLock \
-		p5-Heap>=0.01:${PORTSDIR}/devel/p5-Heap \
-		p5-IO-String>=1.02:${PORTSDIR}/devel/p5-IO-String \
-		p5-TimeDate>=2.24:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-File-NFSLock>=1.2:devel/p5-File-NFSLock \
+		p5-Heap>=0.01:devel/p5-Heap \
+		p5-IO-String>=1.02:devel/p5-IO-String \
+		p5-TimeDate>=2.24:devel/p5-TimeDate
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Cairo-GObject/Makefile b/devel/p5-Cairo-GObject/Makefile
index 073f24dce281..91b59bebc470 100644
--- a/devel/p5-Cairo-GObject/Makefile
+++ b/devel/p5-Cairo-GObject/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Integrate Cairo into the Glib type system
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	cairo>=1.10.0:${PORTSDIR}/graphics/cairo \
-		p5-Cairo>=1.080:${PORTSDIR}/graphics/p5-Cairo \
-		p5-ExtUtils-Depends>=0.200:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=1.224:${PORTSDIR}/devel/p5-Glib2
-RUN_DEPENDS=	cairo>=1.10.0:${PORTSDIR}/graphics/cairo \
-		p5-Cairo>=1.080:${PORTSDIR}/graphics/p5-Cairo \
-		p5-Glib2>=1.224:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS=	cairo>=1.10.0:graphics/cairo \
+		p5-Cairo>=1.080:graphics/p5-Cairo \
+		p5-ExtUtils-Depends>=0.200:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=1.224:devel/p5-Glib2
+RUN_DEPENDS=	cairo>=1.10.0:graphics/cairo \
+		p5-Cairo>=1.080:graphics/p5-Cairo \
+		p5-Glib2>=1.224:devel/p5-Glib2
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Callback-Frame/Makefile b/devel/p5-Callback-Frame/Makefile
index a33d2143fa6d..f5c0fe2d36d3 100644
--- a/devel/p5-Callback-Frame/Makefile
+++ b/devel/p5-Callback-Frame/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Preserve error handlers and "local" variables across callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Guard>=0:${PORTSDIR}/devel/p5-Guard
+RUN_DEPENDS=	p5-Guard>=0:devel/p5-Guard
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Capture-Tiny/Makefile b/devel/p5-Capture-Tiny/Makefile
index 575c5f3632c2..549bf5900b2f 100644
--- a/devel/p5-Capture-Tiny/Makefile
+++ b/devel/p5-Capture-Tiny/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Capture STDOUT and STDERR from Perl, XS, or external programs
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Inline>=0.50:${PORTSDIR}/devel/p5-Inline
+TEST_DEPENDS=	p5-Inline>=0.50:devel/p5-Inline
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Carp-Always-Color/Makefile b/devel/p5-Carp-Always-Color/Makefile
index 6d278bfb66e0..6ec9da08e820 100644
--- a/devel/p5-Carp-Always-Color/Makefile
+++ b/devel/p5-Carp-Always-Color/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Carp::Always, but with color
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Always>=0.10:${PORTSDIR}/devel/p5-Carp-Always
+BUILD_DEPENDS=	p5-Carp-Always>=0.10:devel/p5-Carp-Always
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-Pty-Easy>=0:${PORTSDIR}/devel/p5-IO-Pty-Easy
+TEST_DEPENDS=	p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Carp-Always/Makefile b/devel/p5-Carp-Always/Makefile
index 63de11f1bf75..b9029535e0e9 100644
--- a/devel/p5-Carp-Always/Makefile
+++ b/devel/p5-Carp-Always/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension to warn and die noisily with stack backtraces
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Base>0:${PORTSDIR}/devel/p5-Test-Base
+TEST_DEPENDS=	p5-Test-Base>0:devel/p5-Test-Base
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Carp-Assert-More/Makefile b/devel/p5-Carp-Assert-More/Makefile
index 64e949889045..71fea635d050 100644
--- a/devel/p5-Carp-Assert-More/Makefile
+++ b/devel/p5-Carp-Assert-More/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Convenience wrappers around Carp::Assert
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Carp-Assert>=0:${PORTSDIR}/devel/p5-Carp-Assert
+BUILD_DEPENDS=	p5-Carp-Assert>=0:devel/p5-Carp-Assert
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Carp-Assert/Makefile b/devel/p5-Carp-Assert/Makefile
index 2b84b874d791..511db41aaa2d 100644
--- a/devel/p5-Carp-Assert/Makefile
+++ b/devel/p5-Carp-Assert/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Executable comments like the ANSI C library assert.h
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	pod2test:${PORTSDIR}/devel/p5-Pod-Tests
+TEST_DEPENDS=	pod2test:devel/p5-Pod-Tests
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Carp-Clan-Share/Makefile b/devel/p5-Carp-Clan-Share/Makefile
index d96d1d730ac1..678190e7e210 100644
--- a/devel/p5-Carp-Clan-Share/Makefile
+++ b/devel/p5-Carp-Clan-Share/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Share your Carp::Clan settings with your whole Clan
 
-BUILD_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan
+BUILD_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Carp-Clan/Makefile b/devel/p5-Carp-Clan/Makefile
index ee2dea8d1539..19735c2a2ea0 100644
--- a/devel/p5-Carp-Clan/Makefile
+++ b/devel/p5-Carp-Clan/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Report errors from perspective of caller of a "clan" of modules
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index 54d3fc8b8b16..cc9cf2aa9bff 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Debugging And Tracing Ultimate Module
 
-BUILD_DEPENDS=	p5-Log-Agent>=0:${PORTSDIR}/devel/p5-Log-Agent \
-		p5-Getargs-Long>=0:${PORTSDIR}/devel/p5-Getargs-Long
+BUILD_DEPENDS=	p5-Log-Agent>=0:devel/p5-Log-Agent \
+		p5-Getargs-Long>=0:devel/p5-Getargs-Long
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Carp-REPL/Makefile b/devel/p5-Carp-REPL/Makefile
index e3cafaf7b0a7..73d7f8d02784 100644
--- a/devel/p5-Carp-REPL/Makefile
+++ b/devel/p5-Carp-REPL/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read-Eval-Print-Loop on die and/or warn
 
-BUILD_DEPENDS=	devel/p5-Data-Dump-Streamer>=0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		p5-Devel-LexAlias>=0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Devel-REPL>=0:${PORTSDIR}/devel/p5-Devel-REPL \
-		p5-Devel-StackTrace-WithLexicals>0:${PORTSDIR}/devel/p5-Devel-StackTrace-WithLexicals \
-		p5-Lexical-Persistence>0:${PORTSDIR}/devel/p5-Lexical-Persistence \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	devel/p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
+		p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
+		p5-Devel-REPL>=0:devel/p5-Devel-REPL \
+		p5-Devel-StackTrace-WithLexicals>0:devel/p5-Devel-StackTrace-WithLexicals \
+		p5-Lexical-Persistence>0:devel/p5-Lexical-Persistence \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Expect>=0:${PORTSDIR}/devel/p5-Test-Expect
+TEST_DEPENDS=	p5-Test-Expect>=0:devel/p5-Test-Expect
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Cdk/Makefile b/devel/p5-Cdk/Makefile
index 9d169529459f..4d903e5d8e6a 100644
--- a/devel/p5-Cdk/Makefile
+++ b/devel/p5-Cdk/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl5 module for Curses Development Kit
 
 LICENSE=	BSD4CLAUSE
 
-LIB_DEPENDS=	libcdk.so:${PORTSDIR}/devel/cdk
+LIB_DEPENDS=	libcdk.so:devel/cdk
 
 USES=		perl5 tar:tgz
 GNU_CONFIGURE=	yes
diff --git a/devel/p5-Check-ISA/Makefile b/devel/p5-Check-ISA/Makefile
index 9c0fa88887d8..5866af14bdfc 100644
--- a/devel/p5-Check-ISA/Makefile
+++ b/devel/p5-Check-ISA/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DWIM, correct checking of an object's class
 
-RUN_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -21,7 +21,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Chooser/Makefile b/devel/p5-Chooser/Makefile
index ed814cf3eb99..f1a50ade0c98 100644
--- a/devel/p5-Chooser/Makefile
+++ b/devel/p5-Chooser/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Takes a string composed of various tests, arguments, etc and returns a value
 
-RUN_DEPENDS=	p5-Net-CIDR-Lite>=0.21:${PORTSDIR}/net/p5-Net-CIDR-Lite \
-		p5-IO-Socket-SSL>=1.74:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Text-NeatTemplate>=0.10.01:${PORTSDIR}/textproc/p5-Text-NeatTemplate
+RUN_DEPENDS=	p5-Net-CIDR-Lite>=0.21:net/p5-Net-CIDR-Lite \
+		p5-IO-Socket-SSL>=1.74:security/p5-IO-Socket-SSL \
+		p5-Text-NeatTemplate>=0.10.01:textproc/p5-Text-NeatTemplate
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Accessor-Chained/Makefile b/devel/p5-Class-Accessor-Chained/Makefile
index 633d644f7987..7f861f87e9eb 100644
--- a/devel/p5-Class-Accessor-Chained/Makefile
+++ b/devel/p5-Class-Accessor-Chained/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Make chained accessors
 
-RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Accessor-Children/Makefile b/devel/p5-Class-Accessor-Children/Makefile
index 512aa2620ddb..5f233aa3d1c5 100644
--- a/devel/p5-Class-Accessor-Children/Makefile
+++ b/devel/p5-Class-Accessor-Children/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Automated child-class/accessor generation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Class-Accessor-Complex/Makefile b/devel/p5-Class-Accessor-Complex/Makefile
index 19352164d146..19581d52ab3b 100644
--- a/devel/p5-Class-Accessor-Complex/Makefile
+++ b/devel/p5-Class-Accessor-Complex/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Arrays, hashes, booleans, integers, sets, and more
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Accessor-Installer>=0:${PORTSDIR}/devel/p5-Class-Accessor-Installer \
-		p5-Data-Miscellany>=0:${PORTSDIR}/devel/p5-Data-Miscellany \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Accessor-Installer>=0:devel/p5-Class-Accessor-Installer \
+		p5-Data-Miscellany>=0:devel/p5-Data-Miscellany \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Class-Accessor-Constructor/Makefile b/devel/p5-Class-Accessor-Constructor/Makefile
index 3589a043c158..79abe61adaea 100644
--- a/devel/p5-Class-Accessor-Constructor/Makefile
+++ b/devel/p5-Class-Accessor-Constructor/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for constructor generator
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-	p5-Class-Accessor-Complex>0:${PORTSDIR}/devel/p5-Class-Accessor-Complex \
-	p5-Class-Accessor-Installer>=1.100880:${PORTSDIR}/devel/p5-Class-Accessor-Installer \
-	p5-Data-Inherited>0:${PORTSDIR}/devel/p5-Data-Inherited
+	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+	p5-Class-Accessor-Complex>0:devel/p5-Class-Accessor-Complex \
+	p5-Class-Accessor-Installer>=1.100880:devel/p5-Class-Accessor-Installer \
+	p5-Data-Inherited>0:devel/p5-Data-Inherited
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Accessor-Fast-Contained/Makefile b/devel/p5-Class-Accessor-Fast-Contained/Makefile
index 38409ce0b022..53d14f95ab3f 100644
--- a/devel/p5-Class-Accessor-Fast-Contained/Makefile
+++ b/devel/p5-Class-Accessor-Fast-Contained/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fast accessors with data containment
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Accessor-Fast-XS/Makefile b/devel/p5-Class-Accessor-Fast-XS/Makefile
index 8013c3966093..4d336ed90581 100644
--- a/devel/p5-Class-Accessor-Fast-XS/Makefile
+++ b/devel/p5-Class-Accessor-Fast-XS/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS replacement for Class::Accessor::Fast
 
-BUILD_DEPENDS=	p5-AutoXS-Header>=0.03:${PORTSDIR}/devel/p5-AutoXS-Header \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-AutoXS-Header>=0.03:devel/p5-AutoXS-Header \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Class-Accessor>0:devel/p5-Class-Accessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Accessor-Grouped/Makefile b/devel/p5-Class-Accessor-Grouped/Makefile
index 1772bee551f7..8520a80e123f 100644
--- a/devel/p5-Class-Accessor-Grouped/Makefile
+++ b/devel/p5-Class-Accessor-Grouped/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Lets you build groups of accessors
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Class-XSAccessor>=1.19:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Sub-Name>=0.05:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS=	p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Class-XSAccessor>=1.19:devel/p5-Class-XSAccessor \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Sub-Name>=0.05:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.31:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Accessor-Installer/Makefile b/devel/p5-Class-Accessor-Installer/Makefile
index eaa81f3ba0c8..819edea23358 100644
--- a/devel/p5-Class-Accessor-Installer/Makefile
+++ b/devel/p5-Class-Accessor-Installer/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Install an accessor subroutine
 
-BUILD_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Accessor-Lvalue/Makefile b/devel/p5-Class-Accessor-Lvalue/Makefile
index c318729e1a96..8d093faf6248 100644
--- a/devel/p5-Class-Accessor-Lvalue/Makefile
+++ b/devel/p5-Class-Accessor-Lvalue/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Create Lvalue accessors
 
-BUILD_DEPENDS=	p5-Want>=0:${PORTSDIR}/devel/p5-Want \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Want>=0:devel/p5-Want \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Accessor-Named/Makefile b/devel/p5-Class-Accessor-Named/Makefile
index 3f1212f37364..7d7d345613b3 100644
--- a/devel/p5-Class-Accessor-Named/Makefile
+++ b/devel/p5-Class-Accessor-Named/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Better profiling output for Class::Accessor
 
-RUN_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Hook-LexWrap>=0:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+RUN_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-AlzaboWrapper/Makefile b/devel/p5-Class-AlzaboWrapper/Makefile
index 38052b531560..32d12709b014 100644
--- a/devel/p5-Class-AlzaboWrapper/Makefile
+++ b/devel/p5-Class-AlzaboWrapper/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Higher level wrapper around Alzabo Row and Table objects
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Alzabo>=0:${PORTSDIR}/devel/p5-Alzabo
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Alzabo>=0:devel/p5-Alzabo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-AutoClass/Makefile b/devel/p5-Class-AutoClass/Makefile
index f35fce6a9b4b..d0c79b7cd1db 100644
--- a/devel/p5-Class-AutoClass/Makefile
+++ b/devel/p5-Class-AutoClass/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Create get and set methods and simplify object initialization
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Hash-AutoHash>=1.17:${PORTSDIR}/devel/p5-Hash-AutoHash \
-		p5-Hash-AutoHash-Args>=1.18:${PORTSDIR}/devel/p5-Hash-AutoHash-Args
+BUILD_DEPENDS=	p5-Hash-AutoHash>=1.17:devel/p5-Hash-AutoHash \
+		p5-Hash-AutoHash-Args>=1.18:devel/p5-Hash-AutoHash-Args
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=2.1:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Test-Deep>=0.110:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Pod>=1.48:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-IO-stringy>=2.1:devel/p5-IO-stringy \
+		p5-Test-Deep>=0.110:devel/p5-Test-Deep \
+		p5-Test-Pod>=1.48:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index 5b749e2672b5..dba61c533087 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Defer loading of one or more classes
 
-BUILD_DEPENDS=	p5-prefork>=0:${PORTSDIR}/devel/p5-prefork
-RUN_DEPENDS=	p5-prefork>=0:${PORTSDIR}/devel/p5-prefork
+BUILD_DEPENDS=	p5-prefork>=0:devel/p5-prefork
+RUN_DEPENDS=	p5-prefork>=0:devel/p5-prefork
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-C3-Adopt-NEXT/Makefile b/devel/p5-Class-C3-Adopt-NEXT/Makefile
index 66684e0c3e70..2719db5abe69 100644
--- a/devel/p5-Class-C3-Adopt-NEXT/Makefile
+++ b/devel/p5-Class-C3-Adopt-NEXT/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Make NEXT suck less
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+RUN_DEPENDS=	p5-MRO-Compat>=0:devel/p5-MRO-Compat
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.27:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.27:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -23,8 +23,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Class-C3-Componentised/Makefile b/devel/p5-Class-C3-Componentised/Makefile
index 4e58a9b00ca5..d3dedd917e67 100644
--- a/devel/p5-Class-C3-Componentised/Makefile
+++ b/devel/p5-Class-C3-Componentised/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Load mix-ins or components to your C3-based class
 
-RUN_DEPENDS=	p5-Class-C3>=0.20:${PORTSDIR}/devel/p5-Class-C3 \
-		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+RUN_DEPENDS=	p5-Class-C3>=0.20:devel/p5-Class-C3 \
+		p5-MRO-Compat>0:devel/p5-MRO-Compat \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-C3/Makefile b/devel/p5-Class-C3/Makefile
index 0fefb8ba5094..0589052b86a9 100644
--- a/devel/p5-Class-C3/Makefile
+++ b/devel/p5-Class-C3/Makefile
@@ -18,9 +18,9 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-XS_BUILD_DEPENDS=	p5-Class-C3-XS>=0.13:${PORTSDIR}/devel/p5-Class-C3-XS
-XS_RUN_DEPENDS=		p5-Class-C3-XS>=0.13:${PORTSDIR}/devel/p5-Class-C3-XS
-XS_BUILD_DEPENDS_OFF=	p5-Algorithm-C3>=0.07:${PORTSDIR}/devel/p5-Algorithm-C3
-XS_RUN_DEPENDS_OFF=	p5-Algorithm-C3>=0.07:${PORTSDIR}/devel/p5-Algorithm-C3
+XS_BUILD_DEPENDS=	p5-Class-C3-XS>=0.13:devel/p5-Class-C3-XS
+XS_RUN_DEPENDS=		p5-Class-C3-XS>=0.13:devel/p5-Class-C3-XS
+XS_BUILD_DEPENDS_OFF=	p5-Algorithm-C3>=0.07:devel/p5-Algorithm-C3
+XS_RUN_DEPENDS_OFF=	p5-Algorithm-C3>=0.07:devel/p5-Algorithm-C3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Class-Closure/Makefile b/devel/p5-Class-Closure/Makefile
index 0fe0d5587538..8e0967744c7c 100644
--- a/devel/p5-Class-Closure/Makefile
+++ b/devel/p5-Class-Closure/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Encapsulated, declarative classes in Perl
 
-BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Devel-Caller>=0:${PORTSDIR}/devel/p5-Devel-Caller \
-		p5-Sentinel>=0:${PORTSDIR}/devel/p5-Sentinel
+BUILD_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Devel-Caller>=0:devel/p5-Devel-Caller \
+		p5-Sentinel>=0:devel/p5-Sentinel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-CodeStyler/Makefile b/devel/p5-Class-CodeStyler/Makefile
index e3cc19735890..379d83f91e8c 100644
--- a/devel/p5-Class-CodeStyler/Makefile
+++ b/devel/p5-Class-CodeStyler/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension for code generation program formatting and execution
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-STL-Containers>=0:${PORTSDIR}/devel/p5-Class-STL-Containers
+BUILD_DEPENDS=	p5-Class-STL-Containers>=0:devel/p5-Class-STL-Containers
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Component/Makefile b/devel/p5-Class-Component/Makefile
index 40fdb5b6a0ea..bb49744d3be1 100644
--- a/devel/p5-Class-Component/Makefile
+++ b/devel/p5-Class-Component/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pluggable component framework
 
-BUILD_DEPENDS=	p5-Carp-Clan>0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Inspector>0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Carp-Clan>0:devel/p5-Carp-Clan \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Inspector>0:devel/p5-Class-Inspector \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Container/Makefile b/devel/p5-Class-Container/Makefile
index fbe515bc3316..2c6886b67f4e 100644
--- a/devel/p5-Class-Container/Makefile
+++ b/devel/p5-Class-Container/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Glues object frameworks together transparently
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Data-ConfigHash/Makefile b/devel/p5-Class-Data-ConfigHash/Makefile
index f220347a5816..474603dcb26f 100644
--- a/devel/p5-Class-Data-ConfigHash/Makefile
+++ b/devel/p5-Class-Data-ConfigHash/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Add Catalyst-Style Config To Your Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
-RUN_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
+RUN_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Declare/Makefile b/devel/p5-Class-Declare/Makefile
index ed8e0cec8e5d..694393830b02 100644
--- a/devel/p5-Class-Declare/Makefile
+++ b/devel/p5-Class-Declare/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	simarg@gmail.com
 COMMENT=	Perl module for declare classes
 
-TEST_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.15:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Class-Default/Makefile b/devel/p5-Class-Default/Makefile
index 68c08a5fab83..a860563eb194 100644
--- a/devel/p5-Class-Default/Makefile
+++ b/devel/p5-Class-Default/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Static calls apply to a default instantiation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS=	p5-Class-Inspector>=0:devel/p5-Class-Inspector
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Generate/Makefile b/devel/p5-Class-Generate/Makefile
index a0e143553987..73e08ae315fb 100644
--- a/devel/p5-Class-Generate/Makefile
+++ b/devel/p5-Class-Generate/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simplify the creation of class hierarchies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Text-Soundex>=0:${PORTSDIR}/textproc/p5-Text-Soundex
+TEST_DEPENDS=	p5-Text-Soundex>=0:textproc/p5-Text-Soundex
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Class-Handle/Makefile b/devel/p5-Class-Handle/Makefile
index fc34fe22be67..76ce3fb68cfe 100644
--- a/devel/p5-Class-Handle/Makefile
+++ b/devel/p5-Class-Handle/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Create objects that are handles to classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS=	p5-Class-ISA>=0:devel/p5-Class-ISA \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-InsideOut/Makefile b/devel/p5-Class-InsideOut/Makefile
index 1283314298cf..6fe2e1fe24cc 100644
--- a/devel/p5-Class-InsideOut/Makefile
+++ b/devel/p5-Class-InsideOut/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Safe, simple inside-out object construction kit
 
-BUILD_DEPENDS=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+BUILD_DEPENDS=	p5-Class-ISA>=0:devel/p5-Class-ISA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:1.0301
diff --git a/devel/p5-Class-Load-XS/Makefile b/devel/p5-Class-Load-XS/Makefile
index feabf253bdb5..32634f8c7ada 100644
--- a/devel/p5-Class-Load-XS/Makefile
+++ b/devel/p5-Class-Load-XS/Makefile
@@ -13,12 +13,12 @@ COMMENT=	XS implementation of parts of Class::Load
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Class-Load>=0.20:${PORTSDIR}/devel/p5-Class-Load
+BUILD_DEPENDS=	p5-Class-Load>=0.20:devel/p5-Class-Load
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Module-Implementation>=0.04:${PORTSDIR}/devel/p5-Module-Implementation \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-Module-Implementation>=0.04:devel/p5-Module-Implementation \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Class-Load/Makefile b/devel/p5-Class-Load/Makefile
index 22177e705523..888874790c47 100644
--- a/devel/p5-Class-Load/Makefile
+++ b/devel/p5-Class-Load/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Working (require Class::Name) and more
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-OptList>0:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Module-Implementation>=0.04:${PORTSDIR}/devel/p5-Module-Implementation \
-		p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Package-Stash>=0.14:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Data-OptList>0:devel/p5-Data-OptList \
+		p5-Module-Implementation>=0.04:devel/p5-Module-Implementation \
+		p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Package-Stash>=0.14:devel/p5-Package-Stash \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
 
 CONFIGURE_ENV=	PERL_MM_FALLBACK_SILENCE_WARNING=omg # hide warn about bad toolchain
 
diff --git a/devel/p5-Class-Measure/Makefile b/devel/p5-Class-Measure/Makefile
index 12099ee1e300..f040f23ab07a 100644
--- a/devel/p5-Class-Measure/Makefile
+++ b/devel/p5-Class-Measure/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Create, compare, and convert units of measurement
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0.982:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Method-Modifiers-Fast/Makefile b/devel/p5-Class-Method-Modifiers-Fast/Makefile
index 8d4d01e78fb5..4b09e6afdd27 100644
--- a/devel/p5-Class-Method-Modifiers-Fast/Makefile
+++ b/devel/p5-Class-Method-Modifiers-Fast/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to provide Moose-like method modifiers
 
 RUN_DEPENDS=	\
-	p5-Data-Util>=0.55:${PORTSDIR}/devel/p5-Data-Util
+	p5-Data-Util>=0.55:devel/p5-Data-Util
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Sub-Uplevel>=0.18:${PORTSDIR}/devel/p5-Sub-Uplevel
+TEST_DEPENDS=	p5-Sub-Uplevel>=0.18:devel/p5-Sub-Uplevel
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Method-Modifiers/Makefile b/devel/p5-Class-Method-Modifiers/Makefile
index 2ffacb227464..6dd4169d14ce 100644
--- a/devel/p5-Class-Method-Modifiers/Makefile
+++ b/devel/p5-Class-Method-Modifiers/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Provides Moose-like method modifiers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Mix/Makefile b/devel/p5-Class-Mix/Makefile
index d21cc1332592..2c900940ed7b 100644
--- a/devel/p5-Class-Mix/Makefile
+++ b/devel/p5-Class-Mix/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for dynamic class mixing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Classify>=0:${PORTSDIR}/devel/p5-Params-Classify
+BUILD_DEPENDS=	p5-Params-Classify>=0:devel/p5-Params-Classify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Class-ObjectTemplate-DB/Makefile b/devel/p5-Class-ObjectTemplate-DB/Makefile
index 2d78591dc487..52d622deda5b 100644
--- a/devel/p5-Class-ObjectTemplate-DB/Makefile
+++ b/devel/p5-Class-ObjectTemplate-DB/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Optimized template builder base class with lookup capability
 
-RUN_DEPENDS=	p5-Class-ObjectTemplate>=0:${PORTSDIR}/devel/p5-Class-ObjectTemplate
+RUN_DEPENDS=	p5-Class-ObjectTemplate>=0:devel/p5-Class-ObjectTemplate
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Observable/Makefile b/devel/p5-Class-Observable/Makefile
index 2f355bbf90ba..08b9b5df3e28 100644
--- a/devel/p5-Class-Observable/Makefile
+++ b/devel/p5-Class-Observable/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hcoyote@ghostar.org
 COMMENT=	Allow other classes and objects to respond to events in yours
 
-BUILD_DEPENDS=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+BUILD_DEPENDS=	p5-Class-ISA>=0:devel/p5-Class-ISA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index dcd7889ddf67..d38d13d0618d 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Return-value object that can be treated as a boolean, array, or object
 
-BUILD_DEPENDS=	p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace
+BUILD_DEPENDS=	p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Roles/Makefile b/devel/p5-Class-Roles/Makefile
index 1b09c10070d9..d9c1aff60a7e 100644
--- a/devel/p5-Class-Roles/Makefile
+++ b/devel/p5-Class-Roles/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Provides a role-based system of OOP (emulates Perl6)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Class-StateMachine/Makefile b/devel/p5-Class-StateMachine/Makefile
index 13c53a0b6230..445c49814a32 100644
--- a/devel/p5-Class-StateMachine/Makefile
+++ b/devel/p5-Class-StateMachine/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Define classes for state machines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MRO-Define>=0.01:${PORTSDIR}/devel/p5-MRO-Define \
-		p5-Package-Stash>=0.29:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sub-Name>=0.05:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS=	p5-MRO-Define>=0.01:devel/p5-MRO-Define \
+		p5-Package-Stash>=0.29:devel/p5-Package-Stash \
+		p5-Sub-Name>=0.05:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Std-Fast/Makefile b/devel/p5-Class-Std-Fast/Makefile
index 9ac095bd1ea5..6aa1baf36921 100644
--- a/devel/p5-Class-Std-Fast/Makefile
+++ b/devel/p5-Class-Std-Fast/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Faster but less secure than Class::Std
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Std>=0.0.9:${PORTSDIR}/devel/p5-Class-Std
+BUILD_DEPENDS=	p5-Class-Std>=0.0.9:devel/p5-Class-Std
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Tangram/Makefile b/devel/p5-Class-Tangram/Makefile
index d7387e981d9b..b6d1983b7d85 100644
--- a/devel/p5-Class-Tangram/Makefile
+++ b/devel/p5-Class-Tangram/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create constructors, accessor, update methods for objects from Tangram
 
-BUILD_DEPENDS=	p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Tangram>=0:${PORTSDIR}/databases/p5-Tangram
+BUILD_DEPENDS=	p5-Set-Object>=0:devel/p5-Set-Object \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Tangram>=0:databases/p5-Tangram
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 15fe3dd10998..56495c3835c1 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl module to transport objects from one system to another
 
-BUILD_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump
-RUN_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump
+BUILD_DEPENDS=	p5-Devel-Symdump>=0:devel/p5-Devel-Symdump
+RUN_DEPENDS=	p5-Devel-Symdump>=0:devel/p5-Devel-Symdump
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Trigger/Makefile b/devel/p5-Class-Trigger/Makefile
index fd935a692543..d0def0555a01 100644
--- a/devel/p5-Class-Trigger/Makefile
+++ b/devel/p5-Class-Trigger/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mixin to add / call inheritable triggers
 
-RUN_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+RUN_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Unload/Makefile b/devel/p5-Class-Unload/Makefile
index 884cc32af56a..9c5b6aa04119 100644
--- a/devel/p5-Class-Unload/Makefile
+++ b/devel/p5-Class-Unload/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl5 module for unloading classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS=	p5-Class-Inspector>=0:devel/p5-Class-Inspector
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Class-Virtual/Makefile b/devel/p5-Class-Virtual/Makefile
index 9ef8a7bc3bad..4525b41728d5 100644
--- a/devel/p5-Class-Virtual/Makefile
+++ b/devel/p5-Class-Virtual/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Base class for virtual base classes in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Assert>=0:${PORTSDIR}/devel/p5-Carp-Assert \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+BUILD_DEPENDS=	p5-Carp-Assert>=0:devel/p5-Carp-Assert \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-ISA>=0:devel/p5-Class-ISA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Workflow/Makefile b/devel/p5-Class-Workflow/Makefile
index 332559e25112..316003099b78 100644
--- a/devel/p5-Class-Workflow/Makefile
+++ b/devel/p5-Class-Workflow/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Lightweight workflow system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-Moose>=0.37:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.04:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-Set-Object>=1.19:${PORTSDIR}/devel/p5-Set-Object \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-Moose>=0.37:devel/p5-Moose \
+		p5-MooseX-Clone>=0.04:devel/p5-MooseX-Clone \
+		p5-Set-Object>=1.19:devel/p5-Set-Object \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Code-Perl/Makefile b/devel/p5-Code-Perl/Makefile
index d18bd52124c0..48aaf7b24d86 100644
--- a/devel/p5-Code-Perl/Makefile
+++ b/devel/p5-Code-Perl/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Produce Perl code from a tree
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker
+BUILD_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CommitBit/Makefile b/devel/p5-CommitBit/Makefile
index f422b8e1b408..ac380f220518 100644
--- a/devel/p5-CommitBit/Makefile
+++ b/devel/p5-CommitBit/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Project administration tool
 
-RUN_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Jifty>=0.60728:${PORTSDIR}/www/p5-Jifty \
-		p5-Text-Password-Pronounceable>=0:${PORTSDIR}/security/p5-Text-Password-Pronounceable
+RUN_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-Jifty>=0.60728:www/p5-Jifty \
+		p5-Text-Password-Pronounceable>=0:security/p5-Text-Password-Pronounceable
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Compiler-Lexer/Makefile b/devel/p5-Compiler-Lexer/Makefile
index b010909e9278..2c1da2d4efc7 100644
--- a/devel/p5-Compiler-Lexer/Makefile
+++ b/devel/p5-Compiler-Lexer/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for lexical analyzer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Build-XSUtil>0:${PORTSDIR}/devel/p5-Module-Build-XSUtil
+BUILD_DEPENDS=	p5-Module-Build-XSUtil>0:devel/p5-Module-Build-XSUtil
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Config-ApacheFormat/Makefile b/devel/p5-Config-ApacheFormat/Makefile
index d1a453b6d845..153e433b828e 100644
--- a/devel/p5-Config-ApacheFormat/Makefile
+++ b/devel/p5-Config-ApacheFormat/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Parse a configuration file in the same syntax as the Apache web server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker
+BUILD_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Auto/Makefile b/devel/p5-Config-Auto/Makefile
index b64ea7b871c5..b0656ac32650 100644
--- a/devel/p5-Config-Auto/Makefile
+++ b/devel/p5-Config-Auto/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Magical config file parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-YAML>=0.67:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-YAML>=0.67:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+TEST_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String
 
 USES=		perl5
 USE_PERL5=	configure
@@ -26,7 +26,7 @@ USE_PERL5=	configure
 OPTIONS_DEFINE=	XMLSIMPLE
 XMLSIMPLE_DESC=	Support for XML config files
 
-XMLSIMPLE_BUILD_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
-XMLSIMPLE_RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+XMLSIMPLE_BUILD_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple
+XMLSIMPLE_RUN_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Config-AutoConf/Makefile b/devel/p5-Config-AutoConf/Makefile
index af1f33f12d74..75414f8f85ac 100644
--- a/devel/p5-Config-AutoConf/Makefile
+++ b/devel/p5-Config-AutoConf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module to implement some of AutoConf macros
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+BUILD_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-GitLike/Makefile b/devel/p5-Config-GitLike/Makefile
index 652d06d9bb9a..4635c1b8d2c3 100644
--- a/devel/p5-Config-GitLike/Makefile
+++ b/devel/p5-Config-GitLike/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Simple git-compatible config file parser for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	devel/p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		devel/p5-MooX-Types-MooseLike>=0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike
+BUILD_DEPENDS=	devel/p5-Moo>=0:devel/p5-Moo \
+		devel/p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS+=	devel/p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS+=	devel/p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-INI-Reader-Ordered/Makefile b/devel/p5-Config-INI-Reader-Ordered/Makefile
index 4dc4a3dc2bfc..53cc5c1f6504 100644
--- a/devel/p5-Config-INI-Reader-Ordered/Makefile
+++ b/devel/p5-Config-INI-Reader-Ordered/Makefile
@@ -14,10 +14,10 @@ COMMENT=	INI-file parser that returns sections in order
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-INI>=0:${PORTSDIR}/devel/p5-Config-INI
+BUILD_DEPENDS=	p5-Config-INI>=0:devel/p5-Config-INI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-INI/Makefile b/devel/p5-Config-INI/Makefile
index fb318c68f3d7..9c9243c8c875 100644
--- a/devel/p5-Config-INI/Makefile
+++ b/devel/p5-Config-INI/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple .ini files emitter and parser for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mixin-Linewise>=0.100:${PORTSDIR}/devel/p5-Mixin-Linewise
+BUILD_DEPENDS=	p5-Mixin-Linewise>=0.100:devel/p5-Mixin-Linewise
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Identity/Makefile b/devel/p5-Config-Identity/Makefile
index 152d39ef175e..8c8ce10988ad 100644
--- a/devel/p5-Config-Identity/Makefile
+++ b/devel/p5-Config-Identity/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Load (and optionally decrypt via GnuPG) user/pass identity information
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index b948f5e3a17a..28437b4a04f8 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -19,8 +19,8 @@ USE_PERL5=	modbuild
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Config-IniHash/Makefile b/devel/p5-Config-IniHash/Makefile
index a40aedfa8b6a..bfa1da68d259 100644
--- a/devel/p5-Config-IniHash/Makefile
+++ b/devel/p5-Config-IniHash/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for reading and writing INI files
 
-RUN_DEPENDS=	p5-Hash-Case>=0:${PORTSDIR}/devel/p5-Hash-Case \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Hash-WithDefaults>=0.04:${PORTSDIR}/devel/p5-Hash-WithDefaults
+RUN_DEPENDS=	p5-Hash-Case>=0:devel/p5-Hash-Case \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Hash-WithDefaults>=0.04:devel/p5-Hash-WithDefaults
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 dos2unix
diff --git a/devel/p5-Config-IniRegEx/Makefile b/devel/p5-Config-IniRegEx/Makefile
index 62783f004c62..f0401e9448f6 100644
--- a/devel/p5-Config-IniRegEx/Makefile
+++ b/devel/p5-Config-IniRegEx/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	Ini workaround, regex search for parameters and sections
 
-RUN_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles
+RUN_DEPENDS=	p5-Config-IniFiles>=0:devel/p5-Config-IniFiles
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-JFDI/Makefile b/devel/p5-Config-JFDI/Makefile
index e2ca5d6114be..070e78f00d6b 100644
--- a/devel/p5-Config-JFDI/Makefile
+++ b/devel/p5-Config-JFDI/Makefile
@@ -12,18 +12,18 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst::Plugin::ConfigLoader-style layer over Config::Any
 
-BUILD_DEPENDS=	p5-Carp-Clan-Share>=0:${PORTSDIR}/devel/p5-Carp-Clan-Share \
-		p5-Hash-Merge-Simple>=0:${PORTSDIR}/devel/p5-Hash-Merge-Simple \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Data-Visitor>=0.24:${PORTSDIR}/devel/p5-Data-Visitor
+BUILD_DEPENDS=	p5-Carp-Clan-Share>=0:devel/p5-Carp-Clan-Share \
+		p5-Hash-Merge-Simple>=0:devel/p5-Hash-Merge-Simple \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-Config-General>=0:devel/p5-Config-General \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-Data-Visitor>=0.24:devel/p5-Data-Visitor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-JSON/Makefile b/devel/p5-Config-JSON/Makefile
index ad0804cee9d3..92d5461de4f9 100644
--- a/devel/p5-Config-JSON/Makefile
+++ b/devel/p5-Config-JSON/Makefile
@@ -13,10 +13,10 @@ COMMENT=	JSON based config file system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2.16:${PORTSDIR}/converters/p5-JSON \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo
+BUILD_DEPENDS=	p5-JSON>=2.16:converters/p5-JSON \
+		p5-Moo>=0:devel/p5-Moo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-MVP-Reader-INI/Makefile b/devel/p5-Config-MVP-Reader-INI/Makefile
index ce249f95c103..5cefbd80b309 100644
--- a/devel/p5-Config-MVP-Reader-INI/Makefile
+++ b/devel/p5-Config-MVP-Reader-INI/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Config-INI>=0:${PORTSDIR}/devel/p5-Config-INI \
-		p5-Config-MVP>=2:${PORTSDIR}/devel/p5-Config-MVP
+BUILD_DEPENDS=	p5-Config-INI>=0:devel/p5-Config-INI \
+		p5-Config-MVP>=2:devel/p5-Config-MVP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Config-MVP/Makefile b/devel/p5-Config-MVP/Makefile
index e0e8b124fdc1..a05f0f0baea0 100644
--- a/devel/p5-Config-MVP/Makefile
+++ b/devel/p5-Config-MVP/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Multivalue-property package-oriented configuration
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.17:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0.91:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-OneArgNew>=0:${PORTSDIR}/devel/p5-MooseX-OneArgNew \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Role-HasMessage>=0:${PORTSDIR}/devel/p5-Role-HasMessage \
-		p5-Role-Identifiable>=0:${PORTSDIR}/devel/p5-Role-Identifiable \
-		p5-Throwable>=0:${PORTSDIR}/devel/p5-Throwable \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-Load>=0.17:devel/p5-Class-Load \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=0.91:devel/p5-Moose \
+		p5-MooseX-OneArgNew>=0:devel/p5-MooseX-OneArgNew \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Role-HasMessage>=0:devel/p5-Role-HasMessage \
+		p5-Role-Identifiable>=0:devel/p5-Role-Identifiable \
+		p5-Throwable>=0:devel/p5-Throwable \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-Merge/Makefile b/devel/p5-Config-Merge/Makefile
index 0a81ce217c74..6790c84d1498 100644
--- a/devel/p5-Config-Merge/Makefile
+++ b/devel/p5-Config-Merge/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Load a configuration directory tree in a number of languages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any
+BUILD_DEPENDS=	p5-Config-Any>=0:devel/p5-Config-Any
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index d525443c48cf..3f68fe7dc93b 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -13,31 +13,31 @@ COMMENT=	Model to create configuration validation tool
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Carp-Assert-More>=0:${PORTSDIR}/devel/p5-Carp-Assert-More \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Log-Log4perl>=1.11:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-NativeTraits>=0:${PORTSDIR}/devel/p5-MouseX-NativeTraits \
-		p5-MouseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MouseX-StrictConstructor \
-		p5-Parse-RecDescent>=1.90.0:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM \
-		p5-Term-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-Term-ReadLine-Perl \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-Text-Levenshtein-Damerau>=0:${PORTSDIR}/devel/p5-Text-Levenshtein-Damerau \
-		p5-YAML>=0.30.3:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Log-Log4perl>=1.11:devel/p5-Log-Log4perl \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-NativeTraits>=0:devel/p5-MouseX-NativeTraits \
+		p5-MouseX-StrictConstructor>=0:devel/p5-MouseX-StrictConstructor \
+		p5-Parse-RecDescent>=1.90.0:devel/p5-Parse-RecDescent \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-Pod-POM>=0:textproc/p5-Pod-POM \
+		p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-Text-Levenshtein-Damerau>=0:devel/p5-Text-Levenshtein-Damerau \
+		p5-YAML>=0.30.3:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Config-Model-Tester>=2.046:${PORTSDIR}/devel/p5-Config-Model-Tester \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-File-Contents>=0:${PORTSDIR}/devel/p5-Test-File-Contents \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Config-Model-Tester>=2.046:devel/p5-Config-Model-Tester \
+		p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-File-Contents>=0:devel/p5-Test-File-Contents \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Config-MySQL/Makefile b/devel/p5-Config-MySQL/Makefile
index dd0ae43f4059..a27a1e2c3be1 100644
--- a/devel/p5-Config-MySQL/Makefile
+++ b/devel/p5-Config-MySQL/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to read/write MySQL-style configuration files
 
 RUN_DEPENDS=	\
-	p5-Config-INI>0:${PORTSDIR}/devel/p5-Config-INI
+	p5-Config-INI>0:devel/p5-Config-INI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Objective/Makefile b/devel/p5-Config-Objective/Makefile
index 8bfd5244cd0a..5dcfc8575158 100644
--- a/devel/p5-Config-Objective/Makefile
+++ b/devel/p5-Config-Objective/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pirzyk@FreeBSD.org
 COMMENT=	Configuration data as perl objects
 
-BUILD_DEPENDS=	p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp \
-		p5-ParseLex>=0:${PORTSDIR}/devel/p5-ParseLex
+BUILD_DEPENDS=	p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
+		p5-ParseLex>=0:devel/p5-ParseLex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Record/Makefile b/devel/p5-Config-Record/Makefile
index fbec7e832d23..8e028e347fed 100644
--- a/devel/p5-Config-Record/Makefile
+++ b/devel/p5-Config-Record/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Configuration file access
 
 LICENSE=	GPLv2
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-Setting/Makefile b/devel/p5-Config-Setting/Makefile
index ee051722e59d..0d84f15592b9 100644
--- a/devel/p5-Config-Setting/Makefile
+++ b/devel/p5-Config-Setting/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Class that provides an easy interface to use config files
 
-RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Config-Std/Makefile b/devel/p5-Config-Std/Makefile
index 6c89407cbc88..d8fea1a1fbde 100644
--- a/devel/p5-Config-Std/Makefile
+++ b/devel/p5-Config-Std/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Load and save configuration files in a standard format
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Class-Std>=0:${PORTSDIR}/devel/p5-Class-Std
+RUN_DEPENDS=	p5-Class-Std>=0:devel/p5-Class-Std
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-Validator/Makefile b/devel/p5-Config-Validator/Makefile
index ac0575235f11..669021c943c0 100644
--- a/devel/p5-Config-Validator/Makefile
+++ b/devel/p5-Config-Validator/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Schema based configuration validation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-No-Worries>=1.0:${PORTSDIR}/devel/p5-No-Worries \
-		p5-URI>=1.67:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-No-Worries>=1.0:devel/p5-No-Worries \
+		p5-URI>=1.67:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Versioned/Makefile b/devel/p5-Config-Versioned/Makefile
index 6098bae9acc7..106bd89f4554 100644
--- a/devel/p5-Config-Versioned/Makefile
+++ b/devel/p5-Config-Versioned/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Simple, versioned access to configuration data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Git-PurePerl>=0:${PORTSDIR}/devel/p5-Git-PurePerl
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-Config-Std>=0:devel/p5-Config-Std \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Git-PurePerl>=0:devel/p5-Git-PurePerl
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-Wrest/Makefile b/devel/p5-Config-Wrest/Makefile
index b99d33787405..29f05ee32ba4 100644
--- a/devel/p5-Config-Wrest/Makefile
+++ b/devel/p5-Config-Wrest/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Perl module for reading and writing configuration data
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Any-Template>0:${PORTSDIR}/www/p5-Any-Template \
-		p5-File-Policy>0:${PORTSDIR}/devel/p5-File-Policy \
-		p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace
+BUILD_DEPENDS=	p5-Any-Template>0:www/p5-Any-Template \
+		p5-File-Policy>0:devel/p5-File-Policy \
+		p5-Log-Trace>0:devel/p5-Log-Trace
 RUN_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Assertions>0:${PORTSDIR}/devel/p5-Test-Assertions
+TEST_DEPENDS=	p5-Test-Assertions>0:devel/p5-Test-Assertions
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-YAML/Makefile b/devel/p5-Config-YAML/Makefile
index a79a12ba15c6..8d2e72ec2d39 100644
--- a/devel/p5-Config-YAML/Makefile
+++ b/devel/p5-Config-YAML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Simple configuration automation
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
+RUN_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-ConfigReader-Simple/Makefile b/devel/p5-ConfigReader-Simple/Makefile
index 623a06f08e89..ca6d355dc25d 100644
--- a/devel/p5-ConfigReader-Simple/Makefile
+++ b/devel/p5-ConfigReader-Simple/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Simple configuration file parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Connector/Makefile b/devel/p5-Connector/Makefile
index f94d7fe65f15..5a7bcbd05960 100644
--- a/devel/p5-Connector/Makefile
+++ b/devel/p5-Connector/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Generic connection to a hierarchical-structured data set
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig \
-		p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike \
-		p5-Config-Versioned>=1.01:${PORTSDIR}/devel/p5-Config-Versioned \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Proc-SafeExec>=0:${PORTSDIR}/devel/p5-Proc-SafeExec \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-YAML>=1.06:${PORTSDIR}/textproc/p5-YAML \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	bash:shells/bash \
+		p5-AppConfig>=0:devel/p5-AppConfig \
+		p5-Config-GitLike>=0:devel/p5-Config-GitLike \
+		p5-Config-Versioned>=1.01:devel/p5-Config-Versioned \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Proc-SafeExec>=0:devel/p5-Proc-SafeExec \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+		p5-YAML>=1.06:textproc/p5-YAML \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Const-Fast/Makefile b/devel/p5-Const-Fast/Makefile
index 4d085b40a2c3..88b5067bcd1f 100644
--- a/devel/p5-Const-Fast/Makefile
+++ b/devel/p5-Const-Fast/Makefile
@@ -16,9 +16,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Exporter-Progressive>=0.001007:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
-TEST_DEPENDS=	p5-Test-Exception>=0.29:${PORTSDIR}/devel/p5-Test-Exception
+RUN_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Exporter-Progressive>=0.001007:devel/p5-Sub-Exporter-Progressive
+TEST_DEPENDS=	p5-Test-Exception>=0.29:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Context-Preserve/Makefile b/devel/p5-Context-Preserve/Makefile
index 793f0be972b1..466f0d797c62 100644
--- a/devel/p5-Context-Preserve/Makefile
+++ b/devel/p5-Context-Preserve/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Run code after a subroutine call, preserving the context the subroutine
 
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Contextual-Return/Makefile b/devel/p5-Contextual-Return/Makefile
index 0cd8f81b2049..cf0bd1fdbab5 100644
--- a/devel/p5-Contextual-Return/Makefile
+++ b/devel/p5-Contextual-Return/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create context-sensitive return values
 
-BUILD_DEPENDS=	p5-Want>=0:${PORTSDIR}/devel/p5-Want
-RUN_DEPENDS=	p5-Want>=0:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Want>=0:devel/p5-Want
+RUN_DEPENDS=	p5-Want>=0:devel/p5-Want
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Coro/Makefile b/devel/p5-Coro/Makefile
index 25be8483df1d..3c05773d9f95 100644
--- a/devel/p5-Coro/Makefile
+++ b/devel/p5-Coro/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Coroutine process abstraction for perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=7:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-AnyEvent-AIO>=1.0:${PORTSDIR}/devel/p5-AnyEvent-AIO \
-		p5-EV>=4:${PORTSDIR}/devel/p5-EV \
-		p5-Event>=1.08:${PORTSDIR}/devel/p5-Event \
-		p5-Guard>=0.5:${PORTSDIR}/devel/p5-Guard \
-		p5-IO-AIO>=3.1:${PORTSDIR}/devel/p5-IO-AIO \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-AnyEvent>=7:devel/p5-AnyEvent \
+		p5-AnyEvent-AIO>=1.0:devel/p5-AnyEvent-AIO \
+		p5-EV>=4:devel/p5-EV \
+		p5-Event>=1.08:devel/p5-Event \
+		p5-Guard>=0.5:devel/p5-Guard \
+		p5-IO-AIO>=3.1:devel/p5-IO-AIO \
+		p5-common-sense>=0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-Canary-Stability>=0:${PORTSDIR}/devel/p5-Canary-Stability
+BUILD_DEPENDS+=	p5-Canary-Stability>=0:devel/p5-Canary-Stability
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/p5-Curses-Application/Makefile b/devel/p5-Curses-Application/Makefile
index d3ac07e6aae4..fd0c9c1e6ed3 100644
--- a/devel/p5-Curses-Application/Makefile
+++ b/devel/p5-Curses-Application/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Curses application development framework
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Curses-Forms>=0:${PORTSDIR}/devel/p5-Curses-Forms
+BUILD_DEPENDS=	p5-Curses-Forms>=0:devel/p5-Curses-Forms
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Curses-Forms/Makefile b/devel/p5-Curses-Forms/Makefile
index 2f8384acc8b7..c59514dc891d 100644
--- a/devel/p5-Curses-Forms/Makefile
+++ b/devel/p5-Curses-Forms/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Provide high level APIs for rapid UI design on the console
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Curses-Widgets>=0:${PORTSDIR}/devel/p5-Curses-Widgets
+BUILD_DEPENDS=	p5-Curses-Widgets>=0:devel/p5-Curses-Widgets
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Curses-UI/Makefile b/devel/p5-Curses-UI/Makefile
index 5e3fa8063aaf..a766250e111a 100644
--- a/devel/p5-Curses-UI/Makefile
+++ b/devel/p5-Curses-UI/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Curses based OO user interface framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Curses>=0:devel/p5-Curses \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Curses-Widgets/Makefile b/devel/p5-Curses-Widgets/Makefile
index c41272c5fb56..630eecb147c3 100644
--- a/devel/p5-Curses-Widgets/Makefile
+++ b/devel/p5-Curses-Widgets/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Curses-based widgets and functions
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+BUILD_DEPENDS=	p5-Curses>=0:devel/p5-Curses
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Cvs/Makefile b/devel/p5-Cvs/Makefile
index 6e71d7251632..d627e7af48de 100644
--- a/devel/p5-Cvs/Makefile
+++ b/devel/p5-Cvs/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Cvs - Object oriented interface to the CVS command
 
-RUN_DEPENDS=	p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+RUN_DEPENDS=	p5-IO-Tty>=0:devel/p5-IO-Tty \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Dancer-Debug/Makefile b/devel/p5-Dancer-Debug/Makefile
index d4835cc6de4c..4e4de8390bad 100644
--- a/devel/p5-Dancer-Debug/Makefile
+++ b/devel/p5-Dancer-Debug/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Dancer::Debug - Extend Plack::Middleware::Debug
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Dancer>=0:${PORTSDIR}/www/p5-Dancer \
-		p5-Plack-Middleware-Debug>=0:${PORTSDIR}/www/p5-Plack-Middleware-Debug
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-Dancer>=0:www/p5-Dancer \
+		p5-Plack-Middleware-Debug>=0:www/p5-Plack-Middleware-Debug
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Danga-Socket-Callback/Makefile b/devel/p5-Danga-Socket-Callback/Makefile
index a457260c1b3f..aaeaf2b6c87c 100644
--- a/devel/p5-Danga-Socket-Callback/Makefile
+++ b/devel/p5-Danga-Socket-Callback/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Use Danga::Socket From Callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket
-RUN_DEPENDS=	p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket
+BUILD_DEPENDS=	p5-Danga-Socket>=0:devel/p5-Danga-Socket
+RUN_DEPENDS=	p5-Danga-Socket>=0:devel/p5-Danga-Socket
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Danga-Socket/Makefile b/devel/p5-Danga-Socket/Makefile
index 4f17d14ecb0e..4802c1792d46 100644
--- a/devel/p5-Danga-Socket/Makefile
+++ b/devel/p5-Danga-Socket/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Event loop and event-driven async socket base class
 
-RUN_DEPENDS=	p5-IO-KQueue>=0:${PORTSDIR}/devel/p5-IO-KQueue \
-		p5-Sys-Syscall>=0:${PORTSDIR}/devel/p5-Sys-Syscall
+RUN_DEPENDS=	p5-IO-KQueue>=0:devel/p5-IO-KQueue \
+		p5-Sys-Syscall>=0:devel/p5-Sys-Syscall
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-ACL/Makefile b/devel/p5-Data-ACL/Makefile
index 2309eeb5c26f..9e27285999b5 100644
--- a/devel/p5-Data-ACL/Makefile
+++ b/devel/p5-Data-ACL/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::ACL - Perl extension for simple ACL lists
 
-BUILD_DEPENDS=	p5-Set-NestedGroups>=0:${PORTSDIR}/devel/p5-Set-NestedGroups
+BUILD_DEPENDS=	p5-Set-NestedGroups>=0:devel/p5-Set-NestedGroups
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Average/Makefile b/devel/p5-Data-Average/Makefile
index 73e7520ed6e2..fb98f6c15956 100644
--- a/devel/p5-Data-Average/Makefile
+++ b/devel/p5-Data-Average/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	avk@vl.ru
 COMMENT=	Hold Data Set To Calculate Average
 
-BUILD_DEPENDS=	p5-UNIVERSAL-isa>=0:${PORTSDIR}/devel/p5-UNIVERSAL-isa
-RUN_DEPENDS=	p5-UNIVERSAL-isa>=0:${PORTSDIR}/devel/p5-UNIVERSAL-isa
+BUILD_DEPENDS=	p5-UNIVERSAL-isa>=0:devel/p5-UNIVERSAL-isa
+RUN_DEPENDS=	p5-UNIVERSAL-isa>=0:devel/p5-UNIVERSAL-isa
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Bind/Makefile b/devel/p5-Data-Bind/Makefile
index db55621e536c..2e723c6eed4d 100644
--- a/devel/p5-Data-Bind/Makefile
+++ b/devel/p5-Data-Bind/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to bind and alias variables
 
-BUILD_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor	\
-		p5-Devel-Caller>0:${PORTSDIR}/devel/p5-Devel-Caller \
-		p5-Devel-LexAlias>0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Data-Capture>0:${PORTSDIR}/devel/p5-Data-Capture
+BUILD_DEPENDS=	p5-Class-Accessor>0:devel/p5-Class-Accessor	\
+		p5-Devel-Caller>0:devel/p5-Devel-Caller \
+		p5-Devel-LexAlias>0:devel/p5-Devel-LexAlias \
+		p5-Data-Capture>0:devel/p5-Data-Capture
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-ClearSilver-HDF/Makefile b/devel/p5-Data-ClearSilver-HDF/Makefile
index 7bdf8d6fb7af..fa801e5a9def 100644
--- a/devel/p5-Data-ClearSilver-HDF/Makefile
+++ b/devel/p5-Data-ClearSilver-HDF/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Convert from Perl Data Structure to ClearSilver HDF
 
-BUILD_DEPENDS=	p5-ClearSilver>=0:${PORTSDIR}/www/p5-ClearSilver \
-		p5-Data-Structure-Util>=0:${PORTSDIR}/devel/p5-Data-Structure-Util \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-ClearSilver>=0:www/p5-ClearSilver \
+		p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Clone/Makefile b/devel/p5-Data-Clone/Makefile
index 55d52039f6c9..5cddadf10532 100644
--- a/devel/p5-Data-Clone/Makefile
+++ b/devel/p5-Data-Clone/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Polymorphic data cloning
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Requires>=0.03:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Requires>=0.03:devel/p5-Test-Requires
 
 USE_PERL5=	configure
 USES=		perl5
@@ -23,7 +23,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
+BUILD_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:devel/p5-ExtUtils-ParseXS
 .endif
 
 post-install:
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index d4b0f37727fa..871bc3601249 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0*$//}
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::Compare - compare perl data structures
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Domain/Makefile b/devel/p5-Data-Domain/Makefile
index e5225a9056e5..289403134fc7 100644
--- a/devel/p5-Data-Domain/Makefile
+++ b/devel/p5-Data-Domain/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Data description and validation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Scalar-Does>=0.007:${PORTSDIR}/devel/p5-Scalar-Does \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-experimental>=0:${PORTSDIR}/devel/p5-experimental
+BUILD_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Scalar-Does>=0.007:devel/p5-Scalar-Does \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-experimental>=0:devel/p5-experimental
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Data-Dump-Streamer/Makefile b/devel/p5-Data-Dump-Streamer/Makefile
index 89abe4a1251b..f3e10a2250db 100644
--- a/devel/p5-Data-Dump-Streamer/Makefile
+++ b/devel/p5-Data-Dump-Streamer/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Stream a highly accurate breadth first data dump in Perl code
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-B-Utils>=0.05:${PORTSDIR}/devel/p5-B-Utils \
-		p5-PadWalker>=0.99:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-B-Utils>=0.05:devel/p5-B-Utils \
+		p5-PadWalker>=0.99:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
+TEST_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS
 
 CONFIGURE_ARGS=	DDS
 USES=		perl5
diff --git a/devel/p5-Data-DumpXML/Makefile b/devel/p5-Data-DumpXML/Makefile
index c9329245ad32..1d1f5481f0ea 100644
--- a/devel/p5-Data-DumpXML/Makefile
+++ b/devel/p5-Data-DumpXML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dump arbitrary data structures as XML
 
-RUN_DEPENDS=	p5-Array-RefElem>=0.01:${PORTSDIR}/misc/p5-Array-RefElem \
-		p5-XML-Parser>=2:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-Array-RefElem>=0.01:misc/p5-Array-RefElem \
+		p5-XML-Parser>=2:textproc/p5-XML-Parser
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Dumper-Concise/Makefile b/devel/p5-Data-Dumper-Concise/Makefile
index 68b24b753504..7c2d55c2216f 100644
--- a/devel/p5-Data-Dumper-Concise/Makefile
+++ b/devel/p5-Data-Dumper-Concise/Makefile
@@ -19,8 +19,8 @@ OPTIONS_DEFINE=	ARGNAMES
 OPTIONS_DEFAULT=ARGNAMES
 ARGNAMES_DESC=	Enable DwarnN subroutine
 
-ARGNAMES_BUILD_DEPENDS=	p5-Devel-ArgNames>=0.03:${PORTSDIR}/devel/p5-Devel-ArgNames
-ARGNAMES_RUN_DEPENDS=	p5-Devel-ArgNames>=0.03:${PORTSDIR}/devel/p5-Devel-ArgNames
+ARGNAMES_BUILD_DEPENDS=	p5-Devel-ArgNames>=0.03:devel/p5-Devel-ArgNames
+ARGNAMES_RUN_DEPENDS=	p5-Devel-ArgNames>=0.03:devel/p5-Devel-ArgNames
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Dumper-Perltidy/Makefile b/devel/p5-Data-Dumper-Perltidy/Makefile
index ec137cf62530..dbc4cbdc65a9 100644
--- a/devel/p5-Data-Dumper-Perltidy/Makefile
+++ b/devel/p5-Data-Dumper-Perltidy/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	Stringify and pretty print Perl data structures
 
-RUN_DEPENDS=	perltidy:${PORTSDIR}/devel/p5-Perl-Tidy
+RUN_DEPENDS=	perltidy:devel/p5-Perl-Tidy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-GUID/Makefile b/devel/p5-Data-GUID/Makefile
index 64fa8293aa5f..ce2afbe1333d 100644
--- a/devel/p5-Data-GUID/Makefile
+++ b/devel/p5-Data-GUID/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Generate globally unique identifiers
 
-BUILD_DEPENDS=	p5-Sub-Install>=0.03:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Sub-Exporter>=0.90:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Data-UUID>=1.148:${PORTSDIR}/devel/p5-Data-UUID
+BUILD_DEPENDS=	p5-Sub-Install>=0.03:devel/p5-Sub-Install \
+		p5-Sub-Exporter>=0.90:devel/p5-Sub-Exporter \
+		p5-Data-UUID>=1.148:devel/p5-Data-UUID
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-HexDump-Range/Makefile b/devel/p5-Data-HexDump-Range/Makefile
index 9d5bc7e6dfff..73bdcf75d367 100644
--- a/devel/p5-Data-HexDump-Range/Makefile
+++ b/devel/p5-Data-HexDump-Range/Makefile
@@ -10,13 +10,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gebhart@secnetix.de
 COMMENT=	Hexadecimal Range Dumper with color, bitfields and skip ranges
 
-BUILD_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-Text-Colorizer>=0:${PORTSDIR}/textproc/p5-Text-Colorizer \
-		p5-Term-Bash-Completion-Generator>=0:${PORTSDIR}/shells/p5-Term-Bash-Completion-Generator
+BUILD_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-Text-Colorizer>=0:textproc/p5-Text-Colorizer \
+		p5-Term-Bash-Completion-Generator>=0:shells/p5-Term-Bash-Completion-Generator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Hierarchy/Makefile b/devel/p5-Data-Hierarchy/Makefile
index 9b00966c9c67..98cea72eb514 100644
--- a/devel/p5-Data-Hierarchy/Makefile
+++ b/devel/p5-Data-Hierarchy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Handle data in a hierarchical structure
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-IEEE754/Makefile b/devel/p5-Data-IEEE754/Makefile
index b954f5a88234..0a0bf7a89b43 100644
--- a/devel/p5-Data-IEEE754/Makefile
+++ b/devel/p5-Data-IEEE754/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pack and unpack big-endian IEEE754 floats and doubles
 
 LICENSE=	ART20
 
-TEST_DEPENDS=	p5-Test-Bits>=0:${PORTSDIR}/devel/p5-Test-Bits
+TEST_DEPENDS=	p5-Test-Bits>=0:devel/p5-Test-Bits
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Data-JavaScript-Anon/Makefile b/devel/p5-Data-JavaScript-Anon/Makefile
index 80dbc244b86b..4f1db9dac1f7 100644
--- a/devel/p5-Data-JavaScript-Anon/Makefile
+++ b/devel/p5-Data-JavaScript-Anon/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Dump big dumb Perl structs to anonymous JavaScript structs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Default>=1.51:${PORTSDIR}/devel/p5-Class-Default \
-		p5-Params-Util>=0.01:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Class-Default>=1.51:devel/p5-Class-Default \
+		p5-Params-Util>=0.01:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Localize/Makefile b/devel/p5-Data-Localize/Makefile
index 8308d3a75014..e0448e9127f0 100644
--- a/devel/p5-Data-Localize/Makefile
+++ b/devel/p5-Data-Localize/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl extension for alternate data localization API
 LICENSE=	MIT
 
 RUN_DEPENDS=	\
-	p5-Moo>=1.000008:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-Types-MooseLike>0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-	p5-Log-Minimal>=0.14:${PORTSDIR}/devel/p5-Log-Minimal
+	p5-Moo>=1.000008:devel/p5-Moo \
+	p5-MooX-Types-MooseLike>0:devel/p5-MooX-Types-MooseLike \
+	p5-Log-Minimal>=0.14:devel/p5-Log-Minimal
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=	perl5
diff --git a/devel/p5-Data-MessagePack-Stream/Makefile b/devel/p5-Data-MessagePack-Stream/Makefile
index 9c5b362e5aa6..d7706c35c9d2 100644
--- a/devel/p5-Data-MessagePack-Stream/Makefile
+++ b/devel/p5-Data-MessagePack-Stream/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for yet another messagepack streaming deserializer
 
-BUILD_DEPENDS=	p5-Data-MessagePack>0:${PORTSDIR}/devel/p5-Data-MessagePack
+BUILD_DEPENDS=	p5-Data-MessagePack>0:devel/p5-Data-MessagePack
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-MessagePack/Makefile b/devel/p5-Data-MessagePack/Makefile
index 2849e56a7534..16e7df5006f5 100644
--- a/devel/p5-Data-MessagePack/Makefile
+++ b/devel/p5-Data-MessagePack/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for MessagePack
 
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-LeakTrace>0:${PORTSDIR}/devel/p5-Test-LeakTrace
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-LeakTrace>0:devel/p5-Test-LeakTrace
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Model/Makefile b/devel/p5-Data-Model/Makefile
index 6e234b150230..46655e494a66 100644
--- a/devel/p5-Data-Model/Makefile
+++ b/devel/p5-Data-Model/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for model interface which had more data sources unified
 
 RUN_DEPENDS=	\
-	p5-Class-Trigger>0:${PORTSDIR}/devel/p5-Class-Trigger \
-	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
+	p5-Class-Trigger>0:devel/p5-Class-Trigger \
+	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+	p5-DBI>0:databases/p5-DBI \
+	p5-Params-Validate>0:devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Uplevel>0:${PORTSDIR}/devel/p5-Sub-Uplevel \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+TEST_DEPENDS=	p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Sub-Uplevel>0:devel/p5-Sub-Uplevel \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-URI>=0:net/p5-URI
 
 USES=	perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Data-Munge/Makefile b/devel/p5-Data-Munge/Makefile
index 17edf4467f78..6bfbdbd84ea9 100644
--- a/devel/p5-Data-Munge/Makefile
+++ b/devel/p5-Data-Munge/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Various utility functions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Object/Makefile b/devel/p5-Data-Object/Makefile
index 15925d10a5a3..e99168128c09 100644
--- a/devel/p5-Data-Object/Makefile
+++ b/devel/p5-Data-Object/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Data Type Objects for Perl 5
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moo>=2.000001:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>=1.000005:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-Type-Tiny-Signatures>=0.05:${PORTSDIR}/devel/p5-Type-Tiny-Signatures
+BUILD_DEPENDS=	p5-Moo>=2.000001:devel/p5-Moo \
+		p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
+		p5-Type-Tiny-Signatures>=0.05:devel/p5-Type-Tiny-Signatures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Data-ObjectDriver/Makefile b/devel/p5-Data-ObjectDriver/Makefile
index 31aca66d5c7d..a3672ab1ac62 100644
--- a/devel/p5-Data-ObjectDriver/Makefile
+++ b/devel/p5-Data-ObjectDriver/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Simple, transparent data interface, with caching
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Trigger>=0:${PORTSDIR}/devel/p5-Class-Trigger \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Text-SimpleTable>=0:${PORTSDIR}/textproc/p5-Text-SimpleTable
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Trigger>=0:devel/p5-Class-Trigger \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Text-SimpleTable>=0:textproc/p5-Text-SimpleTable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Data-OptList/Makefile b/devel/p5-Data-OptList/Makefile
index 4f89721cf808..698744ae1e8f 100644
--- a/devel/p5-Data-OptList/Makefile
+++ b/devel/p5-Data-OptList/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Params-Util>=0.14:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Install>=0.92:${PORTSDIR}/devel/p5-Sub-Install
+BUILD_DEPENDS=	p5-Params-Util>=0.14:devel/p5-Params-Util \
+		p5-Sub-Install>=0.92:devel/p5-Sub-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Data-Page-NoTotalEntries/Makefile b/devel/p5-Data-Page-NoTotalEntries/Makefile
index ad347bcad958..dc3f38032860 100644
--- a/devel/p5-Data-Page-NoTotalEntries/Makefile
+++ b/devel/p5-Data-Page-NoTotalEntries/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for paging results without total entries
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-ParseBinary/Makefile b/devel/p5-Data-ParseBinary/Makefile
index 095488695553..56f30b698b27 100644
--- a/devel/p5-Data-ParseBinary/Makefile
+++ b/devel/p5-Data-ParseBinary/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	az@FreeBSD.org
 COMMENT=	Yet Another parser for binary structures
 
-BUILD_DEPENDS=	p5-Math-BigInt>=1.993:${PORTSDIR}/math/p5-Math-BigInt
-TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Math-BigInt>=1.993:math/p5-Math-BigInt
+TEST_DEPENDS=	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Path/Makefile b/devel/p5-Data-Path/Makefile
index b0833c6d61d4..f8e46c7c16c8 100644
--- a/devel/p5-Data-Path/Makefile
+++ b/devel/p5-Data-Path/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	XPath-like access to complex data structures
 
-BUILD_DEPENDS=	p5-Test-MockObject>=1.08:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Test-MockObject>=1.08:devel/p5-Test-MockObject \
+		p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Peek/Makefile b/devel/p5-Data-Peek/Makefile
index 89852db4f180..d6ac8cfe40cf 100644
--- a/devel/p5-Data-Peek/Makefile
+++ b/devel/p5-Data-Peek/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of low-level debug facilities
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Perl/Makefile b/devel/p5-Data-Perl/Makefile
index 10e172808fdb..e113fedebe2e 100644
--- a/devel/p5-Data-Perl/Makefile
+++ b/devel/p5-Data-Perl/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Base classes wrapping fundamental Perl data types
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-strictures>=1:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-strictures>=1:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Printer/Makefile b/devel/p5-Data-Printer/Makefile
index 5741ca3f98c5..4a6ec9843284 100644
--- a/devel/p5-Data-Printer/Makefile
+++ b/devel/p5-Data-Printer/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Colored pretty-print of Perl data structures and objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone-PP>=0:${PORTSDIR}/devel/p5-Clone-PP \
-		p5-File-HomeDir>=0.91:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Package-Stash>=0.30:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally
+BUILD_DEPENDS=	p5-Clone-PP>=0:devel/p5-Clone-PP \
+		p5-File-HomeDir>=0.91:devel/p5-File-HomeDir \
+		p5-Package-Stash>=0.30:devel/p5-Package-Stash \
+		p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-IO-Pty-Easy>=0:${PORTSDIR}/devel/p5-IO-Pty-Easy \
-		p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy \
+		p5-Test-Pod>=1.41:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Rand-Obscure/Makefile b/devel/p5-Data-Rand-Obscure/Makefile
index 81b902c1c9ab..0d4d631639df 100644
--- a/devel/p5-Data-Rand-Obscure/Makefile
+++ b/devel/p5-Data-Rand-Obscure/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl module for generating (fairly) random strings easily
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=6.04:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Object-Tiny>=1.08:${PORTSDIR}/devel/p5-Object-Tiny
-RUN_DEPENDS=	p5-Carp-Clan>=6.04:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Object-Tiny>=1.08:${PORTSDIR}/devel/p5-Object-Tiny
+BUILD_DEPENDS=	p5-Carp-Clan>=6.04:devel/p5-Carp-Clan \
+		p5-Object-Tiny>=1.08:devel/p5-Object-Tiny
+RUN_DEPENDS=	p5-Carp-Clan>=6.04:devel/p5-Carp-Clan \
+		p5-Object-Tiny>=1.08:devel/p5-Object-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Random/Makefile b/devel/p5-Data-Random/Makefile
index 9974d455e6ec..a49ef3f8540f 100644
--- a/devel/p5-Data-Random/Makefile
+++ b/devel/p5-Data-Random/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl module for generating random data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Time-Piece>=1.16:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-YAML-Tiny>=0:${PORTSDIR}/textproc/p5-YAML-Tiny
-RUN_DEPENDS=	p5-Time-Piece>=1.16:${PORTSDIR}/devel/p5-Time-Piece
+BUILD_DEPENDS=	p5-Time-Piece>=1.16:devel/p5-Time-Piece \
+		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny
+RUN_DEPENDS=	p5-Time-Piece>=1.16:devel/p5-Time-Piece
 
 OPTIONS_DEFINE=	GD
 GD_DESC=	Support for rand_image()
@@ -23,7 +23,7 @@ GD_DESC=	Support for rand_image()
 USES=		perl5
 USE_PERL5=	configure
 
-GD_BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
-GD_RUN_DEPENDS=		p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+GD_BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD
+GD_RUN_DEPENDS=		p5-GD>=0:graphics/p5-GD
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Record/Makefile b/devel/p5-Data-Record/Makefile
index 70f273ca7885..838962c26994 100644
--- a/devel/p5-Data-Record/Makefile
+++ b/devel/p5-Data-Record/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Data::Record - "split" on steroids
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Hash-Util-FieldHash-Compat>0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat
-BUILD_DEPENDS=	p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Hash-Util-FieldHash-Compat>0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Scope-Guard>=0.20:${PORTSDIR}/devel/p5-Scope-Guard
+RUN_DEPENDS=	p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Hash-Util-FieldHash-Compat>0:devel/p5-Hash-Util-FieldHash-Compat
+BUILD_DEPENDS=	p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Hash-Util-FieldHash-Compat>0:devel/p5-Hash-Util-FieldHash-Compat
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Scope-Guard>=0.20:devel/p5-Scope-Guard
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Remember/Makefile b/devel/p5-Data-Remember/Makefile
index 39d1d10339e2..67581e0cad6d 100644
--- a/devel/p5-Data-Remember/Makefile
+++ b/devel/p5-Data-Remember/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Remember complex information without giving yourself a headache
 
-BUILD_DEPENDS=	p5-DBM-Deep>0:${PORTSDIR}/databases/p5-DBM-Deep \
-		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-POE>0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-DBM-Deep>0:databases/p5-DBM-Deep \
+		p5-YAML-Syck>0:textproc/p5-YAML-Syck \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+		p5-POE>0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Rmap/Makefile b/devel/p5-Data-Rmap/Makefile
index e02aae849eb6..d9547c482d26 100644
--- a/devel/p5-Data-Rmap/Makefile
+++ b/devel/p5-Data-Rmap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Recursive map, apply a block to a data structure
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Rx/Makefile b/devel/p5-Data-Rx/Makefile
index fb378b86bf80..5518a0954ab0 100644
--- a/devel/p5-Data-Rx/Makefile
+++ b/devel/p5-Data-Rx/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl implementation of Rx schema system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-Number-Tolerant>=0:${PORTSDIR}/devel/p5-Number-Tolerant
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-Number-Tolerant>=0:devel/p5-Number-Tolerant
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-SExpression/Makefile b/devel/p5-Data-SExpression/Makefile
index 0a696f5dde44..9faf711df0bd 100644
--- a/devel/p5-Data-SExpression/Makefile
+++ b/devel/p5-Data-SExpression/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to parse lisp S-expressions into perl data structures
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
+	p5-Class-Accessor>0:devel/p5-Class-Accessor
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Section/Makefile b/devel/p5-Data-Section/Makefile
index 6123567f5fad..6da1ec1f25cd 100644
--- a/devel/p5-Data-Section/Makefile
+++ b/devel/p5-Data-Section/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Read multiple hunks of data out of your DATA section
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Sub-Exporter>=0.979:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Sub-Exporter>=0.979:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Serializable/Makefile b/devel/p5-Data-Serializable/Makefile
index 566ec8432a75..088d8b373278 100644
--- a/devel/p5-Data-Serializable/Makefile
+++ b/devel/p5-Data-Serializable/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Moose role that adds serialization support to any class
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Serializer-Sereal/Makefile b/devel/p5-Data-Serializer-Sereal/Makefile
index 574cfff6d858..1cd4b3cc7b2a 100644
--- a/devel/p5-Data-Serializer-Sereal/Makefile
+++ b/devel/p5-Data-Serializer-Sereal/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Creates bridge between Data::Serializer and Sereal
 
-BUILD_DEPENDS=	p5-Data-Serializer>=0:${PORTSDIR}/devel/p5-Data-Serializer \
-		p5-Sereal-Decoder>=0:${PORTSDIR}/converters/p5-Sereal-Decoder \
-		p5-Sereal-Encoder>=0:${PORTSDIR}/converters/p5-Sereal-Encoder
+BUILD_DEPENDS=	p5-Data-Serializer>=0:devel/p5-Data-Serializer \
+		p5-Sereal-Decoder>=0:converters/p5-Sereal-Decoder \
+		p5-Sereal-Encoder>=0:converters/p5-Sereal-Encoder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Stag/Makefile b/devel/p5-Data-Stag/Makefile
index f5704302124f..d7635498308b 100644
--- a/devel/p5-Data-Stag/Makefile
+++ b/devel/p5-Data-Stag/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Structured Tags datastructures
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+RUN_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Stream-Bulk/Makefile b/devel/p5-Data-Stream-Bulk/Makefile
index 9d4da3319565..16fc076d7531 100644
--- a/devel/p5-Data-Stream-Bulk/Makefile
+++ b/devel/p5-Data-Stream-Bulk/Makefile
@@ -14,13 +14,13 @@ COMMENT=	N at a time iteration API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=0.90:devel/p5-Moose \
+		p5-Path-Class>0:devel/p5-Path-Class \
+		p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Structure-Util/Makefile b/devel/p5-Data-Structure-Util/Makefile
index e1908b3d53b1..f9196a0ab3af 100644
--- a/devel/p5-Data-Structure-Util/Makefile
+++ b/devel/p5-Data-Structure-Util/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl5 module to change the nature of data within a structure
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Data-Throttler-Memcached/Makefile b/devel/p5-Data-Throttler-Memcached/Makefile
index a2d1ce2fda8f..0abc36ed5c38 100644
--- a/devel/p5-Data-Throttler-Memcached/Makefile
+++ b/devel/p5-Data-Throttler-Memcached/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Memcached-Based Data::Throttler
 
-BUILD_DEPENDS=	p5-Cache-Memcached-Managed>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Managed \
-		p5-Data-Throttler>=0:${PORTSDIR}/devel/p5-Data-Throttler \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-Cache-Memcached-Managed>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Managed \
-		p5-Data-Throttler>=0:${PORTSDIR}/devel/p5-Data-Throttler \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Cache-Memcached-Managed>=0:databases/p5-Cache-Memcached-Managed \
+		p5-Data-Throttler>=0:devel/p5-Data-Throttler \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Cache-Memcached-Managed>=0:databases/p5-Cache-Memcached-Managed \
+		p5-Data-Throttler>=0:devel/p5-Data-Throttler \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Throttler/Makefile b/devel/p5-Data-Throttler/Makefile
index 146ae85a7bac..4aeece040fad 100644
--- a/devel/p5-Data-Throttler/Makefile
+++ b/devel/p5-Data-Throttler/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Limit data throughput
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Log4perl>=1:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Set-IntSpan>0:${PORTSDIR}/math/p5-Set-IntSpan \
-		p5-Text-ASCIITable>0:${PORTSDIR}/textproc/p5-Text-ASCIITable \
-		p5-YAML>=0.62:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Log-Log4perl>=1:devel/p5-Log-Log4perl \
+		p5-Set-IntSpan>0:math/p5-Set-IntSpan \
+		p5-Text-ASCIITable>0:textproc/p5-Text-ASCIITable \
+		p5-YAML>=0.62:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Thunk/Makefile b/devel/p5-Data-Thunk/Makefile
index a1e4d4c2969f..9f628db23bbc 100644
--- a/devel/p5-Data-Thunk/Makefile
+++ b/devel/p5-Data-Thunk/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Lazy/deferred evaluation - a sneakier Scalar::Defer
 
-BUILD_DEPENDS=	p5-Check-ISA>=0:${PORTSDIR}/devel/p5-Check-ISA \
-		p5-Data-Swap>=0:${PORTSDIR}/devel/p5-Data-Swap \
-		p5-Devel-Refcount>=0:${PORTSDIR}/devel/p5-Devel-Refcount \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-UNIVERSAL-ref>=0:${PORTSDIR}/devel/p5-UNIVERSAL-ref \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Check-ISA>=0:devel/p5-Check-ISA \
+		p5-Data-Swap>=0:devel/p5-Data-Swap \
+		p5-Devel-Refcount>=0:devel/p5-Devel-Refcount \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-UNIVERSAL-ref>=0:devel/p5-UNIVERSAL-ref \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
index 1395c644cb7c..4510b3032da2 100644
--- a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
+++ b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	GTK renderer for Data::TreeDumper
 
-BUILD_DEPENDS=	p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-Data-TreeDumper/Makefile b/devel/p5-Data-TreeDumper/Makefile
index 6ba9ccb624a6..12616ecc6e3b 100644
--- a/devel/p5-Data-TreeDumper/Makefile
+++ b/devel/p5-Data-TreeDumper/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Dumps a data structure in a tree fashion
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Check-ISA>=0:${PORTSDIR}/devel/p5-Check-ISA \
-		p5-Devel-Size>=0:${PORTSDIR}/devel/p5-Devel-Size \
-		p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
-		p5-Text-Tabs+Wrap>=0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+BUILD_DEPENDS=	p5-Check-ISA>=0:devel/p5-Check-ISA \
+		p5-Devel-Size>=0:devel/p5-Devel-Size \
+		p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally \
+		p5-Term-Size>=0:devel/p5-Term-Size \
+		p5-Text-Tabs+Wrap>=0:textproc/p5-Text-Tabs+Wrap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Data-Util/Makefile b/devel/p5-Data-Util/Makefile
index 6e2279beeccd..34e75209ae8b 100644
--- a/devel/p5-Data-Util/Makefile
+++ b/devel/p5-Data-Util/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-	p5-Hash-Util-FieldHash-Compat>0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat
+	p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+	p5-Hash-Util-FieldHash-Compat>0:devel/p5-Hash-Util-FieldHash-Compat
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Scope-Guard>=0.20:${PORTSDIR}/devel/p5-Scope-Guard
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+	p5-Scope-Guard>=0.20:devel/p5-Scope-Guard
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Validator/Makefile b/devel/p5-Data-Validator/Makefile
index 639103ae575d..22b2038d175e 100644
--- a/devel/p5-Data-Validator/Makefile
+++ b/devel/p5-Data-Validator/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Rule based validator on type constraint system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mouse>=0.93:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.93:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Data-Visitor-Encode/Makefile b/devel/p5-Data-Visitor-Encode/Makefile
index 0b3b411b63f2..83aebffd3a8c 100644
--- a/devel/p5-Data-Visitor-Encode/Makefile
+++ b/devel/p5-Data-Visitor-Encode/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to encode/decode values in a structure
 
 RUN_DEPENDS=	\
-	p5-Data-Visitor>=0.18:${PORTSDIR}/devel/p5-Data-Visitor
+	p5-Data-Visitor>=0.18:devel/p5-Data-Visitor
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Visitor/Makefile b/devel/p5-Data-Visitor/Makefile
index e8e3d00ff357..70adf242f4ae 100644
--- a/devel/p5-Data-Visitor/Makefile
+++ b/devel/p5-Data-Visitor/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Visitor style traversal of Perl data structures
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Moose>=0.89:${PORTSDIR}/devel/p5-Moose \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Tie-ToObject>=0.01:${PORTSDIR}/devel/p5-Tie-ToObject \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Class-Load>=0.06:devel/p5-Class-Load \
+		p5-Moose>=0.89:devel/p5-Moose \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Tie-ToObject>=0.01:devel/p5-Tie-ToObject \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Data-Alias>=0:${PORTSDIR}/devel/p5-Data-Alias \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Data-Alias>=0:devel/p5-Data-Alias \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-Calc-Iterator/Makefile b/devel/p5-Date-Calc-Iterator/Makefile
index 4f5effd2cd43..dab0274975ab 100644
--- a/devel/p5-Date-Calc-Iterator/Makefile
+++ b/devel/p5-Date-Calc-Iterator/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Iterate over a range of dates
 
-BUILD_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+BUILD_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-Calc-XS/Makefile b/devel/p5-Date-Calc-XS/Makefile
index 0240af985e33..f551c4442cbd 100644
--- a/devel/p5-Date-Calc-XS/Makefile
+++ b/devel/p5-Date-Calc-XS/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	XS wrapper and C library plug-in for Date::Calc
 
-BUILD_DEPENDS=	p5-Date-Calc>=6.4:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Bit-Vector>=7.4:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan
+BUILD_DEPENDS=	p5-Date-Calc>=6.4:devel/p5-Date-Calc \
+		p5-Bit-Vector>=7.4:math/p5-Bit-Vector \
+		p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index 4ba1fe547913..d99b2d2d7447 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Gregorian calendar date calculations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Bit-Vector>=7.4:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Carp-Clan>=6.04:${PORTSDIR}/devel/p5-Carp-Clan
+RUN_DEPENDS=	p5-Bit-Vector>=7.4:math/p5-Bit-Vector \
+		p5-Carp-Clan>=6.04:devel/p5-Carp-Clan
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-DayOfWeek/Makefile b/devel/p5-Date-DayOfWeek/Makefile
index 5008b5e93130..dad0fce22663 100644
--- a/devel/p5-Date-DayOfWeek/Makefile
+++ b/devel/p5-Date-DayOfWeek/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Determine the day of the week for any date
 
-BUILD_DEPENDS=	p5-Date-Leapyear>=0:${PORTSDIR}/devel/p5-Date-Leapyear \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Date-Leapyear>=0:devel/p5-Date-Leapyear \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-Extract/Makefile b/devel/p5-Date-Extract/Makefile
index 4dc28288482c..ce315f93259a 100644
--- a/devel/p5-Date-Extract/Makefile
+++ b/devel/p5-Date-Extract/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Extract probable dates from strings
 
-BUILD_DEPENDS=	p5-DateTime-Format-Natural>0:${PORTSDIR}/devel/p5-DateTime-Format-Natural	\
-		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-DateTime-Format-Natural>0:devel/p5-DateTime-Format-Natural	\
+		p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime
+TEST_DEPENDS=	p5-Test-MockTime>=0:devel/p5-Test-MockTime
 
 NO_ARCH=	yes
 
diff --git a/devel/p5-Date-Holidays-DK/Makefile b/devel/p5-Date-Holidays-DK/Makefile
index b8a44e6ba331..bb9b866c1a29 100644
--- a/devel/p5-Date-Holidays-DK/Makefile
+++ b/devel/p5-Date-Holidays-DK/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Determine Danish public holidays
 
-BUILD_DEPENDS=	p5-Date-Simple>=0:${PORTSDIR}/devel/p5-Date-Simple \
-		p5-Date-Easter>=0:${PORTSDIR}/devel/p5-Date-Easter
+BUILD_DEPENDS=	p5-Date-Simple>=0:devel/p5-Date-Simple \
+		p5-Date-Easter>=0:devel/p5-Date-Easter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-ICal/Makefile b/devel/p5-Date-ICal/Makefile
index 1a2d05607bea..2b496d9ea671 100644
--- a/devel/p5-Date-ICal/Makefile
+++ b/devel/p5-Date-ICal/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for ICalendar date objects
 
-BUILD_DEPENDS=	p5-Date-Leapyear>=1.03:${PORTSDIR}/devel/p5-Date-Leapyear
-RUN_DEPENDS=	p5-Date-Leapyear>=1.03:${PORTSDIR}/devel/p5-Date-Leapyear
+BUILD_DEPENDS=	p5-Date-Leapyear>=1.03:devel/p5-Date-Leapyear
+RUN_DEPENDS=	p5-Date-Leapyear>=1.03:devel/p5-Date-Leapyear
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-ISO/Makefile b/devel/p5-Date-ISO/Makefile
index 77526d2b5b7e..193f5a3a6d21 100644
--- a/devel/p5-Date-ISO/Makefile
+++ b/devel/p5-Date-ISO/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Converts dates between ISO and Gregorian formats
 
-BUILD_DEPENDS=	p5-Date-ICal>=1.54:${PORTSDIR}/devel/p5-Date-ICal \
-		p5-Date-Leapyear>=0:${PORTSDIR}/devel/p5-Date-Leapyear
+BUILD_DEPENDS=	p5-Date-ICal>=1.54:devel/p5-Date-ICal \
+		p5-Date-Leapyear>=0:devel/p5-Date-Leapyear
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 6fa29731e03d..46f0288c7d87 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl5 module containing date manipulation routines
 
-TEST_DEPENDS=	p5-Test-Inter>=0:${PORTSDIR}/devel/p5-Test-Inter
+TEST_DEPENDS=	p5-Test-Inter>=0:devel/p5-Test-Inter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-Pcalc/Makefile b/devel/p5-Date-Pcalc/Makefile
index e09edf5d0775..36c71455fe08 100644
--- a/devel/p5-Date-Pcalc/Makefile
+++ b/devel/p5-Date-Pcalc/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Gregorian calendar date calculations
 
-BUILD_DEPENDS=	p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Bit-Vector>=7.0:${PORTSDIR}/math/p5-Bit-Vector
+BUILD_DEPENDS=	p5-Carp-Clan>=5.3:devel/p5-Carp-Clan \
+		p5-Bit-Vector>=7.0:math/p5-Bit-Vector
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-Piece/Makefile b/devel/p5-Date-Piece/Makefile
index af26e4912683..eef2f97d37e9 100644
--- a/devel/p5-Date-Piece/Makefile
+++ b/devel/p5-Date-Piece/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	Date-Piece-v0.0.3
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	Perl5 module containing date manipulation routines
 
-BUILD_DEPENDS=	p5-Date-Simple>=3.03:${PORTSDIR}/devel/p5-Date-Simple
-RUN_DEPENDS=	p5-Date-Simple>=3.03:${PORTSDIR}/devel/p5-Date-Simple
-#TEST_DEPENDS=	p5-Test-Inter>=0:${PORTSDIR}/devel/p5-Test-Inter
+BUILD_DEPENDS=	p5-Date-Simple>=3.03:devel/p5-Date-Simple
+RUN_DEPENDS=	p5-Date-Simple>=3.03:devel/p5-Date-Simple
+#TEST_DEPENDS=	p5-Test-Inter>=0:devel/p5-Test-Inter
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Date-Range/Makefile b/devel/p5-Date-Range/Makefile
index 5dd8f43003b9..4644eef9681b 100644
--- a/devel/p5-Date-Range/Makefile
+++ b/devel/p5-Date-Range/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Date::Range - work with a range of dates
 
-BUILD_DEPENDS=	p5-Date-Simple>=0.03:${PORTSDIR}/devel/p5-Date-Simple
-RUN_DEPENDS=	p5-Date-Simple>=0.03:${PORTSDIR}/devel/p5-Date-Simple
+BUILD_DEPENDS=	p5-Date-Simple>=0.03:devel/p5-Date-Simple
+RUN_DEPENDS=	p5-Date-Simple>=0.03:devel/p5-Date-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-Roman/Makefile b/devel/p5-Date-Roman/Makefile
index 0118629130e1..24f3f2e09135 100644
--- a/devel/p5-Date-Roman/Makefile
+++ b/devel/p5-Date-Roman/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	philip@FreeBSD.org
 COMMENT=	Perl module to play with Roman dates
 
-BUILD_DEPENDS=	p5-Roman>=0:${PORTSDIR}/math/p5-Roman
+BUILD_DEPENDS=	p5-Roman>=0:math/p5-Roman
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Astro/Makefile b/devel/p5-DateTime-Astro/Makefile
index eca62de2bb31..921080c5ee61 100644
--- a/devel/p5-DateTime-Astro/Makefile
+++ b/devel/p5-DateTime-Astro/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Functions For Astromical Calendars
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set
+LIB_DEPENDS=	libmpfr.so:math/mpfr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USE_PERL5=	configure
 USES=		gmake localbase perl5
diff --git a/devel/p5-DateTime-Calendar-Chinese/Makefile b/devel/p5-DateTime-Calendar-Chinese/Makefile
index c003aae963b7..cce5909f352f 100644
--- a/devel/p5-DateTime-Calendar-Chinese/Makefile
+++ b/devel/p5-DateTime-Calendar-Chinese/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Traditional Chinese Calendar Implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime-Event-Chinese>=1.00:${PORTSDIR}/devel/p5-DateTime-Event-Chinese
-RUN_DEPENDS=	p5-DateTime-Event-Chinese>=1.00:${PORTSDIR}/devel/p5-DateTime-Event-Chinese
+BUILD_DEPENDS=	p5-DateTime-Event-Chinese>=1.00:devel/p5-DateTime-Event-Chinese
+RUN_DEPENDS=	p5-DateTime-Event-Chinese>=1.00:devel/p5-DateTime-Event-Chinese
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Calendar-Christian/Makefile b/devel/p5-DateTime-Calendar-Christian/Makefile
index 96e57c539532..8f40186d28bd 100644
--- a/devel/p5-DateTime-Calendar-Christian/Makefile
+++ b/devel/p5-DateTime-Calendar-Christian/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the Christian calendar
 
-BUILD_DEPENDS=	p5-DateTime-Calendar-Julian>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Julian
+BUILD_DEPENDS=	p5-DateTime-Calendar-Julian>=0:devel/p5-DateTime-Calendar-Julian
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-Discordian/Makefile b/devel/p5-DateTime-Calendar-Discordian/Makefile
index ade326b2d31a..8981de9f8c9c 100644
--- a/devel/p5-DateTime-Calendar-Discordian/Makefile
+++ b/devel/p5-DateTime-Calendar-Discordian/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	philip@FreeBSD.org
 COMMENT=	Perl extension for the Discordian Calendar
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Locale>=0:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Locale>=0:devel/p5-DateTime-Locale \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
index d902b6914e97..3634a665a93a 100644
--- a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
+++ b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime>=0.14:${PORTSDIR}/devel/p5-DateTime \
-		p5-Roman>=1.22:${PORTSDIR}/math/p5-Roman
+RUN_DEPENDS=	p5-DateTime>=0.14:devel/p5-DateTime \
+		p5-Roman>=1.22:math/p5-Roman
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Calendar-Hebrew/Makefile b/devel/p5-DateTime-Calendar-Hebrew/Makefile
index a25d35087e48..cad3e8d06278 100644
--- a/devel/p5-DateTime-Calendar-Hebrew/Makefile
+++ b/devel/p5-DateTime-Calendar-Hebrew/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the Hebrew calendar
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Event-Sunrise>=0:${PORTSDIR}/devel/p5-DateTime-Event-Sunrise
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Event-Sunrise>=0:devel/p5-DateTime-Event-Sunrise
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-Japanese/Makefile b/devel/p5-DateTime-Calendar-Japanese/Makefile
index e23c8403ed74..a2d390b62970 100644
--- a/devel/p5-DateTime-Calendar-Japanese/Makefile
+++ b/devel/p5-DateTime-Calendar-Japanese/Makefile
@@ -12,20 +12,20 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	DateTime Extension for Traditional Japanese Calendars
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Util-Calc>=0:${PORTSDIR}/devel/p5-DateTime-Util-Calc \
-		p5-DateTime-Calendar-Chinese>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Chinese \
-		p5-DateTime-Event-Sunrise>=0:${PORTSDIR}/devel/p5-DateTime-Event-Sunrise \
-		ja-p5-DateTime-Calendar-Japanese-Era>=0:${PORTSDIR}/japanese/p5-DateTime-Calendar-Japanese-Era \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Util-Calc>=0:${PORTSDIR}/devel/p5-DateTime-Util-Calc \
-		p5-DateTime-Calendar-Chinese>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Chinese \
-		p5-DateTime-Event-Sunrise>=0:${PORTSDIR}/devel/p5-DateTime-Event-Sunrise \
-		ja-p5-DateTime-Calendar-Japanese-Era>=0:${PORTSDIR}/japanese/p5-DateTime-Calendar-Japanese-Era \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Util-Calc>=0:devel/p5-DateTime-Util-Calc \
+		p5-DateTime-Calendar-Chinese>=0:devel/p5-DateTime-Calendar-Chinese \
+		p5-DateTime-Event-Sunrise>=0:devel/p5-DateTime-Event-Sunrise \
+		ja-p5-DateTime-Calendar-Japanese-Era>=0:japanese/p5-DateTime-Calendar-Japanese-Era \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-YAML>0:textproc/p5-YAML
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Util-Calc>=0:devel/p5-DateTime-Util-Calc \
+		p5-DateTime-Calendar-Chinese>=0:devel/p5-DateTime-Calendar-Chinese \
+		p5-DateTime-Event-Sunrise>=0:devel/p5-DateTime-Event-Sunrise \
+		ja-p5-DateTime-Calendar-Japanese-Era>=0:japanese/p5-DateTime-Calendar-Japanese-Era \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-YAML>0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Calendar-Julian/Makefile b/devel/p5-DateTime-Calendar-Julian/Makefile
index ffa8b3a19169..411cdff0e192 100644
--- a/devel/p5-DateTime-Calendar-Julian/Makefile
+++ b/devel/p5-DateTime-Calendar-Julian/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the Julian calendar
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-Mayan/Makefile b/devel/p5-DateTime-Calendar-Mayan/Makefile
index 8c04858faea6..b478e347933d 100644
--- a/devel/p5-DateTime-Calendar-Mayan/Makefile
+++ b/devel/p5-DateTime-Calendar-Mayan/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mayan Long Count, Haab, and Tzolkin calendars
 
-RUN_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-DateTime>=0:devel/p5-DateTime
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-Pataphysical/Makefile b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
index 2f7d88e99989..b9a364bb745f 100644
--- a/devel/p5-DateTime-Calendar-Pataphysical/Makefile
+++ b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Dates in the pataphysical calendar
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Locale>=0:${PORTSDIR}/devel/p5-DateTime-Locale
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Locale>=0:devel/p5-DateTime-Locale
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime
+TEST_DEPENDS=	p5-Test-MockTime>=0:devel/p5-Test-MockTime
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Event-Chinese/Makefile b/devel/p5-DateTime-Event-Chinese/Makefile
index c39c3642fb19..068b64f844d3 100644
--- a/devel/p5-DateTime-Event-Chinese/Makefile
+++ b/devel/p5-DateTime-Event-Chinese/Makefile
@@ -15,10 +15,10 @@ COMMENT=	DateTime Extension for Calculating Important Chinese Dates
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime-Astro>=0:${PORTSDIR}/devel/p5-DateTime-Astro \
-		p5-Math-Round>=0:${PORTSDIR}/math/p5-Math-Round
-RUN_DEPENDS=	p5-DateTime-Astro>=0:${PORTSDIR}/devel/p5-DateTime-Astro \
-		p5-Math-Round>=0:${PORTSDIR}/math/p5-Math-Round
+BUILD_DEPENDS=	p5-DateTime-Astro>=0:devel/p5-DateTime-Astro \
+		p5-Math-Round>=0:math/p5-Math-Round
+RUN_DEPENDS=	p5-DateTime-Astro>=0:devel/p5-DateTime-Astro \
+		p5-Math-Round>=0:math/p5-Math-Round
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Event-Cron/Makefile b/devel/p5-DateTime-Event-Cron/Makefile
index 9e5ff252e5fb..ad9db17ab837 100644
--- a/devel/p5-DateTime-Event-Cron/Makefile
+++ b/devel/p5-DateTime-Event-Cron/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DateTime extension for generating recurrence sets from crontab
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-Set-Crontab>=0:${PORTSDIR}/devel/p5-Set-Crontab
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-Set-Crontab>=0:devel/p5-Set-Crontab
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-Easter/Makefile b/devel/p5-DateTime-Event-Easter/Makefile
index 5ef9e68a84ba..53f1975b98bd 100644
--- a/devel/p5-DateTime-Event-Easter/Makefile
+++ b/devel/p5-DateTime-Event-Easter/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Returns Easter events for DateTime objects
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Calendar-Julian>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Julian \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Calendar-Julian>=0:devel/p5-DateTime-Calendar-Julian \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-ICal/Makefile b/devel/p5-DateTime-Event-ICal/Makefile
index 583f1924bc0a..aa4307a9b68b 100644
--- a/devel/p5-DateTime-Event-ICal/Makefile
+++ b/devel/p5-DateTime-Event-ICal/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl DateTime extension for computing rfc2445 recurrences
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Event-Recurrence>=0.11:${PORTSDIR}/devel/p5-DateTime-Event-Recurrence
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Event-Recurrence>=0.11:devel/p5-DateTime-Event-Recurrence
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-DateTime-Event-Lunar/Makefile b/devel/p5-DateTime-Event-Lunar/Makefile
index c6aafa538cd9..1bcc448267d6 100644
--- a/devel/p5-DateTime-Event-Lunar/Makefile
+++ b/devel/p5-DateTime-Event-Lunar/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Compute Lunar Events
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-DateTime-Astro>=1.00:${PORTSDIR}/devel/p5-DateTime-Astro \
-		p5-Math-Round>=0:${PORTSDIR}/math/p5-Math-Round
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-DateTime-Astro>=1.00:devel/p5-DateTime-Astro \
+		p5-Math-Round>=0:math/p5-Math-Round
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-NameDay/Makefile b/devel/p5-DateTime-Event-NameDay/Makefile
index e90816fd7e1c..a8279dd06e14 100644
--- a/devel/p5-DateTime-Event-NameDay/Makefile
+++ b/devel/p5-DateTime-Event-NameDay/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl DateTime extension to work with namedays from various countries
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-DateTime-Calendar-Christian>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Christian \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-DateTime-Calendar-Christian>=0:devel/p5-DateTime-Calendar-Christian \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-Random/Makefile b/devel/p5-DateTime-Event-Random/Makefile
index b31e0cb6a7f8..5c080b198cd5 100644
--- a/devel/p5-DateTime-Event-Random/Makefile
+++ b/devel/p5-DateTime-Event-Random/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DateTime extension for creating random datetimes
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-Recurrence/Makefile b/devel/p5-DateTime-Event-Recurrence/Makefile
index 95474fb8870c..3dd977339e88 100644
--- a/devel/p5-DateTime-Event-Recurrence/Makefile
+++ b/devel/p5-DateTime-Event-Recurrence/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl DateTime extension for computing basic recurrences
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.27:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0.36:${PORTSDIR}/devel/p5-DateTime-Set
+BUILD_DEPENDS=	p5-DateTime>=0.27:devel/p5-DateTime \
+		p5-DateTime-Set>=0.36:devel/p5-DateTime-Set
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/devel/p5-DateTime-Event-Sunrise/Makefile b/devel/p5-DateTime-Event-Sunrise/Makefile
index f4b6c73cfbd9..9e0e6556045d 100644
--- a/devel/p5-DateTime-Event-Sunrise/Makefile
+++ b/devel/p5-DateTime-Event-Sunrise/Makefile
@@ -15,10 +15,10 @@ COMMENT=	DateTime Objects for sunrise and sunset for a given day
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.21:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0.16:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Set-Infinite>=0:${PORTSDIR}/devel/p5-Set-Infinite
+BUILD_DEPENDS=	p5-DateTime>=0.21:devel/p5-DateTime \
+		p5-DateTime-Set>=0.16:devel/p5-DateTime-Set \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Set-Infinite>=0:devel/p5-Set-Infinite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-Zodiac/Makefile b/devel/p5-DateTime-Event-Zodiac/Makefile
index 34010befdb73..7aa71b37bdbf 100644
--- a/devel/p5-DateTime-Event-Zodiac/Makefile
+++ b/devel/p5-DateTime-Event-Zodiac/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Return zodiac for a given date
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Astro>=0:${PORTSDIR}/devel/p5-DateTime-Astro
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Astro>=0:devel/p5-DateTime-Astro
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Fiscal-Year/Makefile b/devel/p5-DateTime-Fiscal-Year/Makefile
index 4768a5377322..a6eb096c6db2 100644
--- a/devel/p5-DateTime-Fiscal-Year/Makefile
+++ b/devel/p5-DateTime-Fiscal-Year/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Calculate the day or week of the Fiscal Year with an arbitrary start date
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Baby/Makefile b/devel/p5-DateTime-Format-Baby/Makefile
index ebcf7b7f6c08..4f4bec33044f 100644
--- a/devel/p5-DateTime-Format-Baby/Makefile
+++ b/devel/p5-DateTime-Format-Baby/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DateTime>=0.16:${PORTSDIR}/devel/p5-DateTime \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-DateTime>=0.16:devel/p5-DateTime \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-DateTime-Format-Bork/Makefile b/devel/p5-DateTime-Format-Bork/Makefile
index 014a081e9c7f..5780e010d73d 100644
--- a/devel/p5-DateTime-Format-Bork/Makefile
+++ b/devel/p5-DateTime-Format-Bork/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Formats datetimes for that guy from The Muppet Show
 
-RUN_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+RUN_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile
index 6e23af75087b..f8b84d87e8e8 100644
--- a/devel/p5-DateTime-Format-Builder/Makefile
+++ b/devel/p5-DateTime-Format-Builder/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Create DateTime parser classes and objects
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Factory-Util>=1.6:${PORTSDIR}/devel/p5-Class-Factory-Util \
-		p5-DateTime>=0.12:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Strptime>=1.04:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Params-Validate>=0.72:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-Class-Factory-Util>=1.6:devel/p5-Class-Factory-Util \
+		p5-DateTime>=0.12:devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=1.04:devel/p5-DateTime-Format-Strptime \
+		p5-Params-Validate>=0.72:devel/p5-Params-Validate \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Devel-Cycle>=1.07:${PORTSDIR}/devel/p5-Devel-Cycle \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
+TEST_DEPENDS=	p5-Devel-Cycle>=1.07:devel/p5-Devel-Cycle \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/devel/p5-DateTime-Format-DBI/Makefile b/devel/p5-DateTime-Format-DBI/Makefile
index adc26e4f9b65..2ee3199449bf 100644
--- a/devel/p5-DateTime-Format-DBI/Makefile
+++ b/devel/p5-DateTime-Format-DBI/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Find a parser class for a database connection
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime>=0.1:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DBI>=1.21:databases/p5-DBI \
+		p5-DateTime>=0.1:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Format-DateManip/Makefile b/devel/p5-DateTime-Format-DateManip/Makefile
index 7ada363ba807..2b895b2e9518 100644
--- a/devel/p5-DateTime-Format-DateManip/Makefile
+++ b/devel/p5-DateTime-Format-DateManip/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert Date::Manip dates and durations to DateTimes and vice versa
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-Date-Manip>=0:devel/p5-Date-Manip
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Format-DateParse/Makefile b/devel/p5-DateTime-Format-DateParse/Makefile
index a4a873a6b1d6..a64ad027769f 100644
--- a/devel/p5-DateTime-Format-DateParse/Makefile
+++ b/devel/p5-DateTime-Format-DateParse/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	svysh.fbsd@gmail.com
 COMMENT=	This module is a compatibility wrapper around Date::Parse
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-TimeDate>=0:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Duration/Makefile b/devel/p5-DateTime-Format-Duration/Makefile
index 4b6addf2d33e..a318bbbee13f 100644
--- a/devel/p5-DateTime-Format-Duration/Makefile
+++ b/devel/p5-DateTime-Format-Duration/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Format and parse DateTime::Durations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a$//}
diff --git a/devel/p5-DateTime-Format-Epoch/Makefile b/devel/p5-DateTime-Format-Epoch/Makefile
index 77dbc3b1e2ff..e9b391e4b2f8 100644
--- a/devel/p5-DateTime-Format-Epoch/Makefile
+++ b/devel/p5-DateTime-Format-Epoch/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Convert DateTimes to/from epoch seconds
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.31:${PORTSDIR}/devel/p5-DateTime \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-DateTime>=0.31:devel/p5-DateTime \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.801
diff --git a/devel/p5-DateTime-Format-Excel/Makefile b/devel/p5-DateTime-Format-Excel/Makefile
index 19a3b08e68ef..27cd6f7da481 100644
--- a/devel/p5-DateTime-Format-Excel/Makefile
+++ b/devel/p5-DateTime-Format-Excel/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert between DateTime and Excel dates
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Flexible/Makefile b/devel/p5-DateTime-Format-Flexible/Makefile
index 8ff3a95a7bf6..e57ee634eec4 100644
--- a/devel/p5-DateTime-Format-Flexible/Makefile
+++ b/devel/p5-DateTime-Format-Flexible/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Flexibly parse strings and turn them into DateTime objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0.74:${PORTSDIR}/devel/p5-DateTime-Format-Builder \
-		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0.74:devel/p5-DateTime-Format-Builder \
+		p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime
+TEST_DEPENDS=	p5-Test-MockTime>=0:devel/p5-Test-MockTime
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Format-HTTP/Makefile b/devel/p5-DateTime-Format-HTTP/Makefile
index c86ffed645ea..82c216b4825d 100644
--- a/devel/p5-DateTime-Format-HTTP/Makefile
+++ b/devel/p5-DateTime-Format-HTTP/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTTP date conversion routines
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Format-IBeat/Makefile b/devel/p5-DateTime-Format-IBeat/Makefile
index 55ca702b7ccd..a59738994b74 100644
--- a/devel/p5-DateTime-Format-IBeat/Makefile
+++ b/devel/p5-DateTime-Format-IBeat/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Format times in .beat notation
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-ICal/Makefile b/devel/p5-DateTime-Format-ICal/Makefile
index 92b26a3b5143..78ed90d7d5cf 100644
--- a/devel/p5-DateTime-Format-ICal/Makefile
+++ b/devel/p5-DateTime-Format-ICal/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format ICal datetime and duration strings
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-DateTime-Event-ICal>=0:${PORTSDIR}/devel/p5-DateTime-Event-ICal \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-DateTime-Event-ICal>=0:devel/p5-DateTime-Event-ICal \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-ISO8601/Makefile b/devel/p5-DateTime-Format-ISO8601/Makefile
index 7c703da6fde7..fb4e779cb985 100644
--- a/devel/p5-DateTime-Format-ISO8601/Makefile
+++ b/devel/p5-DateTime-Format-ISO8601/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Parse ISO8601 formats
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.18:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0.77:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+BUILD_DEPENDS=	p5-DateTime>=0.18:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0.77:devel/p5-DateTime-Format-Builder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Mail/Makefile b/devel/p5-DateTime-Format-Mail/Makefile
index f1415ce6ef4e..77b1b2493b1d 100644
--- a/devel/p5-DateTime-Format-Mail/Makefile
+++ b/devel/p5-DateTime-Format-Mail/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert between DateTime and RFC2822/822 formats
 
-RUN_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-DateTime>=0:devel/p5-DateTime
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-MySQL/Makefile b/devel/p5-DateTime-Format-MySQL/Makefile
index d7b6319eebcb..31c1e3653378 100644
--- a/devel/p5-DateTime-Format-MySQL/Makefile
+++ b/devel/p5-DateTime-Format-MySQL/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Parse and format MySQL dates and times
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0.6:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0.6:devel/p5-DateTime-Format-Builder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Natural/Makefile b/devel/p5-DateTime-Format-Natural/Makefile
index 4511984be9ae..4084a9aa473d 100644
--- a/devel/p5-DateTime-Format-Natural/Makefile
+++ b/devel/p5-DateTime-Format-Natural/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Create machine readable date/time with natural parsing logic
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-boolean>=0:${PORTSDIR}/devel/p5-boolean \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Module-Util>=0:${PORTSDIR}/devel/p5-Module-Util
+BUILD_DEPENDS=	p5-boolean>=0:devel/p5-boolean \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Module-Util>=0:devel/p5-Module-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime
+TEST_DEPENDS=	p5-Test-MockTime>=0:devel/p5-Test-MockTime
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Format-Oracle/Makefile b/devel/p5-DateTime-Format-Oracle/Makefile
index 2eba64b1dca5..3647ab486990 100644
--- a/devel/p5-DateTime-Format-Oracle/Makefile
+++ b/devel/p5-DateTime-Format-Oracle/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Parse and format Oracle dates and timestamps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Convert-NLS_DATE_FORMAT>=0.03:${PORTSDIR}/converters/p5-Convert-NLS_DATE_FORMAT \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+BUILD_DEPENDS=	p5-Convert-NLS_DATE_FORMAT>=0.03:converters/p5-Convert-NLS_DATE_FORMAT \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-DateTime-Format-Pg/Makefile b/devel/p5-DateTime-Format-Pg/Makefile
index 201deeed17a9..a344ebc7df86 100644
--- a/devel/p5-DateTime-Format-Pg/Makefile
+++ b/devel/p5-DateTime-Format-Pg/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format PostgreSQL dates and times
 
-BUILD_DEPENDS=	p5-DateTime>=0.10:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0.72:${PORTSDIR}/devel/p5-DateTime-Format-Builder \
-		p5-DateTime-TimeZone>=0.05:${PORTSDIR}/devel/p5-DateTime-TimeZone
+BUILD_DEPENDS=	p5-DateTime>=0.10:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0.72:devel/p5-DateTime-Format-Builder \
+		p5-DateTime-TimeZone>=0.05:devel/p5-DateTime-TimeZone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-RFC3339/Makefile b/devel/p5-DateTime-Format-RFC3339/Makefile
index ed4eebe2d6c3..f061bbda7110 100644
--- a/devel/p5-DateTime-Format-RFC3339/Makefile
+++ b/devel/p5-DateTime-Format-RFC3339/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	citric@cubicone.tmetic.com
 COMMENT=	Parse and format RFC3339 times
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Format-RSS/Makefile b/devel/p5-DateTime-Format-RSS/Makefile
index 1d5d6583777b..b76accd6546c 100644
--- a/devel/p5-DateTime-Format-RSS/Makefile
+++ b/devel/p5-DateTime-Format-RSS/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Format DateTime For RSS
 
-RUN_DEPENDS=	p5-DateTime-Format-DateParse>=0:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-Class-Accessor-Fast-XS>=0:${PORTSDIR}/devel/p5-Class-Accessor-Fast-XS
-BUILD_DEPENDS=	p5-DateTime-Format-DateParse>=0:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-Class-Accessor-Fast-XS>=0:${PORTSDIR}/devel/p5-Class-Accessor-Fast-XS
+RUN_DEPENDS=	p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS
+BUILD_DEPENDS=	p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Format-Roman/Makefile b/devel/p5-DateTime-Format-Roman/Makefile
index 3a34b6b5c5d3..0d9e11673543 100644
--- a/devel/p5-DateTime-Format-Roman/Makefile
+++ b/devel/p5-DateTime-Format-Roman/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Roman day numbering for DateTime objects
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Roman>=0:${PORTSDIR}/math/p5-Roman
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-Roman>=0:math/p5-Roman
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-SQLite/Makefile b/devel/p5-DateTime-Format-SQLite/Makefile
index b092b4e26ffd..6865a493e506 100644
--- a/devel/p5-DateTime-Format-SQLite/Makefile
+++ b/devel/p5-DateTime-Format-SQLite/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format SQLite dates and times
 
-BUILD_DEPENDS=	p5-DateTime-Format-Builder>=0:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+BUILD_DEPENDS=	p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-W3CDTF/Makefile b/devel/p5-DateTime-Format-W3CDTF/Makefile
index 9bf33c7ce89e..c876b1dfa2bd 100644
--- a/devel/p5-DateTime-Format-W3CDTF/Makefile
+++ b/devel/p5-DateTime-Format-W3CDTF/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Parse and format W3CDTF datetime strings
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-XSD/Makefile b/devel/p5-DateTime-Format-XSD/Makefile
index 8a9d860f7f3c..46b91ee92d82 100644
--- a/devel/p5-DateTime-Format-XSD/Makefile
+++ b/devel/p5-DateTime-Format-XSD/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sergey.dyatko@gmail.com
 COMMENT=	Format DateTime according to xsd:dateTime
 
-BUILD_DEPENDS=	p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601
-RUN_DEPENDS=	p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601
+BUILD_DEPENDS=	p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601
+RUN_DEPENDS=	p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Functions/Makefile b/devel/p5-DateTime-Functions/Makefile
index 6d382e8407c3..0b8c05c5b554 100644
--- a/devel/p5-DateTime-Functions/Makefile
+++ b/devel/p5-DateTime-Functions/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Procedural interface to DateTime functions
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-HiRes/Makefile b/devel/p5-DateTime-HiRes/Makefile
index b6fe367a9b64..2769bf1dad33 100644
--- a/devel/p5-DateTime-HiRes/Makefile
+++ b/devel/p5-DateTime-HiRes/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create DateTime objects with sub-second current time resolution
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Incomplete/Makefile b/devel/p5-DateTime-Incomplete/Makefile
index 24bcd97edaf4..059d093b1a8d 100644
--- a/devel/p5-DateTime-Incomplete/Makefile
+++ b/devel/p5-DateTime-Incomplete/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0.14:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-DateTime-Event-Recurrence>=0:${PORTSDIR}/devel/p5-DateTime-Event-Recurrence
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0.14:devel/p5-DateTime-Set \
+		p5-DateTime-Event-Recurrence>=0:devel/p5-DateTime-Event-Recurrence
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-DateTime-Locale/Makefile b/devel/p5-DateTime-Locale/Makefile
index 0c5775b05bab..8176536d34bf 100644
--- a/devel/p5-DateTime-Locale/Makefile
+++ b/devel/p5-DateTime-Locale/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Dist-CheckConflicts>=0.02:${PORTSDIR}/devel/p5-Dist-CheckConflicts \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-DateTime-Precise/Makefile b/devel/p5-DateTime-Precise/Makefile
index c7f70b88a112..75bab82677f7 100644
--- a/devel/p5-DateTime-Precise/Makefile
+++ b/devel/p5-DateTime-Precise/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perform common time and date operations with additional GPS operations
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Set/Makefile b/devel/p5-DateTime-Set/Makefile
index fd47011b3ae8..14d69702082e 100644
--- a/devel/p5-DateTime-Set/Makefile
+++ b/devel/p5-DateTime-Set/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Datetime sets and set math
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DateTime>=0.12:${PORTSDIR}/devel/p5-DateTime \
-		p5-Set-Infinite>=0.59:${PORTSDIR}/devel/p5-Set-Infinite
+BUILD_DEPENDS=	p5-DateTime>=0.12:devel/p5-DateTime \
+		p5-Set-Infinite>=0.59:devel/p5-Set-Infinite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/devel/p5-DateTime-TimeZone-Alias/Makefile b/devel/p5-DateTime-TimeZone-Alias/Makefile
index bd480d8596cc..9a2c8efcff0d 100644
--- a/devel/p5-DateTime-TimeZone-Alias/Makefile
+++ b/devel/p5-DateTime-TimeZone-Alias/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create aliases for DateTime timezones
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-DateTime>=0:devel/p5-DateTime
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-TimeZone-LMT/Makefile b/devel/p5-DateTime-TimeZone-LMT/Makefile
index b335ee18984b..4cc82b3e52a7 100644
--- a/devel/p5-DateTime-TimeZone-LMT/Makefile
+++ b/devel/p5-DateTime-TimeZone-LMT/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Local Mean Time time zone for DateTime
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.12:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-TimeZone>=0.13:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-DateTime>=0.12:devel/p5-DateTime \
+		p5-DateTime-TimeZone>=0.13:devel/p5-DateTime-TimeZone \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-TimeZone/Makefile b/devel/p5-DateTime-TimeZone/Makefile
index a868c88fe902..164b6b929b62 100644
--- a/devel/p5-DateTime-TimeZone/Makefile
+++ b/devel/p5-DateTime-TimeZone/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Time zone object base class and factory
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Singleton>=1.03:${PORTSDIR}/devel/p5-Class-Singleton \
-		p5-List-AllUtils>0:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Params-Validate>=0.72:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-Singleton>=1.03:devel/p5-Class-Singleton \
+		p5-List-AllUtils>0:devel/p5-List-AllUtils \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Params-Validate>=0.72:devel/p5-Params-Validate \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Output>0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Output>0:devel/p5-Test-Output
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Util-Calc/Makefile b/devel/p5-DateTime-Util-Calc/Makefile
index 5ccc9f81ccd5..cac6970a72a3 100644
--- a/devel/p5-DateTime-Util-Calc/Makefile
+++ b/devel/p5-DateTime-Util-Calc/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	DateTime Calculation Utilities
 
-BUILD_DEPENDS=	p5-Math-BigInt>=0:${PORTSDIR}/math/p5-Math-BigInt \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-Math-BigInt>=0:math/p5-Math-BigInt \
+		p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	GMP
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGMP}
-BUILD_DEPENDS+=	p5-Math-BigInt-GMP>=0:${PORTSDIR}/math/p5-Math-BigInt-GMP
+BUILD_DEPENDS+=	p5-Math-BigInt-GMP>=0:math/p5-Math-BigInt-GMP
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-DateTime/Makefile b/devel/p5-DateTime/Makefile
index 36eb3c0d2607..8bb7906a0d18 100644
--- a/devel/p5-DateTime/Makefile
+++ b/devel/p5-DateTime/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Date and time object
 LICENSE=	ART20
 
 # Do not add p5-DateTime-Format-Strptime>=1.20.00 to TEST_DEPENDS to avoid cyclic dependency in tinderbox
-BUILD_DEPENDS=	p5-DateTime-Locale>=0.41:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-DateTime-TimeZone>=1.74:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Params-Validate>=1.03:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-DateTime-Locale>=0.41:devel/p5-DateTime-Locale \
+		p5-DateTime-TimeZone>=1.74:devel/p5-DateTime-TimeZone \
+		p5-Params-Validate>=1.03:devel/p5-Params-Validate \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>=0.005:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>=0.005:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTimeX-Easy/Makefile b/devel/p5-DateTimeX-Easy/Makefile
index 2e2912095207..bb2c846356fb 100644
--- a/devel/p5-DateTimeX-Easy/Makefile
+++ b/devel/p5-DateTimeX-Easy/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Parse a date/time string using the best method available
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-DateParse>=0:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-		p5-DateTime-Format-Flexible>=0:${PORTSDIR}/devel/p5-DateTime-Format-Flexible \
-		p5-DateTime-Format-ICal>=0:${PORTSDIR}/devel/p5-DateTime-Format-ICal \
-		p5-DateTime-Format-Natural>=0:${PORTSDIR}/devel/p5-DateTime-Format-Natural \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse \
+		p5-DateTime-Format-Flexible>=0:devel/p5-DateTime-Format-Flexible \
+		p5-DateTime-Format-ICal>=0:devel/p5-DateTime-Format-ICal \
+		p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
+		p5-TimeDate>=0:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Debug-Client/Makefile b/devel/p5-Debug-Client/Makefile
index d932f4580230..2b042f68a385 100644
--- a/devel/p5-Debug-Client/Makefile
+++ b/devel/p5-Debug-Client/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Client for the standard Perl debugger
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PadWalker>=1.96:${PORTSDIR}/devel/p5-PadWalker \
-		p5-ReadLine-Perl>=1.0303:${PORTSDIR}/devel/p5-ReadLine-Perl
+BUILD_DEPENDS=	p5-PadWalker>=1.96:devel/p5-PadWalker \
+		p5-ReadLine-Perl>=1.0303:devel/p5-ReadLine-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-HomeDir>=1:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-ReadLine-Gnu>=1.20:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Test-CheckDeps>=0.006:${PORTSDIR}/devel/p5-Test-CheckDeps \
-		p5-Test-Class>=0.39:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Deep>=0.110:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Requires>=0.07:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-File-HomeDir>=1:devel/p5-File-HomeDir \
+		p5-ReadLine-Gnu>=1.20:devel/p5-ReadLine-Gnu \
+		p5-Test-CheckDeps>=0.006:devel/p5-Test-CheckDeps \
+		p5-Test-Class>=0.39:devel/p5-Test-Class \
+		p5-Test-Deep>=0.110:devel/p5-Test-Deep \
+		p5-Test-Requires>=0.07:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -30,13 +30,13 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-version>=0.99.02:${PORTSDIR}/devel/p5-version
-RUN_DEPENDS+=	p5-version>=0.99.02:${PORTSDIR}/devel/p5-version
+BUILD_DEPENDS+=	p5-version>=0.99.02:devel/p5-version
+RUN_DEPENDS+=	p5-version>=0.99.02:devel/p5-version
 .endif
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.21:${PORTSDIR}/net/p5-IO-Socket-IP
-RUN_DEPENDS+=	p5-IO-Socket-IP>=0.21:${PORTSDIR}/net/p5-IO-Socket-IP
+BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.21:net/p5-IO-Socket-IP
+RUN_DEPENDS+=	p5-IO-Socket-IP>=0.21:net/p5-IO-Socket-IP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Declare-Constraints-Simple/Makefile b/devel/p5-Declare-Constraints-Simple/Makefile
index 2a9c40bc5ddf..1026910e601d 100644
--- a/devel/p5-Declare-Constraints-Simple/Makefile
+++ b/devel/p5-Declare-Constraints-Simple/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Declarative Validation of Perl Data Structures
 
-BUILD_DEPENDS=	p5-Class-Inspector>=1.24:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan
-RUN_DEPENDS=	p5-Class-Inspector>=1.24:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan
+BUILD_DEPENDS=	p5-Class-Inspector>=1.24:devel/p5-Class-Inspector \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
+RUN_DEPENDS=	p5-Class-Inspector>=1.24:devel/p5-Class-Inspector \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-ArgNames/Makefile b/devel/p5-Devel-ArgNames/Makefile
index 93ec23451b88..6dabf74503a3 100644
--- a/devel/p5-Devel-ArgNames/Makefile
+++ b/devel/p5-Devel-ArgNames/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Figure out the names of variables passed into subroutines
 
-BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
-RUN_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker
+RUN_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker
 
 USES=		perl5
 USE_PERL5=	configure
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-Autoflush/Makefile b/devel/p5-Devel-Autoflush/Makefile
index 96f6877a07e9..358a2fc07288 100644
--- a/devel/p5-Devel-Autoflush/Makefile
+++ b/devel/p5-Devel-Autoflush/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Set autoflush from the command line
 
-BUILD_DEPENDS=	p5-IO-CaptureOutput>0:${PORTSDIR}/devel/p5-IO-CaptureOutput
+BUILD_DEPENDS=	p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-Backtrace/Makefile b/devel/p5-Devel-Backtrace/Makefile
index d086069cb2c3..ab179728859b 100644
--- a/devel/p5-Devel-Backtrace/Makefile
+++ b/devel/p5-Devel-Backtrace/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object-oriented backtrace
 
-BUILD_DEPENDS=	p5-String-Escape>=0:${PORTSDIR}/textproc/p5-String-Escape \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-String-Escape>=0:${PORTSDIR}/textproc/p5-String-Escape \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-String-Escape>=0:textproc/p5-String-Escape \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-String-Escape>=0:textproc/p5-String-Escape \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-BeginLift/Makefile b/devel/p5-Devel-BeginLift/Makefile
index 453b827bbc73..f0f6fb2834e5 100644
--- a/devel/p5-Devel-BeginLift/Makefile
+++ b/devel/p5-Devel-BeginLift/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to make selected sub calls evaluate at compile time
 
 RUN_DEPENDS=	\
-	p5-B-Hooks-OP-Check-EntersubForCV>=0.03:${PORTSDIR}/devel/p5-B-Hooks-OP-Check-EntersubForCV
+	p5-B-Hooks-OP-Check-EntersubForCV>=0.03:devel/p5-B-Hooks-OP-Check-EntersubForCV
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-	p5-ExtUtils-Depends>0:${PORTSDIR}/devel/p5-ExtUtils-Depends
+	p5-ExtUtils-Depends>0:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-CallChecker/Makefile b/devel/p5-Devel-CallChecker/Makefile
index 0339c9a6f2ff..570d2aaceadb 100644
--- a/devel/p5-Devel-CallChecker/Makefile
+++ b/devel/p5-Devel-CallChecker/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Custom op checking attached to subroutines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DynaLoader-Functions>=0.001:${PORTSDIR}/devel/p5-DynaLoader-Functions
+BUILD_DEPENDS=	p5-DynaLoader-Functions>=0.001:devel/p5-DynaLoader-Functions
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Devel-Caller/Makefile b/devel/p5-Devel-Caller/Makefile
index 00f01bea023c..f53864088f5a 100644
--- a/devel/p5-Devel-Caller/Makefile
+++ b/devel/p5-Devel-Caller/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module which is meatier versions of caller
 
-BUILD_DEPENDS=	p5-PadWalker>=0.08:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-PadWalker>=0.08:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-CheckCompiler/Makefile b/devel/p5-Devel-CheckCompiler/Makefile
index b3378b0839c8..a99649256b8d 100644
--- a/devel/p5-Devel-CheckCompiler/Makefile
+++ b/devel/p5-Devel-CheckCompiler/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Check the compiler availability
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Devel-CheckLib/Makefile b/devel/p5-Devel-CheckLib/Makefile
index ddd6ddf163f7..e128885743de 100644
--- a/devel/p5-Devel-CheckLib/Makefile
+++ b/devel/p5-Devel-CheckLib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Check that a library is available
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-CaptureOutput>=1.08:${PORTSDIR}/devel/p5-IO-CaptureOutput
+BUILD_DEPENDS=	p5-IO-CaptureOutput>=1.08:devel/p5-IO-CaptureOutput
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Devel-CheckOS/Makefile b/devel/p5-Devel-CheckOS/Makefile
index 99736adf9a6b..5350da5f1d58 100644
--- a/devel/p5-Devel-CheckOS/Makefile
+++ b/devel/p5-Devel-CheckOS/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Check currently running OS
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Compare>=1.2100:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-File-Find-Rule>=0.28:${PORTSDIR}/devel/p5-File-Find-Rule
+BUILD_DEPENDS=	p5-Data-Compare>=1.2100:devel/p5-Data-Compare \
+		p5-File-Find-Rule>=0.28:devel/p5-File-Find-Rule
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-Cover-Report-Clover/Makefile b/devel/p5-Devel-Cover-Report-Clover/Makefile
index 34d5f2136b70..39499303101f 100644
--- a/devel/p5-Devel-Cover-Report-Clover/Makefile
+++ b/devel/p5-Devel-Cover-Report-Clover/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Clover reporting of coverage statistics
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-	p5-Devel-Cover>0:${PORTSDIR}/devel/p5-Devel-Cover \
-	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit
+	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+	p5-Devel-Cover>0:devel/p5-Devel-Cover \
+	p5-HTML-Parser>0:www/p5-HTML-Parser \
+	p5-Template-Toolkit>0:www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS= \
-	p5-File-Path>=2.06:${PORTSDIR}/devel/p5-File-Path \
-	p5-File-Which>=1.08:${PORTSDIR}/sysutils/p5-File-Which \
-	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Test-MockObject>0:${PORTSDIR}/devel/p5-Test-MockObject
+	p5-File-Path>=2.06:devel/p5-File-Path \
+	p5-File-Which>=1.08:sysutils/p5-File-Which \
+	p5-Test-Exception>0:devel/p5-Test-Exception \
+	p5-Test-MockObject>0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile
index 2c6857c9693e..ee3c6ca7901b 100644
--- a/devel/p5-Devel-Cover/Makefile
+++ b/devel/p5-Devel-Cover/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Code coverage metrics for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
@@ -23,20 +23,20 @@ OPTIONS_DEFAULT=CPANCOVER HTML_REPORTS POD_COVERAGE
 OPTIONS_SUB=	yes
 
 CPANCOVER_DESC=			Coverage statistics on CPAN modules
-CPANCOVER_BUILD_DEPENDS=	p5-Parallel-Iterator>=0:${PORTSDIR}/devel/p5-Parallel-Iterator \
-				p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+CPANCOVER_BUILD_DEPENDS=	p5-Parallel-Iterator>=0:devel/p5-Parallel-Iterator \
+				p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 CPANCOVER_RUN_DEPENDS=		${CPANCOVER_BUILD_DEPENDS}
 
 HTML_REPORTS=			Build HTML reports with p5-HTML-Parser
-HTML_REPORTS_BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+HTML_REPORTS_BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
 HTML_REPORTS_RUN_DEPENDS=	${HTML_REPORTS_BUILD_DEPENDS}
 
 POD_COVERAGE_DESC=		POD coverage via p5-Pod-Coverage
-POD_COVERAGE_BUILD_DEPENDS=	p5-Pod-Coverage>=0.06:${PORTSDIR}/devel/p5-Pod-Coverage
+POD_COVERAGE_BUILD_DEPENDS=	p5-Pod-Coverage>=0.06:devel/p5-Pod-Coverage
 POD_COVERAGE_RUN_DEPENDS=	${POD_COVERAGE_BUILD_DEPENDS}
 
 SYNTAX_HIGHLIGHTING_DESC=		Syntax highlighting via p5-PPI-HTML
-SYNTAX_HIGHLIGHTING_BUILD_DEPENDS=	p5-PPI-HTML>=1.07:${PORTSDIR}/textproc/p5-PPI-HTML
+SYNTAX_HIGHLIGHTING_BUILD_DEPENDS=	p5-PPI-HTML>=1.07:textproc/p5-PPI-HTML
 SYNTAX_HIGHLIGHTING_RUN_DEPENDS=	${SYNTAX_HIGHLIGHTING_BUILD_DEPENDS}
 
 post-install:
diff --git a/devel/p5-Devel-Declare-Parser/Makefile b/devel/p5-Devel-Declare-Parser/Makefile
index dcecced11478..e5749486311b 100644
--- a/devel/p5-Devel-Declare-Parser/Makefile
+++ b/devel/p5-Devel-Declare-Parser/Makefile
@@ -13,11 +13,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-B-Compiling>=0.02:${PORTSDIR}/devel/p5-B-Compiling \
-	p5-B-Hooks-EndOfScope>=0.08:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-	p5-Devel-Declare>=0.006:${PORTSDIR}/devel/p5-Devel-Declare
+	p5-B-Compiling>=0.02:devel/p5-B-Compiling \
+	p5-B-Hooks-EndOfScope>=0.08:devel/p5-B-Hooks-EndOfScope \
+	p5-Devel-Declare>=0.006:devel/p5-Devel-Declare
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception-LessClever>=0:${PORTSDIR}/devel/p5-Test-Exception-LessClever
+TEST_DEPENDS=	p5-Test-Exception-LessClever>=0:devel/p5-Test-Exception-LessClever
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Devel-Declare/Makefile b/devel/p5-Devel-Declare/Makefile
index a4ba64dca415..426ff340c321 100644
--- a/devel/p5-Devel-Declare/Makefile
+++ b/devel/p5-Devel-Declare/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Adding keywords to Perl, in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-B-Hooks-EndOfScope>=0.05:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends \
+RUN_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-B-Hooks-EndOfScope>=0.05:devel/p5-B-Hooks-EndOfScope \
+		p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends \
 		${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-Ditto/Makefile b/devel/p5-Devel-Ditto/Makefile
index da67ab3b9418..61442ca7e12f 100644
--- a/devel/p5-Devel-Ditto/Makefile
+++ b/devel/p5-Devel-Ditto/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Devel::Ditto - Identify where print output comes from
 
-RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+RUN_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-EvalContext/Makefile b/devel/p5-Devel-EvalContext/Makefile
index 19aa3d47cddf..2f44ed4de68f 100644
--- a/devel/p5-Devel-EvalContext/Makefile
+++ b/devel/p5-Devel-EvalContext/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Save lexicals and hints between calls to eval
 
-RUN_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Data-Alias>=0:${PORTSDIR}/devel/p5-Data-Alias \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Data-Alias>=0:devel/p5-Data-Alias \
+		p5-YAML>=0:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-Events-Objects/Makefile b/devel/p5-Devel-Events-Objects/Makefile
index 732fea60b823..92d604166e12 100644
--- a/devel/p5-Devel-Events-Objects/Makefile
+++ b/devel/p5-Devel-Events-Objects/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module providing object tracking support for Devel::Events
 
-BUILD_DEPENDS=	p5-Devel-Events>=0:${PORTSDIR}/devel/p5-Devel-Events \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Tie-RefHash-Weak>=0:${PORTSDIR}/devel/p5-Tie-RefHash-Weak \
-		p5-Variable-Magic>=0:${PORTSDIR}/devel/p5-Variable-Magic
+BUILD_DEPENDS=	p5-Devel-Events>=0:devel/p5-Devel-Events \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Tie-RefHash-Weak>=0:devel/p5-Tie-RefHash-Weak \
+		p5-Variable-Magic>=0:devel/p5-Variable-Magic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-Events/Makefile b/devel/p5-Devel-Events/Makefile
index a95b84bbeca1..30b3c7082f69 100644
--- a/devel/p5-Devel-Events/Makefile
+++ b/devel/p5-Devel-Events/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl5 module providing an extensible instrumentation framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.33:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-AttributeHelpers>=0.03:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Moose>=0.33:devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>=0.03:devel/p5-MooseX-AttributeHelpers \
+		p5-Set-Object>=0:devel/p5-Set-Object \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Sub-Uplevel>=0:${PORTSDIR}/devel/p5-Sub-Uplevel
+TEST_DEPENDS=	p5-Sub-Uplevel>=0:devel/p5-Sub-Uplevel
 
 NO_ARCH=	yes
 USES=		perl5
@@ -28,7 +28,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-GlobalDestruction/Makefile b/devel/p5-Devel-GlobalDestruction/Makefile
index a10ca95698b8..3d5941f4c187 100644
--- a/devel/p5-Devel-GlobalDestruction/Makefile
+++ b/devel/p5-Devel-GlobalDestruction/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Expose PL_dirty, the flag which marks global destruction
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0.001011:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0.001011:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-KYTProf/Makefile b/devel/p5-Devel-KYTProf/Makefile
index 84c6378614ec..813f97c42d80 100644
--- a/devel/p5-Devel-KYTProf/Makefile
+++ b/devel/p5-Devel-KYTProf/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for simple profiler
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBI>0:databases/p5-DBI \
+		p5-DBD-SQLite>0:databases/p5-DBD-SQLite
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-Leak-Cb/Makefile b/devel/p5-Devel-Leak-Cb/Makefile
index fbebf9067412..5cf7b4334482 100644
--- a/devel/p5-Devel-Leak-Cb/Makefile
+++ b/devel/p5-Devel-Leak-Cb/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Detect leaked callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare
-RUN_DEPENDS=	p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare
+BUILD_DEPENDS=	p5-common-sense>=2:devel/p5-common-sense \
+		p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare
+RUN_DEPENDS=	p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-LeakGuard-Object/Makefile b/devel/p5-Devel-LeakGuard-Object/Makefile
index 3e0592a01768..c09cf2430fae 100644
--- a/devel/p5-Devel-LeakGuard-Object/Makefile
+++ b/devel/p5-Devel-LeakGuard-Object/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Scoped checks for object leaks
 
-BUILD_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+BUILD_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-latest>0:${PORTSDIR}/devel/p5-latest
+TEST_DEPENDS=	p5-latest>0:devel/p5-latest
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Devel-LexAlias/Makefile b/devel/p5-Devel-LexAlias/Makefile
index b1ab4f854a08..f84f60fb4f1f 100644
--- a/devel/p5-Devel-LexAlias/Makefile
+++ b/devel/p5-Devel-LexAlias/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module which does alias lexical variables
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Caller>=0.03:${PORTSDIR}/devel/p5-Devel-Caller
+BUILD_DEPENDS=	p5-Devel-Caller>=0.03:devel/p5-Devel-Caller
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-MAT/Makefile b/devel/p5-Devel-MAT/Makefile
index ee487bfbc99d..8277bcc75357 100644
--- a/devel/p5-Devel-MAT/Makefile
+++ b/devel/p5-Devel-MAT/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-List-UtilsBy>=0:${PORTSDIR}/devel/p5-List-UtilsBy \
-		p5-Struct-Dumb>=0.07:${PORTSDIR}/devel/p5-Struct-Dumb
+BUILD_DEPENDS=	p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-List-UtilsBy>=0:devel/p5-List-UtilsBy \
+		p5-Struct-Dumb>=0.07:devel/p5-Struct-Dumb
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Identity>=0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Identity>=0:devel/p5-Test-Identity \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	modbuild
 USES=		perl5
@@ -28,11 +28,11 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.29:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.29:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.29:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.29:lang/p5-Scalar-List-Utils
 .else
-BUILD_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
-RUN_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS+=	p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
 .endif
 
 post-install:
diff --git a/devel/p5-Devel-NYTProf/Makefile b/devel/p5-Devel-NYTProf/Makefile
index bfafe6f1715c..91dcfe1607ae 100644
--- a/devel/p5-Devel-NYTProf/Makefile
+++ b/devel/p5-Devel-NYTProf/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Powerful feature-rich Perl source code profiler
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS
+BUILD_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0.60:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Differences>=0.60:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-OverloadInfo/Makefile b/devel/p5-Devel-OverloadInfo/Makefile
index 9f636da30bf8..86ba6322502b 100644
--- a/devel/p5-Devel-OverloadInfo/Makefile
+++ b/devel/p5-Devel-OverloadInfo/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Introspect overloaded operators
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Package-Stash>=0.14:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sub-Identify>=0:${PORTSDIR}/devel/p5-Sub-Identify
+BUILD_DEPENDS=	p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Package-Stash>=0.14:devel/p5-Package-Stash \
+		p5-Sub-Identify>=0:devel/p5-Sub-Identify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-PackagePath/Makefile b/devel/p5-Devel-PackagePath/Makefile
index 2c1873ee5d38..cfecea5a1e1c 100644
--- a/devel/p5-Devel-PackagePath/Makefile
+++ b/devel/p5-Devel-PackagePath/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Inspect and manipulate a Path based on a Package name
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.64:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-Path-Class>=0.04:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class
+BUILD_DEPENDS=	p5-Moose>=0.64:devel/p5-Moose \
+		p5-MooseX-Types-Path-Class>=0.04:devel/p5-MooseX-Types-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Devel-PartialDump/Makefile b/devel/p5-Devel-PartialDump/Makefile
index 67dd26dac45c..b985a47b2a23 100644
--- a/devel/p5-Devel-PartialDump/Makefile
+++ b/devel/p5-Devel-PartialDump/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Partial dumping of data structures, optimized for argument printing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Tiny>=0:${PORTSDIR}/devel/p5-Class-Tiny \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Class-Tiny>=0:devel/p5-Class-Tiny \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 NO_ARCH=	yes
 USES=		perl5
@@ -26,7 +26,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-PatchPerl/Makefile b/devel/p5-Devel-PatchPerl/Makefile
index 8b9e31e5cf2d..842835017f91 100644
--- a/devel/p5-Devel-PatchPerl/Makefile
+++ b/devel/p5-Devel-PatchPerl/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-pushd>=1:${PORTSDIR}/devel/p5-File-pushd
+BUILD_DEPENDS=	p5-File-pushd>=1:devel/p5-File-pushd
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Devel-REPL/Makefile b/devel/p5-Devel-REPL/Makefile
index 0229901f2602..6e94b12740bd 100644
--- a/devel/p5-Devel-REPL/Makefile
+++ b/devel/p5-Devel-REPL/Makefile
@@ -14,22 +14,22 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Object-Pluggable>=0.0009:${PORTSDIR}/devel/p5-MooseX-Object-Pluggable \
-	p5-MooseX-Getopt>=0.18:${PORTSDIR}/devel/p5-MooseX-Getopt \
-	p5-MooseX-AttributeHelpers>=0.16:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-	p5-namespace-autoclean>0:${PORTSDIR}/devel/p5-namespace-autoclean \
-	p5-File-HomeDir>0:${PORTSDIR}/devel/p5-File-HomeDir \
-	p5-Task-Weaken>0:${PORTSDIR}/devel/p5-Task-Weaken \
-	p5-PPI>0:${PORTSDIR}/textproc/p5-PPI \
-	p5-Data-Dump-Streamer>0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-	p5-Data-Dumper-Concise>0:${PORTSDIR}/devel/p5-Data-Dumper-Concise \
-	p5-File-Next>0:${PORTSDIR}/sysutils/p5-File-Next \
-	p5-B-Keywords>0:${PORTSDIR}/devel/p5-B-Keywords \
-	p5-Lexical-Persistence>0:${PORTSDIR}/devel/p5-Lexical-Persistence \
-	p5-App-Nopaste>0:${PORTSDIR}/www/p5-App-Nopaste \
-	p5-Module-Refresh>0:${PORTSDIR}/devel/p5-Module-Refresh \
-	p5-Sys-SigAction>0:${PORTSDIR}/devel/p5-Sys-SigAction
+BUILD_DEPENDS=	p5-Moose>=0.93:devel/p5-Moose \
+	p5-MooseX-Object-Pluggable>=0.0009:devel/p5-MooseX-Object-Pluggable \
+	p5-MooseX-Getopt>=0.18:devel/p5-MooseX-Getopt \
+	p5-MooseX-AttributeHelpers>=0.16:devel/p5-MooseX-AttributeHelpers \
+	p5-namespace-autoclean>0:devel/p5-namespace-autoclean \
+	p5-File-HomeDir>0:devel/p5-File-HomeDir \
+	p5-Task-Weaken>0:devel/p5-Task-Weaken \
+	p5-PPI>0:textproc/p5-PPI \
+	p5-Data-Dump-Streamer>0:devel/p5-Data-Dump-Streamer \
+	p5-Data-Dumper-Concise>0:devel/p5-Data-Dumper-Concise \
+	p5-File-Next>0:sysutils/p5-File-Next \
+	p5-B-Keywords>0:devel/p5-B-Keywords \
+	p5-Lexical-Persistence>0:devel/p5-Lexical-Persistence \
+	p5-App-Nopaste>0:www/p5-App-Nopaste \
+	p5-Module-Refresh>0:devel/p5-Module-Refresh \
+	p5-Sys-SigAction>0:devel/p5-Sys-SigAction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-Refcount/Makefile b/devel/p5-Devel-Refcount/Makefile
index 21f6a8fc803d..202c010bd70e 100644
--- a/devel/p5-Devel-Refcount/Makefile
+++ b/devel/p5-Devel-Refcount/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Obtain the REFCNT value of a referent
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Devel-RingBuffer/Makefile b/devel/p5-Devel-RingBuffer/Makefile
index d7c504256a95..15bdaf8dbff4 100644
--- a/devel/p5-Devel-RingBuffer/Makefile
+++ b/devel/p5-Devel-RingBuffer/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Shared memory ring buffers for Perl scripts diagnosis/debug
 
-RUN_DEPENDS=	p5-IPC-Mmap>=0:${PORTSDIR}/devel/p5-IPC-Mmap
+RUN_DEPENDS=	p5-IPC-Mmap>=0:devel/p5-IPC-Mmap
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-STrace/Makefile b/devel/p5-Devel-STrace/Makefile
index 1710351b42f1..4759a5a03107 100644
--- a/devel/p5-Devel-STrace/Makefile
+++ b/devel/p5-Devel-STrace/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	strace(1)-like runtime call trace for Perl applications
 
-RUN_DEPENDS=	p5-Devel-RingBuffer>=0:${PORTSDIR}/devel/p5-Devel-RingBuffer
+RUN_DEPENDS=	p5-Devel-RingBuffer>=0:devel/p5-Devel-RingBuffer
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-SimpleTrace/Makefile b/devel/p5-Devel-SimpleTrace/Makefile
index fbdc06fea79e..3b4ce840b463 100644
--- a/devel/p5-Devel-SimpleTrace/Makefile
+++ b/devel/p5-Devel-SimpleTrace/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for better stack traces on interpreter-generated warn/die
 USES=		perl5
 USE_PERL5=	configure
 
-BUILD_DEPENDS=	p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper
+BUILD_DEPENDS=	p5-Data-Dumper>=0:devel/p5-Data-Dumper
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-Size-Report/Makefile b/devel/p5-Devel-Size-Report/Makefile
index fb29d4483834..0ca72d3d64c9 100644
--- a/devel/p5-Devel-Size-Report/Makefile
+++ b/devel/p5-Devel-Size-Report/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Extension to generate a size report for all elements in a structure
 
-BUILD_DEPENDS=	p5-Array-RefElem>=1.00:${PORTSDIR}/misc/p5-Array-RefElem \
-		p5-Devel-Size>=0.69:${PORTSDIR}/devel/p5-Devel-Size
+BUILD_DEPENDS=	p5-Array-RefElem>=1.00:misc/p5-Array-RefElem \
+		p5-Devel-Size>=0.69:devel/p5-Devel-Size
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-StackTrace-AsHTML/Makefile b/devel/p5-Devel-StackTrace-AsHTML/Makefile
index f66da2083b42..0d5f56f2f092 100644
--- a/devel/p5-Devel-StackTrace-AsHTML/Makefile
+++ b/devel/p5-Devel-StackTrace-AsHTML/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to display stack trace in HTML
 
-RUN_DEPENDS=	p5-Devel-StackTrace>0:${PORTSDIR}/devel/p5-Devel-StackTrace
+RUN_DEPENDS=	p5-Devel-StackTrace>0:devel/p5-Devel-StackTrace
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-StackTrace-WithLexicals/Makefile b/devel/p5-Devel-StackTrace-WithLexicals/Makefile
index e8464adac540..d78927483105 100644
--- a/devel/p5-Devel-StackTrace-WithLexicals/Makefile
+++ b/devel/p5-Devel-StackTrace-WithLexicals/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Devel-StackTrace>=2.00:${PORTSDIR}/devel/p5-Devel-StackTrace \
-	p5-PadWalker>=1.98:${PORTSDIR}/devel/p5-PadWalker
+	p5-Devel-StackTrace>=2.00:devel/p5-Devel-StackTrace \
+	p5-PadWalker>=1.98:devel/p5-PadWalker
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-StealthDebug/Makefile b/devel/p5-Devel-StealthDebug/Makefile
index 0ec5edca2b06..574470109f05 100644
--- a/devel/p5-Devel-StealthDebug/Makefile
+++ b/devel/p5-Devel-StealthDebug/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple non-intrusive debug module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Filter-Simple>=0:${PORTSDIR}/textproc/p5-Filter-Simple
+BUILD_DEPENDS=	p5-Filter-Simple>=0:textproc/p5-Filter-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-ebug/Makefile b/devel/p5-Devel-ebug/Makefile
index f060e0d3b8ee..b0a5e8832755 100644
--- a/devel/p5-Devel-ebug/Makefile
+++ b/devel/p5-Devel-ebug/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Simple, extensible Perl debugger
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Proc-Background>=0:${PORTSDIR}/devel/p5-Proc-Background \
-		p5-String-Koremutake>=0:${PORTSDIR}/textproc/p5-String-Koremutake \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Proc-Background>=0:devel/p5-Proc-Background \
+		p5-String-Koremutake>=0:textproc/p5-String-Koremutake \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Expect>=0:${PORTSDIR}/devel/p5-Test-Expect \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-Test-Expect>=0:devel/p5-Test-Expect \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index 22ea2b01e735..3c8eaa51caa3 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tk debugger for Perl
 
-RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Device-USB/Makefile b/devel/p5-Device-USB/Makefile
index e0c93b48ee26..3de69e84cf27 100644
--- a/devel/p5-Device-USB/Makefile
+++ b/devel/p5-Device-USB/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl wrapper for libusb
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
+		p5-Inline-C>=0:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=yes
diff --git a/devel/p5-Directory-Queue/Makefile b/devel/p5-Directory-Queue/Makefile
index cf68b23fa504..ef7418f45187 100644
--- a/devel/p5-Directory-Queue/Makefile
+++ b/devel/p5-Directory-Queue/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Object oriented interface to a directory based queue in Perl
 
-BUILD_DEPENDS=	p5-No-Worries>=0:${PORTSDIR}/devel/p5-No-Worries
+BUILD_DEPENDS=	p5-No-Worries>=0:devel/p5-No-Worries
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Directory-Scratch-Structured/Makefile b/devel/p5-Directory-Scratch-Structured/Makefile
index 827b2407092a..4bf362a5a2e6 100644
--- a/devel/p5-Directory-Scratch-Structured/Makefile
+++ b/devel/p5-Directory-Scratch-Structured/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Creates temporary files and directories from a structured description
 USES=		perl5
 USE_PERL5=	modbuild
 
-RUN_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper \
-		p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch
+RUN_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+		p5-Directory-Scratch>=0:devel/p5-Directory-Scratch
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Block>0:${PORTSDIR}/devel/p5-Test-Block \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Strict>0:${PORTSDIR}/devel/p5-Test-Strict \
-		p5-Test-Warn>0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Block>0:devel/p5-Test-Block \
+		p5-Test-Exception>0:devel/p5-Test-Exception \
+		p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings \
+		p5-Test-Strict>0:devel/p5-Test-Strict \
+		p5-Test-Warn>0:devel/p5-Test-Warn
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Directory-Scratch/Makefile b/devel/p5-Directory-Scratch/Makefile
index f18a7ee363f0..ec70f2d10cb7 100644
--- a/devel/p5-Directory-Scratch/Makefile
+++ b/devel/p5-Directory-Scratch/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Easy-to-use self-cleaning scratch space
 
-BUILD_DEPENDS=	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-File-Slurp>=9999.12:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-String-Random>0:${PORTSDIR}/devel/p5-String-Random
+BUILD_DEPENDS=	p5-Path-Class>0:devel/p5-Path-Class \
+		p5-File-Slurp>=9999.12:devel/p5-File-Slurp \
+		p5-String-Random>0:devel/p5-String-Random
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Dist-CheckConflicts/Makefile b/devel/p5-Dist-CheckConflicts/Makefile
index 5eebb4187f61..9d8334c33fdd 100644
--- a/devel/p5-Dist-CheckConflicts/Makefile
+++ b/devel/p5-Dist-CheckConflicts/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Declare version conflicts for your dist
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Module-Runtime>=0.009:${PORTSDIR}/devel/p5-Module-Runtime
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+RUN_DEPENDS=	p5-Module-Runtime>=0.009:devel/p5-Module-Runtime
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Dist-Joseki/Makefile b/devel/p5-Dist-Joseki/Makefile
index d43c475aa767..a8b185b223c4 100644
--- a/devel/p5-Dist-Joseki/Makefile
+++ b/devel/p5-Dist-Joseki/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Tools for the prolific module author
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Class-Accessor-Complex>=0:${PORTSDIR}/devel/p5-Class-Accessor-Complex \
-		p5-Data-Rmap>=0:${PORTSDIR}/devel/p5-Data-Rmap \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Getopt-Attribute>=0:${PORTSDIR}/devel/p5-Getopt-Attribute \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-App-Cmd>=0:devel/p5-App-Cmd \
+		p5-Class-Accessor-Complex>=0:devel/p5-Class-Accessor-Complex \
+		p5-Data-Rmap>=0:devel/p5-Data-Rmap \
+		p5-Error>=0:lang/p5-Error \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Getopt-Attribute>=0:devel/p5-Getopt-Attribute \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS+=	p5-URI>=0:net/p5-URI
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Dist-Metadata/Makefile b/devel/p5-Dist-Metadata/Makefile
index f2cbe877d9af..51cfb6b7c125 100644
--- a/devel/p5-Dist-Metadata/Makefile
+++ b/devel/p5-Dist-Metadata/Makefile
@@ -13,18 +13,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Archive-Zip>=1.30:${PORTSDIR}/archivers/p5-Archive-Zip \
-	p5-CPAN-DistnameInfo>=0.12:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-	p5-CPAN-Meta>=2.1:${PORTSDIR}/devel/p5-CPAN-Meta \
-	p5-File-Spec-Native>=1.002:${PORTSDIR}/devel/p5-File-Spec-Native \
-	p5-Module-Metadata>0:${PORTSDIR}/devel/p5-Module-Metadata \
-	p5-Path-Class>=0.24:${PORTSDIR}/devel/p5-Path-Class \
-	p5-Try-Tiny>=0.09:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip \
+	p5-CPAN-DistnameInfo>=0.12:devel/p5-CPAN-DistnameInfo \
+	p5-CPAN-Meta>=2.1:devel/p5-CPAN-Meta \
+	p5-File-Spec-Native>=1.002:devel/p5-File-Spec-Native \
+	p5-Module-Metadata>0:devel/p5-Module-Metadata \
+	p5-Path-Class>=0.24:devel/p5-Path-Class \
+	p5-Try-Tiny>=0.09:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-	p5-Test-MockObject>0:${PORTSDIR}/devel/p5-Test-MockObject \
-	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+	p5-Test-MockObject>0:devel/p5-Test-MockObject \
+	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Dist-Zilla/Makefile b/devel/p5-Dist-Zilla/Makefile
index 27ba901fb862..e99142bd59ef 100644
--- a/devel/p5-Dist-Zilla/Makefile
+++ b/devel/p5-Dist-Zilla/Makefile
@@ -10,53 +10,53 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Distribution builder
 
-BUILD_DEPENDS=	p5-App-Cmd>=0.309:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-		p5-CPAN-Uploader>=0.101550:${PORTSDIR}/devel/p5-CPAN-Uploader \
-		p5-Class-Load>=0.17:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Config-MVP-Reader-INI>=2:${PORTSDIR}/devel/p5-Config-MVP-Reader-INI \
-		p5-Config-MVP>=2.200002:${PORTSDIR}/devel/p5-Config-MVP \
-		p5-Data-Section>=0.004:${PORTSDIR}/devel/p5-Data-Section \
-		p5-DateTime>=0.44:${PORTSDIR}/devel/p5-DateTime \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-ShareDir-Install>=0.03:${PORTSDIR}/devel/p5-File-ShareDir-Install \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-File-pushd>=0:${PORTSDIR}/devel/p5-File-pushd \
-		p5-Hash-Merge-Simple>=0:${PORTSDIR}/devel/p5-Hash-Merge-Simple \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-List-AllUtils>=0:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Log-Dispatchouli>=1.102220:${PORTSDIR}/devel/p5-Log-Dispatchouli \
-		p5-Moose-Autobox>=0.10:${PORTSDIR}/devel/p5-Moose-Autobox \
-		p5-Moose>=0.92:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-LazyRequire>=0:${PORTSDIR}/devel/p5-MooseX-LazyRequire \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-SetOnce>=0:${PORTSDIR}/devel/p5-MooseX-SetOnce \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-MooseX-Types-Perl>=0:${PORTSDIR}/devel/p5-MooseX-Types-Perl \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Perl-PrereqScanner>=1.005:${PORTSDIR}/devel/p5-Perl-PrereqScanner \
-		p5-Perl-Version>=0:${PORTSDIR}/devel/p5-Perl-Version \
-		p5-Pod-Eventual>=0.091480:${PORTSDIR}/textproc/p5-Pod-Eventual \
-		p5-Software-License>=0.101370:${PORTSDIR}/misc/p5-Software-License \
-		p5-String-Formatter>=0.100680:${PORTSDIR}/devel/p5-String-Formatter \
-		p5-String-RewritePrefix>=0.005:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-Sub-Exporter-ForMethods>=0:${PORTSDIR}/devel/p5-Sub-Exporter-ForMethods \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Text-Glob>=0.08:${PORTSDIR}/textproc/p5-Text-Glob \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-YAML-Tiny>=0:${PORTSDIR}/textproc/p5-YAML-Tiny \
-		p5-autobox>=2.53:${PORTSDIR}/devel/p5-autobox \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-App-Cmd>=0.309:devel/p5-App-Cmd \
+		p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements \
+		p5-CPAN-Uploader>=0.101550:devel/p5-CPAN-Uploader \
+		p5-Class-Load>=0.17:devel/p5-Class-Load \
+		p5-Config-MVP-Reader-INI>=2:devel/p5-Config-MVP-Reader-INI \
+		p5-Config-MVP>=2.200002:devel/p5-Config-MVP \
+		p5-Data-Section>=0.004:devel/p5-Data-Section \
+		p5-DateTime>=0.44:devel/p5-DateTime \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-File-pushd>=0:devel/p5-File-pushd \
+		p5-Hash-Merge-Simple>=0:devel/p5-Hash-Merge-Simple \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-List-AllUtils>=0:devel/p5-List-AllUtils \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Log-Dispatchouli>=1.102220:devel/p5-Log-Dispatchouli \
+		p5-Moose-Autobox>=0.10:devel/p5-Moose-Autobox \
+		p5-Moose>=0.92:devel/p5-Moose \
+		p5-MooseX-LazyRequire>=0:devel/p5-MooseX-LazyRequire \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-SetOnce>=0:devel/p5-MooseX-SetOnce \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-MooseX-Types-Perl>=0:devel/p5-MooseX-Types-Perl \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-PPI>=0:textproc/p5-PPI \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Perl-PrereqScanner>=1.005:devel/p5-Perl-PrereqScanner \
+		p5-Perl-Version>=0:devel/p5-Perl-Version \
+		p5-Pod-Eventual>=0.091480:textproc/p5-Pod-Eventual \
+		p5-Software-License>=0.101370:misc/p5-Software-License \
+		p5-String-Formatter>=0.100680:devel/p5-String-Formatter \
+		p5-String-RewritePrefix>=0.005:textproc/p5-String-RewritePrefix \
+		p5-Sub-Exporter-ForMethods>=0:devel/p5-Sub-Exporter-ForMethods \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Text-Glob>=0.08:textproc/p5-Text-Glob \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
+		p5-autobox>=2.53:devel/p5-autobox \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Doxygen-Filter-Perl/Makefile b/devel/p5-Doxygen-Filter-Perl/Makefile
index 4f87c4485556..dd877321fd9f 100644
--- a/devel/p5-Doxygen-Filter-Perl/Makefile
+++ b/devel/p5-Doxygen-Filter-Perl/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Input filter for Doxygen enabling support for Perl code documentation
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-		p5-Pod-POM>=0.27:${PORTSDIR}/textproc/p5-Pod-POM \
-		p5-Log-Log4perl>=1.33:${PORTSDIR}/devel/p5-Log-Log4perl
-TEST_DEPENDS=	p5-Test-Output>=1.01:${PORTSDIR}/devel/p5-Test-Output
+RUN_DEPENDS=	doxygen:devel/doxygen \
+		p5-Pod-POM>=0.27:textproc/p5-Pod-POM \
+		p5-Log-Log4perl>=1.33:devel/p5-Log-Log4perl
+TEST_DEPENDS=	p5-Test-Output>=1.01:devel/p5-Test-Output
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DynaLoader-Functions/Makefile b/devel/p5-DynaLoader-Functions/Makefile
index 5318261bad5d..87c2568ecab0 100644
--- a/devel/p5-DynaLoader-Functions/Makefile
+++ b/devel/p5-DynaLoader-Functions/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Deconstructed dynamic C library loading
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-EV/Makefile b/devel/p5-EV/Makefile
index 09790b010c63..f8d330c492af 100644
--- a/devel/p5-EV/Makefile
+++ b/devel/p5-EV/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl interface to libev, a high performance full-featured event loop
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
-BUILD_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense \
-		p5-Canary-Stability>=0:${PORTSDIR}/devel/p5-Canary-Stability
+RUN_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense
+BUILD_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense \
+		p5-Canary-Stability>=0:devel/p5-Canary-Stability
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Error-Helper/Makefile b/devel/p5-Error-Helper/Makefile
index 3092c9caeb37..61ea082ef3f1 100644
--- a/devel/p5-Error-Helper/Makefile
+++ b/devel/p5-Error-Helper/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Provides some easy error related methods
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Eval-Closure/Makefile b/devel/p5-Eval-Closure/Makefile
index 5aaa784d7be6..c6544d6a144b 100644
--- a/devel/p5-Eval-Closure/Makefile
+++ b/devel/p5-Eval-Closure/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Safely and cleanly create closures via string eval
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Devel-LexAlias>=0.05:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Devel-LexAlias>=0.05:devel/p5-Devel-LexAlias \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Eval-Context/Makefile b/devel/p5-Eval-Context/Makefile
index dc836ad8ef04..3dcfce0adfc9 100644
--- a/devel/p5-Eval-Context/Makefile
+++ b/devel/p5-Eval-Context/Makefile
@@ -15,20 +15,20 @@ COMMENT=	Evaluate Perl code in context wrapper
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Package-Generator>=0:${PORTSDIR}/devel/p5-Package-Generator \
-		p5-Test-Spelling>=0:${PORTSDIR}/devel/p5-Test-Spelling \
-		p5-Test-Block>=0:${PORTSDIR}/devel/p5-Test-Block \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Distribution>=0:${PORTSDIR}/devel/p5-Test-Distribution \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Dependencies>=0:${PORTSDIR}/devel/p5-Test-Dependencies \
-		p5-Test-Strict>=0:${PORTSDIR}/devel/p5-Test-Strict \
-		p5-Directory-Scratch-Structured>=0:${PORTSDIR}/devel/p5-Directory-Scratch-Structured \
-		p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper \
-		p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Package-Generator>=0:devel/p5-Package-Generator \
+		p5-Test-Spelling>=0:devel/p5-Test-Spelling \
+		p5-Test-Block>=0:devel/p5-Test-Block \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Distribution>=0:devel/p5-Test-Distribution \
+		p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Dependencies>=0:devel/p5-Test-Dependencies \
+		p5-Test-Strict>=0:devel/p5-Test-Strict \
+		p5-Directory-Scratch-Structured>=0:devel/p5-Directory-Scratch-Structured \
+		p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+		p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-File-Slurp>=0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Eval-WithLexicals/Makefile b/devel/p5-Eval-WithLexicals/Makefile
index def218701dcd..059ff2b6289d 100644
--- a/devel/p5-Eval-WithLexicals/Makefile
+++ b/devel/p5-Eval-WithLexicals/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moo>=0.009006:${PORTSDIR}/devel/p5-Moo
+	p5-Moo>=0.009006:devel/p5-Moo
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Event-ExecFlow/Makefile b/devel/p5-Event-ExecFlow/Makefile
index d8b991bb8915..c809d9aa36f5 100644
--- a/devel/p5-Event-ExecFlow/Makefile
+++ b/devel/p5-Event-ExecFlow/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	API for complex flow controls with asynchronous execution of external programs
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Locale-libintl>=0:devel/p5-Locale-libintl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Event-Join/Makefile b/devel/p5-Event-Join/Makefile
index e7f48c10b1e6..94c24e56743f 100644
--- a/devel/p5-Event-Join/Makefile
+++ b/devel/p5-Event-Join/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Join multiple "events" into one
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -25,7 +25,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Event-Lib/Makefile b/devel/p5-Event-Lib/Makefile
index 8278a7a8d2a4..a8688a23ce20 100644
--- a/devel/p5-Event-Lib/Makefile
+++ b/devel/p5-Event-Lib/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Makes libevent(3) accessible with Perl
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Event-Notify/Makefile b/devel/p5-Event-Notify/Makefile
index bf28acae70ac..0326dd1a922f 100644
--- a/devel/p5-Event-Notify/Makefile
+++ b/devel/p5-Event-Notify/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Simple Observer/Notifier
 
-BUILD_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
-RUN_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+BUILD_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
+RUN_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Event-RPC/Makefile b/devel/p5-Event-RPC/Makefile
index 639dd18b9aca..d79c121d3875 100644
--- a/devel/p5-Event-RPC/Makefile
+++ b/devel/p5-Event-RPC/Makefile
@@ -28,24 +28,24 @@ OPTIONS_DEFAULT=	EVENT ANYEVENT SSL
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-BUILD_DEPENDS=	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS=	p5-Storable>=0:devel/p5-Storable
 
 .if ${PORT_OPTIONS:MEVENT}
-BUILD_DEPENDS+=	p5-Event>=0:${PORTSDIR}/devel/p5-Event
+BUILD_DEPENDS+=	p5-Event>=0:devel/p5-Event
 .endif
 
 .if ${PORT_OPTIONS:MANYEVENT}
-BUILD_DEPENDS+=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
+BUILD_DEPENDS+=	p5-AnyEvent>=0:devel/p5-AnyEvent
 .endif
 
 .if ${PORT_OPTIONS:MGLIB}
-BUILD_DEPENDS+=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS+=	p5-Glib2>=0:devel/p5-Glib2
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
-BUILD_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS+=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 .endif
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/devel/p5-Every/Makefile b/devel/p5-Every/Makefile
index 483fe4f8b7f8..595d212b9812 100644
--- a/devel/p5-Every/Makefile
+++ b/devel/p5-Every/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Return true every N cycles or S seconds
 
-BUILD_DEPENDS=	p5-Devel-Callsite>=0.04:${PORTSDIR}/devel/p5-Devel-Callsite
+BUILD_DEPENDS=	p5-Devel-Callsite>=0.04:devel/p5-Devel-Callsite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Exception-Class-TryCatch/Makefile b/devel/p5-Exception-Class-TryCatch/Makefile
index e6998ad968de..8d29e7d0ab8a 100644
--- a/devel/p5-Exception-Class-TryCatch/Makefile
+++ b/devel/p5-Exception-Class-TryCatch/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Syntactic try/catch sugar for use with Exception::Class
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS+=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class
-RUN_DEPENDS+=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS+=	p5-Exception-Class>=0:devel/p5-Exception-Class
+RUN_DEPENDS+=	p5-Exception-Class>=0:devel/p5-Exception-Class
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index 29024d97237b..8d18c05180c6 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0.02:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Devel-StackTrace>=2.00:${PORTSDIR}/devel/p5-Devel-StackTrace
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable \
+		p5-Devel-StackTrace>=2.00:devel/p5-Devel-StackTrace
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Expect-Simple/Makefile b/devel/p5-Expect-Simple/Makefile
index 0539425dd270..9fa65b62c509 100644
--- a/devel/p5-Expect-Simple/Makefile
+++ b/devel/p5-Expect-Simple/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Wrapper around the Expect module
 
-BUILD_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect
+BUILD_DEPENDS=	p5-Expect>=0:lang/p5-Expect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Exporter-Declare/Makefile b/devel/p5-Exporter-Declare/Makefile
index bda73882043d..e8130e94187d 100644
--- a/devel/p5-Exporter-Declare/Makefile
+++ b/devel/p5-Exporter-Declare/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Meta-Builder>=0.003:${PORTSDIR}/devel/p5-Meta-Builder \
-	p5-aliased>0:${PORTSDIR}/devel/p5-aliased
+	p5-Meta-Builder>=0.003:devel/p5-Meta-Builder \
+	p5-aliased>0:devel/p5-aliased
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Fennec-Lite>=0:${PORTSDIR}/devel/p5-Fennec-Lite \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Fennec-Lite>=0:devel/p5-Fennec-Lite \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=	perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Exporter-Tiny/Makefile b/devel/p5-Exporter-Tiny/Makefile
index b1415e9366b6..09338b7a31c5 100644
--- a/devel/p5-Exporter-Tiny/Makefile
+++ b/devel/p5-Exporter-Tiny/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Exporter with features of Sub::Exporter but only core dependencies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-ExtUtils-CChecker/Makefile b/devel/p5-ExtUtils-CChecker/Makefile
index 1a26627c8d67..988ffe56363a 100644
--- a/devel/p5-ExtUtils-CChecker/Makefile
+++ b/devel/p5-ExtUtils-CChecker/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Configure-time utilities for using C headers, libraries, OS features
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-ExtUtils-CppGuess/Makefile b/devel/p5-ExtUtils-CppGuess/Makefile
index d608cafc365b..b04f41443f95 100644
--- a/devel/p5-ExtUtils-CppGuess/Makefile
+++ b/devel/p5-ExtUtils-CppGuess/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Guess C++ compiler and flags
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+BUILD_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-ExtUtils-InstallPaths/Makefile b/devel/p5-ExtUtils-InstallPaths/Makefile
index 12c409223f29..1f34b3372056 100644
--- a/devel/p5-ExtUtils-InstallPaths/Makefile
+++ b/devel/p5-ExtUtils-InstallPaths/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Build.PL install path logic made easy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Config>=0.002:${PORTSDIR}/devel/p5-ExtUtils-Config
+BUILD_DEPENDS=	p5-ExtUtils-Config>=0.002:devel/p5-ExtUtils-Config
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile b/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
index 4efb0c9fcec4..8e149b8b8d68 100644
--- a/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Cpanfile support for ExtUtils::MakeMaker
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-CPANfile>=0:${PORTSDIR}/devel/p5-Module-CPANfile
+BUILD_DEPENDS=	p5-Module-CPANfile>=0:devel/p5-Module-CPANfile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
index dabe08e15ca4..ac1663e5c410 100644
--- a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Add a Makefile target to determine test coverage using Devel::Cover
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Cover>=0:${PORTSDIR}/devel/p5-Devel-Cover \
-		p5-Object-Accessor>=0:${PORTSDIR}/devel/p5-Object-Accessor
+BUILD_DEPENDS=	p5-Devel-Cover>=0:devel/p5-Devel-Cover \
+		p5-Object-Accessor>=0:devel/p5-Object-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index 4e3b22e28f01..1dde9b2ab749 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -20,8 +20,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-ExtUtils-Manifest>=1.65:${PORTSDIR}/devel/p5-ExtUtils-Manifest
-RUN_DEPENDS+=	p5-ExtUtils-Manifest>=1.65:${PORTSDIR}/devel/p5-ExtUtils-Manifest
+BUILD_DEPENDS+=	p5-ExtUtils-Manifest>=1.65:devel/p5-ExtUtils-Manifest
+RUN_DEPENDS+=	p5-ExtUtils-Manifest>=1.65:devel/p5-ExtUtils-Manifest
 .endif
 
 post-patch:
diff --git a/devel/p5-ExtUtils-XSBuilder/Makefile b/devel/p5-ExtUtils-XSBuilder/Makefile
index 52ec04c4ab9d..d6a618bea0d0 100644
--- a/devel/p5-ExtUtils-XSBuilder/Makefile
+++ b/devel/p5-ExtUtils-XSBuilder/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Autogenerating XS-glue Code
 
-RUN_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+RUN_DEPENDS=	p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ExtUtils-XSpp/Makefile b/devel/p5-ExtUtils-XSpp/Makefile
index 2363634d11f7..97f6e8874b5a 100644
--- a/devel/p5-ExtUtils-XSpp/Makefile
+++ b/devel/p5-ExtUtils-XSpp/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS for C++ in Perl
 
-BUILD_DEPENDS=	p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+BUILD_DEPENDS=	p5-Test-Base>=0:devel/p5-Test-Base \
+		p5-Test-Differences>=0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile
index 28995d7a06f8..f829129b56cd 100644
--- a/devel/p5-FSA-Rules/Makefile
+++ b/devel/p5-FSA-Rules/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Build simple rules-based state machines in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GraphViz>=2:${PORTSDIR}/graphics/p5-GraphViz \
-		p5-Text-Tabs+Wrap>=0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+BUILD_DEPENDS=	p5-GraphViz>=2:graphics/p5-GraphViz \
+		p5-Text-Tabs+Wrap>=0:textproc/p5-Text-Tabs+Wrap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Append-TempFile/Makefile b/devel/p5-File-Append-TempFile/Makefile
index 6504e6f3776a..4fa2b8ac1237 100644
--- a/devel/p5-File-Append-TempFile/Makefile
+++ b/devel/p5-File-Append-TempFile/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Append data to files using a temporary copy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/p5-File-Assets/Makefile b/devel/p5-File-Assets/Makefile
index baa568d1872d..b75a3c3e7e9e 100644
--- a/devel/p5-File-Assets/Makefile
+++ b/devel/p5-File-Assets/Makefile
@@ -12,30 +12,30 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl module to Manage .css and .js assets
 
-BUILD_DEPENDS=	p5-Test-Memory-Cycle>0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-	p5-Directory-Scratch>0:${PORTSDIR}/devel/p5-Directory-Scratch \
-	p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-	p5-Path-Resource>0:${PORTSDIR}/devel/p5-Path-Resource \
-	p5-Tie-LLHash>0:${PORTSDIR}/devel/p5-Tie-LLHash \
-	p5-Carp-Clan-Share>0:${PORTSDIR}/devel/p5-Carp-Clan-Share \
-	p5-Object-Tiny>0:${PORTSDIR}/devel/p5-Object-Tiny \
-	p5-HTML-Declare>0:${PORTSDIR}/www/p5-HTML-Declare \
-	p5-XML-Tiny>0:${PORTSDIR}/textproc/p5-XML-Tiny \
-	p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-CSS-Minifier-XS>=0:${PORTSDIR}/textproc/p5-CSS-Minifier-XS \
-	p5-JavaScript-Minifier-XS>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier-XS
-RUN_DEPENDS=	p5-Test-Memory-Cycle>0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-	p5-Directory-Scratch>0:${PORTSDIR}/devel/p5-Directory-Scratch \
-	p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-	p5-Path-Resource>0:${PORTSDIR}/devel/p5-Path-Resource \
-	p5-Tie-LLHash>0:${PORTSDIR}/devel/p5-Tie-LLHash \
-	p5-Carp-Clan-Share>0:${PORTSDIR}/devel/p5-Carp-Clan-Share \
-	p5-Object-Tiny>0:${PORTSDIR}/devel/p5-Object-Tiny \
-	p5-HTML-Declare>0:${PORTSDIR}/www/p5-HTML-Declare \
-	p5-XML-Tiny>0:${PORTSDIR}/textproc/p5-XML-Tiny \
-	p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-CSS-Minifier-XS>=0:${PORTSDIR}/textproc/p5-CSS-Minifier-XS \
-	p5-JavaScript-Minifier-XS>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier-XS
+BUILD_DEPENDS=	p5-Test-Memory-Cycle>0:devel/p5-Test-Memory-Cycle \
+	p5-Directory-Scratch>0:devel/p5-Directory-Scratch \
+	p5-MIME-Types>0:mail/p5-MIME-Types \
+	p5-Path-Resource>0:devel/p5-Path-Resource \
+	p5-Tie-LLHash>0:devel/p5-Tie-LLHash \
+	p5-Carp-Clan-Share>0:devel/p5-Carp-Clan-Share \
+	p5-Object-Tiny>0:devel/p5-Object-Tiny \
+	p5-HTML-Declare>0:www/p5-HTML-Declare \
+	p5-XML-Tiny>0:textproc/p5-XML-Tiny \
+	p5-IO-stringy>0:devel/p5-IO-stringy \
+	p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
+	p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS
+RUN_DEPENDS=	p5-Test-Memory-Cycle>0:devel/p5-Test-Memory-Cycle \
+	p5-Directory-Scratch>0:devel/p5-Directory-Scratch \
+	p5-MIME-Types>0:mail/p5-MIME-Types \
+	p5-Path-Resource>0:devel/p5-Path-Resource \
+	p5-Tie-LLHash>0:devel/p5-Tie-LLHash \
+	p5-Carp-Clan-Share>0:devel/p5-Carp-Clan-Share \
+	p5-Object-Tiny>0:devel/p5-Object-Tiny \
+	p5-HTML-Declare>0:www/p5-HTML-Declare \
+	p5-XML-Tiny>0:textproc/p5-XML-Tiny \
+	p5-IO-stringy>0:devel/p5-IO-stringy \
+	p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
+	p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Attributes-Recursive/Makefile b/devel/p5-File-Attributes-Recursive/Makefile
index 69a3b79a2eba..6eb476f0c395 100644
--- a/devel/p5-File-Attributes-Recursive/Makefile
+++ b/devel/p5-File-Attributes-Recursive/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Inherit file attributes from parent directories
 
-BUILD_DEPENDS=	p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-File-Attributes>=0:${PORTSDIR}/devel/p5-File-Attributes
+BUILD_DEPENDS=	p5-Directory-Scratch>=0:devel/p5-Directory-Scratch \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-File-Attributes>=0:devel/p5-File-Attributes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Attributes/Makefile b/devel/p5-File-Attributes/Makefile
index 9ec93b18c012..ce1ddcf65426 100644
--- a/devel/p5-File-Attributes/Makefile
+++ b/devel/p5-File-Attributes/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	File::Attributes - Manipulate file metadata
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch \
-		p5-Best>=0:${PORTSDIR}/devel/p5-Best \
-		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML \
+		p5-Directory-Scratch>=0:devel/p5-Directory-Scratch \
+		p5-Best>=0:devel/p5-Best \
+		p5-YAML-Syck>0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-BOM/Makefile b/devel/p5-File-BOM/Makefile
index 2c433183eabf..fb90bbdee20a 100644
--- a/devel/p5-File-BOM/Makefile
+++ b/devel/p5-File-BOM/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl module to handle Unicode byte order marks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-File-BaseDir/Makefile b/devel/p5-File-BaseDir/Makefile
index 2064b89f5c11..e18d9f26af2d 100644
--- a/devel/p5-File-BaseDir/Makefile
+++ b/devel/p5-File-BaseDir/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Use the freedesktop basedir spec
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IPC-System-Simple>=0:${PORTSDIR}/devel/p5-IPC-System-Simple
+BUILD_DEPENDS=	p5-IPC-System-Simple>=0:devel/p5-IPC-System-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which  \
-		p5-Test-Pod>=1.00:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.00:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which  \
+		p5-Test-Pod>=1.00:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.00:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-File-Binary/Makefile b/devel/p5-File-Binary/Makefile
index 91f08113e2b4..eb06ee249146 100644
--- a/devel/p5-File-Binary/Makefile
+++ b/devel/p5-File-Binary/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to modify and read binary files
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-ChangeNotify/Makefile b/devel/p5-File-ChangeNotify/Makefile
index ac0bacbf9586..946302f851ec 100644
--- a/devel/p5-File-ChangeNotify/Makefile
+++ b/devel/p5-File-ChangeNotify/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Watch for changes to files
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-IO-KQueue>=0:${PORTSDIR}/devel/p5-IO-KQueue \
-		p5-MooseX-Params-Validate>=0:${PORTSDIR}/devel/p5-MooseX-Params-Validate \
-		p5-MooseX-SemiAffordanceAccessor>=0:${PORTSDIR}/devel/p5-MooseX-SemiAffordanceAccessor \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+RUN_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-IO-KQueue>=0:devel/p5-IO-KQueue \
+		p5-MooseX-Params-Validate>=0:devel/p5-MooseX-Params-Validate \
+		p5-MooseX-SemiAffordanceAccessor>=0:devel/p5-MooseX-SemiAffordanceAccessor \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-File-ConfigDir/Makefile b/devel/p5-File-ConfigDir/Makefile
index 652ba9ca45b6..224d3bbb86ce 100644
--- a/devel/p5-File-ConfigDir/Makefile
+++ b/devel/p5-File-ConfigDir/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Get directories of configuration files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0.50:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-File-HomeDir>=0.50:devel/p5-File-HomeDir \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-CreationTime/Makefile b/devel/p5-File-CreationTime/Makefile
index 1de5ac050d0e..07b1dfc456d6 100644
--- a/devel/p5-File-CreationTime/Makefile
+++ b/devel/p5-File-CreationTime/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Keeps track of file creation times
 
-BUILD_DEPENDS=	p5-File-Attributes>=0:${PORTSDIR}/devel/p5-File-Attributes
+BUILD_DEPENDS=	p5-File-Attributes>=0:devel/p5-File-Attributes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-DesktopEntry/Makefile b/devel/p5-File-DesktopEntry/Makefile
index 39fba6197283..5598c15a4584 100644
--- a/devel/p5-File-DesktopEntry/Makefile
+++ b/devel/p5-File-DesktopEntry/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Object to handle desktop files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-BaseDir>=0.03:${PORTSDIR}/devel/p5-File-BaseDir
+BUILD_DEPENDS=	p5-File-BaseDir>=0.03:devel/p5-File-BaseDir
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Dir-Dumper/Makefile b/devel/p5-File-Dir-Dumper/Makefile
index 0b9ff4d6953d..36cb152d3fb9 100644
--- a/devel/p5-File-Dir-Dumper/Makefile
+++ b/devel/p5-File-Dir-Dumper/Makefile
@@ -12,11 +12,11 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	tolid@tolid.eu.org
 COMMENT=	Perl5 module to dump directory structures meta-data
 
-BUILD_DEPENDS=	p5-File-Find-Object>0:${PORTSDIR}/devel/p5-File-Find-Object \
-		p5-IO-String>0:${PORTSDIR}/devel/p5-IO-String \
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Devel-CheckOS>0:${PORTSDIR}/devel/p5-Devel-CheckOS
+BUILD_DEPENDS=	p5-File-Find-Object>0:devel/p5-File-Find-Object \
+		p5-IO-String>0:devel/p5-IO-String \
+		p5-JSON>0:converters/p5-JSON \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Devel-CheckOS>0:devel/p5-Devel-CheckOS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Find-Object/Makefile b/devel/p5-File-Find-Object/Makefile
index e25a987c128d..8d31d42142a4 100644
--- a/devel/p5-File-Find-Object/Makefile
+++ b/devel/p5-File-Find-Object/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Object oriented File::Find replacement
 LICENSE=	ART20 GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor
+BUILD_DEPENDS=	p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
index 1f2b0cfef872..66a8b0b4761b 100644
--- a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
+++ b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
@@ -14,9 +14,9 @@ COMMENT=	File::Find::Rule adapted to Filesys::Virtual
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Filesys-Virtual>=0:${PORTSDIR}/devel/p5-Filesys-Virtual \
-		p5-Filesys-Virtual-Plain>=0:${PORTSDIR}/devel/p5-Filesys-Virtual-Plain
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-Filesys-Virtual>=0:devel/p5-Filesys-Virtual \
+		p5-Filesys-Virtual-Plain>=0:devel/p5-Filesys-Virtual-Plain
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Find-Rule-Perl/Makefile b/devel/p5-File-Find-Rule-Perl/Makefile
index b801b83946c9..5b1079d067b7 100644
--- a/devel/p5-File-Find-Rule-Perl/Makefile
+++ b/devel/p5-File-Find-Rule-Perl/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Common rules for searching for Perl things
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0.20:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Parse-CPAN-Meta>=1.38:${PORTSDIR}/devel/p5-Parse-CPAN-Meta \
-		p5-Params-Util>=0.38:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-File-Find-Rule>=0.20:devel/p5-File-Find-Rule \
+		p5-Parse-CPAN-Meta>=1.38:devel/p5-Parse-CPAN-Meta \
+		p5-Params-Util>=0.38:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Find-Rule-VCS/Makefile b/devel/p5-File-Find-Rule-VCS/Makefile
index 748f9fdc01e0..7f7af7d988fd 100644
--- a/devel/p5-File-Find-Rule-VCS/Makefile
+++ b/devel/p5-File-Find-Rule-VCS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Exclude files and directories for Version Control Systems
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0.20:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Text-Glob>=0.08:${PORTSDIR}/textproc/p5-Text-Glob
+BUILD_DEPENDS=	p5-File-Find-Rule>=0.20:devel/p5-File-Find-Rule \
+		p5-Text-Glob>=0.08:textproc/p5-Text-Glob
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Find-Rule/Makefile b/devel/p5-File-Find-Rule/Makefile
index a6d199c65605..d98a978cf4eb 100644
--- a/devel/p5-File-Find-Rule/Makefile
+++ b/devel/p5-File-Find-Rule/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Alternative interface to File::Find
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Number-Compare>=0:${PORTSDIR}/math/p5-Number-Compare \
-		p5-Text-Glob>=0.07:${PORTSDIR}/textproc/p5-Text-Glob
+RUN_DEPENDS=	p5-Number-Compare>=0:math/p5-Number-Compare \
+		p5-Text-Glob>=0.07:textproc/p5-Text-Glob
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Finder/Makefile b/devel/p5-File-Finder/Makefile
index 52d58d40a235..e4e98b3d0f92 100644
--- a/devel/p5-File-Finder/Makefile
+++ b/devel/p5-File-Finder/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Nice wrapper for File::Find ala find(1)
 
-RUN_DEPENDS=	p5-Text-Glob>0:${PORTSDIR}/textproc/p5-Text-Glob
+RUN_DEPENDS=	p5-Text-Glob>0:textproc/p5-Text-Glob
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Flat/Makefile b/devel/p5-File-Flat/Makefile
index 8575b45d6016..700271ff7bed 100644
--- a/devel/p5-File-Flat/Makefile
+++ b/devel/p5-File-Flat/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implements a flat filesystem
 
-BUILD_DEPENDS=	p5-File-NCopy>=0:${PORTSDIR}/devel/p5-File-NCopy \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Remove>=0:${PORTSDIR}/devel/p5-File-Remove \
-		p5-Class-Autouse>=0:${PORTSDIR}/devel/p5-Class-Autouse \
-		p5-prefork>=0:${PORTSDIR}/devel/p5-prefork
+BUILD_DEPENDS=	p5-File-NCopy>=0:devel/p5-File-NCopy \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-Remove>=0:devel/p5-File-Remove \
+		p5-Class-Autouse>=0:devel/p5-Class-Autouse \
+		p5-prefork>=0:devel/p5-prefork
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-ClassAPI>=0:${PORTSDIR}/devel/p5-Test-ClassAPI
+TEST_DEPENDS=	p5-Test-ClassAPI>=0:devel/p5-Test-ClassAPI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Flock-Retry/Makefile b/devel/p5-File-Flock-Retry/Makefile
index 8573e661db0b..d2d968b202a5 100644
--- a/devel/p5-File-Flock-Retry/Makefile
+++ b/devel/p5-File-Flock-Retry/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Yet another flock module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir
+TEST_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-File-chdir>=0:devel/p5-File-chdir
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-File-Flock/Makefile b/devel/p5-File-Flock/Makefile
index dd45fd851df9..d2937868a215 100644
--- a/devel/p5-File-Flock/Makefile
+++ b/devel/p5-File-Flock/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl5 module for file locking with flock
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Data-Structure-Util>=0:${PORTSDIR}/devel/p5-Data-Structure-Util \
-		p5-IO-Event>=0.812:${PORTSDIR}/devel/p5-IO-Event
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util \
+		p5-IO-Event>=0.812:devel/p5-IO-Event
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Test-SharedFork>=0:${PORTSDIR}/devel/p5-Test-SharedFork
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Test-SharedFork>=0:devel/p5-Test-SharedFork
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-HomeDir-PathClass/Makefile b/devel/p5-File-HomeDir-PathClass/Makefile
index 8c563ce53b2c..49e9f0e44c7f 100644
--- a/devel/p5-File-HomeDir-PathClass/Makefile
+++ b/devel/p5-File-HomeDir-PathClass/Makefile
@@ -13,9 +13,9 @@ COMMENT=	File::HomeDir returning Path::Class objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0.93:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-File-HomeDir>=0.93:devel/p5-File-HomeDir \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-HomeDir/Makefile b/devel/p5-File-HomeDir/Makefile
index a00393e461a4..5d9d0c3ba848 100644
--- a/devel/p5-File-HomeDir/Makefile
+++ b/devel/p5-File-HomeDir/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Get home directory for self or other users
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
-RUN_DEPENDS=	p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
+BUILD_DEPENDS=	p5-File-Which>=0.05:sysutils/p5-File-Which
+RUN_DEPENDS=	p5-File-Which>=0.05:sysutils/p5-File-Which
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Map/Makefile b/devel/p5-File-Map/Makefile
index 03dddf424feb..4f96d289e26e 100644
--- a/devel/p5-File-Map/Makefile
+++ b/devel/p5-File-Map/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Memory mapping made simple and safe
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PerlIO-Layers>=0:${PORTSDIR}/devel/p5-PerlIO-Layers \
-		p5-Sub-Exporter-Progressive>=0.001005:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-PerlIO-Layers>=0:devel/p5-PerlIO-Layers \
+		p5-Sub-Exporter-Progressive>=0.001005:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-File-MimeInfo/Makefile b/devel/p5-File-MimeInfo/Makefile
index 9c94b3d79830..992844dd14a5 100644
--- a/devel/p5-File-MimeInfo/Makefile
+++ b/devel/p5-File-MimeInfo/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Determine file type
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-BaseDir>=0.03:${PORTSDIR}/devel/p5-File-BaseDir \
-		p5-File-DesktopEntry>=0.04:${PORTSDIR}/devel/p5-File-DesktopEntry
+BUILD_DEPENDS=	p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \
+		p5-File-DesktopEntry>=0.04:devel/p5-File-DesktopEntry
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Modified/Makefile b/devel/p5-File-Modified/Makefile
index ba89b1fb3751..38d6fca62148 100644
--- a/devel/p5-File-Modified/Makefile
+++ b/devel/p5-File-Modified/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module for checking intelligently if files have changed
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Pid/Makefile b/devel/p5-File-Pid/Makefile
index 0ddf2c86614d..3cb5dad75771 100644
--- a/devel/p5-File-Pid/Makefile
+++ b/devel/p5-File-Pid/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pid File Manipulation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Policy/Makefile b/devel/p5-File-Policy/Makefile
index cc077ff6e661..3f8896551f7b 100644
--- a/devel/p5-File-Policy/Makefile
+++ b/devel/p5-File-Policy/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple policy for file I/O functions
 
-BUILD_DEPENDS=	p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace \
-		p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-Log-Trace>0:devel/p5-Log-Trace \
+		p5-File-Slurp>0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Assertions>0:${PORTSDIR}/devel/p5-Test-Assertions
+TEST_DEPENDS=	p5-Test-Assertions>0:devel/p5-Test-Assertions
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Random/Makefile b/devel/p5-File-Random/Makefile
index 0240f109f2b9..4ed0311f1419 100644
--- a/devel/p5-File-Random/Makefile
+++ b/devel/p5-File-Random/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Perl module for random selecting of a file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Set-Scalar>0:${PORTSDIR}/devel/p5-Set-Scalar \
-		p5-Want>=0:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Set-Scalar>0:devel/p5-Set-Scalar \
+		p5-Want>=0:devel/p5-Want
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Class>=0.03:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Differences>=0.43:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>0.1:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-ManyParams>0:${PORTSDIR}/devel/p5-Test-ManyParams \
-		p5-Test-Warn>0.05:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Class>=0.03:devel/p5-Test-Class \
+		p5-Test-Differences>=0.43:devel/p5-Test-Differences \
+		p5-Test-Exception>0.1:devel/p5-Test-Exception \
+		p5-Test-ManyParams>0:devel/p5-Test-ManyParams \
+		p5-Test-Warn>0.05:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-ReadBackwards/Makefile b/devel/p5-File-ReadBackwards/Makefile
index b7274d8a4fd0..f25f3c61b100 100644
--- a/devel/p5-File-ReadBackwards/Makefile
+++ b/devel/p5-File-ReadBackwards/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	File::ReadBackwards -- read a file backwards by lines
 
-TEST_DEPENDS=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-SearchPath/Makefile b/devel/p5-File-SearchPath/Makefile
index bf63966ca8f4..c07ad6bdb458 100644
--- a/devel/p5-File-SearchPath/Makefile
+++ b/devel/p5-File-SearchPath/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Search for a file in an environment variable path
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Env-Path>=0:${PORTSDIR}/devel/p5-Env-Path
+BUILD_DEPENDS=	p5-Env-Path>=0:devel/p5-Env-Path
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-ShareDir-PAR/Makefile b/devel/p5-File-ShareDir-PAR/Makefile
index 0b1fbde12eba..db7429bb59bb 100644
--- a/devel/p5-File-ShareDir-PAR/Makefile
+++ b/devel/p5-File-ShareDir-PAR/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl5 File::ShareDir module with PAR support
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-PAR>=0:${PORTSDIR}/devel/p5-PAR \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-PAR>=0:devel/p5-PAR \
+		p5-Params-Util>=0:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-ShareDir-PathClass/Makefile b/devel/p5-File-ShareDir-PathClass/Makefile
index 2e2ebd64c157..9be5ca903c8c 100644
--- a/devel/p5-File-ShareDir-PathClass/Makefile
+++ b/devel/p5-File-ShareDir-PathClass/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	File::ShareDir returning Path::Class objects
 
-BUILD_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-ShareDir-ProjectDistDir/Makefile b/devel/p5-File-ShareDir-ProjectDistDir/Makefile
index fa5c82823aff..2398758ec067 100644
--- a/devel/p5-File-ShareDir-ProjectDistDir/Makefile
+++ b/devel/p5-File-ShareDir-ProjectDistDir/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Perl extension for set-and-forget using a directory in projects root
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Path-FindDev>0:${PORTSDIR}/devel/p5-Path-FindDev \
-		p5-Path-IsDev>0:${PORTSDIR}/devel/p5-Path-IsDev \
-		p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-File-ShareDir>0:devel/p5-File-ShareDir \
+		p5-Path-Class>0:devel/p5-Path-Class \
+		p5-Path-FindDev>0:devel/p5-Path-FindDev \
+		p5-Path-IsDev>0:devel/p5-Path-IsDev \
+		p5-Path-Tiny>0:devel/p5-Path-Tiny \
+		p5-Sub-Exporter>0:devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=	perl5
diff --git a/devel/p5-File-ShareDir/Makefile b/devel/p5-File-ShareDir/Makefile
index 14ca5e5b1a5b..0b4f5626042f 100644
--- a/devel/p5-File-ShareDir/Makefile
+++ b/devel/p5-File-ShareDir/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Locate per-dist and per-module shared files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Class-Inspector>=1.12:${PORTSDIR}/devel/p5-Class-Inspector
+RUN_DEPENDS=	p5-Class-Inspector>=1.12:devel/p5-Class-Inspector
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Slurp-Tree/Makefile b/devel/p5-File-Slurp-Tree/Makefile
index f59eba388c65..450ced6e0a6c 100644
--- a/devel/p5-File-Slurp-Tree/Makefile
+++ b/devel/p5-File-Slurp-Tree/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Slurp and emit file trees as nested hashes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-Slurp>=0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Stream/Makefile b/devel/p5-File-Stream/Makefile
index eb5d82d8a6d5..e7b6b5298d63 100644
--- a/devel/p5-File-Stream/Makefile
+++ b/devel/p5-File-Stream/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Regular expression delimited records from streams
 
-RUN_DEPENDS=	p5-YAPE-Regex>=4.00:${PORTSDIR}/textproc/p5-YAPE-Regex
+RUN_DEPENDS=	p5-YAPE-Regex>=4.00:textproc/p5-YAPE-Regex
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-File-Tail-Dir/Makefile b/devel/p5-File-Tail-Dir/Makefile
index 77d63cb3e803..d3afb0955cc3 100644
--- a/devel/p5-File-Tail-Dir/Makefile
+++ b/devel/p5-File-Tail-Dir/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tail all matching files in a given set of directories
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-ChangeNotify>0:${PORTSDIR}/devel/p5-File-ChangeNotify \
-		p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-File-ChangeNotify>0:devel/p5-File-ChangeNotify \
+		p5-Moose>0:devel/p5-Moose \
+		p5-YAML>0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Tail-Scribe/Makefile b/devel/p5-File-Tail-Scribe/Makefile
index 301042299498..f0451ec4b269 100644
--- a/devel/p5-File-Tail-Scribe/Makefile
+++ b/devel/p5-File-Tail-Scribe/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl Module to tail file to Scribe server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Tail-Dir>=0:${PORTSDIR}/devel/p5-File-Tail-Dir \
-		p5-Log-Dispatch-Scribe>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Scribe \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-File-Tail-Dir>=0:devel/p5-File-Tail-Dir \
+		p5-Log-Dispatch-Scribe>=0:devel/p5-Log-Dispatch-Scribe \
+		p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Util/Makefile b/devel/p5-File-Util/Makefile
index 32a43406ae3d..a5eb27962b6a 100644
--- a/devel/p5-File-Util/Makefile
+++ b/devel/p5-File-Util/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jeffhung@mail2000.com.tw
 COMMENT=	Perl5 module for easy, versatile, portable file handling
 
-RUN_DEPENDS=	p5-Class-OOorNO>=0.01:${PORTSDIR}/devel/p5-Class-OOorNO \
-		p5-Exception-Handler>=1:${PORTSDIR}/devel/p5-Exception-Handler
+RUN_DEPENDS=	p5-Class-OOorNO>=0.01:devel/p5-Class-OOorNO \
+		p5-Exception-Handler>=1:devel/p5-Exception-Handler
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Write-Rotate/Makefile b/devel/p5-File-Write-Rotate/Makefile
index 81adf68ad589..cb9b2136583d 100644
--- a/devel/p5-File-Write-Rotate/Makefile
+++ b/devel/p5-File-Write-Rotate/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Write to files that archive/rotate themselves
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Flock-Retry>=0:${PORTSDIR}/devel/p5-File-Flock-Retry \
-		p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
+BUILD_DEPENDS=	p5-File-Flock-Retry>=0:devel/p5-File-Flock-Retry \
+		p5-Proc-PID-File>=0:devel/p5-Proc-PID-File
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-Taint-Runtime>=0:${PORTSDIR}/devel/p5-Taint-Runtime \
-		p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warnings>=0.014:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-Taint-Runtime>=0:devel/p5-Taint-Runtime \
+		p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+		p5-Test-Warnings>=0.014:devel/p5-Test-Warnings
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-FileHandle-Unget/Makefile b/devel/p5-FileHandle-Unget/Makefile
index d835e9f34881..56d706fa0c8f 100644
--- a/devel/p5-FileHandle-Unget/Makefile
+++ b/devel/p5-FileHandle-Unget/Makefile
@@ -12,8 +12,8 @@ COMMENT=	FileHandle which supports ungetting of multiple bytes
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Filesys-Notify-KQueue/Makefile b/devel/p5-Filesys-Notify-KQueue/Makefile
index 4458f81e45c8..adeda545df0e 100644
--- a/devel/p5-Filesys-Notify-KQueue/Makefile
+++ b/devel/p5-Filesys-Notify-KQueue/Makefile
@@ -13,9 +13,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-IO-KQueue>0:${PORTSDIR}/devel/p5-IO-KQueue
+	p5-IO-KQueue>0:devel/p5-IO-KQueue
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-SharedFork>=0.19:${PORTSDIR}/devel/p5-Test-SharedFork
+TEST_DEPENDS=	p5-Test-SharedFork>=0.19:devel/p5-Test-SharedFork
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Filesys-Virtual-Plain/Makefile b/devel/p5-Filesys-Virtual-Plain/Makefile
index 0e0af5f9e244..a7727f648658 100644
--- a/devel/p5-Filesys-Virtual-Plain/Makefile
+++ b/devel/p5-Filesys-Virtual-Plain/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Plain virtual filesystem
 
-BUILD_DEPENDS=	p5-Filesys-Virtual>=0.05:${PORTSDIR}/devel/p5-Filesys-Virtual
+BUILD_DEPENDS=	p5-Filesys-Virtual>=0.05:devel/p5-Filesys-Virtual
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Filter-Template/Makefile b/devel/p5-Filter-Template/Makefile
index da7e7ab0d46f..caa56a9e563c 100644
--- a/devel/p5-Filter-Template/Makefile
+++ b/devel/p5-Filter-Template/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Source filter for inline code templates (macros)
 
-BUILD_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter
+BUILD_DEPENDS=	p5-Filter>=0:devel/p5-Filter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Forest/Makefile b/devel/p5-Forest/Makefile
index efc4fe4b267b..cd1f6c3c4d27 100644
--- a/devel/p5-Forest/Makefile
+++ b/devel/p5-Forest/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Collection of n-ary tree related modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.05:${PORTSDIR}/devel/p5-MooseX-Clone
+BUILD_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Clone>=0.05:devel/p5-MooseX-Clone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Form-Sensible/Makefile b/devel/p5-Form-Sensible/Makefile
index 309c8b10eb29..15fcfd92ab45 100644
--- a/devel/p5-Form-Sensible/Makefile
+++ b/devel/p5-Form-Sensible/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Sensible way to handle form based user interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Natural>=0:${PORTSDIR}/devel/p5-DateTime-Format-Natural \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Function-Parameters/Makefile b/devel/p5-Function-Parameters/Makefile
index 95bc103e6112..941586746df2 100644
--- a/devel/p5-Function-Parameters/Makefile
+++ b/devel/p5-Function-Parameters/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Subroutine definitions with parameter lists
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Dir-Self>=0:${PORTSDIR}/devel/p5-Dir-Self \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased
+TEST_DEPENDS=	p5-Dir-Self>=0:devel/p5-Dir-Self \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-aliased>=0:devel/p5-aliased
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
diff --git a/devel/p5-Future/Makefile b/devel/p5-Future/Makefile
index 255922cd70bd..8d26793c689c 100644
--- a/devel/p5-Future/Makefile
+++ b/devel/p5-Future/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Build objects representing outstanding operations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Identity>0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Refcount>0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+		p5-Test-Identity>0:devel/p5-Test-Identity \
+		p5-Test-Refcount>0:devel/p5-Test-Refcount
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Gearman-Client-Async/Makefile b/devel/p5-Gearman-Client-Async/Makefile
index 3bf717e81070..4d6ad385736a 100644
--- a/devel/p5-Gearman-Client-Async/Makefile
+++ b/devel/p5-Gearman-Client-Async/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Asynchronous client module for Gearman for Danga::Socket applications
 
-RUN_DEPENDS=	p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket \
-		p5-Gearman>=0:${PORTSDIR}/devel/p5-Gearman
+RUN_DEPENDS=	p5-Danga-Socket>=0:devel/p5-Danga-Socket \
+		p5-Gearman>=0:devel/p5-Gearman
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Gearman-Server>=0:${PORTSDIR}/devel/p5-Gearman-Server
+TEST_DEPENDS=	p5-Gearman-Server>=0:devel/p5-Gearman-Server
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Gearman-Server/Makefile b/devel/p5-Gearman-Server/Makefile
index 46175be28fcd..4a7fc37132bd 100644
--- a/devel/p5-Gearman-Server/Makefile
+++ b/devel/p5-Gearman-Server/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Gearman server daemon
 
-RUN_DEPENDS=	p5-Gearman>=1.10:${PORTSDIR}/devel/p5-Gearman \
-		p5-Danga-Socket>=1.52:${PORTSDIR}/devel/p5-Danga-Socket
+RUN_DEPENDS=	p5-Gearman>=1.10:devel/p5-Gearman \
+		p5-Danga-Socket>=1.52:devel/p5-Danga-Socket
 
 CONFLICTS=	gearmand-0.* gearmand-1.0.* gearmand-1.1.*
 
diff --git a/devel/p5-Gearman-XS/Makefile b/devel/p5-Gearman-XS/Makefile
index ac4df476f9d3..1bdf2e378c65 100644
--- a/devel/p5-Gearman-XS/Makefile
+++ b/devel/p5-Gearman-XS/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	otaviof@gmail.com
 COMMENT=	Perl front end for the Gearman C library
 
-LIB_DEPENDS=	libgearman.so:${PORTSDIR}/devel/gearmand
+LIB_DEPENDS=	libgearman.so:devel/gearmand
 
 CFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/devel/p5-Gearman/Makefile b/devel/p5-Gearman/Makefile
index c1dcd6757d3f..e3a8c120d99f 100644
--- a/devel/p5-Gearman/Makefile
+++ b/devel/p5-Gearman/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Gearman client libraray for Perl
 
-RUN_DEPENDS+=	p5-String-CRC32>=0.0:${PORTSDIR}/devel/p5-String-CRC32
+RUN_DEPENDS+=	p5-String-CRC32>=0.0:devel/p5-String-CRC32
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Geo-JSON/Makefile b/devel/p5-Geo-JSON/Makefile
index 47faddf657c6..437a3cb51b25 100644
--- a/devel/p5-Geo-JSON/Makefile
+++ b/devel/p5-Geo-JSON/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl OO interface for geojson
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moo>=1.004003:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-Moo>=1.004003:devel/p5-Moo \
+		p5-Type-Tiny>=0:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Most>=0:devel/p5-Test-Most
 
 USE_PERL5=	modbuildtiny
 USES=		perl5
diff --git a/devel/p5-Geo-ShapeFile/Makefile b/devel/p5-Geo-ShapeFile/Makefile
index bdd61907c0f9..060d04cb2cca 100644
--- a/devel/p5-Geo-ShapeFile/Makefile
+++ b/devel/p5-Geo-ShapeFile/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl extension for handling ESRI GIS Shapefiles
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tree-R>0:${PORTSDIR}/devel/p5-Tree-R \
-		p5-autovivification>0:${PORTSDIR}/devel/p5-autovivification
+BUILD_DEPENDS=	p5-Tree-R>0:devel/p5-Tree-R \
+		p5-autovivification>0:devel/p5-autovivification
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Getargs-Long/Makefile b/devel/p5-Getargs-Long/Makefile
index 48591a853afb..e9e3185c77b9 100644
--- a/devel/p5-Getargs-Long/Makefile
+++ b/devel/p5-Getargs-Long/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Parse routine arguments
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Agent>=0.105:${PORTSDIR}/devel/p5-Log-Agent \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Log-Agent>=0.105:devel/p5-Log-Agent \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Getopt-Compact-WithCmd/Makefile b/devel/p5-Getopt-Compact-WithCmd/Makefile
index 26843d9d7fb6..a4f91437d912 100644
--- a/devel/p5-Getopt-Compact-WithCmd/Makefile
+++ b/devel/p5-Getopt-Compact-WithCmd/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Sub-command friendly, like Getopt::Compact
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
+BUILD_DEPENDS=	p5-Text-Table>=0:textproc/p5-Text-Table
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Getopt-Compact/Makefile b/devel/p5-Getopt-Compact/Makefile
index 79292fac0648..4c2c08e3c0f5 100644
--- a/devel/p5-Getopt-Compact/Makefile
+++ b/devel/p5-Getopt-Compact/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Getopt processing in a compact statement with long and short options
 
-RUN_DEPENDS=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table \
-		p5-Env-Path>=0:${PORTSDIR}/devel/p5-Env-Path
+RUN_DEPENDS=	p5-Text-Table>=0:textproc/p5-Text-Table \
+		p5-Env-Path>=0:devel/p5-Env-Path
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Getopt-Long-Descriptive/Makefile b/devel/p5-Getopt-Long-Descriptive/Makefile
index 75a01523550b..23d604ba2dee 100644
--- a/devel/p5-Getopt-Long-Descriptive/Makefile
+++ b/devel/p5-Getopt-Long-Descriptive/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Getopt::Long with usage text
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Validate>=0.97:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Sub-Exporter>=0.972:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Params-Validate>=0.97:devel/p5-Params-Validate \
+		p5-Sub-Exporter>=0.972:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>=0.005:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>=0.005:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Git-PurePerl/Makefile b/devel/p5-Git-PurePerl/Makefile
index c13269371477..d228e3855c0d 100644
--- a/devel/p5-Git-PurePerl/Makefile
+++ b/devel/p5-Git-PurePerl/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Pure Perl interface to Git repositories
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract \
-		p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike \
-		p5-Data-Stream-Bulk>=0:${PORTSDIR}/devel/p5-Data-Stream-Bulk \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-IO-Digest>0:${PORTSDIR}/devel/p5-IO-Digest \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
+		p5-Config-GitLike>=0:devel/p5-Config-GitLike \
+		p5-Data-Stream-Bulk>=0:devel/p5-Data-Stream-Bulk \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+		p5-IO-Digest>0:devel/p5-IO-Digest \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-utf8>=0:${PORTSDIR}/devel/p5-Test-utf8
+TEST_DEPENDS=	p5-Test-utf8>=0:devel/p5-Test-utf8
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Git-Repository-Plugin-Log/Makefile b/devel/p5-Git-Repository-Plugin-Log/Makefile
index b9debbd0f4b0..04f97056da5a 100644
--- a/devel/p5-Git-Repository-Plugin-Log/Makefile
+++ b/devel/p5-Git-Repository-Plugin-Log/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Git-Repository>=1.309:${PORTSDIR}/devel/p5-Git-Repository
+BUILD_DEPENDS=	p5-Git-Repository>=1.309:devel/p5-Git-Repository
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Git-Repository/Makefile b/devel/p5-Git-Repository/Makefile
index 67dd6f2a1207..0d8bca68f3b8 100644
--- a/devel/p5-Git-Repository/Makefile
+++ b/devel/p5-Git-Repository/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
-		p5-Git-Version-Compare>=1.001:${PORTSDIR}/devel/p5-Git-Version-Compare \
-		p5-System-Command>=1.103:${PORTSDIR}/devel/p5-System-Command \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	git:devel/git \
+		p5-Git-Version-Compare>=1.001:devel/p5-Git-Version-Compare \
+		p5-System-Command>=1.103:devel/p5-System-Command \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Git-Sub/Makefile b/devel/p5-Git-Sub/Makefile
index a942b0fdfcc7..a6911d2c311b 100644
--- a/devel/p5-Git-Sub/Makefile
+++ b/devel/p5-Git-Sub/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Git commands imported into the git:: namespace
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS:=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-System-Sub>=0:${PORTSDIR}/devel/p5-System-Sub
+BUILD_DEPENDS:=	p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-System-Sub>=0:devel/p5-System-Sub
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Git-Version-Compare/Makefile b/devel/p5-Git-Version-Compare/Makefile
index e90da94a9712..5f6f0da2af16 100644
--- a/devel/p5-Git-Version-Compare/Makefile
+++ b/devel/p5-Git-Version-Compare/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Git-Wrapper/Makefile b/devel/p5-Git-Wrapper/Makefile
index 9be4ba4c7a24..f7c97ed5fdf3 100644
--- a/devel/p5-Git-Wrapper/Makefile
+++ b/devel/p5-Git-Wrapper/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Wrap git(7) command-line interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-Devel-CheckBin>=0:${PORTSDIR}/devel/p5-Devel-CheckBin \
-		p5-Sort-Versions>=0:${PORTSDIR}/devel/p5-Sort-Versions
+BUILD_DEPENDS=	git:devel/git \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-Devel-CheckBin>=0:devel/p5-Devel-CheckBin \
+		p5-Sort-Versions>=0:devel/p5-Sort-Versions
 RUN_DEPENDS:=	${BUILD_DEPENDS:Np5-Devel-CheckBin*}
-TEST_DEPENDS=	p5-Path-Class>=0.26:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sort-Versions>=0:${PORTSDIR}/devel/p5-Sort-Versions \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Path-Class>=0.26:devel/p5-Path-Class \
+		p5-Sort-Versions>=0:devel/p5-Sort-Versions \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Glib-Object-Introspection/Makefile b/devel/p5-Glib-Object-Introspection/Makefile
index 5faedafa8d59..c40d33e0cdc3 100644
--- a/devel/p5-Glib-Object-Introspection/Makefile
+++ b/devel/p5-Glib-Object-Introspection/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Dynamically create Perl language bindings
 LICENSE=	LGPL21
 
 # t/vfunc-ref-counting.t requires gobject-introspection 1.35.5+
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=1.270:${PORTSDIR}/devel/p5-Glib2
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS=	p5-Glib2>=1.270:${PORTSDIR}/devel/p5-Glib2
-TEST_DEPENDS=	p5-Cairo-GObject>=0:${PORTSDIR}/devel/p5-Cairo-GObject
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=1.270:devel/p5-Glib2
+LIB_DEPENDS=	libffi.so:devel/libffi
+RUN_DEPENDS=	p5-Glib2>=1.270:devel/p5-Glib2
+TEST_DEPENDS=	p5-Cairo-GObject>=0:devel/p5-Cairo-GObject
 
 OPTIONS_DEFINE=	TEST
 
@@ -28,8 +28,8 @@ USES=		perl5
 
 # Glib::Object::Introspection requires cairo and glib20 to build
 # test libraries during build phase, therefore we add them to BUILD_DEPENDS.
-TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cairo.pc:${PORTSDIR}/graphics/cairo \
-			${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20
+TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cairo.pc:graphics/cairo \
+			${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:devel/glib20
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Glib/Object/Introspection/Introspection.so
diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile
index 8227715247cb..005a5c9b0f6f 100644
--- a/devel/p5-Glib2/Makefile
+++ b/devel/p5-Glib2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	This module provides access to Glib and GObject libraries
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GNOME=	glib20
diff --git a/devel/p5-Gnome2-GConf/Makefile b/devel/p5-Gnome2-GConf/Makefile
index b02ba383e051..62763fa77124 100644
--- a/devel/p5-Gnome2-GConf/Makefile
+++ b/devel/p5-Gnome2-GConf/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl bindings for the GConf2 configuration engine
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-Glib2>=0:devel/p5-Glib2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Goo-Canvas/Makefile b/devel/p5-Goo-Canvas/Makefile
index 609c53aa0225..93d1bc520f97 100644
--- a/devel/p5-Goo-Canvas/Makefile
+++ b/devel/p5-Goo-Canvas/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Perl interface to the GooCanvas
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-LIB_DEPENDS=	libgoocanvas.so:${PORTSDIR}/graphics/goocanvas \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Cairo>=0:graphics/p5-Cairo \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+LIB_DEPENDS=	libgoocanvas.so:graphics/goocanvas \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
+RUN_DEPENDS=	p5-Cairo>=0:graphics/p5-Cairo \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 USE_GNOME=	pango gtk20
 USE_PERL5=	configure
diff --git a/devel/p5-Google-Checkout/Makefile b/devel/p5-Google-Checkout/Makefile
index 9dc6cd726ff3..c0dd5e623023 100644
--- a/devel/p5-Google-Checkout/Makefile
+++ b/devel/p5-Google-Checkout/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl implementation of Google Checkout (GCO)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Crypt-SSLeay>=0.45:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-Date-Manip>=5.40:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Digest-HMAC>=1.01:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-XML-Simple>=2.09:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Writer>=0.6:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-libwww>=5.65:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Crypt-SSLeay>=0.45:security/p5-Crypt-SSLeay \
+		p5-Date-Manip>=5.40:devel/p5-Date-Manip \
+		p5-Digest-HMAC>=1.01:security/p5-Digest-HMAC \
+		p5-XML-Simple>=2.09:textproc/p5-XML-Simple \
+		p5-XML-Writer>=0.6:textproc/p5-XML-Writer \
+		p5-libwww>=5.65:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Google-ProtocolBuffers/Makefile b/devel/p5-Google-ProtocolBuffers/Makefile
index 2b778ece2d99..9cc0096293ea 100644
--- a/devel/p5-Google-ProtocolBuffers/Makefile
+++ b/devel/p5-Google-ProtocolBuffers/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Simple interface to Google Protocol Buffers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Parse-RecDescent>=1.94:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Gravatar-URL/Makefile b/devel/p5-Gravatar-URL/Makefile
index 6c104e78ca75..83f6d6e35b97 100644
--- a/devel/p5-Gravatar-URL/Makefile
+++ b/devel/p5-Gravatar-URL/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Make URLs for Gravatars from an email address
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Gtk2-Notify/Makefile b/devel/p5-Gtk2-Notify/Makefile
index 7e3f2fbc16fa..8ce5b307df99 100644
--- a/devel/p5-Gtk2-Notify/Makefile
+++ b/devel/p5-Gtk2-Notify/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Perl interface to libnotify
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+LIB_DEPENDS=	libnotify.so:devel/libnotify
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
diff --git a/devel/p5-Gtk2-Spell/Makefile b/devel/p5-Gtk2-Spell/Makefile
index dcbc0963c78a..ab815c065cf8 100644
--- a/devel/p5-Gtk2-Spell/Makefile
+++ b/devel/p5-Gtk2-Spell/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl interface to the Gtk2Spell library
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=1.001:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=1.001:${PORTSDIR}/x11-toolkits/p5-Gtk2
-LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+BUILD_DEPENDS=	p5-Cairo>=0:graphics/p5-Cairo \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=1.001:devel/p5-Glib2 \
+		p5-Gtk2>=1.001:x11-toolkits/p5-Gtk2
+LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-HOP-Lexer/Makefile b/devel/p5-HOP-Lexer/Makefile
index 4cd73ddba7f3..63c2a426d4ee 100644
--- a/devel/p5-HOP-Lexer/Makefile
+++ b/devel/p5-HOP-Lexer/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Higher Order Perl Lexer
 
-BUILD_DEPENDS=	p5-HOP-Stream>=0.01:${PORTSDIR}/devel/p5-HOP-Stream
+BUILD_DEPENDS=	p5-HOP-Stream>=0.01:devel/p5-HOP-Stream
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Hash-AutoHash-Args/Makefile b/devel/p5-Hash-AutoHash-Args/Makefile
index 271e4ac341a9..d79442fbeeb6 100644
--- a/devel/p5-Hash-AutoHash-Args/Makefile
+++ b/devel/p5-Hash-AutoHash-Args/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Object-oriented processing of keyword-based argument lists
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Hash-AutoHash>=1.17:${PORTSDIR}/devel/p5-Hash-AutoHash
+BUILD_DEPENDS=	p5-Hash-AutoHash>=1.17:devel/p5-Hash-AutoHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0.110:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Pod>=1.48:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Deep>=0.110:devel/p5-Test-Deep \
+		p5-Test-Pod>=1.48:devel/p5-Test-Pod
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Hash-AutoHash/Makefile b/devel/p5-Hash-AutoHash/Makefile
index e1a857a5f2de..5504eacf9660 100644
--- a/devel/p5-Hash-AutoHash/Makefile
+++ b/devel/p5-Hash-AutoHash/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Object-oriented access to real and tied hashes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0.33:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Tie-ToObject>=0.03:${PORTSDIR}/devel/p5-Tie-ToObject
+BUILD_DEPENDS=	p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
+		p5-Tie-ToObject>=0.03:devel/p5-Tie-ToObject
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0.11:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Tie-Hash-MultiValue>=1.02:${PORTSDIR}/devel/p5-Tie-Hash-MultiValue
+TEST_DEPENDS=	p5-Test-Deep>=0.11:devel/p5-Test-Deep \
+		p5-Tie-Hash-MultiValue>=1.02:devel/p5-Tie-Hash-MultiValue
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Hash-Case/Makefile b/devel/p5-Hash-Case/Makefile
index 85a1d8ee13cb..fb5f3f05cd7c 100644
--- a/devel/p5-Hash-Case/Makefile
+++ b/devel/p5-Hash-Case/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0*$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Base class for hashes with key-casing requirements
 
-BUILD_DEPENDS=	p5-Log-Report>=0.26:${PORTSDIR}/devel/p5-Log-Report
+BUILD_DEPENDS=	p5-Log-Report>=0.26:devel/p5-Log-Report
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Hash-Diff/Makefile b/devel/p5-Hash-Diff/Makefile
index 9c93fdb20406..e99466baa563 100644
--- a/devel/p5-Hash-Diff/Makefile
+++ b/devel/p5-Hash-Diff/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Return the difference between two hashes as a hash
 
-RUN_DEPENDS=	p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge
-BUILD_DEPENDS=	p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge
-TEST_DEPENDS=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge
+BUILD_DEPENDS=	p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge
+TEST_DEPENDS=	p5-Test-Simple>=0.98:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Hash-FieldHash/Makefile b/devel/p5-Hash-FieldHash/Makefile
index 90c7d49dde91..8d990d642188 100644
--- a/devel/p5-Hash-FieldHash/Makefile
+++ b/devel/p5-Hash-FieldHash/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Lightweight field hash implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-LeakTrace>=0.07:${PORTSDIR}/devel/p5-Test-LeakTrace
+TEST_DEPENDS=	p5-Test-LeakTrace>=0.07:devel/p5-Test-LeakTrace
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Hash-Flatten/Makefile b/devel/p5-Hash-Flatten/Makefile
index 281af1955b27..a67aaa4f737a 100644
--- a/devel/p5-Hash-Flatten/Makefile
+++ b/devel/p5-Hash-Flatten/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	az@FreeBSD.org
 COMMENT=	Flatten, unflatten complex data hashes
 
-BUILD_DEPENDS=	p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace \
-		p5-Test-Assertions>0:${PORTSDIR}/devel/p5-Test-Assertions
+BUILD_DEPENDS=	p5-Log-Trace>0:devel/p5-Log-Trace \
+		p5-Test-Assertions>0:devel/p5-Test-Assertions
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Hash-Merge-Simple/Makefile b/devel/p5-Hash-Merge-Simple/Makefile
index 229d2bce3ae6..8459278077a9 100644
--- a/devel/p5-Hash-Merge-Simple/Makefile
+++ b/devel/p5-Hash-Merge-Simple/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Recursively merge two or more hashes, simply
 
-TEST_DEPENDS+=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS+=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Most>=0:devel/p5-Test-Most
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Hash-MultiValue/Makefile b/devel/p5-Hash-MultiValue/Makefile
index 216dafed80c3..9276d1b0f86e 100644
--- a/devel/p5-Hash-MultiValue/Makefile
+++ b/devel/p5-Hash-MultiValue/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension to store multiple values per key
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-UNIVERSAL-ref>0:${PORTSDIR}/devel/p5-UNIVERSAL-ref
+TEST_DEPENDS=	p5-UNIVERSAL-ref>0:devel/p5-UNIVERSAL-ref
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Hash-Slice/Makefile b/devel/p5-Hash-Slice/Makefile
index 12184ee62579..ebdd2c5bd006 100644
--- a/devel/p5-Hash-Slice/Makefile
+++ b/devel/p5-Hash-Slice/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Make a hash from a deep slice of another hash
 
-BUILD_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Clone>=0.09:${PORTSDIR}/devel/p5-Clone
+BUILD_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+		p5-Clone>=0.09:devel/p5-Clone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Hash-Util-FieldHash-Compat/Makefile b/devel/p5-Hash-Util-FieldHash-Compat/Makefile
index 5396df023864..cc136a426cd9 100644
--- a/devel/p5-Hash-Util-FieldHash-Compat/Makefile
+++ b/devel/p5-Hash-Util-FieldHash-Compat/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Use Hash::Util::FieldHash or ties, depending on availability
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Metadata>=0:${PORTSDIR}/devel/p5-Module-Metadata \
-		p5-Tie-RefHash-Weak>=0.08:${PORTSDIR}/devel/p5-Tie-RefHash-Weak
-RUN_DEPENDS=	p5-Tie-RefHash-Weak>=0.08:${PORTSDIR}/devel/p5-Tie-RefHash-Weak
+BUILD_DEPENDS=	p5-Module-Metadata>=0:devel/p5-Module-Metadata \
+		p5-Tie-RefHash-Weak>=0.08:devel/p5-Tie-RefHash-Weak
+RUN_DEPENDS=	p5-Tie-RefHash-Weak>=0.08:devel/p5-Tie-RefHash-Weak
 
 NO_ARCH=	yes
 USES=		perl5
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Heap-Simple-Perl/Makefile b/devel/p5-Heap-Simple-Perl/Makefile
index 7ee5e06d5ffa..bfcfc41b009b 100644
--- a/devel/p5-Heap-Simple-Perl/Makefile
+++ b/devel/p5-Heap-Simple-Perl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pure perl implementation of the Heap::Simple interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Heap-Simple>=0:${PORTSDIR}/devel/p5-Heap-Simple
+BUILD_DEPENDS=	p5-Heap-Simple>=0:devel/p5-Heap-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Heap-Simple-XS/Makefile b/devel/p5-Heap-Simple-XS/Makefile
index 9e5c7cf3c6fa..5bbda1ebb1b8 100644
--- a/devel/p5-Heap-Simple-XS/Makefile
+++ b/devel/p5-Heap-Simple-XS/Makefile
@@ -14,7 +14,7 @@ COMMENT=	XS implementation of the Heap::Simple interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Heap-Simple>=0:${PORTSDIR}/devel/p5-Heap-Simple
+BUILD_DEPENDS=	p5-Heap-Simple>=0:devel/p5-Heap-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IO-AIO/Makefile b/devel/p5-IO-AIO/Makefile
index 46651be5e090..c3b0dd7cf58d 100644
--- a/devel/p5-IO-AIO/Makefile
+++ b/devel/p5-IO-AIO/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Asynchronous Input/Output
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Canary-Stability>=2001:${PORTSDIR}/devel/p5-Canary-Stability \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
-RUN_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-Canary-Stability>=2001:devel/p5-Canary-Stability \
+		p5-common-sense>=0:devel/p5-common-sense
+RUN_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-All-LWP/Makefile b/devel/p5-IO-All-LWP/Makefile
index 0b645732c0a2..78091bbd1424 100644
--- a/devel/p5-IO-All-LWP/Makefile
+++ b/devel/p5-IO-All-LWP/Makefile
@@ -14,8 +14,8 @@ COMMENT=	IO::All interface to LWP
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-All>=0.30:${PORTSDIR}/devel/p5-IO-All \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-IO-All>=0.30:devel/p5-IO-All \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-IO-All/Makefile b/devel/p5-IO-All/Makefile
index f5363fbf4fa7..4d873ec15585 100644
--- a/devel/p5-IO-All/Makefile
+++ b/devel/p5-IO-All/Makefile
@@ -13,11 +13,11 @@ COMMENT=	IO::All combines all of the best Perl IO modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ReadBackwards>=0:${PORTSDIR}/devel/p5-File-ReadBackwards \
-		p5-IO-String>=1.08:${PORTSDIR}/devel/p5-IO-String
+BUILD_DEPENDS=	p5-File-ReadBackwards>=0:devel/p5-File-ReadBackwards \
+		p5-IO-String>=1.08:devel/p5-IO-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
+TEST_DEPENDS=	p5-File-MimeInfo>=0:devel/p5-File-MimeInfo \
+		p5-MLDBM>=0:databases/p5-MLDBM
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Any/Makefile b/devel/p5-IO-Any/Makefile
index a4faf02014ca..c5daf7608b1a 100644
--- a/devel/p5-IO-Any/Makefile
+++ b/devel/p5-IO-Any/Makefile
@@ -14,18 +14,18 @@ COMMENT=	IO::Any opens anything
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Distribution>=0:${PORTSDIR}/devel/p5-Test-Distribution \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fixme>=0:${PORTSDIR}/devel/p5-Test-Fixme \
-		p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Distribution>=0:devel/p5-Test-Distribution \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fixme>=0:devel/p5-Test-Fixme \
+		p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-IO-Async/Makefile b/devel/p5-IO-Async/Makefile
index a7fc407a16b6..15b98ddb67ad 100644
--- a/devel/p5-IO-Async/Makefile
+++ b/devel/p5-IO-Async/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Perl modules that implement asynchronous filehandle IO
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>=0.33:${PORTSDIR}/devel/p5-Future \
-		p5-Struct-Dumb>0:${PORTSDIR}/devel/p5-Struct-Dumb
+BUILD_DEPENDS=	p5-Future>=0.33:devel/p5-Future \
+		p5-Struct-Dumb>0:devel/p5-Struct-Dumb
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Identity>=0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Refcount>=0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Identity>=0:devel/p5-Test-Identity \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Refcount>=0:devel/p5-Test-Refcount
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-IO-Callback/Makefile b/devel/p5-IO-Callback/Makefile
index eeeed3762097..f575941a3ab2 100644
--- a/devel/p5-IO-Callback/Makefile
+++ b/devel/p5-IO-Callback/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-IO-String>0:${PORTSDIR}/devel/p5-IO-String
+	p5-IO-String>0:devel/p5-IO-String
 BUILD_DEPENDS:=	\
 	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings
+	p5-File-Slurp>0:devel/p5-File-Slurp \
+	p5-Test-Exception>0:devel/p5-Test-Exception \
+	p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-IO-Detect/Makefile b/devel/p5-IO-Detect/Makefile
index 93d5f286845d..3f4a511f7520 100644
--- a/devel/p5-IO-Detect/Makefile
+++ b/devel/p5-IO-Detect/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Detect if a given scalar is a filehandle
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+TEST_DEPENDS=	p5-IO-All>=0:devel/p5-IO-All \
+		p5-Path-Class>=0:devel/p5-Path-Class
 
 CONFLICTS_INSTALL=	p5-Scalar-Does-0.[1-9]*
 
diff --git a/devel/p5-IO-Digest/Makefile b/devel/p5-IO-Digest/Makefile
index a54ad2f0b4e1..9122a7292514 100644
--- a/devel/p5-IO-Digest/Makefile
+++ b/devel/p5-IO-Digest/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Calculate digests while reading or writing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PerlIO-via-dynamic>=0:${PORTSDIR}/devel/p5-PerlIO-via-dynamic
+BUILD_DEPENDS=	p5-PerlIO-via-dynamic>=0:devel/p5-PerlIO-via-dynamic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Event/Makefile b/devel/p5-IO-Event/Makefile
index b84b5c5e7787..b83d6c3de79b 100644
--- a/devel/p5-IO-Event/Makefile
+++ b/devel/p5-IO-Event/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tied Filehandles for Nonblocking IO with Object Callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
+TEST_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent
 
 OPTIONS_DEFINE=	ANYEVENT EVENT
 OPTIONS_DEFAULT=ANYEVENT EVENT
@@ -26,9 +26,9 @@ EVENT_DESC=	Use Event as underlying event handler
 USE_PERL5=	configure
 USES=		perl5
 
-ANYEVENT_BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
-ANYEVENT_RUN_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
-EVENT_BUILD_DEPENDS=	p5-Event>=0:${PORTSDIR}/devel/p5-Event
-EVENT_RUN_DEPENDS=	p5-Event>=0:${PORTSDIR}/devel/p5-Event
+ANYEVENT_BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent
+ANYEVENT_RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent
+EVENT_BUILD_DEPENDS=	p5-Event>=0:devel/p5-Event
+EVENT_RUN_DEPENDS=	p5-Event>=0:devel/p5-Event
 
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-FDPass/Makefile b/devel/p5-IO-FDPass/Makefile
index 9bedde319916..4b9e0126e46a 100644
--- a/devel/p5-IO-FDPass/Makefile
+++ b/devel/p5-IO-FDPass/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to pass a file descriptor over a socket
 
-BUILD_DEPENDS=	p5-Canary-Stability>0:${PORTSDIR}/devel/p5-Canary-Stability
+BUILD_DEPENDS=	p5-Canary-Stability>0:devel/p5-Canary-Stability
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-File-AtomicChange/Makefile b/devel/p5-IO-File-AtomicChange/Makefile
index 2f4aa1faa6da..a3608428f762 100644
--- a/devel/p5-IO-File-AtomicChange/Makefile
+++ b/devel/p5-IO-File-AtomicChange/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-File-Sync>0:${PORTSDIR}/devel/p5-File-Sync \
-	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class
+	p5-File-Sync>0:devel/p5-File-Sync \
+	p5-Path-Class>0:devel/p5-Path-Class
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IO-Handle-Util/Makefile b/devel/p5-IO-Handle-Util/Makefile
index 8a335b9c10ea..10c00e686a7a 100644
--- a/devel/p5-IO-Handle-Util/Makefile
+++ b/devel/p5-IO-Handle-Util/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for working with IO::Handle like objects
 
 RUN_DEPENDS=	\
-	p5-IO-String>0:${PORTSDIR}/devel/p5-IO-String \
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-	p5-asa>0:${PORTSDIR}/devel/p5-asa
+	p5-IO-String>0:devel/p5-IO-String \
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+	p5-asa>0:devel/p5-asa
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -22,7 +22,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-IO-Lambda/Makefile b/devel/p5-IO-Lambda/Makefile
index 130b21804f2c..482109941000 100644
--- a/devel/p5-IO-Lambda/Makefile
+++ b/devel/p5-IO-Lambda/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ivan@serezhkin.com
 COMMENT=	Non-blocking I/O in lambda style
 
-BUILD_DEPENDS=	p5-Sub-Name>=0.04:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Net-DNS>=0.64:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-libwww>=5.822:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1.37:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Sub-Name>=0.04:devel/p5-Sub-Name \
+		p5-Net-DNS>=0.64:dns/p5-Net-DNS \
+		p5-libwww>=5.822:www/p5-libwww \
+		p5-URI>=1.37:net/p5-URI
 
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-IO-Socket-SSL>=1.19:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-AnyEvent>=4.33:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-DBI>=1.60.4:${PORTSDIR}/databases/p5-DBI
+		p5-IO-Socket-SSL>=1.19:security/p5-IO-Socket-SSL \
+		p5-AnyEvent>=4.33:devel/p5-AnyEvent \
+		p5-DBI>=1.60.4:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Pipely/Makefile b/devel/p5-IO-Pipely/Makefile
index 3f768a7a9b7f..02fb5a755a0e 100644
--- a/devel/p5-IO-Pipely/Makefile
+++ b/devel/p5-IO-Pipely/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-TEST_DEPENDS=	p5-Scalar-List-Utils>=1.29:${PORTSDIR}/lang/p5-Scalar-List-Utils
+TEST_DEPENDS=	p5-Scalar-List-Utils>=1.29:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-IO-Prompt-Simple/Makefile b/devel/p5-IO-Prompt-Simple/Makefile
index 968015857a10..fd1571b54760 100644
--- a/devel/p5-IO-Prompt-Simple/Makefile
+++ b/devel/p5-IO-Prompt-Simple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple interface for user input
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Requires>=0.06:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0.06:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Prompt-Tiny/Makefile b/devel/p5-IO-Prompt-Tiny/Makefile
index 67f6e380f104..49cbf3617a42 100644
--- a/devel/p5-IO-Prompt-Tiny/Makefile
+++ b/devel/p5-IO-Prompt-Tiny/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Prompt for user input with a default option
 
 LICENSE=	APACHE20
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0.12:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0.12:devel/p5-Capture-Tiny
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-IO-Prompt/Makefile b/devel/p5-IO-Prompt/Makefile
index 9a4b63efc63d..44ac0a8b2165 100644
--- a/devel/p5-IO-Prompt/Makefile
+++ b/devel/p5-IO-Prompt/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Interactively prompt for user input
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Want>0:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Term-ReadKey>0:devel/p5-Term-ReadKey \
+		p5-Want>0:devel/p5-Want
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IO-Prompter/Makefile b/devel/p5-IO-Prompter/Makefile
index 8235baf719a6..9dff96aeca2e 100644
--- a/devel/p5-IO-Prompter/Makefile
+++ b/devel/p5-IO-Prompter/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Prompt for input, read it, clean it, return it
 
-BUILD_DEPENDS=	devel/p5-Contextual-Return>0:${PORTSDIR}/devel/p5-Contextual-Return
+BUILD_DEPENDS=	devel/p5-Contextual-Return>0:devel/p5-Contextual-Return
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IO-Pty-Easy/Makefile b/devel/p5-IO-Pty-Easy/Makefile
index 86f023d75a3a..a265eeba370c 100644
--- a/devel/p5-IO-Pty-Easy/Makefile
+++ b/devel/p5-IO-Pty-Easy/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Easy interface to IO::Pty
 
-BUILD_DEPENDS=	p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty
+BUILD_DEPENDS=	p5-IO-Tty>=0:devel/p5-IO-Tty
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Toolkit/Makefile b/devel/p5-IO-Toolkit/Makefile
index 3ed3c7324c5d..cc96f8abe570 100644
--- a/devel/p5-IO-Toolkit/Makefile
+++ b/devel/p5-IO-Toolkit/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	IO::Toolkit - Perl extension to create logfiles
 
-BUILD_DEPENDS=	p5-Crypt-RC6>=0:${PORTSDIR}/security/p5-Crypt-RC6
-RUN_DEPENDS=	p5-Crypt-RC6>=0:${PORTSDIR}/security/p5-Crypt-RC6
+BUILD_DEPENDS=	p5-Crypt-RC6>=0:security/p5-Crypt-RC6
+RUN_DEPENDS=	p5-Crypt-RC6>=0:security/p5-Crypt-RC6
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-YAML/Makefile b/devel/p5-IO-YAML/Makefile
index 43090a148fd3..740ff68fa289 100644
--- a/devel/p5-IO-YAML/Makefile
+++ b/devel/p5-IO-YAML/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read and write YAML streams incrementally
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-YAML>=0:textproc/p5-YAML
+RUN_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-IOC/Makefile b/devel/p5-IOC/Makefile
index 48ebad04dc10..48c2645a9b8a 100644
--- a/devel/p5-IOC/Makefile
+++ b/devel/p5-IOC/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lightweight IOC (Inversion of Control) framework
 
-BUILD_DEPENDS=	p5-Class-Throwable>=0:${PORTSDIR}/devel/p5-Class-Throwable \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-Class-StrongSingleton>=0:${PORTSDIR}/devel/p5-Class-StrongSingleton \
-		p5-Class-Interfaces>=0:${PORTSDIR}/devel/p5-Class-Interfaces
+BUILD_DEPENDS=	p5-Class-Throwable>=0:devel/p5-Class-Throwable \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-Class-StrongSingleton>=0:devel/p5-Class-StrongSingleton \
+		p5-Class-Interfaces>=0:devel/p5-Class-Interfaces
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IPC-Cache/Makefile b/devel/p5-IPC-Cache/Makefile
index 0d95ac8e053f..868ac7a70a48 100644
--- a/devel/p5-IPC-Cache/Makefile
+++ b/devel/p5-IPC-Cache/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Persist data across processes via shared memory
 
 LICENSE=	GPLv1
 
-BUILD_DEPENDS=	p5-IPC-ShareLite>=0:${PORTSDIR}/devel/p5-IPC-ShareLite
+BUILD_DEPENDS=	p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IPC-Cmd/Makefile b/devel/p5-IPC-Cmd/Makefile
index 81b11032b1c5..547d52e1e270 100644
--- a/devel/p5-IPC-Cmd/Makefile
+++ b/devel/p5-IPC-Cmd/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Finding and running system commands made easy
 
-COMMON_DEPENDS=	p5-IPC-Run>=0.55:${PORTSDIR}/devel/p5-IPC-Run
+COMMON_DEPENDS=	p5-IPC-Run>=0.55:devel/p5-IPC-Run
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/devel/p5-IPC-DirQueue/Makefile b/devel/p5-IPC-DirQueue/Makefile
index b04435d1d82d..70d662d1542a 100644
--- a/devel/p5-IPC-DirQueue/Makefile
+++ b/devel/p5-IPC-DirQueue/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	IPC::DirQueue - disk-based many-to-many task queue
 
-BUILD_DEPENDS=	p5-POE>0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IPC-MM/Makefile b/devel/p5-IPC-MM/Makefile
index bab4665b2986..31c1e71b8bc1 100644
--- a/devel/p5-IPC-MM/Makefile
+++ b/devel/p5-IPC-MM/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to Ralf Engelschall's mm library
 
-LIB_DEPENDS=	libmm.so:${PORTSDIR}/devel/mm
+LIB_DEPENDS=	libmm.so:devel/mm
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IPC-MMA/Makefile b/devel/p5-IPC-MMA/Makefile
index 299ef82b8d93..3e7dbdcd4056 100644
--- a/devel/p5-IPC-MMA/Makefile
+++ b/devel/p5-IPC-MMA/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	peter@vereshagin.org
 COMMENT=	Improved Perl interface to Ralf Engelschall's mm library
 
-BUILD_DEPENDS=	p5-Devel-CheckOS>=0:${PORTSDIR}/devel/p5-Devel-CheckOS
-RUN_DEPENDS=	p5-Devel-CheckOS>=0:${PORTSDIR}/devel/p5-Devel-CheckOS
-LIB_DEPENDS=	libmm.so:${PORTSDIR}/devel/mm
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-Devel-CheckOS>=0:devel/p5-Devel-CheckOS
+RUN_DEPENDS=	p5-Devel-CheckOS>=0:devel/p5-Devel-CheckOS
+LIB_DEPENDS=	libmm.so:devel/mm
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IPC-Mmap-Share/Makefile b/devel/p5-IPC-Mmap-Share/Makefile
index 39f79024168a..e30753b85cfc 100644
--- a/devel/p5-IPC-Mmap-Share/Makefile
+++ b/devel/p5-IPC-Mmap-Share/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Safely share structures among processes using anonymous mmap
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IPC-Mmap>=0:${PORTSDIR}/devel/p5-IPC-Mmap
+BUILD_DEPENDS=	p5-IPC-Mmap>=0:devel/p5-IPC-Mmap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-IPC-PubSub/Makefile b/devel/p5-IPC-PubSub/Makefile
index 786c21da21f3..562de30b4157 100644
--- a/devel/p5-IPC-PubSub/Makefile
+++ b/devel/p5-IPC-PubSub/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Interprocess Publish/Subscribe channels
 
-BUILD_DEPENDS=	p5-DBM-Deep>=1:${PORTSDIR}/databases/p5-DBM-Deep \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID
+BUILD_DEPENDS=	p5-DBM-Deep>=1:databases/p5-DBM-Deep \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Data-UUID>0:devel/p5-Data-UUID
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IPC-Run/Makefile b/devel/p5-IPC-Run/Makefile
index 18a4347a5d9f..89d82dd974ed 100644
--- a/devel/p5-IPC-Run/Makefile
+++ b/devel/p5-IPC-Run/Makefile
@@ -13,7 +13,7 @@ COMMENT=	IPC::Run - Run subprocesses with piping and redirection
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Tty>=1.08:${PORTSDIR}/devel/p5-IO-Tty
+BUILD_DEPENDS=	p5-IO-Tty>=1.08:devel/p5-IO-Tty
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IPC-SharedCache/Makefile b/devel/p5-IPC-SharedCache/Makefile
index 43597ac80d8d..5f058c17fcc0 100644
--- a/devel/p5-IPC-SharedCache/Makefile
+++ b/devel/p5-IPC-SharedCache/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for managing a SysV IPC shared memory cache
 
-BUILD_DEPENDS=	p5-IPC-ShareLite>=0:${PORTSDIR}/devel/p5-IPC-ShareLite
+BUILD_DEPENDS=	p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/devel/p5-IPC-ShellCmd/Makefile b/devel/p5-IPC-ShellCmd/Makefile
index 0d2b72de2b49..62b5c095102f 100644
--- a/devel/p5-IPC-ShellCmd/Makefile
+++ b/devel/p5-IPC-ShellCmd/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Run a command with a given environment and capture output
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		sudo:${PORTSDIR}/security/sudo
+BUILD_DEPENDS=	p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
+		sudo:security/sudo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Import-Base/Makefile b/devel/p5-Import-Base/Makefile
index 03573e965f4b..acd1c49d90b3 100644
--- a/devel/p5-Import-Base/Makefile
+++ b/devel/p5-Import-Base/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Import a set of modules into the calling module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Import-Into>=1.002005:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime
+BUILD_DEPENDS=	p5-Import-Into>=1.002005:devel/p5-Import-Into \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Dancer2-Plugin-Ajax>=0:${PORTSDIR}/www/p5-Dancer2-Plugin-Ajax \
-		p5-Dancer2>=0:${PORTSDIR}/www/p5-Dancer2 \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo
+TEST_DEPENDS=	p5-Dancer2-Plugin-Ajax>=0:www/p5-Dancer2-Plugin-Ajax \
+		p5-Dancer2>=0:www/p5-Dancer2 \
+		p5-Moo>=0:devel/p5-Moo
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Import-Into/Makefile b/devel/p5-Import-Into/Makefile
index 7625ec9551d9..c62165ac785b 100644
--- a/devel/p5-Import-Into/Makefile
+++ b/devel/p5-Import-Into/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Import packages into other packages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime
+BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Inline-ASM/Makefile b/devel/p5-Inline-ASM/Makefile
index 4f08db7ab8bc..ea45653d9054 100644
--- a/devel/p5-Inline-ASM/Makefile
+++ b/devel/p5-Inline-ASM/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Write Perl Subroutines in assembler
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline-C>=0.42:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline-C>=0.42:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Inline-C/Makefile b/devel/p5-Inline-C/Makefile
index 5f37a8401ed5..9abd356ad02d 100644
--- a/devel/p5-Inline-C/Makefile
+++ b/devel/p5-Inline-C/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Write Perl Subroutines in C
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=7.00:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-Inline>=0.79:${PORTSDIR}/devel/p5-Inline \
-		p5-Parse-RecDescent>=1.967.009:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Pegex>=0.58:${PORTSDIR}/devel/p5-Pegex
+BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=7.00:devel/p5-ExtUtils-MakeMaker \
+		p5-Inline>=0.79:devel/p5-Inline \
+		p5-Parse-RecDescent>=1.967.009:devel/p5-Parse-RecDescent \
+		p5-Pegex>=0.58:devel/p5-Pegex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
-BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.06:${PORTSDIR}/devel/p5-File-ShareDir-Install
+TEST_DEPENDS=	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-Test-Warn>=0.23:devel/p5-Test-Warn \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
+BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
 
 CONFLICTS_INSTALL=	p5-Inline-0.[0-5]*
 
diff --git a/devel/p5-Inline-CPP/Makefile b/devel/p5-Inline-CPP/Makefile
index 556d44903b79..4f5837f0f313 100644
--- a/devel/p5-Inline-CPP/Makefile
+++ b/devel/p5-Inline-CPP/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Write Perl subroutines and classes in C++
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Inline>=0.78:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.67:${PORTSDIR}/devel/p5-Inline-C \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Inline>=0.78:devel/p5-Inline \
+		p5-Inline-C>=0.67:devel/p5-Inline-C \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-ExtUtils-CppGuess>=0.11:${PORTSDIR}/devel/p5-ExtUtils-CppGuess
+BUILD_DEPENDS+=	p5-ExtUtils-CppGuess>=0.11:devel/p5-ExtUtils-CppGuess
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Inline-Filters/Makefile b/devel/p5-Inline-Filters/Makefile
index 92509115e5b9..9c48a181d8e9 100644
--- a/devel/p5-Inline-Filters/Makefile
+++ b/devel/p5-Inline-Filters/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Common source code filters for Inline Modules
 LICENSE=	ART10 GPLv1 GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0.42:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.76:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline>=0.42:devel/p5-Inline \
+		p5-Inline-C>=0.76:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index efeeba1b8648..a2dac8869ef6 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Write Perl subroutines and classes in Java
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Inline>=0.68:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.62:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline>=0.68:devel/p5-Inline \
+		p5-Inline-C>=0.62:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_JAVA=	yes
diff --git a/devel/p5-Inline-Python/Makefile b/devel/p5-Inline-Python/Makefile
index 8546ec6c7678..1e118b9b7694 100644
--- a/devel/p5-Inline-Python/Makefile
+++ b/devel/p5-Inline-Python/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Write Perl Subroutines in Python
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0.79:${PORTSDIR}/devel/p5-Inline
+BUILD_DEPENDS=	p5-Inline>=0.79:devel/p5-Inline
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Inline-TT/Makefile b/devel/p5-Inline-TT/Makefile
index 578b93c984fc..4aff44a868b9 100644
--- a/devel/p5-Inline-TT/Makefile
+++ b/devel/p5-Inline-TT/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Provides inline support for template toolkit 2.x
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0.42:${PORTSDIR}/devel/p5-Inline \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Inline>=0.42:devel/p5-Inline \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Inline-Tcl/Makefile b/devel/p5-Inline-Tcl/Makefile
index 681c21340fd5..b7541f8c8c90 100644
--- a/devel/p5-Inline-Tcl/Makefile
+++ b/devel/p5-Inline-Tcl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Write Perl subroutines in Tcl
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline
+BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tcl
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index 5f9b3f994d9b..709f5ba67a6b 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Write Perl subroutines in other programming languages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=1.800:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Parse-RecDescent>=1.800:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Inline-Files>=0:${PORTSDIR}/devel/p5-Inline-Files \
-		p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Inline-Files>=0:devel/p5-Inline-Files \
+		p5-Test-Warn>=0.23:devel/p5-Test-Warn
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
diff --git a/devel/p5-InlineX-C2XS/Makefile b/devel/p5-InlineX-C2XS/Makefile
index be22d31e64bb..0d674b463274 100644
--- a/devel/p5-InlineX-C2XS/Makefile
+++ b/devel/p5-InlineX-C2XS/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl module to create an XS file from an Inline C file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline-C>=0.54:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline-C>=0.54:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0.23:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-InlineX-CPP2XS/Makefile b/devel/p5-InlineX-CPP2XS/Makefile
index 87c95863d37b..e07679cfe1f7 100644
--- a/devel/p5-InlineX-CPP2XS/Makefile
+++ b/devel/p5-InlineX-CPP2XS/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Convert from Inline C++ code to XS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0.50:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-CPP>=0.39:${PORTSDIR}/devel/p5-Inline-CPP
+BUILD_DEPENDS=	p5-Inline>=0.50:devel/p5-Inline \
+		p5-Inline-CPP>=0.39:devel/p5-Inline-CPP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0.24:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0.24:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Input-Validator/Makefile b/devel/p5-Input-Validator/Makefile
index 34daf22751cf..267fa09ffbda 100644
--- a/devel/p5-Input-Validator/Makefile
+++ b/devel/p5-Input-Validator/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Input validator that just validates input
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-String-CamelCase>=0:${PORTSDIR}/textproc/p5-String-CamelCase
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-String-CamelCase>=0:textproc/p5-String-CamelCase
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iodef-Pb-Simple/Makefile b/devel/p5-Iodef-Pb-Simple/Makefile
index a5f60aec08e1..9d472bcf64b6 100644
--- a/devel/p5-Iodef-Pb-Simple/Makefile
+++ b/devel/p5-Iodef-Pb-Simple/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Perl extension providing high level API access to Iodef-Pb
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.34:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Compress-Snappy>=0.18:${PORTSDIR}/archivers/p5-Compress-Snappy \
-		p5-DateTime>=0.61:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-DateParse>=0.05:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-		p5-Google-ProtocolBuffers>=0.08:${PORTSDIR}/devel/p5-Google-ProtocolBuffers \
-		p5-HTML-Table>=2.08:${PORTSDIR}/www/p5-HTML-Table \
-		p5-JSON-XS>=2.29:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-MIME-Base64>=0.08:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-Module-Install>=1.00:${PORTSDIR}/devel/p5-Module-Install \
-		p5-OSSP-uuid>=1.6.2:${PORTSDIR}/misc/p5-OSSP-uuid \
-		p5-Parse-Range>=0.96:${PORTSDIR}/math/p5-Parse-Range \
-		p5-Regexp-Common>=2010010201:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Regexp-Common-net-CIDR>=0.02:${PORTSDIR}/textproc/p5-Regexp-Common-net-CIDR \
-		p5-Snort-Rule>=1.07:${PORTSDIR}/security/p5-Snort-Rule \
-		p5-Text-Table>=1.126:${PORTSDIR}/textproc/p5-Text-Table
+BUILD_DEPENDS=	p5-Class-Accessor>=0.34:devel/p5-Class-Accessor \
+		p5-Compress-Snappy>=0.18:archivers/p5-Compress-Snappy \
+		p5-DateTime>=0.61:devel/p5-DateTime \
+		p5-DateTime-Format-DateParse>=0.05:devel/p5-DateTime-Format-DateParse \
+		p5-Google-ProtocolBuffers>=0.08:devel/p5-Google-ProtocolBuffers \
+		p5-HTML-Table>=2.08:www/p5-HTML-Table \
+		p5-JSON-XS>=2.29:converters/p5-JSON-XS \
+		p5-MIME-Base64>=0.08:converters/p5-MIME-Base64 \
+		p5-Module-Install>=1.00:devel/p5-Module-Install \
+		p5-OSSP-uuid>=1.6.2:misc/p5-OSSP-uuid \
+		p5-Parse-Range>=0.96:math/p5-Parse-Range \
+		p5-Regexp-Common>=2010010201:textproc/p5-Regexp-Common \
+		p5-Regexp-Common-net-CIDR>=0.02:textproc/p5-Regexp-Common-net-CIDR \
+		p5-Snort-Rule>=1.07:security/p5-Snort-Rule \
+		p5-Text-Table>=1.126:textproc/p5-Text-Table
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iterator-IO/Makefile b/devel/p5-Iterator-IO/Makefile
index d1962dc54a25..f60f90d227f8 100644
--- a/devel/p5-Iterator-IO/Makefile
+++ b/devel/p5-Iterator-IO/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Filesystem and stream iterators
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
+BUILD_DEPENDS=	p5-Iterator>=0:devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iterator-Misc/Makefile b/devel/p5-Iterator-Misc/Makefile
index ee20004f867a..d43eac79108a 100644
--- a/devel/p5-Iterator-Misc/Makefile
+++ b/devel/p5-Iterator-Misc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Miscellaneous iterator functions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
+BUILD_DEPENDS=	p5-Iterator>=0:devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iterator-Util/Makefile b/devel/p5-Iterator-Util/Makefile
index 73899665d4f8..d99f7736b29d 100644
--- a/devel/p5-Iterator-Util/Makefile
+++ b/devel/p5-Iterator-Util/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Essential utilities for the Iterator class
 
-BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
+BUILD_DEPENDS=	p5-Iterator>=0:devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iterator/Makefile b/devel/p5-Iterator/Makefile
index d532020d3563..4ccde0a71ec3 100644
--- a/devel/p5-Iterator/Makefile
+++ b/devel/p5-Iterator/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	General-purpose iterator class
 
-BUILD_DEPENDS=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS=	p5-Exception-Class>=0:devel/p5-Exception-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JIRA-Client/Makefile b/devel/p5-JIRA-Client/Makefile
index 686c33e11a35..b23033c88fc8 100644
--- a/devel/p5-JIRA-Client/Makefile
+++ b/devel/p5-JIRA-Client/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extended interface to JIRA's SOAP API
 
-RUN_DEPENDS=	p5-Data-Util>=0:${PORTSDIR}/devel/p5-Data-Util \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+RUN_DEPENDS=	p5-Data-Util>=0:devel/p5-Data-Util \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JIRA-REST/Makefile b/devel/p5-JIRA-REST/Makefile
index d03c2fc3e7cd..ad2e2856cb7a 100644
--- a/devel/p5-JIRA-REST/Makefile
+++ b/devel/p5-JIRA-REST/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Extended interface to JIRA REST API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-TreeBuilder-LibXML>=0:${PORTSDIR}/www/p5-HTML-TreeBuilder-LibXML \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-REST-Client>=0:${PORTSDIR}/www/p5-REST-Client \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-TreeBuilder-LibXML>=0:www/p5-HTML-TreeBuilder-LibXML \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-REST-Client>=0:www/p5-REST-Client \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JQuery/Makefile b/devel/p5-JQuery/Makefile
index 9d3ccca73d5f..5c8611309e16 100644
--- a/devel/p5-JQuery/Makefile
+++ b/devel/p5-JQuery/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Interface to Jquery, a language based on JavaScript
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CSS>=0:${PORTSDIR}/textproc/p5-CSS \
-		p5-HTML-Table>=0:${PORTSDIR}/www/p5-HTML-Table \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-CSS>=0:textproc/p5-CSS \
+		p5-HTML-Table>=0:www/p5-HTML-Table \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-JSON-Hyper/Makefile b/devel/p5-JSON-Hyper/Makefile
index 296241a27a7d..499732521962 100644
--- a/devel/p5-JSON-Hyper/Makefile
+++ b/devel/p5-JSON-Hyper/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Extract links from JSON objects
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-Path>=0:${PORTSDIR}/devel/p5-JSON-Path \
-		p5-URI>=1.30:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2.0:converters/p5-JSON \
+		p5-JSON-Path>=0:devel/p5-JSON-Path \
+		p5-URI>=1.30:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-Path/Makefile b/devel/p5-JSON-Path/Makefile
index b058c074c9bb..6e17171a1874 100644
--- a/devel/p5-JSON-Path/Makefile
+++ b/devel/p5-JSON-Path/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Search nested hashref/arrayref structures using JSONPath
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-LV>=0:${PORTSDIR}/devel/p5-LV
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-LV>=0:devel/p5-LV
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-Pointer/Makefile b/devel/p5-JSON-Pointer/Makefile
index aeab745d9482..d5ed15d185ed 100644
--- a/devel/p5-JSON-Pointer/Makefile
+++ b/devel/p5-JSON-Pointer/Makefile
@@ -13,10 +13,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-Clone>=0.36:${PORTSDIR}/devel/p5-Clone \
-	p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-	p5-URI>=1.65:${PORTSDIR}/net/p5-URI
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+	p5-Clone>=0.36:devel/p5-Clone \
+	p5-JSON>=2.53:converters/p5-JSON \
+	p5-URI>=1.65:net/p5-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-RPC-Common/Makefile b/devel/p5-JSON-RPC-Common/Makefile
index 65d7ca8f1ae2..26745d865143 100644
--- a/devel/p5-JSON-RPC-Common/Makefile
+++ b/devel/p5-JSON-RPC-Common/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Transport agnostic JSON RPC helper objects
 
-BUILD_DEPENDS=	p5-libwww>=5:${PORTSDIR}/www/p5-libwww \
-		p5-Moose>=0.81:${PORTSDIR}/devel/p5-Moose \
-		p5-JSON>=2.11:${PORTSDIR}/converters/p5-JSON \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-libwww>=5:www/p5-libwww \
+		p5-Moose>=0.81:devel/p5-Moose \
+		p5-JSON>=2.11:converters/p5-JSON \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Try-Tiny>0:lang/p5-Try-Tiny \
+		p5-URI>0:net/p5-URI \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -27,7 +27,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-JSON-RPC-Dispatcher/Makefile b/devel/p5-JSON-RPC-Dispatcher/Makefile
index f806258169a8..5968a90519a2 100644
--- a/devel/p5-JSON-RPC-Dispatcher/Makefile
+++ b/devel/p5-JSON-RPC-Dispatcher/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-JSON>=2.16:${PORTSDIR}/converters/p5-JSON \
-		p5-Log-Any>=0.11:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose \
-		p5-Plack>=0.9913:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-JSON>=2.16:converters/p5-JSON \
+		p5-Log-Any>=0.11:devel/p5-Log-Any \
+		p5-Moose>=0.93:devel/p5-Moose \
+		p5-Plack>=0.9913:www/p5-Plack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-RPC/Makefile b/devel/p5-JSON-RPC/Makefile
index 3a731c6d22d9..1cd482f0cf94 100644
--- a/devel/p5-JSON-RPC/Makefile
+++ b/devel/p5-JSON-RPC/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Perl implementation of JSON-RPC 1.1 protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Router-Simple>=0:${PORTSDIR}/www/p5-Router-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Router-Simple>=0:www/p5-Router-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-Schema/Makefile b/devel/p5-JSON-Schema/Makefile
index 2870a38ac9e0..75dfe794094d 100644
--- a/devel/p5-JSON-Schema/Makefile
+++ b/devel/p5-JSON-Schema/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Validate JSON against a schema
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-Path>=0:${PORTSDIR}/devel/p5-JSON-Path \
-		p5-JSON-Hyper>=0:${PORTSDIR}/devel/p5-JSON-Hyper \
-		p5-HTTP-Link-Parser>=0:${PORTSDIR}/www/p5-HTTP-Link-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-autovivification>=0:${PORTSDIR}/devel/p5-autovivification \
-		p5-match-simple>=0:${PORTSDIR}/devel/p5-match-simple
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+		p5-JSON>=2.0:converters/p5-JSON \
+		p5-JSON-Path>=0:devel/p5-JSON-Path \
+		p5-JSON-Hyper>=0:devel/p5-JSON-Hyper \
+		p5-HTTP-Link-Parser>=0:www/p5-HTTP-Link-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-autovivification>=0:devel/p5-autovivification \
+		p5-match-simple>=0:devel/p5-match-simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Jonk/Makefile b/devel/p5-Jonk/Makefile
index b60fd13d58ac..da67f16577bd 100644
--- a/devel/p5-Jonk/Makefile
+++ b/devel/p5-Jonk/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for simple job tank manager
 
 RUN_DEPENDS=	\
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-DBI>0:databases/p5-DBI \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-LV/Makefile b/devel/p5-LV/Makefile
index 1a59fc8d2e75..a9357a253471 100644
--- a/devel/p5-LV/Makefile
+++ b/devel/p5-LV/Makefile
@@ -15,8 +15,8 @@ COMMENT=	LV for lvalue
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Sentinel>=0:${PORTSDIR}/devel/p5-Sentinel \
-		p5-Variable-Magic>=0:${PORTSDIR}/devel/p5-Variable-Magic
+TEST_DEPENDS=	p5-Sentinel>=0:devel/p5-Sentinel \
+		p5-Variable-Magic>=0:devel/p5-Variable-Magic
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Lexical-Import/Makefile b/devel/p5-Lexical-Import/Makefile
index 852297eb4f31..d6ca38ca78d3 100644
--- a/devel/p5-Lexical-Import/Makefile
+++ b/devel/p5-Lexical-Import/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Clean imports from package-exporting modules
 
-BUILD_DEPENDS=	p5-Lexical-Var>=0.006:${PORTSDIR}/devel/p5-Lexical-Var \
-		p5-Module-Runtime>=0.011:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Params-Classify>=0:${PORTSDIR}/devel/p5-Params-Classify
+BUILD_DEPENDS=	p5-Lexical-Var>=0.006:devel/p5-Lexical-Var \
+		p5-Module-Runtime>=0.011:devel/p5-Module-Runtime \
+		p5-Params-Classify>=0:devel/p5-Params-Classify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Lexical-Persistence/Makefile b/devel/p5-Lexical-Persistence/Makefile
index 44db34b0553e..f1956eed214d 100644
--- a/devel/p5-Lexical-Persistence/Makefile
+++ b/devel/p5-Lexical-Persistence/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Persistent lexical variable values for arbitrary calls
 
-BUILD_DEPENDS=	p5-Devel-LexAlias>=0.04:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-PadWalker>=1.1:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-Devel-LexAlias>=0.04:devel/p5-Devel-LexAlias \
+		p5-PadWalker>=1.1:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-List-AllUtils/Makefile b/devel/p5-List-AllUtils/Makefile
index 0de02359ff69..596ac5a18056 100644
--- a/devel/p5-List-AllUtils/Makefile
+++ b/devel/p5-List-AllUtils/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Combines List::Util and List::MoreUtils in one bite-sized package
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0.28:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-List-MoreUtils>=0.28:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USE_PERL5=	configure
 USES=		perl5
@@ -22,8 +22,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.31:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.31:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.31:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.31:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-List-Group/Makefile b/devel/p5-List-Group/Makefile
index 422c6aa6c781..2670b99feb55 100644
--- a/devel/p5-List-Group/Makefile
+++ b/devel/p5-List-Group/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tillman@seekingfire.com
 COMMENT=	Perl module that allows you to group a list by columns or rows
 
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-List-Objects-Types/Makefile b/devel/p5-List-Objects-Types/Makefile
index 2c055185019c..f07e02716fd6 100644
--- a/devel/p5-List-Objects-Types/Makefile
+++ b/devel/p5-List-Objects-Types/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-List-Objects-WithUtils>=2:${PORTSDIR}/devel/p5-List-Objects-WithUtils \
-		p5-Type-Tiny>=0.022:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-List-Objects-WithUtils>=2:devel/p5-List-Objects-WithUtils \
+		p5-Type-Tiny>=0.022:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-List-Objects-WithUtils/Makefile b/devel/p5-List-Objects-WithUtils/Makefile
index 6ffba4c304de..049df97f5810 100644
--- a/devel/p5-List-Objects-WithUtils/Makefile
+++ b/devel/p5-List-Objects-WithUtils/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-List-UtilsBy>=0.09:${PORTSDIR}/devel/p5-List-UtilsBy \
-		p5-Module-Runtime>=0.013:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Role-Tiny>=1.003:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Type-Tie>=0.004:${PORTSDIR}/devel/p5-Type-Tie \
-		p5-autobox>=0:${PORTSDIR}/devel/p5-autobox \
-		p5-strictures>=2:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-List-UtilsBy>=0.09:devel/p5-List-UtilsBy \
+		p5-Module-Runtime>=0.013:devel/p5-Module-Runtime \
+		p5-Role-Tiny>=1.003:devel/p5-Role-Tiny \
+		p5-Type-Tie>=0.004:devel/p5-Type-Tie \
+		p5-autobox>=0:devel/p5-autobox \
+		p5-strictures>=2:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -30,8 +30,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-List-SomeUtils-XS/Makefile b/devel/p5-List-SomeUtils-XS/Makefile
index 5b2ece2407f0..bc9c4f0129e0 100644
--- a/devel/p5-List-SomeUtils-XS/Makefile
+++ b/devel/p5-List-SomeUtils-XS/Makefile
@@ -13,8 +13,8 @@ COMMENT=	XS implementation for List::SomeUtils
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Warnings>=0.006:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Warnings>=0.006:devel/p5-Test-Warnings
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-List-SomeUtils/Makefile b/devel/p5-List-SomeUtils/Makefile
index 38a971aad41c..2caddf6edf93 100644
--- a/devel/p5-List-SomeUtils/Makefile
+++ b/devel/p5-List-SomeUtils/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-List-SomeUtils-XS>=0:${PORTSDIR}/devel/p5-List-SomeUtils-XS \
-		p5-Module-Implementation>=0:${PORTSDIR}/devel/p5-Module-Implementation
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+		p5-List-SomeUtils-XS>=0:devel/p5-List-SomeUtils-XS \
+		p5-Module-Implementation>=0:devel/p5-Module-Implementation
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index f53e369c3737..bb677749de8f 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Use other catalog formats in Locale::Maketext
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	p5-Locale-Maketext>=1.17:${PORTSDIR}/devel/p5-Locale-Maketext
+RUN_DEPENDS=	p5-Locale-Maketext>=1.17:devel/p5-Locale-Maketext
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile
index f9b78c0a145c..ea54ebf0a50f 100644
--- a/devel/p5-Locale-Maketext/Makefile
+++ b/devel/p5-Locale-Maketext/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Framework for software localization and inheritance-based lexicons
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Locale-PO/Makefile b/devel/p5-Locale-PO/Makefile
index 7b607993d501..e321950ad1b3 100644
--- a/devel/p5-Locale-PO/Makefile
+++ b/devel/p5-Locale-PO/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module for manipulating .po entries from GNU gettext
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Accounting-SVK/Makefile b/devel/p5-Log-Accounting-SVK/Makefile
index 6759ac573411..d105baebbad7 100644
--- a/devel/p5-Log-Accounting-SVK/Makefile
+++ b/devel/p5-Log-Accounting-SVK/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Perl module for accounting SVK repository
 
-BUILD_DEPENDS=	svk>=0:${PORTSDIR}/devel/svk \
-		p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-Graph-SocialMap>=0:${PORTSDIR}/graphics/p5-Graph-SocialMap \
-		p5-Graph-Writer-GraphViz>=0:${PORTSDIR}/graphics/p5-Graph-Writer-GraphViz \
-		p5-Algorithm-Accounting>=0:${PORTSDIR}/devel/p5-Algorithm-Accounting
+BUILD_DEPENDS=	svk>=0:devel/svk \
+		p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-Graph-SocialMap>=0:graphics/p5-Graph-SocialMap \
+		p5-Graph-Writer-GraphViz>=0:graphics/p5-Graph-Writer-GraphViz \
+		p5-Algorithm-Accounting>=0:devel/p5-Algorithm-Accounting
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Accounting-SVN/Makefile b/devel/p5-Log-Accounting-SVN/Makefile
index 391a868742d1..b0c7790dc650 100644
--- a/devel/p5-Log-Accounting-SVN/Makefile
+++ b/devel/p5-Log-Accounting-SVN/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Perl module for accounting SVN repository
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-SVN-Log>=0:${PORTSDIR}/devel/p5-SVN-Log \
-		p5-Algorithm-Accounting>=0:${PORTSDIR}/devel/p5-Algorithm-Accounting \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-SVN-Log>=0:devel/p5-SVN-Log \
+		p5-Algorithm-Accounting>=0:devel/p5-Algorithm-Accounting \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index 13e08e6b12ff..6ec8f28bb2e8 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log::Agent::Logger - a logging interface for perl
 
-BUILD_DEPENDS=	p5-Log-Agent>=0:${PORTSDIR}/devel/p5-Log-Agent
+BUILD_DEPENDS=	p5-Log-Agent>=0:devel/p5-Log-Agent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Any-Adapter-Callback/Makefile b/devel/p5-Log-Any-Adapter-Callback/Makefile
index 5475c772ac25..1a77442b3157 100644
--- a/devel/p5-Log-Any-Adapter-Callback/Makefile
+++ b/devel/p5-Log-Any-Adapter-Callback/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension adapter for Log::Any with callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS:=	p5-Log-Any>0:${PORTSDIR}/devel/p5-Log-Any
+RUN_DEPENDS:=	p5-Log-Any>0:devel/p5-Log-Any
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Any-Adapter-Dispatch/Makefile b/devel/p5-Log-Any-Adapter-Dispatch/Makefile
index c5d60ccf272b..3ec5a976b839 100644
--- a/devel/p5-Log-Any-Adapter-Dispatch/Makefile
+++ b/devel/p5-Log-Any-Adapter-Dispatch/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for adapter to use Log::Dispatch with Log::Any
 
 RUN_DEPENDS=	\
-	p5-Log-Any>0:${PORTSDIR}/devel/p5-Log-Any \
-	p5-Log-Dispatch>=2.26:${PORTSDIR}/devel/p5-Log-Dispatch
+	p5-Log-Any>0:devel/p5-Log-Any \
+	p5-Log-Dispatch>=2.26:devel/p5-Log-Dispatch
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Any-Adapter-Log4perl/Makefile b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
index 93a892c1f42b..fd0134a5ee48 100644
--- a/devel/p5-Log-Any-Adapter-Log4perl/Makefile
+++ b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Log::Any adapter for Log4perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Any>=1.03:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Log-Log4perl>=1.32:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Log-Any>=1.03:devel/p5-Log-Any \
+		p5-Log-Log4perl>=1.32:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Any-Adapter-Syslog/Makefile b/devel/p5-Log-Any-Adapter-Syslog/Makefile
index 8dfd3157dd4b..d6e5e50ecf08 100644
--- a/devel/p5-Log-Any-Adapter-Syslog/Makefile
+++ b/devel/p5-Log-Any-Adapter-Syslog/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Send Log::Any logs to syslog
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Log-Any>=0:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog
+RUN_DEPENDS=	p5-Log-Any>=0:devel/p5-Log-Any \
+		p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-MockModule>=0:devel/p5-Test-MockModule \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Any-App/Makefile b/devel/p5-Log-Any-App/Makefile
index a64855d335b5..636eb20b9f4f 100644
--- a/devel/p5-Log-Any-App/Makefile
+++ b/devel/p5-Log-Any-App/Makefile
@@ -14,18 +14,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Write-Rotate>=0.29:${PORTSDIR}/devel/p5-File-Write-Rotate \
-		p5-IO-Socket-UNIX-Util>=0:${PORTSDIR}/net/p5-IO-Socket-UNIX-Util \
-		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Log-Any-Adapter-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Any-Adapter-Log4perl \
-		p5-Log-Any-IfLOG>=0.07:${PORTSDIR}/devel/p5-Log-Any-IfLOG \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Dispatch-ArrayWithLimits>=0:${PORTSDIR}/devel/p5-Log-Dispatch-ArrayWithLimits \
-		p5-Log-Dispatch-Dir>=0.08:${PORTSDIR}/devel/p5-Log-Dispatch-Dir \
-		p5-Log-Dispatch-FileWriteRotate>=0.04:${PORTSDIR}/devel/p5-Log-Dispatch-FileWriteRotate
+BUILD_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Write-Rotate>=0.29:devel/p5-File-Write-Rotate \
+		p5-IO-Socket-UNIX-Util>=0:net/p5-IO-Socket-UNIX-Util \
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-Log-Any-Adapter-Log4perl>=0:devel/p5-Log-Any-Adapter-Log4perl \
+		p5-Log-Any-IfLOG>=0.07:devel/p5-Log-Any-IfLOG \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Log-Dispatch-ArrayWithLimits>=0:devel/p5-Log-Dispatch-ArrayWithLimits \
+		p5-Log-Dispatch-Dir>=0.08:devel/p5-Log-Dispatch-Dir \
+		p5-Log-Dispatch-FileWriteRotate>=0.04:devel/p5-Log-Dispatch-FileWriteRotate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurper>=0:${PORTSDIR}/devel/p5-File-Slurper
+TEST_DEPENDS=	p5-File-Slurper>=0:devel/p5-File-Slurper
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Log-Any-IfLOG/Makefile b/devel/p5-Log-Any-IfLOG/Makefile
index cf02c926a2ac..7269abfe05e9 100644
--- a/devel/p5-Log-Any-IfLOG/Makefile
+++ b/devel/p5-Log-Any-IfLOG/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Load Log::Any only if LOG environment variable is true
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Any>=0:${PORTSDIR}/devel/p5-Log-Any
+BUILD_DEPENDS=	p5-Log-Any>=0:devel/p5-Log-Any
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Log-Contextual/Makefile b/devel/p5-Log-Contextual/Makefile
index 8d60ba84f0e0..5a24526f9214 100644
--- a/devel/p5-Log-Contextual/Makefile
+++ b/devel/p5-Log-Contextual/Makefile
@@ -13,11 +13,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-Dumper-Concise>0:${PORTSDIR}/devel/p5-Data-Dumper-Concise \
-	p5-Exporter-Declare>=0.111:${PORTSDIR}/devel/p5-Exporter-Declare \
-	p5-Moo>=1.003:${PORTSDIR}/devel/p5-Moo
+	p5-Data-Dumper-Concise>0:devel/p5-Data-Dumper-Concise \
+	p5-Exporter-Declare>=0.111:devel/p5-Exporter-Declare \
+	p5-Moo>=1.003:devel/p5-Moo
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl
+TEST_DEPENDS=	p5-Log-Log4perl>0:devel/p5-Log-Log4perl
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Defer/Makefile b/devel/p5-Log-Defer/Makefile
index 4784259a80f7..4fdfc031c674 100644
--- a/devel/p5-Log-Defer/Makefile
+++ b/devel/p5-Log-Defer/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Deferred logs and timers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Guard>=0:${PORTSDIR}/devel/p5-Guard
+RUN_DEPENDS=	p5-Guard>=0:devel/p5-Guard
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Log-Dispatch-Array/Makefile b/devel/p5-Log-Dispatch-Array/Makefile
index 95f44e056180..7ab27dfa6b6a 100644
--- a/devel/p5-Log-Dispatch-Array/Makefile
+++ b/devel/p5-Log-Dispatch-Array/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-ArrayWithLimits/Makefile b/devel/p5-Log-Dispatch-ArrayWithLimits/Makefile
index d0c6ee52f7ff..e63b42288548 100644
--- a/devel/p5-Log-Dispatch-ArrayWithLimits/Makefile
+++ b/devel/p5-Log-Dispatch-ArrayWithLimits/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Log to array, with some limits applied
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Perl-osnames>=0.09:${PORTSDIR}/devel/p5-Perl-osnames
-RUN_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Perl-osnames>=0.09:devel/p5-Perl-osnames
+RUN_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Colorful/Makefile b/devel/p5-Log-Dispatch-Colorful/Makefile
index f72b353f945b..649f12749475 100644
--- a/devel/p5-Log-Dispatch-Colorful/Makefile
+++ b/devel/p5-Log-Dispatch-Colorful/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for logging to screen
 
-BUILD_DEPENDS=	p5-Filter>0:${PORTSDIR}/devel/p5-Filter \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Filter>0:devel/p5-Filter \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Log-Dispatch>0:devel/p5-Log-Dispatch \
+		p5-Params-Validate>0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Config/Makefile b/devel/p5-Log-Dispatch-Config/Makefile
index 3ba120fc9090..9ece15cad18a 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log4j equivalent for Perl
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-AppConfig>=1.52:${PORTSDIR}/devel/p5-AppConfig \
-		p5-Log-Dispatch>=2:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-AppConfig>=1.52:devel/p5-AppConfig \
+		p5-Log-Dispatch>=2:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Configurator-Any/Makefile b/devel/p5-Log-Dispatch-Configurator-Any/Makefile
index f22eb7babef0..82eb01fa3f37 100644
--- a/devel/p5-Log-Dispatch-Configurator-Any/Makefile
+++ b/devel/p5-Log-Dispatch-Configurator-Any/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Configurator implementation with Config::Any
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0.15:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Log-Dispatch>=2.23:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Dispatch-Config>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Config
+BUILD_DEPENDS=	p5-Config-Any>=0.15:devel/p5-Config-Any \
+		p5-Log-Dispatch>=2.23:devel/p5-Log-Dispatch \
+		p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
+TEST_DEPENDS=	p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Configurator-YAML/Makefile b/devel/p5-Log-Dispatch-Configurator-YAML/Makefile
index 6049c00a7311..0fa835a2e825 100644
--- a/devel/p5-Log-Dispatch-Configurator-YAML/Makefile
+++ b/devel/p5-Log-Dispatch-Configurator-YAML/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	oleg@mamontov.net
 COMMENT=	Configurator implementation with YAML
 
-RUN_DEPENDS=	p5-Log-Dispatch-Config>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Config \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-BUILD_DEPENDS=	p5-Log-Dispatch-Config>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Config \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config \
+		p5-YAML>=0:textproc/p5-YAML
+BUILD_DEPENDS=	p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-DBI/Makefile b/devel/p5-Log-Dispatch-DBI/Makefile
index 9602089b9235..dad438100865 100644
--- a/devel/p5-Log-Dispatch-DBI/Makefile
+++ b/devel/p5-Log-Dispatch-DBI/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gebhart@secnetix.de
 COMMENT=	Log::Dispatch output class for logging to database via DBI interface
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=2.0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-DBI>0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-Log-Dispatch>=2.0:devel/p5-Log-Dispatch \
+		p5-DBI>0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-CSV>0:${PORTSDIR}/databases/p5-DBD-CSV
+TEST_DEPENDS=	p5-DBD-CSV>0:databases/p5-DBD-CSV
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-Dir/Makefile b/devel/p5-Log-Dispatch-Dir/Makefile
index 84010dd6a3fa..16a280ff6149 100644
--- a/devel/p5-Log-Dispatch-Dir/Makefile
+++ b/devel/p5-Log-Dispatch-Dir/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Probe-Perl>=0:${PORTSDIR}/sysutils/p5-Probe-Perl
+BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Probe-Perl>=0:sysutils/p5-Probe-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-LibMagic>=0:${PORTSDIR}/devel/p5-File-LibMagic \
-		p5-Media-Type-Simple>=0:${PORTSDIR}/devel/p5-Media-Type-Simple
+TEST_DEPENDS=	p5-File-LibMagic>=0:devel/p5-File-LibMagic \
+		p5-Media-Type-Simple>=0:devel/p5-Media-Type-Simple
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
index 92698cc6a5b2..b474afb248dc 100644
--- a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
+++ b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Subclass of Log-Dispatch-Email that uses Email-Send
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Send>=2.0:${PORTSDIR}/mail/p5-Email-Send \
-		p5-Email-Simple>=2.100:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Log-Dispatch>=2.0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Email-Send>=2.0:mail/p5-Email-Send \
+		p5-Email-Simple>=2.100:mail/p5-Email-Simple \
+		p5-Log-Dispatch>=2.0:devel/p5-Log-Dispatch \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-File-Rolling/Makefile b/devel/p5-Log-Dispatch-File-Rolling/Makefile
index 576201306b94..22f94065a33f 100644
--- a/devel/p5-Log-Dispatch-File-Rolling/Makefile
+++ b/devel/p5-Log-Dispatch-File-Rolling/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Object for logging to date/time/pid stamped files
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=2.37:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Log4perl>=1.38:${PORTSDIR}/devel/p5-Log-Log4perl
-RUN_DEPENDS=	p5-Log-Dispatch>=2.37:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Log4perl>=1.38:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Log-Dispatch>=2.37:devel/p5-Log-Dispatch \
+		p5-Log-Log4perl>=1.38:devel/p5-Log-Log4perl
+RUN_DEPENDS=	p5-Log-Dispatch>=2.37:devel/p5-Log-Dispatch \
+		p5-Log-Log4perl>=1.38:devel/p5-Log-Log4perl
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-File-Stamped/Makefile b/devel/p5-Log-Dispatch-File-Stamped/Makefile
index 24f0d9c3f095..cf6cd6c4ed28 100644
--- a/devel/p5-Log-Dispatch-File-Stamped/Makefile
+++ b/devel/p5-Log-Dispatch-File-Stamped/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Logging to date/time stamped files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=2.38:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Log-Dispatch>=2.38:devel/p5-Log-Dispatch \
+		p5-Params-Validate>0:devel/p5-Params-Validate \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-CheckDeps>=0.002:${PORTSDIR}/devel/p5-Test-CheckDeps \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-TempDir-Tiny>0:${PORTSDIR}/devel/p5-Test-TempDir-Tiny
+TEST_DEPENDS=	p5-Path-Tiny>0:devel/p5-Path-Tiny \
+		p5-Test-CheckDeps>=0.002:devel/p5-Test-CheckDeps \
+		p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Test-TempDir-Tiny>0:devel/p5-Test-TempDir-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index 69120bb30ff7..34801528d83c 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Log::Dispatch plug-in for files that archive/rotate themselves
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-FileShared/Makefile b/devel/p5-Log-Dispatch-FileShared/Makefile
index c3d4726d90ac..ef5d5fd6af25 100644
--- a/devel/p5-Log-Dispatch-FileShared/Makefile
+++ b/devel/p5-Log-Dispatch-FileShared/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log::Dispatch output class for logging to shared files
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-FileWriteRotate/Makefile b/devel/p5-Log-Dispatch-FileWriteRotate/Makefile
index 306850dca89b..0f5c91b73e15 100644
--- a/devel/p5-Log-Dispatch-FileWriteRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileWriteRotate/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-Write-Rotate>=0.29:${PORTSDIR}/devel/p5-File-Write-Rotate \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-File-Write-Rotate>=0.29:devel/p5-File-Write-Rotate \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Log-Dispatch-Perl/Makefile b/devel/p5-Log-Dispatch-Perl/Makefile
index b8174da0a1cf..5b5ae920aaaf 100644
--- a/devel/p5-Log-Dispatch-Perl/Makefile
+++ b/devel/p5-Log-Dispatch-Perl/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log::Dispatch plug-in using core Perl functions for logging
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Screen-Color/Makefile b/devel/p5-Log-Dispatch-Screen-Color/Makefile
index cd91195ad297..b3ccd1f1bed7 100644
--- a/devel/p5-Log-Dispatch-Screen-Color/Makefile
+++ b/devel/p5-Log-Dispatch-Screen-Color/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to support color for Log::Dispatch::Screen
 
 RUN_DEPENDS=	\
-	p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch \
-	p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
+	p5-Log-Dispatch>0:devel/p5-Log-Dispatch \
+	p5-Params-Validate>0:devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy
+TEST_DEPENDS=	p5-IO-stringy>0:devel/p5-IO-stringy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-Scribe/Makefile b/devel/p5-Log-Dispatch-Scribe/Makefile
index b7edcddae7e6..cc89fef1f800 100644
--- a/devel/p5-Log-Dispatch-Scribe/Makefile
+++ b/devel/p5-Log-Dispatch-Scribe/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Logging via Facebook's Scribe server software
 
-BUILD_DEPENDS=	p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-Log-Dispatch>0:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-Timer>=0:${PORTSDIR}/devel/p5-Test-Timer
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-Test-Timer>=0:devel/p5-Test-Timer
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index 6fc31e8644c6..bde4224356da 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Suite of OO modules for logging messages to multiple outputs
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Dist-CheckConflicts>=0.02:${PORTSDIR}/devel/p5-Dist-CheckConflicts \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Params-Validate>=1.03:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Params-Validate>=1.03:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 OPTIONS_DEFINE=		APACHELOG MIMELITE MAILSEND MAILSENDER MAILSENDMAIL
 OPTIONS_DEFAULT=	MAILSENDMAIL
@@ -33,11 +33,11 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-APACHELOG_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+APACHELOG_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 APACHELOG_USE=		APACHE_RUN=22+
-MIMELITE_RUN_DEPENDS=	p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite
-MAILSEND_RUN_DEPENDS=	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
-MAILSENDER_RUN_DEPENDS=	p5-Mail-Sender>=0:${PORTSDIR}/mail/p5-Mail-Sender
-MAILSENDMAIL_RUN_DEPENDS=	p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail
+MIMELITE_RUN_DEPENDS=	p5-MIME-Lite>=0:mail/p5-MIME-Lite
+MAILSEND_RUN_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools
+MAILSENDER_RUN_DEPENDS=	p5-Mail-Sender>=0:mail/p5-Mail-Sender
+MAILSENDMAIL_RUN_DEPENDS=	p5-Mail-Sendmail>=0:mail/p5-Mail-Sendmail
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatchouli/Makefile b/devel/p5-Log-Dispatchouli/Makefile
index 14cb0adc449e..39ae04802245 100644
--- a/devel/p5-Log-Dispatchouli/Makefile
+++ b/devel/p5-Log-Dispatchouli/Makefile
@@ -15,17 +15,17 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Dispatch-Array>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Array \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-String-Flogger>=0:${PORTSDIR}/textproc/p5-String-Flogger \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Exporter-GlobExporter>=0.002:${PORTSDIR}/devel/p5-Sub-Exporter-GlobExporter \
-		p5-Sys-Syslog>=0.16:${PORTSDIR}/sysutils/p5-Sys-Syslog \
-		p5-Try-Tiny>=0.04:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Log-Dispatch-Array>=0:devel/p5-Log-Dispatch-Array \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-String-Flogger>=0:textproc/p5-String-Flogger \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Exporter-GlobExporter>=0.002:devel/p5-Sub-Exporter-GlobExporter \
+		p5-Sys-Syslog>=0.16:sysutils/p5-Sys-Syslog \
+		p5-Try-Tiny>=0.04:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Log-Dump/Makefile b/devel/p5-Log-Dump/Makefile
index 6392f81c99f8..b1280e66cb7c 100644
--- a/devel/p5-Log-Dump/Makefile
+++ b/devel/p5-Log-Dump/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
-	p5-Sub-Install>0:${PORTSDIR}/devel/p5-Sub-Install
+	p5-Data-Dump>0:devel/p5-Data-Dump \
+	p5-Sub-Install>0:devel/p5-Sub-Install
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-	p5-ExtUtils-MakeMaker-CPANfile>0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+	p5-ExtUtils-MakeMaker-CPANfile>0:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Handler/Makefile b/devel/p5-Log-Handler/Makefile
index 7793894e70e1..264927b6098a 100644
--- a/devel/p5-Log-Handler/Makefile
+++ b/devel/p5-Log-Handler/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Object-oriented handler for logging, tracing, and debugging in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Email-Date>=0:${PORTSDIR}/mail/p5-Email-Date
+TEST_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Email-Date>=0:mail/p5-Email-Date
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
index 09f962184003..f0f60205a616 100644
--- a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
+++ b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
@@ -12,15 +12,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl module which allows logging to RabbitMQ via log4perl
 
-RUN_DEPENDS=	${LOCALBASE}/bin/l4p-tmpl:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Net-RabbitMQ>0:${PORTSDIR}/net/p5-Net-RabbitMQ \
-		p5-Readonly>0:${PORTSDIR}/devel/p5-Readonly \
+RUN_DEPENDS=	${LOCALBASE}/bin/l4p-tmpl:devel/p5-Log-Log4perl \
+		p5-Net-RabbitMQ>0:net/p5-Net-RabbitMQ \
+		p5-Readonly>0:devel/p5-Readonly \
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/l4p-tmpl:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Net-RabbitMQ>0:${PORTSDIR}/net/p5-Net-RabbitMQ \
-		p5-Readonly>0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Test-Output>0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Net-RabbitMQ>0:${PORTSDIR}/devel/p5-Test-Net-RabbitMQ
+BUILD_DEPENDS=	${LOCALBASE}/bin/l4p-tmpl:devel/p5-Log-Log4perl \
+		p5-Net-RabbitMQ>0:net/p5-Net-RabbitMQ \
+		p5-Readonly>0:devel/p5-Readonly \
+		p5-Test-Output>0:devel/p5-Test-Output \
+		p5-Test-Net-RabbitMQ>0:devel/p5-Test-Net-RabbitMQ
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Message-Simple/Makefile b/devel/p5-Log-Message-Simple/Makefile
index 5d8c4f1e826b..d8bedbae4300 100644
--- a/devel/p5-Log-Message-Simple/Makefile
+++ b/devel/p5-Log-Message-Simple/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides standardized logging facilities using the Log::Message module
 
-BUILD_DEPENDS=	p5-Log-Message>=0:${PORTSDIR}/devel/p5-Log-Message
+BUILD_DEPENDS=	p5-Log-Message>=0:devel/p5-Log-Message
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Message/Makefile b/devel/p5-Log-Message/Makefile
index d67669c16846..1b5b03dfd777 100644
--- a/devel/p5-Log-Message/Makefile
+++ b/devel/p5-Log-Message/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Powerful and flexible message logging mechanism
 
-BUILD_DEPENDS=	p5-Params-Check>=0:${PORTSDIR}/devel/p5-Params-Check \
-		p5-Module-Load>=0:${PORTSDIR}/devel/p5-Module-Load \
-		p5-Locale-Maketext-Simple>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Simple
+BUILD_DEPENDS=	p5-Params-Check>=0:devel/p5-Params-Check \
+		p5-Module-Load>=0:devel/p5-Module-Load \
+		p5-Locale-Maketext-Simple>=0:devel/p5-Locale-Maketext-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Report-Optional/Makefile b/devel/p5-Log-Report-Optional/Makefile
index 6c15700efea2..f0954b12a87b 100644
--- a/devel/p5-Log-Report-Optional/Makefile
+++ b/devel/p5-Log-Report-Optional/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Log::Report or ::Minimal
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-String-Print>=0.13:${PORTSDIR}/textproc/p5-String-Print
+BUILD_DEPENDS=	p5-String-Print>=0.13:textproc/p5-String-Print
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Report/Makefile b/devel/p5-Log-Report/Makefile
index e8f84e2b5ec9..ae5627dbcd7d 100644
--- a/devel/p5-Log-Report/Makefile
+++ b/devel/p5-Log-Report/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Report a problem, pluggable handlers and language support
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-GlobalDestruction>=0.09:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Log-Report-Optional>=1.02:${PORTSDIR}/devel/p5-Log-Report-Optional \
-		p5-String-Print>=0.13:${PORTSDIR}/textproc/p5-String-Print
+BUILD_DEPENDS=	p5-Devel-GlobalDestruction>=0.09:devel/p5-Devel-GlobalDestruction \
+		p5-Log-Report-Optional>=1.02:devel/p5-Log-Report-Optional \
+		p5-String-Print>=0.13:textproc/p5-String-Print
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Log-TraceMessages/Makefile b/devel/p5-Log-TraceMessages/Makefile
index 0e5ca03dcf67..ed53e3db0896 100644
--- a/devel/p5-Log-TraceMessages/Makefile
+++ b/devel/p5-Log-TraceMessages/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for trace messages used in debugging
 
-BUILD_DEPENDS=	p5-HTML-FromText>=0:${PORTSDIR}/www/p5-HTML-FromText
+BUILD_DEPENDS=	p5-HTML-FromText>=0:www/p5-HTML-FromText
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Luka/Makefile b/devel/p5-Luka/Makefile
index 8d55adb72497..b1f3b825cb17 100644
--- a/devel/p5-Luka/Makefile
+++ b/devel/p5-Luka/Makefile
@@ -15,16 +15,16 @@ COMMENT=	Exception handling and reporting framework
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Std>=0:${PORTSDIR}/devel/p5-Class-Std \
-		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Mail-SendEasy>=0:${PORTSDIR}/mail/p5-Mail-SendEasy \
-		p5-Sub-Uplevel>=0:${PORTSDIR}/devel/p5-Sub-Uplevel \
-		p5-Sys-Hostname-Long>=0:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
-		p5-What>=0:${PORTSDIR}/net/p5-What
+BUILD_DEPENDS=	p5-Class-Std>=0:devel/p5-Class-Std \
+		p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-Error>=0:lang/p5-Error \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Mail-SendEasy>=0:mail/p5-Mail-SendEasy \
+		p5-Sub-Uplevel>=0:devel/p5-Sub-Uplevel \
+		p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \
+		p5-What>=0:net/p5-What
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MRO-Compat/Makefile b/devel/p5-MRO-Compat/Makefile
index 826ebe5c2f76..97e7a26bd13e 100644
--- a/devel/p5-MRO-Compat/Makefile
+++ b/devel/p5-MRO-Compat/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Add mro::* interface compatibility for Perls < 5.9.5
 
-BUILD_DEPENDS=	p5-Class-C3>=0.19:${PORTSDIR}/devel/p5-Class-C3
+BUILD_DEPENDS=	p5-Class-C3>=0.19:devel/p5-Class-C3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MRO-Define/Makefile b/devel/p5-MRO-Define/Makefile
index 3ecda7a5e9af..24fe38f7c514 100644
--- a/devel/p5-MRO-Define/Makefile
+++ b/devel/p5-MRO-Define/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Define your own method resolution order
 
-TEST_DEPENDS=	p5-Variable-Magic>=0:${PORTSDIR}/devel/p5-Variable-Magic
+TEST_DEPENDS=	p5-Variable-Magic>=0:devel/p5-Variable-Magic
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Mac-PropertyList/Makefile b/devel/p5-Mac-PropertyList/Makefile
index 75fdf3d2d6b1..b3f74a6b97b5 100644
--- a/devel/p5-Mac-PropertyList/Makefile
+++ b/devel/p5-Mac-PropertyList/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension for parsing Mac OS X property lists
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Entities>=0:${PORTSDIR}/textproc/p5-XML-Entities
+BUILD_DEPENDS=	p5-XML-Entities>=0:textproc/p5-XML-Entities
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -22,7 +22,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.64:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.64:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Make/Makefile b/devel/p5-Make/Makefile
index 4a21a837c86e..d0515c4480b6 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-Compile>=1.2.1:${PORTSDIR}/devel/p5-Test-Compile
+TEST_DEPENDS=	p5-Test-Compile>=1.2.1:devel/p5-Test-Compile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Media-Type-Simple/Makefile b/devel/p5-Media-Type-Simple/Makefile
index 6041072c3080..6ac719691feb 100644
--- a/devel/p5-Media-Type-Simple/Makefile
+++ b/devel/p5-Media-Type-Simple/Makefile
@@ -15,10 +15,10 @@ COMMENT=	MIME Media Types and their file extensions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Meta-Builder/Makefile b/devel/p5-Meta-Builder/Makefile
index c90d767984d3..44798230d855 100644
--- a/devel/p5-Meta-Builder/Makefile
+++ b/devel/p5-Meta-Builder/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for creating Meta objects to track custom metrics
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Fennec-Lite>=0:${PORTSDIR}/devel/p5-Fennec-Lite
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Fennec-Lite>=0:devel/p5-Fennec-Lite
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-MetaCPAN-Client/Makefile b/devel/p5-MetaCPAN-Client/Makefile
index c693382bc18b..1e1efd237c1e 100644
--- a/devel/p5-MetaCPAN-Client/Makefile
+++ b/devel/p5-MetaCPAN-Client/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Comprehensive, DWIM-featured client to the MetaCPAN API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Search-Elasticsearch>=1.10:${PORTSDIR}/textproc/p5-Search-Elasticsearch \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Search-Elasticsearch>=1.10:textproc/p5-Search-Elasticsearch \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Metabase-Client-Simple/Makefile b/devel/p5-Metabase-Client-Simple/Makefile
index bd594b078969..3df44085dff2 100644
--- a/devel/p5-Metabase-Client-Simple/Makefile
+++ b/devel/p5-Metabase-Client-Simple/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Client that submits to Metabase servers
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Metabase-Fact>0:${PORTSDIR}/devel/p5-Metabase-Fact
-RUN_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Metabase-Fact>0:${PORTSDIR}/devel/p5-Metabase-Fact \
-		p5-Crypt-SSLeay>0:${PORTSDIR}/security/p5-Crypt-SSLeay
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Metabase-Fact>0:devel/p5-Metabase-Fact
+RUN_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Metabase-Fact>0:devel/p5-Metabase-Fact \
+		p5-Crypt-SSLeay>0:security/p5-Crypt-SSLeay
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Metabase-Fact/Makefile b/devel/p5-Metabase-Fact/Makefile
index 582718a433de..a99b291c08a6 100644
--- a/devel/p5-Metabase-Fact/Makefile
+++ b/devel/p5-Metabase-Fact/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Metabase Facts
 
-BUILD_DEPENDS=	p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-Data-GUID>=0:${PORTSDIR}/devel/p5-Data-GUID \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-CPAN-DistnameInfo>0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo
+BUILD_DEPENDS=	p5-JSON>=2.0:converters/p5-JSON \
+		p5-Data-GUID>=0:devel/p5-Data-GUID \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-CPAN-DistnameInfo>0:devel/p5-CPAN-DistnameInfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Method-Signatures-Simple/Makefile b/devel/p5-Method-Signatures-Simple/Makefile
index abf0defb4ad4..95c4e9c6eb4f 100644
--- a/devel/p5-Method-Signatures-Simple/Makefile
+++ b/devel/p5-Method-Signatures-Simple/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Basic method declarations with signatures, without source filters
 
-BUILD_DEPENDS=	p5-Devel-Declare>=0:${PORTSDIR}/devel/p5-Devel-Declare
+BUILD_DEPENDS=	p5-Devel-Declare>=0:devel/p5-Devel-Declare
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Minilla/Makefile b/devel/p5-Minilla/Makefile
index 32664ccc1c9c..3e38a2061e42 100644
--- a/devel/p5-Minilla/Makefile
+++ b/devel/p5-Minilla/Makefile
@@ -17,44 +17,44 @@ COMMENT=	CPAN module authoring tool
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	git>=0:${PORTSDIR}/devel/git \
-		tree>=0:${PORTSDIR}/sysutils/tree \
-		p5-App-cpanminus>=1.6902:${PORTSDIR}/devel/p5-App-cpanminus \
-		p5-Archive-Tar>=1.60:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-CPAN-Meta>=2.132830:${PORTSDIR}/devel/p5-CPAN-Meta \
-		p5-Config-Identity>=0:${PORTSDIR}/devel/p5-Config-Identity \
-		p5-Data-Section-Simple>=0.04:${PORTSDIR}/devel/p5-Data-Section-Simple \
-		p5-ExtUtils-Manifest>=1.54:${PORTSDIR}/devel/p5-ExtUtils-Manifest \
-		p5-CPAN-Uploader>=0:${PORTSDIR}/devel/p5-CPAN-Uploader \
-		p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-Config-Identity>=0:${PORTSDIR}/devel/p5-Config-Identity \
-		p5-Devel-CheckBin>=0:${PORTSDIR}/devel/p5-Devel-CheckBin \
-		p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-File-pushd>=0:${PORTSDIR}/devel/p5-File-pushd \
-		p5-Getopt-Long>=2.36:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Module-Build-Tiny>=0:${PORTSDIR}/devel/p5-Module-Build-Tiny \
-		p5-Module-CPANfile>=0.9025:${PORTSDIR}/devel/p5-Module-CPANfile \
-		p5-Module-Metadata>=1.000012:${PORTSDIR}/devel/p5-Module-Metadata \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moo>=1.001:${PORTSDIR}/devel/p5-Moo \
-		p5-Pod-Markdown>=1.322:${PORTSDIR}/textproc/p5-Pod-Markdown \
-		p5-TOML>=0:${PORTSDIR}/textproc/p5-TOML \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
-		p5-Text-MicroTemplate>=0.20:${PORTSDIR}/textproc/p5-Text-MicroTemplate \
-		p5-Time-Piece>=1.16:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Harness>=0:${PORTSDIR}/devel/p5-Test-Harness \
-		p5-strictures>=0:${PORTSDIR}/devel/p5-strictures \
-		p5-Software-License>=0:${PORTSDIR}/misc/p5-Software-License \
-		p5-Version-Next>=0:${PORTSDIR}/textproc/p5-Version-Next
+BUILD_DEPENDS=	git>=0:devel/git \
+		tree>=0:sysutils/tree \
+		p5-App-cpanminus>=1.6902:devel/p5-App-cpanminus \
+		p5-Archive-Tar>=1.60:archivers/p5-Archive-Tar \
+		p5-CPAN-Meta>=2.132830:devel/p5-CPAN-Meta \
+		p5-Config-Identity>=0:devel/p5-Config-Identity \
+		p5-Data-Section-Simple>=0.04:devel/p5-Data-Section-Simple \
+		p5-ExtUtils-Manifest>=1.54:devel/p5-ExtUtils-Manifest \
+		p5-CPAN-Uploader>=0:devel/p5-CPAN-Uploader \
+		p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
+		p5-Config-Identity>=0:devel/p5-Config-Identity \
+		p5-Devel-CheckBin>=0:devel/p5-Devel-CheckBin \
+		p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-File-pushd>=0:devel/p5-File-pushd \
+		p5-Getopt-Long>=2.36:devel/p5-Getopt-Long \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Module-Build-Tiny>=0:devel/p5-Module-Build-Tiny \
+		p5-Module-CPANfile>=0.9025:devel/p5-Module-CPANfile \
+		p5-Module-Metadata>=1.000012:devel/p5-Module-Metadata \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moo>=1.001:devel/p5-Moo \
+		p5-Pod-Markdown>=1.322:textproc/p5-Pod-Markdown \
+		p5-TOML>=0:textproc/p5-TOML \
+		p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor \
+		p5-Text-MicroTemplate>=0.20:textproc/p5-Text-MicroTemplate \
+		p5-Time-Piece>=1.16:devel/p5-Time-Piece \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Harness>=0:devel/p5-Test-Harness \
+		p5-strictures>=0:devel/p5-strictures \
+		p5-Software-License>=0:misc/p5-Software-License \
+		p5-Version-Next>=0:textproc/p5-Version-Next
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Minion/Makefile b/devel/p5-Minion/Makefile
index 35b05bd38828..dd4d14930b90 100644
--- a/devel/p5-Minion/Makefile
+++ b/devel/p5-Minion/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Asynchronous job queue for Mojolicious
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Mojolicious>=6.0:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS=	p5-Mojolicious>=6.0:www/p5-Mojolicious
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 
 OPTIONS_DEFINE=	PGSQL
 
-PGSQL_BUILD_DEPENDS=	p5-Mojo-Pg>=0:${PORTSDIR}/databases/p5-Mojo-Pg
+PGSQL_BUILD_DEPENDS=	p5-Mojo-Pg>=0:databases/p5-Mojo-Pg
 PGSQL_RUN_DEPENDS=	${PGSQL_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Mixin-Event-Dispatch/Makefile b/devel/p5-Mixin-Event-Dispatch/Makefile
index d3a065ddc650..d042c58f4464 100644
--- a/devel/p5-Mixin-Event-Dispatch/Makefile
+++ b/devel/p5-Mixin-Event-Dispatch/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Mixin methods for simple event/message dispatch framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-UtilsBy>=0:${PORTSDIR}/devel/p5-List-UtilsBy
+BUILD_DEPENDS=	p5-List-UtilsBy>=0:devel/p5-List-UtilsBy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:${PORTSDIR}/devel/p5-Test-CheckDeps \
-		p5-Test-Fatal>=0.010:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Refcount>=0.07:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
+		p5-Test-Fatal>=0.010:devel/p5-Test-Fatal \
+		p5-Test-Refcount>=0.07:devel/p5-Test-Refcount
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Mixin-Linewise/Makefile b/devel/p5-Mixin-Linewise/Makefile
index 719e1b3f240c..b35dd41527b1 100644
--- a/devel/p5-Mixin-Linewise/Makefile
+++ b/devel/p5-Mixin-Linewise/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Write your linewise code for handles; this does the rest
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PerlIO-utf8_strict>=0:${PORTSDIR}/devel/p5-PerlIO-utf8_strict \
-		p5-Sub-Exporter>=0.900:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-PerlIO-utf8_strict>=0:devel/p5-PerlIO-utf8_strict \
+		p5-Sub-Exporter>=0.900:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Mo/Makefile b/devel/p5-Mo/Makefile
index 856b8b531342..d57e77f9e4ad 100644
--- a/devel/p5-Mo/Makefile
+++ b/devel/p5-Mo/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Micro Objects. Mo is less
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI \
-		p5-Test-NoTabs>=0:${PORTSDIR}/devel/p5-Test-NoTabs
+TEST_DEPENDS=	p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-PPI>=0:textproc/p5-PPI \
+		p5-Test-NoTabs>=0:devel/p5-Test-NoTabs
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Mock-Quick/Makefile b/devel/p5-Mock-Quick/Makefile
index a89709f91208..c43894b1879b 100644
--- a/devel/p5-Mock-Quick/Makefile
+++ b/devel/p5-Mock-Quick/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Quickly mock objects and classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Declare>=0.103:${PORTSDIR}/devel/p5-Exporter-Declare
+BUILD_DEPENDS=	p5-Exporter-Declare>=0.103:devel/p5-Exporter-Declare
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Fennec-Lite>=0.004:${PORTSDIR}/devel/p5-Fennec-Lite \
-		p5-Test-Exception>=0.29:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Fennec-Lite>=0.004:devel/p5-Fennec-Lite \
+		p5-Test-Exception>=0.29:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Module-Build-Convert/Makefile b/devel/p5-Module-Build-Convert/Makefile
index 6e47f3667be4..9757f9628896 100644
--- a/devel/p5-Module-Build-Convert/Makefile
+++ b/devel/p5-Module-Build-Convert/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Makefile.PL to Build.PL converter
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-IO-Prompt>=0:${PORTSDIR}/devel/p5-IO-Prompt \
-		p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI
+BUILD_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+		p5-PPI>=0:textproc/p5-PPI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build-Kwalitee/Makefile b/devel/p5-Module-Build-Kwalitee/Makefile
index 4a32a9152845..9139ac40740a 100644
--- a/devel/p5-Module-Build-Kwalitee/Makefile
+++ b/devel/p5-Module-Build-Kwalitee/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Module::Build subclass with prepackaged tests
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Module-Build>=0.26.09:${PORTSDIR}/devel/p5-Module-Build \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
-RUN_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML \
+		p5-Module-Build>=0.26.09:devel/p5-Module-Build \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
+RUN_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile b/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile
index 7563327e77d3..649a7252041e 100644
--- a/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile
+++ b/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Make README.mkdn from POD
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-Module-Build-Pluggable>=0.09:${PORTSDIR}/devel/p5-Module-Build-Pluggable \
-		p5-Pod-Markdown>=0:${PORTSDIR}/textproc/p5-Pod-Markdown
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+		p5-Module-Build-Pluggable>=0.09:devel/p5-Module-Build-Pluggable \
+		p5-Pod-Markdown>=0:textproc/p5-Pod-Markdown
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build-Pluggable/Makefile b/devel/p5-Module-Build-Pluggable/Makefile
index ad75b1b84aad..4308758b9ef4 100644
--- a/devel/p5-Module-Build-Pluggable/Makefile
+++ b/devel/p5-Module-Build-Pluggable/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Module::Build meets plugins
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Test-SharedFork>=0:${PORTSDIR}/devel/p5-Test-SharedFork
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+		p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-Data-OptList>=0:devel/p5-Data-OptList \
+		p5-Test-SharedFork>=0:devel/p5-Test-SharedFork
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build-Tiny/Makefile b/devel/p5-Module-Build-Tiny/Makefile
index 5db235a21204..4a795958619b 100644
--- a/devel/p5-Module-Build-Tiny/Makefile
+++ b/devel/p5-Module-Build-Tiny/Makefile
@@ -18,10 +18,10 @@ COMMENT=	Tiny replacement for Module::Build
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Config>=0.003:${PORTSDIR}/devel/p5-ExtUtils-Config \
-		p5-ExtUtils-Helpers>=0.020:${PORTSDIR}/devel/p5-ExtUtils-Helpers \
-		p5-ExtUtils-InstallPaths>=0.002:${PORTSDIR}/devel/p5-ExtUtils-InstallPaths \
-		p5-Test-Harness>=3.29:${PORTSDIR}/devel/p5-Test-Harness
+BUILD_DEPENDS=	p5-ExtUtils-Config>=0.003:devel/p5-ExtUtils-Config \
+		p5-ExtUtils-Helpers>=0.020:devel/p5-ExtUtils-Helpers \
+		p5-ExtUtils-InstallPaths>=0.002:devel/p5-ExtUtils-InstallPaths \
+		p5-Test-Harness>=3.29:devel/p5-Test-Harness
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Module-Build-XSUtil/Makefile b/devel/p5-Module-Build-XSUtil/Makefile
index aa8bdadbab01..3f122b6b063e 100644
--- a/devel/p5-Module-Build-XSUtil/Makefile
+++ b/devel/p5-Module-Build-XSUtil/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Module::Build class for building XS modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckCompiler>=0:${PORTSDIR}/devel/p5-Devel-CheckCompiler
+BUILD_DEPENDS=	p5-Devel-CheckCompiler>=0:devel/p5-Devel-CheckCompiler
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Cwd-Guard>=0:${PORTSDIR}/devel/p5-Cwd-Guard \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Cwd-Guard>=0:devel/p5-Cwd-Guard \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile
index 1ab002282b86..a7f12ab0ae27 100644
--- a/devel/p5-Module-Build/Makefile
+++ b/devel/p5-Module-Build/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Build and install Perl modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-PAR-Dist>=0.17:${PORTSDIR}/devel/p5-PAR-Dist
+TEST_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-PAR-Dist>=0.17:devel/p5-PAR-Dist
 
 PORTSCOUT=	skipv:0.31011,0.31012
 
@@ -29,13 +29,13 @@ USE_PERL5=	modbuild
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Test-Harness>=3.29:${PORTSDIR}/devel/p5-Test-Harness
-RUN_DEPENDS+=	p5-Test-Harness>=3.29:${PORTSDIR}/devel/p5-Test-Harness
+BUILD_DEPENDS+=	p5-Test-Harness>=3.29:devel/p5-Test-Harness
+RUN_DEPENDS+=	p5-Test-Harness>=3.29:devel/p5-Test-Harness
 .endif
 
 .if ${PERL_LEVEL} < 502105
-BUILD_DEPENDS+=	p5-CPAN-Meta>=2.142060:${PORTSDIR}/devel/p5-CPAN-Meta
-RUN_DEPENDS+=	p5-CPAN-Meta>=2.142060:${PORTSDIR}/devel/p5-CPAN-Meta
+BUILD_DEPENDS+=	p5-CPAN-Meta>=2.142060:devel/p5-CPAN-Meta
+RUN_DEPENDS+=	p5-CPAN-Meta>=2.142060:devel/p5-CPAN-Meta
 .endif
 
 post-patch:
diff --git a/devel/p5-Module-CPANTS-Analyse/Makefile b/devel/p5-Module-CPANTS-Analyse/Makefile
index be5781e0e2ee..b29fc28e4774 100644
--- a/devel/p5-Module-CPANTS-Analyse/Makefile
+++ b/devel/p5-Module-CPANTS-Analyse/Makefile
@@ -14,22 +14,22 @@ COMMENT=	Generate Kwalitee ratings for a distribution
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Any-Lite>=0.06:${PORTSDIR}/archivers/p5-Archive-Any-Lite \
-		p5-Array-Diff>=0.04:${PORTSDIR}/misc/p5-Array-Diff \
-		p5-CPAN-DistnameInfo>=0.06:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-		p5-CPAN-Meta>=2.131490:${PORTSDIR}/devel/p5-CPAN-Meta \
-		p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML \
-		p5-Class-Accessor>=0.19:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-IO-Capture>=0.05:${PORTSDIR}/devel/p5-IO-Capture \
-		p5-JSON-MaybeXS>0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-File-Find-Object>=0.2.1:${PORTSDIR}/devel/p5-File-Find-Object \
-		p5-Module-ExtractUse>=0.33:${PORTSDIR}/devel/p5-Module-ExtractUse \
-		p5-Set-Scalar>=0:${PORTSDIR}/devel/p5-Set-Scalar \
-		p5-Software-License>=0.103008:${PORTSDIR}/misc/p5-Software-License \
-		p5-Software-License-CCpack>=0:${PORTSDIR}/misc/p5-Software-License-CCpack
+BUILD_DEPENDS=	p5-Archive-Any-Lite>=0.06:archivers/p5-Archive-Any-Lite \
+		p5-Array-Diff>=0.04:misc/p5-Array-Diff \
+		p5-CPAN-DistnameInfo>=0.06:devel/p5-CPAN-DistnameInfo \
+		p5-CPAN-Meta>=2.131490:devel/p5-CPAN-Meta \
+		p5-CPAN-Meta-YAML>=0.008:devel/p5-CPAN-Meta-YAML \
+		p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
+		p5-IO-Capture>=0.05:devel/p5-IO-Capture \
+		p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS \
+		p5-File-Find-Object>=0.2.1:devel/p5-File-Find-Object \
+		p5-Module-ExtractUse>=0.33:devel/p5-Module-ExtractUse \
+		p5-Set-Scalar>=0:devel/p5-Set-Scalar \
+		p5-Software-License>=0.103008:misc/p5-Software-License \
+		p5-Software-License-CCpack>=0:misc/p5-Software-License-CCpack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker-CPANfile>=0.06:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker-CPANfile>=0.06:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
@@ -37,8 +37,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-CPAN-Meta>=2.133380:${PORTSDIR}/devel/p5-CPAN-Meta
-RUN_DEPENDS+=	p5-CPAN-Meta>=2.133380:${PORTSDIR}/devel/p5-CPAN-Meta
+BUILD_DEPENDS+=	p5-CPAN-Meta>=2.133380:devel/p5-CPAN-Meta
+RUN_DEPENDS+=	p5-CPAN-Meta>=2.133380:devel/p5-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Module-CheckDeps/Makefile b/devel/p5-Module-CheckDeps/Makefile
index 00df51df4183..b954c69bcf0b 100644
--- a/devel/p5-Module-CheckDeps/Makefile
+++ b/devel/p5-Module-CheckDeps/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI
+BUILD_DEPENDS=	p5-PPI>=0:textproc/p5-PPI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Module-CheckVersion/Makefile b/devel/p5-Module-CheckVersion/Makefile
index ab9ce1692db7..e5e208f7e9e4 100644
--- a/devel/p5-Module-CheckVersion/Makefile
+++ b/devel/p5-Module-CheckVersion/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Check module (e.g. latest version) with CPAN (or equivalent repo)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Perl-osnames>=0.09:${PORTSDIR}/devel/p5-Perl-osnames
-RUN_DEPENDS=	p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS
+BUILD_DEPENDS=	p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-Perl-osnames>=0.09:devel/p5-Perl-osnames
+RUN_DEPENDS=	p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Collect/Makefile b/devel/p5-Module-Collect/Makefile
index 51b505359d0c..331fd5c54900 100644
--- a/devel/p5-Module-Collect/Makefile
+++ b/devel/p5-Module-Collect/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to collect module files from some directories
 
 RUN_DEPENDS=	\
-	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule
+	p5-File-Find-Rule>0:devel/p5-File-Find-Rule
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Compile/Makefile b/devel/p5-Module-Compile/Makefile
index ba47f3d45db4..283cc9d00c1e 100644
--- a/devel/p5-Module-Compile/Makefile
+++ b/devel/p5-Module-Compile/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Provide a system for writing modules that compile other Perl modules
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Depends/Makefile b/devel/p5-Module-Depends/Makefile
index c157b4c54bfd..f0fd4e1a5a4e 100644
--- a/devel/p5-Module-Depends/Makefile
+++ b/devel/p5-Module-Depends/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Identify the dependencies of a distribution
 
-RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-YAML>=0:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Extract/Makefile b/devel/p5-Module-Extract/Makefile
index 41b1d9a63063..5191335ab80e 100644
--- a/devel/p5-Module-Extract/Makefile
+++ b/devel/p5-Module-Extract/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Base class for working with Perl distributions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract
+BUILD_DEPENDS=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-ExtractUse/Makefile b/devel/p5-Module-ExtractUse/Makefile
index f5e037e170b2..e922e72e1a62 100644
--- a/devel/p5-Module-ExtractUse/Makefile
+++ b/devel/p5-Module-ExtractUse/Makefile
@@ -15,11 +15,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=1.967:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Pod-Strip>=0:${PORTSDIR}/textproc/p5-Pod-Strip
+BUILD_DEPENDS=	p5-Parse-RecDescent>=1.967:devel/p5-Parse-RecDescent \
+		p5-Pod-Strip>=0:textproc/p5-Pod-Strip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-UNIVERSAL-require>=0.11:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-UNIVERSAL-require>=0.11:devel/p5-UNIVERSAL-require \
+		p5-Test-Deep>0:devel/p5-Test-Deep
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Module-Functions/Makefile b/devel/p5-Module-Functions/Makefile
index d23cb3c3eca5..3c462f816e3a 100644
--- a/devel/p5-Module-Functions/Makefile
+++ b/devel/p5-Module-Functions/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to get function list from package
 
 RUN_DEPENDS=	\
-	p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify
+	p5-Sub-Identify>=0.04:devel/p5-Sub-Identify
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Implementation/Makefile b/devel/p5-Module-Implementation/Makefile
index 909b43cf9b93..35a5f75a81ce 100644
--- a/devel/p5-Module-Implementation/Makefile
+++ b/devel/p5-Module-Implementation/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Loads one of several alternate underlying implementations for a module
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.006:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-NoTabs>=0:${PORTSDIR}/devel/p5-Test-NoTabs \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Taint>=0:${PORTSDIR}/devel/p5-Test-Taint
+TEST_DEPENDS=	p5-Test-Fatal>=0.006:devel/p5-Test-Fatal \
+		p5-Test-NoTabs>=0:devel/p5-Test-NoTabs \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Taint>=0:devel/p5-Test-Taint
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Module-Info-File/Makefile b/devel/p5-Module-Info-File/Makefile
index fadd431db1f5..fccad9e6b685 100644
--- a/devel/p5-Module-Info-File/Makefile
+++ b/devel/p5-Module-Info-File/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Retrieves module information from a file or script
 
-RUN_DEPENDS=	p5-Module-Info>0.20:${PORTSDIR}/devel/p5-Module-Info
+RUN_DEPENDS=	p5-Module-Info>0.20:devel/p5-Module-Info
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Info/Makefile b/devel/p5-Module-Info/Makefile
index d4ec29f3ab87..eaaa411edc08 100644
--- a/devel/p5-Module-Info/Makefile
+++ b/devel/p5-Module-Info/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Provides information about Perl modules
 
-BUILD_DEPENDS=	p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools
+BUILD_DEPENDS=	p5-PathTools>=0:devel/p5-PathTools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Inspector/Makefile b/devel/p5-Module-Inspector/Makefile
index f2ff1d8d4ae5..c0f92dc57bbf 100644
--- a/devel/p5-Module-Inspector/Makefile
+++ b/devel/p5-Module-Inspector/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Integrated API for inspecting Perl distributions
 
-BUILD_DEPENDS=	p5-File-Find-Rule-VCS>=0:${PORTSDIR}/devel/p5-File-Find-Rule-VCS \
-		p5-File-Find-Rule-Perl>=0:${PORTSDIR}/devel/p5-File-Find-Rule-Perl \
-		p5-Module-Extract>=0:${PORTSDIR}/devel/p5-Module-Extract \
-		p5-Module-Manifest>=0:${PORTSDIR}/devel/p5-Module-Manifest \
-		p5-Module-Math-Depends>=0:${PORTSDIR}/devel/p5-Module-Math-Depends \
-		p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI \
-		p5-YAML-Tiny>=0:${PORTSDIR}/textproc/p5-YAML-Tiny \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-File-Find-Rule-VCS>=0:devel/p5-File-Find-Rule-VCS \
+		p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl \
+		p5-Module-Extract>=0:devel/p5-Module-Extract \
+		p5-Module-Manifest>=0:devel/p5-Module-Manifest \
+		p5-Module-Math-Depends>=0:devel/p5-Module-Math-Depends \
+		p5-PPI>=0:textproc/p5-PPI \
+		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
+		p5-Params-Util>=0:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-AuthorRequires/Makefile b/devel/p5-Module-Install-AuthorRequires/Makefile
index b89e4c72722e..5987c1c70562 100644
--- a/devel/p5-Module-Install-AuthorRequires/Makefile
+++ b/devel/p5-Module-Install-AuthorRequires/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to declare author-only dependencies
 
 RUN_DEPENDS=	\
-	p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install
+	p5-Module-Install>0:devel/p5-Module-Install
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-AuthorTests/Makefile b/devel/p5-Module-Install-AuthorTests/Makefile
index b71d04e4c63f..e345969511af 100644
--- a/devel/p5-Module-Install-AuthorTests/Makefile
+++ b/devel/p5-Module-Install-AuthorTests/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to designate tests only run by module authors
 
 RUN_DEPENDS=	\
-	p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install
+	p5-Module-Install>0:devel/p5-Module-Install
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-ReadmeFromPod/Makefile b/devel/p5-Module-Install-ReadmeFromPod/Makefile
index c921ddbfb8d9..cd65089b12b8 100644
--- a/devel/p5-Module-Install-ReadmeFromPod/Makefile
+++ b/devel/p5-Module-Install-ReadmeFromPod/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Automatically generate README from POD during installation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>=1.00:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Capture-Tiny>=0.05:${PORTSDIR}/devel/p5-Capture-Tiny
+BUILD_DEPENDS=	p5-Module-Install>=1.00:devel/p5-Module-Install \
+		p5-Capture-Tiny>=0.05:devel/p5-Capture-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-Template/Makefile b/devel/p5-Module-Install-Template/Makefile
index cd9faf853324..829655836088 100644
--- a/devel/p5-Module-Install-Template/Makefile
+++ b/devel/p5-Module-Install-Template/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Treat module source code as a template
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-TestBase/Makefile b/devel/p5-Module-Install-TestBase/Makefile
index 145b92413409..a93a14ca667e 100644
--- a/devel/p5-Module-Install-TestBase/Makefile
+++ b/devel/p5-Module-Install-TestBase/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Module::Install Support for Test::Base
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>=1.10:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Test-Base>=0.86:${PORTSDIR}/devel/p5-Test-Base
+BUILD_DEPENDS=	p5-Module-Install>=1.10:devel/p5-Module-Install \
+		p5-Test-Base>=0.86:devel/p5-Test-Base
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-XSUtil/Makefile b/devel/p5-Module-Install-XSUtil/Makefile
index 84959b795f33..0dac0717e994 100644
--- a/devel/p5-Module-Install-XSUtil/Makefile
+++ b/devel/p5-Module-Install-XSUtil/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Utility functions for XS modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>=0.91:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-Module-Install>=0.91:devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:${PORTSDIR}/devel/p5-B-Hooks-OP-Annotation
+TEST_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:devel/p5-B-Hooks-OP-Annotation
 
 USE_PERL5=	configure
 USES=		perl5
@@ -24,8 +24,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
-RUN_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
+BUILD_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:devel/p5-ExtUtils-ParseXS
+RUN_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:devel/p5-ExtUtils-ParseXS
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Module-Install/Makefile b/devel/p5-Module-Install/Makefile
index d4a616c0aab2..a36060266a6a 100644
--- a/devel/p5-Module-Install/Makefile
+++ b/devel/p5-Module-Install/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Standalone, extensible Perl module installer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Remove>=1.42:${PORTSDIR}/devel/p5-File-Remove \
-		p5-JSON>=2.14:${PORTSDIR}/converters/p5-JSON \
-		p5-Module-ScanDeps>=1.09:${PORTSDIR}/devel/p5-Module-ScanDeps \
-		p5-PAR-Dist>=0.29:${PORTSDIR}/devel/p5-PAR-Dist \
-		p5-YAML-Tiny>=1.38:${PORTSDIR}/textproc/p5-YAML-Tiny
+BUILD_DEPENDS=	p5-File-Remove>=1.42:devel/p5-File-Remove \
+		p5-JSON>=2.14:converters/p5-JSON \
+		p5-Module-ScanDeps>=1.09:devel/p5-Module-ScanDeps \
+		p5-PAR-Dist>=0.29:devel/p5-PAR-Dist \
+		p5-YAML-Tiny>=1.38:textproc/p5-YAML-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Load-Conditional/Makefile b/devel/p5-Module-Load-Conditional/Makefile
index 6a9c4db70286..b81bd8db8122 100644
--- a/devel/p5-Module-Load-Conditional/Makefile
+++ b/devel/p5-Module-Load-Conditional/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS=	p5-Module-Load>=0.28:${PORTSDIR}/devel/p5-Module-Load
+BUILD_DEPENDS=	p5-Module-Load>=0.28:devel/p5-Module-Load
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 .endif
 
diff --git a/devel/p5-Module-Manifest/Makefile b/devel/p5-Module-Manifest/Makefile
index 06091d1bdff3..32482ee161f8 100644
--- a/devel/p5-Module-Manifest/Makefile
+++ b/devel/p5-Module-Manifest/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Parse and examine a Perl distribution MANIFEST file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Math-Depends/Makefile b/devel/p5-Module-Math-Depends/Makefile
index 9af38d45034c..26b6ab8054f9 100644
--- a/devel/p5-Module-Math-Depends/Makefile
+++ b/devel/p5-Module-Math-Depends/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Convenience object for manipulating module dependencies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Path/Makefile b/devel/p5-Module-Path/Makefile
index 3142f48e5c40..29b38897cd45 100644
--- a/devel/p5-Module-Path/Makefile
+++ b/devel/p5-Module-Path/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Get the full path to a locally installed module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Devel-FindPerl>0:${PORTSDIR}/devel/p5-Devel-FindPerl
+TEST_DEPENDS=	p5-Devel-FindPerl>0:devel/p5-Devel-FindPerl
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Pluggable-Fast/Makefile b/devel/p5-Module-Pluggable-Fast/Makefile
index 3aad232cecbc..cfbd179aa9ff 100644
--- a/devel/p5-Module-Pluggable-Fast/Makefile
+++ b/devel/p5-Module-Pluggable-Fast/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fast plugins with instantiation
 
-BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Pluggable-Ordered/Makefile b/devel/p5-Module-Pluggable-Ordered/Makefile
index ae788b515a5b..8482048da89c 100644
--- a/devel/p5-Module-Pluggable-Ordered/Makefile
+++ b/devel/p5-Module-Pluggable-Ordered/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Call module plugins in a specified order
 
-BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
-RUN_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
+RUN_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Recursive-Require/Makefile b/devel/p5-Module-Recursive-Require/Makefile
index 68f574a80e62..95b6d1808de1 100644
--- a/devel/p5-Module-Recursive-Require/Makefile
+++ b/devel/p5-Module-Recursive-Require/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Require module recursively
 
-BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
-RUN_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
+RUN_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Refresh/Makefile b/devel/p5-Module-Refresh/Makefile
index a7dd0256a4f0..ea03b7e708fc 100644
--- a/devel/p5-Module-Refresh/Makefile
+++ b/devel/p5-Module-Refresh/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Refresh %INC files when updated on disk
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+TEST_DEPENDS=	p5-Path-Class>=0:devel/p5-Path-Class
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile
index 3c72c88f14bf..f5db4ff213c8 100644
--- a/devel/p5-Module-Release/Makefile
+++ b/devel/p5-Module-Release/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Upload files to CPAN and SourceForge
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CACertOrg-CA>=0:${PORTSDIR}/security/p5-CACertOrg-CA \
-		p5-ConfigReader-Simple>=0:${PORTSDIR}/devel/p5-ConfigReader-Simple \
-		p5-IO-Null>=0:${PORTSDIR}/devel/p5-IO-Null \
-		p5-Mojolicious>=4.50:${PORTSDIR}/www/p5-Mojolicious \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=6.02:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-CACertOrg-CA>=0:security/p5-CACertOrg-CA \
+		p5-ConfigReader-Simple>=0:devel/p5-ConfigReader-Simple \
+		p5-IO-Null>=0:devel/p5-IO-Null \
+		p5-Mojolicious>=4.50:www/p5-Mojolicious \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=6.02:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -33,7 +33,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.64:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.64:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Module-Setup/Makefile b/devel/p5-Module-Setup/Makefile
index 2e1f5ed7de3a..b2c000ac713b 100644
--- a/devel/p5-Module-Setup/Makefile
+++ b/devel/p5-Module-Setup/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for a simple module maker
 
 RUN_DEPENDS=	\
-	p5-Class-Trigger>0:${PORTSDIR}/devel/p5-Class-Trigger \
-	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-	p5-File-HomeDir>0:${PORTSDIR}/devel/p5-File-HomeDir \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Module-Collect>=0.06:${PORTSDIR}/devel/p5-Module-Collect \
-	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-	p5-Template-Toolkit>=2.20:${PORTSDIR}/www/p5-Template-Toolkit \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML \
-	p5-Module-Install-AuthorTests>0:${PORTSDIR}/devel/p5-Module-Install-AuthorTests \
-	p5-Text-Patch>0:${PORTSDIR}/textproc/p5-Text-Patch
+	p5-Class-Trigger>0:devel/p5-Class-Trigger \
+	p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+	p5-File-HomeDir>0:devel/p5-File-HomeDir \
+	p5-libwww>0:www/p5-libwww \
+	p5-Module-Collect>=0.06:devel/p5-Module-Collect \
+	p5-Path-Class>0:devel/p5-Path-Class \
+	p5-Template-Toolkit>=2.20:www/p5-Template-Toolkit \
+	p5-YAML>0:textproc/p5-YAML \
+	p5-Module-Install-AuthorTests>0:devel/p5-Module-Install-AuthorTests \
+	p5-Text-Patch>0:textproc/p5-Text-Patch
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Starter-PBP/Makefile b/devel/p5-Module-Starter-PBP/Makefile
index 363a60235784..03091829a5e4 100644
--- a/devel/p5-Module-Starter-PBP/Makefile
+++ b/devel/p5-Module-Starter-PBP/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Create a module as recommended in "Perl Best Practices"
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Starter>=0:${PORTSDIR}/devel/p5-Module-Starter
+BUILD_DEPENDS=	p5-Module-Starter>=0:devel/p5-Module-Starter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile b/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile
index a289bca3fd33..5abb0a2149df 100644
--- a/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile
+++ b/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Provide methods of retrieving templates for Module::Starter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Starter>=1.32:${PORTSDIR}/devel/p5-Module-Starter
+BUILD_DEPENDS=	p5-Module-Starter>=1.32:devel/p5-Module-Starter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Starter-Plugin-TT2/Makefile b/devel/p5-Module-Starter-Plugin-TT2/Makefile
index 8cc16e186ccd..2660332d67d0 100644
--- a/devel/p5-Module-Starter-Plugin-TT2/Makefile
+++ b/devel/p5-Module-Starter-Plugin-TT2/Makefile
@@ -14,9 +14,9 @@ COMMENT=	TT2 templates for Module::Starter::Template
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Starter>=1.47:${PORTSDIR}/devel/p5-Module-Starter \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
-RUN_DEPENDS=	p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Module-Starter>=1.47:devel/p5-Module-Starter \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Starter/Makefile b/devel/p5-Module-Starter/Makefile
index 32575850c993..95898ef15bbf 100644
--- a/devel/p5-Module-Starter/Makefile
+++ b/devel/p5-Module-Starter/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple starter kit for any Perl module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:1.470
diff --git a/devel/p5-Module-Used/Makefile b/devel/p5-Module-Used/Makefile
index a6586441e5f1..6e9bd2ff456f 100644
--- a/devel/p5-Module-Used/Makefile
+++ b/devel/p5-Module-Used/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Find modules loaded by Perl code without running it
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-Next>=1.02:${PORTSDIR}/sysutils/p5-File-Next \
-		p5-PPI>=1.203:${PORTSDIR}/textproc/p5-PPI \
-		p5-Test-Deep>=0.098:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly
+RUN_DEPENDS=	p5-File-Next>=1.02:sysutils/p5-File-Next \
+		p5-PPI>=1.203:textproc/p5-PPI \
+		p5-Test-Deep>=0.098:devel/p5-Test-Deep \
+		p5-Readonly>=1.03:devel/p5-Readonly
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Moo/Makefile b/devel/p5-Moo/Makefile
index c577ebb99ba8..da2455cce28f 100644
--- a/devel/p5-Moo/Makefile
+++ b/devel/p5-Moo/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Minimalist Object Orientation (with Moose compatibility)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=1.10:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Devel-GlobalDestruction>=0.11:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Module-Runtime>=0.014:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Role-Tiny>=2:${PORTSDIR}/devel/p5-Role-Tiny
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=1.10:devel/p5-Class-Method-Modifiers \
+		p5-Devel-GlobalDestruction>=0.11:devel/p5-Devel-GlobalDestruction \
+		p5-Module-Runtime>=0.014:devel/p5-Module-Runtime \
+		p5-Role-Tiny>=2:devel/p5-Role-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 OPTIONS_DEFINE=	XS
 
@@ -28,7 +28,7 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-XS_BUILD_DEPENDS=	p5-Class-XSAccessor>=1.18:${PORTSDIR}/devel/p5-Class-XSAccessor
+XS_BUILD_DEPENDS=	p5-Class-XSAccessor>=1.18:devel/p5-Class-XSAccessor
 XS_RUN_DEPENDS=		${XS_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-MooX-Cmd/Makefile b/devel/p5-MooX-Cmd/Makefile
index 2d8829d52f1b..9ec88c4a35a8 100644
--- a/devel/p5-MooX-Cmd/Makefile
+++ b/devel/p5-MooX-Cmd/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Giving an easy Moo style way to make command organized CLI apps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-TieCombine>=0:${PORTSDIR}/devel/p5-IO-TieCombine \
-		p5-Module-Pluggable>=4.8:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-Moo>=0.009013:${PORTSDIR}/devel/p5-Moo \
-		p5-Package-Stash>=0.33:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Regexp-Common>=2011121001:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Test-LoadAllModules>=0.021:${PORTSDIR}/devel/p5-Test-LoadAllModules
+BUILD_DEPENDS=	p5-IO-TieCombine>=0:devel/p5-IO-TieCombine \
+		p5-Module-Pluggable>=4.8:devel/p5-Module-Pluggable \
+		p5-Moo>=0.009013:devel/p5-Moo \
+		p5-Package-Stash>=0.33:devel/p5-Package-Stash \
+		p5-Regexp-Common>=2011121001:textproc/p5-Regexp-Common \
+		p5-Test-LoadAllModules>=0.021:devel/p5-Test-LoadAllModules
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-TieCombine>=0:${PORTSDIR}/devel/p5-IO-TieCombine
+TEST_DEPENDS=	p5-IO-TieCombine>=0:devel/p5-IO-TieCombine
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-ConfigFromFile/Makefile b/devel/p5-MooX-ConfigFromFile/Makefile
index 2c76bd6bdb52..4dae4626de13 100644
--- a/devel/p5-MooX-ConfigFromFile/Makefile
+++ b/devel/p5-MooX-ConfigFromFile/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Moo eXtension for initializing objects from config file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-File-Find-Rule>=0.30:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-Moo>=1.003000:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-File-ConfigDir>=0.002:${PORTSDIR}/devel/p5-MooX-File-ConfigDir
+BUILD_DEPENDS=	p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-File-Find-Rule>=0.30:devel/p5-File-Find-Rule \
+		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+		p5-Moo>=1.003000:devel/p5-Moo \
+		p5-MooX-File-ConfigDir>=0.002:devel/p5-MooX-File-ConfigDir
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-File-ConfigDir/Makefile b/devel/p5-MooX-File-ConfigDir/Makefile
index ff49b15dc4d7..1411438943fc 100644
--- a/devel/p5-MooX-File-ConfigDir/Makefile
+++ b/devel/p5-MooX-File-ConfigDir/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Moo eXtension for File::ConfigDir
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ConfigDir>=0.011:${PORTSDIR}/devel/p5-File-ConfigDir \
-		p5-Moo>=1.003000:${PORTSDIR}/devel/p5-Moo \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-File-ConfigDir>=0.011:devel/p5-File-ConfigDir \
+		p5-Moo>=1.003000:devel/p5-Moo \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-HandlesVia/Makefile b/devel/p5-MooX-HandlesVia/Makefile
index 29c74c616991..4a346da01eba 100644
--- a/devel/p5-MooX-HandlesVia/Makefile
+++ b/devel/p5-MooX-HandlesVia/Makefile
@@ -12,12 +12,12 @@ COMMENT=	NativeTrait-like behavior for Moo
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Perl>=0.002006:${PORTSDIR}/devel/p5-Data-Perl \
-		p5-Moo>=1.003000:${PORTSDIR}/devel/p5-Moo
+BUILD_DEPENDS=	p5-Data-Perl>=0.002006:devel/p5-Data-Perl \
+		p5-Moo>=1.003000:devel/p5-Moo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-MooX-Types-MooseLike>=0.23:${PORTSDIR}/devel/p5-MooX-Types-MooseLike
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-MooX-Types-MooseLike>=0.23:devel/p5-MooX-Types-MooseLike
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-Options/Makefile b/devel/p5-MooX-Options/Makefile
index 60ce250ddf6a..4b3693188109 100644
--- a/devel/p5-MooX-Options/Makefile
+++ b/devel/p5-MooX-Options/Makefile
@@ -13,26 +13,26 @@ COMMENT=	Option keywords to your object (Mo/Moo/Moose)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Record>=0:${PORTSDIR}/devel/p5-Data-Record \
-		p5-Getopt-Long-Descriptive>=0.091:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Module-Metadata>=1.000019:${PORTSDIR}/devel/p5-Module-Metadata \
-		p5-Moo>=1.003001:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MooX-ConfigFromFile \
-		p5-Path-Class>=0.32:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Term-Size-Any>=0:${PORTSDIR}/devel/p5-Term-Size-Any \
-		p5-Text-WrapI18N>=0:${PORTSDIR}/textproc/p5-Text-WrapI18N
+BUILD_DEPENDS=	p5-Data-Record>=0:devel/p5-Data-Record \
+		p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Module-Metadata>=1.000019:devel/p5-Module-Metadata \
+		p5-Moo>=1.003001:devel/p5-Moo \
+		p5-MooX-ConfigFromFile>=0:devel/p5-MooX-ConfigFromFile \
+		p5-Path-Class>=0.32:devel/p5-Path-Class \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Term-Size-Any>=0:devel/p5-Term-Size-Any \
+		p5-Text-WrapI18N>=0:textproc/p5-Text-WrapI18N
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Mo>=0:${PORTSDIR}/devel/p5-Mo \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Mo>=0:devel/p5-Mo \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Trap>=0:devel/p5-Test-Trap \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-MooX-StrictConstructor/Makefile b/devel/p5-MooX-StrictConstructor/Makefile
index 09dd56807f02..07330e92d0ae 100644
--- a/devel/p5-MooX-StrictConstructor/Makefile
+++ b/devel/p5-MooX-StrictConstructor/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Make your Moo-based object constructors blow up on unknown attributes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Moo>=1.001000:${PORTSDIR}/devel/p5-Moo \
-		p5-strictures>=1:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-Moo>=1.001000:devel/p5-Moo \
+		p5-strictures>=1:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-bareword-filehandles>=0:${PORTSDIR}/devel/p5-bareword-filehandles \
-		p5-indirect>=0:${PORTSDIR}/devel/p5-indirect \
-		p5-multidimensional>=0:${PORTSDIR}/devel/p5-multidimensional
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-bareword-filehandles>=0:devel/p5-bareword-filehandles \
+		p5-indirect>=0:devel/p5-indirect \
+		p5-multidimensional>=0:devel/p5-multidimensional
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-MooX-TypeTiny/Makefile b/devel/p5-MooX-TypeTiny/Makefile
index c78e82c6196d..d8bd293491e7 100644
--- a/devel/p5-MooX-TypeTiny/Makefile
+++ b/devel/p5-MooX-TypeTiny/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Optimized type checks for Moo + Type::Tiny
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moo>=1.004003:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>=1.000002:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-Moo>=1.004003:devel/p5-Moo \
+		p5-Type-Tiny>=1.000002:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
index 48e52cdc7d7b..f77c37be6281 100644
--- a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
+++ b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Moo types for numbers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MooX-Types-MooseLike>=0.23:${PORTSDIR}/devel/p5-MooX-Types-MooseLike
+BUILD_DEPENDS=	p5-MooX-Types-MooseLike>=0.23:devel/p5-MooX-Types-MooseLike
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-Types-MooseLike/Makefile b/devel/p5-MooX-Types-MooseLike/Makefile
index 921f9c50bfde..10797c9fef1f 100644
--- a/devel/p5-MooX-Types-MooseLike/Makefile
+++ b/devel/p5-MooX-Types-MooseLike/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Some Moosish types and a typer builder
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0.014:${PORTSDIR}/devel/p5-Module-Runtime
+BUILD_DEPENDS=	p5-Module-Runtime>=0.014:devel/p5-Module-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moo>=1.004002:${PORTSDIR}/devel/p5-Moo \
-		p5-Set-Object>=1:${PORTSDIR}/devel/p5-Set-Object \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Moo>=1.004002:devel/p5-Moo \
+		p5-Set-Object>=1:devel/p5-Set-Object \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-late/Makefile b/devel/p5-MooX-late/Makefile
index 0f1e1d275e7a..d196d14662ad 100644
--- a/devel/p5-MooX-late/Makefile
+++ b/devel/p5-MooX-late/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moo>=1.006000:${PORTSDIR}/devel/p5-Moo \
-	p5-Test-Requires>=0.06:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Type-Tiny>=1.000001:${PORTSDIR}/devel/p5-Type-Tiny
+	p5-Moo>=1.006000:devel/p5-Moo \
+	p5-Test-Requires>=0.06:devel/p5-Test-Requires \
+	p5-Type-Tiny>=1.000001:devel/p5-Type-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Moos/Makefile b/devel/p5-Moos/Makefile
index c6bfe18551af..2975bf1d40e4 100644
--- a/devel/p5-Moos/Makefile
+++ b/devel/p5-Moos/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Moo s{imple,peedy,ingle}
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-XSAccessor>=1.07:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-Role-Tiny>=1.002.000:${PORTSDIR}/devel/p5-Role-Tiny
+BUILD_DEPENDS=	p5-Class-XSAccessor>=1.07:devel/p5-Class-XSAccessor \
+		p5-Role-Tiny>=1.002.000:devel/p5-Role-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Sub-Identify>=0.04:devel/p5-Sub-Identify \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Moose-Autobox/Makefile b/devel/p5-Moose-Autobox/Makefile
index be987b939895..53a32cf924e4 100644
--- a/devel/p5-Moose-Autobox/Makefile
+++ b/devel/p5-Moose-Autobox/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Autoboxed wrappers for Native Perl datatypes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-autobox>=2.23:${PORTSDIR}/devel/p5-autobox \
-		p5-Moose>=0.42:${PORTSDIR}/devel/p5-Moose \
-		p5-Syntax-Keyword-Junction>=0:${PORTSDIR}/devel/p5-Syntax-Keyword-Junction
+BUILD_DEPENDS=	p5-autobox>=2.23:devel/p5-autobox \
+		p5-Moose>=0.42:devel/p5-Moose \
+		p5-Syntax-Keyword-Junction>=0:devel/p5-Syntax-Keyword-Junction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.21:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Moose-Policy/Makefile b/devel/p5-Moose-Policy/Makefile
index d45f96f24a94..0436635441b1 100644
--- a/devel/p5-Moose-Policy/Makefile
+++ b/devel/p5-Moose-Policy/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Moose-mounted police
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Moose-Test/Makefile b/devel/p5-Moose-Test/Makefile
index 77f516e5bbf8..dab4ff33bd95 100644
--- a/devel/p5-Moose-Test/Makefile
+++ b/devel/p5-Moose-Test/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test Runner for the Moose test suite
 
-BUILD_DEPENDS=	p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Mouse>=0:devel/p5-Mouse \
+		p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
index 0944b9bf828f..fca0980fa4e8 100644
--- a/devel/p5-Moose/Makefile
+++ b/devel/p5-Moose/Makefile
@@ -16,51 +16,51 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 # Do not add p5-Data-Visitor to TEST_DEPENDS to avoid cyclic dependency
-BUILD_DEPENDS=	p5-Class-Load>=0.09:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Class-Load-XS>=0.01:${PORTSDIR}/devel/p5-Class-Load-XS \
-		p5-Data-OptList>=0.107:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Devel-OverloadInfo>=0.004:${PORTSDIR}/devel/p5-Devel-OverloadInfo \
-		p5-Devel-StackTrace>=1.33:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Eval-Closure>=0.04:${PORTSDIR}/devel/p5-Eval-Closure \
-		p5-List-MoreUtils>=0.28:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MRO-Compat>=0.05:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Module-Runtime-Conflicts>=0.002:${PORTSDIR}/devel/p5-Module-Runtime-Conflicts \
-		p5-Package-DeprecationManager>=0.10:${PORTSDIR}/devel/p5-Package-DeprecationManager \
-		p5-Package-Stash>=0.32:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Package-Stash-XS>=0.24:${PORTSDIR}/devel/p5-Package-Stash-XS \
-		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Exporter>=0.980:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Identify>=0:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-Sub-Name>=0.05:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Try-Tiny>=0.17:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-Load>=0.09:devel/p5-Class-Load \
+		p5-Class-Load-XS>=0.01:devel/p5-Class-Load-XS \
+		p5-Data-OptList>=0.107:devel/p5-Data-OptList \
+		p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-Devel-OverloadInfo>=0.004:devel/p5-Devel-OverloadInfo \
+		p5-Devel-StackTrace>=1.33:devel/p5-Devel-StackTrace \
+		p5-Eval-Closure>=0.04:devel/p5-Eval-Closure \
+		p5-List-MoreUtils>=0.28:lang/p5-List-MoreUtils \
+		p5-MRO-Compat>=0.05:devel/p5-MRO-Compat \
+		p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Module-Runtime-Conflicts>=0.002:devel/p5-Module-Runtime-Conflicts \
+		p5-Package-DeprecationManager>=0.10:devel/p5-Package-DeprecationManager \
+		p5-Package-Stash>=0.32:devel/p5-Package-Stash \
+		p5-Package-Stash-XS>=0.24:devel/p5-Package-Stash-XS \
+		p5-Params-Util>=1.00:devel/p5-Params-Util \
+		p5-Sub-Exporter>=0.980:devel/p5-Sub-Exporter \
+		p5-Sub-Identify>=0:devel/p5-Sub-Identify \
+		p5-Sub-Name>=0.05:devel/p5-Sub-Name \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Try-Tiny>=0.17:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.011:${PORTSDIR}/devel/p5-CPAN-Meta-Check \
-		p5-DBM-Deep>=0:${PORTSDIR}/databases/p5-DBM-Deep \
-		p5-DateTime-Calendar-Mayan>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Mayan \
-		p5-DateTime-Format-MySQL>=0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-		p5-Declare-Constraints-Simple>=0:${PORTSDIR}/devel/p5-Declare-Constraints-Simple \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Locale-US>=0:${PORTSDIR}/misc/p5-Locale-US \
-		p5-Module-Refresh>=0:${PORTSDIR}/devel/p5-Module-Refresh \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Params-Coerce>=0:${PORTSDIR}/devel/p5-Params-Coerce \
-		p5-Specio>=0:${PORTSDIR}/devel/p5-Specio \
-		p5-SUPER>=0:${PORTSDIR}/devel/p5-SUPER \
-		p5-Test-CleanNamespaces>=0.13:${PORTSDIR}/devel/p5-Test-CleanNamespaces \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-DependentModules>=0:${PORTSDIR}/devel/p5-Test-DependentModules \
-		p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-Fatal>=0.001:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
+		p5-DBM-Deep>=0:databases/p5-DBM-Deep \
+		p5-DateTime-Calendar-Mayan>=0:devel/p5-DateTime-Calendar-Mayan \
+		p5-DateTime-Format-MySQL>=0:devel/p5-DateTime-Format-MySQL \
+		p5-Declare-Constraints-Simple>=0:devel/p5-Declare-Constraints-Simple \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Locale-US>=0:misc/p5-Locale-US \
+		p5-Module-Refresh>=0:devel/p5-Module-Refresh \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Params-Coerce>=0:devel/p5-Params-Coerce \
+		p5-Specio>=0:devel/p5-Specio \
+		p5-SUPER>=0:devel/p5-SUPER \
+		p5-Test-CleanNamespaces>=0.13:devel/p5-Test-CleanNamespaces \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-DependentModules>=0:devel/p5-Test-DependentModules \
+		p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-Fatal>=0.001:devel/p5-Test-Fatal \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Requires>=0.05:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings \
+		p5-URI>=0:net/p5-URI
 
 CFLAGS+=	-I.	# mop.h
 MAKE_JOBS_UNSAFE=	yes
@@ -73,8 +73,8 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.35:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.35:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.35:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.35:lang/p5-Scalar-List-Utils
 .endif
 
 post-install:
diff --git a/devel/p5-MooseX-Aliases/Makefile b/devel/p5-MooseX-Aliases/Makefile
index a7b9ad8eb0df..638aec3cf2e6 100644
--- a/devel/p5-MooseX-Aliases/Makefile
+++ b/devel/p5-MooseX-Aliases/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Easy aliasing of methods and attributes in Moose
 
-COMMON_DEPENDS=	p5-Moose>=1.09:${PORTSDIR}/devel/p5-Moose
+COMMON_DEPENDS=	p5-Moose>=1.09:devel/p5-Moose
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-App-Cmd/Makefile b/devel/p5-MooseX-App-Cmd/Makefile
index d3276d942f05..28eac1886f5a 100644
--- a/devel/p5-MooseX-App-Cmd/Makefile
+++ b/devel/p5-MooseX-App-Cmd/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Mashes up MooseX::Getopt and App::Cmd
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0.321:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Getopt-Long-Descriptive>=0.091:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-NonMoose>=0:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-App-Cmd>=0.321:devel/p5-App-Cmd \
+		p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
+		p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MooseX-ConfigFromFile \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-App/Makefile b/devel/p5-MooseX-App/Makefile
index 8257e76e6acd..1cd3f5c2f7a2 100644
--- a/devel/p5-MooseX-App/Makefile
+++ b/devel/p5-MooseX-App/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Write user-friendly command line apps with even less suffering
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-IO-Interactive>=0:${PORTSDIR}/devel/p5-IO-Interactive \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Pod-Elemental>=0:${PORTSDIR}/textproc/p5-Pod-Elemental \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-IO-Interactive>=0:devel/p5-IO-Interactive \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Pod-Elemental>=0:textproc/p5-Pod-Elemental \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-ArrayRef/Makefile b/devel/p5-MooseX-ArrayRef/Makefile
index 421dafa0dea2..a2e75170a03a 100644
--- a/devel/p5-MooseX-ArrayRef/Makefile
+++ b/devel/p5-MooseX-ArrayRef/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Moose blessed array references
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=2.00:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=2.00:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Async/Makefile b/devel/p5-MooseX-Async/Makefile
index 6c779a007849..39c205f8d960 100644
--- a/devel/p5-MooseX-Async/Makefile
+++ b/devel/p5-MooseX-Async/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	The Orphanange of Asynchronous Love Children
 
-RUN_DEPENDS=	p5-Moose>=0.56:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-AttributeHelpers>=0.13:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers
+RUN_DEPENDS=	p5-Moose>=0.56:devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>=0.13:devel/p5-MooseX-AttributeHelpers
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Attribute-Chained/Makefile b/devel/p5-MooseX-Attribute-Chained/Makefile
index b670de0c7241..cb688b0ea1b2 100644
--- a/devel/p5-MooseX-Attribute-Chained/Makefile
+++ b/devel/p5-MooseX-Attribute-Chained/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS_INSTALL=	p5-MooseX-ChainedAccessors-[0-9]*
diff --git a/devel/p5-MooseX-Attribute-ENV/Makefile b/devel/p5-MooseX-Attribute-ENV/Makefile
index f8a18a1bfcbc..554b760033c2 100644
--- a/devel/p5-MooseX-Attribute-ENV/Makefile
+++ b/devel/p5-MooseX-Attribute-ENV/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Set default of an attribute to a value from %ENV
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=1.19:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=1.19:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-AttributeHelpers/Makefile b/devel/p5-MooseX-AttributeHelpers/Makefile
index f30f68640281..72bdc138715b 100644
--- a/devel/p5-MooseX-AttributeHelpers/Makefile
+++ b/devel/p5-MooseX-AttributeHelpers/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Extend your attribute interfaces
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.56:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.56:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 DEPRECATED=	Functionality is now a part of p5-Moose (Moose::Meta::Attribute::Native). Do not use for new projects
 
diff --git a/devel/p5-MooseX-AttributeShortcuts/Makefile b/devel/p5-MooseX-AttributeShortcuts/Makefile
index 16d13008ce53..a256461e2628 100644
--- a/devel/p5-MooseX-AttributeShortcuts/Makefile
+++ b/devel/p5-MooseX-AttributeShortcuts/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Shorthand for common attribute options
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-Types-Common>=0:${PORTSDIR}/devel/p5-MooseX-Types-Common \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Types-Common>=0:devel/p5-MooseX-Types-Common \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-AuthorizedMethods/Makefile b/devel/p5-MooseX-AuthorizedMethods/Makefile
index 6e2fccfb5c1c..3adbd1d43a82 100644
--- a/devel/p5-MooseX-AuthorizedMethods/Makefile
+++ b/devel/p5-MooseX-AuthorizedMethods/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Syntax sugar for authorized methods
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=1.21:${PORTSDIR}/devel/p5-Moose \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased
+BUILD_DEPENDS=	p5-Moose>=1.21:devel/p5-Moose \
+		p5-aliased>=0:devel/p5-aliased
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-ClassAttribute/Makefile b/devel/p5-MooseX-ClassAttribute/Makefile
index 4f98f353d304..f4d19a389f9c 100644
--- a/devel/p5-MooseX-ClassAttribute/Makefile
+++ b/devel/p5-MooseX-ClassAttribute/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Declare class attributes Moose-style
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0.11:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-namespace-autoclean>=0.11:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-Role-Strict>=0:${PORTSDIR}/devel/p5-MooseX-Role-Strict \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-MooseX-AttributeHelpers>=0:devel/p5-MooseX-AttributeHelpers \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Role-Strict>=0:devel/p5-MooseX-Role-Strict \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Clone/Makefile b/devel/p5-MooseX-Clone/Makefile
index b2d701e54520..ed8c771ddd6a 100644
--- a/devel/p5-MooseX-Clone/Makefile
+++ b/devel/p5-MooseX-Clone/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Fine grained cloning support for Moose objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Data-Visitor>=0.24:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-Hash-Util-FieldHash-Compat>=0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+RUN_DEPENDS=	p5-Data-Visitor>=0.24:devel/p5-Data-Visitor \
+		p5-Hash-Util-FieldHash-Compat>=0:devel/p5-Hash-Util-FieldHash-Compat \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-CompileTime-Traits/Makefile b/devel/p5-MooseX-CompileTime-Traits/Makefile
index d00e394df306..b3434c2540d2 100644
--- a/devel/p5-MooseX-CompileTime-Traits/Makefile
+++ b/devel/p5-MooseX-CompileTime-Traits/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to allow compile time traits for classes/roles
 
 RUN_DEPENDS=	\
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Declare>0:${PORTSDIR}/devel/p5-MooseX-Declare
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-Declare>0:devel/p5-MooseX-Declare
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-ConfigFromFile/Makefile b/devel/p5-MooseX-ConfigFromFile/Makefile
index 4a6930b623da..51af971b6813 100644
--- a/devel/p5-MooseX-ConfigFromFile/Makefile
+++ b/devel/p5-MooseX-ConfigFromFile/Makefile
@@ -13,18 +13,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Types>=0.19:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types-Path-Tiny>=0.005:${PORTSDIR}/devel/p5-MooseX-Types-Path-Tiny \
-	p5-namespace-autoclean>0:${PORTSDIR}/devel/p5-namespace-autoclean
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-Types>=0.19:devel/p5-MooseX-Types \
+	p5-MooseX-Types-Path-Tiny>=0.005:devel/p5-MooseX-Types-Path-Tiny \
+	p5-namespace-autoclean>0:devel/p5-namespace-autoclean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-CheckDeps>=0.006:${PORTSDIR}/devel/p5-Test-CheckDeps \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-	p5-Test-NoWarnings>=1.04:${PORTSDIR}/devel/p5-Test-NoWarnings \
-	p5-Test-Without-Module>0:${PORTSDIR}/devel/p5-Test-Without-Module \
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+	p5-Test-CheckDeps>=0.006:devel/p5-Test-CheckDeps \
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+	p5-Test-NoWarnings>=1.04:devel/p5-Test-NoWarnings \
+	p5-Test-Without-Module>0:devel/p5-Test-Without-Module \
+	p5-Test-Deep>0:devel/p5-Test-Deep
 
 USES=	perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Daemonize/Makefile b/devel/p5-MooseX-Daemonize/Makefile
index 86de873786e1..3d0bd4755847 100644
--- a/devel/p5-MooseX-Daemonize/Makefile
+++ b/devel/p5-MooseX-Daemonize/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Role for daemonizing your Moose based application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.33:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0.07:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class
+BUILD_DEPENDS=	p5-Moose>=0.33:devel/p5-Moose \
+		p5-MooseX-Getopt>=0.07:devel/p5-MooseX-Getopt \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
-BUILD_DEPENDS+=	p5-Devel-CheckOS>=1.63:${PORTSDIR}/devel/p5-Devel-CheckOS
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
+BUILD_DEPENDS+=	p5-Devel-CheckOS>=1.63:devel/p5-Devel-CheckOS
 
 DEPRECATED=	Deprecated by upstream, use devel/p5-Daemon-Control instead
 
diff --git a/devel/p5-MooseX-Declare/Makefile b/devel/p5-MooseX-Declare/Makefile
index 69d2c88b0024..c75a60201f99 100644
--- a/devel/p5-MooseX-Declare/Makefile
+++ b/devel/p5-MooseX-Declare/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Declarative syntax for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Method-Signatures>=0.36:${PORTSDIR}/devel/p5-MooseX-Method-Signatures \
-		p5-MooseX-Role-Parameterized>=0.12:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-Types>=0.20:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Parse-Method-Signatures>=0:${PORTSDIR}/devel/p5-Parse-Method-Signatures \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0.16:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=0.90:devel/p5-Moose \
+		p5-MooseX-Method-Signatures>=0.36:devel/p5-MooseX-Method-Signatures \
+		p5-MooseX-Role-Parameterized>=0.12:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Types>=0.20:devel/p5-MooseX-Types \
+		p5-Parse-Method-Signatures>=0:devel/p5-Parse-Method-Signatures \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-namespace-autoclean>=0.16:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 DEPRECATED=	Deprecated by upstream
 
diff --git a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
index cbb79b8f1bd2..21971bb7a5a2 100644
--- a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
+++ b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Emulate Class::Accessor::Fast behavior using Moose attributes
 
-BUILD_DEPENDS=	p5-Moose>=0.84:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=0.84:devel/p5-Moose \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-FollowPBP/Makefile b/devel/p5-MooseX-FollowPBP/Makefile
index 6d111d7e2605..a4283ad6d9b0 100644
--- a/devel/p5-MooseX-FollowPBP/Makefile
+++ b/devel/p5-MooseX-FollowPBP/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Name your accessors get_foo() and set_foo()
 
-BUILD_DEPENDS=	p5-Moose>=1.16:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=1.16:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	ART20
diff --git a/devel/p5-MooseX-Getopt/Makefile b/devel/p5-MooseX-Getopt/Makefile
index d6686775397f..e0fbef20ce53 100644
--- a/devel/p5-MooseX-Getopt/Makefile
+++ b/devel/p5-MooseX-Getopt/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Moose role for processing command line options
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0.081:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-Moose>=0.56:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MooseX-ConfigFromFile \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0.081:devel/p5-Getopt-Long-Descriptive \
+		p5-Moose>=0.56:devel/p5-Moose \
+		p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-SimpleConfig>=0.07:${PORTSDIR}/devel/p5-MooseX-SimpleConfig \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Path-Tiny>=0.009:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-MooseX-SimpleConfig>=0.07:devel/p5-MooseX-SimpleConfig \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Path-Tiny>=0.009:devel/p5-Path-Tiny \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Trap>=0:devel/p5-Test-Trap \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Has-Options/Makefile b/devel/p5-MooseX-Has-Options/Makefile
index 5702ae8cf455..ce8cd3a50dce 100644
--- a/devel/p5-MooseX-Has-Options/Makefile
+++ b/devel/p5-MooseX-Has-Options/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	MooseX::Has::Options - Succinct options for Moose
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Package-Stash>=0.18:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-String-RewritePrefix>=0:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Package-Stash>=0.18:devel/p5-Package-Stash \
+		p5-String-RewritePrefix>=0:textproc/p5-String-RewritePrefix \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Has-Sugar/Makefile b/devel/p5-MooseX-Has-Sugar/Makefile
index ff0bd4ec950f..c214e1f9f8fb 100644
--- a/devel/p5-MooseX-Has-Sugar/Makefile
+++ b/devel/p5-MooseX-Has-Sugar/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Sugar Syntax for moose has fields
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Types>=0.44:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+TEST_DEPENDS=	p5-MooseX-Types>=0.44:devel/p5-MooseX-Types \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-HasDefaults/Makefile b/devel/p5-MooseX-HasDefaults/Makefile
index 3efb94a910e5..8ed31767859d 100644
--- a/devel/p5-MooseX-HasDefaults/Makefile
+++ b/devel/p5-MooseX-HasDefaults/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Default "is" to "ro" or "rw" for all attributes
 
-BUILD_DEPENDS=	p5-Moose>2:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Moose>2:devel/p5-Moose \
+		p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-IOC/Makefile b/devel/p5-MooseX-IOC/Makefile
index 24129c12a87d..a6c36676f82a 100644
--- a/devel/p5-MooseX-IOC/Makefile
+++ b/devel/p5-MooseX-IOC/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Moose attributes with IOC integration
 
-BUILD_DEPENDS=	p5-IOC>=0:${PORTSDIR}/devel/p5-IOC \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
-RUN_DEPENDS=	p5-IOC>=0:${PORTSDIR}/devel/p5-IOC \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-IOC>=0:devel/p5-IOC \
+		p5-Moose>=0:devel/p5-Moose
+RUN_DEPENDS=	p5-IOC>=0:devel/p5-IOC \
+		p5-Moose>=0:devel/p5-Moose
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-InsideOut/Makefile b/devel/p5-MooseX-InsideOut/Makefile
index e46e7deb2194..71e1438ef1e1 100644
--- a/devel/p5-MooseX-InsideOut/Makefile
+++ b/devel/p5-MooseX-InsideOut/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Inside-out objects with Moose
 
-BUILD_DEPENDS=	p5-Hash-Util-FieldHash-Compat>=0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-clean>=0.11:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Hash-Util-FieldHash-Compat>=0:devel/p5-Hash-Util-FieldHash-Compat \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-namespace-clean>=0.11:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-LazyRequire/Makefile b/devel/p5-MooseX-LazyRequire/Makefile
index 190b6eef221e..4f39f2715d76 100644
--- a/devel/p5-MooseX-LazyRequire/Makefile
+++ b/devel/p5-MooseX-LazyRequire/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Required attributes which fail only when trying to use them
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \
-		p5-aliased>=0.30:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose \
+		p5-aliased>=0.30:devel/p5-aliased \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Lists/Makefile b/devel/p5-MooseX-Lists/Makefile
index 3789124b90a5..4a83e72537f7 100644
--- a/devel/p5-MooseX-Lists/Makefile
+++ b/devel/p5-MooseX-Lists/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Treat arrays and hashes as lists
 
-RUN_DEPENDS=	p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose
+RUN_DEPENDS=	p5-Moose>=0.93:devel/p5-Moose
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Log-Log4perl/Makefile b/devel/p5-MooseX-Log-Log4perl/Makefile
index 6fdf932d0f0e..b0584878fae3 100644
--- a/devel/p5-MooseX-Log-Log4perl/Makefile
+++ b/devel/p5-MooseX-Log-Log4perl/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Logging role for Moose based on Log::Log4perl
 
-BUILD_DEPENDS=	p5-Any-Moose>=0.12:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Log-Log4perl>=1.13:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Any-Moose>=0.12:devel/p5-Any-Moose \
+		p5-Log-Log4perl>=1.13:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Moose>=0.65:${PORTSDIR}/devel/p5-Moose
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Moose>=0.65:devel/p5-Moose
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-MarkAsMethods/Makefile b/devel/p5-MooseX-MarkAsMethods/Makefile
index 3304e5a09633..c19ede1aa142 100644
--- a/devel/p5-MooseX-MarkAsMethods/Makefile
+++ b/devel/p5-MooseX-MarkAsMethods/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Mark overload code symbols as methods
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0.12:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0:devel/p5-B-Hooks-EndOfScope \
+		p5-Moose>=0.94:devel/p5-Moose \
+		p5-namespace-autoclean>=0.12:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
index 559716aff0ee..4921e579cda2 100644
--- a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
+++ b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Force coercion when validating type constraints
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile b/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile
index bc1041876d48..a69807fa4669 100644
--- a/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile
+++ b/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Translate Moo-style constraints to Moose-style
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-autoclean>=0.24:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-autoclean>=0.24:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:${PORTSDIR}/devel/p5-Test-CheckDeps \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Moose-More>=0.028:${PORTSDIR}/devel/p5-Test-Moose-More \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased
+TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Moose-More>=0.028:devel/p5-Test-Moose-More \
+		p5-aliased>=0:devel/p5-aliased
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-MetaDescription/Makefile b/devel/p5-MooseX-MetaDescription/Makefile
index 561a2327c2f5..dc84d7971976 100644
--- a/devel/p5-MooseX-MetaDescription/Makefile
+++ b/devel/p5-MooseX-MetaDescription/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Framework for adding additional metadata to Moose classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.4:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.4:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MooseX-Method-Signatures/Makefile b/devel/p5-MooseX-Method-Signatures/Makefile
index 39c0b6244a99..3d4ebda30d1e 100644
--- a/devel/p5-MooseX-Method-Signatures/Makefile
+++ b/devel/p5-MooseX-Method-Signatures/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Method declarations with type constraints and no source filter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.10:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Context-Preserve>=0:${PORTSDIR}/devel/p5-Context-Preserve \
-		p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0.89:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-LazyRequire>=0.06:${PORTSDIR}/devel/p5-MooseX-LazyRequire \
-		p5-MooseX-Meta-TypeConstraint-ForceCoercion>=0:${PORTSDIR}/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion \
-		p5-MooseX-Types>=0.35:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Structured>=0.24:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-		p5-Parse-Method-Signatures>=1.003014:${PORTSDIR}/devel/p5-Parse-Method-Signatures \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.10:devel/p5-B-Hooks-EndOfScope \
+		p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
+		p5-Context-Preserve>=0:devel/p5-Context-Preserve \
+		p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Moose>=0.89:devel/p5-Moose \
+		p5-MooseX-LazyRequire>=0.06:devel/p5-MooseX-LazyRequire \
+		p5-MooseX-Meta-TypeConstraint-ForceCoercion>=0:devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion \
+		p5-MooseX-Types>=0.35:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Structured>=0.24:devel/p5-MooseX-Types-Structured \
+		p5-Parse-Method-Signatures>=1.003014:devel/p5-Parse-Method-Signatures \
+		p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Eval-Closure>=0:${PORTSDIR}/devel/p5-Eval-Closure \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Eval-Closure>=0:devel/p5-Eval-Closure \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-MethodAttributes/Makefile b/devel/p5-MooseX-MethodAttributes/Makefile
index cab79d36af9e..cc1dee5587ae 100644
--- a/devel/p5-MooseX-MethodAttributes/Makefile
+++ b/devel/p5-MooseX-MethodAttributes/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Code attribute introspection
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.98:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.21:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0.08:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0.98:devel/p5-Moose \
+		p5-MooseX-Types>=0.21:devel/p5-MooseX-Types \
+		p5-namespace-autoclean>=0.08:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-MultiInitArg/Makefile b/devel/p5-MooseX-MultiInitArg/Makefile
index 1ef15f94c5b7..4193d76314e3 100644
--- a/devel/p5-MooseX-MultiInitArg/Makefile
+++ b/devel/p5-MooseX-MultiInitArg/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Attributes with aliases for constructor arguments for MooseX
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+RUN_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-MultiMethods/Makefile b/devel/p5-MooseX-MultiMethods/Makefile
index c0ae3d816da1..cf15a31e3670 100644
--- a/devel/p5-MooseX-MultiMethods/Makefile
+++ b/devel/p5-MooseX-MultiMethods/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Multi Method Dispatch based on Moose type constraints
 
-RUN_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-aliased>0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-Devel-Declare>=0.004000:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-MooseX-Types-VariantTable>=0.03:${PORTSDIR}/devel/p5-MooseX-Types-VariantTable \
-		p5-MooseX-Method-Signatures>=0.29:${PORTSDIR}/devel/p5-MooseX-Method-Signatures \
-		p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types
+RUN_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-aliased>0:devel/p5-aliased \
+		p5-namespace-autoclean>0:devel/p5-namespace-autoclean \
+		p5-Devel-Declare>=0.004000:devel/p5-Devel-Declare \
+		p5-MooseX-Types-VariantTable>=0.03:devel/p5-MooseX-Types-VariantTable \
+		p5-MooseX-Method-Signatures>=0.29:devel/p5-MooseX-Method-Signatures \
+		p5-MooseX-Types>0:devel/p5-MooseX-Types
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-NonMoose/Makefile b/devel/p5-MooseX-NonMoose/Makefile
index 474612690ba5..d1b7c4e49fa4 100644
--- a/devel/p5-MooseX-NonMoose/Makefile
+++ b/devel/p5-MooseX-NonMoose/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Easy subclassing of non-Moose classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-InsideOut>=0:${PORTSDIR}/devel/p5-MooseX-InsideOut \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-MooseX-InsideOut>=0:devel/p5-MooseX-InsideOut \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Object-Pluggable/Makefile b/devel/p5-MooseX-Object-Pluggable/Makefile
index d83d9e393ba7..d2b415c7b64c 100644
--- a/devel/p5-MooseX-Object-Pluggable/Makefile
+++ b/devel/p5-MooseX-Object-Pluggable/Makefile
@@ -15,13 +15,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-OneArgNew/Makefile b/devel/p5-MooseX-OneArgNew/Makefile
index f671b678ec36..575fc815fead 100644
--- a/devel/p5-MooseX-OneArgNew/Makefile
+++ b/devel/p5-MooseX-OneArgNew/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=1.01:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=1.01:devel/p5-MooseX-Role-Parameterized \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-MooseX-POE/Makefile b/devel/p5-MooseX-POE/Makefile
index c03c5a868aa7..7fe9238ebdcb 100644
--- a/devel/p5-MooseX-POE/Makefile
+++ b/devel/p5-MooseX-POE/Makefile
@@ -14,13 +14,13 @@ COMMENT=	The Illicit Love Child of Moose and POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=2.0002:${PORTSDIR}/devel/p5-Moose \
-		p5-POE>=1.310:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Moose>=2.0002:devel/p5-Moose \
+		p5-POE>=1.310:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-MooseX-Daemonize>=0:${PORTSDIR}/devel/p5-MooseX-Daemonize \
-		p5-MooseX-Declare>=0:${PORTSDIR}/devel/p5-MooseX-Declare \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-MooseX-Daemonize>=0:devel/p5-MooseX-Daemonize \
+		p5-MooseX-Declare>=0:devel/p5-MooseX-Declare \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Params-Validate/Makefile b/devel/p5-MooseX-Params-Validate/Makefile
index 676b8622ba1c..9c2d3a814001 100644
--- a/devel/p5-MooseX-Params-Validate/Makefile
+++ b/devel/p5-MooseX-Params-Validate/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Extension of Params::Validate for using Moose types
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Caller>=0:${PORTSDIR}/devel/p5-Devel-Caller \
-		p5-Moose>=0.58:${PORTSDIR}/devel/p5-Moose \
-		p5-Params-Validate>=0.88:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Devel-Caller>=0:devel/p5-Devel-Caller \
+		p5-Moose>=0.58:devel/p5-Moose \
+		p5-Params-Validate>=0.88:devel/p5-Params-Validate \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-RelatedClassRoles/Makefile b/devel/p5-MooseX-RelatedClassRoles/Makefile
index b687f255c45b..79b0eb2be3d2 100644
--- a/devel/p5-MooseX-RelatedClassRoles/Makefile
+++ b/devel/p5-MooseX-RelatedClassRoles/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Apply roles to a class related to yours
 
-BUILD_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0.04:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized
+BUILD_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0.04:devel/p5-MooseX-Role-Parameterized
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Role-Loggable/Makefile b/devel/p5-MooseX-Role-Loggable/Makefile
index 961921381b7c..102b429a4816 100644
--- a/devel/p5-MooseX-Role-Loggable/Makefile
+++ b/devel/p5-MooseX-Role-Loggable/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Extensive, yet simple, logging role using Log::Dispatchouli
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Dispatchouli>=0:${PORTSDIR}/devel/p5-Log-Dispatchouli \
-		p5-Moo>=1.000001:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-Types-MooseLike>=0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Sys-Syslog>=0.25:${PORTSDIR}/sysutils/p5-Sys-Syslog \
-		p5-namespace-sweep>=0:${PORTSDIR}/devel/p5-namespace-sweep
+BUILD_DEPENDS=	p5-Log-Dispatchouli>=0:devel/p5-Log-Dispatchouli \
+		p5-Moo>=1.000001:devel/p5-Moo \
+		p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Sys-Syslog>=0.25:sysutils/p5-Sys-Syslog \
+		p5-namespace-sweep>=0:devel/p5-namespace-sweep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Role-Matcher/Makefile b/devel/p5-MooseX-Role-Matcher/Makefile
index 34f85752b306..06350afa7edd 100644
--- a/devel/p5-MooseX-Role-Matcher/Makefile
+++ b/devel/p5-MooseX-Role-Matcher/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Generic object matching based on attributes and methods
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MooseX-Role-Parameterized>=0.03:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-MooseX-Role-Parameterized>=0.03:devel/p5-MooseX-Role-Parameterized
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MooseX-Role-Parameterized/Makefile b/devel/p5-MooseX-Role-Parameterized/Makefile
index 0bfab5b85c79..3c434f062610 100644
--- a/devel/p5-MooseX-Role-Parameterized/Makefile
+++ b/devel/p5-MooseX-Role-Parameterized/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Roles with composition parameters
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=2.0300:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=2.0300:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Role-Strict/Makefile b/devel/p5-MooseX-Role-Strict/Makefile
index 828b9c4906f7..48bf72cd0d83 100644
--- a/devel/p5-MooseX-Role-Strict/Makefile
+++ b/devel/p5-MooseX-Role-Strict/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Use strict 'roles'
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.89:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.89:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Role-WithOverloading/Makefile b/devel/p5-MooseX-Role-WithOverloading/Makefile
index e172647ddfe7..3befa936d315 100644
--- a/devel/p5-MooseX-Role-WithOverloading/Makefile
+++ b/devel/p5-MooseX-Role-WithOverloading/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Roles which support overloading
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=1.15:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0.16:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=1.15:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-namespace-autoclean>=0.16:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 DEPRECATED=	deprecated by upstream (obsolete with modern Moose)
diff --git a/devel/p5-MooseX-Runnable/Makefile b/devel/p5-MooseX-Runnable/Makefile
index 9550b75a7ce0..00362389eb91 100644
--- a/devel/p5-MooseX-Runnable/Makefile
+++ b/devel/p5-MooseX-Runnable/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Tag a class as a runnable application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-List-SomeUtils>=0:${PORTSDIR}/devel/p5-List-SomeUtils \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-List-SomeUtils>=0:devel/p5-List-SomeUtils \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-TableDriven>=0:${PORTSDIR}/devel/p5-Test-TableDriven
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-TableDriven>=0:devel/p5-Test-TableDriven
 
 NO_ARCH=	yes
 USE_PERL5=	modbuildtiny
@@ -33,7 +33,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-SemiAffordanceAccessor/Makefile b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
index f413f4c6e4c3..8c8fedb81aa3 100644
--- a/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
+++ b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Name your accessors foo() and set_foo()
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-SetOnce/Makefile b/devel/p5-MooseX-SetOnce/Makefile
index 4ec15ca371d2..f733e9c6e653 100644
--- a/devel/p5-MooseX-SetOnce/Makefile
+++ b/devel/p5-MooseX-SetOnce/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Write-once, read-many attributes for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.90:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-SimpleConfig/Makefile b/devel/p5-MooseX-SimpleConfig/Makefile
index a5c981c8af49..4ac8943ca9a7 100644
--- a/devel/p5-MooseX-SimpleConfig/Makefile
+++ b/devel/p5-MooseX-SimpleConfig/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Moose role for setting attributes from a simple configfile
 
-RUN_DEPENDS=	p5-Moose>=0.35:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-ConfigFromFile>=0.02:${PORTSDIR}/devel/p5-MooseX-ConfigFromFile \
-		p5-Config-Any>=0.13:${PORTSDIR}/devel/p5-Config-Any
+RUN_DEPENDS=	p5-Moose>=0.35:devel/p5-Moose \
+		p5-MooseX-ConfigFromFile>=0.02:devel/p5-MooseX-ConfigFromFile \
+		p5-Config-Any>=0.13:devel/p5-Config-Any
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Singleton/Makefile b/devel/p5-MooseX-Singleton/Makefile
index 73b1e0aadf8a..44d11032652f 100644
--- a/devel/p5-MooseX-Singleton/Makefile
+++ b/devel/p5-MooseX-Singleton/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Turn Moose class into a singleton
 
-BUILD_DEPENDS=	p5-Moose>=1.10:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=1.10:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-NoWarnings>=0.01:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warn>=0.01:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-NoWarnings>=0.01:devel/p5-Test-NoWarnings \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Warn>=0.01:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Storage/Makefile b/devel/p5-MooseX-Storage/Makefile
index b9a141f12ac9..0a0b4dd52b33 100644
--- a/devel/p5-MooseX-Storage/Makefile
+++ b/devel/p5-MooseX-Storage/Makefile
@@ -13,21 +13,21 @@ COMMENT=	Serialization framework for Moose classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-MaybeXS>=1.001000:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Moose>=0.99:${PORTSDIR}/devel/p5-Moose \
-		p5-String-RewritePrefix>=0.004:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-JSON-MaybeXS>=1.001000:converters/p5-JSON-MaybeXS \
+		p5-Moose>=0.99:devel/p5-Moose \
+		p5-String-RewritePrefix>=0.004:textproc/p5-String-RewritePrefix \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-JSON>=0.06:${PORTSDIR}/devel/p5-Test-JSON \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-JSON>=0.06:devel/p5-Test-JSON \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-StrictConstructor/Makefile b/devel/p5-MooseX-StrictConstructor/Makefile
index ce0a9bcd9ee9..f56c9f4064bf 100644
--- a/devel/p5-MooseX-StrictConstructor/Makefile
+++ b/devel/p5-MooseX-StrictConstructor/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Make your MooseX object constructors blow up on unknown attributes
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Traits-Pluggable/Makefile b/devel/p5-MooseX-Traits-Pluggable/Makefile
index aba4daece7a6..44ec3cf959a9 100644
--- a/devel/p5-MooseX-Traits-Pluggable/Makefile
+++ b/devel/p5-MooseX-Traits-Pluggable/Makefile
@@ -15,12 +15,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	\
-	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-	p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+	p5-Moose>=0:devel/p5-Moose \
+	p5-Class-Load>=0:devel/p5-Class-Load \
+	p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Traits/Makefile b/devel/p5-MooseX-Traits/Makefile
index c34f4fa6819b..60976fd0d44f 100644
--- a/devel/p5-MooseX-Traits/Makefile
+++ b/devel/p5-MooseX-Traits/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Moose eXtension to automatically apply roles at object creation time
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
@@ -29,7 +29,7 @@ USE_PERL5=	modbuildtiny
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-TransactionalMethods/Makefile b/devel/p5-MooseX-TransactionalMethods/Makefile
index 24190d8e6fca..7505fb703145 100644
--- a/devel/p5-MooseX-TransactionalMethods/Makefile
+++ b/devel/p5-MooseX-TransactionalMethods/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Syntax sugar for transactional methods
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=1.21:${PORTSDIR}/devel/p5-Moose \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased
+BUILD_DEPENDS=	p5-Moose>=1.21:devel/p5-Moose \
+		p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-aliased>=0:devel/p5-aliased
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-Common/Makefile b/devel/p5-MooseX-Types-Common/Makefile
index 3ccba3e4d5cb..c2ef387d2b97 100644
--- a/devel/p5-MooseX-Types-Common/Makefile
+++ b/devel/p5-MooseX-Types-Common/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Set of commonly-used type constraints that do not ship with p5-Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.39:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types
+BUILD_DEPENDS=	p5-Moose>=0.39:devel/p5-Moose \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Warnings>=0.005:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Warnings>=0.005:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
index 81313ea7df08..2e1cde2b02b9 100644
--- a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
@@ -14,15 +14,15 @@ COMMENT=	DateTime related constraints and coercions for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.43:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Locale>=0.40:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-DateTime-TimeZone>=0.96:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Olson-Abbreviations>=0.03:${PORTSDIR}/devel/p5-Olson-Abbreviations \
-		p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-DateTime>=0.43:devel/p5-DateTime \
+		p5-DateTime-Locale>=0.40:devel/p5-DateTime-Locale \
+		p5-DateTime-TimeZone>=0.96:devel/p5-DateTime-TimeZone \
+		p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
+		p5-Olson-Abbreviations>=0.03:devel/p5-Olson-Abbreviations \
+		p5-namespace-clean>=0.08:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.27:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.27:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
@@ -31,7 +31,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
index 943ebf893c5f..4fe69d1f0b2a 100644
--- a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Extensions to MooseX::Types::DateTime
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.43.02:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTimeX-Easy>=0.085:${PORTSDIR}/devel/p5-DateTimeX-Easy \
-		p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-DateTime>=0.06:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \
-		p5-Time-Duration-Parse>=0.06:${PORTSDIR}/devel/p5-Time-Duration-Parse \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-DateTime>=0.43.02:devel/p5-DateTime \
+		p5-DateTimeX-Easy>=0.085:devel/p5-DateTimeX-Easy \
+		p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
+		p5-MooseX-Types-DateTime>=0.06:devel/p5-MooseX-Types-DateTime \
+		p5-Time-Duration-Parse>=0.06:devel/p5-Time-Duration-Parse \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	modbuildtiny
@@ -30,7 +30,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-DateTime-MySQL/Makefile b/devel/p5-MooseX-Types-DateTime-MySQL/Makefile
index 20b780236fce..13d9240003f2 100644
--- a/devel/p5-MooseX-Types-DateTime-MySQL/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-MySQL/Makefile
@@ -9,16 +9,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	MySQL datetime type constraints and coercions
 
-RUN_DEPENDS=	p5-DateTime>=0.03:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Duration>=1.03:${PORTSDIR}/devel/p5-DateTime-Format-Duration \
-		p5-DateTime-Format-MySQL>=0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-		p5-Moose>=0.79:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-DateTime>=0.03:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \
-		p5-namespace-clean>=0.05:${PORTSDIR}/devel/p5-namespace-clean
+RUN_DEPENDS=	p5-DateTime>=0.03:devel/p5-DateTime \
+		p5-DateTime-Format-Duration>=1.03:devel/p5-DateTime-Format-Duration \
+		p5-DateTime-Format-MySQL>=0:devel/p5-DateTime-Format-MySQL \
+		p5-Moose>=0.79:devel/p5-Moose \
+		p5-MooseX-Types-DateTime>=0.03:devel/p5-MooseX-Types-DateTime \
+		p5-namespace-clean>=0.05:devel/p5-namespace-clean
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-#TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-#		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+#TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+#		p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-DateTime/Makefile b/devel/p5-MooseX-Types-DateTime/Makefile
index 26273a82cb0b..e8370a5398b8 100644
--- a/devel/p5-MooseX-Types-DateTime/Makefile
+++ b/devel/p5-MooseX-Types-DateTime/Makefile
@@ -14,14 +14,14 @@ COMMENT=	DateTime related constraints and coercions for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.43.02:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Locale>=0.40.01:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-DateTime-TimeZone>=0.95:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.30:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-DateTime>=0.43.02:devel/p5-DateTime \
+		p5-DateTime-Locale>=0.40.01:devel/p5-DateTime-Locale \
+		p5-DateTime-TimeZone>=0.95:devel/p5-DateTime-TimeZone \
+		p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-Types>=0.30:devel/p5-MooseX-Types \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	modbuildtiny
@@ -30,7 +30,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-DateTimeX/Makefile b/devel/p5-MooseX-Types-DateTimeX/Makefile
index 0b7efd07d561..91bbbe95b128 100644
--- a/devel/p5-MooseX-Types-DateTimeX/Makefile
+++ b/devel/p5-MooseX-Types-DateTimeX/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Extensions to MooseX::Types::DateTime::ButMaintained
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTimeX-Easy>=0.085:${PORTSDIR}/devel/p5-DateTimeX-Easy \
-		p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-DateTime-ButMaintained>=0.04:${PORTSDIR}/devel/p5-MooseX-Types-DateTime-ButMaintained \
-		p5-Time-Duration-Parse>=0.06:${PORTSDIR}/devel/p5-Time-Duration-Parse \
-		p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-DateTimeX-Easy>=0.085:devel/p5-DateTimeX-Easy \
+		p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
+		p5-MooseX-Types-DateTime-ButMaintained>=0.04:devel/p5-MooseX-Types-DateTime-ButMaintained \
+		p5-Time-Duration-Parse>=0.06:devel/p5-Time-Duration-Parse \
+		p5-namespace-clean>=0.08:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Types-ISO8601/Makefile b/devel/p5-MooseX-Types-ISO8601/Makefile
index 01705abb6b5b..58273edff82e 100644
--- a/devel/p5-MooseX-Types-ISO8601/Makefile
+++ b/devel/p5-MooseX-Types-ISO8601/Makefile
@@ -9,19 +9,19 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	ISO8601 date and duration string type constraints and coercions
 
-RUN_DEPENDS=	p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-DateTime>=0.03:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Duration>=1.03:${PORTSDIR}/devel/p5-DateTime-Format-Duration \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-Moose>=0.79:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-DateTime>=0.03:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \
-		p5-MooseX-Types-DateTime-MySQL>=0:${PORTSDIR}/devel/p5-MooseX-Types-DateTime-MySQL \
-		p5-namespace-clean>=0.05:${PORTSDIR}/devel/p5-namespace-clean \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+RUN_DEPENDS=	p5-aliased>=0:devel/p5-aliased \
+		p5-DateTime>=0.03:devel/p5-DateTime \
+		p5-DateTime-Format-Duration>=1.03:devel/p5-DateTime-Format-Duration \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-Moose>=0.79:devel/p5-Moose \
+		p5-MooseX-Types-DateTime>=0.03:devel/p5-MooseX-Types-DateTime \
+		p5-MooseX-Types-DateTime-MySQL>=0:devel/p5-MooseX-Types-DateTime-MySQL \
+		p5-namespace-clean>=0.05:devel/p5-namespace-clean \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-JSON/Makefile b/devel/p5-MooseX-Types-JSON/Makefile
index 09aab35fa0c5..7ebb5cf28ab0 100644
--- a/devel/p5-MooseX-Types-JSON/Makefile
+++ b/devel/p5-MooseX-Types-JSON/Makefile
@@ -15,11 +15,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-JSON>=2.00:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>=0.82:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.15:${PORTSDIR}/devel/p5-MooseX-Types
+BUILD_DEPENDS=	p5-JSON>=2.00:converters/p5-JSON \
+		p5-Moose>=0.82:devel/p5-Moose \
+		p5-MooseX-Types>=0.15:devel/p5-MooseX-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.00:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.00:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-Types-LoadableClass/Makefile b/devel/p5-MooseX-Types-LoadableClass/Makefile
index e050b53ab3e9..7ac5a0918b33 100644
--- a/devel/p5-MooseX-Types-LoadableClass/Makefile
+++ b/devel/p5-MooseX-Types-LoadableClass/Makefile
@@ -13,13 +13,13 @@ COMMENT=	ClassName type constraint with coercion to load the class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.42:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+RUN_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0.42:devel/p5-MooseX-Types \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Types-Path-Class/Makefile b/devel/p5-MooseX-Types-Path-Class/Makefile
index dbc27a0a7680..015996549960 100644
--- a/devel/p5-MooseX-Types-Path-Class/Makefile
+++ b/devel/p5-MooseX-Types-Path-Class/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Path::Class type library for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Path-Class>=0.16:${PORTSDIR}/devel/p5-Path-Class
+RUN_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
+		p5-Path-Class>=0.16:devel/p5-Path-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-MooseX-Types-Path-Tiny/Makefile b/devel/p5-MooseX-Types-Path-Tiny/Makefile
index f42d74d360ab..1eb15b47a137 100644
--- a/devel/p5-MooseX-Types-Path-Tiny/Makefile
+++ b/devel/p5-MooseX-Types-Path-Tiny/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl extension of Path::Tiny types and coercions for Moose
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types-Stringlike>=0:${PORTSDIR}/devel/p5-MooseX-Types-Stringlike \
-	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny
+	p5-Moose>=2:devel/p5-Moose \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-MooseX-Types-Stringlike>=0:devel/p5-MooseX-Types-Stringlike \
+	p5-Path-Tiny>0:devel/p5-Path-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-File-pushd>0:${PORTSDIR}/devel/p5-File-pushd \
-	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal
+	p5-File-pushd>0:devel/p5-File-pushd \
+	p5-Test-Fatal>0:devel/p5-Test-Fatal
 
 USES=	perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Types-Perl/Makefile b/devel/p5-MooseX-Types-Perl/Makefile
index 7f5509ced239..8f5622ec57c8 100644
--- a/devel/p5-MooseX-Types-Perl/Makefile
+++ b/devel/p5-MooseX-Types-Perl/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Moose types that check against Perl syntax
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Params-Util>=0:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-PortNumber/Makefile b/devel/p5-MooseX-Types-PortNumber/Makefile
index 74badb1abba3..4db8357fbb19 100644
--- a/devel/p5-MooseX-Types-PortNumber/Makefile
+++ b/devel/p5-MooseX-Types-PortNumber/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Port number type for Moose classes by the IANA
 
-BUILD_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
-RUN_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
-TEST_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
+RUN_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Test-Exception>=0.31:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -25,7 +25,7 @@ regression-test: build
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-Set-Object/Makefile b/devel/p5-MooseX-Types-Set-Object/Makefile
index 4fed07b6a032..64bfd6252628 100644
--- a/devel/p5-MooseX-Types-Set-Object/Makefile
+++ b/devel/p5-MooseX-Types-Set-Object/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Set::Object type with coercions and stuff
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.50:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object
+BUILD_DEPENDS=	p5-Moose>=0.50:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Set-Object>=0:devel/p5-Set-Object
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	modbuildtiny
@@ -26,7 +26,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-Signal/Makefile b/devel/p5-MooseX-Types-Signal/Makefile
index 19b5db4dc958..811a8c4d36f3 100644
--- a/devel/p5-MooseX-Types-Signal/Makefile
+++ b/devel/p5-MooseX-Types-Signal/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Type to represent valid UNIX or Perl signals
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types
+BUILD_DEPENDS=	p5-MooseX-Types>0:devel/p5-MooseX-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Moose>0:${PORTSDIR}/devel/p5-Moose
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception \
+		p5-Moose>0:devel/p5-Moose
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-Stringlike/Makefile b/devel/p5-MooseX-Types-Stringlike/Makefile
index 9b6d9cb04a4b..c465b951263b 100644
--- a/devel/p5-MooseX-Types-Stringlike/Makefile
+++ b/devel/p5-MooseX-Types-Stringlike/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension of Moose type constraints for string-like objects
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types
+	p5-MooseX-Types>0:devel/p5-MooseX-Types
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Types-Structured/Makefile b/devel/p5-MooseX-Types-Structured/Makefile
index 68899bb2c4ae..0bbb19616144 100644
--- a/devel/p5-MooseX-Types-Structured/Makefile
+++ b/devel/p5-MooseX-Types-Structured/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Moose Type Constraint classes for Structured Types
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-PartialDump>=0.13:${PORTSDIR}/devel/p5-Devel-PartialDump \
-		p5-Moose>=1.08:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.22:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Sub-Exporter>=0.982:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Devel-PartialDump>=0.13:devel/p5-Devel-PartialDump \
+		p5-Moose>=1.08:devel/p5-Moose \
+		p5-MooseX-Types>=0.22:devel/p5-MooseX-Types \
+		p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-MooseX-Types-DateTime>=0:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-MooseX-Types-DateTime>=0:devel/p5-MooseX-Types-DateTime \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
@@ -31,8 +31,8 @@ USE_PERL5=	modbuildtiny
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-JSON-PP>=2.27300:${PORTSDIR}/converters/p5-JSON-PP
-RUN_DEPENDS+=	p5-JSON-PP>=2.27300:${PORTSDIR}/converters/p5-JSON-PP
+BUILD_DEPENDS+=	p5-JSON-PP>=2.27300:converters/p5-JSON-PP
+RUN_DEPENDS+=	p5-JSON-PP>=2.27300:converters/p5-JSON-PP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-URI/Makefile b/devel/p5-MooseX-Types-URI/Makefile
index f22f4a9d332c..8e9ae31ee0a7 100644
--- a/devel/p5-MooseX-Types-URI/Makefile
+++ b/devel/p5-MooseX-Types-URI/Makefile
@@ -13,12 +13,12 @@ COMMENT=	URI related types and coercions for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.40:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-URI-FromHash>=0:${PORTSDIR}/net/p5-URI-FromHash \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0.40:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-URI>=0:net/p5-URI \
+		p5-URI-FromHash>=0:net/p5-URI-FromHash \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -28,11 +28,11 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-TEST_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.120.900:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements
+TEST_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.120.900:devel/p5-CPAN-Meta-Requirements
 .endif
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-VariantTable/Makefile b/devel/p5-MooseX-Types-VariantTable/Makefile
index 0b52aa03ee27..c2497609c7f3 100644
--- a/devel/p5-MooseX-Types-VariantTable/Makefile
+++ b/devel/p5-MooseX-Types-VariantTable/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Type constraint based variant table
 
-RUN_DEPENDS=	p5-MooseX-Types-Structured>=0.12:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-		p5-MooseX-Clone>=0.03:${PORTSDIR}/devel/p5-MooseX-Clone
+RUN_DEPENDS=	p5-MooseX-Types-Structured>=0.12:devel/p5-MooseX-Types-Structured \
+		p5-MooseX-Clone>=0.03:devel/p5-MooseX-Clone
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types/Makefile b/devel/p5-MooseX-Types/Makefile
index d94298a9613c..a1be57c17bd4 100644
--- a/devel/p5-MooseX-Types/Makefile
+++ b/devel/p5-MooseX-Types/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Organise your Moose types in libraries
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=6.00:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=1.06:${PORTSDIR}/devel/p5-Moose \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Exporter-ForMethods>=0.100052:${PORTSDIR}/devel/p5-Sub-Exporter-ForMethods \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-namespace-autoclean>=0.08:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Carp-Clan>=6.00:devel/p5-Carp-Clan \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=1.06:devel/p5-Moose \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Exporter-ForMethods>=0.100052:devel/p5-Sub-Exporter-ForMethods \
+		p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-namespace-autoclean>=0.08:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Mouse/Makefile b/devel/p5-Mouse/Makefile
index 44910e3806b4..24d9ff02448e 100644
--- a/devel/p5-Mouse/Makefile
+++ b/devel/p5-Mouse/Makefile
@@ -16,21 +16,21 @@ COMMENT=	Moose minus the antlers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Build-XSUtil>=0:${PORTSDIR}/devel/p5-Module-Build-XSUtil
-TEST_DEPENDS=	p5-Declare-Constraints-Simple>=0:${PORTSDIR}/devel/p5-Declare-Constraints-Simple \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Locale-US>=0:${PORTSDIR}/misc/p5-Locale-US \
-		p5-Params-Coerce>=0:${PORTSDIR}/devel/p5-Params-Coerce \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Module-Build-XSUtil>=0:devel/p5-Module-Build-XSUtil
+TEST_DEPENDS=	p5-Declare-Constraints-Simple>=0:devel/p5-Declare-Constraints-Simple \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Locale-US>=0:misc/p5-Locale-US \
+		p5-Params-Coerce>=0:devel/p5-Params-Coerce \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-MouseX-App-Cmd/Makefile b/devel/p5-MouseX-App-Cmd/Makefile
index 0cd88474d32c..4fade9f70194 100644
--- a/devel/p5-MouseX-App-Cmd/Makefile
+++ b/devel/p5-MouseX-App-Cmd/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Mashes up MouseX::Getopt and App::Cmd
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0.321:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Getopt-Long-Descriptive>=0.091:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MouseX-ConfigFromFile \
-		p5-MouseX-Getopt>=0:${PORTSDIR}/devel/p5-MouseX-Getopt \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-App-Cmd>=0.321:devel/p5-App-Cmd \
+		p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-ConfigFromFile>=0:devel/p5-MouseX-ConfigFromFile \
+		p5-MouseX-Getopt>=0:devel/p5-MouseX-Getopt \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MouseX-AttributeHelpers/Makefile b/devel/p5-MouseX-AttributeHelpers/Makefile
index e684174da1f0..beb40a26d257 100644
--- a/devel/p5-MouseX-AttributeHelpers/Makefile
+++ b/devel/p5-MouseX-AttributeHelpers/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to extend your attribute interfaces
 
 RUN_DEPENDS=	\
-	p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
+	p5-Mouse>=0.40:devel/p5-Mouse
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-UseAllModules>=0:${PORTSDIR}/devel/p5-Test-UseAllModules \
-		p5-Test-Data>=0:${PORTSDIR}/devel/p5-Test-Data
+TEST_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-UseAllModules>=0:devel/p5-Test-UseAllModules \
+		p5-Test-Data>=0:devel/p5-Test-Data
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MouseX-ConfigFromFile/Makefile b/devel/p5-MouseX-ConfigFromFile/Makefile
index 30df5f3b271d..236734b25ae8 100644
--- a/devel/p5-MouseX-ConfigFromFile/Makefile
+++ b/devel/p5-MouseX-ConfigFromFile/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Abstract Mouse role for setting attributes from a configfile
 
-BUILD_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter \
-		p5-Mouse>=0.19:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-Types-Path-Class>=0.05:${PORTSDIR}/devel/p5-MouseX-Types-Path-Class
+BUILD_DEPENDS=	p5-Filter>=0:devel/p5-Filter \
+		p5-Mouse>=0.19:devel/p5-Mouse \
+		p5-MouseX-Types-Path-Class>=0.05:devel/p5-MouseX-Types-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MouseX-Foreign/Makefile b/devel/p5-MouseX-Foreign/Makefile
index a14b92b5e618..1f83a57f3f39 100644
--- a/devel/p5-MouseX-Foreign/Makefile
+++ b/devel/p5-MouseX-Foreign/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Extends non-Mouse classes as well as Mouse classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mouse>=0.77:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.77:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Any-Moose>=0.15:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Any-Moose>=0.15:devel/p5-Any-Moose \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-MouseX-Getopt/Makefile b/devel/p5-MouseX-Getopt/Makefile
index 1aad6477bfc4..9e4a9fdb945c 100644
--- a/devel/p5-MouseX-Getopt/Makefile
+++ b/devel/p5-MouseX-Getopt/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Mouse>=0.64:${PORTSDIR}/devel/p5-Mouse \
-	p5-Getopt-Long-Descriptive>=0.091:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive
+	p5-Mouse>=0.64:devel/p5-Mouse \
+	p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-MouseX-NativeTraits/Makefile b/devel/p5-MouseX-NativeTraits/Makefile
index 8c6c5a7bf206..29852dc49671 100644
--- a/devel/p5-MouseX-NativeTraits/Makefile
+++ b/devel/p5-MouseX-NativeTraits/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Extend your attribute interfaces for Mouse
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mouse>=0.82:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.82:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Any-Moose>=0.13:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Any-Moose>=0.13:devel/p5-Any-Moose \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-MouseX-StrictConstructor/Makefile b/devel/p5-MouseX-StrictConstructor/Makefile
index 14607d07e481..205ae5ad693f 100644
--- a/devel/p5-MouseX-StrictConstructor/Makefile
+++ b/devel/p5-MouseX-StrictConstructor/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Make your object constructors blow up on unknown attributes
 
-BUILD_DEPENDS=	p5-Mouse>=0.62:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.62:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MouseX-Traits/Makefile b/devel/p5-MouseX-Traits/Makefile
index f17fdf3086c6..041c08ecbb7f 100644
--- a/devel/p5-MouseX-Traits/Makefile
+++ b/devel/p5-MouseX-Traits/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Automatically apply roles at object creation time
 
-BUILD_DEPENDS=	p5-Mouse>=0.81:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.81:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MouseX-Types-Path-Class/Makefile b/devel/p5-MouseX-Types-Path-Class/Makefile
index 1c24fe7d6c66..e7deb0e9f346 100644
--- a/devel/p5-MouseX-Types-Path-Class/Makefile
+++ b/devel/p5-MouseX-Types-Path-Class/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Path::Class type library for Mouse
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mouse>=0.39:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-Types>=0.02:${PORTSDIR}/devel/p5-MouseX-Types \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-MouseX-Getopt>=0.22:${PORTSDIR}/devel/p5-MouseX-Getopt
+BUILD_DEPENDS=	p5-Mouse>=0.39:devel/p5-Mouse \
+		p5-MouseX-Types>=0.02:devel/p5-MouseX-Types \
+		p5-Path-Class>0:devel/p5-Path-Class \
+		p5-MouseX-Getopt>=0.22:devel/p5-MouseX-Getopt
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-UseAllModules>0:${PORTSDIR}/devel/p5-Test-UseAllModules
+TEST_DEPENDS=	p5-Test-UseAllModules>0:devel/p5-Test-UseAllModules
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MouseX-Types/Makefile b/devel/p5-MouseX-Types/Makefile
index 74f4bfb5e5d6..b59d4da4461f 100644
--- a/devel/p5-MouseX-Types/Makefile
+++ b/devel/p5-MouseX-Types/Makefile
@@ -12,10 +12,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to organize your Mouse types in libraries
 
 RUN_DEPENDS=	\
-	p5-Any-Moose>=0.15:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-Mouse>=0.77:${PORTSDIR}/devel/p5-Mouse
+	p5-Any-Moose>=0.15:devel/p5-Any-Moose \
+	p5-Mouse>=0.77:devel/p5-Mouse
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Net-DBus/Makefile b/devel/p5-Net-DBus/Makefile
index f603beee4ac3..104fbd855cef 100644
--- a/devel/p5-Net-DBus/Makefile
+++ b/devel/p5-Net-DBus/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Perl extension for the DBus message system
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-RUN_DEPENDS=	p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-XML-Grove>=0:${PORTSDIR}/textproc/p5-XML-Grove \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
+RUN_DEPENDS=	p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-XML-Grove>=0:textproc/p5-XML-Grove \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes
 
 USES=		pkgconfig perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Net-ZooKeeper/Makefile b/devel/p5-Net-ZooKeeper/Makefile
index 63664447a4d1..7c3c69657811 100644
--- a/devel/p5-Net-ZooKeeper/Makefile
+++ b/devel/p5-Net-ZooKeeper/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for Apache ZooKeeper
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
+LIB_DEPENDS=	libzookeeper_mt.so:devel/libzookeeper
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-No-Worries/Makefile b/devel/p5-No-Worries/Makefile
index fa9115b162d0..cfe888eae4fc 100644
--- a/devel/p5-No-Worries/Makefile
+++ b/devel/p5-No-Worries/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	No::Worries - coding without worries
 
-BUILD_DEPENDS=	p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Number-Tolerant/Makefile b/devel/p5-Number-Tolerant/Makefile
index 47094bf6ddaa..0c67922dde5c 100644
--- a/devel/p5-Number-Tolerant/Makefile
+++ b/devel/p5-Number-Tolerant/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provides inexact number comparisons with tolerance ranges
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0.950:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0.950:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-OLE-Storage_Lite/Makefile b/devel/p5-OLE-Storage_Lite/Makefile
index 65e34fa4a0c5..ab3615baa1cd 100644
--- a/devel/p5-OLE-Storage_Lite/Makefile
+++ b/devel/p5-OLE-Storage_Lite/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for OLE document interface
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Object-Accessor/Makefile b/devel/p5-Object-Accessor/Makefile
index ae49459018c5..8128a24aceef 100644
--- a/devel/p5-Object-Accessor/Makefile
+++ b/devel/p5-Object-Accessor/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Interface to create per object accessors
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Check>=0.34:${PORTSDIR}/devel/p5-Params-Check
-RUN_DEPENDS=	p5-Params-Check>=0.34:${PORTSDIR}/devel/p5-Params-Check
+BUILD_DEPENDS=	p5-Params-Check>=0.34:devel/p5-Params-Check
+RUN_DEPENDS=	p5-Params-Check>=0.34:devel/p5-Params-Check
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Object-Array/Makefile b/devel/p5-Object-Array/Makefile
index f2f3548ed39d..0e22f12be542 100644
--- a/devel/p5-Object-Array/Makefile
+++ b/devel/p5-Object-Array/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Array references with accessors
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Install>=0:devel/p5-Sub-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Object-Authority/Makefile b/devel/p5-Object-Authority/Makefile
index 1db377c4c73c..b168c3fe6eb4 100644
--- a/devel/p5-Object-Authority/Makefile
+++ b/devel/p5-Object-Authority/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that adds an AUTHORITY method to your class
 
-BUILD_DEPENDS=	p5-Object-Role>=0:${PORTSDIR}/devel/p5-Object-Role
+BUILD_DEPENDS=	p5-Object-Role>=0:devel/p5-Object-Role
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Object-Container/Makefile b/devel/p5-Object-Container/Makefile
index 98094779ff05..5a214ffa94ef 100644
--- a/devel/p5-Object-Container/Makefile
+++ b/devel/p5-Object-Container/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Simple object container
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 PORTSCOUT=	limit:^[0-9]*.[0-9][0-9]$$
 
diff --git a/devel/p5-Object-Declare/Makefile b/devel/p5-Object-Declare/Makefile
index 7845c2a8a317..ccf3cafa5ca1 100644
--- a/devel/p5-Object-Declare/Makefile
+++ b/devel/p5-Object-Declare/Makefile
@@ -16,7 +16,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502106
-TEST_DEPENDS+=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=0:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Object-Enum/Makefile b/devel/p5-Object-Enum/Makefile
index 277ea18595f9..2f52bb69313a 100644
--- a/devel/p5-Object-Enum/Makefile
+++ b/devel/p5-Object-Enum/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Replacement for if ($$foo eq 'bar')
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Object-Event/Makefile b/devel/p5-Object-Event/Makefile
index 174198e068b3..92a0ce93732d 100644
--- a/devel/p5-Object-Event/Makefile
+++ b/devel/p5-Object-Event/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	mons@cpan.org
 COMMENT=	Class that provides an event callback interface
 
-RUN_DEPENDS=	p5-AnyEvent>=3.5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+RUN_DEPENDS=	p5-AnyEvent>=3.5:devel/p5-AnyEvent \
+		p5-common-sense>=0:devel/p5-common-sense
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Object-InsideOut/Makefile b/devel/p5-Object-InsideOut/Makefile
index fc0a95d98875..f72f0ed1da3b 100644
--- a/devel/p5-Object-InsideOut/Makefile
+++ b/devel/p5-Object-InsideOut/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Comprehensive inside-out object support module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exception-Class>=1.32:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Want>=0.21:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Exception-Class>=1.32:devel/p5-Exception-Class \
+		p5-Want>=0.21:devel/p5-Want
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Object-Pluggable/Makefile b/devel/p5-Object-Pluggable/Makefile
index 473c26c7a33b..fda4a3586c92 100644
--- a/devel/p5-Object-Pluggable/Makefile
+++ b/devel/p5-Object-Pluggable/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Base class for creating plugin-enabled objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Object-Role/Makefile b/devel/p5-Object-Role/Makefile
index 5ec1782e60c9..23ed2154bd2d 100644
--- a/devel/p5-Object-Role/Makefile
+++ b/devel/p5-Object-Role/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl base class for non-Moose roles
 
-BUILD_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Olson-Abbreviations/Makefile b/devel/p5-Olson-Abbreviations/Makefile
index 4b4e113d70cf..4af2b75387d5 100644
--- a/devel/p5-Olson-Abbreviations/Makefile
+++ b/devel/p5-Olson-Abbreviations/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Globally unique timezones abbreviation handling
 
-RUN_DEPENDS=	p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-MooseX-ClassAttribute>=0:${PORTSDIR}/devel/p5-MooseX-ClassAttribute
+RUN_DEPENDS=	p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>=0:devel/p5-MooseX-AttributeHelpers \
+		p5-MooseX-ClassAttribute>=0:devel/p5-MooseX-ClassAttribute
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-OrePAN2/Makefile b/devel/p5-OrePAN2/Makefile
index 204332b2aa1f..0b18e5735151 100644
--- a/devel/p5-OrePAN2/Makefile
+++ b/devel/p5-OrePAN2/Makefile
@@ -14,22 +14,22 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Archive-Extract>=0.72:${PORTSDIR}/archivers/p5-Archive-Extract \
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-File-pushd>0:${PORTSDIR}/devel/p5-File-pushd \
-	p5-IO-File-AtomicChange>=0:${PORTSDIR}/devel/p5-IO-File-AtomicChange \
-	p5-IO-Socket-SSL>=1.42:${PORTSDIR}/security/p5-IO-Socket-SSL \
-	p5-List-Compare>0:${PORTSDIR}/misc/p5-List-Compare \
-	p5-MetaCPAN-Client>=1.006:${PORTSDIR}/devel/p5-MetaCPAN-Client \
-	p5-Moo>=1.007000:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-Options>0:${PORTSDIR}/devel/p5-MooX-Options \
-	p5-Parse-CPAN-Packages>=2.39:${PORTSDIR}/devel/p5-Parse-CPAN-Packages \
-	p5-Parse-LocalDistribution>=0.14:${PORTSDIR}/devel/p5-Parse-LocalDistribution \
-	p5-Parse-PMFile>=0.29:${PORTSDIR}/devel/p5-Parse-PMFile \
-	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-Types-URI>=0:${PORTSDIR}/devel/p5-Types-URI
+	p5-Archive-Extract>=0.72:archivers/p5-Archive-Extract \
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+	p5-File-pushd>0:devel/p5-File-pushd \
+	p5-IO-File-AtomicChange>=0:devel/p5-IO-File-AtomicChange \
+	p5-IO-Socket-SSL>=1.42:security/p5-IO-Socket-SSL \
+	p5-List-Compare>0:misc/p5-List-Compare \
+	p5-MetaCPAN-Client>=1.006:devel/p5-MetaCPAN-Client \
+	p5-Moo>=1.007000:devel/p5-Moo \
+	p5-MooX-Options>0:devel/p5-MooX-Options \
+	p5-Parse-CPAN-Packages>=2.39:devel/p5-Parse-CPAN-Packages \
+	p5-Parse-LocalDistribution>=0.14:devel/p5-Parse-LocalDistribution \
+	p5-Parse-PMFile>=0.29:devel/p5-Parse-PMFile \
+	p5-Path-Tiny>0:devel/p5-Path-Tiny \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-Type-Tiny>=0:devel/p5-Type-Tiny \
+	p5-Types-URI>=0:devel/p5-Types-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Ouch/Makefile b/devel/p5-Ouch/Makefile
index eb506e48bb2c..c9413c3eaf37 100644
--- a/devel/p5-Ouch/Makefile
+++ b/devel/p5-Ouch/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension for exceptions that don't hurt
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap
+TEST_DEPENDS=	p5-Test-Trap>=0:devel/p5-Test-Trap
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile
index a15cdfbe3b71..7ba39b7bf019 100644
--- a/devel/p5-PAR/Makefile
+++ b/devel/p5-PAR/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl Archive Toolkit
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Zip>=1:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-PAR-Dist>=0.32:${PORTSDIR}/devel/p5-PAR-Dist
+BUILD_DEPENDS=	p5-Archive-Zip>=1:archivers/p5-Archive-Zip \
+		p5-PAR-Dist>=0.32:devel/p5-PAR-Dist
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-PCSC-Card/Makefile b/devel/p5-PCSC-Card/Makefile
index d7e4c61ef940..0a0893924b49 100644
--- a/devel/p5-PCSC-Card/Makefile
+++ b/devel/p5-PCSC-Card/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Perl bindings for the PC/SC Lite Framework
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		perl5 pkgconfig tar:bzip2
 USE_PERL5=	configure
diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile
index 8f717b4fd045..cae6c6612b8a 100644
--- a/devel/p5-POE-API-Hooks/Makefile
+++ b/devel/p5-POE-API-Hooks/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0+$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implement lightweight hooks into POE
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile
index 8a1eef30477f..7af351aedc94 100644
--- a/devel/p5-POE-API-Peek/Makefile
+++ b/devel/p5-POE-API-Peek/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Peek into the internals of a running POE environment
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
-		p5-Devel-Size>0:${PORTSDIR}/devel/p5-Devel-Size
+BUILD_DEPENDS=	p5-POE>=1.311:devel/p5-POE \
+		p5-Devel-Size>0:devel/p5-Devel-Size
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Child/Makefile b/devel/p5-POE-Component-Child/Makefile
index c94b02bd374c..319ec6bc94c9 100644
--- a/devel/p5-POE-Component-Child/Makefile
+++ b/devel/p5-POE-Component-Child/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE child management
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
-RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Component-Cron/Makefile b/devel/p5-POE-Component-Cron/Makefile
index 55aaeb95d73e..fbc528c3f44e 100644
--- a/devel/p5-POE-Component-Cron/Makefile
+++ b/devel/p5-POE-Component-Cron/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Schedule POE Events using a cron spec
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Schedule>=0:${PORTSDIR}/devel/p5-POE-Component-Schedule \
-		p5-DateTime-Event-Random>=0:${PORTSDIR}/devel/p5-DateTime-Event-Random \
-		p5-DateTime-Event-Cron>=0:${PORTSDIR}/devel/p5-DateTime-Event-Cron
-RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Schedule>=0:${PORTSDIR}/devel/p5-POE-Component-Schedule \
-		p5-DateTime-Event-Random>=0:${PORTSDIR}/devel/p5-DateTime-Event-Random \
-		p5-DateTime-Event-Cron>=0:${PORTSDIR}/devel/p5-DateTime-Event-Cron
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-Component-Schedule>=0:devel/p5-POE-Component-Schedule \
+		p5-DateTime-Event-Random>=0:devel/p5-DateTime-Event-Random \
+		p5-DateTime-Event-Cron>=0:devel/p5-DateTime-Event-Cron
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-Component-Schedule>=0:devel/p5-POE-Component-Schedule \
+		p5-DateTime-Event-Random>=0:devel/p5-DateTime-Event-Random \
+		p5-DateTime-Event-Cron>=0:devel/p5-DateTime-Event-Cron
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Component-Daemon/Makefile b/devel/p5-POE-Component-Daemon/Makefile
index b99416864a46..fa22424d2d21 100644
--- a/devel/p5-POE-Component-Daemon/Makefile
+++ b/devel/p5-POE-Component-Daemon/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Handles all the housework for a daemon in POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=1:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile
index ca90b098e03b..9b537a82c9d2 100644
--- a/devel/p5-POE-Component-DebugShell/Makefile
+++ b/devel/p5-POE-Component-DebugShell/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interactive peeking into a running POE application
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-API-Peek>=0:${PORTSDIR}/devel/p5-POE-API-Peek
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-API-Peek>=0:devel/p5-POE-API-Peek
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Distribution>=0:${PORTSDIR}/devel/p5-Test-Distribution
+TEST_DEPENDS=	p5-Test-Distribution>=0:devel/p5-Test-Distribution
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Component-DirWatch/Makefile b/devel/p5-POE-Component-DirWatch/Makefile
index b20725b34b8e..9521486fa487 100644
--- a/devel/p5-POE-Component-DirWatch/Makefile
+++ b/devel/p5-POE-Component-DirWatch/Makefile
@@ -13,10 +13,10 @@ COMMENT=	POE directory watcher
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=0.12:${PORTSDIR}/devel/p5-POE \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-MooseX-Types-Path-Class>0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-File-Signature>0:${PORTSDIR}/sysutils/p5-File-Signature
+BUILD_DEPENDS=	p5-POE>=0.12:devel/p5-POE \
+		p5-Path-Class>0:devel/p5-Path-Class \
+		p5-MooseX-Types-Path-Class>0:devel/p5-MooseX-Types-Path-Class \
+		p5-File-Signature>0:sysutils/p5-File-Signature
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Hailo/Makefile b/devel/p5-POE-Component-Hailo/Makefile
index be4074de819e..57a84bf5da02 100644
--- a/devel/p5-POE-Component-Hailo/Makefile
+++ b/devel/p5-POE-Component-Hailo/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Non-blocking wrapper around Hailo
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-Hailo>=0:${PORTSDIR}/textproc/p5-Hailo
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-Hailo>=0:textproc/p5-Hailo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-IKC/Makefile b/devel/p5-POE-Component-IKC/Makefile
index a6264d975d51..b7beb23eb881 100644
--- a/devel/p5-POE-Component-IKC/Makefile
+++ b/devel/p5-POE-Component-IKC/Makefile
@@ -13,9 +13,9 @@ COMMENT=	POE Inter-Kernel Communication
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Size>=0.77:${PORTSDIR}/devel/p5-Devel-Size \
-		p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
-		p5-Data-Dump>=1:${PORTSDIR}/devel/p5-Data-Dump
+BUILD_DEPENDS=	p5-Devel-Size>=0.77:devel/p5-Devel-Size \
+		p5-POE>=1.311:devel/p5-POE \
+		p5-Data-Dump>=1:devel/p5-Data-Dump
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-JobQueue/Makefile b/devel/p5-POE-Component-JobQueue/Makefile
index 1c14137b0294..cae47badc464 100644
--- a/devel/p5-POE-Component-JobQueue/Makefile
+++ b/devel/p5-POE-Component-JobQueue/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0+$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE component to manage queues and worker pools
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Logger/Makefile b/devel/p5-POE-Component-Logger/Makefile
index 1d721358f399..8721062db2f4 100644
--- a/devel/p5-POE-Component-Logger/Makefile
+++ b/devel/p5-POE-Component-Logger/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE logging class
 
-BUILD_DEPENDS=	p5-POE>=1.293:${PORTSDIR}/devel/p5-POE \
-		p5-Log-Dispatch>=2.26:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Dispatch-Config>=1.03:${PORTSDIR}/devel/p5-Log-Dispatch-Config
+BUILD_DEPENDS=	p5-POE>=1.293:devel/p5-POE \
+		p5-Log-Dispatch>=2.26:devel/p5-Log-Dispatch \
+		p5-Log-Dispatch-Config>=1.03:devel/p5-Log-Dispatch-Config
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Component-Pluggable/Makefile b/devel/p5-POE-Component-Pluggable/Makefile
index 2d5f44ff14a5..dfbc04a47021 100644
--- a/devel/p5-POE-Component-Pluggable/Makefile
+++ b/devel/p5-POE-Component-Pluggable/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Base class for creating plugin enabled POE Components
 
-BUILD_DEPENDS=	p5-POE>=1.004:${PORTSDIR}/devel/p5-POE \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-POE>=1.004:devel/p5-POE \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-RSS/Makefile b/devel/p5-POE-Component-RSS/Makefile
index 0c5301bc634b..01b36f60e15e 100644
--- a/devel/p5-POE-Component-RSS/Makefile
+++ b/devel/p5-POE-Component-RSS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module for event based RSS parsing
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-XML-RSS>=0:textproc/p5-XML-RSS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-RSSAggregator/Makefile b/devel/p5-POE-Component-RSSAggregator/Makefile
index 4506969d2bbc..fb62fccbb160 100644
--- a/devel/p5-POE-Component-RSSAggregator/Makefile
+++ b/devel/p5-POE-Component-RSSAggregator/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Watch Muliple RSS Feeds for New Headlines
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-RSS-Feed>=0:${PORTSDIR}/textproc/p5-XML-RSS-Feed \
-		p5-POE-Component-Client-DNS>=0.98:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \
-		p5-POE-Component-Client-HTTP>=0.51:${PORTSDIR}/www/p5-POE-Component-Client-HTTP
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-RSS-Feed>=0:textproc/p5-XML-RSS-Feed \
+		p5-POE-Component-Client-DNS>=0.98:dns/p5-POE-Component-Client-DNS \
+		p5-POE-Component-Client-HTTP>=0.51:www/p5-POE-Component-Client-HTTP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Schedule/Makefile b/devel/p5-POE-Component-Schedule/Makefile
index 1bb4dad4a69e..874711f262fc 100644
--- a/devel/p5-POE-Component-Schedule/Makefile
+++ b/devel/p5-POE-Component-Schedule/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Schedule POE Events using a cron spec
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Server-XMLRPC/Makefile b/devel/p5-POE-Component-Server-XMLRPC/Makefile
index 9a3b3490ee7f..13fc7c01ab2c 100644
--- a/devel/p5-POE-Component-Server-XMLRPC/Makefile
+++ b/devel/p5-POE-Component-Server-XMLRPC/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jesper@jdn.dk
 COMMENT=	POE Component to create XMLRPC Servers
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Server-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Server-HTTP \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Syndicator/Makefile b/devel/p5-POE-Component-Syndicator/Makefile
index 733ce0e75322..9c97308aa216 100644
--- a/devel/p5-POE-Component-Syndicator/Makefile
+++ b/devel/p5-POE-Component-Syndicator/Makefile
@@ -15,9 +15,9 @@ COMMENT=	POE component base class which implements the Observer pattern
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
-		p5-Object-Pluggable>=1.29:${PORTSDIR}/devel/p5-Object-Pluggable \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-POE>=1.311:devel/p5-POE \
+		p5-Object-Pluggable>=1.29:devel/p5-Object-Pluggable \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-TSTP/Makefile b/devel/p5-POE-Component-TSTP/Makefile
index af39016e079d..337422527794 100644
--- a/devel/p5-POE-Component-TSTP/Makefile
+++ b/devel/p5-POE-Component-TSTP/Makefile
@@ -14,7 +14,7 @@ COMMENT=	POE component to correctly handle Ctrl-Z in your program
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile
index 6ddca4c0456e..0752f38f9f51 100644
--- a/devel/p5-POE-Devel-Profiler/Makefile
+++ b/devel/p5-POE-Devel-Profiler/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Profiles POE programs
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Loop-AnyEvent/Makefile b/devel/p5-POE-Loop-AnyEvent/Makefile
index 427cb8529498..f28819646770 100644
--- a/devel/p5-POE-Loop-AnyEvent/Makefile
+++ b/devel/p5-POE-Loop-AnyEvent/Makefile
@@ -13,10 +13,10 @@ COMMENT=	AnyEvent event loop support for POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-POE>=1.289:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-POE>=1.289:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-POE-Test-Loops>=1.035:${PORTSDIR}/devel/p5-POE-Test-Loops
+BUILD_DEPENDS+=	p5-POE-Test-Loops>=1.035:devel/p5-POE-Test-Loops
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-POE-Loop-Glib/Makefile b/devel/p5-POE-Loop-Glib/Makefile
index 5baef93a2efe..0f2305c9fec3 100644
--- a/devel/p5-POE-Loop-Glib/Makefile
+++ b/devel/p5-POE-Loop-Glib/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Bridge that supports Glib event loop from POE
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-POE>=1.288:${PORTSDIR}/devel/p5-POE \
-		p5-Glib2>=1.222:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS=	p5-POE>=1.288:devel/p5-POE \
+		p5-Glib2>=1.222:devel/p5-Glib2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-POE-Loop-Tk/Makefile b/devel/p5-POE-Loop-Tk/Makefile
index 5631917e0888..2fd58642d7bf 100644
--- a/devel/p5-POE-Loop-Tk/Makefile
+++ b/devel/p5-POE-Loop-Tk/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bridge that allows POE to be driven by Tk
 
-BUILD_DEPENDS=	p5-POE>=1.356:${PORTSDIR}/devel/p5-POE \
-		p5-Tk>=804.031:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-POE>=1.356:devel/p5-POE \
+		p5-Tk>=804.031:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Quickie/Makefile b/devel/p5-POE-Quickie/Makefile
index db4329a64c43..9b6412d5749c 100644
--- a/devel/p5-POE-Quickie/Makefile
+++ b/devel/p5-POE-Quickie/Makefile
@@ -15,10 +15,10 @@ LICENSE=	GPLv1 ART10
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-POE>=1.350:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=1.350:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0.07:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Capture-Tiny>=0.07:devel/p5-Capture-Tiny \
+		p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Session-MultiDispatch/Makefile b/devel/p5-POE-Session-MultiDispatch/Makefile
index 4855749a1cc4..9b66c5400184 100644
--- a/devel/p5-POE-Session-MultiDispatch/Makefile
+++ b/devel/p5-POE-Session-MultiDispatch/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Callback dispatch for session events
 
-RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Stage/Makefile b/devel/p5-POE-Stage/Makefile
index 1318c6efcb7e..affbdaeb7235 100644
--- a/devel/p5-POE-Stage/Makefile
+++ b/devel/p5-POE-Stage/Makefile
@@ -13,12 +13,12 @@ PORTREVISION=	1
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Base class for formalized POE components
 
-BUILD_DEPENDS=	p5-POE>=1.351:${PORTSDIR}/devel/p5-POE \
-		p5-PadWalker>=1.93:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Devel-LexAlias>=0.04:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Lexical-Persistence>=1.020:${PORTSDIR}/devel/p5-Lexical-Persistence \
-		p5-Attribute-Handlers>=0.93:${PORTSDIR}/devel/p5-Attribute-Handlers
+BUILD_DEPENDS=	p5-POE>=1.351:devel/p5-POE \
+		p5-PadWalker>=1.93:devel/p5-PadWalker \
+		p5-Net-DNS>=0.68:dns/p5-Net-DNS \
+		p5-Devel-LexAlias>=0.04:devel/p5-Devel-LexAlias \
+		p5-Lexical-Persistence>=1.020:devel/p5-Lexical-Persistence \
+		p5-Attribute-Handlers>=0.93:devel/p5-Attribute-Handlers
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Test-Loops/Makefile b/devel/p5-POE-Test-Loops/Makefile
index 37b8585b1d1a..d82b70722f03 100644
--- a/devel/p5-POE-Test-Loops/Makefile
+++ b/devel/p5-POE-Test-Loops/Makefile
@@ -21,8 +21,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.002:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.002:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-POE-XS-Loop-Poll/Makefile b/devel/p5-POE-XS-Loop-Poll/Makefile
index 3707d93362a6..d1e85343c84d 100644
--- a/devel/p5-POE-XS-Loop-Poll/Makefile
+++ b/devel/p5-POE-XS-Loop-Poll/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS implementation of POE::Loop, using poll(2)
 
-BUILD_DEPENDS=	p5-POE-Test-Loops>=1.033:${PORTSDIR}/devel/p5-POE-Test-Loops \
-		p5-POE>=1.003:${PORTSDIR}/devel/p5-POE
-RUN_DEPENDS=	p5-POE>=1.003:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE-Test-Loops>=1.033:devel/p5-POE-Test-Loops \
+		p5-POE>=1.003:devel/p5-POE
+RUN_DEPENDS=	p5-POE>=1.003:devel/p5-POE
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-XS-Queue-Array/Makefile b/devel/p5-POE-XS-Queue-Array/Makefile
index f3da9591995d..957d4ec92f36 100644
--- a/devel/p5-POE-XS-Queue-Array/Makefile
+++ b/devel/p5-POE-XS-Queue-Array/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS implementation of POE::Queue::Array
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 2f04ad3f5674..6482595e40b3 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Multitasking and networking framework for perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Curses>=1.08:${PORTSDIR}/devel/p5-Curses \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-Pipely>=0.005:${PORTSDIR}/devel/p5-IO-Pipely \
-		p5-IO-Tty>=1.08:${PORTSDIR}/devel/p5-IO-Tty \
-		p5-POE-Test-Loops>=1.360:${PORTSDIR}/devel/p5-POE-Test-Loops \
-		p5-Socket-GetAddrInfo>=0.20:${PORTSDIR}/net/p5-Socket-GetAddrInfo \
-		p5-Term-ReadKey>=2.21:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-URI>=1.30:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=5.79:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Curses>=1.08:devel/p5-Curses \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-Pipely>=0.005:devel/p5-IO-Pipely \
+		p5-IO-Tty>=1.08:devel/p5-IO-Tty \
+		p5-POE-Test-Loops>=1.360:devel/p5-POE-Test-Loops \
+		p5-Socket-GetAddrInfo>=0.20:net/p5-Socket-GetAddrInfo \
+		p5-Term-ReadKey>=2.21:devel/p5-Term-ReadKey \
+		p5-URI>=1.30:net/p5-URI \
+		p5-libwww>=5.79:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/devel/p5-POEx-Role-SessionInstantiation/Makefile b/devel/p5-POEx-Role-SessionInstantiation/Makefile
index 37e77aaf054c..6381b49ef1fb 100644
--- a/devel/p5-POEx-Role-SessionInstantiation/Makefile
+++ b/devel/p5-POEx-Role-SessionInstantiation/Makefile
@@ -12,13 +12,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of Moose role for turning objects into POE sessions
 
 RUN_DEPENDS=	\
-	p5-MooseX-CompileTime-Traits>=0:${PORTSDIR}/devel/p5-MooseX-CompileTime-Traits \
-	p5-MooseX-Declare>0:${PORTSDIR}/devel/p5-MooseX-Declare \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-POE>0:${PORTSDIR}/devel/p5-POE \
-	p5-POEx-Types>=0:${PORTSDIR}/devel/p5-POEx-Types \
-	p5-aliased>0:${PORTSDIR}/devel/p5-aliased
+	p5-MooseX-CompileTime-Traits>=0:devel/p5-MooseX-CompileTime-Traits \
+	p5-MooseX-Declare>0:devel/p5-MooseX-Declare \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-POE>0:devel/p5-POE \
+	p5-POEx-Types>=0:devel/p5-POEx-Types \
+	p5-aliased>0:devel/p5-aliased
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POEx-Role-Streaming/Makefile b/devel/p5-POEx-Role-Streaming/Makefile
index a7799fde8fc3..e442a3368dce 100644
--- a/devel/p5-POEx-Role-Streaming/Makefile
+++ b/devel/p5-POEx-Role-Streaming/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for streaming from one filehandle to another
 
 RUN_DEPENDS=	\
-	p5-MooseX-Declare>0:${PORTSDIR}/devel/p5-MooseX-Declare \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-POE>0:${PORTSDIR}/devel/p5-POE \
-	p5-POEx-Role-SessionInstantiation>=0:${PORTSDIR}/devel/p5-POEx-Role-SessionInstantiation \
-	p5-POEx-Types>0:${PORTSDIR}/devel/p5-POEx-Types \
-	p5-aliased>0:${PORTSDIR}/devel/p5-aliased
+	p5-MooseX-Declare>0:devel/p5-MooseX-Declare \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-POE>0:devel/p5-POE \
+	p5-POEx-Role-SessionInstantiation>=0:devel/p5-POEx-Role-SessionInstantiation \
+	p5-POEx-Types>0:devel/p5-POEx-Types \
+	p5-aliased>0:devel/p5-aliased
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POEx-Types/Makefile b/devel/p5-POEx-Types/Makefile
index 703146ae80a1..e0b28992283b 100644
--- a/devel/p5-POEx-Types/Makefile
+++ b/devel/p5-POEx-Types/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to provide MooseX::Types types for modern POE
 
 RUN_DEPENDS=	\
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types-Structured>0:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-	p5-POE>0:${PORTSDIR}/devel/p5-POE
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-MooseX-Types-Structured>0:devel/p5-MooseX-Types-Structured \
+	p5-POE>0:devel/p5-POE
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 1224391e9620..efacfc873f1e 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl5 library for text-mode user interface widgets
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses
 
 USES=		perl5
 
diff --git a/devel/p5-Package-DeprecationManager/Makefile b/devel/p5-Package-DeprecationManager/Makefile
index d5532bcd2b83..82f4bb44f6e8 100644
--- a/devel/p5-Package-DeprecationManager/Makefile
+++ b/devel/p5-Package-DeprecationManager/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Manage deprecation warnings for your distribution
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Package-Stash>0:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Params-Util>0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Install>0:${PORTSDIR}/devel/p5-Sub-Install
+BUILD_DEPENDS=	p5-Package-Stash>0:devel/p5-Package-Stash \
+		p5-Params-Util>0:devel/p5-Params-Util \
+		p5-Sub-Install>0:devel/p5-Sub-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>0:devel/p5-Test-Warnings
 
 NO_ARCH=	yes
 USES=		perl5
@@ -27,8 +27,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Package-Stash-XS/Makefile b/devel/p5-Package-Stash-XS/Makefile
index 22657b8eb9c7..e09d2262bd09 100644
--- a/devel/p5-Package-Stash-XS/Makefile
+++ b/devel/p5-Package-Stash-XS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Faster and more correct implementation of the Package::Stash API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Package-Stash/Makefile b/devel/p5-Package-Stash/Makefile
index 199a81ff9ffa..2950b17633ac 100644
--- a/devel/p5-Package-Stash/Makefile
+++ b/devel/p5-Package-Stash/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Routines for manipulating stashes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dist-CheckConflicts>=0.02:${PORTSDIR}/devel/p5-Dist-CheckConflicts \
-		p5-Module-Implementation>=0.06:${PORTSDIR}/devel/p5-Module-Implementation \
-		p5-Package-Stash-XS>=0.22:${PORTSDIR}/devel/p5-Package-Stash-XS
+BUILD_DEPENDS=	p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
+		p5-Module-Implementation>=0.06:devel/p5-Module-Implementation \
+		p5-Package-Stash-XS>=0.22:devel/p5-Package-Stash-XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Package-Variant/Makefile b/devel/p5-Package-Variant/Makefile
index 23c71d07d4d3..61a047a344f9 100644
--- a/devel/p5-Package-Variant/Makefile
+++ b/devel/p5-Package-Variant/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Parameterizable packages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Import-Into>=1:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Module-Runtime>=0.013:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-strictures>=2:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Import-Into>=1:devel/p5-Import-Into \
+		p5-Module-Runtime>=0.013:devel/p5-Module-Runtime \
+		p5-strictures>=2:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Moo>=0:devel/p5-Moo \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Parallel-Async/Makefile b/devel/p5-Parallel-Async/Makefile
index 0cc4cae85682..83bbbe6f91c9 100644
--- a/devel/p5-Parallel-Async/Makefile
+++ b/devel/p5-Parallel-Async/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Parallel-Prefork/Makefile b/devel/p5-Parallel-Prefork/Makefile
index 76c6be34a5a3..809b2f82488f 100644
--- a/devel/p5-Parallel-Prefork/Makefile
+++ b/devel/p5-Parallel-Prefork/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Simple prefork server framework
 
-BUILD_DEPENDS=	p5-Proc-Wait3>=0.03:${PORTSDIR}/devel/p5-Proc-Wait3 \
-		p5-Class-Accessor-Lite>=0.04:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Scope-Guard>=0:${PORTSDIR}/devel/p5-Scope-Guard
+BUILD_DEPENDS=	p5-Proc-Wait3>=0.03:devel/p5-Proc-Wait3 \
+		p5-Class-Accessor-Lite>=0.04:devel/p5-Class-Accessor-Lite \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Scope-Guard>=0:devel/p5-Scope-Guard
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-SharedFork>=0:${PORTSDIR}/devel/p5-Test-SharedFork \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-SharedFork>=0:devel/p5-Test-SharedFork \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parallel-Scoreboard/Makefile b/devel/p5-Parallel-Scoreboard/Makefile
index b769a11237db..331166bd8298 100644
--- a/devel/p5-Parallel-Scoreboard/Makefile
+++ b/devel/p5-Parallel-Scoreboard/Makefile
@@ -13,9 +13,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+	p5-HTML-Parser>0:www/p5-HTML-Parser \
+	p5-JSON>0:converters/p5-JSON
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Params-CallbackRequest/Makefile b/devel/p5-Params-CallbackRequest/Makefile
index 3cc25ef0a1d9..71ed67e3abf5 100644
--- a/devel/p5-Params-CallbackRequest/Makefile
+++ b/devel/p5-Params-CallbackRequest/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provide callbacks to method and function parameters
 
-RUN_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+RUN_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Class-ISA>=0:devel/p5-Class-ISA
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Params-Coerce/Makefile b/devel/p5-Params-Coerce/Makefile
index d1bcb014f97e..8026342796ee 100644
--- a/devel/p5-Params-Coerce/Makefile
+++ b/devel/p5-Params-Coerce/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	coryking@mozimedia.com
 COMMENT=	Allows your classes to do coercion of parameters  (Params::Coerce)
 
-BUILD_DEPENDS=	p5-Params-Util>=0.20:${PORTSDIR}/devel/p5-Params-Util
-RUN_DEPENDS=	p5-Params-Util>=0.20:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Params-Util>=0.20:devel/p5-Params-Util
+RUN_DEPENDS=	p5-Params-Util>=0.20:devel/p5-Params-Util
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Params-Validate-Dependencies/Makefile b/devel/p5-Params-Validate-Dependencies/Makefile
index b1ea911f64ea..e2b5807a89c0 100644
--- a/devel/p5-Params-Validate-Dependencies/Makefile
+++ b/devel/p5-Params-Validate-Dependencies/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Validate combinations of parameters
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone>=0.38:${PORTSDIR}/devel/p5-Clone \
-		p5-Data-Domain>=1.02:${PORTSDIR}/devel/p5-Data-Domain \
-		p5-PadWalker>=1.96:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Params-Validate>=1.07:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Clone>=0.38:devel/p5-Clone \
+		p5-Data-Domain>=1.02:devel/p5-Data-Domain \
+		p5-PadWalker>=1.96:devel/p5-PadWalker \
+		p5-Params-Validate>=1.07:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index 6be0485a3213..cefc6275648c 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Validate method/function parameters
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Module-Implementation>=0.04:${PORTSDIR}/devel/p5-Module-Implementation
-RUN_DEPENDS=	p5-Module-Implementation>=0.04:${PORTSDIR}/devel/p5-Module-Implementation
-TEST_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Taint>=0.02:${PORTSDIR}/devel/p5-Test-Taint
+BUILD_DEPENDS=	p5-Module-Implementation>=0.04:devel/p5-Module-Implementation
+RUN_DEPENDS=	p5-Module-Implementation>=0.04:devel/p5-Module-Implementation
+TEST_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>0:devel/p5-Test-Requires \
+		p5-Test-Taint>=0.02:devel/p5-Test-Taint
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Paranoid/Makefile b/devel/p5-Paranoid/Makefile
index 5526d450acba..aea86899f112 100644
--- a/devel/p5-Paranoid/Makefile
+++ b/devel/p5-Paranoid/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Paranoia support for safer programs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-BerkeleyDB>=0.32:${PORTSDIR}/databases/p5-BerkeleyDB \
-		p5-Unix-Syslog>=1.1:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-BerkeleyDB>=0.32:databases/p5-BerkeleyDB \
+		p5-Unix-Syslog>=1.1:sysutils/p5-Unix-Syslog \
+		p5-Socket6>=0.23:net/p5-Socket6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-CPAN-Meta/Makefile b/devel/p5-Parse-CPAN-Meta/Makefile
index b562b194a6c9..930798a4551d 100644
--- a/devel/p5-Parse-CPAN-Meta/Makefile
+++ b/devel/p5-Parse-CPAN-Meta/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Parse META.yml and other similar CPAN metadata files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CPAN-Meta-YAML>=0.011:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
-RUN_DEPENDS=	p5-CPAN-Meta-YAML>=0.011:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
+BUILD_DEPENDS=	p5-CPAN-Meta-YAML>=0.011:devel/p5-CPAN-Meta-YAML
+RUN_DEPENDS=	p5-CPAN-Meta-YAML>=0.011:devel/p5-CPAN-Meta-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-CPAN-Packages-Fast/Makefile b/devel/p5-Parse-CPAN-Packages-Fast/Makefile
index 2fc95f925776..24ae3a6887da 100644
--- a/devel/p5-Parse-CPAN-Packages-Fast/Makefile
+++ b/devel/p5-Parse-CPAN-Packages-Fast/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Parse CPAN package index
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CPAN-DistnameInfo>=0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo
+BUILD_DEPENDS=	p5-CPAN-DistnameInfo>=0:devel/p5-CPAN-DistnameInfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Parse-CPAN-Packages/Makefile b/devel/p5-Parse-CPAN-Packages/Makefile
index 6463429af914..747606d6709d 100644
--- a/devel/p5-Parse-CPAN-Packages/Makefile
+++ b/devel/p5-Parse-CPAN-Packages/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Parse 02packages.details.txt.gz from CPAN
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Peek>0:${PORTSDIR}/archivers/p5-Archive-Peek \
-		p5-CPAN-DistnameInfo>0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-PPI>0:${PORTSDIR}/textproc/p5-PPI \
-		p5-Type-Tiny>0:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-Archive-Peek>0:archivers/p5-Archive-Peek \
+		p5-CPAN-DistnameInfo>0:devel/p5-CPAN-DistnameInfo \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-PPI>0:textproc/p5-PPI \
+		p5-Type-Tiny>0:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-InDistDir>0:${PORTSDIR}/devel/p5-Test-InDistDir \
-		p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp
+TEST_DEPENDS=	p5-Test-InDistDir>0:devel/p5-Test-InDistDir \
+		p5-File-Slurp>0:devel/p5-File-Slurp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-ErrorString-Perl/Makefile b/devel/p5-Parse-ErrorString-Perl/Makefile
index 9d40546560af..0bc845d837e0 100644
--- a/devel/p5-Parse-ErrorString-Perl/Makefile
+++ b/devel/p5-Parse-ErrorString-Perl/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Parse error messages from the Perl interpreter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Pod-POM>=0.27:${PORTSDIR}/textproc/p5-Pod-POM
+BUILD_DEPENDS=	p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
+		p5-Module-Install>0:devel/p5-Module-Install \
+		p5-Pod-POM>=0.27:textproc/p5-Pod-POM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-LocalDistribution/Makefile b/devel/p5-Parse-LocalDistribution/Makefile
index 3b53722d5ac3..bb7e2fcba718 100644
--- a/devel/p5-Parse-LocalDistribution/Makefile
+++ b/devel/p5-Parse-LocalDistribution/Makefile
@@ -13,9 +13,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Parse-PMFile>=0.35:${PORTSDIR}/devel/p5-Parse-PMFile
+	p5-Parse-PMFile>=0.35:devel/p5-Parse-PMFile
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-	p5-ExtUtils-MakeMaker-CPANfile>0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+	p5-ExtUtils-MakeMaker-CPANfile>0:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-Method-Signatures/Makefile b/devel/p5-Parse-Method-Signatures/Makefile
index 5b3de0b89f90..b8f4aff60953 100644
--- a/devel/p5-Parse-Method-Signatures/Makefile
+++ b/devel/p5-Parse-Method-Signatures/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Perl6 like method signature parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.19:${PORTSDIR}/devel/p5-Class-Load \
-		p5-List-MoreUtils>=0.20:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Traits>=0.06:${PORTSDIR}/devel/p5-MooseX-Traits \
-		p5-MooseX-Types>=0.17:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Structured>=0:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-		p5-PPI>=1.203:${PORTSDIR}/textproc/p5-PPI \
-		p5-namespace-clean>=0.10:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Class-Load>=0.19:devel/p5-Class-Load \
+		p5-List-MoreUtils>=0.20:lang/p5-List-MoreUtils \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Traits>=0.06:devel/p5-MooseX-Traits \
+		p5-MooseX-Types>=0.17:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Structured>=0:devel/p5-MooseX-Types-Structured \
+		p5-PPI>=1.203:textproc/p5-PPI \
+		p5-namespace-clean>=0.10:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-aliased>=0:devel/p5-aliased
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Parse-PMFile/Makefile b/devel/p5-Parse-PMFile/Makefile
index 4cdfed60adb5..37359e81def1 100644
--- a/devel/p5-Parse-PMFile/Makefile
+++ b/devel/p5-Parse-PMFile/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension to parses .pm file as PAUSE does
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-MakeMaker-CPANfile>0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+BUILD_DEPENDS=	p5-ExtUtils-MakeMaker-CPANfile>0:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-Pidl/Makefile b/devel/p5-Parse-Pidl/Makefile
index efc102b79d45..4aa9699f6df1 100644
--- a/devel/p5-Parse-Pidl/Makefile
+++ b/devel/p5-Parse-Pidl/Makefile
@@ -12,7 +12,7 @@ COMMENT=		IDL compiler written in Perl
 
 LICENSE=		GPLv3
 
-BUILD_DEPENDS=		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
+BUILD_DEPENDS=		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
 CONFLICTS=
diff --git a/devel/p5-Parse-PlainConfig/Makefile b/devel/p5-Parse-PlainConfig/Makefile
index c594db86a3cb..8f7be294b510 100644
--- a/devel/p5-Parse-PlainConfig/Makefile
+++ b/devel/p5-Parse-PlainConfig/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	peter@vereshagin.org
 COMMENT=	Perl5 module to use plain config files
 
-RUN_DEPENDS=	p5-Paranoid>0:${PORTSDIR}/devel/p5-Paranoid \
-		p5-Text-ParseWords>0:${PORTSDIR}/textproc/p5-Text-ParseWords \
-		p5-Text-Tabs+Wrap>0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+RUN_DEPENDS=	p5-Paranoid>0:devel/p5-Paranoid \
+		p5-Text-ParseWords>0:textproc/p5-Text-ParseWords \
+		p5-Text-Tabs+Wrap>0:textproc/p5-Text-Tabs+Wrap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index f676dbc1a51f..f13e6ed54443 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Recursive descent parsing framework for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/p5-ParseLex/Makefile b/devel/p5-ParseLex/Makefile
index b85a9a04df36..2b628df64b47 100644
--- a/devel/p5-ParseLex/Makefile
+++ b/devel/p5-ParseLex/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pirzyk@FreeBSD.org
 COMMENT=	Object-oriented generator of lexical analyzers
 
-BUILD_DEPENDS=	p5-ParseTemplate>=3.01:${PORTSDIR}/devel/p5-ParseTemplate
+BUILD_DEPENDS=	p5-ParseTemplate>=3.01:devel/p5-ParseTemplate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Path-Abstract/Makefile b/devel/p5-Path-Abstract/Makefile
index 8b0cc8ff1332..5f80fdb6456d 100644
--- a/devel/p5-Path-Abstract/Makefile
+++ b/devel/p5-Path-Abstract/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Fast and featureful UNIX-style path parsing and manipulation
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
-RUN_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-Lazy>=0:${PORTSDIR}/devel/p5-Test-Lazy
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most \
+		p5-Test-Lazy>=0:devel/p5-Test-Lazy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-Class-File-Lockable/Makefile b/devel/p5-Path-Class-File-Lockable/Makefile
index 36a67ff74666..e8e3afe3e7bf 100644
--- a/devel/p5-Path-Class-File-Lockable/Makefile
+++ b/devel/p5-Path-Class-File-Lockable/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Lock your files with Path::Class::File
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-NFSLock>0:${PORTSDIR}/devel/p5-File-NFSLock \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-File-NFSLock>0:devel/p5-File-NFSLock \
+		p5-Path-Class>0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Path-Dispatcher-Declarative/Makefile b/devel/p5-Path-Dispatcher-Declarative/Makefile
index 037453fc24b1..9e468f372f5e 100644
--- a/devel/p5-Path-Dispatcher-Declarative/Makefile
+++ b/devel/p5-Path-Dispatcher-Declarative/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Sugary dispatcher for perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Path-Dispatcher>=1.02:${PORTSDIR}/devel/p5-Path-Dispatcher \
-		p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Path-Dispatcher>=1.02:devel/p5-Path-Dispatcher \
+		p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Path-Dispatcher/Makefile b/devel/p5-Path-Dispatcher/Makefile
index b3142540ee75..9d0d65e34f78 100644
--- a/devel/p5-Path-Dispatcher/Makefile
+++ b/devel/p5-Path-Dispatcher/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl flexible and extensible dispatch
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0.12:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Try-Tiny>=0.02:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Any-Moose>=0.12:devel/p5-Any-Moose \
+		p5-Try-Tiny>=0.02:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-Extended/Makefile b/devel/p5-Path-Extended/Makefile
index 862be4730921..071f2396c295 100644
--- a/devel/p5-Path-Extended/Makefile
+++ b/devel/p5-Path-Extended/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-	p5-Log-Dump>0:${PORTSDIR}/devel/p5-Log-Dump \
-	p5-Sub-Install>0:${PORTSDIR}/devel/p5-Sub-Install
+	p5-File-Copy-Recursive>0:devel/p5-File-Copy-Recursive \
+	p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+	p5-Log-Dump>0:devel/p5-Log-Dump \
+	p5-Sub-Install>0:devel/p5-Sub-Install
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-	p5-ExtUtils-MakeMaker-CPANfile>0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+	p5-ExtUtils-MakeMaker-CPANfile>0:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-FindDev/Makefile b/devel/p5-Path-FindDev/Makefile
index 151e461cfda2..b70ba02f62b7 100644
--- a/devel/p5-Path-FindDev/Makefile
+++ b/devel/p5-Path-FindDev/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Find a development path in an upper hierarchy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Tiny>=0.010:${PORTSDIR}/devel/p5-Class-Tiny \
-		p5-Path-IsDev>=0.2.2:${PORTSDIR}/devel/p5-Path-IsDev \
-		p5-Path-Tiny>=0.054:${PORTSDIR}/devel/p5-Path-Tiny
+BUILD_DEPENDS=	p5-Class-Tiny>=0.010:devel/p5-Class-Tiny \
+		p5-Path-IsDev>=0.2.2:devel/p5-Path-IsDev \
+		p5-Path-Tiny>=0.054:devel/p5-Path-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CPAN-Meta>0:${PORTSDIR}/devel/p5-CPAN-Meta \
-		p5-CPAN-Meta-Requirements>2.120:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-		p5-Test-Simple>=1.001.003:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-CPAN-Meta>0:devel/p5-CPAN-Meta \
+		p5-CPAN-Meta-Requirements>2.120:devel/p5-CPAN-Meta-Requirements \
+		p5-Test-Simple>=1.001.003:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-IsDev/Makefile b/devel/p5-Path-IsDev/Makefile
index a0ec3a0eed14..87b27f408eef 100644
--- a/devel/p5-Path-IsDev/Makefile
+++ b/devel/p5-Path-IsDev/Makefile
@@ -15,12 +15,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Tiny>=0.010:${PORTSDIR}/devel/p5-Class-Tiny \
-	p5-File-HomeDir>0:${PORTSDIR}/devel/p5-File-HomeDir \
-	p5-Module-Runtime>0:${PORTSDIR}/devel/p5-Module-Runtime \
-	p5-Path-Tiny>=0.004:${PORTSDIR}/devel/p5-Path-Tiny \
-	p5-Role-Tiny>0:${PORTSDIR}/devel/p5-Role-Tiny \
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter
+	p5-Class-Tiny>=0.010:devel/p5-Class-Tiny \
+	p5-File-HomeDir>0:devel/p5-File-HomeDir \
+	p5-Module-Runtime>0:devel/p5-Module-Runtime \
+	p5-Path-Tiny>=0.004:devel/p5-Path-Tiny \
+	p5-Role-Tiny>0:devel/p5-Role-Tiny \
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Path-Iterator-Rule/Makefile b/devel/p5-Path-Iterator-Rule/Makefile
index 2b47dca9c3a9..fd8851db35b5 100644
--- a/devel/p5-Path-Iterator-Rule/Makefile
+++ b/devel/p5-Path-Iterator-Rule/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Perl extension for iterative, recursive file finder
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	p5-Data-Clone>0:${PORTSDIR}/devel/p5-Data-Clone \
-	p5-Number-Compare>=0.02:${PORTSDIR}/math/p5-Number-Compare \
-	p5-Text-Glob>0:${PORTSDIR}/textproc/p5-Text-Glob \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+	p5-Data-Clone>0:devel/p5-Data-Clone \
+	p5-Number-Compare>=0.02:math/p5-Number-Compare \
+	p5-Text-Glob>0:textproc/p5-Text-Glob \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-namespace-clean>0:devel/p5-namespace-clean
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-File-pushd>0:${PORTSDIR}/devel/p5-File-pushd \
-	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny \
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-Filename>0:${PORTSDIR}/devel/p5-Test-Filename
+	p5-File-pushd>0:devel/p5-File-pushd \
+	p5-Path-Tiny>0:devel/p5-Path-Tiny \
+	p5-Test-Deep>0:devel/p5-Test-Deep \
+	p5-Test-Filename>0:devel/p5-Test-Filename
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-Resource/Makefile b/devel/p5-Path-Resource/Makefile
index a52d078a936e..1e3e31a4eb4e 100644
--- a/devel/p5-Path-Resource/Makefile
+++ b/devel/p5-Path-Resource/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl module for combining local path manipulation and URI manipulation
 
-BUILD_DEPENDS=	p5-Path-Abstract>0:${PORTSDIR}/devel/p5-Path-Abstract \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-Path-Abstract>0:${PORTSDIR}/devel/p5-Path-Abstract \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-Lazy>=0:${PORTSDIR}/devel/p5-Test-Lazy
+BUILD_DEPENDS=	p5-Path-Abstract>0:devel/p5-Path-Abstract \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-URI>=0:net/p5-URI \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Path-Abstract>0:devel/p5-Path-Abstract \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-URI>=0:net/p5-URI \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most \
+		p5-Test-Lazy>=0:devel/p5-Test-Lazy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-Tiny/Makefile b/devel/p5-Path-Tiny/Makefile
index 8cf7217a03df..3c498f0dad6a 100644
--- a/devel/p5-Path-Tiny/Makefile
+++ b/devel/p5-Path-Tiny/Makefile
@@ -14,7 +14,7 @@ COMMENT=	File path utility
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Paws/Makefile b/devel/p5-Paws/Makefile
index 5d74253bc371..2e448af752fc 100644
--- a/devel/p5-Paws/Makefile
+++ b/devel/p5-Paws/Makefile
@@ -13,29 +13,29 @@ COMMENT=	Perl extension of SDK for AWS (Amazon Web Services) APIs
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	\
-	p5-ARGV-Struct>=0:${PORTSDIR}/devel/p5-ARGV-Struct \
-	p5-Browser-Open>0:${PORTSDIR}/www/p5-Browser-Open \
-	p5-Config-INI>0:${PORTSDIR}/devel/p5-Config-INI \
-	p5-Data-Compare>0:${PORTSDIR}/devel/p5-Data-Compare \
-	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-	p5-DateTime-Format-ISO8601>0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
-	p5-Hash-Flatten>0:${PORTSDIR}/devel/p5-Hash-Flatten \
-	p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-	p5-Module-Find>0:${PORTSDIR}/devel/p5-Module-Find \
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-ClassAttribute>0:${PORTSDIR}/devel/p5-MooseX-ClassAttribute \
-	p5-MooseX-Getopt>0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-	p5-Net-Amazon-Signature-V3>=0:${PORTSDIR}/net/p5-Net-Amazon-Signature-V3 \
-	p5-Net-Amazon-Signature-V4>=0:${PORTSDIR}/net/p5-Net-Amazon-Signature-V4 \
-	p5-String-Util>=0:${PORTSDIR}/textproc/p5-String-Util \
-	p5-Throwable>=0:${PORTSDIR}/devel/p5-Throwable \
-	p5-URI>0:${PORTSDIR}/net/p5-URI \
-	p5-URI-Template>0:${PORTSDIR}/net/p5-URI-Template \
-	p5-URL-Encode>0:${PORTSDIR}/www/p5-URL-Encode \
-	p5-URL-Encode-XS>0:${PORTSDIR}/www/p5-URL-Encode-XS \
-	p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+	p5-ARGV-Struct>=0:devel/p5-ARGV-Struct \
+	p5-Browser-Open>0:www/p5-Browser-Open \
+	p5-Config-INI>0:devel/p5-Config-INI \
+	p5-Data-Compare>0:devel/p5-Data-Compare \
+	p5-DateTime>0:devel/p5-DateTime \
+	p5-DateTime-Format-ISO8601>0:devel/p5-DateTime-Format-ISO8601 \
+	p5-Digest-HMAC>0:security/p5-Digest-HMAC \
+	p5-Hash-Flatten>0:devel/p5-Hash-Flatten \
+	p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
+	p5-JSON>0:converters/p5-JSON \
+	p5-Module-Find>0:devel/p5-Module-Find \
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-ClassAttribute>0:devel/p5-MooseX-ClassAttribute \
+	p5-MooseX-Getopt>0:devel/p5-MooseX-Getopt \
+	p5-Net-Amazon-Signature-V3>=0:net/p5-Net-Amazon-Signature-V3 \
+	p5-Net-Amazon-Signature-V4>=0:net/p5-Net-Amazon-Signature-V4 \
+	p5-String-Util>=0:textproc/p5-String-Util \
+	p5-Throwable>=0:devel/p5-Throwable \
+	p5-URI>0:net/p5-URI \
+	p5-URI-Template>0:net/p5-URI-Template \
+	p5-URL-Encode>0:www/p5-URL-Encode \
+	p5-URL-Encode-XS>0:www/p5-URL-Encode-XS \
+	p5-XML-Simple>0:textproc/p5-XML-Simple
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Pegex/Makefile b/devel/p5-Pegex/Makefile
index dfc802e6a772..b1739d59863f 100644
--- a/devel/p5-Pegex/Makefile
+++ b/devel/p5-Pegex/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Acmeist PEG Parser Framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
+BUILD_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.06:${PORTSDIR}/devel/p5-File-ShareDir-Install
+BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Penguin/Makefile b/devel/p5-Penguin/Makefile
index 8fb6e9c2778d..8e352fe92e8b 100644
--- a/devel/p5-Penguin/Makefile
+++ b/devel/p5-Penguin/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Framework for passing digitally signed perl5 code between machines
 
-RUN_DEPENDS=	pgp:${PORTSDIR}/security/pgp
+RUN_DEPENDS=	pgp:security/pgp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Perl-Critic-Deprecated/Makefile b/devel/p5-Perl-Critic-Deprecated/Makefile
index c85c9efd0f21..75dc40cf65d9 100644
--- a/devel/p5-Perl-Critic-Deprecated/Makefile
+++ b/devel/p5-Perl-Critic-Deprecated/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Policies that are no longer included with Perl::Critic
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Perl-Critic
+BUILD_DEPENDS=	p5-Perl-Critic>=0:textproc/p5-Perl-Critic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl-Metrics-Lite/Makefile b/devel/p5-Perl-Metrics-Lite/Makefile
index d8fd74c1f3df..b16026a42670 100644
--- a/devel/p5-Perl-Metrics-Lite/Makefile
+++ b/devel/p5-Perl-Metrics-Lite/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for pluggable Perl Code Metrics System
 
 RUN_DEPENDS=	\
-	p5-PPI>=1.205:${PORTSDIR}/textproc/p5-PPI \
-	p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-	p5-Text-ASCIITable>0:${PORTSDIR}/textproc/p5-Text-ASCIITable
+	p5-PPI>=1.205:textproc/p5-PPI \
+	p5-Readonly>=1.03:devel/p5-Readonly \
+	p5-Text-ASCIITable>0:textproc/p5-Text-ASCIITable
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl-Metrics-Simple/Makefile b/devel/p5-Perl-Metrics-Simple/Makefile
index 633f26c2e5f8..4b8c0cbceb11 100644
--- a/devel/p5-Perl-Metrics-Simple/Makefile
+++ b/devel/p5-Perl-Metrics-Simple/Makefile
@@ -13,13 +13,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-PPI>=1.113:${PORTSDIR}/textproc/p5-PPI \
-	p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-	p5-Statistics-Basic>0:${PORTSDIR}/math/p5-Statistics-Basic
+	p5-PPI>=1.113:textproc/p5-PPI \
+	p5-Readonly>=1.03:devel/p5-Readonly \
+	p5-Statistics-Basic>0:math/p5-Statistics-Basic
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Pod>0:${PORTSDIR}/devel/p5-Test-Pod \
-	p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+	p5-Test-Pod>0:devel/p5-Test-Pod \
+	p5-Test-Pod-Coverage>0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Perl-PrereqScanner-Lite/Makefile b/devel/p5-Perl-PrereqScanner-Lite/Makefile
index f0cf2c6b2aa8..1aee5718e75c 100644
--- a/devel/p5-Perl-PrereqScanner-Lite/Makefile
+++ b/devel/p5-Perl-PrereqScanner-Lite/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Compiler-Lexer>=0.22:${PORTSDIR}/devel/p5-Compiler-Lexer \
-	p5-Module-Path>0:${PORTSDIR}/devel/p5-Module-Path
+	p5-Compiler-Lexer>=0.22:devel/p5-Compiler-Lexer \
+	p5-Module-Path>0:devel/p5-Module-Path
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl-PrereqScanner/Makefile b/devel/p5-Perl-PrereqScanner/Makefile
index 8317a714dfbb..6d5d70690005 100644
--- a/devel/p5-Perl-PrereqScanner/Makefile
+++ b/devel/p5-Perl-PrereqScanner/Makefile
@@ -14,16 +14,16 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Path>=0:${PORTSDIR}/devel/p5-Module-Path \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-PPI>=1.215:${PORTSDIR}/textproc/p5-PPI \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-String-RewritePrefix>=0.005:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0:devel/p5-Getopt-Long-Descriptive \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Path>=0:devel/p5-Module-Path \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-PPI>=1.215:textproc/p5-PPI \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-String-RewritePrefix>=0.005:textproc/p5-String-RewritePrefix \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Perl-Version/Makefile b/devel/p5-Perl-Version/Makefile
index b3026f2dc67a..de85fb2daee9 100644
--- a/devel/p5-Perl-Version/Makefile
+++ b/devel/p5-Perl-Version/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Parse and manipulate Perl version strings
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny
+RUN_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl6-Builtins/Makefile b/devel/p5-Perl6-Builtins/Makefile
index 717aced79bf0..6ce396b03c73 100644
--- a/devel/p5-Perl6-Builtins/Makefile
+++ b/devel/p5-Perl6-Builtins/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provide Perl 5 versions of the new Perl 6 builtins
 
-BUILD_DEPENDS=	p5-Contextual-Return>=0:${PORTSDIR}/devel/p5-Contextual-Return
+BUILD_DEPENDS=	p5-Contextual-Return>=0:devel/p5-Contextual-Return
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl6-Export-Attrs/Makefile b/devel/p5-Perl6-Export-Attrs/Makefile
index 5f3d4e9509e7..6beb67ce6cf6 100644
--- a/devel/p5-Perl6-Export-Attrs/Makefile
+++ b/devel/p5-Perl6-Export-Attrs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl 6 'is export(...)' trait as a Perl 5 attribute
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Perl6-Form/Makefile b/devel/p5-Perl6-Form/Makefile
index 5423b339417b..98a3a398db17 100644
--- a/devel/p5-Perl6-Form/Makefile
+++ b/devel/p5-Perl6-Form/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Implements the Perl 6 'form' built-in
 
-BUILD_DEPENDS=	p5-Perl6-Export>=0:${PORTSDIR}/devel/p5-Perl6-Export
+BUILD_DEPENDS=	p5-Perl6-Export>=0:devel/p5-Perl6-Export
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl6-Rules/Makefile b/devel/p5-Perl6-Rules/Makefile
index 293ecc1e27de..0900988444fb 100644
--- a/devel/p5-Perl6-Rules/Makefile
+++ b/devel/p5-Perl6-Rules/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implements (most of) the Perl 6 regex syntax
 
-BUILD_DEPENDS=	p5-Attribute-Handlers>=0:${PORTSDIR}/devel/p5-Attribute-Handlers \
-		p5-Filter-Simple>=0:${PORTSDIR}/textproc/p5-Filter-Simple
+BUILD_DEPENDS=	p5-Attribute-Handlers>=0:devel/p5-Attribute-Handlers \
+		p5-Filter-Simple>=0:textproc/p5-Filter-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl6-Slurp/Makefile b/devel/p5-Perl6-Slurp/Makefile
index e39fb610dbcc..af7d3ac125c7 100644
--- a/devel/p5-Perl6-Slurp/Makefile
+++ b/devel/p5-Perl6-Slurp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Implements the Perl6 'slurp' built-in
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Perl6-Export>=0.07:${PORTSDIR}/devel/p5-Perl6-Export
+BUILD_DEPENDS=	p5-Perl6-Export>=0.07:devel/p5-Perl6-Export
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-PerlIO-utf8_strict/Makefile b/devel/p5-PerlIO-utf8_strict/Makefile
index 930dc602c809..165a724e2a65 100644
--- a/devel/p5-PerlIO-utf8_strict/Makefile
+++ b/devel/p5-PerlIO-utf8_strict/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Fast and correct UTF-8 IO
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-PerlIO-via-symlink/Makefile b/devel/p5-PerlIO-via-symlink/Makefile
index d8746c01df46..a9451e8e27db 100644
--- a/devel/p5-PerlIO-via-symlink/Makefile
+++ b/devel/p5-PerlIO-via-symlink/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Symbolic link PerlIO layers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-Module-Install>0:devel/p5-Module-Install
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-PerlX-Maybe/Makefile b/devel/p5-PerlX-Maybe/Makefile
index b8a7d15261ed..6b3c8423d9ca 100644
--- a/devel/p5-PerlX-Maybe/Makefile
+++ b/devel/p5-PerlX-Maybe/Makefile
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-XS_BUILD_DEPENDS=	p5-PerlX-Maybe-XS>=0:${PORTSDIR}/devel/p5-PerlX-Maybe-XS
-XS_RUN_DEPENDS=		p5-PerlX-Maybe-XS>=0:${PORTSDIR}/devel/p5-PerlX-Maybe-XS
+XS_BUILD_DEPENDS=	p5-PerlX-Maybe-XS>=0:devel/p5-PerlX-Maybe-XS
+XS_RUN_DEPENDS=		p5-PerlX-Maybe-XS>=0:devel/p5-PerlX-Maybe-XS
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Pipeline/Makefile b/devel/p5-Pipeline/Makefile
index 763b39cded8f..4113a60b4fa1 100644
--- a/devel/p5-Pipeline/Makefile
+++ b/devel/p5-Pipeline/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rouslan@rshell.net
 COMMENT=	Pipeline - Generic pipeline interface
 
-BUILD_DEPENDS=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-IO-Null>=0:${PORTSDIR}/devel/p5-IO-Null \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Data-Structure-Util>=0:${PORTSDIR}/devel/p5-Data-Structure-Util
+BUILD_DEPENDS=	p5-Class-ISA>=0:devel/p5-Class-ISA \
+		p5-Error>=0:lang/p5-Error \
+		p5-IO-Null>=0:devel/p5-IO-Null \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Data-UUID>=0:devel/p5-Data-UUID \
+		p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Pithub/Makefile b/devel/p5-Pithub/Makefile
index 2590566c9cae..396807dc1f5c 100644
--- a/devel/p5-Pithub/Makefile
+++ b/devel/p5-Pithub/Makefile
@@ -15,17 +15,17 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Array-Iterator>=0:${PORTSDIR}/devel/p5-Array-Iterator \
-		p5-Cache-LRU>=0.04:${PORTSDIR}/devel/p5-Cache-LRU \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON-MaybeXS>=1.003003:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Moo>=1.001000:${PORTSDIR}/devel/p5-Moo \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Array-Iterator>=0:devel/p5-Array-Iterator \
+		p5-Cache-LRU>=0.04:devel/p5-Cache-LRU \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON-MaybeXS>=1.003003:converters/p5-JSON-MaybeXS \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Moo>=1.001000:devel/p5-Moo \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Import-Into>=1.002004:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Path-Tiny>=0.037:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Import-Into>=1.002004:devel/p5-Import-Into \
+		p5-Path-Tiny>=0.037:devel/p5-Path-Tiny \
+		p5-Test-Most>=0:devel/p5-Test-Most
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Pod-Coverage-Moose/Makefile b/devel/p5-Pod-Coverage-Moose/Makefile
index baab9379c2fe..9eebbcb3dfcd 100644
--- a/devel/p5-Pod-Coverage-Moose/Makefile
+++ b/devel/p5-Pod-Coverage-Moose/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Pod::Coverage extension for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=2.1300:${PORTSDIR}/devel/p5-Moose \
-		p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-namespace-autoclean>=0.08:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=2.1300:devel/p5-Moose \
+		p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-namespace-autoclean>=0.08:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-MooseX-Role-WithOverloading>=0:${PORTSDIR}/devel/p5-MooseX-Role-WithOverloading \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-MooseX-AttributeHelpers>=0:devel/p5-MooseX-AttributeHelpers \
+		p5-MooseX-Role-WithOverloading>=0:devel/p5-MooseX-Role-WithOverloading \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Pod-Coverage-TrustPod/Makefile b/devel/p5-Pod-Coverage-TrustPod/Makefile
index 9ac383f4ba31..12af6fc5e033 100644
--- a/devel/p5-Pod-Coverage-TrustPod/Makefile
+++ b/devel/p5-Pod-Coverage-TrustPod/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Declare trusted symbol names in POD
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Pod-Eventual>=0:${PORTSDIR}/textproc/p5-Pod-Eventual
-TEST_DEPENDS=	p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod
+BUILD_DEPENDS=	p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-Pod-Eventual>=0:textproc/p5-Pod-Eventual
+TEST_DEPENDS=	p5-Test-Pod>=1.41:devel/p5-Test-Pod
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Pod-Coverage/Makefile b/devel/p5-Pod-Coverage/Makefile
index bc9266d68e9a..52c9df63ecff 100644
--- a/devel/p5-Pod-Coverage/Makefile
+++ b/devel/p5-Pod-Coverage/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Checks if the documentation of a module is comprehensive
 
-BUILD_DEPENDS=	p5-Devel-Symdump>=2.01:${PORTSDIR}/devel/p5-Devel-Symdump
-RUN_DEPENDS=	p5-Devel-Symdump>=2.01:${PORTSDIR}/devel/p5-Devel-Symdump
+BUILD_DEPENDS=	p5-Devel-Symdump>=2.01:devel/p5-Devel-Symdump
+RUN_DEPENDS=	p5-Devel-Symdump>=2.01:devel/p5-Devel-Symdump
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Pod-Usage/Makefile b/devel/p5-Pod-Usage/Makefile
index 0e8e9e7dd334..49c2e22b7931 100644
--- a/devel/p5-Pod-Usage/Makefile
+++ b/devel/p5-Pod-Usage/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Print a usage message from embedded pod documentation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-podlators>=4:${PORTSDIR}/textproc/p5-podlators
+BUILD_DEPENDS=	p5-podlators>=4:textproc/p5-podlators
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index c5cfba21beae..0d8935f6aeb4 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module that provides a method to daemonify a Perl script
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Proc-ProcessTable>0:${PORTSDIR}/devel/p5-Proc-ProcessTable
+TEST_DEPENDS=	p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Proc-Fork/Makefile b/devel/p5-Proc-Fork/Makefile
index 80198a2fe1c9..162ac7e8145e 100644
--- a/devel/p5-Proc-Fork/Makefile
+++ b/devel/p5-Proc-Fork/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Proc::Fork - Simple, intuitive interface to the fork() system call
 
-BUILD_DEPENDS=	p5-Exporter-Tidy>=0:${PORTSDIR}/devel/p5-Exporter-Tidy \
-		p5-Object-Tiny-Lvalue>=0:${PORTSDIR}/devel/p5-Object-Tiny-Lvalue
-RUN_DEPENDS=	p5-Exporter-Tidy>=0:${PORTSDIR}/devel/p5-Exporter-Tidy \
-		p5-Object-Tiny-Lvalue>=0:${PORTSDIR}/devel/p5-Object-Tiny-Lvalue
+BUILD_DEPENDS=	p5-Exporter-Tidy>=0:devel/p5-Exporter-Tidy \
+		p5-Object-Tiny-Lvalue>=0:devel/p5-Object-Tiny-Lvalue
+RUN_DEPENDS=	p5-Exporter-Tidy>=0:devel/p5-Exporter-Tidy \
+		p5-Object-Tiny-Lvalue>=0:devel/p5-Object-Tiny-Lvalue
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Proc-Guard/Makefile b/devel/p5-Proc-Guard/Makefile
index 1e5ec7d9535e..7829139ae417 100644
--- a/devel/p5-Proc-Guard/Makefile
+++ b/devel/p5-Proc-Guard/Makefile
@@ -13,9 +13,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Proc-Pidfile/Makefile b/devel/p5-Proc-Pidfile/Makefile
index c1ec9d589c6b..5a91735c9670 100644
--- a/devel/p5-Proc-Pidfile/Makefile
+++ b/devel/p5-Proc-Pidfile/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Proc-ProcessTable>0:${PORTSDIR}/devel/p5-Proc-ProcessTable
+	p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Proc-WaitStat/Makefile b/devel/p5-Proc-WaitStat/Makefile
index ab68e90fb0f4..643029f73789 100644
--- a/devel/p5-Proc-WaitStat/Makefile
+++ b/devel/p5-Proc-WaitStat/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Interpret and act on wait() status values
 
-BUILD_DEPENDS=	p5-IPC-Signal>=0:${PORTSDIR}/devel/p5-IPC-Signal
+BUILD_DEPENDS=	p5-IPC-Signal>=0:devel/p5-IPC-Signal
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile
index 873265f6d7ef..0d45ad9dce30 100644
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create Gantt charts to manage project scheduling
 
-BUILD_DEPENDS=	p5-Class-Date>=0:${PORTSDIR}/devel/p5-Class-Date \
-		convert:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS=	p5-Class-Date>=0:devel/p5-Class-Date \
+		convert:graphics/ImageMagick
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Project-Libs/Makefile b/devel/p5-Project-Libs/Makefile
index c485024e8748..0f01f64784c6 100644
--- a/devel/p5-Project-Libs/Makefile
+++ b/devel/p5-Project-Libs/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to add module directories of a project into @INC
 
 RUN_DEPENDS=	\
-	p5-FindBin-libs>0:${PORTSDIR}/devel/p5-FindBin-libs
+	p5-FindBin-libs>0:devel/p5-FindBin-libs
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Qudo/Makefile b/devel/p5-Qudo/Makefile
index 27f5c45196b9..81aa5575e424 100644
--- a/devel/p5-Qudo/Makefile
+++ b/devel/p5-Qudo/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for simple and extensible job queue manager
 
 RUN_DEPENDS=	\
-	p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-DBIx-Skinny>0:${PORTSDIR}/databases/p5-DBIx-Skinny \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+	p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+	p5-DBI>0:databases/p5-DBI \
+	p5-DBIx-Skinny>0:databases/p5-DBIx-Skinny \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+	p5-YAML>0:textproc/p5-YAML
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-RPSL-Parser/Makefile b/devel/p5-RPSL-Parser/Makefile
index 2af780048463..33361a565e96 100644
--- a/devel/p5-RPSL-Parser/Makefile
+++ b/devel/p5-RPSL-Parser/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Router Policy Specification Language (RFC2622) Parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.31:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0.31:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.039001,0.039_001,0.19,0.28,0.29,0.32,0.38,0.39
diff --git a/devel/p5-RRDTool-OO/Makefile b/devel/p5-RRDTool-OO/Makefile
index 40576d58accb..3bcaa59d79f6 100644
--- a/devel/p5-RRDTool-OO/Makefile
+++ b/devel/p5-RRDTool-OO/Makefile
@@ -13,8 +13,8 @@ COMMENT=	RRDTool::OO - Object-oriented interface to RRDTool
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
-		p5-Log-Log4perl>=0.40:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	rrdtool>=0:databases/rrdtool \
+		p5-Log-Log4perl>=0.40:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Rcs-Agent/Makefile b/devel/p5-Rcs-Agent/Makefile
index 97d356a063c7..accc6967443b 100644
--- a/devel/p5-Rcs-Agent/Makefile
+++ b/devel/p5-Rcs-Agent/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	nick@foobar.org
 COMMENT=	Perl module for RCS archive manipulation
 
-BUILD_DEPENDS=	p5-String-ShellQuote>1.00:${PORTSDIR}/textproc/p5-String-ShellQuote
+BUILD_DEPENDS=	p5-String-ShellQuote>1.00:textproc/p5-String-ShellQuote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Readonly-XS/Makefile b/devel/p5-Readonly-XS/Makefile
index 9611e9b3dfa5..1a0a6eff5ba2 100644
--- a/devel/p5-Readonly-XS/Makefile
+++ b/devel/p5-Readonly-XS/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Companion module for Readonly.pm, to speed up read-only scalar variable
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Readonly>=1.02:${PORTSDIR}/devel/p5-Readonly
+BUILD_DEPENDS=	p5-Readonly>=1.02:devel/p5-Readonly
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Reflex/Makefile b/devel/p5-Reflex/Makefile
index dfea8b1fa9a5..91298309c1db 100644
--- a/devel/p5-Reflex/Makefile
+++ b/devel/p5-Reflex/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Class library for flexible, reactive programs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1.294:${PORTSDIR}/devel/p5-POE \
-		p5-Moose>=2.0203:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0.23:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized
+BUILD_DEPENDS=	p5-POE>=1.294:devel/p5-POE \
+		p5-Moose>=2.0203:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0.23:devel/p5-MooseX-Role-Parameterized
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-Regexp-Assemble-Compressed/Makefile b/devel/p5-Regexp-Assemble-Compressed/Makefile
index 10c678926d2a..eb04e6be229b 100644
--- a/devel/p5-Regexp-Assemble-Compressed/Makefile
+++ b/devel/p5-Regexp-Assemble-Compressed/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to compress Regular Expression
 
 RUN_DEPENDS=	\
-	p5-Regexp-Assemble>0:${PORTSDIR}/devel/p5-Regexp-Assemble
+	p5-Regexp-Assemble>0:devel/p5-Regexp-Assemble
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Regexp-Lexer/Makefile b/devel/p5-Regexp-Lexer/Makefile
index 411cb835d4c8..91cfe89a9993 100644
--- a/devel/p5-Regexp-Lexer/Makefile
+++ b/devel/p5-Regexp-Lexer/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lexer for Perl regular expressions
 
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Regexp-RegGrp/Makefile b/devel/p5-Regexp-RegGrp/Makefile
index fb72de185e0b..2905e3b01fde 100644
--- a/devel/p5-Regexp-RegGrp/Makefile
+++ b/devel/p5-Regexp-RegGrp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Groups a regular expressions collection
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Reply/Makefile b/devel/p5-Reply/Makefile
index 1a0fcc37972d..548ad268836f 100644
--- a/devel/p5-Reply/Makefile
+++ b/devel/p5-Reply/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Lightweight, extensible REPL for Perl
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Config-INI-Reader-Ordered>=0:${PORTSDIR}/devel/p5-Config-INI-Reader-Ordered \
-		p5-Devel-LexAlias>=0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Eval-Closure>=0.11:${PORTSDIR}/devel/p5-Eval-Closure \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Package-Stash>=0:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Config-INI-Reader-Ordered>=0:devel/p5-Config-INI-Reader-Ordered \
+		p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
+		p5-Eval-Closure>=0.11:devel/p5-Eval-Closure \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Package-Stash>=0:devel/p5-Package-Stash \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Return-MultiLevel/Makefile b/devel/p5-Return-MultiLevel/Makefile
index 5184b052076b..e6ec2727fbb9 100644
--- a/devel/p5-Return-MultiLevel/Makefile
+++ b/devel/p5-Return-MultiLevel/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Return across multiple call levels
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Munge>=0.07:${PORTSDIR}/devel/p5-Data-Munge
+BUILD_DEPENDS=	p5-Data-Munge>=0.07:devel/p5-Data-Munge
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Rinci/Makefile b/devel/p5-Rinci/Makefile
index eb718671fad1..227fa5ca4118 100644
--- a/devel/p5-Rinci/Makefile
+++ b/devel/p5-Rinci/Makefile
@@ -15,8 +15,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-DefHash>=1.0.6:${PORTSDIR}/devel/p5-DefHash \
-		p5-Sah>=0.9.36:${PORTSDIR}/devel/p5-Sah
+TEST_DEPENDS=	p5-DefHash>=1.0.6:devel/p5-DefHash \
+		p5-Sah>=0.9.36:devel/p5-Sah
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Role-HasMessage/Makefile b/devel/p5-Role-HasMessage/Makefile
index c36a631a302d..947127b333c2 100644
--- a/devel/p5-Role-HasMessage/Makefile
+++ b/devel/p5-Role-HasMessage/Makefile
@@ -15,11 +15,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-String-Errf>=0:${PORTSDIR}/devel/p5-String-Errf \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-String-Errf>=0:devel/p5-String-Errf \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Role-Identifiable/Makefile b/devel/p5-Role-Identifiable/Makefile
index d9e764f2c82a..9a38b817c5e7 100644
--- a/devel/p5-Role-Identifiable/Makefile
+++ b/devel/p5-Role-Identifiable/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Role-Tiny/Makefile b/devel/p5-Role-Tiny/Makefile
index 4f93505e8140..fca00f4e8b59 100644
--- a/devel/p5-Role-Tiny/Makefile
+++ b/devel/p5-Role-Tiny/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Roles, like a nouvelle cusine portion size slice of Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=1.05:${PORTSDIR}/devel/p5-Class-Method-Modifiers
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=1.05:devel/p5-Class-Method-Modifiers
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-strictures>=0:${PORTSDIR}/devel/p5-strictures
+TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-strictures>=0:devel/p5-strictures
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Rose-DateTime/Makefile b/devel/p5-Rose-DateTime/Makefile
index 2df41ce4d9ea..4743c72b266c 100644
--- a/devel/p5-Rose-DateTime/Makefile
+++ b/devel/p5-Rose-DateTime/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DateTime helper functions and objects
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Rose-Object>=0.82:${PORTSDIR}/devel/p5-Rose-Object
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-Rose-Object>=0.82:devel/p5-Rose-Object
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Rose-Object/Makefile b/devel/p5-Rose-Object/Makefile
index 98cbac5377a8..e78329657cdc 100644
--- a/devel/p5-Rose-Object/Makefile
+++ b/devel/p5-Rose-Object/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple object base class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor
+TEST_DEPENDS=	p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Router-R3/Makefile b/devel/p5-Router-R3/Makefile
index 8a77e640b6c2..d7d5cdbde5e2 100644
--- a/devel/p5-Router-R3/Makefile
+++ b/devel/p5-Router-R3/Makefile
@@ -13,9 +13,9 @@ COMMENT=	XS wrapper around a C library R3
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
-LIB_DEPENDS=	libr3.so:${PORTSDIR}/devel/libr3
+BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=0:devel/p5-ExtUtils-MakeMaker \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig
+LIB_DEPENDS=	libr3.so:devel/libr3
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-RunApp/Makefile b/devel/p5-RunApp/Makefile
index fa535eb20ba9..3c77aa50d051 100644
--- a/devel/p5-RunApp/Makefile
+++ b/devel/p5-RunApp/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Generic module to run web-applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Control>=0:${PORTSDIR}/devel/p5-App-Control \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-App-Control>=0:devel/p5-App-Control \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index 05e7db9f21c7..aa304cba2c0b 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl Bindings for SDL
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Alien-SDL>=1.426:${PORTSDIR}/devel/p5-Alien-SDL
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
-RUN_DEPENDS=	p5-Alien-SDL>=1.426:${PORTSDIR}/devel/p5-Alien-SDL \
-		p5-Tie-Simple>=0:${PORTSDIR}/devel/p5-Tie-Simple
+BUILD_DEPENDS=	p5-Alien-SDL>=1.426:devel/p5-Alien-SDL
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libsmpeg.so:multimedia/smpeg
+RUN_DEPENDS=	p5-Alien-SDL>=1.426:devel/p5-Alien-SDL \
+		p5-Tie-Simple>=0:devel/p5-Tie-Simple
 
 USES=		jpeg perl5
 USE_GL=		glu
diff --git a/devel/p5-SOAP-WSDL/Makefile b/devel/p5-SOAP-WSDL/Makefile
index b47f18bf30c4..64fe9a10f756 100644
--- a/devel/p5-SOAP-WSDL/Makefile
+++ b/devel/p5-SOAP-WSDL/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl module for SOAP with WSDL support
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.20:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Class-Std-Fast>=0.0.5:${PORTSDIR}/devel/p5-Class-Std-Fast \
-		p5-Template-Toolkit>=2.18:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Load>=0.20:devel/p5-Class-Load \
+		p5-Class-Std-Fast>=0.0.5:devel/p5-Class-Std-Fast \
+		p5-Template-Toolkit>=2.18:www/p5-Template-Toolkit \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SUPER/Makefile b/devel/p5-SUPER/Makefile
index 725adb831e33..b15289690e9d 100644
--- a/devel/p5-SUPER/Makefile
+++ b/devel/p5-SUPER/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Perl module control superclass method dispatch
 
-BUILD_DEPENDS=	p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify
+BUILD_DEPENDS=	p5-Sub-Identify>=0.04:devel/p5-Sub-Identify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-ACL/Makefile b/devel/p5-SVN-ACL/Makefile
index 9f2fd6a5690f..18a7a7039539 100644
--- a/devel/p5-SVN-ACL/Makefile
+++ b/devel/p5-SVN-ACL/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple ACL frontend for subversion
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tar:tgz
diff --git a/devel/p5-SVN-Access/Makefile b/devel/p5-SVN-Access/Makefile
index ec767ec7228f..898094c06b46 100644
--- a/devel/p5-SVN-Access/Makefile
+++ b/devel/p5-SVN-Access/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl extension to manipulate SVN Access files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tie-IxHash>=1.21:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+BUILD_DEPENDS=	p5-Tie-IxHash>=1.21:devel/p5-Tie-IxHash \
+		p5-subversion>=0:devel/p5-subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Agent/Makefile b/devel/p5-SVN-Agent/Makefile
index 478af9cce0e2..88b56f042c16 100644
--- a/devel/p5-SVN-Agent/Makefile
+++ b/devel/p5-SVN-Agent/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Simple svn manipulation
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-File-Slurp>=0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Dumpfile/Makefile b/devel/p5-SVN-Dumpfile/Makefile
index b3dccb31fade..ef1dc772ee5f 100644
--- a/devel/p5-SVN-Dumpfile/Makefile
+++ b/devel/p5-SVN-Dumpfile/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to access and manipulate Subversion dumpfiles
 
-BUILD_DEPENDS=	p5-Data-GUID>=0:${PORTSDIR}/devel/p5-Data-GUID \
-		p5-TimeDate>=2.27:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly
+BUILD_DEPENDS=	p5-Data-GUID>=0:devel/p5-Data-GUID \
+		p5-TimeDate>=2.27:devel/p5-TimeDate \
+		p5-Readonly>=1.03:devel/p5-Readonly
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Hook/Makefile b/devel/p5-SVN-Hook/Makefile
index d839074f5aa3..2fb50c677c4f 100644
--- a/devel/p5-SVN-Hook/Makefile
+++ b/devel/p5-SVN-Hook/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl module for managing Subversion hook scripts
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Hooks/Makefile b/devel/p5-SVN-Hooks/Makefile
index c4aa5cb847c1..00e2e608d5fd 100644
--- a/devel/p5-SVN-Hooks/Makefile
+++ b/devel/p5-SVN-Hooks/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Framework for implementing Subversion hooks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Util>=0:${PORTSDIR}/devel/p5-Data-Util \
-		p5-SVN-Look>=0:${PORTSDIR}/devel/p5-SVN-Look \
-		p5-SVN-Notify>=0:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-JIRA-Client>=0:${PORTSDIR}/devel/p5-JIRA-Client \
-		p5-XMLRPC-Lite>0:${PORTSDIR}/net/p5-XMLRPC-Lite \
-		subversion>=1.4.0:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS=	p5-Data-Util>=0:devel/p5-Data-Util \
+		p5-SVN-Look>=0:devel/p5-SVN-Look \
+		p5-SVN-Notify>=0:devel/p5-SVN-Notify \
+		p5-JIRA-Client>=0:devel/p5-JIRA-Client \
+		p5-XMLRPC-Lite>0:net/p5-XMLRPC-Lite \
+		subversion>=1.4.0:devel/subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+TEST_DEPENDS=	p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-SVN-Log/Makefile b/devel/p5-SVN-Log/Makefile
index 7c3ad6e418e0..76c36beb1f25 100644
--- a/devel/p5-SVN-Log/Makefile
+++ b/devel/p5-SVN-Log/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	SVN::Log - Extract change logs from a Subversion server
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Look/Makefile b/devel/p5-SVN-Look/Makefile
index 9a5ddd9649e1..9b79eefd4f8d 100644
--- a/devel/p5-SVN-Look/Makefile
+++ b/devel/p5-SVN-Look/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Caching wrapper around the svnlook command
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		subversion>=1.7.0:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		subversion>=1.7.0:devel/subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Mirror/Makefile b/devel/p5-SVN-Mirror/Makefile
index 9b2ef423579f..00743b8a6cb0 100644
--- a/devel/p5-SVN-Mirror/Makefile
+++ b/devel/p5-SVN-Mirror/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Mirror remote subversion repository to local
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-SVN-Simple>=0:${PORTSDIR}/devel/p5-SVN-Simple \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-VCP-autrijus>=0:${PORTSDIR}/devel/p5-VCP-autrijus \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Data-UUID>=0:devel/p5-Data-UUID \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-SVN-Simple>=0:devel/p5-SVN-Simple \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-URI>=0:net/p5-URI \
+		p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
+		p5-subversion>=0:devel/p5-subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Notify-Config/Makefile b/devel/p5-SVN-Notify-Config/Makefile
index 1bb6680fb9fd..7c9ac499ba9e 100644
--- a/devel/p5-SVN-Notify-Config/Makefile
+++ b/devel/p5-SVN-Notify-Config/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Perl module for config-driven Subversion notification
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/svnlook:${PORTSDIR}/devel/subversion \
-		p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-YAML>=0.62:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	${LOCALBASE}/bin/svnlook:devel/subversion \
+		p5-SVN-Notify>=2.70:devel/p5-SVN-Notify \
+		p5-YAML>=0.62:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0.1:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0.1:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile b/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile
index 435884046d18..e418970b647e 100644
--- a/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile
+++ b/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Determines Subversion accounts to receive email via the authz file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SVN-Access>=0:${PORTSDIR}/devel/p5-SVN-Access \
-		p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
-RUN_DEPENDS=	p5-SVN-Access>=0:${PORTSDIR}/devel/p5-SVN-Access \
-		p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
+BUILD_DEPENDS=	p5-SVN-Access>=0:devel/p5-SVN-Access \
+		p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
+RUN_DEPENDS=	p5-SVN-Access>=0:devel/p5-SVN-Access \
+		p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile b/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile
index d709996efae7..707054c60a6f 100644
--- a/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile
+++ b/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Converts account names to email address based on a flat-file database
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
-RUN_DEPENDS=	p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
+BUILD_DEPENDS=	p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
+RUN_DEPENDS=	p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-SVN-Notify-Filter-Markdown/Makefile b/devel/p5-SVN-Notify-Filter-Markdown/Makefile
index 6d2452b2f3ae..3952f45f4540 100644
--- a/devel/p5-SVN-Notify-Filter-Markdown/Makefile
+++ b/devel/p5-SVN-Notify-Filter-Markdown/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl module to convert SVN::Notify log messages from Markdown to HTML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-Text-Markdown>=1.04:${PORTSDIR}/textproc/p5-Text-Markdown
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-Text-Markdown>=1.04:${PORTSDIR}/textproc/p5-Text-Markdown
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-SVN-Notify>=2.70:devel/p5-SVN-Notify \
+		p5-Text-Markdown>=1.04:textproc/p5-Text-Markdown
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-SVN-Notify>=2.70:devel/p5-SVN-Notify \
+		p5-Text-Markdown>=1.04:textproc/p5-Text-Markdown
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-SVN-Notify-Filter-Watchers/Makefile b/devel/p5-SVN-Notify-Filter-Watchers/Makefile
index a94a8b5ca764..27392283e95a 100644
--- a/devel/p5-SVN-Notify-Filter-Watchers/Makefile
+++ b/devel/p5-SVN-Notify-Filter-Watchers/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Subscribe to SVN::Notify commits with a Subversion property
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
-RUN_DEPENDS=	p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
+BUILD_DEPENDS=	p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
+RUN_DEPENDS=	p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-SVN-Notify-Mirror/Makefile b/devel/p5-SVN-Notify-Mirror/Makefile
index 0fd222a3e960..f21d96bc12a9 100644
--- a/devel/p5-SVN-Notify-Mirror/Makefile
+++ b/devel/p5-SVN-Notify-Mirror/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Keep a mirrored working copy of a repository path
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SVN-Notify>=2.83:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-YAML>=0.81:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-SVN-Notify>=2.83:devel/p5-SVN-Notify \
+		p5-YAML>=0.81:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -28,11 +28,11 @@ CONFIG_DESC=	Enable YAML syntax for post-commit hook
 SSH_DESC=	Enable SSH for remote working copy update
 RSYNC_DESC=	Enable rsync for remote working copy update
 
-CONFIG_BUILD_DEPENDS=	p5-SVN-Notify-Config>=0.0906:${PORTSDIR}/devel/p5-SVN-Notify-Config
-CONFIG_RUN_DEPENDS=	p5-SVN-Notify-Config>=0.0906:${PORTSDIR}/devel/p5-SVN-Notify-Config
-RSYNC_BUILD_DEPENDS=	p5-File-Rsync>=0.42:${PORTSDIR}/net/p5-File-Rsync
-RSYNC_RUN_DEPENDS=	p5-File-Rsync>=0.42:${PORTSDIR}/net/p5-File-Rsync
-SSH_BUILD_DEPENDS=	p5-Net-SSH>=0.08:${PORTSDIR}/net/p5-Net-SSH
-SSH_RUN_DEPENDS=	p5-Net-SSH>=0.08:${PORTSDIR}/net/p5-Net-SSH
+CONFIG_BUILD_DEPENDS=	p5-SVN-Notify-Config>=0.0906:devel/p5-SVN-Notify-Config
+CONFIG_RUN_DEPENDS=	p5-SVN-Notify-Config>=0.0906:devel/p5-SVN-Notify-Config
+RSYNC_BUILD_DEPENDS=	p5-File-Rsync>=0.42:net/p5-File-Rsync
+RSYNC_RUN_DEPENDS=	p5-File-Rsync>=0.42:net/p5-File-Rsync
+SSH_BUILD_DEPENDS=	p5-Net-SSH>=0.08:net/p5-Net-SSH
+SSH_RUN_DEPENDS=	p5-Net-SSH>=0.08:net/p5-Net-SSH
 
 .include <bsd.port.mk>
diff --git a/devel/p5-SVN-Notify-Snapshot/Makefile b/devel/p5-SVN-Notify-Snapshot/Makefile
index 865d6b76c180..e1843d5e52aa 100644
--- a/devel/p5-SVN-Notify-Snapshot/Makefile
+++ b/devel/p5-SVN-Notify-Snapshot/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Take snapshots from Subversion activity
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/svnnotify:${PORTSDIR}/devel/p5-SVN-Notify
-RUN_DEPENDS=	${LOCALBASE}/bin/svnnotify:${PORTSDIR}/devel/p5-SVN-Notify
+BUILD_DEPENDS=	${LOCALBASE}/bin/svnnotify:devel/p5-SVN-Notify
+RUN_DEPENDS=	${LOCALBASE}/bin/svnnotify:devel/p5-SVN-Notify
 
 OPTIONS_DEFINE=	CONFIG
 CONFIG_DESC=	Enable YAML syntax for post-commit hook
@@ -23,7 +23,7 @@ CONFIG_DESC=	Enable YAML syntax for post-commit hook
 USES=		perl5
 USE_PERL5=	modbuild
 
-CONFIG_BUILD_DEPENDS=	p5-SVN-Notify-Config>=0:${PORTSDIR}/devel/p5-SVN-Notify-Config
-CONFIG_RUN_DEPENDS=	p5-SVN-Notify-Config>=0:${PORTSDIR}/devel/p5-SVN-Notify-Config
+CONFIG_BUILD_DEPENDS=	p5-SVN-Notify-Config>=0:devel/p5-SVN-Notify-Config
+CONFIG_RUN_DEPENDS=	p5-SVN-Notify-Config>=0:devel/p5-SVN-Notify-Config
 
 .include <bsd.port.mk>
diff --git a/devel/p5-SVN-S4/Makefile b/devel/p5-SVN-S4/Makefile
index 4a81a392db54..1654270c8295 100644
--- a/devel/p5-SVN-S4/Makefile
+++ b/devel/p5-SVN-S4/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Wrapper for subversion program
 LICENSE=	ART20 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
-RUN_DEPENDS=	p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-IO-AIO>=0:${PORTSDIR}/devel/p5-IO-AIO \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion
+RUN_DEPENDS=	p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-IO-AIO>=0:devel/p5-IO-AIO \
+		p5-subversion>=0:devel/p5-subversion
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-SVN-Simple/Makefile b/devel/p5-SVN-Simple/Makefile
index 21156575a68e..1020b260221f 100644
--- a/devel/p5-SVN-Simple/Makefile
+++ b/devel/p5-SVN-Simple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple interface to SVN::Delta::Editor
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Statistics/Makefile b/devel/p5-SVN-Statistics/Makefile
index 03b1be768fdb..a3710e494a3e 100644
--- a/devel/p5-SVN-Statistics/Makefile
+++ b/devel/p5-SVN-Statistics/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	SVN::Statistics - perl module to create subversion statistics
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-RRDTool-OO>=0:${PORTSDIR}/devel/p5-RRDTool-OO \
-		p5-Data-Dumper-Simple>=0:${PORTSDIR}/devel/p5-Data-Dumper-Simple \
-		p5-IO-Toolkit>=0:${PORTSDIR}/devel/p5-IO-Toolkit
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-RRDTool-OO>=0:devel/p5-RRDTool-OO \
+		p5-Data-Dumper-Simple>=0:devel/p5-Data-Dumper-Simple \
+		p5-IO-Toolkit>=0:devel/p5-IO-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Web/Makefile b/devel/p5-SVN-Web/Makefile
index 3f4e7782c77c..bff043d754eb 100644
--- a/devel/p5-SVN-Web/Makefile
+++ b/devel/p5-SVN-Web/Makefile
@@ -11,29 +11,29 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Subversion repository web frontend
 
-RUN_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Locale-Maketext-Simple>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS \
-		p5-XML-RSS-Parser>=0:${PORTSDIR}/textproc/p5-XML-RSS-Parser \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Exception-Class>=1.22:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Template-Plugin-Clickable-Email>=0:${PORTSDIR}/www/p5-Template-Plugin-Clickable-Email \
-		p5-Template-Plugin-Clickable>=0:${PORTSDIR}/www/p5-Template-Plugin-Clickable \
-		p5-Template-Plugin-Number-Format>=0:${PORTSDIR}/www/p5-Template-Plugin-Number-Format \
-		p5-Template-Plugin-Subst>=0:${PORTSDIR}/www/p5-Template-Plugin-Subst \
-		p5-Text-Diff-HTML>=0:${PORTSDIR}/textproc/p5-Text-Diff-HTML \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Locale-Maketext-Simple>=0:devel/p5-Locale-Maketext-Simple \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-XML-RSS>=0:textproc/p5-XML-RSS \
+		p5-XML-RSS-Parser>=0:textproc/p5-XML-RSS-Parser \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-Exception-Class>=1.22:devel/p5-Exception-Class \
+		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-Locale-Maketext-Lexicon>=0:devel/p5-Locale-Maketext-Lexicon \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Template-Plugin-Clickable-Email>=0:www/p5-Template-Plugin-Clickable-Email \
+		p5-Template-Plugin-Clickable>=0:www/p5-Template-Plugin-Clickable \
+		p5-Template-Plugin-Number-Format>=0:www/p5-Template-Plugin-Number-Format \
+		p5-Template-Plugin-Subst>=0:www/p5-Template-Plugin-Subst \
+		p5-Text-Diff-HTML>=0:textproc/p5-Text-Diff-HTML \
+		p5-URI>=0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-Test-Benchmark>=0:${PORTSDIR}/devel/p5-Test-Benchmark \
-		p5-Test-HTML-Tidy>=0:${PORTSDIR}/devel/p5-Test-HTML-Tidy \
-		p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+		p5-Test-Benchmark>=0:devel/p5-Test-Benchmark \
+		p5-Test-HTML-Tidy>=0:devel/p5-Test-HTML-Tidy \
+		p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	bin/svnweb-install
diff --git a/devel/p5-Sah/Makefile b/devel/p5-Sah/Makefile
index 683328c2c09e..e75c257d3c3f 100644
--- a/devel/p5-Sah/Makefile
+++ b/devel/p5-Sah/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Schema for data structures (specification)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ShareDir-Install>=0.06:${PORTSDIR}/devel/p5-File-ShareDir-Install
-TEST_DEPENDS=	p5-DefHash>=1.0.6:${PORTSDIR}/devel/p5-DefHash
+BUILD_DEPENDS=	p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
+TEST_DEPENDS=	p5-DefHash>=1.0.6:devel/p5-DefHash
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Scalar-Defer/Makefile b/devel/p5-Scalar-Defer/Makefile
index bdab5ecab973..ae68334d1e79 100644
--- a/devel/p5-Scalar-Defer/Makefile
+++ b/devel/p5-Scalar-Defer/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Calculate values on demand
 
-BUILD_DEPENDS=	p5-Class-InsideOut>=0:${PORTSDIR}/devel/p5-Class-InsideOut \
-		p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite
+BUILD_DEPENDS=	p5-Class-InsideOut>=0:devel/p5-Class-InsideOut \
+		p5-Exporter-Lite>=0:devel/p5-Exporter-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Scalar-Does/Makefile b/devel/p5-Scalar-Does/Makefile
index 77c615be0914..7a91a3a08855 100644
--- a/devel/p5-Scalar-Does/Makefile
+++ b/devel/p5-Scalar-Does/Makefile
@@ -14,19 +14,19 @@ COMMENT=	Like ref() but useful
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-Type-Tiny>=0.004:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-lexical-underscore>=0:${PORTSDIR}/devel/p5-lexical-underscore \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
+		p5-Type-Tiny>=0.004:devel/p5-Type-Tiny \
+		p5-URI>=0:net/p5-URI \
+		p5-lexical-underscore>=0:devel/p5-lexical-underscore \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Requires>=0.06:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-IO-All>=0:devel/p5-IO-All \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Requires>=0.06:devel/p5-Test-Requires
 
 CONFLICTS_INSTALL=	p5-IO-Detect-[0-9]*
 
diff --git a/devel/p5-Sentinel/Makefile b/devel/p5-Sentinel/Makefile
index e9f32a1c5979..bcbd1bc2a085 100644
--- a/devel/p5-Sentinel/Makefile
+++ b/devel/p5-Sentinel/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Create lightweight SCALARs with get/set callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Refcount>=0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Refcount>=0:devel/p5-Test-Refcount
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile
index 8963f635b56f..d10d9e0bf3a2 100644
--- a/devel/p5-Sepia/Makefile
+++ b/devel/p5-Sepia/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Simple Emacs-Perl Interface
 
-BUILD_DEPENDS=	p5-Devel-Size>=0:${PORTSDIR}/devel/p5-Devel-Size \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Devel-LexAlias>=0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Module-Info>=0:${PORTSDIR}/devel/p5-Module-Info \
-		p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource
+BUILD_DEPENDS=	p5-Devel-Size>=0:devel/p5-Devel-Size \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Module-Info>=0:devel/p5-Module-Info \
+		p5-BSD-Resource>=0:devel/p5-BSD-Resource
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake makeinfo perl5
diff --git a/devel/p5-Set-Array/Makefile b/devel/p5-Set-Array/Makefile
index 35d5edbc1931..bcda41b14258 100644
--- a/devel/p5-Set-Array/Makefile
+++ b/devel/p5-Set-Array/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Arrays as objects with set operations
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Try-Tiny>=0.11:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Want>=0:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Try-Tiny>=0.11:lang/p5-Try-Tiny \
+		p5-Want>=0:devel/p5-Want
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Set-ConsistentHash/Makefile b/devel/p5-Set-ConsistentHash/Makefile
index b347effc0c9f..3107a9bc60d9 100644
--- a/devel/p5-Set-ConsistentHash/Makefile
+++ b/devel/p5-Set-ConsistentHash/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Library for doing consistent hashing
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Set-Object/Makefile b/devel/p5-Set-Object/Makefile
index b5719ea7e2ab..1b184463d35f 100644
--- a/devel/p5-Set-Object/Makefile
+++ b/devel/p5-Set-Object/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Perl module to manage sets of objects
 
 LICENSE=	ART20
 
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Shape/Makefile b/devel/p5-Shape/Makefile
index 4d0486a43fb5..514b704e9941 100644
--- a/devel/p5-Shape/Makefile
+++ b/devel/p5-Shape/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to read and write shapefiles via shapelib
 
-LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
+LIB_DEPENDS=	libshp.so:devel/shapelib
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Shell-Base/Makefile b/devel/p5-Shell-Base/Makefile
index ed6c0fef1046..baaf845a72e6 100644
--- a/devel/p5-Shell-Base/Makefile
+++ b/devel/p5-Shell-Base/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl module implementing a simple command shell
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
-		p5-Text-Shellwords>=0:${PORTSDIR}/textproc/p5-Text-Shellwords
+BUILD_DEPENDS=	p5-Term-Size>=0:devel/p5-Term-Size \
+		p5-Text-Shellwords>=0:textproc/p5-Text-Shellwords
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Shell-EnvImporter/Makefile b/devel/p5-Shell-EnvImporter/Makefile
index 6d39cbebe391..ad9ec95aae78 100644
--- a/devel/p5-Shell-EnvImporter/Makefile
+++ b/devel/p5-Shell-EnvImporter/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mhjacks@swbell.net
 COMMENT=	Inherit different shell environments and restore previous
 
-RUN_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker
+RUN_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-ShipIt-Step-Manifest/Makefile b/devel/p5-ShipIt-Step-Manifest/Makefile
index 4af112e5b9a4..083f9c9f4df2 100644
--- a/devel/p5-ShipIt-Step-Manifest/Makefile
+++ b/devel/p5-ShipIt-Step-Manifest/Makefile
@@ -15,8 +15,8 @@ COMMENT=	ShipIt step for recreating the MANIFEST
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dist-Joseki>=0:${PORTSDIR}/devel/p5-Dist-Joseki \
-		p5-ShipIt>=0:${PORTSDIR}/devel/p5-ShipIt
+BUILD_DEPENDS=	p5-Dist-Joseki>=0:devel/p5-Dist-Joseki \
+		p5-ShipIt>=0:devel/p5-ShipIt
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Sort-Key-DateTime/Makefile b/devel/p5-Sort-Key-DateTime/Makefile
index fd8d8c049fea..b404644bca6f 100644
--- a/devel/p5-Sort-Key-DateTime/Makefile
+++ b/devel/p5-Sort-Key-DateTime/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for sorting objects by some DateTime key
 
-RUN_DEPENDS=	p5-DateTime>=0.28:${PORTSDIR}/devel/p5-DateTime \
-		p5-Sort-Key>=1.28:${PORTSDIR}/devel/p5-Sort-Key
+RUN_DEPENDS=	p5-DateTime>=0.28:devel/p5-DateTime \
+		p5-Sort-Key>=1.28:devel/p5-Sort-Key
 BUILD_DEPENDS=  ${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Specio/Makefile b/devel/p5-Specio/Makefile
index c0e566e7b2dd..7c7145717d33 100644
--- a/devel/p5-Specio/Makefile
+++ b/devel/p5-Specio/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Type constraints and coercions for Perl
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Devel-PartialDump>=0:${PORTSDIR}/devel/p5-Devel-PartialDump \
-		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Eval-Closure>=0:${PORTSDIR}/devel/p5-Eval-Closure \
-		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-Devel-PartialDump>=0:devel/p5-Devel-PartialDump \
+		p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
+		p5-Eval-Closure>=0:devel/p5-Eval-Closure \
+		p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -37,8 +37,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile
index ac370498a09e..29326587cce8 100644
--- a/devel/p5-Spoon/Makefile
+++ b/devel/p5-Spoon/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Spiffy Application Building Framework
 
-BUILD_DEPENDS=	p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-String-Checker/Makefile b/devel/p5-String-Checker/Makefile
index dc6c785f589e..addf08535594 100644
--- a/devel/p5-String-Checker/Makefile
+++ b/devel/p5-String-Checker/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module implementing an extensible string validation interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip
+BUILD_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-String-Diff/Makefile b/devel/p5-String-Diff/Makefile
index 4678c084fbd5..23df862e977e 100644
--- a/devel/p5-String-Diff/Makefile
+++ b/devel/p5-String-Diff/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Simple diff to String
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-Test-Base>=0:devel/p5-Test-Base \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-String-Dump/Makefile b/devel/p5-String-Dump/Makefile
index b00dbdfd44da..da33e89d7171 100644
--- a/devel/p5-String-Dump/Makefile
+++ b/devel/p5-String-Dump/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Dump strings of characters or bytes for printing and debugging
 
-BUILD_DEPENDS=	p5-Getopt-Lucid>=0:${PORTSDIR}/textproc/p5-Getopt-Lucid
+BUILD_DEPENDS=	p5-Getopt-Lucid>=0:textproc/p5-Getopt-Lucid
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-String-Errf/Makefile b/devel/p5-String-Errf/Makefile
index b19eb5f81a30..94fa64ad007b 100644
--- a/devel/p5-String-Errf/Makefile
+++ b/devel/p5-String-Errf/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Simple sprintf-like dialect
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-String-Formatter>=0.102081:${PORTSDIR}/devel/p5-String-Formatter
-BUILD_DEPENDS:=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-autodie>=0:${PORTSDIR}/devel/p5-autodie \
+RUN_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-String-Formatter>=0.102081:devel/p5-String-Formatter
+BUILD_DEPENDS:=	p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-autodie>=0:devel/p5-autodie \
 		${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-String-Formatter/Makefile b/devel/p5-String-Formatter/Makefile
index 824653fda980..46f5802be6a0 100644
--- a/devel/p5-String-Formatter/Makefile
+++ b/devel/p5-String-Formatter/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Build sprintf-like functions of your own
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-String-TT/Makefile b/devel/p5-String-TT/Makefile
index 7c27d2fb1288..7916381682a8 100644
--- a/devel/p5-String-TT/Makefile
+++ b/devel/p5-String-TT/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Perl interface to interpolate lexical variables
 
-RUN_DEPENDS=	p5-PadWalker>=1:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-TableDriven>=0:${PORTSDIR}/devel/p5-Test-TableDriven
+RUN_DEPENDS=	p5-PadWalker>=1:devel/p5-PadWalker \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-TableDriven>=0:devel/p5-Test-TableDriven
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Struct-Dumb/Makefile b/devel/p5-Struct-Dumb/Makefile
index 1798e6b29f60..1f8cc19e9c54 100644
--- a/devel/p5-Struct-Dumb/Makefile
+++ b/devel/p5-Struct-Dumb/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Sub-Alias/Makefile b/devel/p5-Sub-Alias/Makefile
index fa42f575053b..cd6bba12dc62 100644
--- a/devel/p5-Sub-Alias/Makefile
+++ b/devel/p5-Sub-Alias/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Simple subroutine alias
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Devel-Declare>=0:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Devel-BeginLift>=0:${PORTSDIR}/devel/p5-Devel-BeginLift
-RUN_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Devel-Declare>=0:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Devel-BeginLift>=0:${PORTSDIR}/devel/p5-Devel-BeginLift
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Devel-Declare>=0:devel/p5-Devel-Declare \
+		p5-Devel-BeginLift>=0:devel/p5-Devel-BeginLift
+RUN_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Devel-Declare>=0:devel/p5-Devel-Declare \
+		p5-Devel-BeginLift>=0:devel/p5-Devel-BeginLift
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Exporter-ForMethods/Makefile b/devel/p5-Sub-Exporter-ForMethods/Makefile
index 5336ebd9d231..9718cd792e42 100644
--- a/devel/p5-Sub-Exporter-ForMethods/Makefile
+++ b/devel/p5-Sub-Exporter-ForMethods/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Helper routines for using Sub::Exporter to build methods
 
-RUN_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Sub-Exporter>=0.978:${PORTSDIR}/devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-Sub-Exporter>=0.978:devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Sub-Exporter-GlobExporter/Makefile b/devel/p5-Sub-Exporter-GlobExporter/Makefile
index 7d2d533f5a87..c95809bef195 100644
--- a/devel/p5-Sub-Exporter-GlobExporter/Makefile
+++ b/devel/p5-Sub-Exporter-GlobExporter/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Sub-Exporter-Lexical/Makefile b/devel/p5-Sub-Exporter-Lexical/Makefile
index eab071dc8fab..43f4d0534276 100644
--- a/devel/p5-Sub-Exporter-Lexical/Makefile
+++ b/devel/p5-Sub-Exporter-Lexical/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Export lexically-available subs with Sub::Exporter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Lexical-Var>=0:${PORTSDIR}/devel/p5-Lexical-Var \
-		p5-Sub-Exporter>=0.978:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0:devel/p5-B-Hooks-EndOfScope \
+		p5-Lexical-Var>=0:devel/p5-Lexical-Var \
+		p5-Sub-Exporter>=0.978:devel/p5-Sub-Exporter \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Exporter-Progressive/Makefile b/devel/p5-Sub-Exporter-Progressive/Makefile
index 2f54ad419043..b51448204007 100644
--- a/devel/p5-Sub-Exporter-Progressive/Makefile
+++ b/devel/p5-Sub-Exporter-Progressive/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Only use Sub::Exporter if you need it
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Exporter/Makefile b/devel/p5-Sub-Exporter/Makefile
index 81354d6dfb97..9339ddd7fa3c 100644
--- a/devel/p5-Sub-Exporter/Makefile
+++ b/devel/p5-Sub-Exporter/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Sophisticated exporter for custom-built routines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-OptList>=0.100:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Params-Util>=0.14:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Install>=0.920:${PORTSDIR}/devel/p5-Sub-Install
+BUILD_DEPENDS=	p5-Data-OptList>=0.100:devel/p5-Data-OptList \
+		p5-Params-Util>=0.14:devel/p5-Params-Util \
+		p5-Sub-Install>=0.920:devel/p5-Sub-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Sub-Infix/Makefile b/devel/p5-Sub-Infix/Makefile
index 6cfa29dcfc49..a9b346dc8ed3 100644
--- a/devel/p5-Sub-Infix/Makefile
+++ b/devel/p5-Sub-Infix/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Create a fake infix operator
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Sub-Multi/Makefile b/devel/p5-Sub-Multi/Makefile
index 820c511e6211..9166fbc0cf0b 100644
--- a/devel/p5-Sub-Multi/Makefile
+++ b/devel/p5-Sub-Multi/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Data::Bind-based multi-sub dispatch
 
-BUILD_DEPENDS=	p5-Class-Multimethods-Pure>=0.11:${PORTSDIR}/devel/p5-Class-Multimethods-Pure \
-		p5-Data-Bind>=0.26:${PORTSDIR}/devel/p5-Data-Bind
+BUILD_DEPENDS=	p5-Class-Multimethods-Pure>=0.11:devel/p5-Class-Multimethods-Pure \
+		p5-Data-Bind>=0.26:devel/p5-Data-Bind
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Name/Makefile b/devel/p5-Sub-Name/Makefile
index b9a41c29f5e7..044741b6c772 100644
--- a/devel/p5-Sub-Name/Makefile
+++ b/devel/p5-Sub-Name/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Sub::Name - (re)name a sub
 
-TEST_DEPENDS=	p5-B-C>=1.48:${PORTSDIR}/devel/p5-B-C \
-		p5-Devel-CheckBin>=0:${PORTSDIR}/devel/p5-Devel-CheckBin
+TEST_DEPENDS=	p5-B-C>=1.48:devel/p5-B-C \
+		p5-Devel-CheckBin>=0:devel/p5-Devel-CheckBin
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Override/Makefile b/devel/p5-Sub-Override/Makefile
index 2668a1e59810..ae29b9530201 100644
--- a/devel/p5-Sub-Override/Makefile
+++ b/devel/p5-Sub-Override/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for easily overriding subroutines
 
-TEST_DEPENDS=	p5-Test-Fatal>=0.0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0.0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Signatures/Makefile b/devel/p5-Sub-Signatures/Makefile
index f68027156106..34caf3289b7d 100644
--- a/devel/p5-Sub-Signatures/Makefile
+++ b/devel/p5-Sub-Signatures/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use proper signatures for subroutines, including dispatching
 
-BUILD_DEPENDS=	p5-Sub-Uplevel>=0.12:${PORTSDIR}/devel/p5-Sub-Uplevel
+BUILD_DEPENDS=	p5-Sub-Uplevel>=0.12:devel/p5-Sub-Uplevel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-WrapPackages/Makefile b/devel/p5-Sub-WrapPackages/Makefile
index 3b16370fdc56..a307a20caa4d 100644
--- a/devel/p5-Sub-WrapPackages/Makefile
+++ b/devel/p5-Sub-WrapPackages/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Add pre- and post-execution wrappers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Caller-IgnoreNamespaces>=1:${PORTSDIR}/devel/p5-Devel-Caller-IgnoreNamespaces \
-		p5-Hook-LexWrap>=0:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-Sub-Prototype>=0.02:${PORTSDIR}/devel/p5-Sub-Prototype
+BUILD_DEPENDS=	p5-Devel-Caller-IgnoreNamespaces>=1:devel/p5-Devel-Caller-IgnoreNamespaces \
+		p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap \
+		p5-Sub-Prototype>=0.02:devel/p5-Sub-Prototype
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Syntax-Keyword-Junction/Makefile b/devel/p5-Syntax-Keyword-Junction/Makefile
index 6d3635fd8952..13750840107a 100644
--- a/devel/p5-Syntax-Keyword-Junction/Makefile
+++ b/devel/p5-Syntax-Keyword-Junction/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Perl6 style Junction operators in Perl5
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-syntax>=0:${PORTSDIR}/devel/p5-syntax \
-		p5-Sub-Exporter-Progressive>=0.001006:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-syntax>=0:devel/p5-syntax \
+		p5-Sub-Exporter-Progressive>=0.001006:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Sys-Info-Base/Makefile b/devel/p5-Sys-Info-Base/Makefile
index a316f912fd66..4bc75aece643 100644
--- a/devel/p5-Sys-Info-Base/Makefile
+++ b/devel/p5-Sys-Info-Base/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Base class for Sys::Info
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Sys-Info-Driver-BSD/Makefile b/devel/p5-Sys-Info-Driver-BSD/Makefile
index 2c3f9c7cc2a0..f92ee198675f 100644
--- a/devel/p5-Sys-Info-Driver-BSD/Makefile
+++ b/devel/p5-Sys-Info-Driver-BSD/Makefile
@@ -14,13 +14,13 @@ COMMENT=	BSD driver for Sys::Info
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-BSD-Sysctl>=0.08:${PORTSDIR}/sysutils/p5-BSD-Sysctl \
-		p5-Sys-Info-Base>=0.7801:${PORTSDIR}/devel/p5-Sys-Info-Base \
-		p5-Unix-Processors>=0:${PORTSDIR}/sysutils/p5-Unix-Processors
+BUILD_DEPENDS=	p5-BSD-Sysctl>=0.08:sysutils/p5-BSD-Sysctl \
+		p5-Sys-Info-Base>=0.7801:devel/p5-Sys-Info-Base \
+		p5-Unix-Processors>=0:sysutils/p5-Unix-Processors
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Sys-Info>=0.20:${PORTSDIR}/devel/p5-Test-Sys-Info
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+		p5-Test-Sys-Info>=0.20:devel/p5-Test-Sys-Info
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Sys-Info/Makefile b/devel/p5-Sys-Info/Makefile
index 40873bfb133b..16fee3a8a6d6 100644
--- a/devel/p5-Sys-Info/Makefile
+++ b/devel/p5-Sys-Info/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Fetch information from the host system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sys-Info-Base>=0.7800:${PORTSDIR}/devel/p5-Sys-Info-Base \
-		p5-Sys-Info-Driver-BSD>=0.7800:${PORTSDIR}/devel/p5-Sys-Info-Driver-BSD
+BUILD_DEPENDS=	p5-Sys-Info-Base>=0.7800:devel/p5-Sys-Info-Base \
+		p5-Sys-Info-Driver-BSD>=0.7800:devel/p5-Sys-Info-Driver-BSD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Sys-Info>=0.20:${PORTSDIR}/devel/p5-Test-Sys-Info
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+		p5-Test-Sys-Info>=0.20:devel/p5-Test-Sys-Info
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Sys-SigAction/Makefile b/devel/p5-Sys-SigAction/Makefile
index ea801b09cd56..e3ccfa95c95f 100644
--- a/devel/p5-Sys-SigAction/Makefile
+++ b/devel/p5-Sys-SigAction/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension for Consistent Signal Handling
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Time-HiRes>=1.9726:${PORTSDIR}/devel/p5-Time-HiRes
+BUILD_DEPENDS=	p5-Time-HiRes>=1.9726:devel/p5-Time-HiRes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Sys-Virt/Makefile b/devel/p5-Sys-Virt/Makefile
index 93287585f71e..ecafa4e0aa41 100644
--- a/devel/p5-Sys-Virt/Makefile
+++ b/devel/p5-Sys-Virt/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl bindings for libvirt
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
-RUN_DEPENDS=	p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
-TEST_DEPENDS=	p5-CPAN-Changes>=0:${PORTSDIR}/devel/p5-CPAN-Changes \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+BUILD_DEPENDS=	p5-XML-XPath>=0:textproc/p5-XML-XPath
+LIB_DEPENDS=	libvirt.so:devel/libvirt
+RUN_DEPENDS=	p5-XML-XPath>=0:textproc/p5-XML-XPath
+TEST_DEPENDS=	p5-CPAN-Changes>=0:devel/p5-CPAN-Changes \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5 pkgconfig shebangfix
 SHEBANG_FILES=	examples/*.pl
diff --git a/devel/p5-System-Command/Makefile b/devel/p5-System-Command/Makefile
index 679c973a751e..53f9b57aa2ee 100644
--- a/devel/p5-System-Command/Makefile
+++ b/devel/p5-System-Command/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Object for running system commands
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Command>=0:${PORTSDIR}/devel/p5-Test-Command \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Command>=0:devel/p5-Test-Command \
+		p5-Test-Output>=0:devel/p5-Test-Output
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-System-Sub/Makefile b/devel/p5-System-Sub/Makefile
index 46caaab2e84b..640db521a55e 100644
--- a/devel/p5-System-Sub/Makefile
+++ b/devel/p5-System-Sub/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Wrap external command with a DWIM sub
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS:=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS:=	p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-Sub-Name>=0:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-TAP-Formatter-JUnit/Makefile b/devel/p5-TAP-Formatter-JUnit/Makefile
index 2028d570da2b..48ac638d70e7 100644
--- a/devel/p5-TAP-Formatter-JUnit/Makefile
+++ b/devel/p5-TAP-Formatter-JUnit/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-NonMoose>0:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-XML-Generator>0:${PORTSDIR}/textproc/p5-XML-Generator \
-	p5-Test-Harness>3.12:${PORTSDIR}/devel/p5-Test-Harness
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-NonMoose>0:devel/p5-MooseX-NonMoose \
+	p5-File-Slurp>0:devel/p5-File-Slurp \
+	p5-XML-Generator>0:textproc/p5-XML-Generator \
+	p5-Test-Harness>3.12:devel/p5-Test-Harness
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-TAP-Harness-JUnit/Makefile b/devel/p5-TAP-Harness-JUnit/Makefile
index 588f2c5d9ead..25440e248058 100644
--- a/devel/p5-TAP-Harness-JUnit/Makefile
+++ b/devel/p5-TAP-Harness-JUnit/Makefile
@@ -10,10 +10,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to generate JUnit compatible output from TAP
 
 RUN_DEPENDS=	\
-	p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+	p5-XML-Simple>0:textproc/p5-XML-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+	p5-Test-Deep>0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-TAP-SimpleOutput/Makefile b/devel/p5-TAP-SimpleOutput/Makefile
index 8205de4bce2c..e9be7ed7cfda 100644
--- a/devel/p5-TAP-SimpleOutput/Makefile
+++ b/devel/p5-TAP-SimpleOutput/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple closure-driven TAP generator
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tee/Makefile b/devel/p5-Tee/Makefile
index 98aca5fee44b..5033a0c4d3a9 100644
--- a/devel/p5-Tee/Makefile
+++ b/devel/p5-Tee/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Pure Perl emulation of GNU tee
 
-BUILD_DEPENDS=	p5-IO-CaptureOutput>0:${PORTSDIR}/devel/p5-IO-CaptureOutput \
-		p5-Probe-Perl>=0:${PORTSDIR}/sysutils/p5-Probe-Perl
-RUN_DEPENDS=	p5-IO-CaptureOutput>0:${PORTSDIR}/devel/p5-IO-CaptureOutput
+BUILD_DEPENDS=	p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput \
+		p5-Probe-Perl>=0:sysutils/p5-Probe-Perl
+RUN_DEPENDS=	p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Template-Provider-Encode/Makefile b/devel/p5-Template-Provider-Encode/Makefile
index 0ddef03baf75..fb45ec229d38 100644
--- a/devel/p5-Template-Provider-Encode/Makefile
+++ b/devel/p5-Template-Provider-Encode/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	Encode templates for Template Toolkit
 
-RUN_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Term-Animation/Makefile b/devel/p5-Term-Animation/Makefile
index ead5a7e82f30..d05336f3d659 100644
--- a/devel/p5-Term-Animation/Makefile
+++ b/devel/p5-Term-Animation/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	ASCII sprite animation framework
 
-BUILD_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+BUILD_DEPENDS=	p5-Curses>=0:devel/p5-Curses
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-Clui/Makefile b/devel/p5-Term-Clui/Makefile
index 9a252b5174b9..60853eb430b8 100644
--- a/devel/p5-Term-Clui/Makefile
+++ b/devel/p5-Term-Clui/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Perl module offering a Command-Line User Interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
-		p5-Term-ReadKey>=2.14:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu
+BUILD_DEPENDS=	p5-Term-Size>=0:devel/p5-Term-Size \
+		p5-Term-ReadKey>=2.14:devel/p5-Term-ReadKey \
+		p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-Menus/Makefile b/devel/p5-Term-Menus/Makefile
index 7e88ff72019e..a71d82361817 100644
--- a/devel/p5-Term-Menus/Makefile
+++ b/devel/p5-Term-Menus/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Create Powerful Terminal, Console, and CMD Environment Menus
 
 LICENSE=	AGPLv3
 
-BUILD_DEPENDS=	p5-Data-Dump-Streamer>0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		p5-Devel-Symdump>0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-PadWalker>0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Term-RawInput>=1.20:${PORTSDIR}/devel/p5-Term-RawInput \
-		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Data-Dump-Streamer>0:devel/p5-Data-Dump-Streamer \
+		p5-Devel-Symdump>0:devel/p5-Devel-Symdump \
+		p5-PadWalker>0:devel/p5-PadWalker \
+		p5-Term-RawInput>=1.20:devel/p5-Term-RawInput \
+		p5-Term-ReadKey>0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Term-ProgressBar-Quiet/Makefile b/devel/p5-Term-ProgressBar-Quiet/Makefile
index 60f2803d0770..288cba9e2476 100644
--- a/devel/p5-Term-ProgressBar-Quiet/Makefile
+++ b/devel/p5-Term-ProgressBar-Quiet/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl extension to display a progress bar, if interactive
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar \
-		p5-Test-MockObject>0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-IO-Interactive>=0:${PORTSDIR}/devel/p5-IO-Interactive
+BUILD_DEPENDS=	p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
+		p5-Test-MockObject>0:devel/p5-Test-MockObject \
+		p5-IO-Interactive>=0:devel/p5-IO-Interactive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-ProgressBar-Simple/Makefile b/devel/p5-Term-ProgressBar-Simple/Makefile
index 084faa2a9db8..da4c185e57b3 100644
--- a/devel/p5-Term-ProgressBar-Simple/Makefile
+++ b/devel/p5-Term-ProgressBar-Simple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simpler Term::ProgressBar interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-ProgressBar-Quiet>=0:${PORTSDIR}/devel/p5-Term-ProgressBar-Quiet
+BUILD_DEPENDS=	p5-Term-ProgressBar-Quiet>=0:devel/p5-Term-ProgressBar-Quiet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-ProgressBar/Makefile b/devel/p5-Term-ProgressBar/Makefile
index 7b2e380dea62..6b2393b10be7 100644
--- a/devel/p5-Term-ProgressBar/Makefile
+++ b/devel/p5-Term-ProgressBar/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Perl extension to display a progress bar
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=1.02:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		p5-Term-ReadKey>=2.14:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Class-MethodMaker>=1.02:devel/p5-Class-MethodMaker \
+		p5-Term-ReadKey>=2.14:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0.13:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Capture-Tiny>=0.13:devel/p5-Capture-Tiny \
+		p5-Test-Exception>=0.31:devel/p5-Test-Exception
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile
index 6066713adc63..c973946c0984 100644
--- a/devel/p5-Term-Prompt/Makefile
+++ b/devel/p5-Term-Prompt/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl extension for prompting a user for information
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index eef41c2eba75..1a7fb7686b88 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Interactive question-response user interface module
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Array-PrintCols>=0:${PORTSDIR}/misc/p5-Array-PrintCols
+BUILD_DEPENDS=	p5-Array-PrintCols>=0:misc/p5-Array-PrintCols
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-RawInput/Makefile b/devel/p5-Term-RawInput/Makefile
index db325c762b04..db965faf5e4d 100644
--- a/devel/p5-Term-RawInput/Makefile
+++ b/devel/p5-Term-RawInput/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Drop-in replacement for <STDIN> with handling of non-standard keys
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-ReadLine-Perl/Makefile b/devel/p5-Term-ReadLine-Perl/Makefile
index e0ef4022a44a..7eb0f8e524d3 100644
--- a/devel/p5-Term-ReadLine-Perl/Makefile
+++ b/devel/p5-Term-ReadLine-Perl/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Quick implementation of the minimal interface to Readline libraries
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Term-ReadLine-Zoid/Makefile b/devel/p5-Term-ReadLine-Zoid/Makefile
index 144871506d66..b3278ede6ff2 100644
--- a/devel/p5-Term-ReadLine-Zoid/Makefile
+++ b/devel/p5-Term-ReadLine-Zoid/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides an interactive input buffer written in plain PERL
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-ScreenColor/Makefile b/devel/p5-Term-ScreenColor/Makefile
index 0d94d85fd526..db8419dd5159 100644
--- a/devel/p5-Term-ScreenColor/Makefile
+++ b/devel/p5-Term-ScreenColor/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Term::Screen based screen positioning and coloring module
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Term-Screen>=0:${PORTSDIR}/devel/p5-Term-Screen
+RUN_DEPENDS=	p5-Term-Screen>=0:devel/p5-Term-Screen
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Term-Shell/Makefile b/devel/p5-Term-Shell/Makefile
index 850d3c2d97ad..713aa5e0ee0f 100644
--- a/devel/p5-Term-Shell/Makefile
+++ b/devel/p5-Term-Shell/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Write command-line shells in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Text-Autoformat>=0:${PORTSDIR}/textproc/p5-Text-Autoformat
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Text-Autoformat>=0:textproc/p5-Text-Autoformat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Term-Size-Any/Makefile b/devel/p5-Term-Size-Any/Makefile
index c22cc2eefd5c..63a8788bec18 100644
--- a/devel/p5-Term-Size-Any/Makefile
+++ b/devel/p5-Term-Size-Any/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Retrieve terminal size
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Hide>=0:${PORTSDIR}/devel/p5-Devel-Hide \
-		p5-Term-Size-Perl>=0:${PORTSDIR}/devel/p5-Term-Size-Perl
+BUILD_DEPENDS=	p5-Devel-Hide>=0:devel/p5-Devel-Hide \
+		p5-Term-Size-Perl>=0:devel/p5-Term-Size-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Pod>=1.18:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Pod>=1.18:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Term-Size-Perl/Makefile b/devel/p5-Term-Size-Perl/Makefile
index f72173cadbeb..17215950b985 100644
--- a/devel/p5-Term-Size-Perl/Makefile
+++ b/devel/p5-Term-Size-Perl/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Retrieving terminal size
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Pod>=1.18:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Pod>=1.18:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Term-VT102-Boundless/Makefile b/devel/p5-Term-VT102-Boundless/Makefile
index fea6698f5ea9..00f8fb2d5f8f 100644
--- a/devel/p5-Term-VT102-Boundless/Makefile
+++ b/devel/p5-Term-VT102-Boundless/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Subclass to emulate boundless DEC VT102 terminal
 
-BUILD_DEPENDS=	p5-Term-VT102>=0:${PORTSDIR}/devel/p5-Term-VT102
+BUILD_DEPENDS=	p5-Term-VT102>=0:devel/p5-Term-VT102
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Term-Visual/Makefile b/devel/p5-Term-Visual/Makefile
index 4c8335555c23..b1ddbcac4b16 100644
--- a/devel/p5-Term-Visual/Makefile
+++ b/devel/p5-Term-Visual/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Split-terminal user interface
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-Curses>=0:devel/p5-Curses
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Able-Runner/Makefile b/devel/p5-Test-Able-Runner/Makefile
index d2c290f449ba..e51ef4ad7c84 100644
--- a/devel/p5-Test-Able-Runner/Makefile
+++ b/devel/p5-Test-Able-Runner/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Use Test::Able without a bunch of boilerplate
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Pluggable>=3.6:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Able>=0.09:${PORTSDIR}/devel/p5-Test-Able
+BUILD_DEPENDS=	p5-Module-Pluggable>=3.6:devel/p5-Module-Pluggable \
+		p5-Moose>=0.94:devel/p5-Moose \
+		p5-Test-Able>=0.09:devel/p5-Test-Able
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Able/Makefile b/devel/p5-Test-Able/Makefile
index ef9620e2611c..39b64eab1b56 100644
--- a/devel/p5-Test-Able/Makefile
+++ b/devel/p5-Test-Able/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Xunit with Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Aggregate/Makefile b/devel/p5-Test-Aggregate/Makefile
index a5f1aaed4d47..fe2f41ed8a62 100644
--- a/devel/p5-Test-Aggregate/Makefile
+++ b/devel/p5-Test-Aggregate/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Aggregate Perl tests for better performance
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-Most>=0.21:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Trap>0:${PORTSDIR}/devel/p5-Test-Trap
+BUILD_DEPENDS=	p5-Test-Most>=0.21:devel/p5-Test-Most \
+		p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings \
+		p5-Test-Trap>0:devel/p5-Test-Trap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Assertions/Makefile b/devel/p5-Test-Assertions/Makefile
index 31c98af1505d..99107b2f6efd 100644
--- a/devel/p5-Test-Assertions/Makefile
+++ b/devel/p5-Test-Assertions/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Simple set of building blocks for both unit and runtime testing
 
-RUN_DEPENDS=	p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace
+RUN_DEPENDS=	p5-Log-Trace>0:devel/p5-Log-Trace
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Base/Makefile b/devel/p5-Test-Base/Makefile
index 44f732fc209d..04a2302e02b4 100644
--- a/devel/p5-Test-Base/Makefile
+++ b/devel/p5-Test-Base/Makefile
@@ -15,13 +15,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	\
-		p5-Spiffy>=0.30:${PORTSDIR}/devel/p5-Spiffy \
-		p5-Test-Simple>=0.86:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
+		p5-Spiffy>=0.30:devel/p5-Spiffy \
+		p5-Test-Simple>=0.86:devel/p5-Test-Simple \
+		p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-YAML>=0:textproc/p5-YAML \
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/devel/p5-Test-Benchmark/Makefile b/devel/p5-Test-Benchmark/Makefile
index 9965d99f555e..036f82cfa30a 100644
--- a/devel/p5-Test-Benchmark/Makefile
+++ b/devel/p5-Test-Benchmark/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Make sure something really is faster
 
 LICENSE=	LGPL21
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USE_PERL5=	configure
 USES=		perl5
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-BinaryData/Makefile b/devel/p5-Test-BinaryData/Makefile
index 72b7a5c84d86..26fa4ec676c4 100644
--- a/devel/p5-Test-BinaryData/Makefile
+++ b/devel/p5-Test-BinaryData/Makefile
@@ -20,7 +20,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Bits/Makefile b/devel/p5-Test-Bits/Makefile
index ca0d8782149c..542308847a2b 100644
--- a/devel/p5-Test-Bits/Makefile
+++ b/devel/p5-Test-Bits/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Provides a bits_is() subroutine for testing binary data
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-List-AllUtils>=0:${PORTSDIR}/devel/p5-List-AllUtils
+BUILD_DEPENDS=	p5-List-AllUtils>=0:devel/p5-List-AllUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USE_PERL5=	configure
 USES=		perl5
@@ -23,7 +23,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Block/Makefile b/devel/p5-Test-Block/Makefile
index 267bc614e0f2..1eff568a7595 100644
--- a/devel/p5-Test-Block/Makefile
+++ b/devel/p5-Test-Block/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Specify fine granularity test plans
 DEPRECATED=	Marked as depreciated upstream
 
-BUILD_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Simple>=0.47:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Test-Exception>=0.15:devel/p5-Test-Exception \
+		p5-Test-Simple>=0.47:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-CPAN-Meta-YAML/Makefile b/devel/p5-Test-CPAN-Meta-YAML/Makefile
index a21b9807a4a8..0df4a4adce2a 100644
--- a/devel/p5-Test-CPAN-Meta-YAML/Makefile
+++ b/devel/p5-Test-CPAN-Meta-YAML/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Validate a META.yml file within a CPAN distribution
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Test-YAML-Valid>=0.03:${PORTSDIR}/devel/p5-Test-YAML-Valid
+BUILD_DEPENDS=	p5-Test-YAML-Valid>=0.03:devel/p5-Test-YAML-Valid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-CPAN-Meta/Makefile b/devel/p5-Test-CPAN-Meta/Makefile
index b09d715012f7..a57c7ab23cec 100644
--- a/devel/p5-Test-CPAN-Meta/Makefile
+++ b/devel/p5-Test-CPAN-Meta/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Validate your CPAN META.yml files
 
 LICENSE=	ART20
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0.08:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Test-CheckDeps/Makefile b/devel/p5-Test-CheckDeps/Makefile
index f5248aa5a6ef..abca487e1404 100644
--- a/devel/p5-Test-CheckDeps/Makefile
+++ b/devel/p5-Test-CheckDeps/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Check for presence of dependencies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CPAN-Meta-Check>=0.007:${PORTSDIR}/devel/p5-CPAN-Meta-Check
+BUILD_DEPENDS=	p5-CPAN-Meta-Check>=0.007:devel/p5-CPAN-Meta-Check
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -23,8 +23,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-CPAN-Meta>=2.120920:${PORTSDIR}/devel/p5-CPAN-Meta
-RUN_DEPENDS+=	p5-CPAN-Meta>=2.120920:${PORTSDIR}/devel/p5-CPAN-Meta
+BUILD_DEPENDS+=	p5-CPAN-Meta>=2.120920:devel/p5-CPAN-Meta
+RUN_DEPENDS+=	p5-CPAN-Meta>=2.120920:devel/p5-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Class-Most/Makefile b/devel/p5-Test-Class-Most/Makefile
index 1d5356af3cbe..cf8dd9362c04 100644
--- a/devel/p5-Test-Class-Most/Makefile
+++ b/devel/p5-Test-Class-Most/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Test Classes the easy way
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-Class>=0.38:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Most>=0.31:${PORTSDIR}/devel/p5-Test-Most
+BUILD_DEPENDS=	p5-Test-Class>=0.38:devel/p5-Test-Class \
+		p5-Test-Most>=0.31:devel/p5-Test-Most
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Class/Makefile b/devel/p5-Test-Class/Makefile
index c773b1f07f61..063ef6209a9f 100644
--- a/devel/p5-Test-Class/Makefile
+++ b/devel/p5-Test-Class/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Easily create test classes in an xUnit style
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MRO-Compat>=0.11:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-MRO-Compat>=0.11:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Contextual-Return>=0:${PORTSDIR}/devel/p5-Contextual-Return \
-		p5-Test-Exception>=0.25:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Contextual-Return>=0:devel/p5-Contextual-Return \
+		p5-Test-Exception>=0.25:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Test-ClassAPI/Makefile b/devel/p5-Test-ClassAPI/Makefile
index fd9c36588033..e16ea8a936e8 100644
--- a/devel/p5-Test-ClassAPI/Makefile
+++ b/devel/p5-Test-ClassAPI/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Provides basic first-pass API testing for large class trees
 
-RUN_DEPENDS=	p5-Class-Inspector>=1.12:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Config-Tiny>=2.00:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util
+RUN_DEPENDS=	p5-Class-Inspector>=1.12:devel/p5-Class-Inspector \
+		p5-Config-Tiny>=2.00:devel/p5-Config-Tiny \
+		p5-Params-Util>=1.00:devel/p5-Params-Util
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Classy/Makefile b/devel/p5-Test-Classy/Makefile
index 9e4a97b221a0..f0da9a7a89f6 100644
--- a/devel/p5-Test-Classy/Makefile
+++ b/devel/p5-Test-Classy/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Write your unit tests in other modules than *.t
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Module-Find>=0.05:${PORTSDIR}/devel/p5-Module-Find \
-		p5-Sub-Install>=0.920:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Term-Encoding>=0:${PORTSDIR}/devel/p5-Term-Encoding
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Module-Find>=0.05:devel/p5-Module-Find \
+		p5-Sub-Install>=0.920:devel/p5-Sub-Install \
+		p5-Term-Encoding>=0:devel/p5-Term-Encoding
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-UseAllModules>=0.09:${PORTSDIR}/devel/p5-Test-UseAllModules
+TEST_DEPENDS=	p5-Test-UseAllModules>=0.09:devel/p5-Test-UseAllModules
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-CleanNamespaces/Makefile b/devel/p5-Test-CleanNamespaces/Makefile
index f86c17296e26..356933b1aa70 100644
--- a/devel/p5-Test-CleanNamespaces/Makefile
+++ b/devel/p5-Test-CleanNamespaces/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Check for uncleaned imports
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-Find-Rule-Perl>0:${PORTSDIR}/devel/p5-File-Find-Rule-Perl \
-		p5-Module-Runtime>0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Package-Stash>=0.14:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Identify>0:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+		p5-File-Find-Rule-Perl>0:devel/p5-File-Find-Rule-Perl \
+		p5-Module-Runtime>0:devel/p5-Module-Runtime \
+		p5-Package-Stash>=0.14:devel/p5-Package-Stash \
+		p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+		p5-Sub-Identify>0:devel/p5-Sub-Identify \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0.009:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Test-Requires>0:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0.009:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	configure
@@ -34,7 +34,7 @@ PLIST_FILES=	%%SITE_PERL%%/Test/CleanNamespaces.pm \
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Command-Simple/Makefile b/devel/p5-Test-Command-Simple/Makefile
index 16d19b2d3470..16a6b7ad60e6 100644
--- a/devel/p5-Test-Command-Simple/Makefile
+++ b/devel/p5-Test-Command-Simple/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Test external commands (nearly) as easily as loaded modules
 
-TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Command/Makefile b/devel/p5-Test-Command/Makefile
index 3fa39a07d49c..e9bc3f9786f7 100644
--- a/devel/p5-Test-Command/Makefile
+++ b/devel/p5-Test-Command/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Test routines for external commands
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Test-Compile/Makefile b/devel/p5-Test-Compile/Makefile
index 5a7578eb6675..fa178983d8c4 100644
--- a/devel/p5-Test-Compile/Makefile
+++ b/devel/p5-Test-Compile/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Check whether Perl module files compile correctly
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckOS>=0:${PORTSDIR}/devel/p5-Devel-CheckOS \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Devel-CheckOS>=0:devel/p5-Devel-CheckOS \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-DBIx-Class/Makefile b/devel/p5-Test-DBIx-Class/Makefile
index f211f9470089..7e13ba1f4081 100644
--- a/devel/p5-Test-DBIx-Class/Makefile
+++ b/devel/p5-Test-DBIx-Class/Makefile
@@ -13,28 +13,28 @@ COMMENT=	Easier test cases for your DBIx::Class applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0.19:${PORTSDIR}/devel/p5-Config-Any \
-		p5-DBIx-Class>=0.08123:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBIx-Class-Schema-PopulateMore>=0.16:${PORTSDIR}/databases/p5-DBIx-Class-Schema-PopulateMore \
-		p5-DBIx-Class-TimeStamp>=0.13:${PORTSDIR}/databases/p5-DBIx-Class-TimeStamp \
-		p5-DBIx-Class-UUIDColumns>=0.02005:${PORTSDIR}/databases/p5-DBIx-Class-UUIDColumns \
-		p5-Data-UUID>=1.215:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Data-Visitor>=0.27:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-Hash-Merge>=0.11:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Runtime>=0.013:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=1.10:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Attribute-ENV>=0.01:${PORTSDIR}/devel/p5-MooseX-Attribute-ENV \
-		p5-MooseX-Types>=0.23:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Path-Class>=0.21:${PORTSDIR}/devel/p5-Path-Class \
-		p5-SQL-Translator>=0.11006:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-Sub-Exporter>=0.982:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Test-Deep>=0.106:${PORTSDIR}/devel/p5-Test-Deep
+BUILD_DEPENDS=	p5-Config-Any>=0.19:devel/p5-Config-Any \
+		p5-DBIx-Class>=0.08123:databases/p5-DBIx-Class \
+		p5-DBIx-Class-Schema-PopulateMore>=0.16:databases/p5-DBIx-Class-Schema-PopulateMore \
+		p5-DBIx-Class-TimeStamp>=0.13:databases/p5-DBIx-Class-TimeStamp \
+		p5-DBIx-Class-UUIDColumns>=0.02005:databases/p5-DBIx-Class-UUIDColumns \
+		p5-Data-UUID>=1.215:devel/p5-Data-UUID \
+		p5-Data-Visitor>=0.27:devel/p5-Data-Visitor \
+		p5-Hash-Merge>=0.11:textproc/p5-Hash-Merge \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+		p5-Module-Runtime>=0.013:devel/p5-Module-Runtime \
+		p5-Moose>=1.10:devel/p5-Moose \
+		p5-MooseX-Attribute-ENV>=0.01:devel/p5-MooseX-Attribute-ENV \
+		p5-MooseX-Types>=0.23:devel/p5-MooseX-Types \
+		p5-Path-Class>=0.21:devel/p5-Path-Class \
+		p5-SQL-Translator>=0.11006:databases/p5-SQL-Translator \
+		p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter \
+		p5-Test-Deep>=0.106:devel/p5-Test-Deep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Types-LoadableClass>=0:${PORTSDIR}/devel/p5-MooseX-Types-LoadableClass \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-mysqld>=0:${PORTSDIR}/databases/p5-Test-mysqld \
-		p5-Test-postgresql>=0:${PORTSDIR}/databases/p5-Test-postgresql
+TEST_DEPENDS=	p5-MooseX-Types-LoadableClass>=0:devel/p5-MooseX-Types-LoadableClass \
+		p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-mysqld>=0:databases/p5-Test-mysqld \
+		p5-Test-postgresql>=0:databases/p5-Test-postgresql
 # Also for test:
 #USE_MYSQL+=	server
 
diff --git a/devel/p5-Test-Declare/Makefile b/devel/p5-Test-Declare/Makefile
index b80ab26e9536..6d304effc3a0 100644
--- a/devel/p5-Test-Declare/Makefile
+++ b/devel/p5-Test-Declare/Makefile
@@ -11,18 +11,18 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for declarative testing
 
 RUN_DEPENDS=	\
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-PPI>0:${PORTSDIR}/textproc/p5-PPI \
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-PPI>0:textproc/p5-PPI \
+	p5-Test-Deep>0:devel/p5-Test-Deep \
+	p5-Test-Exception>0:devel/p5-Test-Exception
 BUILD_DEPENDS=	\
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-PPI>0:${PORTSDIR}/textproc/p5-PPI \
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-PPI>0:textproc/p5-PPI \
+	p5-Test-Deep>0:devel/p5-Test-Deep \
+	p5-Test-Exception>0:devel/p5-Test-Exception
 
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Test-Output>=0:devel/p5-Test-Output
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Deep/Makefile b/devel/p5-Test-Deep/Makefile
index e15199be8cbb..c53e996bcb01 100644
--- a/devel/p5-Test-Deep/Makefile
+++ b/devel/p5-Test-Deep/Makefile
@@ -24,8 +24,8 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Dependencies/Makefile b/devel/p5-Test-Dependencies/Makefile
index f759a1f711c7..c6227340d4eb 100644
--- a/devel/p5-Test-Dependencies/Makefile
+++ b/devel/p5-Test-Dependencies/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Ensure that your Makefile.PL specifies all module dependencies
 
-BUILD_DEPENDS=	p5-rpm-build-perl>=0:${PORTSDIR}/devel/p5-rpm-build-perl \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-IPC-Cmd>=0:${PORTSDIR}/devel/p5-IPC-Cmd \
-		p5-Pod-Strip>=0:${PORTSDIR}/textproc/p5-Pod-Strip \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-rpm-build-perl>=0:devel/p5-rpm-build-perl \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-IPC-Cmd>=0:devel/p5-IPC-Cmd \
+		p5-Pod-Strip>=0:textproc/p5-Pod-Strip \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-DependentModules/Makefile b/devel/p5-Test-DependentModules/Makefile
index 718ccd8d73b1..683bbab69e4c 100644
--- a/devel/p5-Test-DependentModules/Makefile
+++ b/devel/p5-Test-DependentModules/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Test all modules which depend on your module
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-Parallel-ForkManager>=0.7.6:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-IO-Handle-Util>=0:${PORTSDIR}/devel/p5-IO-Handle-Util \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-MetaCPAN-Client>=0:${PORTSDIR}/devel/p5-MetaCPAN-Client \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-autodie>=0:${PORTSDIR}/devel/p5-autodie
+BUILD_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-Parallel-ForkManager>=0.7.6:devel/p5-Parallel-ForkManager \
+		p5-IO-Handle-Util>=0:devel/p5-IO-Handle-Util \
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-MetaCPAN-Client>=0:devel/p5-MetaCPAN-Client \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-autodie>=0:devel/p5-autodie
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-Module-Build-Tiny>=0:${PORTSDIR}/devel/p5-Module-Build-Tiny
+TEST_DEPENDS=	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-Module-Build-Tiny>=0:devel/p5-Module-Build-Tiny
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -33,7 +33,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502000
-TEST_DEPENDS+=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build
+TEST_DEPENDS+=	p5-Module-Build>=0:devel/p5-Module-Build
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Differences/Makefile b/devel/p5-Test-Differences/Makefile
index 66037ea09c58..3af35f8c2a66 100644
--- a/devel/p5-Test-Differences/Makefile
+++ b/devel/p5-Test-Differences/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Test::Differences - Test strings and data structures for differences
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Diff>=0.35:${PORTSDIR}/textproc/p5-Text-Diff
+BUILD_DEPENDS=	p5-Text-Diff>=0.35:textproc/p5-Text-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0.24:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0.24:devel/p5-Capture-Tiny
 
 PORTSCOUT=	skipv:0.4801
 
diff --git a/devel/p5-Test-Distribution/Makefile b/devel/p5-Test-Distribution/Makefile
index 1110af0abaa2..9e1acd2377d9 100644
--- a/devel/p5-Test-Distribution/Makefile
+++ b/devel/p5-Test-Distribution/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Test::Distribution - Perform tests on all modules of a distribution
 
-BUILD_DEPENDS+=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+BUILD_DEPENDS+=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-EOL/Makefile b/devel/p5-Test-EOL/Makefile
index a885a7a1144f..9098d07495ab 100644
--- a/devel/p5-Test-EOL/Makefile
+++ b/devel/p5-Test-EOL/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Check the correct line endings in your project
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Pod-Coverage-TrustPod>=0:${PORTSDIR}/devel/p5-Pod-Coverage-TrustPod \
-		p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Pod-Coverage>=1.08:devel/p5-Pod-Coverage \
+		p5-Pod-Coverage-TrustPod>=0:devel/p5-Pod-Coverage-TrustPod \
+		p5-Test-Pod>=1.41:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Exception-LessClever/Makefile b/devel/p5-Test-Exception-LessClever/Makefile
index b75a27d53252..8de1b758688c 100644
--- a/devel/p5-Test-Exception-LessClever/Makefile
+++ b/devel/p5-Test-Exception-LessClever/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Test::Exception simplified
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mock-Quick>=1.100:${PORTSDIR}/devel/p5-Mock-Quick
+BUILD_DEPENDS=	p5-Mock-Quick>=1.100:devel/p5-Mock-Quick
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-Test-Exception/Makefile b/devel/p5-Test-Exception/Makefile
index b6784da95393..6e2e51b24dc9 100644
--- a/devel/p5-Test-Exception/Makefile
+++ b/devel/p5-Test-Exception/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Test functions for exception based code
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Uplevel>=0.18:${PORTSDIR}/devel/p5-Sub-Uplevel
+BUILD_DEPENDS=	p5-Sub-Uplevel>=0.18:devel/p5-Sub-Uplevel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Test-Expect/Makefile b/devel/p5-Test-Expect/Makefile
index 1b566e766293..8529edaad022 100644
--- a/devel/p5-Test-Expect/Makefile
+++ b/devel/p5-Test-Expect/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Automated driving and testing of terminal-based programs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-Expect-Simple>=0:${PORTSDIR}/devel/p5-Expect-Simple
+BUILD_DEPENDS=	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-Expect-Simple>=0:devel/p5-Expect-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-FailWarnings/Makefile b/devel/p5-Test-FailWarnings/Makefile
index 8749f37eede7..54ff41bc7763 100644
--- a/devel/p5-Test-FailWarnings/Makefile
+++ b/devel/p5-Test-FailWarnings/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Add test failures if warnings are caught
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0.21:${PORTSDIR}/devel/p5-Capture-Tiny
+BUILD_DEPENDS=	p5-Capture-Tiny>=0.21:devel/p5-Capture-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Fake-HTTPD/Makefile b/devel/p5-Test-Fake-HTTPD/Makefile
index 2366e995f2e3..c75a65635950 100644
--- a/devel/p5-Test-Fake-HTTPD/Makefile
+++ b/devel/p5-Test-Fake-HTTPD/Makefile
@@ -13,23 +13,23 @@ COMMENT=	Fake HTTP server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Daemon>=0:${PORTSDIR}/www/p5-HTTP-Daemon \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Test-SharedFork>=0.29:${PORTSDIR}/devel/p5-Test-SharedFork \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Test-SharedFork>=0.29:devel/p5-Test-SharedFork \
+		p5-Test-TCP>=0:devel/p5-Test-TCP \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-Test-UseAllModules>=0:${PORTSDIR}/devel/p5-Test-UseAllModules \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-TCP>=0:devel/p5-Test-TCP \
+		p5-Test-UseAllModules>=0:devel/p5-Test-UseAllModules \
+		p5-libwww>=0:www/p5-libwww
 
 OPTIONS_DEFINE=	SSL
 
 USE_PERL5=	configure
 USES=		perl5
 
-SSL_BUILD_DEPENDS=	p5-HTTP-Daemon-SSL>=0:${PORTSDIR}/www/p5-HTTP-Daemon-SSL
-SSL_RUN_DEPENDS=	p5-HTTP-Daemon-SSL>=0:${PORTSDIR}/www/p5-HTTP-Daemon-SSL
+SSL_BUILD_DEPENDS=	p5-HTTP-Daemon-SSL>=0:www/p5-HTTP-Daemon-SSL
+SSL_RUN_DEPENDS=	p5-HTTP-Daemon-SSL>=0:www/p5-HTTP-Daemon-SSL
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-Fatal/Makefile b/devel/p5-Test-Fatal/Makefile
index 94686b8d3391..16fd64ae3818 100644
--- a/devel/p5-Test-Fatal/Makefile
+++ b/devel/p5-Test-Fatal/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Incredibly simple helpers for testing code with exceptions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Try-Tiny>=0.07:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Try-Tiny>=0.07:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-File-Contents/Makefile b/devel/p5-Test-File-Contents/Makefile
index e253ec6dc6cd..2e3a233fe38b 100644
--- a/devel/p5-Test-File-Contents/Makefile
+++ b/devel/p5-Test-File-Contents/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Test routines for examining the contents of files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Diff>=0.35:${PORTSDIR}/textproc/p5-Text-Diff
+BUILD_DEPENDS=	p5-Text-Diff>=0.35:textproc/p5-Text-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-File-ShareDir/Makefile b/devel/p5-Test-File-ShareDir/Makefile
index 4c91cabec6bd..c8afe05b635e 100644
--- a/devel/p5-Test-File-ShareDir/Makefile
+++ b/devel/p5-Test-File-ShareDir/Makefile
@@ -9,13 +9,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Create a fake ShareDir for your modules for testing
 
-BUILD_DEPENDS=	p5-Class-Tiny>0:${PORTSDIR}/devel/p5-Class-Tiny \
-		p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-ShareDir>=1.00:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Path-Tiny>=0.018:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Scope-Guard>0:${PORTSDIR}/devel/p5-Scope-Guard
+BUILD_DEPENDS=	p5-Class-Tiny>0:devel/p5-Class-Tiny \
+		p5-File-Copy-Recursive>0:devel/p5-File-Copy-Recursive \
+		p5-File-ShareDir>=1.00:devel/p5-File-ShareDir \
+		p5-Path-Tiny>=0.018:devel/p5-Path-Tiny \
+		p5-Scope-Guard>0:devel/p5-Scope-Guard
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-File/Makefile b/devel/p5-Test-File/Makefile
index 73ce0b119ee3..23545d39b0c3 100644
--- a/devel/p5-Test-File/Makefile
+++ b/devel/p5-Test-File/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Test file attributes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-utf8>=0:${PORTSDIR}/devel/p5-Test-utf8
+TEST_DEPENDS=	p5-Test-utf8>=0:devel/p5-Test-utf8
 
 NO_ARCH=	yes
 USES=		perl5
@@ -22,8 +22,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502104
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.006:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.006:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001.006:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001.006:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Filename/Makefile b/devel/p5-Test-Filename/Makefile
index 9b7930a43a5a..501297f6d06f 100644
--- a/devel/p5-Test-Filename/Makefile
+++ b/devel/p5-Test-Filename/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for portable filename comparison
 
 RUN_DEPENDS=	\
-	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny
+	p5-Path-Tiny>0:devel/p5-Path-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Fixture-DBIC-Schema/Makefile b/devel/p5-Test-Fixture-DBIC-Schema/Makefile
index 503b5ef814c8..2a0585e2ae94 100644
--- a/devel/p5-Test-Fixture-DBIC-Schema/Makefile
+++ b/devel/p5-Test-Fixture-DBIC-Schema/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module providing a DBIx::Class::Schema fixture data loader
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.07005:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Kwalify>=1.19:${PORTSDIR}/textproc/p5-Kwalify \
-		p5-Params-Validate>=0.15:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-YAML-Syck>=0.95:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-DBIx-Class>=0.07005:databases/p5-DBIx-Class \
+		p5-Kwalify>=1.19:textproc/p5-Kwalify \
+		p5-Params-Validate>=0.15:devel/p5-Params-Validate \
+		p5-YAML-Syck>=0.95:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Group/Makefile b/devel/p5-Test-Group/Makefile
index 9502c212cc54..9752d7292c2a 100644
--- a/devel/p5-Test-Group/Makefile
+++ b/devel/p5-Test-Group/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Group together related tests in a test suite
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Test-Cmd>=0:${PORTSDIR}/devel/p5-Test-Cmd
+BUILD_DEPENDS=	p5-File-Slurp>0:devel/p5-File-Slurp \
+		p5-Test-Cmd>=0:devel/p5-Test-Cmd
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-HTML-Tidy/Makefile b/devel/p5-Test-HTML-Tidy/Makefile
index ee6c8db0eb09..abc85b887164 100644
--- a/devel/p5-Test-HTML-Tidy/Makefile
+++ b/devel/p5-Test-HTML-Tidy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Test::More-style wrapper around HTML::Tidy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy
+BUILD_DEPENDS=	p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-If/Makefile b/devel/p5-Test-If/Makefile
index 0113f8d69609..a27e880cc490 100644
--- a/devel/p5-Test-If/Makefile
+++ b/devel/p5-Test-If/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Test only if
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-lib-abs>=0:${PORTSDIR}/devel/p5-lib-abs
+BUILD_DEPENDS=	p5-lib-abs>=0:devel/p5-lib-abs
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index 42443cbbffbf..a3300dfc46c3 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -14,19 +14,19 @@ COMMENT=	Inlining your tests next to the code being tested
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Algorithm-Dependency>=1.02:${PORTSDIR}/devel/p5-Algorithm-Dependency \
-		p5-Class-Autouse>=1.15:${PORTSDIR}/devel/p5-Class-Autouse \
-		p5-Config-Tiny>=2.00:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-File-Find-Rule>=0.26:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-Flat>=1.00:${PORTSDIR}/devel/p5-File-Flat \
-		p5-File-Remove>=0.37:${PORTSDIR}/devel/p5-File-Remove \
-		p5-File-Slurp>=9999.04:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-File-chmod>=0.31:${PORTSDIR}/devel/p5-File-chmod \
-		p5-Params-Util>=0.21:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Pod-Tests>=0.18:${PORTSDIR}/devel/p5-Pod-Tests
+RUN_DEPENDS=	p5-Algorithm-Dependency>=1.02:devel/p5-Algorithm-Dependency \
+		p5-Class-Autouse>=1.15:devel/p5-Class-Autouse \
+		p5-Config-Tiny>=2.00:devel/p5-Config-Tiny \
+		p5-File-Find-Rule>=0.26:devel/p5-File-Find-Rule \
+		p5-File-Flat>=1.00:devel/p5-File-Flat \
+		p5-File-Remove>=0.37:devel/p5-File-Remove \
+		p5-File-Slurp>=9999.04:devel/p5-File-Slurp \
+		p5-File-chmod>=0.31:devel/p5-File-chmod \
+		p5-Params-Util>=0.21:devel/p5-Params-Util \
+		p5-Pod-Tests>=0.18:devel/p5-Pod-Tests
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-ClassAPI>=1.02:${PORTSDIR}/devel/p5-Test-ClassAPI \
-		p5-Test-Script>=1.02:${PORTSDIR}/devel/p5-Test-Script
+BUILD_DEPENDS+=	p5-Test-ClassAPI>=1.02:devel/p5-Test-ClassAPI \
+		p5-Test-Script>=1.02:devel/p5-Test-Script
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-JSON/Makefile b/devel/p5-Test-JSON/Makefile
index 0513f62d2266..c15c50944e3f 100644
--- a/devel/p5-Test-JSON/Makefile
+++ b/devel/p5-Test-JSON/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${DISTVERSION:C/0$//}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test JSON data
 
-RUN_DEPENDS=	p5-Test-Differences>=0.47:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-JSON-Any>=1.20:${PORTSDIR}/converters/p5-JSON-Any
+RUN_DEPENDS=	p5-Test-Differences>=0.47:devel/p5-Test-Differences \
+		p5-JSON-Any>=1.20:converters/p5-JSON-Any
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -22,8 +22,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Kwalitee/Makefile b/devel/p5-Test-Kwalitee/Makefile
index ebe45913a880..9bc0c8dffd74 100644
--- a/devel/p5-Test-Kwalitee/Makefile
+++ b/devel/p5-Test-Kwalitee/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Test the Kwalitee of a distribution before you release it
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-CPANTS-Analyse>=0.92:${PORTSDIR}/devel/p5-Module-CPANTS-Analyse \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Module-CPANTS-Analyse>=0.92:devel/p5-Module-CPANTS-Analyse \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.007:${PORTSDIR}/devel/p5-CPAN-Meta-Check \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Warnings>=0.009:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.007:devel/p5-CPAN-Meta-Check \
+		p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Test-Warnings>=0.009:devel/p5-Test-Warnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Test-Lazy/Makefile b/devel/p5-Test-Lazy/Makefile
index de6b068d9c3e..79757b44f881 100644
--- a/devel/p5-Test-Lazy/Makefile
+++ b/devel/p5-Test-Lazy/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Quick and easy way to compose and run tests with useful output
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Test-Deep>0:devel/p5-Test-Deep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-LoadAllModules/Makefile b/devel/p5-Test-LoadAllModules/Makefile
index 495be1e3e4da..8943317cbf9c 100644
--- a/devel/p5-Test-LoadAllModules/Makefile
+++ b/devel/p5-Test-LoadAllModules/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to do use_ok for modules in search path
 
 RUN_DEPENDS=	\
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Log4perl/Makefile b/devel/p5-Test-Log4perl/Makefile
index 798d9c593404..522b9afc9826 100644
--- a/devel/p5-Test-Log4perl/Makefile
+++ b/devel/p5-Test-Log4perl/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Test::Log4perl - test Log::Log4perl
 
-BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Lingua-EN-Numbers-Ordinate>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Numbers-Ordinate \
-		p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Lingua-EN-Numbers-Ordinate>=0:textproc/p5-Lingua-EN-Numbers-Ordinate \
+		p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-ManyParams/Makefile b/devel/p5-Test-ManyParams/Makefile
index 0ef18b29bef4..2e8e56adef6d 100644
--- a/devel/p5-Test-ManyParams/Makefile
+++ b/devel/p5-Test-ManyParams/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to test many params as one test
 
-BUILD_DEPENDS=	p5-Set-CrossProduct>0:${PORTSDIR}/devel/p5-Set-CrossProduct \
-		p5-Test-Differences>0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Set-CrossProduct>0:devel/p5-Set-CrossProduct \
+		p5-Test-Differences>0:devel/p5-Test-Differences \
+		p5-Test-Exception>0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Memory-Cycle/Makefile b/devel/p5-Test-Memory-Cycle/Makefile
index a2d081917966..7253dd5b65d9 100644
--- a/devel/p5-Test-Memory-Cycle/Makefile
+++ b/devel/p5-Test-Memory-Cycle/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Check for memory leaks and circular memory references
 
-BUILD_DEPENDS=	p5-Devel-Cycle>=0:${PORTSDIR}/devel/p5-Devel-Cycle \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-Devel-Cycle>=0:devel/p5-Devel-Cycle \
+		p5-PadWalker>=0:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Mini-Unit/Makefile b/devel/p5-Test-Mini-Unit/Makefile
index f1a884724b2a..06012a2f03a9 100644
--- a/devel/p5-Test-Mini-Unit/Makefile
+++ b/devel/p5-Test-Mini-Unit/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kurt.lidl@cello.com
 COMMENT=	Declarative syntactic sugar for Test::Mini
 
-BUILD_DEPENDS=	p5-Devel-Declare>=0.6.0:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Test-Mini>=v1.1.3:${PORTSDIR}/devel/p5-Test-Mini
+BUILD_DEPENDS=	p5-Devel-Declare>=0.6.0:devel/p5-Devel-Declare \
+		p5-Test-Mini>=v1.1.3:devel/p5-Test-Mini
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Mini/Makefile b/devel/p5-Test-Mini/Makefile
index 62bf1f2549ca..441f179f51ca 100644
--- a/devel/p5-Test-Mini/Makefile
+++ b/devel/p5-Test-Mini/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kurt.lidl@cello.com
 COMMENT=	Provides lightweight unit testing framework
 
-BUILD_DEPENDS=	p5-Data-Inspect>=0.03:${PORTSDIR}/devel/p5-Data-Inspect \
-		p5-Exception-Class>=1.30:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Text-Outdent>=0.01:${PORTSDIR}/devel/p5-Text-Outdent \
-		p5-Try-Tiny>=0.04:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-aliased>=0.30:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-clean>=0.14:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Data-Inspect>=0.03:devel/p5-Data-Inspect \
+		p5-Exception-Class>=1.30:devel/p5-Exception-Class \
+		p5-IO-stringy>=2.110:devel/p5-IO-stringy \
+		p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
+		p5-Text-Outdent>=0.01:devel/p5-Text-Outdent \
+		p5-Try-Tiny>=0.04:lang/p5-Try-Tiny \
+		p5-aliased>=0.30:devel/p5-aliased \
+		p5-namespace-clean>=0.14:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Mock-Guard/Makefile b/devel/p5-Test-Mock-Guard/Makefile
index f2f3a2cddd3b..1cee6efdf1e9 100644
--- a/devel/p5-Test-Mock-Guard/Makefile
+++ b/devel/p5-Test-Mock-Guard/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl extension for simple mock test library using RAII
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load
-RUN_DEPENDS=	p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load
+BUILD_DEPENDS=	p5-Class-Load>=0.06:devel/p5-Class-Load
+RUN_DEPENDS=	p5-Class-Load>=0.06:devel/p5-Class-Load
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Test-Mock-LWP-Dispatch/Makefile b/devel/p5-Test-Mock-LWP-Dispatch/Makefile
index d9da830edfc7..e16147c22c65 100644
--- a/devel/p5-Test-Mock-LWP-Dispatch/Makefile
+++ b/devel/p5-Test-Mock-LWP-Dispatch/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Mocks LWP::UserAgent and dispatches your requests/responses
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Mock-LWP/Makefile b/devel/p5-Test-Mock-LWP/Makefile
index a691eeb37ab3..58a45047b3e5 100644
--- a/devel/p5-Test-Mock-LWP/Makefile
+++ b/devel/p5-Test-Mock-LWP/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Easy mocking of LWP packages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-MockObject>=1.08:${PORTSDIR}/devel/p5-Test-MockObject
+BUILD_DEPENDS=	p5-Test-MockObject>=1.08:devel/p5-Test-MockObject
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-MockModule/Makefile b/devel/p5-Test-MockModule/Makefile
index 9cda8f68c6cd..08660aad934b 100644
--- a/devel/p5-Test-MockModule/Makefile
+++ b/devel/p5-Test-MockModule/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Override subroutines in a module for unit testing
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-SUPER>=0:${PORTSDIR}/devel/p5-SUPER
+BUILD_DEPENDS=	p5-SUPER>=0:devel/p5-SUPER
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-MockObject/Makefile b/devel/p5-Test-MockObject/Makefile
index 9555b8e6354b..6a89f996d0da 100644
--- a/devel/p5-Test-MockObject/Makefile
+++ b/devel/p5-Test-MockObject/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Tests remote URLs or local web files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-UNIVERSAL-can>=1.20110617:${PORTSDIR}/devel/p5-UNIVERSAL-can \
-		p5-UNIVERSAL-isa>=1.20110614:${PORTSDIR}/devel/p5-UNIVERSAL-isa
-RUN_DEPENDS=	p5-UNIVERSAL-can>=1.20110617:${PORTSDIR}/devel/p5-UNIVERSAL-can \
-		p5-UNIVERSAL-isa>=1.20110614:${PORTSDIR}/devel/p5-UNIVERSAL-isa
-TEST_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-UNIVERSAL-can>=1.20110617:devel/p5-UNIVERSAL-can \
+		p5-UNIVERSAL-isa>=1.20110614:devel/p5-UNIVERSAL-isa
+RUN_DEPENDS=	p5-UNIVERSAL-can>=1.20110617:devel/p5-UNIVERSAL-can \
+		p5-UNIVERSAL-isa>=1.20110614:devel/p5-UNIVERSAL-isa
+TEST_DEPENDS=	p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+		p5-Test-Warn>=0.23:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-MockTime/Makefile b/devel/p5-Test-MockTime/Makefile
index 671bf010ee67..fd6cf86fb121 100644
--- a/devel/p5-Test-MockTime/Makefile
+++ b/devel/p5-Test-MockTime/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Replaces actual time with simulated time
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece
-RUN_DEPENDS=	p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece
+BUILD_DEPENDS=	p5-Time-Piece>=0:devel/p5-Time-Piece
+RUN_DEPENDS=	p5-Time-Piece>=0:devel/p5-Time-Piece
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Modern/Makefile b/devel/p5-Test-Modern/Makefile
index 244093b046ac..d5e98bf40173 100644
--- a/devel/p5-Test-Modern/Makefile
+++ b/devel/p5-Test-Modern/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Precision testing for modern perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-Import-Into>=1:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Test-API>=0.004:${PORTSDIR}/devel/p5-Test-API \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>0:${PORTSDIR}/devel/p5-Test-Warnings
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+		p5-Import-Into>=1:devel/p5-Import-Into \
+		p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Test-API>=0.004:devel/p5-Test-API \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>0:devel/p5-Test-Warnings
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Module-Used/Makefile b/devel/p5-Test-Module-Used/Makefile
index 2e03f30f0391..f24bd89aa0a1 100644
--- a/devel/p5-Test-Module-Used/Makefile
+++ b/devel/p5-Test-Module-Used/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Test required module is really used and vice versa
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-CPAN-Meta>=2.102400:${PORTSDIR}/devel/p5-CPAN-Meta \
-		p5-List-MoreUtils>=0.24:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-CoreList>=2.18:${PORTSDIR}/devel/p5-Module-CoreList \
-		p5-Module-Used>=v1.2.0:${PORTSDIR}/devel/p5-Module-Used \
-		p5-PPI>=1.205:${PORTSDIR}/textproc/p5-PPI
+RUN_DEPENDS=	p5-CPAN-Meta>=2.102400:devel/p5-CPAN-Meta \
+		p5-List-MoreUtils>=0.24:lang/p5-List-MoreUtils \
+		p5-Module-CoreList>=2.18:devel/p5-Module-CoreList \
+		p5-Module-Used>=v1.2.0:devel/p5-Module-Used \
+		p5-PPI>=1.205:textproc/p5-PPI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Moose-More/Makefile b/devel/p5-Test-Moose-More/Makefile
index 9e3cd05ab24e..9e4c52d3ed34 100644
--- a/devel/p5-Test-Moose-More/Makefile
+++ b/devel/p5-Test-Moose-More/Makefile
@@ -11,15 +11,15 @@ COMMENT=	More tools for testing Moose packages
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Syntax-Keyword-Junction>=0:${PORTSDIR}/devel/p5-Syntax-Keyword-Junction \
-		p5-Sub-Exporter-Progressive>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive \
-		p5-TAP-SimpleOutput>=0:${PORTSDIR}/devel/p5-TAP-SimpleOutput \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Data-OptList>=0:devel/p5-Data-OptList \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Syntax-Keyword-Junction>=0:devel/p5-Syntax-Keyword-Junction \
+		p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive \
+		p5-TAP-SimpleOutput>=0:devel/p5-TAP-SimpleOutput \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-Perl-Version>=0:${PORTSDIR}/devel/p5-Perl-Version
+TEST_DEPENDS=	p5-aliased>=0:devel/p5-aliased \
+		p5-Perl-Version>=0:devel/p5-Perl-Version
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-More-UTF8/Makefile b/devel/p5-Test-More-UTF8/Makefile
index a607629efbc4..cd1743de474a 100644
--- a/devel/p5-Test-More-UTF8/Makefile
+++ b/devel/p5-Test-More-UTF8/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Enhancing Test::More for UTF-8-based projects
 
-BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Most/Makefile b/devel/p5-Test-Most/Makefile
index 059ccf787277..48e4d2eef986 100644
--- a/devel/p5-Test-Most/Makefile
+++ b/devel/p5-Test-Most/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for most commonly needed test functions and features
 
 RUN_DEPENDS=	\
-	p5-Exception-Class>=1.14:${PORTSDIR}/devel/p5-Exception-Class \
-	p5-Test-Deep>=0.106:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-Differences>=0.61:${PORTSDIR}/devel/p5-Test-Differences \
-	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn
+	p5-Exception-Class>=1.14:devel/p5-Exception-Class \
+	p5-Test-Deep>=0.106:devel/p5-Test-Deep \
+	p5-Test-Differences>=0.61:devel/p5-Test-Differences \
+	p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+	p5-Test-Warn>=0.23:devel/p5-Test-Warn
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Name-FromLine/Makefile b/devel/p5-Test-Name-FromLine/Makefile
index dcd34704a74b..cf2c74a1f408 100644
--- a/devel/p5-Test-Name-FromLine/Makefile
+++ b/devel/p5-Test-Name-FromLine/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp
+	p5-File-Slurp>0:devel/p5-File-Slurp
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Net-LDAP/Makefile b/devel/p5-Test-Net-LDAP/Makefile
index c822c59daf56..855664f564c8 100644
--- a/devel/p5-Test-Net-LDAP/Makefile
+++ b/devel/p5-Test-Net-LDAP/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension of Net::LDAP subclass for testing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-perl-ldap>=0.5800:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-perl-ldap>=0.5800:net/p5-perl-ldap
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Net-RabbitMQ/Makefile b/devel/p5-Test-Net-RabbitMQ/Makefile
index 798613723612..ddd495cffe7c 100644
--- a/devel/p5-Test-Net-RabbitMQ/Makefile
+++ b/devel/p5-Test-Net-RabbitMQ/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl mock RabbitMQ implementation for use when testing
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-NoWarnings/Makefile b/devel/p5-Test-NoWarnings/Makefile
index 1a760eeeea7d..fb5551ed2949 100644
--- a/devel/p5-Test-NoWarnings/Makefile
+++ b/devel/p5-Test-NoWarnings/Makefile
@@ -22,14 +22,14 @@ DEVEL_STACKTRACE_DESC=	Stack trace support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEVEL_STACKTRACE}
-BUILD_DEPENDS+=	p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace
-RUN_DEPENDS+=	p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace
+BUILD_DEPENDS+=	p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace
+RUN_DEPENDS+=	p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-OpenLDAP/Makefile b/devel/p5-Test-OpenLDAP/Makefile
index df33829f44cd..0c6ef2a412e8 100644
--- a/devel/p5-Test-OpenLDAP/Makefile
+++ b/devel/p5-Test-OpenLDAP/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \
-	p5-perl-ldap>0:${PORTSDIR}/net/p5-perl-ldap \
-	${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-server \
-	p5-Net>0:${PORTSDIR}/net/p5-Net
+	p5-Data-UUID>0:devel/p5-Data-UUID \
+	p5-perl-ldap>0:net/p5-perl-ldap \
+	${LOCALBASE}/libexec/slapd:net/openldap${OPENLDAP_VER}-server \
+	p5-Net>0:net/p5-Net
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Output/Makefile b/devel/p5-Test-Output/Makefile
index a5e7502b264f..ac3cb5a67f95 100644
--- a/devel/p5-Test-Output/Makefile
+++ b/devel/p5-Test-Output/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Utilities to test STDOUT and STDERR messages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0.17:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Capture-Tiny>=0.17:devel/p5-Capture-Tiny \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-POE-Client-TCP/Makefile b/devel/p5-Test-POE-Client-TCP/Makefile
index bf1ce6d0a363..0a2b4cdebbef 100644
--- a/devel/p5-Test-POE-Client-TCP/Makefile
+++ b/devel/p5-Test-POE-Client-TCP/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	POE Component providing TCP client services for test cases
 
-BUILD_DEPENDS=	p5-POE>=1.28:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=1.28:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-POE-Server-TCP/Makefile b/devel/p5-Test-POE-Server-TCP/Makefile
index fbb0ebf916a7..03ea74f94cb6 100644
--- a/devel/p5-Test-POE-Server-TCP/Makefile
+++ b/devel/p5-Test-POE-Server-TCP/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	POE Component providing TCP server services for test cases
 
-BUILD_DEPENDS=	p5-POE>=1.004:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=1.004:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Parser/Makefile b/devel/p5-Test-Parser/Makefile
index 3ba0a8db2e13..35f599a46b82 100644
--- a/devel/p5-Test-Parser/Makefile
+++ b/devel/p5-Test-Parser/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parsing log files from test runs, and displays in an XML syntax
 
-RUN_DEPENDS=	p5-Chart-Graph>=0:${PORTSDIR}/graphics/p5-Chart-Graph \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS=	p5-Chart-Graph>=0:graphics/p5-Chart-Graph \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-PerlTidy/Makefile b/devel/p5-Test-PerlTidy/Makefile
index d66f538b3e78..42c29a98abcb 100644
--- a/devel/p5-Test-PerlTidy/Makefile
+++ b/devel/p5-Test-PerlTidy/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to check that all your files are tidy
 
 RUN_DEPENDS=	\
-	p5-File-Finder>0:${PORTSDIR}/devel/p5-File-Finder \
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-	perltidy:${PORTSDIR}/devel/p5-Perl-Tidy \
-	p5-Text-Diff>0:${PORTSDIR}/textproc/p5-Text-Diff
+	p5-File-Finder>0:devel/p5-File-Finder \
+	p5-File-Slurp>0:devel/p5-File-Slurp \
+	perltidy:devel/p5-Perl-Tidy \
+	p5-Text-Diff>0:textproc/p5-Text-Diff
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Pod-Coverage-Permissive/Makefile b/devel/p5-Test-Pod-Coverage-Permissive/Makefile
index a67b26decb0f..8c25a8acad48 100644
--- a/devel/p5-Test-Pod-Coverage-Permissive/Makefile
+++ b/devel/p5-Test-Pod-Coverage-Permissive/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Checks for pod coverage regression
 
-RUN_DEPENDS=	p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
-		p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+RUN_DEPENDS=	p5-PathTools>=0:devel/p5-PathTools \
+		p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Pod-Coverage/Makefile b/devel/p5-Test-Pod-Coverage/Makefile
index 77ff52b34554..11b21df9e841 100644
--- a/devel/p5-Test-Pod-Coverage/Makefile
+++ b/devel/p5-Test-Pod-Coverage/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Check for pod coverage in your distribution
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	p5-Pod-Coverage>0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Test-Simple>0:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Pod-Coverage>0:devel/p5-Pod-Coverage \
+		p5-Test-Simple>0:devel/p5-Test-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Prereq/Makefile b/devel/p5-Test-Prereq/Makefile
index e8f38f44c31c..d02c6c48e260 100644
--- a/devel/p5-Test-Prereq/Makefile
+++ b/devel/p5-Test-Prereq/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Check if Makefile.PL has the right pre-requisites
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Info>=0:${PORTSDIR}/devel/p5-Module-Info
+BUILD_DEPENDS=	p5-Module-Info>=0:devel/p5-Module-Info
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Refcount/Makefile b/devel/p5-Test-Refcount/Makefile
index fbf2ff8994e9..5c4693671fef 100644
--- a/devel/p5-Test-Refcount/Makefile
+++ b/devel/p5-Test-Refcount/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Assert reference counts on objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-MAT>=0:${PORTSDIR}/devel/p5-Devel-MAT
+BUILD_DEPENDS=	p5-Devel-MAT>=0:devel/p5-Devel-MAT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Test-Reporter-Transport-Metabase/Makefile b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
index 7633438bafeb..592e51a8712c 100644
--- a/devel/p5-Test-Reporter-Transport-Metabase/Makefile
+++ b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Metabase transport for Test::Reporter
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Config-Perl-V>0:${PORTSDIR}/devel/p5-Config-Perl-V \
-		p5-CPAN-Testers-Report>0:${PORTSDIR}/devel/p5-CPAN-Testers-Report \
-		p5-Metabase-Fact>0:${PORTSDIR}/devel/p5-Metabase-Fact \
-		p5-Metabase-Client-Simple>0:${PORTSDIR}/devel/p5-Metabase-Client-Simple \
-		p5-Test-Reporter>>1.54:${PORTSDIR}/devel/p5-Test-Reporter
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-Config-Perl-V>0:devel/p5-Config-Perl-V \
+		p5-CPAN-Testers-Report>0:devel/p5-CPAN-Testers-Report \
+		p5-Metabase-Fact>0:devel/p5-Metabase-Fact \
+		p5-Metabase-Client-Simple>0:devel/p5-Metabase-Client-Simple \
+		p5-Test-Reporter>>1.54:devel/p5-Test-Reporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Reporter/Makefile b/devel/p5-Test-Reporter/Makefile
index 5238fd6a3173..dfd8cd82b665 100644
--- a/devel/p5-Test-Reporter/Makefile
+++ b/devel/p5-Test-Reporter/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Sends test results to cpan-testers@perl.org
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Net>0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Net>0:net/p5-Net
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Script-Run/Makefile b/devel/p5-Test-Script-Run/Makefile
index 7a603d811c66..1ec18d265d7c 100644
--- a/devel/p5-Test-Script-Run/Makefile
+++ b/devel/p5-Test-Script-Run/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Test the script with run
 
-RUN_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+RUN_DEPENDS=	p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Script/Makefile b/devel/p5-Test-Script/Makefile
index ac35c9d1feff..df32150c9664 100644
--- a/devel/p5-Test-Script/Makefile
+++ b/devel/p5-Test-Script/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test::Script - Cross-platform basic tests for scripts
 
-RUN_DEPENDS=	p5-IPC-Run3>=0.034:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Probe-Perl>=0.01:${PORTSDIR}/sysutils/p5-Probe-Perl
+RUN_DEPENDS=	p5-IPC-Run3>=0.034:devel/p5-IPC-Run3 \
+		p5-Probe-Perl>=0.01:sysutils/p5-Probe-Perl
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-SharedFork/Makefile b/devel/p5-Test-SharedFork/Makefile
index 30735ae8f440..8d603c88e316 100644
--- a/devel/p5-Test-SharedFork/Makefile
+++ b/devel/p5-Test-SharedFork/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension for fork test
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Singleton/Makefile b/devel/p5-Test-Singleton/Makefile
index bf2fd0b8c2fb..c49564db946e 100644
--- a/devel/p5-Test-Singleton/Makefile
+++ b/devel/p5-Test-Singleton/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Test for Singleton classes
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Class-Singleton>=0:${PORTSDIR}/devel/p5-Class-Singleton
+BUILD_DEPENDS=	p5-Class-Singleton>=0:devel/p5-Class-Singleton
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Spec/Makefile b/devel/p5-Test-Spec/Makefile
index a137d10702df..7d111f29d47d 100644
--- a/devel/p5-Test-Spec/Makefile
+++ b/devel/p5-Test-Spec/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Write tests in a declarative specification style
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Package-Stash>=0.23:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Test-Deep>=0.103:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS=	p5-Package-Stash>=0.23:devel/p5-Package-Stash \
+		p5-Test-Deep>=0.103:devel/p5-Test-Deep \
+		p5-Test-Trap>=0:devel/p5-Test-Trap \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Test-Spelling/Makefile b/devel/p5-Test-Spelling/Makefile
index 8ac9ed51ca82..2dd90ed29b64 100644
--- a/devel/p5-Test-Spelling/Makefile
+++ b/devel/p5-Test-Spelling/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Check for spelling errors in POD files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Pod-Spell>=0:${PORTSDIR}/textproc/p5-Pod-Spell \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3
-RUN_DEPENDS=	p5-Pod-Spell>=0:${PORTSDIR}/textproc/p5-Pod-Spell \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3
+BUILD_DEPENDS=	p5-Pod-Spell>=0:textproc/p5-Pod-Spell \
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3
+RUN_DEPENDS=	p5-Pod-Spell>=0:textproc/p5-Pod-Spell \
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3
 
 USES=		perl5
 USE_PERL5=	configure
@@ -25,7 +25,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Strict/Makefile b/devel/p5-Test-Strict/Makefile
index 87cb892a4f54..f2499323146d 100644
--- a/devel/p5-Test-Strict/Makefile
+++ b/devel/p5-Test-Strict/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Devel-Cover>=0.43:${PORTSDIR}/devel/p5-Devel-Cover
+BUILD_DEPENDS=	p5-Devel-Cover>=0.43:devel/p5-Devel-Cover
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Test-SubCalls/Makefile b/devel/p5-Test-SubCalls/Makefile
index 7e0f6f71bd3c..c37459985c1f 100644
--- a/devel/p5-Test-SubCalls/Makefile
+++ b/devel/p5-Test-SubCalls/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Track the number of times subs are called
 
-BUILD_DEPENDS=	p5-Hook-LexWrap>=0:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Synopsis/Makefile b/devel/p5-Test-Synopsis/Makefile
index ba098c95f075..c66213694e04 100644
--- a/devel/p5-Test-Synopsis/Makefile
+++ b/devel/p5-Test-Synopsis/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tsucchi@cpan.org
 COMMENT=	Test your SYNOPSIS code in CPAN module
 
-BUILD_DEPENDS=	p5-Filter>=1.35:${PORTSDIR}/devel/p5-Filter \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	p5-Filter>=1.35:${PORTSDIR}/devel/p5-Filter \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Filter>=1.35:devel/p5-Filter \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Filter>=1.35:devel/p5-Filter \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Sys-Info/Makefile b/devel/p5-Test-Sys-Info/Makefile
index cdd6512f95ba..c0e338e30232 100644
--- a/devel/p5-Test-Sys-Info/Makefile
+++ b/devel/p5-Test-Sys-Info/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Centralized test suite for Sys::Info
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Test-TAP-HTMLMatrix/Makefile b/devel/p5-Test-TAP-HTMLMatrix/Makefile
index cb65439d1205..7b07ac989207 100644
--- a/devel/p5-Test-TAP-HTMLMatrix/Makefile
+++ b/devel/p5-Test-TAP-HTMLMatrix/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Creates colorful matrix of Test::Harness test run results
 
-BUILD_DEPENDS=	p5-Test-TAP-Model>=0:${PORTSDIR}/devel/p5-Test-TAP-Model \
-		p5-Petal>=0:${PORTSDIR}/textproc/p5-Petal \
-		p5-Petal-Utils>=0:${PORTSDIR}/textproc/p5-Petal-Utils \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Test-TAP-Model>=0:devel/p5-Test-TAP-Model \
+		p5-Petal>=0:textproc/p5-Petal \
+		p5-Petal-Utils>=0:textproc/p5-Petal-Utils \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-TAP-Model/Makefile b/devel/p5-Test-TAP-Model/Makefile
index faacdbfdb790..9440c3971f0a 100644
--- a/devel/p5-Test-TAP-Model/Makefile
+++ b/devel/p5-Test-TAP-Model/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Accessible result collector for Test::Harness::Straps runs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Method-Alias>=0:${PORTSDIR}/devel/p5-Method-Alias \
-		p5-Test-Harness-Straps>=0.30:${PORTSDIR}/devel/p5-Test-Harness-Straps
+BUILD_DEPENDS=	p5-Method-Alias>=0:devel/p5-Method-Alias \
+		p5-Test-Harness-Straps>=0.30:devel/p5-Test-Harness-Straps
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-TCP/Makefile b/devel/p5-Test-TCP/Makefile
index aedb8ad713ee..85c54fc1aef6 100644
--- a/devel/p5-Test-TCP/Makefile
+++ b/devel/p5-Test-TCP/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for testing TCP program
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-SharedFork>=0.19:${PORTSDIR}/devel/p5-Test-SharedFork
+BUILD_DEPENDS=	p5-Test-SharedFork>=0.19:devel/p5-Test-SharedFork
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -22,8 +22,8 @@ NO_ARCH=	YES
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501908
-BUILD_DEPENDS+=	p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP
-RUN_DEPENDS+=	p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP
+BUILD_DEPENDS+=	p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP
+RUN_DEPENDS+=	p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Timer/Makefile b/devel/p5-Test-Timer/Makefile
index 9b5b9e28ee6d..375260a6ab8f 100644
--- a/devel/p5-Test-Timer/Makefile
+++ b/devel/p5-Test-Timer/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl test module to test/assert response times
 
-BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
-RUN_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
+BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
+RUN_DEPENDS=	p5-Error>=0:lang/p5-Error
 
 USES=		perl5
 USE_PERL5=	configure
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Trap/Makefile b/devel/p5-Test-Trap/Makefile
index a3d17b32b927..486983cf3929 100644
--- a/devel/p5-Test-Trap/Makefile
+++ b/devel/p5-Test-Trap/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Trap exit codes, exceptions, output, etc
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump
+BUILD_DEPENDS=	p5-Data-Dump>=0:devel/p5-Data-Dump
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Refcount>=0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-Refcount>=0:devel/p5-Test-Refcount
 
 USE_PERL5=	configure
 USES=		perl5
@@ -24,7 +24,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=  p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=  p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Unit/Makefile b/devel/p5-Test-Unit/Makefile
index e50c9a5957d7..2cc89ccfc16d 100644
--- a/devel/p5-Test-Unit/Makefile
+++ b/devel/p5-Test-Unit/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PerlUnit testing framework
 
-BUILD_DEPENDS=	p5-Class-Inner>=0:${PORTSDIR}/devel/p5-Class-Inner \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error
+BUILD_DEPENDS=	p5-Class-Inner>=0:devel/p5-Class-Inner \
+		p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-Error>=0:lang/p5-Error
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-Test-Version/Makefile b/devel/p5-Test-Version/Makefile
index 4b91acde74ef..296943a508da 100644
--- a/devel/p5-Test-Version/Makefile
+++ b/devel/p5-Test-Version/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Check to see that version in modules are sane
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-File-Find-Rule-Perl>=0:${PORTSDIR}/devel/p5-File-Find-Rule-Perl
+BUILD_DEPENDS=	p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USE_PERL5=	configure
 USES=		perl5
@@ -23,7 +23,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-WWW-Declare/Makefile b/devel/p5-Test-WWW-Declare/Makefile
index 9d85cdd15002..a7680f618244 100644
--- a/devel/p5-Test-WWW-Declare/Makefile
+++ b/devel/p5-Test-WWW-Declare/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Declarative testing for your web app
 
-BUILD_DEPENDS=	p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+BUILD_DEPENDS=	p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-WWW-Mechanize-CGI/Makefile b/devel/p5-Test-WWW-Mechanize-CGI/Makefile
index a849391c3ec0..e1ec6efbbf8e 100644
--- a/devel/p5-Test-WWW-Mechanize-CGI/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-CGI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test CGI applications with Test::WWW::Mechanize
 
-RUN_DEPENDS=	p5-WWW-Mechanize-CGI>=0.2:${PORTSDIR}/www/p5-WWW-Mechanize-CGI \
-		p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+RUN_DEPENDS=	p5-WWW-Mechanize-CGI>=0.2:www/p5-WWW-Mechanize-CGI \
+		p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile b/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
index a28680f81a2d..9979eaf59afa 100644
--- a/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Test::WWW::Mechanize for CGIApp
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-HTTP-Request-AsCGI>=0:${PORTSDIR}/www/p5-HTTP-Request-AsCGI \
-		p5-Test-WWW-Mechanize>=1.14:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-HTTP-Request-AsCGI>=0:www/p5-HTTP-Request-AsCGI \
+		p5-Test-WWW-Mechanize>=1.14:devel/p5-Test-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
index cb781fcd2299..649349425411 100644
--- a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Test::WWW::Mechanize for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.9000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Moose>=0.67:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-WWW-Mechanize>=1.14:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
-		p5-WWW-Mechanize>=1.54:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-namespace-clean>=0.09:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.9000:www/p5-Catalyst-Runtime \
+		p5-Moose>=0.67:devel/p5-Moose \
+		p5-Test-WWW-Mechanize>=1.14:devel/p5-Test-WWW-Mechanize \
+		p5-WWW-Mechanize>=1.54:www/p5-WWW-Mechanize \
+		p5-namespace-clean>=0.09:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Plugin-Session-State-Cookie>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-State-Cookie \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-utf8>=0:${PORTSDIR}/devel/p5-Test-utf8
+TEST_DEPENDS=	p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-utf8>=0:devel/p5-Test-utf8
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-WWW-Mechanize-PSGI/Makefile b/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
index 83fe5b8c80eb..62088f4fa048 100644
--- a/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to test PSGI programs using WWW::Mechanize
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Test-WWW-Mechanize>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Plack>0:www/p5-Plack \
+	p5-Test-WWW-Mechanize>0:devel/p5-Test-WWW-Mechanize \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-WWW-Mechanize/Makefile b/devel/p5-Test-WWW-Mechanize/Makefile
index 5a4e1b9ed3f2..e419c17d94c8 100644
--- a/devel/p5-Test-WWW-Mechanize/Makefile
+++ b/devel/p5-Test-WWW-Mechanize/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Testing-specific WWW::Mechanize subclass
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Carp-Assert-More>=0:${PORTSDIR}/devel/p5-Carp-Assert-More \
-		p5-HTML-Tree>0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTTP-Server-Simple>=0.42:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-Test-LongString>=0.15:${PORTSDIR}/devel/p5-Test-LongString \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=1.68:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-libwww>=6.02:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \
+		p5-HTML-Tree>0:www/p5-HTML-Tree \
+		p5-HTTP-Server-Simple>=0.42:www/p5-HTTP-Server-Simple \
+		p5-Test-LongString>=0.15:devel/p5-Test-LongString \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=1.68:www/p5-WWW-Mechanize \
+		p5-libwww>=6.02:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-WWW-Selenium/Makefile b/devel/p5-Test-WWW-Selenium/Makefile
index 5ea4cc3bca0e..b36ed3c6702c 100644
--- a/devel/p5-Test-WWW-Selenium/Makefile
+++ b/devel/p5-Test-WWW-Selenium/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Perl driver and test library for Selenium Remote Control (SRC)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Devel-REPL>=0:${PORTSDIR}/devel/p5-Devel-REPL
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Devel-REPL>=0:devel/p5-Devel-REPL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Mock-LWP>=0:${PORTSDIR}/devel/p5-Test-Mock-LWP \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Mock-LWP>=0:devel/p5-Test-Mock-LWP \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Warn/Makefile b/devel/p5-Test-Warn/Makefile
index d4e768fc4605..e1eb706254db 100644
--- a/devel/p5-Test-Warn/Makefile
+++ b/devel/p5-Test-Warn/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension to test methods for warnings
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Uplevel>=0.12:${PORTSDIR}/devel/p5-Sub-Uplevel
+BUILD_DEPENDS=	p5-Sub-Uplevel>=0.12:devel/p5-Sub-Uplevel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Warnings/Makefile b/devel/p5-Test-Warnings/Makefile
index 905536763421..fe881f0b38f9 100644
--- a/devel/p5-Test-Warnings/Makefile
+++ b/devel/p5-Test-Warnings/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENCE_FILE=	${WRKSRC}/LICENCE
 
-TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.011:${PORTSDIR}/devel/p5-CPAN-Meta-Check \
-		p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Test-Kwalitee>=1.12:${PORTSDIR}/devel/p5-Test-Kwalitee
+TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
+		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Test-Kwalitee>=1.12:devel/p5-Test-Kwalitee
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -25,7 +25,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-XML-Valid/Makefile b/devel/p5-Test-XML-Valid/Makefile
index 836f7421b5f6..34f209bb2c0c 100644
--- a/devel/p5-Test-XML-Valid/Makefile
+++ b/devel/p5-Test-XML-Valid/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Validate XML and XHTML
 
-RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-Test-Simple>0:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML \
+		p5-Test-Simple>0:devel/p5-Test-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-XML/Makefile b/devel/p5-Test-XML/Makefile
index 6ccc21e8a88c..28ec3b72939c 100644
--- a/devel/p5-Test-XML/Makefile
+++ b/devel/p5-Test-XML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Compare XML in perl tests
 
-BUILD_DEPENDS=	p5-XML-SemanticDiff>=0:${PORTSDIR}/textproc/p5-XML-SemanticDiff \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-SemanticDiff>=0:textproc/p5-XML-SemanticDiff \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-YAML-Meta/Makefile b/devel/p5-Test-YAML-Meta/Makefile
index e1b9c4a3a84f..3be585060e10 100644
--- a/devel/p5-Test-YAML-Meta/Makefile
+++ b/devel/p5-Test-YAML-Meta/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Validation of the META.yml file in a distribution
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Test-YAML-Valid>=0:${PORTSDIR}/devel/p5-Test-YAML-Valid \
-		p5-Test-CPAN-Meta-YAML>=0.17:${PORTSDIR}/devel/p5-Test-CPAN-Meta-YAML
+BUILD_DEPENDS=	p5-Test-YAML-Valid>=0:devel/p5-Test-YAML-Valid \
+		p5-Test-CPAN-Meta-YAML>=0.17:devel/p5-Test-CPAN-Meta-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Test-YAML-Valid/Makefile b/devel/p5-Test-YAML-Valid/Makefile
index 2bf94d465d49..b78e9024030b 100644
--- a/devel/p5-Test-YAML-Valid/Makefile
+++ b/devel/p5-Test-YAML-Valid/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test for valid YAML
 
-RUN_DEPENDS=	p5-YAML>=0.60:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-YAML>=0.60:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -20,8 +20,8 @@ USE_PERL5=	configure
 OPTIONS_DEFINE=	YAMLSYCK
 YAMLSYCK_DESC=	Use YAML::Syck for testing
 
-YAMLSYCK_RUN_DEPENDS=	p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck
-YAMLSYCK_BUILD_DEPENDS=	p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck
+YAMLSYCK_RUN_DEPENDS=	p5-YAML-Syck>0:textproc/p5-YAML-Syck
+YAMLSYCK_BUILD_DEPENDS=	p5-YAML-Syck>0:textproc/p5-YAML-Syck
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e '/auto_install.*/d' \
diff --git a/devel/p5-Test-YAML/Makefile b/devel/p5-Test-YAML/Makefile
index 2f4db0bdf014..eb91153e27de 100644
--- a/devel/p5-Test-YAML/Makefile
+++ b/devel/p5-Test-YAML/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Testing Module for YAML Implementations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		p5-Test-Base>=0.88:${PORTSDIR}/devel/p5-Test-Base
+BUILD_DEPENDS=	bash:shells/bash \
+		p5-Test-Base>=0.88:devel/p5-Test-Base
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS_INSTALL=	p5-YAML-0.*
diff --git a/devel/p5-Test2-Suite/Makefile b/devel/p5-Test2-Suite/Makefile
index fb229e869035..ba3fd70b2ef6 100644
--- a/devel/p5-Test2-Suite/Makefile
+++ b/devel/p5-Test2-Suite/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Test2>=0.000027:${PORTSDIR}/devel/p5-Test2
+BUILD_DEPENDS=	p5-Test2>=0.000027:devel/p5-Test2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Text-Levenshtein/Makefile b/devel/p5-Text-Levenshtein/Makefile
index 8f2f8f12be5c..cc8254dea65d 100644
--- a/devel/p5-Text-Levenshtein/Makefile
+++ b/devel/p5-Text-Levenshtein/Makefile
@@ -20,8 +20,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Unicode-Collate>=1.04:${PORTSDIR}/textproc/p5-Unicode-Collate
-RUN_DEPENDS+=	p5-Unicode-Collate>=1.04:${PORTSDIR}/textproc/p5-Unicode-Collate
+BUILD_DEPENDS+=	p5-Unicode-Collate>=1.04:textproc/p5-Unicode-Collate
+RUN_DEPENDS+=	p5-Unicode-Collate>=1.04:textproc/p5-Unicode-Collate
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Text-vFile-asData/Makefile b/devel/p5-Text-vFile-asData/Makefile
index 756e06b984cb..3cc66a1b70cf 100644
--- a/devel/p5-Text-vFile-asData/Makefile
+++ b/devel/p5-Text-vFile-asData/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Parse vFile formatted files into data structures
 
-RUN_DEPENDS=	p5-Class-Accessor-Chained>0:${PORTSDIR}/devel/p5-Class-Accessor-Chained
+RUN_DEPENDS=	p5-Class-Accessor-Chained>0:devel/p5-Class-Accessor-Chained
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-TheSchwartz-Simple/Makefile b/devel/p5-TheSchwartz-Simple/Makefile
index 7b2ccbb860a0..71ae273767a7 100644
--- a/devel/p5-TheSchwartz-Simple/Makefile
+++ b/devel/p5-TheSchwartz-Simple/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI only job dispatcher for TheSchwartz
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
index 2b246f971063..0d777b31ba8b 100644
--- a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
+++ b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	TheSchwartz Worker Task to Send Email
 
-BUILD_DEPENDS=	p5-TheSchwartz>=1.10:${PORTSDIR}/devel/p5-TheSchwartz \
-		p5-Net-DNS>=0.66_1:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
+		p5-Net-DNS>=0.66_1:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-TheSchwartz/Makefile b/devel/p5-TheSchwartz/Makefile
index 6ba0630c9028..aeb44fabe5ab 100644
--- a/devel/p5-TheSchwartz/Makefile
+++ b/devel/p5-TheSchwartz/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Reliable job queue
 
-BUILD_DEPENDS=	p5-Data-ObjectDriver>=0.04:${PORTSDIR}/devel/p5-Data-ObjectDriver
+BUILD_DEPENDS=	p5-Data-ObjectDriver>=0.04:devel/p5-Data-ObjectDriver
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-Thread-Apartment/Makefile b/devel/p5-Thread-Apartment/Makefile
index 8c15ff5003ad..bcddb86652a7 100644
--- a/devel/p5-Thread-Apartment/Makefile
+++ b/devel/p5-Thread-Apartment/Makefile
@@ -16,9 +16,9 @@ LICENSE_NAME=	Academic Free License version 2.1
 LICENSE_FILE=	${WRKSRC}/License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	p5-Class-ISA>=0.32:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-Class-Inspector>=1.08:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Thread-Queue-Duplex>=0.92:${PORTSDIR}/devel/p5-Thread-Queue-Duplex
+BUILD_DEPENDS=	p5-Class-ISA>=0.32:devel/p5-Class-ISA \
+		p5-Class-Inspector>=1.08:devel/p5-Class-Inspector \
+		p5-Thread-Queue-Duplex>=0.92:devel/p5-Thread-Queue-Duplex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Thread-Cancel/Makefile b/devel/p5-Thread-Cancel/Makefile
index 1922d7ec7b3c..4dd1146fd211 100644
--- a/devel/p5-Thread-Cancel/Makefile
+++ b/devel/p5-Thread-Cancel/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Cancel (i.e., kill) threads
 
-RUN_DEPENDS=	p5-threads>=1.34:${PORTSDIR}/devel/p5-threads
+RUN_DEPENDS=	p5-threads>=1.34:devel/p5-threads
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Thrift-XS/Makefile b/devel/p5-Thrift-XS/Makefile
index 7dae18e7fb8e..838d1f3a18ee 100644
--- a/devel/p5-Thrift-XS/Makefile
+++ b/devel/p5-Thrift-XS/Makefile
@@ -12,15 +12,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Faster Thrift binary protocol encoding and decoding
 
-BUILD_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-Test-BinaryData>=0:${PORTSDIR}/devel/p5-Test-BinaryData \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
+		p5-Test-BinaryData>=0:devel/p5-Test-BinaryData \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Thrift/Makefile b/devel/p5-Thrift/Makefile
index c0a09446d309..fba4842c5abb 100644
--- a/devel/p5-Thrift/Makefile
+++ b/devel/p5-Thrift/Makefile
@@ -12,9 +12,9 @@ DISTFILES=
 MAINTAINER=	komarov@valerka.net
 COMMENT=	Perl interface to Thrift
 
-BUILD_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector
-RUN_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector
-FETCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/thrift:extract
+BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector
+RUN_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector
+FETCH_DEPENDS+=	${NONEXISTENT}:devel/thrift:extract
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Throwable/Makefile b/devel/p5-Throwable/Makefile
index 445f927d17dd..7d88e4941603 100644
--- a/devel/p5-Throwable/Makefile
+++ b/devel/p5-Throwable/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Easy-to-use class for error objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Devel-StackTrace>=1.32:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Module-Runtime>=0.002:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moo>=1.000001:${PORTSDIR}/devel/p5-Moo
+RUN_DEPENDS=	p5-Devel-StackTrace>=1.32:devel/p5-Devel-StackTrace \
+		p5-Module-Runtime>=0.002:devel/p5-Module-Runtime \
+		p5-Moo>=1.000001:devel/p5-Moo
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Tie-DB_File-SplitHash/Makefile b/devel/p5-Tie-DB_File-SplitHash/Makefile
index 911e5443965c..07d139d05f64 100644
--- a/devel/p5-Tie-DB_File-SplitHash/Makefile
+++ b/devel/p5-Tie-DB_File-SplitHash/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Wrapper around the DB_File Berkeley database system
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tie-File-AsHash/Makefile b/devel/p5-Tie-File-AsHash/Makefile
index 923e8832166c..41536c84c0c4 100644
--- a/devel/p5-Tie-File-AsHash/Makefile
+++ b/devel/p5-Tie-File-AsHash/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rdg@bzerk.org
 COMMENT=	Access the lines of a disk file via a Perl hash
 
-BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	p5-Tie-File>=0:${PORTSDIR}/devel/p5-Tie-File
+BUILD_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Tie-File>=0:devel/p5-Tie-File
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Tie-FileLRUCache/Makefile b/devel/p5-Tie-FileLRUCache/Makefile
index 414f369c09ae..e887b2785bf4 100644
--- a/devel/p5-Tie-FileLRUCache/Makefile
+++ b/devel/p5-Tie-FileLRUCache/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lightweight but robust filesystem based persistent LRU cache
 
-BUILD_DEPENDS=	p5-Class-NamedParms>=0:${PORTSDIR}/devel/p5-Class-NamedParms \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Class-ParmList>=0:${PORTSDIR}/devel/p5-Class-ParmList
+BUILD_DEPENDS=	p5-Class-NamedParms>=0:devel/p5-Class-NamedParms \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Class-ParmList>=0:devel/p5-Class-ParmList
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tie-Hash-Regex/Makefile b/devel/p5-Tie-Hash-Regex/Makefile
index 087e88bd3f6c..ec629d9ff3b7 100644
--- a/devel/p5-Tie-Hash-Regex/Makefile
+++ b/devel/p5-Tie-Hash-Regex/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Match hash keys using Regular Expressions
 
-BUILD_DEPENDS=	p5-Attribute-Handlers>=0.76:${PORTSDIR}/devel/p5-Attribute-Handlers
-RUN_DEPENDS=	p5-Attribute-Handlers>=0.76:${PORTSDIR}/devel/p5-Attribute-Handlers
+BUILD_DEPENDS=	p5-Attribute-Handlers>=0.76:devel/p5-Attribute-Handlers
+RUN_DEPENDS=	p5-Attribute-Handlers>=0.76:devel/p5-Attribute-Handlers
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Tie-RefHash-Weak/Makefile b/devel/p5-Tie-RefHash-Weak/Makefile
index 8bd08d216861..0e2837ff1def 100644
--- a/devel/p5-Tie-RefHash-Weak/Makefile
+++ b/devel/p5-Tie-RefHash-Weak/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tie::RefHash subclass with weakened references in the keys
 
-RUN_DEPENDS=	p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Variable-Magic>=0:${PORTSDIR}/devel/p5-Variable-Magic
+RUN_DEPENDS=	p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Variable-Magic>=0:devel/p5-Variable-Magic
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tie-ShareLite/Makefile b/devel/p5-Tie-ShareLite/Makefile
index b683882766c1..0646deea38e1 100644
--- a/devel/p5-Tie-ShareLite/Makefile
+++ b/devel/p5-Tie-ShareLite/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	Tied hash interface to IPC::ShareLite
 
-RUN_DEPENDS=	p5-IPC-ShareLite>=0:${PORTSDIR}/devel/p5-IPC-ShareLite
+RUN_DEPENDS=	p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Tie-ToObject/Makefile b/devel/p5-Tie-ToObject/Makefile
index 7685fcfe17c8..e1f7de0f3652 100644
--- a/devel/p5-Tie-ToObject/Makefile
+++ b/devel/p5-Tie-ToObject/Makefile
@@ -20,7 +20,7 @@ post-extract:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Time-Crontab/Makefile b/devel/p5-Time-Crontab/Makefile
index f73c84ddffb6..4b892f8d675a 100644
--- a/devel/p5-Time-Crontab/Makefile
+++ b/devel/p5-Time-Crontab/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to parse crontab date and time field
 
 RUN_DEPENDS=	\
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Set-Crontab>=1.03:${PORTSDIR}/devel/p5-Set-Crontab
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-Set-Crontab>=1.03:devel/p5-Set-Crontab
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Time-Duration-Parse/Makefile b/devel/p5-Time-Duration-Parse/Makefile
index c2e855704cae..06eb2f8032ce 100644
--- a/devel/p5-Time-Duration-Parse/Makefile
+++ b/devel/p5-Time-Duration-Parse/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Parse string that represents time duration
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Lite>=0.02:${PORTSDIR}/devel/p5-Exporter-Lite
+BUILD_DEPENDS=	p5-Exporter-Lite>=0.02:devel/p5-Exporter-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Time-Duration>=1.0.6:${PORTSDIR}/devel/p5-Time-Duration
+TEST_DEPENDS=	p5-Time-Duration>=1.0.6:devel/p5-Time-Duration
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Time-Duration/Makefile b/devel/p5-Time-Duration/Makefile
index b12eb3bcb74d..04647de7fe01 100644
--- a/devel/p5-Time-Duration/Makefile
+++ b/devel/p5-Time-Duration/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Rounded or exact English expression of durations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index e612b4870bbb..84122f71e686 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl5 module implementing High resolution time, sleep, and alarm
 
-TEST_DEPENDS=	p5-Test-Simple>=0.82:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.82:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Time-Interval/Makefile b/devel/p5-Time-Interval/Makefile
index 5c6def2f3b14..e80f9f61d891 100644
--- a/devel/p5-Time-Interval/Makefile
+++ b/devel/p5-Time-Interval/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Converts time intervals of days, hours, minutes, and seconds
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-TimeDate>0:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-TimeDate>0:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Time-Piece-Range/Makefile b/devel/p5-Time-Piece-Range/Makefile
index 67446013d4f8..1e93295a863b 100644
--- a/devel/p5-Time-Piece-Range/Makefile
+++ b/devel/p5-Time-Piece-Range/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Time::Piece::Range - deal with a range of Time::Piece objects
 
-BUILD_DEPENDS=	p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-Date-Range>=0:${PORTSDIR}/devel/p5-Date-Range
+BUILD_DEPENDS=	p5-Time-Piece>=0:devel/p5-Time-Piece \
+		p5-Date-Range>=0:devel/p5-Date-Range
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tree-Binary-Dictionary/Makefile b/devel/p5-Tree-Binary-Dictionary/Makefile
index ba00532a79e6..98aca4798741 100644
--- a/devel/p5-Tree-Binary-Dictionary/Makefile
+++ b/devel/p5-Tree-Binary-Dictionary/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Dictionary API to a binary tree
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Tree-Binary>=0:${PORTSDIR}/devel/p5-Tree-Binary
+RUN_DEPENDS=	p5-Tree-Binary>=0:devel/p5-Tree-Binary
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tree-Binary/Makefile b/devel/p5-Tree-Binary/Makefile
index c6a8f0aade16..deb1f7c13f55 100644
--- a/devel/p5-Tree-Binary/Makefile
+++ b/devel/p5-Tree-Binary/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Object Oriented Binary Tree for Perl
 
 LICENSE=	ART20
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Tree-DAG_Node/Makefile b/devel/p5-Tree-DAG_Node/Makefile
index 88fca0178f4c..7b38cf8eb65c 100644
--- a/devel/p5-Tree-DAG_Node/Makefile
+++ b/devel/p5-Tree-DAG_Node/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Super class for representing nodes in a tree
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0.003:${PORTSDIR}/devel/p5-File-Slurp-Tiny
+BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0.003:devel/p5-File-Slurp-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -22,7 +22,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Tree-Parser/Makefile b/devel/p5-Tree-Parser/Makefile
index bcd10ee5ae3e..9ed5d984ed51 100644
--- a/devel/p5-Tree-Parser/Makefile
+++ b/devel/p5-Tree-Parser/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Module to parse formatted files into tree structures
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Array-Iterator>=0:${PORTSDIR}/devel/p5-Array-Iterator \
-		p5-Tree-Simple>=0:${PORTSDIR}/devel/p5-Tree-Simple
+BUILD_DEPENDS=	p5-Array-Iterator>=0:devel/p5-Array-Iterator \
+		p5-Tree-Simple>=0:devel/p5-Tree-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Tree-Simple-View/Makefile b/devel/p5-Tree-Simple-View/Makefile
index 2f41efaed4cf..4f8e0080f32f 100644
--- a/devel/p5-Tree-Simple-View/Makefile
+++ b/devel/p5-Tree-Simple-View/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Set of classes for viewing Tree::Simple hierarchies
 
-BUILD_DEPENDS=	p5-Tree-Simple>=0:${PORTSDIR}/devel/p5-Tree-Simple \
-		p5-Class-Throwable>=0:${PORTSDIR}/devel/p5-Class-Throwable
+BUILD_DEPENDS=	p5-Tree-Simple>=0:devel/p5-Tree-Simple \
+		p5-Class-Throwable>=0:devel/p5-Class-Throwable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-LongString>=0:devel/p5-Test-LongString
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Tree-Simple-VisitorFactory/Makefile b/devel/p5-Tree-Simple-VisitorFactory/Makefile
index de9ba7b3260d..0aaff78dcdd2 100644
--- a/devel/p5-Tree-Simple-VisitorFactory/Makefile
+++ b/devel/p5-Tree-Simple-VisitorFactory/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Set of visitor objects for traversing Tree::Simple hierarchies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tree-Simple>=1.22:${PORTSDIR}/devel/p5-Tree-Simple
+BUILD_DEPENDS=	p5-Tree-Simple>=1.22:devel/p5-Tree-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.15:devel/p5-Test-Exception
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Tree-Simple/Makefile b/devel/p5-Tree-Simple/Makefile
index 377f72991bde..8454b726716c 100644
--- a/devel/p5-Tree-Simple/Makefile
+++ b/devel/p5-Tree-Simple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple tree object
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.15:devel/p5-Test-Exception
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Type-Tie/Makefile b/devel/p5-Type-Tie/Makefile
index 38a176b2f5a1..dff2f69a2d0e 100644
--- a/devel/p5-Type-Tie/Makefile
+++ b/devel/p5-Type-Tie/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Tie a variable to a type constraint
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-Hash-FieldHash>=0:${PORTSDIR}/devel/p5-Hash-FieldHash
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
+		p5-Hash-FieldHash>=0:devel/p5-Hash-FieldHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Type-Tiny>=0.004:${PORTSDIR}/devel/p5-Type-Tiny
+TEST_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Type-Tiny>=0.004:devel/p5-Type-Tiny
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Type-Tiny-Signatures/Makefile b/devel/p5-Type-Tiny-Signatures/Makefile
index bad2f76be010..59a796f8056b 100644
--- a/devel/p5-Type-Tiny-Signatures/Makefile
+++ b/devel/p5-Type-Tiny-Signatures/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Method/Function Signatures w/Type::Tiny Constraints
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Type-Tiny>=1.000005:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-Function-Parameters>=1.0605:${PORTSDIR}/devel/p5-Function-Parameters
+BUILD_DEPENDS=	p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
+		p5-Function-Parameters>=1.0605:devel/p5-Function-Parameters
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Type-Tiny/Makefile b/devel/p5-Type-Tiny/Makefile
index 28ff2f6805e6..57f4b2779f0e 100644
--- a/devel/p5-Type-Tiny/Makefile
+++ b/devel/p5-Type-Tiny/Makefile
@@ -15,25 +15,25 @@ COMMENT=	Tiny, yet Moo(se)-compatible type constraint
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:${PORTSDIR}/devel/p5-Exporter-Tiny
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Class-InsideOut>=0:${PORTSDIR}/devel/p5-Class-InsideOut \
-		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Function-Parameters>=0:${PORTSDIR}/devel/p5-Function-Parameters \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moo>=1.002001:${PORTSDIR}/devel/p5-Moo \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Common>=0:${PORTSDIR}/devel/p5-MooseX-Types-Common \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-Types>=0:${PORTSDIR}/devel/p5-MouseX-Types \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Sub-Exporter-Lexical>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Lexical \
-		p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings \
-		p5-Validation-Class>=0:${PORTSDIR}/devel/p5-Validation-Class \
-		p5-match-simple>=0:${PORTSDIR}/devel/p5-match-simple
+TEST_DEPENDS=	p5-Class-InsideOut>=0:devel/p5-Class-InsideOut \
+		p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
+		p5-Function-Parameters>=0:devel/p5-Function-Parameters \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Moo>=1.002001:devel/p5-Moo \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Common>=0:devel/p5-MooseX-Types-Common \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-Types>=0:devel/p5-MouseX-Types \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-Sub-Exporter-Lexical>=0:devel/p5-Sub-Exporter-Lexical \
+		p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings \
+		p5-Validation-Class>=0:devel/p5-Validation-Class \
+		p5-match-simple>=0:devel/p5-match-simple
 
 OPTIONS_DEFINE=	XS
 OPTIONS_DEFAULT=XS
@@ -44,13 +44,13 @@ PORTSCOUT=	limit:^[0-9\.]*$$
 USE_PERL5=	configure
 USES=		perl5
 
-XS_BUILD_DEPENDS=	p5-Type-Tiny-XS>=0.010:${PORTSDIR}/devel/p5-Type-Tiny-XS
-XS_RUN_DEPENDS=		p5-Type-Tiny-XS>=0.010:${PORTSDIR}/devel/p5-Type-Tiny-XS
+XS_BUILD_DEPENDS=	p5-Type-Tiny-XS>=0.010:devel/p5-Type-Tiny-XS
+XS_RUN_DEPENDS=		p5-Type-Tiny-XS>=0.010:devel/p5-Type-Tiny-XS
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Types-Core/Makefile b/devel/p5-Types-Core/Makefile
index ee4c90f0374b..14058cca2dc9 100644
--- a/devel/p5-Types-Core/Makefile
+++ b/devel/p5-Types-Core/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Core types defined as tests and literals
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Xporter>=0.0.8:${PORTSDIR}/devel/p5-Xporter \
-		p5-mem>=0.4.5:${PORTSDIR}/devel/p5-mem
+BUILD_DEPENDS=	p5-Xporter>=0.0.8:devel/p5-Xporter \
+		p5-mem>=0.4.5:devel/p5-mem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -25,7 +25,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Types-Path-Tiny/Makefile b/devel/p5-Types-Path-Tiny/Makefile
index e89eb02e9083..578b79ee917b 100644
--- a/devel/p5-Types-Path-Tiny/Makefile
+++ b/devel/p5-Types-Path-Tiny/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Path::Tiny types and coercions for Moose and Moo
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Type-Tiny>=0.008:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-Type-Tiny>=0.008:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-pushd>=0:${PORTSDIR}/devel/p5-File-pushd
+TEST_DEPENDS=	p5-File-pushd>=0:devel/p5-File-pushd
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Types-Serialiser/Makefile b/devel/p5-Types-Serialiser/Makefile
index 9825f8cb4d84..81a1a90eff7a 100644
--- a/devel/p5-Types-Serialiser/Makefile
+++ b/devel/p5-Types-Serialiser/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Simple data types for common serialisation formats
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Types-URI/Makefile b/devel/p5-Types-URI/Makefile
index 240aa0a6b91d..9222d79936a7 100644
--- a/devel/p5-Types-URI/Makefile
+++ b/devel/p5-Types-URI/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Type-Tiny>=1.000000:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-Types-Path-Tiny>0:${PORTSDIR}/devel/p5-Types-Path-Tiny \
-	p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-Types-UUID>=0:${PORTSDIR}/devel/p5-Types-UUID \
-	p5-URI>0:${PORTSDIR}/net/p5-URI \
-	p5-URI-FromHash>0:${PORTSDIR}/net/p5-URI-FromHash
+	p5-Type-Tiny>=1.000000:devel/p5-Type-Tiny \
+	p5-Types-Path-Tiny>0:devel/p5-Types-Path-Tiny \
+	p5-Type-Tiny>=0:devel/p5-Type-Tiny \
+	p5-Types-UUID>=0:devel/p5-Types-UUID \
+	p5-URI>0:net/p5-URI \
+	p5-URI-FromHash>0:net/p5-URI-FromHash
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Types-UUID/Makefile b/devel/p5-Types-UUID/Makefile
index 1a8abff42671..ecd5e77dcd45 100644
--- a/devel/p5-Types-UUID/Makefile
+++ b/devel/p5-Types-UUID/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Type-Tiny>=1.000000:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-UUID-Tiny>=1.02:${PORTSDIR}/devel/p5-UUID-Tiny
+	p5-Type-Tiny>=1.000000:devel/p5-Type-Tiny \
+	p5-UUID-Tiny>=1.02:devel/p5-UUID-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-UI-Dialog/Makefile b/devel/p5-UI-Dialog/Makefile
index 1c26e9aa8bd7..2a413f4603b9 100644
--- a/devel/p5-UI-Dialog/Makefile
+++ b/devel/p5-UI-Dialog/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Perl wrapper for the various dialog applications
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	cdialog:${PORTSDIR}/devel/cdialog
+RUN_DEPENDS=	cdialog:devel/cdialog
 
 OPTIONS_DEFINE=	KDE NEWT X11 ZENITY
 
@@ -24,10 +24,10 @@ USES=		perl5
 USE_PERL5=	configure
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-KDE_RUN_DEPENDS=	kdialog:${PORTSDIR}/x11/kde4-baseapps
-NEWT_RUN_DEPENDS=	whiptail:${PORTSDIR}/devel/newt
-X11_RUN_DEPENDS=	Xdialog:${PORTSDIR}/x11/xdialog
-ZENITY_RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
+KDE_RUN_DEPENDS=	kdialog:x11/kde4-baseapps
+NEWT_RUN_DEPENDS=	whiptail:devel/newt
+X11_RUN_DEPENDS=	Xdialog:x11/xdialog
+ZENITY_RUN_DEPENDS=	zenity:x11/zenity
 
 post-patch:
 	@${REINPLACE_CMD} -e "/self->{'_opts'}->{'bin'}/ s|dialog|c&|" ${WRKSRC}/lib/UI/Dialog/Backend/CDialog.pm
diff --git a/devel/p5-UNIVERSAL-ref/Makefile b/devel/p5-UNIVERSAL-ref/Makefile
index 11195141c478..07d0b17866dc 100644
--- a/devel/p5-UNIVERSAL-ref/Makefile
+++ b/devel/p5-UNIVERSAL-ref/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Turns ref() into a multimethod
 
-BUILD_DEPENDS=	p5-B-Utils>=0:${PORTSDIR}/devel/p5-B-Utils
+BUILD_DEPENDS=	p5-B-Utils>=0:devel/p5-B-Utils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-UUID-Random-Patch-UseMRS/Makefile b/devel/p5-UUID-Random-Patch-UseMRS/Makefile
index 121ba2dd18c5..59dd16483781 100644
--- a/devel/p5-UUID-Random-Patch-UseMRS/Makefile
+++ b/devel/p5-UUID-Random-Patch-UseMRS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Make UUID::Random use Math::Random::Secure::rand()
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Random-Secure>=0:${PORTSDIR}/math/p5-Math-Random-Secure \
-		p5-UUID-Random>=0:${PORTSDIR}/devel/p5-UUID-Random
+BUILD_DEPENDS=	p5-Math-Random-Secure>=0:math/p5-Math-Random-Secure \
+		p5-UUID-Random>=0:devel/p5-UUID-Random
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-UUID-Tiny/Makefile b/devel/p5-UUID-Tiny/Makefile
index 27281d282a15..e721f5c577ef 100644
--- a/devel/p5-UUID-Tiny/Makefile
+++ b/devel/p5-UUID-Tiny/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Pure Perl UUID Support With Functional Interface
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-UUID/Makefile b/devel/p5-UUID/Makefile
index 87ae5cd4e284..00b3f9013883 100644
--- a/devel/p5-UUID/Makefile
+++ b/devel/p5-UUID/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl extension for using UUID interfaces as defined in e2fsprogs
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Unix-Statgrab/Makefile b/devel/p5-Unix-Statgrab/Makefile
index b6e69cc0cc03..bd0f4afd7bcf 100644
--- a/devel/p5-Unix-Statgrab/Makefile
+++ b/devel/p5-Unix-Statgrab/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Perl extension for collecting information about the machine
 
-BUILD_DEPENDS=	p5-Config-AutoConf>=0.19:${PORTSDIR}/devel/p5-Config-AutoConf
-LIB_DEPENDS=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
+BUILD_DEPENDS=	p5-Config-AutoConf>=0.19:devel/p5-Config-AutoConf
+LIB_DEPENDS=	libstatgrab.so:devel/libstatgrab
 
 USES=		perl5 pkgconfig
 USE_PERL5=	configure modbuild
diff --git a/devel/p5-User-Identity/Makefile b/devel/p5-User-Identity/Makefile
index 6c47a016fa6a..d43360ddae6f 100644
--- a/devel/p5-User-Identity/Makefile
+++ b/devel/p5-User-Identity/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for abstracting information about a physical person
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Geography-Countries>0:${PORTSDIR}/misc/p5-Geography-Countries
+RUN_DEPENDS=	p5-Geography-Countries>0:misc/p5-Geography-Countries
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-VCP-Dest-svk/Makefile b/devel/p5-VCP-Dest-svk/Makefile
index 43a94851b243..55750c6f64e3 100644
--- a/devel/p5-VCP-Dest-svk/Makefile
+++ b/devel/p5-VCP-Dest-svk/Makefile
@@ -15,10 +15,10 @@ COMMENT=	VCP destination driver for svn/svk
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-VCP-autrijus>=0:${PORTSDIR}/devel/p5-VCP-autrijus \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		svk>=0:${PORTSDIR}/devel/svk
+BUILD_DEPENDS=	p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-subversion>=0:devel/p5-subversion \
+		svk>=0:devel/svk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-VCP-Source-cvsbk/Makefile b/devel/p5-VCP-Source-cvsbk/Makefile
index aac28ca161f2..6269f83088e3 100644
--- a/devel/p5-VCP-Source-cvsbk/Makefile
+++ b/devel/p5-VCP-Source-cvsbk/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	VCP source driver for bk exported cvs repository
 
-BUILD_DEPENDS=	p5-VCP-autrijus>=0:${PORTSDIR}/devel/p5-VCP-autrijus \
-		p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
+		p5-Module-Install>0:devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-VCP-autrijus/Makefile b/devel/p5-VCP-autrijus/Makefile
index c4088134ca3f..5c3242f68778 100644
--- a/devel/p5-VCP-autrijus/Makefile
+++ b/devel/p5-VCP-autrijus/Makefile
@@ -14,14 +14,14 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-snapshot-${PORTVERSION:C/\.([^.]*)$/-\1/}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tool for copying files between various SCM repositories
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-AutoWriter>=0:${PORTSDIR}/textproc/p5-XML-AutoWriter \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-PodToHTML>=0:${PORTSDIR}/www/p5-PodToHTML \
-		p5-Regexp-Shellish>=0:${PORTSDIR}/devel/p5-Regexp-Shellish \
-		p5-BFD>=0:${PORTSDIR}/devel/p5-BFD \
-		p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-AutoWriter>=0:textproc/p5-XML-AutoWriter \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-PodToHTML>=0:www/p5-PodToHTML \
+		p5-Regexp-Shellish>=0:devel/p5-Regexp-Shellish \
+		p5-BFD>=0:devel/p5-BFD \
+		p5-Text-Table>=0:textproc/p5-Text-Table
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-VCS-CVS/Makefile b/devel/p5-VCS-CVS/Makefile
index b46e2b3e3b7b..f0b3d2965208 100644
--- a/devel/p5-VCS-CVS/Makefile
+++ b/devel/p5-VCS-CVS/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that provides a simple interface to CVS
 
-BUILD_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+BUILD_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5 tar:tgz
 USE_PERL5=	modbuild
diff --git a/devel/p5-VCS-Lite/Makefile b/devel/p5-VCS-Lite/Makefile
index db8886cbc85c..dbdae219b379 100644
--- a/devel/p5-VCS-Lite/Makefile
+++ b/devel/p5-VCS-Lite/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Minimal version control system
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=1.13:${PORTSDIR}/devel/p5-Algorithm-Diff
+BUILD_DEPENDS=	p5-Algorithm-Diff>=1.13:devel/p5-Algorithm-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile
index 97753a767c75..a8960ca1bf6b 100644
--- a/devel/p5-VCS/Makefile
+++ b/devel/p5-VCS/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Library for generic Version Control System access in Perl
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Validation-Class/Makefile b/devel/p5-Validation-Class/Makefile
index 13cad62044cb..a09e0df4b16c 100644
--- a/devel/p5-Validation-Class/Makefile
+++ b/devel/p5-Validation-Class/Makefile
@@ -15,16 +15,16 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Forward>0:${PORTSDIR}/devel/p5-Class-Forward \
-	p5-Hash-Flatten>0:${PORTSDIR}/devel/p5-Hash-Flatten \
-	p5-Hash-Merge>0:${PORTSDIR}/textproc/p5-Hash-Merge \
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Module-Find>0:${PORTSDIR}/devel/p5-Module-Find \
-	p5-Module-Runtime>0:${PORTSDIR}/devel/p5-Module-Runtime
+	p5-Class-Forward>0:devel/p5-Class-Forward \
+	p5-Hash-Flatten>0:devel/p5-Hash-Flatten \
+	p5-Hash-Merge>0:textproc/p5-Hash-Merge \
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-Module-Find>0:devel/p5-Module-Find \
+	p5-Module-Runtime>0:devel/p5-Module-Runtime
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-Class-Method-Modifiers>0:${PORTSDIR}/devel/p5-Class-Method-Modifiers
+	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+	p5-Class-Method-Modifiers>0:devel/p5-Class-Method-Modifiers
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Variable-Eject/Makefile b/devel/p5-Variable-Eject/Makefile
index 880219e6dd11..183e82c9e5b8 100644
--- a/devel/p5-Variable-Eject/Makefile
+++ b/devel/p5-Variable-Eject/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Eject variables from hash to current namespace
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Lexical-Alias>=0.04:${PORTSDIR}/devel/p5-Lexical-Alias \
-		p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-uni-perl>=0.03:${PORTSDIR}/devel/p5-uni-perl
-RUN_DEPENDS=	p5-Lexical-Alias>=0.04:${PORTSDIR}/devel/p5-Lexical-Alias \
-		p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-uni-perl>=0.03:${PORTSDIR}/devel/p5-uni-perl
+BUILD_DEPENDS=	p5-Lexical-Alias>=0.04:devel/p5-Lexical-Alias \
+		p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
+		p5-uni-perl>=0.03:devel/p5-uni-perl
+RUN_DEPENDS=	p5-Lexical-Alias>=0.04:devel/p5-Lexical-Alias \
+		p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
+		p5-uni-perl>=0.03:devel/p5-uni-perl
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Workflow/Makefile b/devel/p5-Workflow/Makefile
index 3de2d7e2da9f..32a0286e02d4 100644
--- a/devel/p5-Workflow/Makefile
+++ b/devel/p5-Workflow/Makefile
@@ -13,26 +13,26 @@ COMMENT=	Simple, flexible system to implement workflows
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.18:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Factory>=1:${PORTSDIR}/devel/p5-Class-Factory \
-		p5-Class-Observable>=1.04:${PORTSDIR}/devel/p5-Class-Observable \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime>=0.15:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Strptime>=1:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Exception-Class>=1.1:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Log-Dispatch>=2:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Log4perl>=0.34:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-XML-Simple>=2:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-Class-Accessor>=0.18:devel/p5-Class-Accessor \
+		p5-Class-Factory>=1:devel/p5-Class-Factory \
+		p5-Class-Observable>=1.04:devel/p5-Class-Observable \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DateTime>=0.15:devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=1:devel/p5-DateTime-Format-Strptime \
+		p5-Exception-Class>=1.1:devel/p5-Exception-Class \
+		p5-Log-Dispatch>=2:devel/p5-Log-Dispatch \
+		p5-Log-Log4perl>=0.34:devel/p5-Log-Log4perl \
+		p5-Data-UUID>=0:devel/p5-Data-UUID \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-XML-Simple>=2:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-Mock>=0.1:${PORTSDIR}/databases/p5-DBD-Mock \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Pod-Coverage-TrustPod>=0:${PORTSDIR}/devel/p5-Pod-Coverage-TrustPod \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Kwalitee>=1.21:${PORTSDIR}/devel/p5-Test-Kwalitee \
-		p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-DBD-Mock>=0.1:databases/p5-DBD-Mock \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Pod-Coverage-TrustPod>=0:devel/p5-Pod-Coverage-TrustPod \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Kwalitee>=1.21:devel/p5-Test-Kwalitee \
+		p5-Test-Pod>=1.41:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-XML-Compile-Tester/Makefile b/devel/p5-XML-Compile-Tester/Makefile
index c27494ca986f..1b7e0aa07f44 100644
--- a/devel/p5-XML-Compile-Tester/Makefile
+++ b/devel/p5-XML-Compile-Tester/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Support XML::Compile Related Regression Testing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Log-Report>=0.17:${PORTSDIR}/devel/p5-Log-Report \
-		p5-Test-Deep>=0.095:${PORTSDIR}/devel/p5-Test-Deep
+RUN_DEPENDS=	p5-Log-Report>=0.17:devel/p5-Log-Report \
+		p5-Test-Deep>=0.095:devel/p5-Test-Deep
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-XML-Pastor/Makefile b/devel/p5-XML-Pastor/Makefile
index ee2538f8569d..8bac9a35ab55 100644
--- a/devel/p5-XML-Pastor/Makefile
+++ b/devel/p5-XML-Pastor/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Generate Perl classes with XML bindings from a W3C XSD schema
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Data-HashArray>=0:${PORTSDIR}/devel/p5-Data-HashArray \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Data-HashArray>=0:devel/p5-Data-HashArray \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/p5-XS-Object-Magic/Makefile b/devel/p5-XS-Object-Magic/Makefile
index f452a7b98eaf..73968ddd0efd 100644
--- a/devel/p5-XS-Object-Magic/Makefile
+++ b/devel/p5-XS-Object-Magic/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Opaque, extensible XS pointer backed objects using sv_magic
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USE_PERL5=	configure
 USES=		perl5
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 post-install:
diff --git a/devel/p5-Xporter/Makefile b/devel/p5-Xporter/Makefile
index b1ce3e2d4dd1..657e98701a99 100644
--- a/devel/p5-Xporter/Makefile
+++ b/devel/p5-Xporter/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Alternative Exporter with persistant defaults and auto-ISA
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-mem>=0.4.5:${PORTSDIR}/devel/p5-mem
+BUILD_DEPENDS=	p5-mem>=0.4.5:devel/p5-mem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -25,7 +25,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-YAML-AppConfig/Makefile b/devel/p5-YAML-AppConfig/Makefile
index 77a377a34ac1..cdb61e24d0ee 100644
--- a/devel/p5-YAML-AppConfig/Makefile
+++ b/devel/p5-YAML-AppConfig/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-YAML>=0.38:${PORTSDIR}/textproc/p5-YAML
+	p5-YAML>=0.38:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Yada-Yada-Yada/Makefile b/devel/p5-Yada-Yada-Yada/Makefile
index 99c627c3630d..8c5ed900135e 100644
--- a/devel/p5-Yada-Yada-Yada/Makefile
+++ b/devel/p5-Yada-Yada-Yada/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Adds a Yada-Yada-Yada operator (...) to Perl 5
 
-BUILD_DEPENDS=	p5-Filter-Simple>=0:${PORTSDIR}/textproc/p5-Filter-Simple
+BUILD_DEPENDS=	p5-Filter-Simple>=0:textproc/p5-Filter-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ZConf-GUI/Makefile b/devel/p5-ZConf-GUI/Makefile
index 39c06447f0b7..fa1819a3a492 100644
--- a/devel/p5-ZConf-GUI/Makefile
+++ b/devel/p5-ZConf-GUI/Makefile
@@ -15,10 +15,10 @@ COMMENT=	GUI backend chooser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ZConf>=6.1.0:${PORTSDIR}/net/p5-ZConf \
-		p5-Error-Helper>=1.0.0:${PORTSDIR}/devel/p5-Error-Helper \
-		p5-Module-List>=0.003:${PORTSDIR}/devel/p5-Module-List \
-		${LOCALBASE}/bin/xhost:${PORTSDIR}/x11/xhost
+BUILD_DEPENDS=	p5-ZConf>=6.1.0:net/p5-ZConf \
+		p5-Error-Helper>=1.0.0:devel/p5-Error-Helper \
+		p5-Module-List>=0.003:devel/p5-Module-List \
+		${LOCALBASE}/bin/xhost:x11/xhost
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-ZML/Makefile b/devel/p5-ZML/Makefile
index b27f44f01c29..311c5fc98769 100644
--- a/devel/p5-ZML/Makefile
+++ b/devel/p5-ZML/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Simple, fast, and easy to read binary data storage format
 
-BUILD_DEPENDS=	p5-Error-Helper>=0:${PORTSDIR}/devel/p5-Error-Helper
-RUN_DEPENDS=	p5-Error-Helper>=0:${PORTSDIR}/devel/p5-Error-Helper
+BUILD_DEPENDS=	p5-Error-Helper>=0:devel/p5-Error-Helper
+RUN_DEPENDS=	p5-Error-Helper>=0:devel/p5-Error-Helper
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-accessors-fast/Makefile b/devel/p5-accessors-fast/Makefile
index 6131b3f46692..d478374fc21f 100644
--- a/devel/p5-accessors-fast/Makefile
+++ b/devel/p5-accessors-fast/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Wrap fastest Class::Accessor::* into pragma
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Fast-XS>=0:${PORTSDIR}/devel/p5-Class-Accessor-Fast-XS \
-		p5-constant-def>=0.01:${PORTSDIR}/devel/p5-constant-def \
-		p5-Class-C3>=0:${PORTSDIR}/devel/p5-Class-C3
+BUILD_DEPENDS=	p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS \
+		p5-constant-def>=0.01:devel/p5-constant-def \
+		p5-Class-C3>=0:devel/p5-Class-C3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-autobox-Core/Makefile b/devel/p5-autobox-Core/Makefile
index 28f13341af24..fba0fd332674 100644
--- a/devel/p5-autobox-Core/Makefile
+++ b/devel/p5-autobox-Core/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Core functions exposed as methods in primitive types
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Want>=0.26:${PORTSDIR}/devel/p5-Want \
-		p5-autobox>=2.71:${PORTSDIR}/devel/p5-autobox
+BUILD_DEPENDS=	p5-Want>=0.26:devel/p5-Want \
+		p5-autobox>=2.71:devel/p5-autobox
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-autobox/Makefile b/devel/p5-autobox/Makefile
index 0d0753c6325e..b8833551532b 100644
--- a/devel/p5-autobox/Makefile
+++ b/devel/p5-autobox/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bill.brinzer@gmail.com
 COMMENT=	Call methods on native Perl types
 
-BUILD_DEPENDS=	p5-Scope-Guard>=0.20:${PORTSDIR}/devel/p5-Scope-Guard
+BUILD_DEPENDS=	p5-Scope-Guard>=0.20:devel/p5-Scope-Guard
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-autodie/Makefile b/devel/p5-autodie/Makefile
index 56dad84d2c80..24bf4d450e1f 100644
--- a/devel/p5-autodie/Makefile
+++ b/devel/p5-autodie/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Replace functions with ones that succeed or die with lexical scope
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource \
-		p5-IPC-System-Simple>=0.12:${PORTSDIR}/devel/p5-IPC-System-Simple \
-		p5-Import-Into>=1.002004:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Sub-Identify>=0:${PORTSDIR}/devel/p5-Sub-Identify
+TEST_DEPENDS=	p5-BSD-Resource>=0:devel/p5-BSD-Resource \
+		p5-IPC-System-Simple>=0.12:devel/p5-IPC-System-Simple \
+		p5-Import-Into>=1.002004:devel/p5-Import-Into \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Sub-Identify>=0:devel/p5-Sub-Identify
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-bareword-filehandles/Makefile b/devel/p5-bareword-filehandles/Makefile
index 9c491b27a233..ca40cbbea767 100644
--- a/devel/p5-bareword-filehandles/Makefile
+++ b/devel/p5-bareword-filehandles/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Disables bareword filehandles
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-Lexical-SealRequireHints>=0:${PORTSDIR}/devel/p5-Lexical-SealRequireHints
-RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-Lexical-SealRequireHints>=0:${PORTSDIR}/devel/p5-Lexical-SealRequireHints
+BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0:devel/p5-B-Hooks-OP-Check \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-Lexical-SealRequireHints>=0:devel/p5-Lexical-SealRequireHints
+RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0:devel/p5-B-Hooks-OP-Check \
+		p5-Lexical-SealRequireHints>=0:devel/p5-Lexical-SealRequireHints
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-capitalization/Makefile b/devel/p5-capitalization/Makefile
index a9b509ae3be9..db3ce53d5165 100644
--- a/devel/p5-capitalization/Makefile
+++ b/devel/p5-capitalization/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Perl module which allows you to use familiar style on method naming
 
-BUILD_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-carton/Makefile b/devel/p5-carton/Makefile
index fb57059fef2b..ec0cc773b3f2 100644
--- a/devel/p5-carton/Makefile
+++ b/devel/p5-carton/Makefile
@@ -15,15 +15,15 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-App-cpanminus>=1.703:${PORTSDIR}/devel/p5-App-cpanminus \
-	p5-CPAN-Meta>=2.120921:${PORTSDIR}/devel/p5-CPAN-Meta \
-	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-	p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-	p5-Module-CPANfile>=0.9031:${PORTSDIR}/devel/p5-Module-CPANfile \
-	p5-Module-Metadata>=1.000003:${PORTSDIR}/devel/p5-Module-Metadata \
-	p5-Module-Reader>=0.002:${PORTSDIR}/devel/p5-Module-Reader \
-	p5-Path-Tiny>=0.033:${PORTSDIR}/devel/p5-Path-Tiny \
-	p5-Try-Tiny>=0.09:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-App-cpanminus>=1.703:devel/p5-App-cpanminus \
+	p5-CPAN-Meta>=2.120921:devel/p5-CPAN-Meta \
+	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements \
+	p5-JSON>=2.53:converters/p5-JSON \
+	p5-Module-CPANfile>=0.9031:devel/p5-Module-CPANfile \
+	p5-Module-Metadata>=1.000003:devel/p5-Module-Metadata \
+	p5-Module-Reader>=0.002:devel/p5-Module-Reader \
+	p5-Path-Tiny>=0.033:devel/p5-Path-Tiny \
+	p5-Try-Tiny>=0.09:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-constant-boolean/Makefile b/devel/p5-constant-boolean/Makefile
index a24762c186e3..ccd5e8dca500 100644
--- a/devel/p5-constant-boolean/Makefile
+++ b/devel/p5-constant-boolean/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Define TRUE and FALSE constants
 
-TEST_DEPENDS=	p5-Symol-Util>=0:${PORTSDIR}/devel/p5-Symbol-Util
+TEST_DEPENDS=	p5-Symol-Util>=0:devel/p5-Symbol-Util
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-constant-def/Makefile b/devel/p5-constant-def/Makefile
index 1a849aa40f81..c64d72b80a0a 100644
--- a/devel/p5-constant-def/Makefile
+++ b/devel/p5-constant-def/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mons@cpan.org
 COMMENT=	Declare only undeclared constants
 
-BUILD_DEPENDS=	p5-ex-lib>=0.06:${PORTSDIR}/devel/p5-ex-lib
+BUILD_DEPENDS=	p5-ex-lib>=0.06:devel/p5-ex-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-constant-lexical/Makefile b/devel/p5-constant-lexical/Makefile
index a1fac3ac8293..ead965dc8f32 100644
--- a/devel/p5-constant-lexical/Makefile
+++ b/devel/p5-constant-lexical/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl pragma to declare lexical compile-time constants
 
-BUILD_DEPENDS=	p5-Sub-Delete>=0:${PORTSDIR}/devel/p5-Sub-Delete \
-		p5-Lexical-Var>=0:${PORTSDIR}/devel/p5-Lexical-Var
+BUILD_DEPENDS=	p5-Sub-Delete>=0:devel/p5-Sub-Delete \
+		p5-Lexical-Var>=0:devel/p5-Lexical-Var
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-cpan-listchanges/Makefile b/devel/p5-cpan-listchanges/Makefile
index 3e7e24389bda..9457d7522fe6 100644
--- a/devel/p5-cpan-listchanges/Makefile
+++ b/devel/p5-cpan-listchanges/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to list changes for CPAN modules
 
 RUN_DEPENDS=	\
-	p5-Algorithm-Diff>0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-	p5-CPAN-DistnameInfo>0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Module-Metadata>0:${PORTSDIR}/devel/p5-Module-Metadata \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+	p5-Algorithm-Diff>0:devel/p5-Algorithm-Diff \
+	p5-CPAN-DistnameInfo>0:devel/p5-CPAN-DistnameInfo \
+	p5-libwww>0:www/p5-libwww \
+	p5-Module-Metadata>0:devel/p5-Module-Metadata \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-YAML>0:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ex-lib/Makefile b/devel/p5-ex-lib/Makefile
index da129db4310d..87170dd0f2b0 100644
--- a/devel/p5-ex-lib/Makefile
+++ b/devel/p5-ex-lib/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mons@cpan.org
 COMMENT=	Relative use lib in absolute way
 
-RUN_DEPENDS=	p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+RUN_DEPENDS=	p5-lib-abs>=0.90:devel/p5-lib-abs
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-forks/Makefile b/devel/p5-forks/Makefile
index 36ac0647ad36..ec92c2137ded 100644
--- a/devel/p5-forks/Makefile
+++ b/devel/p5-forks/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Drop-in replacement for Perl threads using fork()
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Acme-Damn>=0:${PORTSDIR}/devel/p5-Acme-Damn \
-		p5-Attribute-Handlers>=0:${PORTSDIR}/devel/p5-Attribute-Handlers \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-List-MoreUtils>=:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Sys-SigAction>=0.11:${PORTSDIR}/devel/p5-Sys-SigAction
+BUILD_DEPENDS=	p5-Acme-Damn>=0:devel/p5-Acme-Damn \
+		p5-Attribute-Handlers>=0:devel/p5-Attribute-Handlers \
+		p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-List-MoreUtils>=:lang/p5-List-MoreUtils \
+		p5-Sys-SigAction>=0.11:devel/p5-Sys-SigAction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-github_creator/Makefile b/devel/p5-github_creator/Makefile
index 89f7a34bacb3..77e742b83d2b 100644
--- a/devel/p5-github_creator/Makefile
+++ b/devel/p5-github_creator/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create a Github repository for your Perl module
 
-BUILD_DEPENDS=	p5-Config-IniFiles>0:${PORTSDIR}/devel/p5-Config-IniFiles	\
-		p5-File-Find-Closures>0:${PORTSDIR}/devel/p5-File-Find-Closures	\
-		p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl	\
-		p5-WWW-Mechanize>0:${PORTSDIR}/www/p5-WWW-Mechanize	\
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Config-IniFiles>0:devel/p5-Config-IniFiles	\
+		p5-File-Find-Closures>0:devel/p5-File-Find-Closures	\
+		p5-Log-Log4perl>0:devel/p5-Log-Log4perl	\
+		p5-WWW-Mechanize>0:www/p5-WWW-Mechanize	\
+		p5-YAML>0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-iCal-Parser/Makefile b/devel/p5-iCal-Parser/Makefile
index d3cd06dbbe39..8ec885dc8b9b 100644
--- a/devel/p5-iCal-Parser/Makefile
+++ b/devel/p5-iCal-Parser/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Parse iCalendar files into a data structure
 
-BUILD_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-	p5-FreezeThaw>=0.43:${PORTSDIR}/devel/p5-FreezeThaw \
-	p5-DateTime-Format-ICal>=0.08:${PORTSDIR}/devel/p5-DateTime-Format-ICal \
-	p5-Text-vFile-asData>=0.02:${PORTSDIR}/devel/p5-Text-vFile-asData
+BUILD_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String \
+	p5-FreezeThaw>=0.43:devel/p5-FreezeThaw \
+	p5-DateTime-Format-ICal>=0.08:devel/p5-DateTime-Format-ICal \
+	p5-Text-vFile-asData>=0.02:devel/p5-Text-vFile-asData
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=	perl5
diff --git a/devel/p5-lexical-underscore/Makefile b/devel/p5-lexical-underscore/Makefile
index be3dbfa394d4..be38fd946351 100644
--- a/devel/p5-lexical-underscore/Makefile
+++ b/devel/p5-lexical-underscore/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Access lexical underscore of your caller
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-libxml-enno/Makefile b/devel/p5-libxml-enno/Makefile
index 33fd75e0ffa9..12ee032e2317 100644
--- a/devel/p5-libxml-enno/Makefile
+++ b/devel/p5-libxml-enno/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Group of Perl modules for XML parsing
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
-RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-libxml>=0:textproc/p5-libxml \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
+RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-libxml>=0:textproc/p5-libxml \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
 
 CONFLICTS=	p5-XML-DOM-[0-9]* p5-XML-Filter-DetectWS-[0-9]* \
 		p5-XML-Filter-Reindent-[0-9]* p5-XML-Filter-SAXT-[0-9]* \
diff --git a/devel/p5-local-lib/Makefile b/devel/p5-local-lib/Makefile
index 5c3a814cae8f..99fdde264921 100644
--- a/devel/p5-local-lib/Makefile
+++ b/devel/p5-local-lib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension to create and use a local lib/ with PERL5LIB
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-match-simple/Makefile b/devel/p5-match-simple/Makefile
index 8a54c685ff65..d7a3103122e5 100644
--- a/devel/p5-match-simple/Makefile
+++ b/devel/p5-match-simple/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Simplified clone of smartmatch operator
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-Sub-Infix>=0.004:${PORTSDIR}/devel/p5-Sub-Infix
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
+		p5-Sub-Infix>=0.004:devel/p5-Sub-Infix
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USE_PERL5=	configure
 USES=		perl5
@@ -26,8 +26,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-mem/Makefile b/devel/p5-mem/Makefile
index fd8aa14738a1..6efd1fa7a1ba 100644
--- a/devel/p5-mem/Makefile
+++ b/devel/p5-mem/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.82:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.82:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-mixin/Makefile b/devel/p5-mixin/Makefile
index 79ad8b41782f..bae6f23ef4ee 100644
--- a/devel/p5-mixin/Makefile
+++ b/devel/p5-mixin/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-mocked/Makefile b/devel/p5-mocked/Makefile
index d2149823876c..c69818ae36bf 100644
--- a/devel/p5-mocked/Makefile
+++ b/devel/p5-mocked/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	mocked - use mocked libraries in unit tests
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-multidimensional/Makefile b/devel/p5-multidimensional/Makefile
index 321878d48332..151951f7d88a 100644
--- a/devel/p5-multidimensional/Makefile
+++ b/devel/p5-multidimensional/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Disables multidimensional array emulation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-Lexical-SealRequireHints>=0.005:${PORTSDIR}/devel/p5-Lexical-SealRequireHints
-RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-Lexical-SealRequireHints>=0.005:${PORTSDIR}/devel/p5-Lexical-SealRequireHints
+BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-Lexical-SealRequireHints>=0.005:devel/p5-Lexical-SealRequireHints
+RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check \
+		p5-Lexical-SealRequireHints>=0.005:devel/p5-Lexical-SealRequireHints
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-namespace-autoclean/Makefile b/devel/p5-namespace-autoclean/Makefile
index 01b1c2423ab3..d0b5407ad677 100644
--- a/devel/p5-namespace-autoclean/Makefile
+++ b/devel/p5-namespace-autoclean/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Keep imports out of your namespace
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.12:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Sub-Identify>=0:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.12:devel/p5-B-Hooks-EndOfScope \
+		p5-Sub-Identify>=0:devel/p5-Sub-Identify \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Spelling>0.12:${PORTSDIR}/devel/p5-Test-Spelling
+TEST_DEPENDS=	p5-Moo>=0:devel/p5-Moo \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Spelling>0.12:devel/p5-Test-Spelling
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-namespace-clean/Makefile b/devel/p5-namespace-clean/Makefile
index 5458a18536e9..804c4a3fbef6 100644
--- a/devel/p5-namespace-clean/Makefile
+++ b/devel/p5-namespace-clean/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Keep imports and functions out of your namespace
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.12:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Package-Stash>=0.23:${PORTSDIR}/devel/p5-Package-Stash
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.12:devel/p5-B-Hooks-EndOfScope \
+		p5-Package-Stash>=0.23:devel/p5-Package-Stash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-namespace-sweep/Makefile b/devel/p5-namespace-sweep/Makefile
index 35959dd038ad..0b5871e53461 100644
--- a/devel/p5-namespace-sweep/Makefile
+++ b/devel/p5-namespace-sweep/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Sweep up imported subs in your classes
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.09:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Package-Stash>=0.33:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.09:devel/p5-B-Hooks-EndOfScope \
+		p5-Package-Stash>=0.33:devel/p5-Package-Stash \
+		p5-Sub-Identify>=0.04:devel/p5-Sub-Identify \
+		p5-Sub-Name>=0:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-orz/Makefile b/devel/p5-orz/Makefile
index eba46596e0f8..865efc29fcae 100644
--- a/devel/p5-orz/Makefile
+++ b/devel/p5-orz/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Method of annotation as /* */ in perl
 
-BUILD_DEPENDS=	p5-Module-Compile>=0.21:${PORTSDIR}/devel/p5-Module-Compile
+BUILD_DEPENDS=	p5-Module-Compile>=0.21:devel/p5-Module-Compile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile
index 88dc2dc356af..750b5689753b 100644
--- a/devel/p5-perlqt/Makefile
+++ b/devel/p5-perlqt/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Perl bindings for Qt
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2 \
+		libqwt.so:x11-toolkits/qwt5
 
 USE_KDE4=	kdeprefix smokeqt qimageblitz
 USE_QT4=	corelib dbus gui network xml \
diff --git a/devel/p5-pip/Makefile b/devel/p5-pip/Makefile
index 8dad267ff91f..9e2d1280da42 100644
--- a/devel/p5-pip/Makefile
+++ b/devel/p5-pip/Makefile
@@ -15,18 +15,18 @@ COMMENT=	Perl Installation Program
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Zip>=1.29:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-CPAN-Inject>=0.07:${PORTSDIR}/devel/p5-CPAN-Inject \
-		p5-File-Which>=1.08:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-File-pushd>=0.32:${PORTSDIR}/devel/p5-File-pushd \
-		p5-PAR-Dist>=0.25:${PORTSDIR}/devel/p5-PAR-Dist \
-		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Archive-Zip>=1.29:archivers/p5-Archive-Zip \
+		p5-CPAN-Inject>=0.07:devel/p5-CPAN-Inject \
+		p5-File-Which>=1.08:sysutils/p5-File-Which \
+		p5-File-pushd>=0.32:devel/p5-File-pushd \
+		p5-PAR-Dist>=0.25:devel/p5-PAR-Dist \
+		p5-Params-Util>=1.00:devel/p5-Params-Util \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-LWP-Online>=0:${PORTSDIR}/www/p5-LWP-Online \
-		p5-Test-Script>=0:${PORTSDIR}/devel/p5-Test-Script \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2
+TEST_DEPENDS=	p5-LWP-Online>=0:www/p5-LWP-Online \
+		p5-Test-Script>=0:devel/p5-Test-Script \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-relative/Makefile b/devel/p5-relative/Makefile
index 80f5f069b609..fec63cc8c48c 100644
--- a/devel/p5-relative/Makefile
+++ b/devel/p5-relative/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Load modules with relative names
 
-RUN_DEPENDS=	p5-UNIVERSAL-require>=0.11:${PORTSDIR}/devel/p5-UNIVERSAL-require
+RUN_DEPENDS=	p5-UNIVERSAL-require>=0.11:devel/p5-UNIVERSAL-require
 
 BUILD_DEPEND=	${RUN_DEPENDS} \
-				p5-Test-Simple>=0.74:${PORTSDIR}/devel/p5-Test-Simple
+				p5-Test-Simple>=0.74:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-rpm-build-perl/Makefile b/devel/p5-rpm-build-perl/Makefile
index aad4c1de4407..1867728ccb13 100644
--- a/devel/p5-rpm-build-perl/Makefile
+++ b/devel/p5-rpm-build-perl/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	This module is required to build Perl RPM packages
 
-TEST_DEPENDS=	p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-self-init/Makefile b/devel/p5-self-init/Makefile
index 51151e154572..910036d70dbe 100644
--- a/devel/p5-self-init/Makefile
+++ b/devel/p5-self-init/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Invoke package init methods at compile time
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-ex-lib>=0:${PORTSDIR}/devel/p5-ex-lib
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-ex-lib>=0:devel/p5-ex-lib
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-self/Makefile b/devel/p5-self/Makefile
index 4274748e58ca..321e008017ca 100644
--- a/devel/p5-self/Makefile
+++ b/devel/p5-self/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Provides "self" and "args" keywords in your OO program
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-B-Hooks-Parser>=0.08:${PORTSDIR}/devel/p5-B-Hooks-Parser \
-		p5-B-OPCheck>=0.27:${PORTSDIR}/devel/p5-B-OPCheck \
-		p5-Devel-Declare>=0.003004:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-B-Hooks-Parser>=0.08:devel/p5-B-Hooks-Parser \
+		p5-B-OPCheck>=0.27:devel/p5-B-OPCheck \
+		p5-Devel-Declare>=0.003004:devel/p5-Devel-Declare \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-strictures/Makefile b/devel/p5-strictures/Makefile
index c5b1114ee9af..9fd2cd534ce9 100644
--- a/devel/p5-strictures/Makefile
+++ b/devel/p5-strictures/Makefile
@@ -23,9 +23,9 @@ OPTIONS_DEFINE=	STRICTURES_EXTRA
 OPTIONS_DEFAULT=STRICTURES_EXTRA
 
 STRICTURES_EXTRA_DESC=		Enable full set of strictures (recommended)
-STRICTURES_EXTRA_BUILD_DEPENDS=	p5-bareword-filehandles>=0:${PORTSDIR}/devel/p5-bareword-filehandles \
-				p5-indirect>=0:${PORTSDIR}/devel/p5-indirect \
-				p5-multidimensional>=0:${PORTSDIR}/devel/p5-multidimensional
+STRICTURES_EXTRA_BUILD_DEPENDS=	p5-bareword-filehandles>=0:devel/p5-bareword-filehandles \
+				p5-indirect>=0:devel/p5-indirect \
+				p5-multidimensional>=0:devel/p5-multidimensional
 STRICTURES_EXTRA_RUN_DEPENDS=	${STRICTURES_EXTRA_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-subatom/Makefile b/devel/p5-subatom/Makefile
index 2f0a8d8de9eb..e0321a91aef1 100644
--- a/devel/p5-subatom/Makefile
+++ b/devel/p5-subatom/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Produce an atom feed from subversion commits
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	p5-XML-Atom-SimpleFeed>=0.80:${PORTSDIR}/textproc/p5-XML-Atom-SimpleFeed
+BUILD_DEPENDS=	p5-XML-Atom-SimpleFeed>=0.80:textproc/p5-XML-Atom-SimpleFeed
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-syntax/Makefile b/devel/p5-syntax/Makefile
index d50dd1cddd83..376d115a8e9f 100644
--- a/devel/p5-syntax/Makefile
+++ b/devel/p5-syntax/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Activate syntax extensions in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-OptList>=0.104:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Data-OptList>=0.104:devel/p5-Data-OptList \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-true/Makefile b/devel/p5-true/Makefile
index f256de536b7a..102a7b7b65e9 100644
--- a/devel/p5-true/Makefile
+++ b/devel/p5-true/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Automatically return a true value when a file is required
 
-BUILD_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:${PORTSDIR}/devel/p5-B-Hooks-OP-Annotation \
-		p5-B-Hooks-OP-Check>=0.18:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-Devel-StackTrace>=1.27:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends
-RUN_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:${PORTSDIR}/devel/p5-B-Hooks-OP-Annotation \
-		p5-B-Hooks-OP-Check>=0.18:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-Devel-StackTrace>=1.27:${PORTSDIR}/devel/p5-Devel-StackTrace
+BUILD_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:devel/p5-B-Hooks-OP-Annotation \
+		p5-B-Hooks-OP-Check>=0.18:devel/p5-B-Hooks-OP-Check \
+		p5-Devel-StackTrace>=1.27:devel/p5-Devel-StackTrace \
+		p5-ExtUtils-Depends>=0.304:devel/p5-ExtUtils-Depends
+RUN_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:devel/p5-B-Hooks-OP-Annotation \
+		p5-B-Hooks-OP-Check>=0.18:devel/p5-B-Hooks-OP-Check \
+		p5-Devel-StackTrace>=1.27:devel/p5-Devel-StackTrace
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-uni-perl/Makefile b/devel/p5-uni-perl/Makefile
index 3c990f1d2272..e6ddd9e8b84b 100644
--- a/devel/p5-uni-perl/Makefile
+++ b/devel/p5-uni-perl/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mons@cpan.org
 COMMENT=	Modern perl with Unicode
 
-RUN_DEPENDS=	p5-Encode>=2.37:${PORTSDIR}/converters/p5-Encode \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+RUN_DEPENDS=	p5-Encode>=2.37:converters/p5-Encode \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/paexec/Makefile b/devel/paexec/Makefile
index 2ac93d0e5db6..cded3fdd1b2c 100644
--- a/devel/paexec/Makefile
+++ b/devel/paexec/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Parallel executor, distributes tasks over network
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	mkcmake:${PORTSDIR}/devel/mk-configure \
-		runawk:${PORTSDIR}/lang/runawk
+BUILD_DEPENDS=	mkcmake:devel/mk-configure \
+		runawk:lang/runawk
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/pas2dox/Makefile b/devel/pas2dox/Makefile
index 2c5211c4bd66..d5b5412147d4 100644
--- a/devel/pas2dox/Makefile
+++ b/devel/pas2dox/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	bin/${PORTNAME}
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>0:textproc/flex
 MAKE_ENV+=	LEX="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index c943961c07e2..69c1768e09dd 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Wrapper class around the pcre library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/pcsc-ada/Makefile b/devel/pcsc-ada/Makefile
index 826d29f1f1a1..47b4a99dbb59 100644
--- a/devel/pcsc-ada/Makefile
+++ b/devel/pcsc-ada/Makefile
@@ -27,7 +27,7 @@ NO_OPTIONS_SORT=yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUNIT_TEST} || ${PORT_OPTIONS:MINTF_TEST}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/gnat/ahven.gpr:${PORTSDIR}/devel/ahven
+BUILD_DEPENDS+=	${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 . if ${PORT_OPTIONS:MUNIT_TEST}
 ALL_TARGET+=	utests
 . endif
@@ -36,11 +36,11 @@ ALL_TARGET+=	itests
 . endif
 .endif
 
-LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc \
-		source-highlight:${PORTSDIR}/textproc/source-highlight
+BUILD_DEPENDS+= asciidoc:textproc/asciidoc \
+		source-highlight:textproc/source-highlight
 ALL_TARGET+=	doc
 USES+=		gmake
 .endif
diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile
index 0043518127bb..d14822face38 100644
--- a/devel/pdcurses/Makefile
+++ b/devel/pdcurses/Makefile
@@ -26,11 +26,11 @@ LATIN1_CONFIGURE_ENABLE=latin1
 
 NEXTAW_DESC=		Link with NeXtaw
 NEXTAW_CONFIGURE_WITH=	nextaw
-NEXTAW_LIB_DEPENDS=	libneXtaw.so:${PORTSDIR}/x11-toolkits/neXtaw
+NEXTAW_LIB_DEPENDS=	libneXtaw.so:x11-toolkits/neXtaw
 
 XAW3D_DESC=		Link with Xaw3d
 XAW3D_CONFIGURE_WITH=	xaw3d
-XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/devel/pear-Config/Makefile b/devel/pear-Config/Makefile
index a794b17970e2..0ce9938a0d77 100644
--- a/devel/pear-Config/Makefile
+++ b/devel/pear-Config/Makefile
@@ -14,7 +14,7 @@ PEAR_XML_UTIL_DESC=	PEAR::XML_Util support
 
 USES=	pear
 
-PEAR_XML_PARSER_RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+PEAR_XML_PARSER_RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays/Makefile b/devel/pear-Date_Holidays/Makefile
index 9ab24fffa1dd..3578f748a59c 100644
--- a/devel/pear-Date_Holidays/Makefile
+++ b/devel/pear-Date_Holidays/Makefile
@@ -8,16 +8,16 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR driver based class to calculate holidays
 
-BUILD_DEPENDS=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+RUN_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 USES=		pear
 
 OPTIONS_DEFINE=	PEAR_CONSOLE_GETARGS
 PEAR_CONSOLE_GETARGS_DESC=	Console::Getargs support
 
-PEAR_CONSOLE_GETARGS_BUILD_DEPENDS=${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
+PEAR_CONSOLE_GETARGS_BUILD_DEPENDS=${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Austria/Makefile b/devel/pear-Date_Holidays_Austria/Makefile
index a2c2ce350485..0ea9a3ce54b2 100644
--- a/devel/pear-Date_Holidays_Austria/Makefile
+++ b/devel/pear-Date_Holidays_Austria/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Driver based class to calculate holidays in Austria
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=		pear
 NO_ARCH=	yes
diff --git a/devel/pear-Date_Holidays_Brazil/Makefile b/devel/pear-Date_Holidays_Brazil/Makefile
index aef293456b9e..c060c35dde89 100644
--- a/devel/pear-Date_Holidays_Brazil/Makefile
+++ b/devel/pear-Date_Holidays_Brazil/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Brazil
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Denmark/Makefile b/devel/pear-Date_Holidays_Denmark/Makefile
index e632bd8d4eb9..a091b92b50af 100644
--- a/devel/pear-Date_Holidays_Denmark/Makefile
+++ b/devel/pear-Date_Holidays_Denmark/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Denmark
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Discordian/Makefile b/devel/pear-Date_Holidays_Discordian/Makefile
index c7b15aab8f6d..3af82fc0d5d3 100644
--- a/devel/pear-Date_Holidays_Discordian/Makefile
+++ b/devel/pear-Date_Holidays_Discordian/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate Discordian holidays
 
-BUILD_DEPENDS=  ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=   	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=  ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=   	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_EnglandWales/Makefile b/devel/pear-Date_Holidays_EnglandWales/Makefile
index 54a26d3c6589..a8d27f39c49b 100644
--- a/devel/pear-Date_Holidays_EnglandWales/Makefile
+++ b/devel/pear-Date_Holidays_EnglandWales/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in England and Wales
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Germany/Makefile b/devel/pear-Date_Holidays_Germany/Makefile
index e3821979d20d..1b5d35f50384 100644
--- a/devel/pear-Date_Holidays_Germany/Makefile
+++ b/devel/pear-Date_Holidays_Germany/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Germany
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Iceland/Makefile b/devel/pear-Date_Holidays_Iceland/Makefile
index fee6bf1d5ceb..9bad421058cc 100644
--- a/devel/pear-Date_Holidays_Iceland/Makefile
+++ b/devel/pear-Date_Holidays_Iceland/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Iceland
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Ireland/Makefile b/devel/pear-Date_Holidays_Ireland/Makefile
index bdd486571f02..ac8b4dbe2810 100644
--- a/devel/pear-Date_Holidays_Ireland/Makefile
+++ b/devel/pear-Date_Holidays_Ireland/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Ireland
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Italy/Makefile b/devel/pear-Date_Holidays_Italy/Makefile
index 0bb8ca5e276b..fbbbc123765d 100644
--- a/devel/pear-Date_Holidays_Italy/Makefile
+++ b/devel/pear-Date_Holidays_Italy/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Italy
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=		pear
 
diff --git a/devel/pear-Date_Holidays_Japan/Makefile b/devel/pear-Date_Holidays_Japan/Makefile
index 569f850b6b0a..dc7015280fb8 100644
--- a/devel/pear-Date_Holidays_Japan/Makefile
+++ b/devel/pear-Date_Holidays_Japan/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Japan
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Netherlands/Makefile b/devel/pear-Date_Holidays_Netherlands/Makefile
index 0305140b4628..a4677b270de5 100644
--- a/devel/pear-Date_Holidays_Netherlands/Makefile
+++ b/devel/pear-Date_Holidays_Netherlands/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the Netherlands
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS:=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Norway/Makefile b/devel/pear-Date_Holidays_Norway/Makefile
index 42c41403d98d..7daa4f6a7c49 100644
--- a/devel/pear-Date_Holidays_Norway/Makefile
+++ b/devel/pear-Date_Holidays_Norway/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Norway
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_PHPdotNet/Makefile b/devel/pear-Date_Holidays_PHPdotNet/Makefile
index 82e4091aeccb..77e7c086be3e 100644
--- a/devel/pear-Date_Holidays_PHPdotNet/Makefile
+++ b/devel/pear-Date_Holidays_PHPdotNet/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate birthdays of members of PHP.net
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Romania/Makefile b/devel/pear-Date_Holidays_Romania/Makefile
index d4d8c5bc3b48..fdb09d064fe3 100644
--- a/devel/pear-Date_Holidays_Romania/Makefile
+++ b/devel/pear-Date_Holidays_Romania/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Romania
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Slovenia/Makefile b/devel/pear-Date_Holidays_Slovenia/Makefile
index d72fbf82f6c1..9047fc4e7c3f 100644
--- a/devel/pear-Date_Holidays_Slovenia/Makefile
+++ b/devel/pear-Date_Holidays_Slovenia/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Slovenia
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Sweden/Makefile b/devel/pear-Date_Holidays_Sweden/Makefile
index f3d4240cae87..852eec590c38 100644
--- a/devel/pear-Date_Holidays_Sweden/Makefile
+++ b/devel/pear-Date_Holidays_Sweden/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Sweden
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_UNO/Makefile b/devel/pear-Date_Holidays_UNO/Makefile
index ba77fc626790..724497bb7ac1 100644
--- a/devel/pear-Date_Holidays_UNO/Makefile
+++ b/devel/pear-Date_Holidays_UNO/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the UNO
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_USA/Makefile b/devel/pear-Date_Holidays_USA/Makefile
index 139e5c5a253e..e6bbbf3f0d42 100644
--- a/devel/pear-Date_Holidays_USA/Makefile
+++ b/devel/pear-Date_Holidays_USA/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the USA
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Ukraine/Makefile b/devel/pear-Date_Holidays_Ukraine/Makefile
index 4d0d3bd8b038..2374e709e862 100644
--- a/devel/pear-Date_Holidays_Ukraine/Makefile
+++ b/devel/pear-Date_Holidays_Ukraine/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the Ukraine
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-FSM/Makefile b/devel/pear-FSM/Makefile
index a19d083253b2..447d5a017038 100644
--- a/devel/pear-FSM/Makefile
+++ b/devel/pear-FSM/Makefile
@@ -13,6 +13,6 @@ PEAR_GRAPGHVIZ_DESC=	PEAR::GraphViz support
 
 USES=	pear
 
-PEAR_GRAPGHVIZ_RUN_DEPENDS=	${PEARDIR}/GraphViz.php:${PORTSDIR}/graphics/pear-Image_GraphViz
+PEAR_GRAPGHVIZ_RUN_DEPENDS=	${PEARDIR}/GraphViz.php:graphics/pear-Image_GraphViz
 
 .include <bsd.port.mk>
diff --git a/devel/pear-File_Iterator/Makefile b/devel/pear-File_Iterator/Makefile
index f919d759419a..b5ab7760e0be 100644
--- a/devel/pear-File_Iterator/Makefile
+++ b/devel/pear-File_Iterator/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PEAR FileIterator implementation
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-HTML_BBCodeParser/Makefile b/devel/pear-HTML_BBCodeParser/Makefile
index 7f8de5e80a3f..96ffd76c7cf3 100644
--- a/devel/pear-HTML_BBCodeParser/Makefile
+++ b/devel/pear-HTML_BBCodeParser/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	lewiz@compsoc.man.ac.uk
 COMMENT=	Parser to replace UBB style tags with their HTML equivalents
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_CSS/Makefile b/devel/pear-HTML_CSS/Makefile
index 5c4b413caab1..5b78dbeaf577 100644
--- a/devel/pear-HTML_CSS/Makefile
+++ b/devel/pear-HTML_CSS/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class for generating CSS declarations
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Page2/Makefile b/devel/pear-HTML_Page2/Makefile
index 5dcb53ae8c0c..216bc0bd7821 100644
--- a/devel/pear-HTML_Page2/Makefile
+++ b/devel/pear-HTML_Page2/Makefile
@@ -9,8 +9,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}beta
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR base class for XHTML page generation
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm/Makefile b/devel/pear-HTML_QuickForm/Makefile
index 7026382f0d49..e534a490a19f 100644
--- a/devel/pear-HTML_QuickForm/Makefile
+++ b/devel/pear-HTML_QuickForm/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Provide methods for creating, validating, and processing HTML forms
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS:=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS:=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm2/Makefile b/devel/pear-HTML_QuickForm2/Makefile
index 75c8a494da0f..3b51340b97c5 100644
--- a/devel/pear-HTML_QuickForm2/Makefile
+++ b/devel/pear-HTML_QuickForm2/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP5 rewrite of the HTML_QuickForm package
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common2.php:${PORTSDIR}/devel/pear-HTML_Common2
-RUN_DEPENDS=	${PEARDIR}/HTML/Common2.php:${PORTSDIR}/devel/pear-HTML_Common2
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2
+RUN_DEPENDS=	${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_Controller/Makefile b/devel/pear-HTML_QuickForm_Controller/Makefile
index bbbbaeba1d9b..f088e5f991e6 100644
--- a/devel/pear-HTML_QuickForm_Controller/Makefile
+++ b/devel/pear-HTML_QuickForm_Controller/Makefile
@@ -10,8 +10,8 @@ COMMENT=	The add-on to HTML_QuickForm that allows building of multipage forms
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_Livesearch/Makefile b/devel/pear-HTML_QuickForm_Livesearch/Makefile
index 41db8e3651d4..06b99ef30e1d 100644
--- a/devel/pear-HTML_QuickForm_Livesearch/Makefile
+++ b/devel/pear-HTML_QuickForm_Livesearch/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Element for PEAR::HTML_QuickForm to enable a suggest search
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/AJAX.php:${PORTSDIR}/www/pear-HTML_AJAX
-RUN_DEPENDS:=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/AJAX.php:${PORTSDIR}/www/pear-HTML_AJAX
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX
+RUN_DEPENDS:=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
index 0a4bba96120b..de9531d6b048 100644
--- a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
+++ b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	chris@smartt.com
 COMMENT=	Implementation of Tableless Renderer for HTML_QuickForm
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_SelectFilter/Makefile b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
index a3da3f51f262..7126ddc8e21a 100644
--- a/devel/pear-HTML_QuickForm_SelectFilter/Makefile
+++ b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
@@ -9,8 +9,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}RC1
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Element for PEAR::HTML_QuickForm that defines dynamic filters
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_advmultiselect/Makefile b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
index f6fce0efd976..94182fadedf3 100644
--- a/devel/pear-HTML_QuickForm_advmultiselect/Makefile
+++ b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	devel www pear
 MAINTAINER=	chris@ctgameinfo.com
 COMMENT=	Element for PEAR::HTML_QuickForm that defines a 2 box multi-select
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Select/Makefile b/devel/pear-HTML_Select/Makefile
index e95618273c3e..5d612613cffc 100644
--- a/devel/pear-HTML_Select/Makefile
+++ b/devel/pear-HTML_Select/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR::HTML_Select is a class for generating HTML form select elements
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 53c5bec16b48..f2975c7b37d1 100644
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Some small PEAR classes to handle common <select> lists
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common	\
-		${PEARDIR}/I18N/Common.php:${PORTSDIR}/devel/pear-I18N
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common	\
-		${PEARDIR}/I18N/Common.php:${PORTSDIR}/devel/pear-I18N
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common	\
+		${PEARDIR}/I18N/Common.php:devel/pear-I18N
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common	\
+		${PEARDIR}/I18N/Common.php:devel/pear-I18N
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Table/Makefile b/devel/pear-HTML_Table/Makefile
index a01592317678..ef31a0971546 100644
--- a/devel/pear-HTML_Table/Makefile
+++ b/devel/pear-HTML_Table/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Makes the design of HTML tables easy, flexible, reusable, and efficient
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Template_Flexy/Makefile b/devel/pear-HTML_Template_Flexy/Makefile
index 53aa717cd5d7..e8e81df2cb88 100644
--- a/devel/pear-HTML_Template_Flexy/Makefile
+++ b/devel/pear-HTML_Template_Flexy/Makefile
@@ -17,8 +17,8 @@ PEAR_TRANSLATION2_DESC=	PEAR::Translation2 support
 
 USES=	pear
 
-PEAR_HTML_JAVASCRIPT_RUN_DEPENDS=	${PEARDIR}/HTML/Javascript.php:${PORTSDIR}/devel/pear-HTML_Javascript
-PEAR_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:${PORTSDIR}/sysutils/pear-File_Gettext
-PEAR_TRANSLATION2_RUN_DEPENDS=	${PEARDIR}/Translation2.php:${PORTSDIR}/sysutils/pear-Translation2
+PEAR_HTML_JAVASCRIPT_RUN_DEPENDS=	${PEARDIR}/HTML/Javascript.php:devel/pear-HTML_Javascript
+PEAR_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:sysutils/pear-File_Gettext
+PEAR_TRANSLATION2_RUN_DEPENDS=	${PEARDIR}/Translation2.php:sysutils/pear-Translation2
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Core/Makefile b/devel/pear-Horde_Core/Makefile
index 54d41d1b5d7a..4a3503c92a66 100644
--- a/devel/pear-Horde_Core/Makefile
+++ b/devel/pear-Horde_Core/Makefile
@@ -68,7 +68,7 @@ USE_HORDE_RUN=	Horde_Role \
 USE_HORDE_RUN+=	Horde_Routes
 
 KOLAB_USE=	HORDE_RUN=Horde_Kolab_Server,Horde_Kolab_Session,Horde_Kolab_Storage
-LZF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:${PORTSDIR}/archivers/pecl-lzf
+LZF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:archivers/pecl-lzf
 SOCKETS_USE=	PHP=sockets
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Nls/Makefile b/devel/pear-Horde_Nls/Makefile
index c89f0364249f..ff9cd70357d1 100644
--- a/devel/pear-Horde_Nls/Makefile
+++ b/devel/pear-Horde_Nls/Makefile
@@ -18,6 +18,6 @@ OPTIONS_DEFINE=	GEOIP
 GEOIP_DESC=	Depend on geoip PHP extension
 
 GEOIP_USE=	PHP=yes
-GEOIP_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:${PORTSDIR}/net/pecl-geoip
+GEOIP_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:net/pecl-geoip
 
 .include <bsd.port.mk>
diff --git a/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile
index 601d20f3ea9d..ef0232dd6eee 100644
--- a/devel/pear-I18N/Makefile
+++ b/devel/pear-I18N/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR internationalization package
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
+RUN_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
 
 USES=	pear
 
diff --git a/devel/pear-Net_Gearman/Makefile b/devel/pear-Net_Gearman/Makefile
index 861333d5f04e..6e190a37c93f 100644
--- a/devel/pear-Net_Gearman/Makefile
+++ b/devel/pear-Net_Gearman/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Gearman client libraray for PHP
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:${PORTSDIR}/devel/pear
+BUILD_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:devel/pear
 
 USE_PHP=	json mbstring sockets
 USES=		pear
diff --git a/devel/pear-PEAR_Info/Makefile b/devel/pear-PEAR_Info/Makefile
index dc76ccab0e33..7aa28067ed6c 100644
--- a/devel/pear-PEAR_Info/Makefile
+++ b/devel/pear-PEAR_Info/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Show Information about your PEAR install and its packages
 
-BUILD_DEPENDS=	${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
-RUN_DEPENDS=	${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
+BUILD_DEPENDS=	${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs
+RUN_DEPENDS=	${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs
 
 OPTIONS_DEFINE=	PEAR_PHPUNIT3
 OPTIONS_DEFAULT=	PEAR_PHPUNIT3
@@ -17,6 +17,6 @@ PEAR_PHPUNIT3_DESC=	PEAR::PHPUnit3 support
 
 USES=	pear
 
-PEAR_PHPUNIT3_RUN_DEPENDS=	${PEARDIR}/PHPUnit/Autoload.php:${PORTSDIR}/devel/pear-PHPUnit3
+PEAR_PHPUNIT3_RUN_DEPENDS=	${PEARDIR}/PHPUnit/Autoload.php:devel/pear-PHPUnit3
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PEAR_PackageFileManager/Makefile b/devel/pear-PEAR_PackageFileManager/Makefile
index 96371f630891..71e78c04f43e 100644
--- a/devel/pear-PEAR_PackageFileManager/Makefile
+++ b/devel/pear-PEAR_PackageFileManager/Makefile
@@ -14,7 +14,7 @@ PEAR_XML_TREE_DESC=	PEAR::XML_Tree support
 
 USES=	pear
 
-PEAR_PHP_COMPATINFO_RUN_DEPENDS=	${PEARDIR}/PHP/CompatInfo.php:${PORTSDIR}/devel/pear-PHP_CompatInfo
-PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
+PEAR_PHP_COMPATINFO_RUN_DEPENDS=	${PEARDIR}/PHP/CompatInfo.php:devel/pear-PHP_CompatInfo
+PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PEAR_PackageFileManager2/Makefile b/devel/pear-PEAR_PackageFileManager2/Makefile
index 55e33f712f79..1d55741dce63 100644
--- a/devel/pear-PEAR_PackageFileManager2/Makefile
+++ b/devel/pear-PEAR_PackageFileManager2/Makefile
@@ -10,8 +10,8 @@ COMMENT=	PEAR class to maintain PEAR packages
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
-RUN_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
+BUILD_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:devel/pear-PEAR_PackageFileManager_Plugins
+RUN_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:devel/pear-PEAR_PackageFileManager_Plugins
 
 USES=	pear
 
diff --git a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
index 295d4cdc2464..783d05bd03bf 100644
--- a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
+++ b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	The plugins for PEAR_PackageFileManager
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/devel/pear-PHPUnit3/Makefile b/devel/pear-PHPUnit3/Makefile
index 9709c2043539..d244be1e8bec 100644
--- a/devel/pear-PHPUnit3/Makefile
+++ b/devel/pear-PHPUnit3/Makefile
@@ -15,20 +15,20 @@ COMMENT=	PEAR regression testing framework for unit tests
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-File_Iterator>=1.3.1:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
-		pear-PHP_CodeCoverage>=1.2.1:${PORTSDIR}/devel/pear-PHP_CodeCoverage \
-		pear-PHP_Timer>=1.0.2:${PORTSDIR}/devel/pear-PHP_Timer \
-		pear-PHPUnit_MockObject>=1.2.0:${PORTSDIR}/devel/pear-PHPUnit_MockObject \
-		pear-Symfony_Component_Yaml>=2.1.0:${PORTSDIR}/textproc/pear-Symfony_Component_Yaml \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-File_Iterator>=1.3.1:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
-		pear-PHP_CodeCoverage>=1.2.1:${PORTSDIR}/devel/pear-PHP_CodeCoverage \
-		pear-PHP_Timer>=1.0.2:${PORTSDIR}/devel/pear-PHP_Timer \
-		pear-PHPUnit_MockObject>=1.2.0:${PORTSDIR}/devel/pear-PHPUnit_MockObject \
-		pear-Symfony_Component_Yaml>=2.1.0:${PORTSDIR}/textproc/pear-Symfony_Component_Yaml \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-File_Iterator>=1.3.1:devel/pear-File_Iterator \
+		pear-Text_Template>=1.1.1:textproc/pear-Text_Template \
+		pear-PHP_CodeCoverage>=1.2.1:devel/pear-PHP_CodeCoverage \
+		pear-PHP_Timer>=1.0.2:devel/pear-PHP_Timer \
+		pear-PHPUnit_MockObject>=1.2.0:devel/pear-PHPUnit_MockObject \
+		pear-Symfony_Component_Yaml>=2.1.0:textproc/pear-Symfony_Component_Yaml \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear-File_Iterator>=1.3.1:devel/pear-File_Iterator \
+		pear-Text_Template>=1.1.1:textproc/pear-Text_Template \
+		pear-PHP_CodeCoverage>=1.2.1:devel/pear-PHP_CodeCoverage \
+		pear-PHP_Timer>=1.0.2:devel/pear-PHP_Timer \
+		pear-PHPUnit_MockObject>=1.2.0:devel/pear-PHPUnit_MockObject \
+		pear-Symfony_Component_Yaml>=2.1.0:textproc/pear-Symfony_Component_Yaml \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 CONFLICTS=	pear-PHPUnit-[12]*
 
diff --git a/devel/pear-PHPUnit_MockObject/Makefile b/devel/pear-PHPUnit_MockObject/Makefile
index 8b167cd82749..2ba9627def3a 100644
--- a/devel/pear-PHPUnit_MockObject/Makefile
+++ b/devel/pear-PHPUnit_MockObject/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Mock Object library for PHPUnit
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/Text/Template.php:${PORTSDIR}/textproc/pear-Text_Template \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/Text/Template.php:${PORTSDIR}/textproc/pear-Text_Template \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/Text/Template.php:textproc/pear-Text_Template \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/Text/Template.php:textproc/pear-Text_Template \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-PHP_Beautifier/Makefile b/devel/pear-PHP_Beautifier/Makefile
index 2e5afdeba2c1..bf4774afac0d 100644
--- a/devel/pear-PHP_Beautifier/Makefile
+++ b/devel/pear-PHP_Beautifier/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR beautifier for PHP
 
-BUILD_DEPENDS=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log
+RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log
 
 USES=	pear
 USE_PHP=	tokenizer bz2
diff --git a/devel/pear-PHP_CodeBrowser/Makefile b/devel/pear-PHP_CodeBrowser/Makefile
index 5586f2fc1bfc..95cdae331441 100644
--- a/devel/pear-PHP_CodeBrowser/Makefile
+++ b/devel/pear-PHP_CodeBrowser/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Code browser that augments the code with information
 
-BUILD_DEPENDS=	pear-Console_CommandLine>=1.1.3:${PORTSDIR}/devel/pear-Console_CommandLine \
-		pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-Log>=1.2.1:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS=	pear-Console_CommandLine>=1.1.3:${PORTSDIR}/devel/pear-Console_CommandLine \
-		pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-Log>=1.2.1:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	pear-Console_CommandLine>=1.1.3:devel/pear-Console_CommandLine \
+		pear-File_Iterator>=1.3.0:devel/pear-File_Iterator \
+		pear-Log>=1.2.1:sysutils/pear-Log
+RUN_DEPENDS=	pear-Console_CommandLine>=1.1.3:devel/pear-Console_CommandLine \
+		pear-File_Iterator>=1.3.0:devel/pear-File_Iterator \
+		pear-Log>=1.2.1:sysutils/pear-Log
 
 USES=	pear
 USE_PHP=	dom
diff --git a/devel/pear-PHP_CodeCoverage/Makefile b/devel/pear-PHP_CodeCoverage/Makefile
index 4631d3ad8d0e..6a5f5258dcb6 100644
--- a/devel/pear-PHP_CodeCoverage/Makefile
+++ b/devel/pear-PHP_CodeCoverage/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Library that provides PHP code coverage information
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-PHP_TokenStream>=1.1.3:${PORTSDIR}/devel/pear-PHP_TokenStream \
-		pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-PHP_TokenStream>=1.1.3:${PORTSDIR}/devel/pear-PHP_TokenStream \
-		pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-File_Iterator>=1.3.0:devel/pear-File_Iterator \
+		pear-PHP_TokenStream>=1.1.3:devel/pear-PHP_TokenStream \
+		pear-Text_Template>=1.1.1:textproc/pear-Text_Template \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear-File_Iterator>=1.3.0:devel/pear-File_Iterator \
+		pear-PHP_TokenStream>=1.1.3:devel/pear-PHP_TokenStream \
+		pear-Text_Template>=1.1.1:textproc/pear-Text_Template \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
@@ -29,6 +29,6 @@ DOM_DESC=	Enable DOM support
 XDEBUG_DESC=	Enable Xdebug support
 
 DOM_USE=	PHP=dom
-XDEBUG_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdebug.so:${PORTSDIR}/devel/php-xdebug
+XDEBUG_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdebug.so:devel/php-xdebug
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile
index 1bcf223b199e..adea3ef6520a 100644
--- a/devel/pear-PHP_CompatInfo/Makefile
+++ b/devel/pear-PHP_CompatInfo/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class to find out the minimum version and extensions required
 
-RUN_DEPENDS=	${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table \
-		${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs \
-		${PEARDIR}/File/Find.php:${PORTSDIR}/sysutils/pear-File_Find \
-		${PEARDIR}/Event/Dispatcher.php:${PORTSDIR}/devel/pear-Event_Dispatcher
+RUN_DEPENDS=	${PEARDIR}/Console/Table.php:devel/pear-Console_Table \
+		${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs \
+		${PEARDIR}/File/Find.php:sysutils/pear-File_Find \
+		${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher
 
 PORTSCOUT=	skipv:1.9.0a1,1.9.0b1,1.9.0b2
 USE_PHP=	tokenizer
@@ -26,10 +26,10 @@ PEAR_PHPUNIT_DESC=	PEAR::PHPUnit support
 PEAR_XML_UTIL_DESC=	PEAR::XML_Util support
 PEAR_HTML_TABLE_DESC=	PEAR::HTML_Table
 
-PEAR_XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:${PORTSDIR}/textproc/pear-XML_Beautifier
-PEAR_VAR_DUMP_RUN_DEPENDS=	${PEARDIR}/Var/Dump.php:${PORTSDIR}/devel/pear-Var_Dump
-PEAR_PHPUNIT_RUN_DEPENDS=	${PEARDIR}/PHPUnit/Autoload.php:${PORTSDIR}/devel/pear-PHPUnit3
-PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table
+PEAR_XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:textproc/pear-XML_Beautifier
+PEAR_VAR_DUMP_RUN_DEPENDS=	${PEARDIR}/Var/Dump.php:devel/pear-Var_Dump
+PEAR_PHPUNIT_RUN_DEPENDS=	${PEARDIR}/PHPUnit/Autoload.php:devel/pear-PHPUnit3
+PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PHP_Depend/Makefile b/devel/pear-PHP_Depend/Makefile
index b5a2409f2559..1a8a08239419 100644
--- a/devel/pear-PHP_Depend/Makefile
+++ b/devel/pear-PHP_Depend/Makefile
@@ -12,8 +12,8 @@ COMMENT=	PHP_Depend design quality metrics for PHP packages
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
 
 USES=	pear
 PEAR_CHANNEL=	pdepend
diff --git a/devel/pear-PHP_PMD/Makefile b/devel/pear-PHP_PMD/Makefile
index 96dcc867cdc0..9ecf5fb9e8db 100644
--- a/devel/pear-PHP_PMD/Makefile
+++ b/devel/pear-PHP_PMD/Makefile
@@ -12,8 +12,8 @@ COMMENT=	PHP Mess Detector
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:devel/pear-channel-phpmd
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:devel/pear-channel-phpmd
 
 USES=	pear
 PEAR_CHANNEL=	phpmd
diff --git a/devel/pear-PHP_Timer/Makefile b/devel/pear-PHP_Timer/Makefile
index c97af5a6047b..3f1ca3d0d3c1 100644
--- a/devel/pear-PHP_Timer/Makefile
+++ b/devel/pear-PHP_Timer/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Utility class for timing
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-PHP_TokenStream/Makefile b/devel/pear-PHP_TokenStream/Makefile
index 0ea0b7e17ef2..413a26978ccb 100644
--- a/devel/pear-PHP_TokenStream/Makefile
+++ b/devel/pear-PHP_TokenStream/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Wrapper around PHP tokenizer extension
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-PHP_UML/Makefile b/devel/pear-PHP_UML/Makefile
index 3e16bfe4c656..e63ac38371a4 100644
--- a/devel/pear-PHP_UML/Makefile
+++ b/devel/pear-PHP_UML/Makefile
@@ -10,9 +10,9 @@ COMMENT=	PEAR Class to Create UML Representation of PHP Code
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
-		${PEARDIR}/Console/CommandLine.php:${PORTSDIR}/devel/pear-Console_CommandLine
-RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear \
+		${PEARDIR}/Console/CommandLine.php:devel/pear-Console_CommandLine
+RUN_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
 
 USES=		pear
 USE_PHP=	spl xsl
diff --git a/devel/pear-PPW/Makefile b/devel/pear-PPW/Makefile
index 521b4eebc476..adba29b3ac1b 100644
--- a/devel/pear-PPW/Makefile
+++ b/devel/pear-PPW/Makefile
@@ -13,12 +13,12 @@ COMMENT=	PHP Project Wizard
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
-		pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-Text_Template>=1.1.0:${PORTSDIR}/textproc/pear-Text_Template
-RUN_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
-		pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-Text_Template>=1.1.0:${PORTSDIR}/textproc/pear-Text_Template
+BUILD_DEPENDS=	pear>=1.9.4:devel/pear \
+		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-Text_Template>=1.1.0:textproc/pear-Text_Template
+RUN_DEPENDS=	pear>=1.9.4:devel/pear \
+		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-Text_Template>=1.1.0:textproc/pear-Text_Template
 
 PEAR_CHANNEL=	phpunit
 USES=	pear
diff --git a/devel/pear-PhpDocumentor/Makefile b/devel/pear-PhpDocumentor/Makefile
index 2ebb41f324c1..1154634f520e 100644
--- a/devel/pear-PhpDocumentor/Makefile
+++ b/devel/pear-PhpDocumentor/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Provides automatic documenting of php-api from the source
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	pear-PHPDoc-[0-9]*
@@ -17,7 +17,7 @@ USES=	pear
 OPTIONS_DEFINE=	XML_BEAUTIFIER
 XML_BEAUTIFIER_DESC=	XML_Beautifier support
 
-XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:${PORTSDIR}/textproc/pear-XML_Beautifier
+XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:textproc/pear-XML_Beautifier
 
 post-extract:
 .for dir in ${DUMMYDIRS}
diff --git a/devel/pear-Pirum/Makefile b/devel/pear-Pirum/Makefile
index c4c4b10c0453..f390676b0de0 100644
--- a/devel/pear-Pirum/Makefile
+++ b/devel/pear-Pirum/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple PEAR channel server manager
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:${PORTSDIR}/devel/pear-channel-pirum
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:${PORTSDIR}/devel/pear-channel-pirum
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:devel/pear-channel-pirum
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:devel/pear-channel-pirum
 
 PEAR_CHANNEL=	pirum
 USES=	pear
diff --git a/devel/pear-SebastianBergmann_FinderFacade/Makefile b/devel/pear-SebastianBergmann_FinderFacade/Makefile
index f7a4f7924fb0..c145f672d00a 100644
--- a/devel/pear-SebastianBergmann_FinderFacade/Makefile
+++ b/devel/pear-SebastianBergmann_FinderFacade/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Convenience wrapper for Symfony's Finder component
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-TheSeer_fDOMDocument>=1.3.1:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
-		pear-Symfony_Component_Finder>=2.2.0:${PORTSDIR}/devel/pear-Symfony_Component_Finder \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-TheSeer_fDOMDocument>=1.3.1:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
-		pear-Symfony_Component_Finder>=2.2.0:${PORTSDIR}/devel/pear-Symfony_Component_Finder \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-TheSeer_fDOMDocument>=1.3.1:devel/pear-TheSeer_fDOMDocument \
+		pear-Symfony_Component_Finder>=2.2.0:devel/pear-Symfony_Component_Finder \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear-TheSeer_fDOMDocument>=1.3.1:devel/pear-TheSeer_fDOMDocument \
+		pear-Symfony_Component_Finder>=2.2.0:devel/pear-Symfony_Component_Finder \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 PEAR_CHANNEL=	phpunit
 USES=	pear
diff --git a/devel/pear-SebastianBergmann_Git/Makefile b/devel/pear-SebastianBergmann_Git/Makefile
index 0d0823e68a96..1873a65b01f7 100644
--- a/devel/pear-SebastianBergmann_Git/Makefile
+++ b/devel/pear-SebastianBergmann_Git/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Simple wrapper for Git
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear>=1.9.4:devel/pear \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear>=1.9.4:devel/pear \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-SebastianBergmann_PHPCPD/Makefile b/devel/pear-SebastianBergmann_PHPCPD/Makefile
index 658d213d76db..43f58bccada1 100644
--- a/devel/pear-SebastianBergmann_PHPCPD/Makefile
+++ b/devel/pear-SebastianBergmann_PHPCPD/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Copy/Paste Detector (CPD) for PHP code
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-SebastianBergmann_FinderFacade>=1.0.4:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
-		pear-PHP_Timer>=1.0.4:${PORTSDIR}/devel/pear-PHP_Timer \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-SebastianBergmann_FinderFacade>=1.0.4:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
-		pear-PHP_Timer>=1.0.4:${PORTSDIR}/devel/pear-PHP_Timer \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-SebastianBergmann_FinderFacade>=1.0.4:devel/pear-SebastianBergmann_FinderFacade \
+		pear-PHP_Timer>=1.0.4:devel/pear-PHP_Timer \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-SebastianBergmann_FinderFacade>=1.0.4:devel/pear-SebastianBergmann_FinderFacade \
+		pear-PHP_Timer>=1.0.4:devel/pear-PHP_Timer \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USE_PHP=	tokenizer
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-SebastianBergmann_PHPLOC/Makefile b/devel/pear-SebastianBergmann_PHPLOC/Makefile
index fd6343b19316..647ef5381e1c 100644
--- a/devel/pear-SebastianBergmann_PHPLOC/Makefile
+++ b/devel/pear-SebastianBergmann_PHPLOC/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Tool for quickly measuring the size of a PHP project
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-Symfony_Component_Console>=1.1.0:${PORTSDIR}/devel/pear-Symfony_Component_Console \
-		pear-SebastianBergmann_FinderFacade>=1.1.0:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
-		pear-SebastianBergmann_Git>=1.0.0:${PORTSDIR}/devel/pear-SebastianBergmann_Git \
-		pear-SebastianBergmann_Version>=1.0.0:${PORTSDIR}/devel/pear-SebastianBergmann_Version \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-Symfony_Component_Console>=1.1.0:devel/pear-Symfony_Component_Console \
+		pear-SebastianBergmann_FinderFacade>=1.1.0:devel/pear-SebastianBergmann_FinderFacade \
+		pear-SebastianBergmann_Git>=1.0.0:devel/pear-SebastianBergmann_Git \
+		pear-SebastianBergmann_Version>=1.0.0:devel/pear-SebastianBergmann_Version \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PHP=	tokenizer
diff --git a/devel/pear-SebastianBergmann_Version/Makefile b/devel/pear-SebastianBergmann_Version/Makefile
index 8870944eca3b..f42992b53675 100644
--- a/devel/pear-SebastianBergmann_Version/Makefile
+++ b/devel/pear-SebastianBergmann_Version/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Managing the version number of Git-hosted PHP projects
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 PEAR_CHANNEL=	phpunit
 USES=	pear
diff --git a/devel/pear-Structures_DataGrid/Makefile b/devel/pear-Structures_DataGrid/Makefile
index 66f6e18e47ef..48fd8069714c 100644
--- a/devel/pear-Structures_DataGrid/Makefile
+++ b/devel/pear-Structures_DataGrid/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Full-featured tabular structured data management package
 
-RUN_DEPENDS=	${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table
+RUN_DEPENDS=	${PEARDIR}/Console/Table.php:devel/pear-Console_Table
 
 USES=	pear
 
diff --git a/devel/pear-Structures_DataGrid_Renderer_Console/Makefile b/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
index 12d4cf68da3b..f36c5c047350 100644
--- a/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Console_Table Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/Console/Table.php:devel/pear-Console_Table
 
 USES=	pear
 
diff --git a/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile b/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
index faa89932d09e..6d2d497e8293 100644
--- a/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	HTMLSortForm Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
 
 USES=	pear
 
diff --git a/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile b/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
index c2cf79dac752..191396b62546 100644
--- a/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	HTML_Table Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table \
-		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:${PORTSDIR}/www/pear-Structures_DataGrid_Renderer_Pager
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table \
+		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager
 
 USES=	pear
 
diff --git a/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile b/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
index b83ecb8dc103..b2cd5702bcc8 100644
--- a/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	XUL Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
 
 USES=	pear
 
diff --git a/devel/pear-Symfony_Component_Console/Makefile b/devel/pear-Symfony_Component_Console/Makefile
index 61d9377d50a0..cbc6f0154543 100644
--- a/devel/pear-Symfony_Component_Console/Makefile
+++ b/devel/pear-Symfony_Component_Console/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Symfony2 Console Component
 
 LICENSE=	MIT
 
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.symfony.com.reg:${PORTSDIR}/devel/pear-channel-symfony2
-RUN_DEPENDS+=	${PEARDIR}/.channels/pear.symfony.com.reg:${PORTSDIR}/devel/pear-channel-symfony2
+BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
+RUN_DEPENDS+=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
 
 USES=		pear
 PEAR_CHANNEL=	symfony2
diff --git a/devel/pear-Symfony_Component_Finder/Makefile b/devel/pear-Symfony_Component_Finder/Makefile
index aada7d1bd7e1..9831cdb59c64 100644
--- a/devel/pear-Symfony_Component_Finder/Makefile
+++ b/devel/pear-Symfony_Component_Finder/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Symfony2 Finder Component
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:${PORTSDIR}/devel/pear-channel-symfony2
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:${PORTSDIR}/devel/pear-channel-symfony2
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
 
 USES=		pear
 PEAR_CHANNEL=	symfony2
diff --git a/devel/pear-TheSeer_DirectoryScanner/Makefile b/devel/pear-TheSeer_DirectoryScanner/Makefile
index 345408b610eb..c1634cece4fc 100644
--- a/devel/pear-TheSeer_DirectoryScanner/Makefile
+++ b/devel/pear-TheSeer_DirectoryScanner/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Recursive directory scanner and filter
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
 
 USE_PHP=	fileinfo
 PEAR_CHANNEL=	theseer
diff --git a/devel/pear-TheSeer_fDOMDocument/Makefile b/devel/pear-TheSeer_fDOMDocument/Makefile
index 37ae56d936ba..178ac8c50a99 100644
--- a/devel/pear-TheSeer_fDOMDocument/Makefile
+++ b/devel/pear-TheSeer_fDOMDocument/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Extension to PHP's standard DOM
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
 
 USE_PHP=	dom xml
 PEAR_CHANNEL=	theseer
diff --git a/devel/pear-TheSeer_fXSL/Makefile b/devel/pear-TheSeer_fXSL/Makefile
index 3a7036e26f60..409f4a8551e2 100644
--- a/devel/pear-TheSeer_fXSL/Makefile
+++ b/devel/pear-TheSeer_fXSL/Makefile
@@ -13,8 +13,8 @@ COMMENT=	XSL wrapper / extension to the PHP 5.x XSLTProcessor
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
 
 USE_PHP=	dom xml xsl
 PEAR_CHANNEL=	theseer
diff --git a/devel/pear-TheSeer_phpDox/Makefile b/devel/pear-TheSeer_phpDox/Makefile
index 4d08cafbd58e..d1ae9337e42a 100644
--- a/devel/pear-TheSeer_phpDox/Makefile
+++ b/devel/pear-TheSeer_phpDox/Makefile
@@ -12,16 +12,16 @@ COMMENT=	PHP Documentation generation framework and tool
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:${PORTSDIR}/devel/pear-TheSeer_DirectoryScanner \
-		pear-TheSeer_fDOMDocument>=1.2.3:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
-		pear-TheSeer_fXSL>=1.0.4:${PORTSDIR}/devel/pear-TheSeer_fXSL \
-		pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-pdepend_staticReflection>=0.2.1:${PORTSDIR}/devel/pear-pdepend-staticReflection
-RUN_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:${PORTSDIR}/devel/pear-TheSeer_DirectoryScanner \
-		pear-TheSeer_fDOMDocument>=1.2.3:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
-		pear-TheSeer_fXSL>=1.0.4:${PORTSDIR}/devel/pear-TheSeer_fXSL \
-		pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-pdepend_staticReflection>=0.2.1:${PORTSDIR}/devel/pear-pdepend-staticReflection
+BUILD_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner \
+		pear-TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument \
+		pear-TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL \
+		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection
+RUN_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner \
+		pear-TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument \
+		pear-TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL \
+		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection
 
 USE_PHP=	dom tokenizer xsl iconv
 PEAR_CHANNEL=	theseer
diff --git a/devel/pear-VFS/Makefile b/devel/pear-VFS/Makefile
index ac127c58589d..d8f7a197248c 100644
--- a/devel/pear-VFS/Makefile
+++ b/devel/pear-VFS/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Virtual File System API
 
-BUILD_DEPENDS=	${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/Log/null.php:sysutils/pear-Log
+RUN_DEPENDS=	${PEARDIR}/Log/null.php:sysutils/pear-Log
 
 USE_PHP=	gettext
 USES=	pear
diff --git a/devel/pear-Validate_Finance/Makefile b/devel/pear-Validate_Finance/Makefile
index a26be4ec3592..216e277f1cab 100644
--- a/devel/pear-Validate_Finance/Makefile
+++ b/devel/pear-Validate_Finance/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Finance Validation class
 
-BUILD_DEPENDS=	pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
-RUN_DEPENDS=	pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
+BUILD_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
+RUN_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
 
 USES=	pear
 
diff --git a/devel/pear-Validate_US/Makefile b/devel/pear-Validate_US/Makefile
index e2e0b514be09..29ca6bad0325 100644
--- a/devel/pear-Validate_US/Makefile
+++ b/devel/pear-Validate_US/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR data validation class for US
 
-BUILD_DEPENDS=	pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
-RUN_DEPENDS=	pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
+BUILD_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
+RUN_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
 
 USES=	pear
 
diff --git a/devel/pear-Var_Dump/Makefile b/devel/pear-Var_Dump/Makefile
index bc939becf23f..a01299983634 100644
--- a/devel/pear-Var_Dump/Makefile
+++ b/devel/pear-Var_Dump/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Provides methods for dumping structured information about a variable
 
 LICENSE=	PHP30
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		pear shebangfix
 SHEBANG_FILES=	scripts/gen_php_doc.sh
diff --git a/devel/pear-VersionControl_SVN/Makefile b/devel/pear-VersionControl_SVN/Makefile
index 5653ef16f598..5b7fda88e348 100644
--- a/devel/pear-VersionControl_SVN/Makefile
+++ b/devel/pear-VersionControl_SVN/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Wrapper interface for the Subversion command-line client
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	pear-XML_Parser>=1.3.4:${PORTSDIR}/devel/pear-XML_Parser
-RUN_DEPENDS=	pear-XML_Parser>=1.3.4:${PORTSDIR}/devel/pear-XML_Parser
+BUILD_DEPENDS=	pear-XML_Parser>=1.3.4:devel/pear-XML_Parser
+RUN_DEPENDS=	pear-XML_Parser>=1.3.4:devel/pear-XML_Parser
 
 USE_PHP=	yes
 USES=	pear
diff --git a/devel/pear-XML_NITF/Makefile b/devel/pear-XML_NITF/Makefile
index 2176f1569c50..d38a32356ccf 100644
--- a/devel/pear-XML_NITF/Makefile
+++ b/devel/pear-XML_NITF/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR NITF XML parser
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
 
 USES=	pear
 
diff --git a/devel/pear-XML_RSS/Makefile b/devel/pear-XML_RSS/Makefile
index 26b0e11eb2ba..e64b9c5b2d1b 100644
--- a/devel/pear-XML_RSS/Makefile
+++ b/devel/pear-XML_RSS/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR RSS parser
 
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
 
 USES=	pear
 
diff --git a/devel/pear-XML_Serializer/Makefile b/devel/pear-XML_Serializer/Makefile
index 8da7d367a7bd..5ea3ac3a2fbf 100644
--- a/devel/pear-XML_Serializer/Makefile
+++ b/devel/pear-XML_Serializer/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Swiss-army knive for reading and writing XML files
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
 
 USES=		pear
 
diff --git a/devel/pear-XML_Transformer/Makefile b/devel/pear-XML_Transformer/Makefile
index 58bde05417d0..9dfa9f98d2b8 100644
--- a/devel/pear-XML_Transformer/Makefile
+++ b/devel/pear-XML_Transformer/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR XML Transformations in PHP
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-RUN_DEPENDS:=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+RUN_DEPENDS:=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
 
 USES=	pear
 
diff --git a/devel/pear-XML_Tree/Makefile b/devel/pear-XML_Tree/Makefile
index ad66fb3a897b..35095593b6c8 100644
--- a/devel/pear-XML_Tree/Makefile
+++ b/devel/pear-XML_Tree/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class for representing XML data in a tree structure
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
 
 USES=	pear
 
diff --git a/devel/pear-ezc_Base/Makefile b/devel/pear-ezc_Base/Makefile
index a8cd5ffafa0c..f5662e0e9c19 100644
--- a/devel/pear-ezc_Base/Makefile
+++ b/devel/pear-ezc_Base/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Base package that all ezc components packages rely on
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
-RUN_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
+BUILD_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
+RUN_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
 
 PEAR_CHANNEL=	ezc
 USES=	pear
diff --git a/devel/pear-ezc_ConsoleTools/Makefile b/devel/pear-ezc_ConsoleTools/Makefile
index 06b27bd40a4a..e282d7a6a9e6 100644
--- a/devel/pear-ezc_ConsoleTools/Makefile
+++ b/devel/pear-ezc_ConsoleTools/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Set of classes to do different actions with the console
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-ezc_Base>=1.8:${PORTSDIR}/devel/pear-ezc_Base \
-		${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
-RUN_DEPENDS=	pear-ezc_Base>=1.8:${PORTSDIR}/devel/pear-ezc_Base \
-		${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
+BUILD_DEPENDS=	pear-ezc_Base>=1.8:devel/pear-ezc_Base \
+		${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
+RUN_DEPENDS=	pear-ezc_Base>=1.8:devel/pear-ezc_Base \
+		${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
 
 PEAR_CHANNEL=	ezc
 USES=	pear
diff --git a/devel/pear-htmlpurifier/Makefile b/devel/pear-htmlpurifier/Makefile
index 744d01d27a02..4315ee84167e 100644
--- a/devel/pear-htmlpurifier/Makefile
+++ b/devel/pear-htmlpurifier/Makefile
@@ -15,8 +15,8 @@ COMMENT=	PHP HTML filter library
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:${PORTSDIR}/devel/pear-channel-htmlpurifier
-RUN_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:${PORTSDIR}/devel/pear-channel-htmlpurifier
+BUILD_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:devel/pear-channel-htmlpurifier
+RUN_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:devel/pear-channel-htmlpurifier
 
 PEAR_CHANNEL=	htmlpurifier.org
 USES=	pear
diff --git a/devel/pear-pdepend-staticReflection/Makefile b/devel/pear-pdepend-staticReflection/Makefile
index 6046a6e2906f..ec27b697e0e0 100644
--- a/devel/pear-pdepend-staticReflection/Makefile
+++ b/devel/pear-pdepend-staticReflection/Makefile
@@ -12,8 +12,8 @@ COMMENT=	staticReflection package for PHP
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
 
 USE_PHP=	tokenizer
 PEAR_CHANNEL=	pdepend
diff --git a/devel/pear-phing/Makefile b/devel/pear-phing/Makefile
index 9481e456938f..deebcf7e9217 100644
--- a/devel/pear-phing/Makefile
+++ b/devel/pear-phing/Makefile
@@ -14,7 +14,7 @@ LICENSE=	LGPL3
 PEAR_CHANNEL=	phing
 USES=	pear
 
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:${PORTSDIR}/devel/pear-channel-phing
-RUN_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:${PORTSDIR}/devel/pear-channel-phing
+BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:devel/pear-channel-phing
+RUN_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:devel/pear-channel-phing
 
 .include <bsd.port.mk>
diff --git a/devel/pear/bsd.pear.channel.mk b/devel/pear/bsd.pear.channel.mk
index e56cb74df75b..1fa97ada6620 100644
--- a/devel/pear/bsd.pear.channel.mk
+++ b/devel/pear/bsd.pear.channel.mk
@@ -7,8 +7,8 @@ PKGNAMEPREFIX?=	pear-channel-
 MASTER_SITES?=	#no master sites
 DISTFILES?=	#no distfiles
 
-BUILD_DEPENDS?=	${LOCALBASE}/bin/pear:${PORTSDIR}/devel/pear
-RUN_DEPENDS?=	${LOCALBASE}/bin/pear:${PORTSDIR}/devel/pear
+BUILD_DEPENDS?=	${LOCALBASE}/bin/pear:devel/pear
+RUN_DEPENDS?=	${LOCALBASE}/bin/pear:devel/pear
 
 NO_BUILD?=	yes
 
diff --git a/devel/pecl-event/Makefile b/devel/pecl-event/Makefile
index d8f23b466f9b..1f0128df56ea 100644
--- a/devel/pecl-event/Makefile
+++ b/devel/pecl-event/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provides interface to libevent library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		tar:tgz
 USE_OPENSSL=	yes
diff --git a/devel/pecl-expect/Makefile b/devel/pecl-expect/Makefile
index 5d2ca01f6c34..c6ac27f8e58c 100644
--- a/devel/pecl-expect/Makefile
+++ b/devel/pecl-expect/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP extension for expect library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libexpect.so:${PORTSDIR}/lang/expect
+LIB_DEPENDS=	libexpect.so:lang/expect
 
 USES=		tar:tgz tcl:86
 USE_PHP=	yes
diff --git a/devel/pecl-gearman/Makefile b/devel/pecl-gearman/Makefile
index 5fe8c3f9130d..ec6d8993c002 100644
--- a/devel/pecl-gearman/Makefile
+++ b/devel/pecl-gearman/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Gearman API
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libgearman.so:${PORTSDIR}/devel/gearmand
+LIB_DEPENDS=	libgearman.so:devel/gearmand
 
 USES=		tar:tgz
 CONFIGURE_ARGS=	--with-gearman
diff --git a/devel/pecl-inotify/Makefile b/devel/pecl-inotify/Makefile
index af2cd45c6dd7..7d064348f2f3 100644
--- a/devel/pecl-inotify/Makefile
+++ b/devel/pecl-inotify/Makefile
@@ -15,7 +15,7 @@ COMMENT=	This extension allows to use inotify functions in a PHP scripts
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
diff --git a/devel/pecl-intl/Makefile b/devel/pecl-intl/Makefile
index 84ad163064be..c31809b2c00d 100644
--- a/devel/pecl-intl/Makefile
+++ b/devel/pecl-intl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension to support Internationalization(ICU)
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/devel/pecl-jsonc/Makefile b/devel/pecl-jsonc/Makefile
index 46438cd151bc..5255ad312177 100644
--- a/devel/pecl-jsonc/Makefile
+++ b/devel/pecl-jsonc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PECL extension for JSON manipulation
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	libjson-c.so:devel/json-c
 
 USES=		pkgconfig tar:tgz
 CONFIGURE_ARGS=	--with-jsonc --with-libjson
diff --git a/devel/pecl-jsonnet/Makefile b/devel/pecl-jsonnet/Makefile
index ee5b7ab2744f..4a66cd30d8fe 100644
--- a/devel/pecl-jsonnet/Makefile
+++ b/devel/pecl-jsonnet/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Google JsonNet for PHP
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libjsonnet.so:${PORTSDIR}/devel/jsonnet
+LIB_DEPENDS=	libjsonnet.so:devel/jsonnet
 
 USES=		tar:tgz
 USE_PHP=	json
diff --git a/devel/pecl-judy/Makefile b/devel/pecl-judy/Makefile
index 7fbae3da5218..055a55a29195 100644
--- a/devel/pecl-judy/Makefile
+++ b/devel/pecl-judy/Makefile
@@ -15,8 +15,8 @@ COMMENT=	PHP Judy implements sparse dynamic arrays
 
 LICENSE=	PHP301
 
-RUN_DEPENDS=	Judy>=0:${PORTSDIR}/devel/judy
-BUILD_DEPENDS=	Judy>=0:${PORTSDIR}/devel/judy
+RUN_DEPENDS=	Judy>=0:devel/judy
+BUILD_DEPENDS=	Judy>=0:devel/judy
 
 CONFIGURE_ARGS=	--with-judy=${LOCALBASE}
 USE_PHP=	yes
diff --git a/devel/pecl-libevent/Makefile b/devel/pecl-libevent/Makefile
index 705de0746900..aa6f989d75ae 100644
--- a/devel/pecl-libevent/Makefile
+++ b/devel/pecl-libevent/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Libevent extension for PHP
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=	tar:tgz
 
diff --git a/devel/pecl-mcve/Makefile b/devel/pecl-mcve/Makefile
index bb90d72f0293..4e2f472d7dde 100644
--- a/devel/pecl-mcve/Makefile
+++ b/devel/pecl-mcve/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL Extension for Interface the MCVE/Monetra API
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libmonetra.so:${PORTSDIR}/devel/libmonetra
+LIB_DEPENDS=	libmonetra.so:devel/libmonetra
 
 USES=		tar:tgz
 USE_OPENSSL=	yes
diff --git a/devel/pecl-memoize/Makefile b/devel/pecl-memoize/Makefile
index 57509100c04b..d8af275c5d81 100644
--- a/devel/pecl-memoize/Makefile
+++ b/devel/pecl-memoize/Makefile
@@ -29,8 +29,8 @@ MEMORY_DESC=	Enable the memoize memory storage module
 APC_CONFIGURE_ON=	--enable-memoize-apc
 APC_USE=		PHP=apc
 MEMCACHED_CONFIGURE_ON=	--with-memoize-memcached
-MEMCACHED_BUILD_DEPENDS=libmemcached>=0:${PORTSDIR}/databases/libmemcached
-MEMCACHED_RUN_DEPENDS=	libmemcached>=0:${PORTSDIR}/databases/libmemcached
+MEMCACHED_BUILD_DEPENDS=libmemcached>=0:databases/libmemcached
+MEMCACHED_RUN_DEPENDS=	libmemcached>=0:databases/libmemcached
 MEMORY_CONFIGURE_OFF=	--disable-memoize-memory
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-newt/Makefile b/devel/pecl-newt/Makefile
index 88dc4ce53f7c..8e597ec033f3 100644
--- a/devel/pecl-newt/Makefile
+++ b/devel/pecl-newt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PHP language extension for RedHat Newt library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
+LIB_DEPENDS=	libnewt.so:devel/newt
 
 USE_PHP=	yes
 USE_PHPIZE=	yes
diff --git a/devel/pecl-qb/Makefile b/devel/pecl-qb/Makefile
index 0b6761a2a304..a12032c53b8d 100644
--- a/devel/pecl-qb/Makefile
+++ b/devel/pecl-qb/Makefile
@@ -23,7 +23,7 @@ IGNORE_WITH_PHP=	70
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000034
-LIB_DEPENDS+=	libmissing.so:${PORTSDIR}/math/libmissing
+LIB_DEPENDS+=	libmissing.so:math/libmissing
 CONFIGURE_ARGS=	--with-libmissing=${LOCALBASE}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libmissing
 .endif
diff --git a/devel/pecl-shape/Makefile b/devel/pecl-shape/Makefile
index ea87867b522f..56978e7251f1 100644
--- a/devel/pecl-shape/Makefile
+++ b/devel/pecl-shape/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension that wraps libshape
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
+LIB_DEPENDS=	libshp.so:devel/shapelib
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/devel/pecl-spl_types/Makefile b/devel/pecl-spl_types/Makefile
index b1e2afce6e37..00e414e3b3fc 100644
--- a/devel/pecl-spl_types/Makefile
+++ b/devel/pecl-spl_types/Makefile
@@ -16,7 +16,7 @@ LICENSE=	PHP301
 
 OPTIONS_DEFINE=	RE2C
 RE2C_DESC=	Compile regular expression 2 C
-RE2C_RUN_DEPENDS=	re2c:${PORTSDIR}/devel/re2c
+RE2C_RUN_DEPENDS=	re2c:devel/re2c
 
 USE_PHP=	spl
 #USE_PHP_BUILD=	yes
diff --git a/devel/pecl-spread/Makefile b/devel/pecl-spread/Makefile
index 7293b6658e16..a087b3f48590 100644
--- a/devel/pecl-spread/Makefile
+++ b/devel/pecl-spread/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Php Interface to the Spread Toolkit API
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${LOCALBASE}/include/sp.h:${PORTSDIR}/net/spread4
-RUN_DEPENDS=	${LOCALBASE}/include/sp.h:${PORTSDIR}/net/spread4
+BUILD_DEPENDS=	${LOCALBASE}/include/sp.h:net/spread4
+RUN_DEPENDS=	${LOCALBASE}/include/sp.h:net/spread4
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/devel/pecl-statgrab/Makefile b/devel/pecl-statgrab/Makefile
index 7561ee4e288d..7da435eb686a 100644
--- a/devel/pecl-statgrab/Makefile
+++ b/devel/pecl-statgrab/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	PECL extension to retrieve information from libstatgrab
 
-LIB_DEPENDS=	libstatgrab0.so:${PORTSDIR}/devel/libstatgrab0
+LIB_DEPENDS=	libstatgrab0.so:devel/libstatgrab0
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/devel/pecl-svn/Makefile b/devel/pecl-svn/Makefile
index fc6171ec9dc8..078228229837 100644
--- a/devel/pecl-svn/Makefile
+++ b/devel/pecl-svn/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension to the libsvn library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion18
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion18
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/devel/pecl-uuid/Makefile b/devel/pecl-uuid/Makefile
index 03657ef43611..803680e49608 100644
--- a/devel/pecl-uuid/Makefile
+++ b/devel/pecl-uuid/Makefile
@@ -13,7 +13,7 @@ COMMENT=	UUID extension in PHP
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/devel/pecl-yac/Makefile b/devel/pecl-yac/Makefile
index e7ec1b1af0fb..db0be3a330c3 100644
--- a/devel/pecl-yac/Makefile
+++ b/devel/pecl-yac/Makefile
@@ -21,7 +21,7 @@ IGNORE_WITH_PHP=	70
 
 OPTIONS_DEFINE=	MSGPACK
 MSGPACK_DESC=	Enable MSGPACK module
-MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:${PORTSDIR}/devel/pecl-msgpack
-MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:${PORTSDIR}/devel/pecl-msgpack
+MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack
+MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-zookeeper/Makefile b/devel/pecl-zookeeper/Makefile
index ddc8d33cc5fa..c20d3deecc21 100644
--- a/devel/pecl-zookeeper/Makefile
+++ b/devel/pecl-zookeeper/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP extension for interfacing with Apache ZooKeeper
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
+LIB_DEPENDS=	libzookeeper_mt.so:devel/libzookeeper
 
 USE_PHP=	session
 USE_PHP_BUILD=	session
diff --git a/devel/perlconsole/Makefile b/devel/perlconsole/Makefile
index 6b66dc303022..c986f747fea3 100644
--- a/devel/perlconsole/Makefile
+++ b/devel/perlconsole/Makefile
@@ -11,10 +11,10 @@ MASTER_SITE_SUBDIR=	CPAN:SUKRIA
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Light program that lets you evaluate Perl code interactively
 
-RUN_DEPENDS=	p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Module-Refresh>=0:${PORTSDIR}/devel/p5-Module-Refresh \
-		p5-Lexical-Persistence>=0:${PORTSDIR}/devel/p5-Lexical-Persistence \
-		p5-B-Keywords>=0:${PORTSDIR}/devel/p5-B-Keywords
+RUN_DEPENDS=	p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \
+		p5-Module-Refresh>=0:devel/p5-Module-Refresh \
+		p5-Lexical-Persistence>=0:devel/p5-Lexical-Persistence \
+		p5-B-Keywords>=0:devel/p5-B-Keywords
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
index 2f296ade1561..dd3f591a9cca 100644
--- a/devel/phabricator/Makefile
+++ b/devel/phabricator/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Open source, software engineering platform
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	php5-libphutil>0:${PORTSDIR}/devel/libphutil \
-		php5-arcanist>0:${PORTSDIR}/devel/arcanist \
-		git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	php5-libphutil>0:devel/libphutil \
+		php5-arcanist>0:devel/arcanist \
+		git:devel/git
 
 OPTIONS_DEFINE=	GD OPCACHE
 OPTIONS_DEFAULT=OPCACHE
@@ -35,7 +35,7 @@ GD_USE=		PHP=gd
 .if ${PORT_OPTIONS:MOPCACHE}
 .	if ${PHP_EXT_DIR:C|[^0-9]||g}  >= 20121212
 USE_PHP+=	opcache
-RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:${PORTSDIR}/devel/pecl-APCu
+RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu
 .	else
 USE_PHP+=	apc
 .	endif
diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile
index 710f8d98b08e..69552a949f5b 100644
--- a/devel/php-composer/Makefile
+++ b/devel/php-composer/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Dependency Manager for PHP
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	ca_root_nss>0:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/php-jq/Makefile b/devel/php-jq/Makefile
index 1b0f805480f3..f3085a92a42e 100644
--- a/devel/php-jq/Makefile
+++ b/devel/php-jq/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Jq shared extension for php
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libjq.so:${PORTSDIR}/textproc/jq
+LIB_DEPENDS=	libjq.so:textproc/jq
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kjdev
diff --git a/devel/php-maxminddb/Makefile b/devel/php-maxminddb/Makefile
index 319b2389d94f..057d7e55ee7c 100644
--- a/devel/php-maxminddb/Makefile
+++ b/devel/php-maxminddb/Makefile
@@ -11,7 +11,7 @@ COMMENT=	MaxMind DB Reader extension for PHP
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libmaxminddb.so:${PORTSDIR}/net/libmaxminddb
+LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/php-memoize/Makefile b/devel/php-memoize/Makefile
index e39fbfaeb63e..469ca758ad17 100644
--- a/devel/php-memoize/Makefile
+++ b/devel/php-memoize/Makefile
@@ -31,13 +31,13 @@ MEMORY_DESC=	Enable the memoize memory storage module
 
 .if ${PORT_OPTIONS:MAPC}
 CONFIGURE_ARGS+=	--enable-memoize-apc
-BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
+BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
 CONFIGURE_ARGS+=	--with-memoize-memcached
-BUILD_DEPENDS+=		libmemcached>0:${PORTSDIR}/databases/libmemcached
-RUN_DEPENDS+=		libmemcached>0:${PORTSDIR}/databases/libmemcached
+BUILD_DEPENDS+=		libmemcached>0:databases/libmemcached
+RUN_DEPENDS+=		libmemcached>0:databases/libmemcached
 .endif
 
 .if empty(PORT_OPTIONS:MMEMORY)
diff --git a/devel/php5-dav/Makefile b/devel/php5-dav/Makefile
index 9be5785f35c4..2ab64055185b 100644
--- a/devel/php5-dav/Makefile
+++ b/devel/php5-dav/Makefile
@@ -14,7 +14,7 @@ COMMENT=	The PHP WebDAV extension
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libneon.so:www/neon
 
 USE_PHP=	yes
 USE_PHPIZE=	yes
diff --git a/devel/php5-ice/Makefile b/devel/php5-ice/Makefile
index 3bf6ee73c0f5..89cc6d978135 100644
--- a/devel/php5-ice/Makefile
+++ b/devel/php5-ice/Makefile
@@ -9,9 +9,9 @@ COMMENT=	Ice (Internet Communications Engine) language mapping for PHP
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp \
-		slice2php:${PORTSDIR}/devel/ice
-LIB_DEPENDS=	libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
+BUILD_DEPENDS=	mcpp:devel/mcpp \
+		slice2php:devel/ice
+LIB_DEPENDS=	libIce.so.${LIB_VRS}:devel/ice
 
 OPTIONS_DEFINE=	DEBUG NAMESPACES
 OPTIONS_DEFAULT=
diff --git a/devel/php5-pinba/Makefile b/devel/php5-pinba/Makefile
index cca1b532446c..cb2fd56cc803 100644
--- a/devel/php5-pinba/Makefile
+++ b/devel/php5-pinba/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	php5-
 MAINTAINER=	komarov@valerka.net
 COMMENT=	PHP-extension part of statistics server for PHP
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tony2001
diff --git a/devel/phpbt/Makefile b/devel/phpbt/Makefile
index e41f9cfb826e..2bd82170ac44 100644
--- a/devel/phpbt/Makefile
+++ b/devel/phpbt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bug-tracking system developed in PHP
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
 
 .if !defined(WITHOUT_PHP_DEPENDS)
 USE_PHP=	ctype pcre posix session tokenizer xml zlib
diff --git a/devel/pig/Makefile b/devel/pig/Makefile
index c32a4ef3318b..7f768880f217 100644
--- a/devel/pig/Makefile
+++ b/devel/pig/Makefile
@@ -17,9 +17,9 @@ COMMENT=	Engine for executing data flows in parallel on Hadoop
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/bin/ant:devel/apache-ant
+RUN_DEPENDS=	bash:shells/bash \
+		yarn:devel/hadoop2
 
 BROKEN=		tries to make outbound http connection during build phase breaking tinderbox.  Software itself does not have known issues, remove this BROKEN line and build your own package
 
diff --git a/devel/pinba_engine/Makefile b/devel/pinba_engine/Makefile
index 75ac67038633..7a6bf2cc8db1 100644
--- a/devel/pinba_engine/Makefile
+++ b/devel/pinba_engine/Makefile
@@ -9,14 +9,14 @@ CATEGORIES=	devel
 MAINTAINER=	raven428@gmail.com
 COMMENT=	Mysql-engine part of statistics server for PHP
 
-BUILD_DEPENDS=	${LOCALBASE}/include/google/protobuf/descriptor.h:${PORTSDIR}/devel/protobuf \
-		${LOCALBASE}/include/event.h:${PORTSDIR}/devel/libevent2 \
-		${LOCALBASE}/include/Judy.h:${PORTSDIR}/devel/judy \
-		${LOCALBASE}/lib/mysql/plugin:${PORTSDIR}/${_MYSQL_SERVER} \
-		${NONEXISTENT}:${PORTSDIR}/${_MYSQL_SERVER}:configure \
-		bison:${PORTSDIR}/devel/bison \
-		cmake:${PORTSDIR}/devel/cmake
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+BUILD_DEPENDS=	${LOCALBASE}/include/google/protobuf/descriptor.h:devel/protobuf \
+		${LOCALBASE}/include/event.h:devel/libevent2 \
+		${LOCALBASE}/include/Judy.h:devel/judy \
+		${LOCALBASE}/lib/mysql/plugin:${_MYSQL_SERVER} \
+		${NONEXISTENT}:${_MYSQL_SERVER}:configure \
+		bison:devel/bison \
+		cmake:devel/cmake
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tony2001
diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile
index d93ab9a36620..83bd150d924c 100644
--- a/devel/plan9port/Makefile
+++ b/devel/plan9port/Makefile
@@ -18,7 +18,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 BROKEN_ia64=	does not install: cleanname not found
 BROKEN_sparc64=	does not install: cleanname not found
 
-RUN_DEPENDS=	rc:${PORTSDIR}/shells/rc
+RUN_DEPENDS=	rc:shells/rc
 
 USES=		perl5 shebangfix tar:tgz
 SHEBANG_LANG=	rc
diff --git a/devel/poco-devel/Makefile b/devel/poco-devel/Makefile
index 6b6130b79f35..c33f20b04050 100644
--- a/devel/poco-devel/Makefile
+++ b/devel/poco-devel/Makefile
@@ -13,9 +13,9 @@ COMMENT=	C++ Portable Components library
 
 LICENSE=	BSL
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libexpat.so:textproc/expat2
 
 CONFLICTS=	poco-ssl-[0-9]* poco-[0-9]*
 
@@ -49,11 +49,11 @@ CONFIGURE_ARGS+=	--omit=Data/ODBC
 .endif
 
 .if ${PORT_OPTIONS:MUODBC} && ! ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+=	libodbcinst.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbcinst.so:databases/unixODBC
 .endif
 
 .if ${PORT_OPTIONS:MIODBC} && ! ${PORT_OPTIONS:MUODBC}
-LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	libiodbc.so:databases/libiodbc
 CFLAGS+=	-I${LOCALBASE}/include/libiodbc
 LDFLAGS+=	-L${LOCALBASE}/lib/libiodbc
 .endif
diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile
index bed93c5f7c46..95e9be47775d 100644
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@@ -31,7 +31,7 @@ SAMPLES_DESC=	Build sample programs
 TEST_CONFIGURE_OFF=	--no-tests
 SAMPLES_CONFIGURE_OFF=	--no-samples
 
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/libiodbc
+ODBC_LIB_DEPENDS=	libodbc.so:databases/libiodbc
 ODBC_CONFIGURE_OFF=	--omit=Data/ODBC
 
 MYSQL_USE=		MYSQL=yes
diff --git a/devel/poco/Makefile b/devel/poco/Makefile
index 82251d2cf7e3..eff36fd64035 100644
--- a/devel/poco/Makefile
+++ b/devel/poco/Makefile
@@ -12,8 +12,8 @@ COMMENT=	C++ libraries with a network/internet focus
 
 LICENSE=	BSL
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libexpat.so:textproc/expat2
 
 CONFLICTS=	poco-ssl-[0-9]*
 
@@ -32,7 +32,7 @@ OPTIONS_SUB=		yes
 
 MYSQL_USE=		mysql=yes
 MYSQL_CMAKE_OFF=	-DENABLE_DATA_MYSQL:BOOL=OFF
-IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 IODBC_CMAKE_ON=		-DODBC_INCLUDE_DIRECTORIES:PATH=${LOCALBASE}/include/libiodbc \
 			-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libiodbc.so
 SQLITE_USES=		sqlite
@@ -40,7 +40,7 @@ SQLITE_CMAKE_OFF=	-DENABLE_DATA_SQLITE:BOOL=OFF
 SSL_USE=		openssl=yes
 SSL_CMAKE_OFF=		-DENABLE_CRYPTO:BOOL=OFF \
 			-DENABLE_NETSSL:BOOL=OFF
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_CMAKE_ON=	-DODBC_INCLUDE_DIRECTORIES:PATH=${LOCALBASE}/include \
 			-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libodbc.so
 TEST_CMAKE_ON=		-DENABLE_TESTS:BOOL=ON
diff --git a/devel/powerpc64-gcc/Makefile b/devel/powerpc64-gcc/Makefile
index 5d2e651fd80b..cd8578866182 100644
--- a/devel/powerpc64-gcc/Makefile
+++ b/devel/powerpc64-gcc/Makefile
@@ -18,11 +18,11 @@ PLIST_SUB=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
-RUN_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
+RUN_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
 
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC=	${WRKDIR}/build-gcc
diff --git a/devel/powerpc64-xtoolchain-gcc/Makefile b/devel/powerpc64-xtoolchain-gcc/Makefile
index 4f7febca3c1e..c9b6db4eb221 100644
--- a/devel/powerpc64-xtoolchain-gcc/Makefile
+++ b/devel/powerpc64-xtoolchain-gcc/Makefile
@@ -23,7 +23,7 @@ XCXX?=		${TOOLCHAIN_PREFIX}portbld-${OPSYS:tl}${OSREL}-g++
 XCPP?=		${TOOLCHAIN_PREFIX}portbld-${OPSYS:tl}${OSREL}-cpp
 X_COMPILER_TYPE?=	${PKGNAMESUFFIX:C/-//g}
 
-RUN_DEPENDS?=	${XCC}:${PORTSDIR}/devel/${PKGNAMEPREFIX}${X_COMPILER_TYPE}
+RUN_DEPENDS?=	${XCC}:devel/${PKGNAMEPREFIX}${X_COMPILER_TYPE}
 
 SUB_FILES=	xtoolchain.mk
 SUB_LIST=	TARGETARCH=${TOOLCHAIN_PREFIX:C/-//g} \
diff --git a/devel/poxml/Makefile b/devel/poxml/Makefile
index 2046486087b6..8697e9af8a2c 100644
--- a/devel/poxml/Makefile
+++ b/devel/poxml/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Tools to translate Docbook XML using gettext
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libantlr.a:${PORTSDIR}/devel/antlr
+BUILD_DEPENDS=	${LOCALBASE}/lib/libantlr.a:devel/antlr
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource gettext-tools:build,run tar:xz
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index 327140a41e3b..23d924a4ed29 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -13,9 +13,9 @@ COMMENT=	C++ library for the manipulation of convex polyhedra
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	libglpk.so:${PORTSDIR}/math/glpk \
-		libgmp.so:${PORTSDIR}/math/gmp
+BUILD_DEPENDS=	gm4:devel/m4
+LIB_DEPENDS=	libglpk.so:math/glpk \
+		libgmp.so:math/gmp
 
 USES=		gmake perl5 tar:xz libtool
 USE_PERL5=	build
diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile
index 471667addcc5..920057a5a321 100644
--- a/devel/protobuf-c/Makefile
+++ b/devel/protobuf-c/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Code generator and libraries to use Protocol Buffers from pure C
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USES=		autoreconf gmake libtool pkgconfig
 GNU_CONFIGURE=	yes
@@ -29,7 +29,7 @@ PORTDOCS=	*
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install-strip
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	html-local
 
 post-install-DOXYGEN-on:
diff --git a/devel/pructl/Makefile b/devel/pructl/Makefile
index 3a5760e5658e..ee4f577022d0 100644
--- a/devel/pructl/Makefile
+++ b/devel/pructl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Utilities to interface with PRUs
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libpru.so:${PORTSDIR}/devel/libpru
+LIB_DEPENDS=	libpru.so:devel/libpru
 
 USES=		cmake libedit
 
diff --git a/devel/psptoolchain-gcc-stage1/Makefile b/devel/psptoolchain-gcc-stage1/Makefile
index 430ce8f16a66..2ce26920fedb 100644
--- a/devel/psptoolchain-gcc-stage1/Makefile
+++ b/devel/psptoolchain-gcc-stage1/Makefile
@@ -16,23 +16,23 @@ ONLY_FOR_ARCHS=		amd64 i386
 
 PSP_GCC_STAGE_PREFIX=	psp/stage1
 
-LIB_DEPENDS=		libgmp.so:${PORTSDIR}/math/gmp \
-			libmpfr.so:${PORTSDIR}/math/mpfr \
-			libmpc.so:${PORTSDIR}/math/mpc
+LIB_DEPENDS=		libgmp.so:math/gmp \
+			libmpfr.so:math/mpfr \
+			libmpc.so:math/mpc
 
-BUILD_DEPENDS+=		psp-addr2line:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-as:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-c++filt:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ld:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-nm:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-objcopy:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-objdump:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ranlib:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-readelf:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-size:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-strings:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-strip:${PORTSDIR}/devel/psptoolchain-binutils
+BUILD_DEPENDS+=		psp-addr2line:devel/psptoolchain-binutils \
+			psp-ar:devel/psptoolchain-binutils \
+			psp-as:devel/psptoolchain-binutils \
+			psp-c++filt:devel/psptoolchain-binutils \
+			psp-ld:devel/psptoolchain-binutils \
+			psp-nm:devel/psptoolchain-binutils \
+			psp-objcopy:devel/psptoolchain-binutils \
+			psp-objdump:devel/psptoolchain-binutils \
+			psp-ranlib:devel/psptoolchain-binutils \
+			psp-readelf:devel/psptoolchain-binutils \
+			psp-size:devel/psptoolchain-binutils \
+			psp-strings:devel/psptoolchain-binutils \
+			psp-strip:devel/psptoolchain-binutils
 
 USES=			gmake libtool tar:bzip2
 PATCH_WRKSRC=		${SRCDIR}
diff --git a/devel/psptoolchain-gcc-stage2/Makefile b/devel/psptoolchain-gcc-stage2/Makefile
index 4a5a3eb4661b..ca879ab71f79 100644
--- a/devel/psptoolchain-gcc-stage2/Makefile
+++ b/devel/psptoolchain-gcc-stage2/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX=		-stage2
 
 MAINTAINER=		tphilipp@potion-studios.com
 
-BUILD_DEPENDS=		${LOCALBASE}/psp/lib/libc.a:${PORTSDIR}/devel/psptoolchain-newlib
+BUILD_DEPENDS=		${LOCALBASE}/psp/lib/libc.a:devel/psptoolchain-newlib
 
 MAKE_ENV=		CFLAGS_FOR_TARGET="-G0" PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ARGS=		--prefix=${PREFIX} \
diff --git a/devel/psptoolchain-gdb/Makefile b/devel/psptoolchain-gdb/Makefile
index 8f05a304b79e..1731e0eb16bf 100644
--- a/devel/psptoolchain-gdb/Makefile
+++ b/devel/psptoolchain-gdb/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=		psptoolchain-
 MAINTAINER=		tphilipp@potion-studios.com
 COMMENT=		PlayStation Portable development toolchain ${PORTNAME}
 
-BUILD_DEPENDS=		${LOCALBASE}/psp/sdk/lib/libpspsdk.a:${PORTSDIR}/devel/psptoolchain-pspsdk-stage2
+BUILD_DEPENDS=		${LOCALBASE}/psp/sdk/lib/libpspsdk.a:devel/psptoolchain-pspsdk-stage2
 
 USES=			gmake tar:bzip2
 USE_CSTD=		gnu89
diff --git a/devel/psptoolchain-newlib/Makefile b/devel/psptoolchain-newlib/Makefile
index 98da54f20958..2ea97a5da2b1 100644
--- a/devel/psptoolchain-newlib/Makefile
+++ b/devel/psptoolchain-newlib/Makefile
@@ -15,11 +15,11 @@ COMMENT=		PlayStation Portable development toolchain ${PORTNAME}
 PSP_GCC_STAGE_PREFIX=	psp/stage1
 PSP_SDK_STAGE_PREFIX=	psp/stage1
 
-BUILD_DEPENDS+=		${LOCALBASE}/${PSP_SDK_STAGE_PREFIX}/sdk/include/pspsdk.h:${PORTSDIR}/devel/psptoolchain-pspsdk-stage1 \
-			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-as:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ld:${PORTSDIR}/devel/psptoolchain-binutils \
-			${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin/psp-gcc:${PORTSDIR}/devel/psptoolchain-gcc-stage1
+BUILD_DEPENDS+=		${LOCALBASE}/${PSP_SDK_STAGE_PREFIX}/sdk/include/pspsdk.h:devel/psptoolchain-pspsdk-stage1 \
+			psp-ar:devel/psptoolchain-binutils \
+			psp-as:devel/psptoolchain-binutils \
+			psp-ld:devel/psptoolchain-binutils \
+			${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin/psp-gcc:devel/psptoolchain-gcc-stage1
 
 USES=			gmake makeinfo
 HAS_CONFIGURE=		yes
diff --git a/devel/psptoolchain-pspsdk-stage2/Makefile b/devel/psptoolchain-pspsdk-stage2/Makefile
index 26657a7d4d2f..492b8d8d4219 100644
--- a/devel/psptoolchain-pspsdk-stage2/Makefile
+++ b/devel/psptoolchain-pspsdk-stage2/Makefile
@@ -8,12 +8,12 @@ PKGNAMESUFFIX=		-stage2
 MAINTAINER=		tphilipp@potion-studios.com
 COMMENT=		PlayStation Portable development toolchain ${PORTNAME}
 
-BUILD_DEPENDS=		psp-cpp:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-gcc:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-gcov:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-g++:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
-			${LOCALBASE}/psp/lib/libc.a:${PORTSDIR}/devel/psptoolchain-newlib
+BUILD_DEPENDS=		psp-cpp:devel/psptoolchain-gcc-stage2 \
+			psp-gcc:devel/psptoolchain-gcc-stage2 \
+			psp-gcov:devel/psptoolchain-gcc-stage2 \
+			psp-g++:devel/psptoolchain-gcc-stage2 \
+			psp-ar:devel/psptoolchain-binutils \
+			${LOCALBASE}/psp/lib/libc.a:devel/psptoolchain-newlib
 
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-pspdev="${LOCALBASE}"
 
diff --git a/devel/psptoolchain/Makefile b/devel/psptoolchain/Makefile
index 9ebed4d1f54a..18ee429f2128 100644
--- a/devel/psptoolchain/Makefile
+++ b/devel/psptoolchain/Makefile
@@ -9,21 +9,21 @@ CATEGORIES=		devel
 MAINTAINER=		tphilipp@potion-studios.com
 COMMENT=		PlayStation Portable development toolchain meta port
 
-RUN_DEPENDS=		psp-gdb:${PORTSDIR}/devel/psptoolchain-gdb \
-			psp-gcc:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-g++:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-as:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-c++filt:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ld:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-nm:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-objcopy:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-objdump:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ranlib:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-readelf:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-size:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-strings:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-strip:${PORTSDIR}/devel/psptoolchain-binutils
+RUN_DEPENDS=		psp-gdb:devel/psptoolchain-gdb \
+			psp-gcc:devel/psptoolchain-gcc-stage2 \
+			psp-g++:devel/psptoolchain-gcc-stage2 \
+			psp-ar:devel/psptoolchain-binutils \
+			psp-as:devel/psptoolchain-binutils \
+			psp-c++filt:devel/psptoolchain-binutils \
+			psp-ld:devel/psptoolchain-binutils \
+			psp-nm:devel/psptoolchain-binutils \
+			psp-objcopy:devel/psptoolchain-binutils \
+			psp-objdump:devel/psptoolchain-binutils \
+			psp-ranlib:devel/psptoolchain-binutils \
+			psp-readelf:devel/psptoolchain-binutils \
+			psp-size:devel/psptoolchain-binutils \
+			psp-strings:devel/psptoolchain-binutils \
+			psp-strip:devel/psptoolchain-binutils
 
 USES=			metaport
 
diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile
index a25aa668d810..60b60a93572c 100644
--- a/devel/psvn/Makefile
+++ b/devel/psvn/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Subversion interface for Emacs
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	svn:devel/subversion
 
 USE_EMACS=	yes
 
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index b55e0cbf88a9..6ee0b08fc0f2 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Cross platform C++ library, used by OPAL
 
 LICENSE=	MPL
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 CONFLICTS=	pwlib-1.*
 
@@ -59,7 +59,7 @@ PLIST_SUB+=	DEBUG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:audio/pulseaudio
 CONFIGURE_ARGS+=--enable-pulse
 .else
 CONFIGURE_ARGS+=--disable-pulse
@@ -71,14 +71,14 @@ PLLIB_VIDEO=1
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=--enable-odbc
 .else
 CONFIGURE_ARGS+=--disable-odbc
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:audio/alsa-lib
 CONFIGURE_ARGS+=--enable-alsa
 PLIST_SUB+=	ALSA=""
 .else
@@ -96,8 +96,8 @@ PLIST_SUB+=	BSDVIDEO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MV4L}
-BUILD_DEPENDS+=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS+=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS+=	v4l_compat>=0:multimedia/v4l_compat
+LIB_DEPENDS+=	libv4l2.so:multimedia/libv4l
 CONFIGURE_ARGS+=--enable-v4l --enable-v4l2
 PLIST_SUB+=	V4L=""
 PTLIB_VIDEO=1
@@ -137,8 +137,8 @@ CONFIGURE_ARGS+=--disable-openldap
 #
 ##enable libavc1394
 #.if defined(WITH_AVC1394)
-#LIB_DEPENDS+=	avc1394.2:${PORTSDIR}/devel/libavc1394 \
-#		dv.4:${PORTSDIR}/multimedia/libdv
+#LIB_DEPENDS+=	avc1394.2:devel/libavc1394 \
+#		dv.4:multimedia/libdv
 #CONFIGURE_ARGS+=	--enable-avc
 #PLIST_SUB+=	AVC1394=""
 #.else
@@ -148,7 +148,7 @@ PLIST_SUB+=	AVC1394="@comment "
 #
 ##enable libdc1394
 #.if defined(WITH_DC1394)
-#LIB_DEPENDS+=	dc1394.2[0-9]:${PORTSDIR}/multimedia/libdc1394
+#LIB_DEPENDS+=	dc1394.2[0-9]:multimedia/libdc1394
 #CONFIGURE_ARGS+=	--enable-dc
 #PLIST_SUB+=	DC1394=""
 #.else
diff --git a/devel/pure-ffi/Makefile b/devel/pure-ffi/Makefile
index 7fa8b20f6055..c3a35fab2722 100644
--- a/devel/pure-ffi/Makefile
+++ b/devel/pure-ffi/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pure language interface to libffi
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS+=	libffi.so:devel/libffi
 
 USES=		pkgconfig pure
 
diff --git a/devel/pushmi/Makefile b/devel/pushmi/Makefile
index 5fd85692f5b0..6eed3e2d0d60 100644
--- a/devel/pushmi/Makefile
+++ b/devel/pushmi/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Subversion repository replication tool
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-App-CLI>=0.06:${PORTSDIR}/devel/p5-App-CLI \
-		p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		svk>=2.0.0:${PORTSDIR}/devel/svk
+RUN_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-App-CLI>=0.06:devel/p5-App-CLI \
+		p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+		svk>=2.0.0:devel/svk
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-RunApp>=0.13:${PORTSDIR}/devel/p5-RunApp \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-RunApp>=0.13:devel/p5-RunApp \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index fccfbe1e4720..2badab907b14 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	openh323
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross platform C++ library, used by OpenH323
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 CONFLICTS=	ptlib-2.*
 
@@ -55,7 +55,7 @@ ESOUND_USE=	GNOME=esound
 ESOUND_CONFIGURE_ENABLE=	esd
 
 V4L_CONFIGURE_ENABLE=	v4l
-V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
+V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
 
 #explicity build OSS
 CONFIGURE_ARGS+=	--enable-oss
@@ -73,8 +73,8 @@ CONFIGURE_ARGS+=	--disable-odbc
 #
 ##enable libavc1394
 #.if defined(WITH_AVC1394)
-#LIB_DEPENDS+=	avc1394.2:${PORTSDIR}/devel/libavc1394 \
-#		dv.4:${PORTSDIR}/multimedia/libdv
+#LIB_DEPENDS+=	avc1394.2:devel/libavc1394 \
+#		dv.4:multimedia/libdv
 #CONFIGURE_ARGS+=	--enable-avc
 #PLIST_SUB+=	AVC1394=""
 #.else
@@ -84,7 +84,7 @@ PLIST_SUB+=	AVC1394="@comment "
 #
 ##enable libdc1394
 #.if defined(WITH_DC1394)
-#LIB_DEPENDS+=	dc1394_control.13:${PORTSDIR}/devel/libdc1394
+#LIB_DEPENDS+=	dc1394_control.13:devel/libdc1394
 #CONFIGURE_ARGS+=	--enable-dc
 #PLIST_SUB+=	DC1394=""
 #.else
diff --git a/devel/py-Acquisition/Makefile b/devel/py-Acquisition/Makefile
index e4df09901ba4..17856e17f9f1 100644
--- a/devel/py-Acquisition/Makefile
+++ b/devel/py-Acquisition/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Allows to obtain attributes from the containment hierarchy
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-AddOns/Makefile b/devel/py-AddOns/Makefile
index 337a9d71004d..a569fe9908dd 100644
--- a/devel/py-AddOns/Makefile
+++ b/devel/py-AddOns/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Dynamically extend other objects with AddOns
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python zip
diff --git a/devel/py-BytecodeAssembler/Makefile b/devel/py-BytecodeAssembler/Makefile
index e0e30207ec9a..fd0e01a8d967 100644
--- a/devel/py-BytecodeAssembler/Makefile
+++ b/devel/py-BytecodeAssembler/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate Python code objects by "assembling" bytecode
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools \
-		${PYTHON_PKGNAMEPREFIX}SymbolType>0:${PORTSDIR}/devel/py-SymbolType
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools \
+		${PYTHON_PKGNAMEPREFIX}SymbolType>0:devel/py-SymbolType
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python zip
diff --git a/devel/py-DateTime/Makefile b/devel/py-DateTime/Makefile
index d91a42dfec44..9baac1697c9a 100644
--- a/devel/py-DateTime/Makefile
+++ b/devel/py-DateTime/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Zope 2 DateTime data type
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-DocumentTemplate/Makefile b/devel/py-DocumentTemplate/Makefile
index f2079b1ba6d2..bffa0c037783 100644
--- a/devel/py-DocumentTemplate/Makefile
+++ b/devel/py-DocumentTemplate/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Document Templating Markup Language (DTML)
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:${PORTSDIR}/devel/py-zope.sequencesort \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile
index 28f3fb312fb2..26247bb7306b 100644
--- a/devel/py-Jinja2/Makefile
+++ b/devel/py-Jinja2/Makefile
@@ -14,8 +14,8 @@ COMMENT?=	Fast and easy to use stand-alone template engine
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py-MarkupSafe
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py-MarkupSafe
 
 NO_ARCH=	yes
 USES=		python
@@ -29,7 +29,7 @@ OPTIONS_DEFINE?=	BABEL EXAMPLES
 OPTIONS_DEFAULT?=	BABEL
 BABEL_DESC=		Enable Babel extension
 
-BABEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel
+BABEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel
 
 PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
 PY2TO3_ARGS=	--fix=all --no-diffs --nobackups --verbose --write
@@ -39,7 +39,7 @@ PY2TO3_ARGS=	--fix=all --no-diffs --nobackups --verbose --write
 .include <bsd.port.pre.mk>
 
 .if ${PKGNAMESUFFIX} == "-doc"
-BUILD_DEPENDS+=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 PORTDOCS=	*
 PORT_OPTIONS:=	${PORT_OPTIONS:NEXAMPLES}
diff --git a/devel/py-Missing/Makefile b/devel/py-Missing/Makefile
index afbc1f5f51c9..9d51acf777e0 100644
--- a/devel/py-Missing/Makefile
+++ b/devel/py-Missing/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Special Missing objects used in Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-MultiMapping/Makefile b/devel/py-MultiMapping/Makefile
index 18918de373fa..82aaf4b9f0b9 100644
--- a/devel/py-MultiMapping/Makefile
+++ b/devel/py-MultiMapping/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Special MultiMapping objects used in Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-PEAK-Rules/Makefile b/devel/py-PEAK-Rules/Makefile
index f1af7eeee2d9..d42bf85399fd 100644
--- a/devel/py-PEAK-Rules/Makefile
+++ b/devel/py-PEAK-Rules/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.dev-r2686
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Generic functions and business rules support systems
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:${PORTSDIR}/devel/py-extremes \
-		${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:${PORTSDIR}/devel/py-AddOns \
-		${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:${PORTSDIR}/devel/py-BytecodeAssembler
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:devel/py-extremes \
+		${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:devel/py-AddOns \
+		${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:devel/py-BytecodeAssembler
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-Persistence/Makefile b/devel/py-Persistence/Makefile
index edfe4ddc0c0a..f2fd275177dc 100644
--- a/devel/py-Persistence/Makefile
+++ b/devel/py-Persistence/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Persistent ExtensionClass
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ATContentTypes/Makefile b/devel/py-Products.ATContentTypes/Makefile
index 4aea1e4918d7..95902377dde2 100644
--- a/devel/py-Products.ATContentTypes/Makefile
+++ b/devel/py-Products.ATContentTypes/Makefile
@@ -12,31 +12,31 @@ COMMENT=	Default Content Types for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:${PORTSDIR}/devel/py-archetypes.referencebrowserwidget \
-		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:${PORTSDIR}/www/py-plone.i18n \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:${PORTSDIR}/www/py-plone.app.folder \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:${PORTSDIR}/devel/py-Products.Archetypes \
-		${PYTHON_PKGNAMEPREFIX}Products.ATReferenceBrowserWidget>=0:${PORTSDIR}/devel/py-Products.ATReferenceBrowserWidget \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:${PORTSDIR}/devel/py-Products.MimetypesRegistry \
-		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:${PORTSDIR}/devel/py-Products.PortalTransforms \
-		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:${PORTSDIR}/devel/py-Products.validation \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \
+		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
+		${PYTHON_PKGNAMEPREFIX}Products.ATReferenceBrowserWidget>=0:devel/py-Products.ATReferenceBrowserWidget \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \
+		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \
+		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.ATReferenceBrowserWidget/Makefile b/devel/py-Products.ATReferenceBrowserWidget/Makefile
index f55caf4f631d..8947e40862f5 100644
--- a/devel/py-Products.ATReferenceBrowserWidget/Makefile
+++ b/devel/py-Products.ATReferenceBrowserWidget/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Reference widget for Archetypes
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:${PORTSDIR}/devel/py-archetypes.referencebrowserwidget \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.Archetypes/Makefile b/devel/py-Products.Archetypes/Makefile
index 84b9060b71c5..b9b0b1e3660a 100644
--- a/devel/py-Products.Archetypes/Makefile
+++ b/devel/py-Products.Archetypes/Makefile
@@ -12,42 +12,42 @@ COMMENT=	Developers framework for rapidly implementing content types
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:${PORTSDIR}/devel/py-zope.datetime \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:${PORTSDIR}/devel/py-Products.CMFCalendar \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:${PORTSDIR}/devel/py-Products.CMFFormController \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:${PORTSDIR}/devel/py-Products.CMFQuickInstallerTool \
-		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:${PORTSDIR}/devel/py-Products.DCWorkflow \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.Marshall>=0:${PORTSDIR}/devel/py-Products.Marshall \
-		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=2.0.3:${PORTSDIR}/devel/py-Products.MimetypesRegistry \
-		${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:${PORTSDIR}/devel/py-Products.PlacelessTranslationService \
-		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:${PORTSDIR}/devel/py-Products.PortalTransforms \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
-		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:${PORTSDIR}/devel/py-Products.validation \
-		${PYTHON_PKGNAMEPREFIX}plone.folder>=0:${PORTSDIR}/www/py-plone.folder \
-		${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid \
-		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:${PORTSDIR}/www/py-plone.app.folder \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:${PORTSDIR}/devel/py-Products.ZSQLMethods
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \
+		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.Marshall>=0:devel/py-Products.Marshall \
+		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=2.0.3:devel/py-Products.MimetypesRegistry \
+		${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService \
+		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
+		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \
+		${PYTHON_PKGNAMEPREFIX}plone.folder>=0:www/py-plone.folder \
+		${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \
+		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.BTreeFolder2/Makefile b/devel/py-Products.BTreeFolder2/Makefile
index 6851765f562c..e4f445b29516 100644
--- a/devel/py-Products.BTreeFolder2/Makefile
+++ b/devel/py-Products.BTreeFolder2/Makefile
@@ -13,14 +13,14 @@ COMMENT=	BTree based implementation for Zope 2's OFS
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-Products.CMFActionIcons/Makefile b/devel/py-Products.CMFActionIcons/Makefile
index d76142ad2131..47ca85a6679e 100644
--- a/devel/py-Products.CMFActionIcons/Makefile
+++ b/devel/py-Products.CMFActionIcons/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Action icons product for the Zope CMF
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.CMFCalendar/Makefile b/devel/py-Products.CMFCalendar/Makefile
index 4b5b3d677907..a9f32672da7c 100644
--- a/devel/py-Products.CMFCalendar/Makefile
+++ b/devel/py-Products.CMFCalendar/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Calendar product for the Zope Content Management Framework
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>0:${PORTSDIR}/devel/py-zope.app.form
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>0:devel/py-zope.app.form
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/devel/py-Products.CMFCore/Makefile b/devel/py-Products.CMFCore/Makefile
index a2b7fec80d64..06debb96ab5d 100644
--- a/devel/py-Products.CMFCore/Makefile
+++ b/devel/py-Products.CMFCore/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Zope Content Management Framework core components
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/py-five.localsitemanager \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:${PORTSDIR}/devel/py-Products.ZSQLMethods \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:${PORTSDIR}/devel/py-zope.app.publication
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication
 
 NO_ARCH=	yes
 #USES=		zope # cyclic dependency
diff --git a/devel/py-Products.CMFDefault/Makefile b/devel/py-Products.CMFDefault/Makefile
index 5823afd732ec..56ac8aee440a 100644
--- a/devel/py-Products.CMFDefault/Makefile
+++ b/devel/py-Products.CMFDefault/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Default product for the Zope Content Management Framework
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:${PORTSDIR}/devel/py-five.formlib \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:devel/py-five.formlib \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-Products.CMFDiffTool/Makefile b/devel/py-Products.CMFDiffTool/Makefile
index 37a70089a535..65552d5b9420 100644
--- a/devel/py-Products.CMFDiffTool/Makefile
+++ b/devel/py-Products.CMFDiffTool/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Diff tool for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/devel/py-Products.CMFDynamicViewFTI/Makefile b/devel/py-Products.CMFDynamicViewFTI/Makefile
index 194a0a7ed48e..339e30db0b2d 100644
--- a/devel/py-Products.CMFDynamicViewFTI/Makefile
+++ b/devel/py-Products.CMFDynamicViewFTI/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Product for dynamic views in CMF
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:${PORTSDIR}/devel/py-zope.browsermenu \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.CMFEditions/Makefile b/devel/py-Products.CMFEditions/Makefile
index 95f55afca1af..fc2f7784071d 100644
--- a/devel/py-Products.CMFEditions/Makefile
+++ b/devel/py-Products.CMFEditions/Makefile
@@ -12,19 +12,19 @@ COMMENT=	Versioning for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.copy>0:${PORTSDIR}/devel/py-zope.copy \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:${PORTSDIR}/devel/py-Products.CMFDiffTool \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:${PORTSDIR}/devel/py-Products.CMFUid \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4.0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.ZopeVersionControl>=0:${PORTSDIR}/devel/py-Products.ZopeVersionControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4.0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.ZopeVersionControl>=0:devel/py-Products.ZopeVersionControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python zope
diff --git a/devel/py-Products.CMFFormController/Makefile b/devel/py-Products.CMFFormController/Makefile
index 8fc7cdf702f3..99615a120f1d 100644
--- a/devel/py-Products.CMFFormController/Makefile
+++ b/devel/py-Products.CMFFormController/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Form validation mechanism for Zope CMF
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.CMFPlacefulWorkflow/Makefile b/devel/py-Products.CMFPlacefulWorkflow/Makefile
index 835aafbe96d9..02c3289b0e61 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/Makefile
+++ b/devel/py-Products.CMFPlacefulWorkflow/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Workflow policies for CMF and Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-Products.CMFQuickInstallerTool/Makefile b/devel/py-Products.CMFQuickInstallerTool/Makefile
index 78a749f9dbe3..9cae1b28d4b8 100644
--- a/devel/py-Products.CMFQuickInstallerTool/Makefile
+++ b/devel/py-Products.CMFQuickInstallerTool/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Facility for activation/deactivation of Zope CMF products
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python zope
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.CMFTestCase/Makefile b/devel/py-Products.CMFTestCase/Makefile
index 7426a1346992..f981cdfb7136 100644
--- a/devel/py-Products.CMFTestCase/Makefile
+++ b/devel/py-Products.CMFTestCase/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Integration testing framework for CMF
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:${PORTSDIR}/devel/py-Products.CMFCalendar \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.CMFUid/Makefile b/devel/py-Products.CMFUid/Makefile
index a914d2dcef5e..c5e8b106832a 100644
--- a/devel/py-Products.CMFUid/Makefile
+++ b/devel/py-Products.CMFUid/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Uid product for the Zope CMF
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.DCWorkflow/Makefile b/devel/py-Products.DCWorkflow/Makefile
index 79c15b7d7386..c7d3259c7ad7 100644
--- a/devel/py-Products.DCWorkflow/Makefile
+++ b/devel/py-Products.DCWorkflow/Makefile
@@ -13,9 +13,9 @@ COMMENT=	DCWorkflow product for the Zope Content Management Framework
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ExtendedPathIndex/Makefile b/devel/py-Products.ExtendedPathIndex/Makefile
index da82c5f71007..58c2c385cd84 100644
--- a/devel/py-Products.ExtendedPathIndex/Makefile
+++ b/devel/py-Products.ExtendedPathIndex/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Zope catalog index for paths
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}transaction>0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3
 
 USES=		python zope zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ExternalMethod/Makefile b/devel/py-Products.ExternalMethod/Makefile
index 84a0419b3364..fb573831a274 100644
--- a/devel/py-Products.ExternalMethod/Makefile
+++ b/devel/py-Products.ExternalMethod/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Support for external Python methods within a Zope 2 environment
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/devel/py-Products.GenericSetup/Makefile b/devel/py-Products.GenericSetup/Makefile
index 238bccfd786c..4ef467fb3d9e 100644
--- a/devel/py-Products.GenericSetup/Makefile
+++ b/devel/py-Products.GenericSetup/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Read Zope configuration state from profile dirs / tarballs
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/py-five.localsitemanager \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/devel/py-Products.LDAPMultiPlugins/Makefile b/devel/py-Products.LDAPMultiPlugins/Makefile
index da8b6095713d..0a5433101240 100644
--- a/devel/py-Products.LDAPMultiPlugins/Makefile
+++ b/devel/py-Products.LDAPMultiPlugins/Makefile
@@ -14,9 +14,9 @@ COMMENT=	LDAP-backed plugins for the Zope2 PluggableAuthService
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:${PORTSDIR}/net/py-ldap \
-		${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:${PORTSDIR}/devel/py-Products.LDAPUserFolder \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:${PORTSDIR}/security/py-Products.PluggableAuthService
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap \
+		${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:security/py-Products.PluggableAuthService
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.LDAPUserFolder/Makefile b/devel/py-Products.LDAPUserFolder/Makefile
index abbb0bed73d2..c0df817dad61 100644
--- a/devel/py-Products.LDAPUserFolder/Makefile
+++ b/devel/py-Products.LDAPUserFolder/Makefile
@@ -13,8 +13,8 @@ COMMENT=	LDAP-enabled Zope 2 user folder
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:${PORTSDIR}/devel/py-setuptools-git
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:${PORTSDIR}/net/py-ldap
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:devel/py-setuptools-git
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap
 
 OPTIONS_DEFINE=		POSIXGROUP_PATCH
 POSIXGROUP_PATCH_DESC=	Use posixGroup for group membership
diff --git a/devel/py-Products.MIMETools/Makefile b/devel/py-Products.MIMETools/Makefile
index d928dbbde578..59247a34460e 100644
--- a/devel/py-Products.MIMETools/Makefile
+++ b/devel/py-Products.MIMETools/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provides the <!--#mime--> tag for DocumentTemplate
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.Marshall/Makefile b/devel/py-Products.Marshall/Makefile
index 06ce4a89f3c2..8d2a9c3ad756 100644
--- a/devel/py-Products.Marshall/Makefile
+++ b/devel/py-Products.Marshall/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Configurable Marshallers for Archetypes
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:${PORTSDIR}/devel/py-zope.deprecation \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.MimetypesRegistry/Makefile b/devel/py-Products.MimetypesRegistry/Makefile
index b5954007ae5a..1221e59f6f18 100644
--- a/devel/py-Products.MimetypesRegistry/Makefile
+++ b/devel/py-Products.MimetypesRegistry/Makefile
@@ -12,11 +12,11 @@ COMMENT=	MIME type handling for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.OFSP/Makefile b/devel/py-Products.OFSP/Makefile
index d576659ede54..bc2b3acd3a35 100644
--- a/devel/py-Products.OFSP/Makefile
+++ b/devel/py-Products.OFSP/Makefile
@@ -13,8 +13,8 @@ COMMENT=	General Zope 2 help screens
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.PasswordResetTool/Makefile b/devel/py-Products.PasswordResetTool/Makefile
index 67b19cbd3355..a863b7e9bf02 100644
--- a/devel/py-Products.PasswordResetTool/Makefile
+++ b/devel/py-Products.PasswordResetTool/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Password reset tool for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime
 
 NO_ARCH=	yes
 USES=		python zip zope
diff --git a/devel/py-Products.PlacelessTranslationService/Makefile b/devel/py-Products.PlacelessTranslationService/Makefile
index e4412173ec0f..cac8992b5712 100644
--- a/devel/py-Products.PlacelessTranslationService/Makefile
+++ b/devel/py-Products.PlacelessTranslationService/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Internationalizing and localizing software for Zope 2
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gettext>0:${PORTSDIR}/textproc/py-python-gettext \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gettext>0:textproc/py-python-gettext \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.PloneTestCase/Makefile b/devel/py-Products.PloneTestCase/Makefile
index f3ffc01b59d9..8ea1f63b4845 100644
--- a/devel/py-Products.PloneTestCase/Makefile
+++ b/devel/py-Products.PloneTestCase/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Integration testing framework for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=0:${PORTSDIR}/devel/py-Products.ATContentTypes \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=0:devel/py-Products.ATContentTypes \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USE_PYTHON=	autoplist distutils
 USES=		python:2 zope zip
diff --git a/devel/py-Products.PluginRegistry/Makefile b/devel/py-Products.PluginRegistry/Makefile
index c0f7dd1d1258..b93f3a01200d 100644
--- a/devel/py-Products.PluginRegistry/Makefile
+++ b/devel/py-Products.PluginRegistry/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Configure application plugins based on interfaces
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.PortalTransforms/Makefile b/devel/py-Products.PortalTransforms/Makefile
index e7af2ca8428f..f268b9f189c0 100644
--- a/devel/py-Products.PortalTransforms/Makefile
+++ b/devel/py-Products.PortalTransforms/Makefile
@@ -12,14 +12,14 @@ COMMENT=	MIME based content transformations
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:${PORTSDIR}/www/py-plone.intelligenttext \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:${PORTSDIR}/devel/py-Products.MimetypesRegistry \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}markdown>=1.7:${PORTSDIR}/textproc/py-markdown
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}markdown>=1.7:textproc/py-markdown
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.PythonScripts/Makefile b/devel/py-Products.PythonScripts/Makefile
index 87b291037bb8..d5e2bcb2beb4 100644
--- a/devel/py-Products.PythonScripts/Makefile
+++ b/devel/py-Products.PythonScripts/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Support for restricted execution of Python scripts in Zope 2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ResourceRegistries/Makefile b/devel/py-Products.ResourceRegistries/Makefile
index 35c8998d1e25..acd7df838617 100644
--- a/devel/py-Products.ResourceRegistries/Makefile
+++ b/devel/py-Products.ResourceRegistries/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Registry for managing CSS and JS
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:${PORTSDIR}/www/py-plone.app.registry
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:www/py-plone.app.registry
 
 USES=		python:2.7 zip zope
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.StandardCacheManagers/Makefile b/devel/py-Products.StandardCacheManagers/Makefile
index e51b299ed3d9..a7274859a593 100644
--- a/devel/py-Products.StandardCacheManagers/Makefile
+++ b/devel/py-Products.StandardCacheManagers/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Cache managers for Zope 2
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-Products.ZCTextIndex/Makefile b/devel/py-Products.ZCTextIndex/Makefile
index 2efc8e6bec7c..61ea803e2573 100644
--- a/devel/py-Products.ZCTextIndex/Makefile
+++ b/devel/py-Products.ZCTextIndex/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Full text indexing for ZCatalog/Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ZCatalog/Makefile b/devel/py-Products.ZCatalog/Makefile
index 655b83b32559..7d455d7585a4 100644
--- a/devel/py-Products.ZCatalog/Makefile
+++ b/devel/py-Products.ZCatalog/Makefile
@@ -12,22 +12,22 @@ COMMENT=	Zope2's indexing and search solution
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}Missing>=0:${PORTSDIR}/devel/py-Missing \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:${PORTSDIR}/devel/py-Products.ZCTextIndex \
-		${PYTHON_PKGNAMEPREFIX}Record>=0:${PORTSDIR}/devel/py-Record \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex \
+		${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
 
 USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ZSQLMethods/Makefile b/devel/py-Products.ZSQLMethods/Makefile
index 0ac487e766a1..e2768bb0ebe6 100644
--- a/devel/py-Products.ZSQLMethods/Makefile
+++ b/devel/py-Products.ZSQLMethods/Makefile
@@ -13,15 +13,15 @@ COMMENT=	SQL method support for Zope 2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}Missing>=0:${PORTSDIR}/devel/py-Missing \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}Record>=0:${PORTSDIR}/devel/py-Record \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ZopeVersionControl/Makefile b/devel/py-Products.ZopeVersionControl/Makefile
index 155375651230..20caa22fc14b 100644
--- a/devel/py-Products.ZopeVersionControl/Makefile
+++ b/devel/py-Products.ZopeVersionControl/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Zope Version Control
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.statusmessages/Makefile b/devel/py-Products.statusmessages/Makefile
index 6cad3478a443..41f804640857 100644
--- a/devel/py-Products.statusmessages/Makefile
+++ b/devel/py-Products.statusmessages/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Handling of internationalized status messages for Zope
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.validation/Makefile b/devel/py-Products.validation/Makefile
index f3b5499fa78c..c2e5eb9db1c6 100644
--- a/devel/py-Products.validation/Makefile
+++ b/devel/py-Products.validation/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Data validation package for Archetypes
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/devel/py-RPyC/Makefile b/devel/py-RPyC/Makefile
index b0fa0751a1fc..055fa8bfcec8 100644
--- a/devel/py-RPyC/Makefile
+++ b/devel/py-RPyC/Makefile
@@ -16,7 +16,7 @@ LICENSE=	MIT
 OPTIONS_DEFINE=	PLUMBUM
 OPTIONS_DEFAULT=PLUMBUM
 
-PLUMBUM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plumbum>0:${PORTSDIR}/sysutils/py-plumbum
+PLUMBUM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plumbum>0:sysutils/py-plumbum
 PLUMBUM_DESC=	 Required for features like rpyc_classic.py and zero deploy
 
 USES=		python:-3.3
diff --git a/devel/py-Record/Makefile b/devel/py-Record/Makefile
index 58f45f5f3cb2..1030b50a52ce 100644
--- a/devel/py-Record/Makefile
+++ b/devel/py-Record/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Special Record objects used in Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-TGScheduler/Makefile b/devel/py-TGScheduler/Makefile
index 03840cf05f00..96015931893d 100644
--- a/devel/py-TGScheduler/Makefile
+++ b/devel/py-TGScheduler/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Turbogears Scheduler
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-ToscaWidgets/Makefile b/devel/py-ToscaWidgets/Makefile
index 37f2f9ad312c..927cd3992a74 100644
--- a/devel/py-ToscaWidgets/Makefile
+++ b/devel/py-ToscaWidgets/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python framework for building reusable web components
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-TurboJinja/Makefile b/devel/py-TurboJinja/Makefile
index 96376aabe999..ea1f768a9f39 100644
--- a/devel/py-TurboJinja/Makefile
+++ b/devel/py-TurboJinja/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Jinja (Django & Smarty-like) template for TurboGears
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:${PORTSDIR}/www/py-turbogears
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:www/py-turbogears
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja>=0.9:${PORTSDIR}/devel/py-Jinja
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja>=0.9:devel/py-Jinja
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-aniso8601/Makefile b/devel/py-aniso8601/Makefile
index dd1afd9d53c6..1db4c53a18d1 100644
--- a/devel/py-aniso8601/Makefile
+++ b/devel/py-aniso8601/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for parsing ISO 8601 strings
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile
index aeb231cb61ab..3450497b8ced 100644
--- a/devel/py-apscheduler/Makefile
+++ b/devel/py-apscheduler/Makefile
@@ -12,9 +12,9 @@ COMMENT=	In-process task scheduler with Cron-like capabilities
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>0:${PORTSDIR}/devel/py-tzlocal
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal
 
 NO_ARCH=	yes
 USES=		python
@@ -22,18 +22,18 @@ USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	TEST
 
-TEST_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:${PORTSDIR}/devel/py-pytest
+TEST_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest
 TEST_MAKE_ENV=	TZ=UTC
 PYDISTUTILS_TEST_TARGET?=	test
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MTEST} && ${PYTHON_REL} < 3300
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 .if ${PYTHON_REL} < 3200
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>0:${PORTSDIR}/devel/py-futures
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
 .endif
 
 pre-install-TEST-on:
diff --git a/devel/py-archetypes.querywidget/Makefile b/devel/py-archetypes.querywidget/Makefile
index 8e02fd79e0cd..bf5d4406c545 100644
--- a/devel/py-archetypes.querywidget/Makefile
+++ b/devel/py-archetypes.querywidget/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Widget for creating catalog queries
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:${PORTSDIR}/www/py-plone.app.querystring \
-		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:${PORTSDIR}/www/py-plone.app.jquerytools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:www/py-plone.app.querystring \
+		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-archetypes.referencebrowserwidget/Makefile b/devel/py-archetypes.referencebrowserwidget/Makefile
index a28118fbc8e3..23af89757ce6 100644
--- a/devel/py-archetypes.referencebrowserwidget/Makefile
+++ b/devel/py-archetypes.referencebrowserwidget/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Implementation of referencebrowser widget for Archetypes
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
-		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:${PORTSDIR}/www/py-plone.app.jquerytools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
+		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:www/py-plone.app.jquerytools
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-archetypes.schemaextender/Makefile b/devel/py-archetypes.schemaextender/Makefile
index f8f717a0ae33..e73987f1de30 100644
--- a/devel/py-archetypes.schemaextender/Makefile
+++ b/devel/py-archetypes.schemaextender/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Dynamically extend Archetypes schemas with named adapters
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-arrow/Makefile b/devel/py-arrow/Makefile
index 522a5e1df53f..6ab1d836c97d 100644
--- a/devel/py-arrow/Makefile
+++ b/devel/py-arrow/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Better dates and times for Python
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile
index 1cbb5de3b391..429be7c8da13 100644
--- a/devel/py-astroid/Makefile
+++ b/devel/py-astroid/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Extension for Python compiler.ast module
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wrapt>0:${PORTSDIR}/devel/py-wrapt \
-		${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>0:${PORTSDIR}/devel/py-lazy-object-proxy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \
+		${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>0:devel/py-lazy-object-proxy
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index 9224293fd218..23ff7675111f 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of tools for internationalizing Python applications
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-bandit/Makefile b/devel/py-bandit/Makefile
index 6375b895474f..13dcb2df77a9 100644
--- a/devel/py-bandit/Makefile
+++ b/devel/py-bandit/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Tool for finding common security issues in Python code
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:${PORTSDIR}/devel/py-stevedore
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:devel/py-stevedore
 
 MAKE_ENV+=	PBR_VERSION=${PORTVERSION}
 
diff --git a/devel/py-bcdoc/Makefile b/devel/py-bcdoc/Makefile
index c28013c4c3cc..654dfcbd34ff 100644
--- a/devel/py-bcdoc/Makefile
+++ b/devel/py-bcdoc/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tools to help document botocore-based projects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-binplist/Makefile b/devel/py-binplist/Makefile
index dee490b6cce3..018d8873f9ac 100644
--- a/devel/py-binplist/Makefile
+++ b/devel/py-binplist/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Binary plist parser
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-biplist/Makefile b/devel/py-biplist/Makefile
index 299e98fbd4cf..97f1571e3605 100644
--- a/devel/py-biplist/Makefile
+++ b/devel/py-biplist/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Library for reading/writing binary plists
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 TEST_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		python
diff --git a/devel/py-bison/Makefile b/devel/py-bison/Makefile
index a3ca4b5bfea4..c4194d0a84a3 100644
--- a/devel/py-bison/Makefile
+++ b/devel/py-bison/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python-based parsing at the speed of C
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
+BUILD_DEPENDS=	pyrex>=0.9.6.2:devel/pyrex
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/py-blinker/Makefile b/devel/py-blinker/Makefile
index ed291bf883fc..06018cef5784 100644
--- a/devel/py-blinker/Makefile
+++ b/devel/py-blinker/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fast, simple object-to-object and broadcast signaling
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-botocore/Makefile b/devel/py-botocore/Makefile
index 7719fb1d9d85..db97ac0a54ba 100644
--- a/devel/py-botocore/Makefile
+++ b/devel/py-botocore/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Low-level, core functionality of boto 3
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}jmespath>=0.9.0:${PORTSDIR}/devel/py-jmespath \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}jmespath>=0.9.0:devel/py-jmespath \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-canonicaljson/Makefile b/devel/py-canonicaljson/Makefile
index d1039b918e95..fc6905072eca 100644
--- a/devel/py-canonicaljson/Makefile
+++ b/devel/py-canonicaljson/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Canonical JSON
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-capstone/Makefile b/devel/py-capstone/Makefile
index da214d71b171..496f7a1bf4c7 100644
--- a/devel/py-capstone/Makefile
+++ b/devel/py-capstone/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for the Capstone Disassembly Engine
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-LIB_DEPENDS=	libcapstone.so:${PORTSDIR}/devel/capstone
+LIB_DEPENDS=	libcapstone.so:devel/capstone
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-celery/Makefile b/devel/py-celery/Makefile
index 66985a50eec7..82c50e1e2478 100644
--- a/devel/py-celery/Makefile
+++ b/devel/py-celery/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Asynchronous task queue/job queue
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:${PORTSDIR}/devel/py-billiard \
-		${PYTHON_PKGNAMEPREFIX}pytz>=1.5:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}kombu>=3.0.29:${PORTSDIR}/net/py-kombu \
-		${PYTHON_PKGNAMEPREFIX}python-memcached>=0:${PORTSDIR}/databases/py-python-memcached
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard \
+		${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}kombu>=3.0.29:net/py-kombu \
+		${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-cffi/Makefile b/devel/py-cffi/Makefile
index ee33a241f29b..33556444b714 100644
--- a/devel/py-cffi/Makefile
+++ b/devel/py-cffi/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Foreign Function Interface for Python calling C code
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:${PORTSDIR}/devel/py-pycparser
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+LIB_DEPENDS=	libffi.so:devel/libffi
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 CFLAGS+=	-I${LOCALBASE}/include -Wl,-rpath,${LOCALBASE}/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/py-check-manifest/Makefile b/devel/py-check-manifest/Makefile
index 85e3aa4abfe8..c7989447473e 100644
--- a/devel/py-check-manifest/Makefile
+++ b/devel/py-check-manifest/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Check MANIFEST.in in a Python source package for completeness
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE.rst
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index fa83dcd308e1..440a757ff682 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	Cheetah-${DISTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	HTML template engine for Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:${PORTSDIR}/textproc/py-markdown
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-circuits/Makefile b/devel/py-circuits/Makefile
index 0d7d80bd065b..def3502f72aa 100644
--- a/devel/py-circuits/Makefile
+++ b/devel/py-circuits/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Asynchronous Component-based Event Application Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-cld/Makefile b/devel/py-cld/Makefile
index 93ccd6ce05fd..f97493b4394e 100644
--- a/devel/py-cld/Makefile
+++ b/devel/py-cld/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for compact language detector library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcld2.so:${PORTSDIR}/devel/cld2
+LIB_DEPENDS=	libcld2.so:devel/cld2
 
 USES=		python
 
diff --git a/devel/py-clint/Makefile b/devel/py-clint/Makefile
index 6e12f7550440..8aafa0742301 100644
--- a/devel/py-clint/Makefile
+++ b/devel/py-clint/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python command-line application tools
 
 LICENSE=	ISCL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:${PORTSDIR}/devel/py-args
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-collective.z3cform.datetimewidget/Makefile b/devel/py-collective.z3cform.datetimewidget/Makefile
index 18d693c3f370..fbb078e4f0ac 100644
--- a/devel/py-collective.z3cform.datetimewidget/Makefile
+++ b/devel/py-collective.z3cform.datetimewidget/Makefile
@@ -12,9 +12,9 @@ COMMENT=	z3c.form date and datetime widgets
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation
 
 NO_ARCH=	yes
 USES=		python:2.7 zip
diff --git a/devel/py-columnize/Makefile b/devel/py-columnize/Makefile
index 5bac0c7fec44..e7d6265475bc 100644
--- a/devel/py-columnize/Makefile
+++ b/devel/py-columnize/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Format a simple (i.e. not nested) list into aligned columns
 
 LICENSE=	MIT
 
-MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.0:${PORTSDIR}/devel/py-nose
+MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose
 
 BUILD_DEPENDS=	${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS}
@@ -24,7 +24,7 @@ USE_PYTHON=	autoplist distutils
 .if ${PYTHON_MAJOR_VER} == "3"
 EXTRA_PATCHES=      ${FILESDIR}/extra-patch-____pkginfo____.py
 .else
-MY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size=1.0:${PORTSDIR}/devel/py-backports.shutil_get_terminal_size
+MY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size=1.0:devel/py-backports.shutil_get_terminal_size
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile
index 6db9954d57bb..5ed31477ef9c 100644
--- a/devel/py-configobj/Makefile
+++ b/devel/py-configobj/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple but powerful config file reader and writer
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-construct/Makefile b/devel/py-construct/Makefile
index 371943fa1784..5323249b1002 100644
--- a/devel/py-construct/Makefile
+++ b/devel/py-construct/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python module for parsing and building of data structures
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-cov-core/Makefile b/devel/py-cov-core/Makefile
index 119a82e02e67..15b078a44ccc 100644
--- a/devel/py-cov-core/Makefile
+++ b/devel/py-cov-core/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Plugin core for use by pytest-cov, nose-cov and nose2-cov
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=3.6:${PORTSDIR}/devel/py-coverage
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-curtsies/Makefile b/devel/py-curtsies/Makefile
index 89dc1cd230a8..0cd95ead6425 100644
--- a/devel/py-curtsies/Makefile
+++ b/devel/py-curtsies/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Curses-like terminal wrapper, with colored strings
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blessings>=1.5:${PORTSDIR}/devel/py-blessings \
-		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:${PORTSDIR}/devel/py-wcwidth
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blessings>=1.5:devel/py-blessings \
+		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-cycler/Makefile b/devel/py-cycler/Makefile
index d49f8871e2a1..2280bda415de 100644
--- a/devel/py-cycler/Makefile
+++ b/devel/py-cycler/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Composable style cycles
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-d2to1/Makefile b/devel/py-d2to1/Makefile
index 53a1b2ffa1b4..febf1aaeed20 100644
--- a/devel/py-d2to1/Makefile
+++ b/devel/py-d2to1/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Distutils2-like setup.cfg files with setuptools setup.py
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-daemon/Makefile b/devel/py-daemon/Makefile
index 71938c506084..b4c6b5b702b5 100644
--- a/devel/py-daemon/Makefile
+++ b/devel/py-daemon/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Well-behaved daemon framework for Python
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:${PORTSDIR}/devel/py-lockfile
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/py-dateutil/Makefile b/devel/py-dateutil/Makefile
index 804ddbc49e76..002feb651599 100644
--- a/devel/py-dateutil/Makefile
+++ b/devel/py-dateutil/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extensions to the standard Python datetime module
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.5:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six
 
 USES=		python dos2unix
 USE_GITHUB=	yes
diff --git a/devel/py-debtcollector/Makefile b/devel/py-debtcollector/Makefile
index e8d327d14b48..63403596fd5c 100644
--- a/devel/py-debtcollector/Makefile
+++ b/devel/py-debtcollector/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Collection of Python deprecation patterns and strategies
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}wrapt>0:${PORTSDIR}/devel/py-wrapt
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt
 
 NO_ARCH=	yes
 
diff --git a/devel/py-delfick_error/Makefile b/devel/py-delfick_error/Makefile
index 3b8e05aeb489..1d87a0bdeab3 100644
--- a/devel/py-delfick_error/Makefile
+++ b/devel/py-delfick_error/Makefile
@@ -10,16 +10,16 @@ COMMENT=	Customized exception class
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}total-ordering>0:${PORTSDIR}/devel/py-total-ordering
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:${PORTSDIR}/devel/py-noseofyeti	\
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}total-ordering>0:devel/py-total-ordering
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti	\
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 OPTIONS_DEFINE=	DOCS
 DOCS_BUILD_DEPENDS=	\
-		${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:${PORTSDIR}/textproc/py-cloud_sptheme
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \
+		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:textproc/py-cloud_sptheme
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-deliciousapi/Makefile b/devel/py-deliciousapi/Makefile
index 165a27e2fbb8..55030cb35bbc 100644
--- a/devel/py-deliciousapi/Makefile
+++ b/devel/py-deliciousapi/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	DeliciousAPI-${PORTVERSION}
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Unofficial Python API for retrieving data from Delicious.com
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:${PORTSDIR}/devel/py-simplejson
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:devel/py-simplejson
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-dialog/Makefile b/devel/py-dialog/Makefile
index eeabbfd0ad47..dc4cbc4d6f66 100644
--- a/devel/py-dialog/Makefile
+++ b/devel/py-dialog/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python interface to dialog(3)
 
 LICENSE=	LGPL20
 
-RUN_DEPENDS=	cdialog:${PORTSDIR}/devel/cdialog
+RUN_DEPENDS=	cdialog:devel/cdialog
 
 USES=		python tar:bzip2
 USE_PYTHON=	distutils
diff --git a/devel/py-diazo/Makefile b/devel/py-diazo/Makefile
index bba7c8554df9..e8e19a255f5a 100644
--- a/devel/py-diazo/Makefile
+++ b/devel/py-diazo/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Deliverance like language using a pure XSLT engine
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}cssselect>0:${PORTSDIR}/www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}future>0:${PORTSDIR}/devel/py-future \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:${PORTSDIR}/devel/py-repoze.xmliter \
-		${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter \
+		${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-django-rq/Makefile b/devel/py-django-rq/Makefile
index 79ae995b840c..8317087d9062 100644
--- a/devel/py-django-rq/Makefile
+++ b/devel/py-django-rq/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Provides Django integration for RQ (Redis Queue)
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.5:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:${PORTSDIR}/devel/py-rq
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ui
diff --git a/devel/py-django-tastypie-mongoengine/Makefile b/devel/py-django-tastypie-mongoengine/Makefile
index 86434419ebd9..c45afca2825e 100644
--- a/devel/py-django-tastypie-mongoengine/Makefile
+++ b/devel/py-django-tastypie-mongoengine/Makefile
@@ -14,9 +14,9 @@ COMMENT=		MongoEngine support for django-tastypie
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:${PORTSDIR}/www/py-django-tastypie \
-		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
-		${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:www/py-django-tastypie \
+		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine \
+		${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		wlanslovenija
diff --git a/devel/py-django16-tastypie-mongoengine/Makefile b/devel/py-django16-tastypie-mongoengine/Makefile
index 00b8786a1031..f1c43eba3334 100644
--- a/devel/py-django16-tastypie-mongoengine/Makefile
+++ b/devel/py-django16-tastypie-mongoengine/Makefile
@@ -10,9 +10,9 @@ COMMENT=		MongoEngine support for django-tastypie using Django 1.6
 LICENSE=		AGPLv3
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-tastypie16>=0.9.12:${PORTSDIR}/www/py-django16-tastypie \
-		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
-		${PYTHON_PKGNAMEPREFIX}django16>0:${PORTSDIR}/www/py-django16
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-tastypie16>=0.9.12:www/py-django16-tastypie \
+		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine \
+		${PYTHON_PKGNAMEPREFIX}django16>0:www/py-django16
 
 MASTERDIR=		${.CURDIR}/../py-django-tastypie-mongoengine
 
diff --git a/devel/py-dogpile.cache/Makefile b/devel/py-dogpile.cache/Makefile
index 95d4bb21af21..0ed7af6850a5 100644
--- a/devel/py-dogpile.cache/Makefile
+++ b/devel/py-dogpile.cache/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Caching front-end based on the Dogpile lock
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dogpile.core>0:${PORTSDIR}/devel/py-dogpile.core \
-		${PYTHON_PKGNAMEPREFIX}gdbm>0:${PORTSDIR}/databases/py-gdbm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dogpile.core>0:devel/py-dogpile.core \
+		${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-doit/Makefile b/devel/py-doit/Makefile
index bfc188c3ea6a..056aa22a4c00 100644
--- a/devel/py-doit/Makefile
+++ b/devel/py-doit/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Task management & automation tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}cloudpickle>0:${PORTSDIR}/devel/py-cloudpickle
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -26,7 +26,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}configparser>0:${PORTSDIR}/devel/py-configparser
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser
 .endif
 
 do-test:
diff --git a/devel/py-efilter/Makefile b/devel/py-efilter/Makefile
index 79d62ca8d901..e7649c6f6508 100644
--- a/devel/py-efilter/Makefile
+++ b/devel/py-efilter/Makefile
@@ -12,8 +12,8 @@ COMMENT=	EFILTER query language
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2011:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2011:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-efl/Makefile b/devel/py-efl/Makefile
index 2e6f36219065..8dc9ec79e04f 100644
--- a/devel/py-efl/Makefile
+++ b/devel/py-efl/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python bindings for EFL and Elementary
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libelementary.so:${PORTSDIR}/x11-toolkits/elementary
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libelementary.so:x11-toolkits/elementary
 
 DIST_SUBDIR=	enlightenment
 USES=		pkgconfig python tar:xz
@@ -24,11 +24,11 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py-dbus
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus
 .else
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py3-dbus
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py3-dbus
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py3-dbus
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py3-dbus
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-envisage/Makefile b/devel/py-envisage/Makefile
index 2c8e4938ef26..eee1cd584433 100644
--- a/devel/py-envisage/Makefile
+++ b/devel/py-envisage/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE PSFL LGPL20
 LICENSE_COMB=	multi
 # See image_LICENSE.txt files for per file license information
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:${PORTSDIR}/devel/py-traits
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-epsilon/Makefile b/devel/py-epsilon/Makefile
index e58edbc808c5..0450583a08aa 100644
--- a/devel/py-epsilon/Makefile
+++ b/devel/py-epsilon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Set of Python utility modules used by DivMod projects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl
 
 CONFLICTS=	brlcad-[0-9]*
 USES=		python twisted
diff --git a/devel/py-evdev/Makefile b/devel/py-evdev/Makefile
index e93bc54de2ca..d7e4a49c4d4a 100644
--- a/devel/py-evdev/Makefile
+++ b/devel/py-evdev/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bindings to the Linux input handling subsystem
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-event/Makefile b/devel/py-event/Makefile
index 41f1bea8a219..51fb667ec5d6 100644
--- a/devel/py-event/Makefile
+++ b/devel/py-event/Makefile
@@ -17,7 +17,7 @@ BROKEN=		unfetchable
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 PROJECTHOST=	pyevent
 USES=		python
diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile
index 17047b985afa..182b11c6a2dc 100644
--- a/devel/py-fabric/Makefile
+++ b/devel/py-fabric/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Simple, Pythonic remote execution and deployment
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:${PORTSDIR}/security/py-paramiko
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}fudge>0:${PORTSDIR}/devel/py-fudge \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:${PORTSDIR}/devel/py-Jinja2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:devel/py-Jinja2
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-filemagic/Makefile b/devel/py-filemagic/Makefile
index d45df99b1c78..964492aa49b5 100644
--- a/devel/py-filemagic/Makefile
+++ b/devel/py-filemagic/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python API for libmagic, the library behind the Unix file command
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=	TESTS
 
@@ -29,7 +29,7 @@ GH_TAGNAME=	b24df9f
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 .endif
 
 regression-test: build
diff --git a/devel/py-five.customerize/Makefile b/devel/py-five.customerize/Makefile
index 13d43a02a9de..6504b56e64d9 100644
--- a/devel/py-five.customerize/Makefile
+++ b/devel/py-five.customerize/Makefile
@@ -13,21 +13,21 @@ COMMENT=	TTW customization of template-based Zope views
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition
 
 USE_PYTHON=	distutils autoplist
 USES=		python:2 zope zip
diff --git a/devel/py-five.formlib/Makefile b/devel/py-five.formlib/Makefile
index d49ca86c9d49..35956bc48eb6 100644
--- a/devel/py-five.formlib/Makefile
+++ b/devel/py-five.formlib/Makefile
@@ -13,19 +13,19 @@ COMMENT=	zope.formlib integration for Zope 2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-five.globalrequest/Makefile b/devel/py-five.globalrequest/Makefile
index 9a5d679a8b95..9d215b208827 100644
--- a/devel/py-five.globalrequest/Makefile
+++ b/devel/py-five.globalrequest/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Zope 2 integration for zope.globalrequest
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:${PORTSDIR}/devel/py-zope.globalrequest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-five.localsitemanager/Makefile b/devel/py-five.localsitemanager/Makefile
index b69fd9b4db16..52a93ac2590a 100644
--- a/devel/py-five.localsitemanager/Makefile
+++ b/devel/py-five.localsitemanager/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Local site manager implementation for Zope 2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index e94173bee27c..ee3755405410 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Code checking using pep8 and pyflakes
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mccabe>=0.2.1:${PORTSDIR}/devel/py-mccabe \
-		${PYTHON_PKGNAMEPREFIX}pep8>=1.5.7:${PORTSDIR}/devel/pep8 \
-		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:${PORTSDIR}/devel/py-pyflakes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mccabe>=0.2.1:devel/py-mccabe \
+		${PYTHON_PKGNAMEPREFIX}pep8>=1.5.7:devel/pep8 \
+		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py-pyflakes
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-flask-babel/Makefile b/devel/py-flask-babel/Makefile
index 0c8036cdcf33..a08966760144 100644
--- a/devel/py-flask-babel/Makefile
+++ b/devel/py-flask-babel/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Adds i18n/l10n support to Flask applications
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}speaklater>=1.3:${PORTSDIR}/devel/py-speaklater
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}speaklater>=1.3:devel/py-speaklater
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-foolscap/Makefile b/devel/py-foolscap/Makefile
index 61bd7c84d943..d155839987e8 100644
--- a/devel/py-foolscap/Makefile
+++ b/devel/py-foolscap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	RPC protocol for Twisted Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python twisted
diff --git a/devel/py-freenas.dispatcher/Makefile b/devel/py-freenas.dispatcher/Makefile
index 1cfd942d4b5c..cc474cc6d5f5 100644
--- a/devel/py-freenas.dispatcher/Makefile
+++ b/devel/py-freenas.dispatcher/Makefile
@@ -9,13 +9,13 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	FreeNAS dispatcher client
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freenas.utils>0:${PORTSDIR}/devel/py-freenas.utils
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ws4py>0:${PORTSDIR}/www/py-ws4py \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>0:${PORTSDIR}/devel/py-jsonschema \
-		${PYTHON_PKGNAMEPREFIX}gevent>0:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}paramiko>0:${PORTSDIR}/security/py-paramiko \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}freenas.utils>0:${PORTSDIR}/devel/py-freenas.utils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ws4py>0:www/py-ws4py \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
+		${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-freenas.utils/Makefile b/devel/py-freenas.utils/Makefile
index cd07f9117131..9a3721a292af 100644
--- a/devel/py-freenas.utils/Makefile
+++ b/devel/py-freenas.utils/Makefile
@@ -11,8 +11,8 @@ COMMENT=	FreeNAS common Python modules
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-freezegun/Makefile b/devel/py-freezegun/Makefile
index db4c24ae9aee..b0c5f4882188 100644
--- a/devel/py-freezegun/Makefile
+++ b/devel/py-freezegun/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Let your Python tests travel through time
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:${PORTSDIR}/devel/py-dateutil
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-fsm/Makefile b/devel/py-fsm/Makefile
index 4296bfbf34dc..acae11c7d6d6 100644
--- a/devel/py-fsm/Makefile
+++ b/devel/py-fsm/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pure Python Implementation of a Finite State Machine
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:${PORTSDIR}/graphics/py-pygraphviz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 5b3403514fbd..f3383f72fa1e 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Module designed to write games in Python
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		dos2unix python
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index c583120ec190..cc5c8d670a09 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -28,13 +28,13 @@ EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MM2CRYPTO}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:${PORTSDIR}/security/py-m2crypto
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:security/py-m2crypto
 .endif
 .if ${PORT_OPTIONS:MPYCRYPTO}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
 .endif
 .if ${PORT_OPTIONS:MGMPY}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gmpy>0:${PORTSDIR}/math/py-gmpy
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy
 .endif
 
 post-install:
diff --git a/devel/py-geojson/Makefile b/devel/py-geojson/Makefile
index c32c62a748dc..659d74cd044d 100644
--- a/devel/py-geojson/Makefile
+++ b/devel/py-geojson/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python's Encoder/decoder for simple GIS features
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.0:${PORTSDIR}/devel/py-nose
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>1.9:${PORTSDIR}/devel/py-simplejson
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.0:devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>1.9:devel/py-simplejson
 
 PORTDOCS=	LICENSE.rst CHANGELOG.rst README.rst
 
diff --git a/devel/py-gevent/Makefile b/devel/py-gevent/Makefile
index 87deb63159e7..254a443b6c3e 100644
--- a/devel/py-gevent/Makefile
+++ b/devel/py-gevent/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Python co-routine networking library based on greenlet
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares \
-		libev.so:${PORTSDIR}/devel/libev
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.7:${PORTSDIR}/devel/py-greenlet
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.7:${PORTSDIR}/devel/py-greenlet \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+LIB_DEPENDS=	libcares.so:dns/c-ares \
+		libev.so:devel/libev
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.7:devel/py-greenlet
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.7:devel/py-greenlet \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 
 DO_MAKE_TEST=	${SETENV} PYTHONPATH=../ ${PYTHON_CMD}
 MAKE_ENV=	CARES_EMBED=0 LIBEV_EMBED=0
diff --git a/devel/py-git-up/Makefile b/devel/py-git-up/Makefile
index d8bdffdab9a8..47bcfb27ed22 100644
--- a/devel/py-git-up/Makefile
+++ b/devel/py-git-up/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Python implementation of 'git up'
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}GitPython>=0.3.6:${PORTSDIR}/devel/py-gitpython \
-	${PYTHON_PKGNAMEPREFIX}colorama>=0.3.2:${PORTSDIR}/devel/py-colorama \
-	${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:${PORTSDIR}/devel/py-termcolor \
-	${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:${PORTSDIR}/devel/py-docopt
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}GitPython>=0.3.6:devel/py-gitpython \
+	${PYTHON_PKGNAMEPREFIX}colorama>=0.3.2:devel/py-colorama \
+	${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \
+	${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt
 
 USES=		python zip dos2unix
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-gitdb/Makefile b/devel/py-gitdb/Makefile
index 5c9a27898fa6..2212c037cf05 100644
--- a/devel/py-gitdb/Makefile
+++ b/devel/py-gitdb/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pure Python git object database
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}smmap>=0.8.5:${PORTSDIR}/devel/py-smmap
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}smmap>=0.8.5:devel/py-smmap
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-gitosis/Makefile b/devel/py-gitosis/Makefile
index d9c485ae824a..bb90a6ea9393 100644
--- a/devel/py-gitosis/Makefile
+++ b/devel/py-gitosis/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Software for hosting git repositories
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 USES=		python tar:bzip2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-gitpython/Makefile b/devel/py-gitpython/Makefile
index 37a16c343f96..9bbe750df6ee 100644
--- a/devel/py-gitpython/Makefile
+++ b/devel/py-gitpython/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Python Git Library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gitdb>=0.6.4:${PORTSDIR}/devel/py-gitdb
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}gitdb>=0.6.4:${PORTSDIR}/devel/py-gitdb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gitdb>=0.6.4:devel/py-gitdb
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}gitdb>=0.6.4:devel/py-gitdb
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index db659b15db66..39775d922627 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Python bindings for GObject
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
+LIB_DEPENDS+=	libffi.so:devel/libffi
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
 
 PORTSCOUT=	ignore:1
 
diff --git a/devel/py-google-apputils/Makefile b/devel/py-google-apputils/Makefile
index 96aa5e5c5d07..7c70e0cbac9d 100644
--- a/devel/py-google-apputils/Makefile
+++ b/devel/py-google-apputils/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Google Application Utilities for Python
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gflags>2:${PORTSDIR}/devel/py-gflags \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}dateutil>2:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gflags>2:devel/py-gflags \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}dateutil>2:devel/py-dateutil
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-grab/Makefile b/devel/py-grab/Makefile
index 7310eab305dc..5ea977b2e149 100644
--- a/devel/py-grab/Makefile
+++ b/devel/py-grab/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Site scraping framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}pycurl>0:${PORTSDIR}/ftp/py-pycurl \
-		${PYTHON_PKGNAMEPREFIX}weblib>0:${PORTSDIR}/devel/py-weblib \
-		${PYTHON_PKGNAMEPREFIX}selection>0:${PORTSDIR}/devel/py-selection \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}user_agent>0:${PORTSDIR}/www/py-user_agent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \
+		${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib \
+		${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-hash_ring/Makefile b/devel/py-hash_ring/Makefile
index 69b27d843874..8a89322d4fc8 100644
--- a/devel/py-hash_ring/Makefile
+++ b/devel/py-hash_ring/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of consistent hashing in Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=0:${PORTSDIR}/databases/py-python-memcached
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-hgsubversion/Makefile b/devel/py-hgsubversion/Makefile
index fb22863d4ffa..e4e4f9ae45b3 100644
--- a/devel/py-hgsubversion/Makefile
+++ b/devel/py-hgsubversion/Makefile
@@ -22,9 +22,9 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSUBVERTPY}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subvertpy>=0:${PORTSDIR}/devel/py-subvertpy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subvertpy>=0:devel/py-subvertpy
 .else
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:${PORTSDIR}/devel/py-subversion
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile
index f2596130826d..3470a9fbd510 100644
--- a/devel/py-hypothesis/Makefile
+++ b/devel/py-hypothesis/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for property based testing
 
 LICENSE=	MPL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index 4f58d2084e69..3926b1313629 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Parser and generator of iCalender files for Python
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index 3030e09ec86a..11c9105a90d7 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Ice (Internet Communications Engine) language mapping for Python
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp
-LIB_DEPENDS=	libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
+BUILD_DEPENDS=	mcpp:devel/mcpp
+LIB_DEPENDS=	libIce.so.${LIB_VRS}:devel/ice
 
 USES=		python shebangfix
 USE_PYTHON=	py3kplist
diff --git a/devel/py-instant/Makefile b/devel/py-instant/Makefile
index 22c5359dd6b2..3a141f307b9f 100644
--- a/devel/py-instant/Makefile
+++ b/devel/py-instant/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python module for instant inlining of C and C++ code in Python
 
 LICENSE=	LGPL3
 
-RUN_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+RUN_DEPENDS=	swig2.0:devel/swig20
 
 USES=			python:2
 USE_PYTHON=		distutils
diff --git a/devel/py-intervaltree/Makefile b/devel/py-intervaltree/Makefile
index d0a86d31cdf2..62b532c33958 100644
--- a/devel/py-intervaltree/Makefile
+++ b/devel/py-intervaltree/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Editable interval tree data structure for Python 2 and 3
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:${PORTSDIR}/devel/py-sortedcontainers
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:devel/py-sortedcontainers
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-ipdb/Makefile b/devel/py-ipdb/Makefile
index 216076a318e6..a4eb3798417a 100644
--- a/devel/py-ipdb/Makefile
+++ b/devel/py-ipdb/Makefile
@@ -13,7 +13,7 @@ COMMENT=	IPython-enabled pdb
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0.10:${PORTSDIR}/devel/ipython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0.10:devel/ipython
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-iso8601/Makefile b/devel/py-iso8601/Makefile
index df0e98fd37a5..1725cbd0e4a0 100644
--- a/devel/py-iso8601/Makefile
+++ b/devel/py-iso8601/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple module to parse ISO 8601 dates
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-itools/Makefile b/devel/py-itools/Makefile
index 6eca0f92e3c3..a328d937f410 100644
--- a/devel/py-itools/Makefile
+++ b/devel/py-itools/Makefile
@@ -14,23 +14,23 @@ COMMENT=	Python library Provides Wide Range Of Capabilities
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=  ${LOCALBASE}/include/poppler/goo/gtypes.h:${PORTSDIR}/graphics/poppler \
-		${LOCALBASE}/include/git2.h:${PORTSDIR}/devel/libgit2 \
-		${PYTHON_PKGNAMEPREFIX}reportlab2>=2.3:${PORTSDIR}/print/py-reportlab2 \
-		${PYTHON_PKGNAMEPREFIX}pygit2>0:${PORTSDIR}/devel/py-pygit2 \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}xlrd>0:${PORTSDIR}/textproc/py-xlrd \
-		${PYTHON_PKGNAMEPREFIX}magic>0:${PORTSDIR}/devel/py-magic \
-		${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}gobject>=2.16.1:${PORTSDIR}/devel/py-gobject \
-		${LOCALBASE}/bin/git:${PORTSDIR}/devel/git \
-		xapian-bindings>1.0.8:${PORTSDIR}/databases/xapian-bindings
+BUILD_DEPENDS=  ${LOCALBASE}/include/poppler/goo/gtypes.h:graphics/poppler \
+		${LOCALBASE}/include/git2.h:devel/libgit2 \
+		${PYTHON_PKGNAMEPREFIX}reportlab2>=2.3:print/py-reportlab2 \
+		${PYTHON_PKGNAMEPREFIX}pygit2>0:devel/py-pygit2 \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd \
+		${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic \
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
+		${PYTHON_PKGNAMEPREFIX}gobject>=2.16.1:devel/py-gobject \
+		${LOCALBASE}/bin/git:devel/git \
+		xapian-bindings>1.0.8:databases/xapian-bindings
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20 \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libwv2.so:${PORTSDIR}/textproc/wv2
+LIB_DEPENDS=	libglib-2.0.so:devel/glib20 \
+		libsoup-2.4.so:devel/libsoup \
+		libwv2.so:textproc/wv2
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/poppler
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/py-jaraco.timing/Makefile b/devel/py-jaraco.timing/Makefile
index aad623ae007d..0aa7f3d8da4a 100644
--- a/devel/py-jaraco.timing/Makefile
+++ b/devel/py-jaraco.timing/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Routines pertinent to the fourth dimension
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools \
-		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:${PORTSDIR}/devel/py-setuptools_scm
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \
+		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-jaraco.util/Makefile b/devel/py-jaraco.util/Makefile
index d99b6415ec7f..e053b18a4783 100644
--- a/devel/py-jaraco.util/Makefile
+++ b/devel/py-jaraco.util/Makefile
@@ -12,10 +12,10 @@ COMMENT=	General utility modules that supply commonly-used functionality
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}more-itertools>0:${PORTSDIR}/devel/py-more-itertools \
-		${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:${PORTSDIR}/devel/py-jaraco.timing
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools \
+		${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:devel/py-jaraco.timing
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-jira/Makefile b/devel/py-jira/Makefile
index 7934b0592ecc..18e64f3300a7 100644
--- a/devel/py-jira/Makefile
+++ b/devel/py-jira/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Library to ease use of the JIRA 5 REST APIs
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:${PORTSDIR}/www/py-requests-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:${PORTSDIR}/security/py-tlslite \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 OPTIONS_DEFINE=		MAGIC PARALLEL SHELL TESTS
 OPTIONS_DEFAULT=	MAGIC PARALLEL
@@ -29,13 +29,13 @@ PARALLEL_DESC=	Enable asynchronous requests
 SHELL_DESC=	Enable interactive shell
 TESTS_DESC=	Install test suite dependencies
 
-MAGIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}filemagic>=1.6:${PORTSDIR}/devel/py-filemagic
-PARALLEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grequests>0:${PORTSDIR}/www/py-grequests
-SHELL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0.13:${PORTSDIR}/devel/ipython
+MAGIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}filemagic>=1.6:devel/py-filemagic
+PARALLEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grequests>0:www/py-grequests
+SHELL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0.13:devel/ipython
 TESTS_BUILD_DEPENDS=	${TEST_DEPENDS}
 
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-jsonpatch/Makefile b/devel/py-jsonpatch/Makefile
index ec73ad06291c..31270a9664e3 100644
--- a/devel/py-jsonpatch/Makefile
+++ b/devel/py-jsonpatch/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	harm@weites.com
 COMMENT=	Apply JSON-Patches (RFC 6902)
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonpointer>0:${PORTSDIR}/devel/py-jsonpointer
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile
index cd761a48046c..f488c1ff996d 100644
--- a/devel/py-jsonrpclib/Makefile
+++ b/devel/py-jsonrpclib/Makefile
@@ -22,7 +22,7 @@ CJSON_DESC=	Use cjson instead of json or simplejson
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCJSON}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cjson>0:${PORTSDIR}/devel/py-cjson
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cjson>0:devel/py-cjson
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile
index a677342fb802..eb124f77a3f9 100644
--- a/devel/py-jsonschema/Makefile
+++ b/devel/py-jsonschema/Makefile
@@ -12,7 +12,7 @@ COMMENT=	JSON Schema validation for Python
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcversioner>0:${PORTSDIR}/devel/py-vcversioner
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -20,7 +20,7 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} == "2.7"
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}functools32>0:${PORTSDIR}/devel/py-functools32
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-kaptan/Makefile b/devel/py-kaptan/Makefile
index 2fee13dfb478..109acfdd7d49 100644
--- a/devel/py-kaptan/Makefile
+++ b/devel/py-kaptan/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python config parser for json, yaml
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-kayako/Makefile b/devel/py-kayako/Makefile
index 8d66443b75fd..7033c6db394b 100644
--- a/devel/py-kayako/Makefile
+++ b/devel/py-kayako/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Python API Wrapper for Kayako
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/devel/py-kazoo/Makefile b/devel/py-kazoo/Makefile
index 9e8d169993ef..fbd7f42e86ec 100644
--- a/devel/py-kazoo/Makefile
+++ b/devel/py-kazoo/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Higher Level API to Zookeeper for Python
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:${PORTSDIR}/devel/py-gevent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent
 
 USES=		gmake python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-keystoneauth1/Makefile b/devel/py-keystoneauth1/Makefile
index 3d376d318427..242c2e9854f0 100644
--- a/devel/py-keystoneauth1/Makefile
+++ b/devel/py-keystoneauth1/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Authentication Library for OpenStack Identity
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}iso8601>0:${PORTSDIR}/devel/py-iso8601 \
-		${PYTHON_PKGNAMEPREFIX}positional>0:${PORTSDIR}/devel/py-positional \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}stevedore>0:${PORTSDIR}/devel/py-stevedore
+BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 \
+		${PYTHON_PKGNAMEPREFIX}positional>0:devel/py-positional \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}stevedore>0:devel/py-stevedore
 
 NO_ARCH=	yes
 
diff --git a/devel/py-libpeas/Makefile b/devel/py-libpeas/Makefile
index 23a19274bf5e..a9505d5acd4e 100644
--- a/devel/py-libpeas/Makefile
+++ b/devel/py-libpeas/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	libpeas Python 2 support
 
-LIB_DEPENDS+=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas
+LIB_DEPENDS+=	libpeas-1.0.so:devel/libpeas
 
 LIBPEAS_SLAVE=	python2
 
diff --git a/devel/py-libplist/Makefile b/devel/py-libplist/Makefile
index 5265722ed85b..81a12b26b4b0 100644
--- a/devel/py-libplist/Makefile
+++ b/devel/py-libplist/Makefile
@@ -7,8 +7,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Python bindings for libplist
 
-LIB_DEPENDS=	libplist.so:${PORTSDIR}/${MASTER_PORT}
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+LIB_DEPENDS=	libplist.so:${MASTER_PORT}
+BUILD_DEPENDS=	cython:lang/cython
 
 USES=		python
 CONFIGURE_ENV=	PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`"
diff --git a/devel/py-libvirt/Makefile b/devel/py-libvirt/Makefile
index a7f9330bca74..45e083934d1e 100644
--- a/devel/py-libvirt/Makefile
+++ b/devel/py-libvirt/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for Libvirt virtualization API
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	libvirt.so:devel/libvirt
 
 USES=	pkgconfig python shebangfix
 SHEBANG_FILES=	generator.py sanitytest.py setup.py
diff --git a/devel/py-libzfs/Makefile b/devel/py-libzfs/Makefile
index c5db0e6af6f8..f3b0d80cb3f8 100644
--- a/devel/py-libzfs/Makefile
+++ b/devel/py-libzfs/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python libzfs bindings
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	cython>0:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython>0:lang/cython
 
 USE_GITHUB=     yes
 GH_ACCOUNT=	freenas
@@ -27,7 +27,7 @@ MAKE_ENV=	FREEBSD_SRC=${SRC_BASE}
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .if !exists(${SRC_BASE}/sys/Makefile)
diff --git a/devel/py-lockfile/Makefile b/devel/py-lockfile/Makefile
index f7b4224f86bf..e4e5feb77d84 100644
--- a/devel/py-lockfile/Makefile
+++ b/devel/py-lockfile/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Platform-independent file locking module
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:${PORTSDIR}/devel/py-pbr
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-logan/Makefile b/devel/py-logan/Makefile
index fed1524ff6f5..2326439ea216 100644
--- a/devel/py-logan/Makefile
+++ b/devel/py-logan/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Logan is a toolkit for running standalone Django applications
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile
index 76bb22e18ec0..055c82be3cb0 100644
--- a/devel/py-lxml/Makefile
+++ b/devel/py-lxml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Pythonic binding for the libxml2 and libxslt libraries
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libxslt.so:textproc/libxslt
 
 USES=		python uniquefiles:dirs
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-manuel/Makefile b/devel/py-manuel/Makefile
index 4657c4f93cd4..47cd126d704d 100644
--- a/devel/py-manuel/Makefile
+++ b/devel/py-manuel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Lets you build tested documentation
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-meliae/Makefile b/devel/py-meliae/Makefile
index 8165c62882f1..f5bce1d013f8 100644
--- a/devel/py-meliae/Makefile
+++ b/devel/py-meliae/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python Memory Usage Analyzer
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	cython>0:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython>0:lang/cython
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-memory_profiler/Makefile b/devel/py-memory_profiler/Makefile
index 4bd669b171d2..40bd7cd39d2b 100644
--- a/devel/py-memory_profiler/Makefile
+++ b/devel/py-memory_profiler/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD2CLAUSE
 
 OPTIONS_DEFINE=	PSUTIL
 PSUTIL_DESC=	Use psutil for better performance
-PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:${PORTSDIR}/sysutils/py-psutil
+PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:sysutils/py-psutil
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-mercurialserver/Makefile b/devel/py-mercurialserver/Makefile
index 008181a85f2e..ec535ab61b4d 100644
--- a/devel/py-mercurialserver/Makefile
+++ b/devel/py-mercurialserver/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Software for hosting mercurial repositories
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial
+RUN_DEPENDS=	hg:devel/mercurial
 
 WRKSRC=		${WRKDIR}/${SNAME}_${SVERSION}.orig
 SNAME=		mercurial-server
diff --git a/devel/py-minimongo/Makefile b/devel/py-minimongo/Makefile
index 14cafe69fbfa..2713e48aac42 100644
--- a/devel/py-minimongo/Makefile
+++ b/devel/py-minimongo/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	mail@derzinn.de
 COMMENT=	Minimal database Model management for MongoDB
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=1.9:${PORTSDIR}/databases/pymongo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=1.9:databases/pymongo
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-mock/Makefile b/devel/py-mock/Makefile
index 46dc3ae6d555..8c878b848df3 100644
--- a/devel/py-mock/Makefile
+++ b/devel/py-mock/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Mock unit tests for Python
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:${PORTSDIR}/devel/py-pbr \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:${PORTSDIR}/devel/py-pbr \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:${PORTSDIR}/devel/py-six
-TESTS_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six
+TESTS_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -25,7 +25,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=  ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:${PORTSDIR}/devel/py-funcsigs
+RUN_DEPENDS+=  ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs
 .endif
 
 do-test:
diff --git a/devel/py-mongoengine/Makefile b/devel/py-mongoengine/Makefile
index 40c17e009c74..7817cdac9b9e 100644
--- a/devel/py-mongoengine/Makefile
+++ b/devel/py-mongoengine/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Object-Document-Mapper for working with MongoDB
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}rednose>0:${PORTSDIR}/devel/py-rednose
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:${PORTSDIR}/databases/pymongo
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:databases/pymongo
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-mongokit/Makefile b/devel/py-mongokit/Makefile
index 0bc57310318d..3368804d23ee 100644
--- a/devel/py-mongokit/Makefile
+++ b/devel/py-mongokit/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	mail@derzinn.de
 COMMENT=	Python ORM-like layer on top of pymongo
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.0.1:${PORTSDIR}/databases/pymongo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.0.1:databases/pymongo
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-mwlib.rl/Makefile b/devel/py-mwlib.rl/Makefile
index b81ead664332..05ab2b73f0f5 100644
--- a/devel/py-mwlib.rl/Makefile
+++ b/devel/py-mwlib.rl/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Generate Pdfs from Mediawiki Markup
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/texvc:${PORTSDIR}/print/texvc \
-		${LOCALBASE}/bin/fribidi:${PORTSDIR}/converters/fribidi \
-		${PYTHON_PKGNAMEPREFIX}gevent>=0:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}mwlib>=0.12.14:${PORTSDIR}/devel/py-mwlib \
-		${PYTHON_PKGNAMEPREFIX}mwlib.ext>=0.12.3:${PORTSDIR}/devel/py-mwlib.ext \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.0:${PORTSDIR}/textproc/py-pygments
+BUILD_DEPENDS=	${LOCALBASE}/bin/texvc:print/texvc \
+		${LOCALBASE}/bin/fribidi:converters/fribidi \
+		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}mwlib>=0.12.14:devel/py-mwlib \
+		${PYTHON_PKGNAMEPREFIX}mwlib.ext>=0.12.3:devel/py-mwlib.ext \
+		${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python zip
diff --git a/devel/py-mwlib/Makefile b/devel/py-mwlib/Makefile
index 0ed30dc201e2..90f329190a78 100644
--- a/devel/py-mwlib/Makefile
+++ b/devel/py-mwlib/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Python's MediaWiki Parser and Utility Library
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:${PORTSDIR}/devel/py-apipkg \
-		${PYTHON_PKGNAMEPREFIX}bottle>=0.10:${PORTSDIR}/www/py-bottle \
-		${PYTHON_PKGNAMEPREFIX}flup>=1.0:${PORTSDIR}/www/py-flup \
-		${PYTHON_PKGNAMEPREFIX}gevent>=0:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:${PORTSDIR}/devel/py-lockfile \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:${PORTSDIR}/devel/py-odfpy \
-		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:${PORTSDIR}/www/py-webob \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:${PORTSDIR}/devel/py-lockfile \
-		${PYTHON_PKGNAMEPREFIX}timelib>=0.2:${PORTSDIR}/devel/py-timelib \
-		${PYTHON_PKGNAMEPREFIX}pdf>=1.12:${PORTSDIR}/print/py-pdf \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}py>=1.4.0:${PORTSDIR}/devel/py-py \
-		${PYTHON_PKGNAMEPREFIX}qserve>=0:${PORTSDIR}/devel/py-qserve \
-		${PYTHON_PKGNAMEPREFIX}roman>=0:${PORTSDIR}/math/py-roman \
-		${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:${PORTSDIR}/databases/py-sqlite3dbm \
-		${PYTHON_PKGNAMEPREFIX}timelib>=0.2:${PORTSDIR}/devel/py-timelib \
-		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg \
+		${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle \
+		${PYTHON_PKGNAMEPREFIX}flup>=1.0:www/py-flup \
+		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:devel/py-odfpy \
+		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile \
+		${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib \
+		${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}py>=1.4.0:devel/py-py \
+		${PYTHON_PKGNAMEPREFIX}qserve>=0:devel/py-qserve \
+		${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman \
+		${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:databases/py-sqlite3dbm \
+		${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib \
+		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob
 
 USES=		python:2 shebangfix zip
 SHEBANG_FILES=	mwlib/EasyTimeline.pl
diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile
index cf67d9f19159..4bd7b4b33cd2 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	egenix-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sergio@softshark.org
 COMMENT=	The eGenix mx Extensions - EXPERIMENTAL Package
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/gmp
-#RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base
+BUILD_DEPENDS=	${LOCALBASE}/include/gmp.h:math/gmp
+#RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:lang/py-mx-base
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-nose-cov/Makefile b/devel/py-nose-cov/Makefile
index e7abd9e629a3..801c7566a286 100644
--- a/devel/py-nose-cov/Makefile
+++ b/devel/py-nose-cov/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Nose plugin for coverage reporting
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-noseofyeti/Makefile b/devel/py-noseofyeti/Makefile
index bb8bf46f0212..08739bc57121 100644
--- a/devel/py-noseofyeti/Makefile
+++ b/devel/py-noseofyeti/Makefile
@@ -8,18 +8,18 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	truckman@FreeBSD.org
 COMMENT=	Nose plugin providing BDD dsl for Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}fudge>0:${PORTSDIR}/devel/py-fudge \
-		${PYTHON_PKGNAMEPREFIX}should_dsl>0:${PORTSDIR}/devel/py-should_dsl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \
+		${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl
 
 OPTIONS_DEFINE=	DOCS
 DOCS_BUILD_DEPENDS=	\
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}fudge>0:${PORTSDIR}/devel/py-fudge \
-		${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}pinocchio>0:${PORTSDIR}/devel/py-pinocchio \
-		${PYTHON_PKGNAMEPREFIX}should_dsl>0:${PORTSDIR}/devel/py-should_dsl
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \
+		${PYTHON_PKGNAMEPREFIX}pinocchio>0:devel/py-pinocchio \
+		${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl
 
 NO_ARCH=	yes
 USES=		python shebangfix
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index 4cfbde026b10..c7c9f3bf127f 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -13,7 +13,7 @@ COMMENT=	python bindings for libnotify
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 USES=		gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
 USE_GNOME=	pygtk2
diff --git a/devel/py-ocempgui/Makefile b/devel/py-ocempgui/Makefile
index c07e68b9fb63..11b9002c5cf1 100644
--- a/devel/py-ocempgui/Makefile
+++ b/devel/py-ocempgui/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GUI toolkit in python
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:${PORTSDIR}/devel/py-game
-RUN_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:${PORTSDIR}/devel/py-game
+BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game
+RUN_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game
 
 USES=		python:2
 USE_GNOME=	atk
diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile
index da0acacbeccd..407b2b89c27e 100644
--- a/devel/py-ode/Makefile
+++ b/devel/py-ode/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	python
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Python bindings for The Open Dynamics Engine
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
+BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:devel/ode
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-omnijson/Makefile b/devel/py-omnijson/Makefile
index 44f282d02cbc..e7abe40ba514 100644
--- a/devel/py-omnijson/Makefile
+++ b/devel/py-omnijson/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Wraps the best Python JSON installed
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 OPTIONS_DEFINE=	TESTS
 
diff --git a/devel/py-omniorb-3/Makefile b/devel/py-omniorb-3/Makefile
index 4abc6aacbe42..aca92e7b1125 100644
--- a/devel/py-omniorb-3/Makefile
+++ b/devel/py-omniorb-3/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Python bindings for omniORB4, a CORBA 2.6 ORB
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libomniORB4.so.1:${PORTSDIR}/devel/omniORB-4.1
+LIB_DEPENDS=	libomniORB4.so.1:devel/omniORB-4.1
 # parts of omniORB4 source tree is required to build omniORBpy;
 # see also the "post-extract" target below.
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB-4.1:patch
+BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB-4.1:patch
 
 CONFLICTS=	py${PYTHON_SUFFIX}-orbit-2* py${PYTHON_SUFFIX}-omniorb-4.2*
 
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index 4e45a0ed6353..b1b650c0b363 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Python bindings for omniORB4, a CORBA 2.6 ORB
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libomniORB4.so:${PORTSDIR}/devel/omniORB
-RUN_DEPENDS=	omniidl:${PORTSDIR}/devel/omniORB
+LIB_DEPENDS=	libomniORB4.so:devel/omniORB
+RUN_DEPENDS=	omniidl:devel/omniORB
 # parts of omniORB4 source tree is required to build omniORBpy;
 # see also the "post-extract" target below.
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB:patch
+BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB:patch
 
 CONFLICTS=	py*-orbit-2* py${PYTHON_SUFFIX}-omniorb3-3*
 
diff --git a/devel/py-option_merge/Makefile b/devel/py-option_merge/Makefile
index 29df11ae5f91..05fd51367929 100644
--- a/devel/py-option_merge/Makefile
+++ b/devel/py-option_merge/Makefile
@@ -8,11 +8,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	truckman@FreeBSD.org
 COMMENT=	Code to deeply merge multiple python dictionaries
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:${PORTSDIR}/devel/py-delfick_error	\
-		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:${PORTSDIR}/devel/py-noseofyeti	\
-		${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:devel/py-delfick_error	\
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti	\
+		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-oslo.i18n/Makefile b/devel/py-oslo.i18n/Makefile
index 2e89cba4b94f..c6191c6b4c4a 100644
--- a/devel/py-oslo.i18n/Makefile
+++ b/devel/py-oslo.i18n/Makefile
@@ -9,9 +9,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Oslo i18n library
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 
diff --git a/devel/py-oslo.serialization/Makefile b/devel/py-oslo.serialization/Makefile
index 4335da229eb5..ceb08e0de7a2 100644
--- a/devel/py-oslo.serialization/Makefile
+++ b/devel/py-oslo.serialization/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Oslo Serialization library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>0:${PORTSDIR}/devel/py-msgpack-python \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>0:${PORTSDIR}/devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>0:devel/py-oslo.utils \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 
diff --git a/devel/py-oslo.utils/Makefile b/devel/py-oslo.utils/Makefile
index fd855453a5a7..fef905618df6 100644
--- a/devel/py-oslo.utils/Makefile
+++ b/devel/py-oslo.utils/Makefile
@@ -9,16 +9,16 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Oslo Utility library
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>0:${PORTSDIR}/devel/py-debtcollector \
-		${PYTHON_PKGNAMEPREFIX}funcsigs>0:${PORTSDIR}/devel/py-funcsigs \
-		${PYTHON_PKGNAMEPREFIX}iso8601>0:${PORTSDIR}/devel/py-iso8601 \
-		${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:${PORTSDIR}/devel/py-monotonic \
-		${PYTHON_PKGNAMEPREFIX}netaddr>0:${PORTSDIR}/net/py-netaddr \
-		${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>0:${PORTSDIR}/devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>0:devel/py-debtcollector \
+		${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs \
+		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 \
+		${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic \
+		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \
+		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>0:devel/py-oslo.i18n \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 
diff --git a/devel/py-palm/Makefile b/devel/py-palm/Makefile
index a3e484332b81..999fec9a821f 100644
--- a/devel/py-palm/Makefile
+++ b/devel/py-palm/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Fast Protocol Buffer library for Python
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>0:${PORTSDIR}/devel/py-protobuf
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simpleparse>0:${PORTSDIR}/devel/py-simpleparse
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simpleparse>0:devel/py-simpleparse
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pathlib/Makefile b/devel/py-pathlib/Makefile
index d832775d7df4..d81ad75e2220 100644
--- a/devel/py-pathlib/Makefile
+++ b/devel/py-pathlib/Makefile
@@ -17,7 +17,7 @@ USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/py-pathtools/Makefile b/devel/py-pathtools/Makefile
index 0a3e1ee1f306..6b11c5b3fdd3 100644
--- a/devel/py-pathtools/Makefile
+++ b/devel/py-pathtools/Makefile
@@ -20,7 +20,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 post-build:
diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile
index 7a2a75a6d388..68daab41bb08 100644
--- a/devel/py-pbr/Makefile
+++ b/devel/py-pbr/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python Build Reasonableness
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:${PORTSDIR}/devel/py-pip
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
 
 NO_ARCH=	yes
 
diff --git a/devel/py-pex/Makefile b/devel/py-pex/Makefile
index dcec0f0ea500..539916abc2a6 100644
--- a/devel/py-pex/Makefile
+++ b/devel/py-pex/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PEX packaging toolchain
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:${PORTSDIR}/devel/py-wheel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-phabricator/Makefile b/devel/py-phabricator/Makefile
index 230442ef296c..6601315f331c 100644
--- a/devel/py-phabricator/Makefile
+++ b/devel/py-phabricator/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Phabricator API Bindings
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pinocchio/Makefile b/devel/py-pinocchio/Makefile
index b6aeb5fe7ac4..3c5cd37efe3e 100644
--- a/devel/py-pinocchio/Makefile
+++ b/devel/py-pinocchio/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Pinocchio plugins for the nose testing framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:${PORTSDIR}/devel/py-colorama
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 8830b604af42..8d3f653619cf 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -13,21 +13,21 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 # Tests also need bzr, git, otherwise they fail
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:${PORTSDIR}/devel/py-pytest-capturelog \
-		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:${PORTSDIR}/devel/py-pytest-timeout \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:${PORTSDIR}/devel/py-pytest-xdist \
-		${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:${PORTSDIR}/devel/py-virtualenv \
-		${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:${PORTSDIR}/devel/py-scripttest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}pretend>0:${PORTSDIR}/devel/py-pretend \
-		${PYTHON_PKGNAMEPREFIX}freezegun>0:${PORTSDIR}/devel/py-freezegun \
-		git>0:${PORTSDIR}/devel/git \
-		bzr>0:${PORTSDIR}/devel/bzr
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog \
+		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist \
+		${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv \
+		${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend \
+		${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun \
+		git>0:devel/git \
+		bzr>0:devel/bzr
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_PORTDOCS=	*
 DOCS_VARS=	PYDISTUTILS_BUILD_TARGET=build_sphinx \
 		PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
diff --git a/devel/py-plan/Makefile b/devel/py-plan/Makefile
index 389ef9032794..f461ae11c716 100644
--- a/devel/py-plan/Makefile
+++ b/devel/py-plan/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python package for writing and deploying cron jobs
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=2.1:${PORTSDIR}/devel/py-click
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=2.1:devel/py-click
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pluggy/Makefile b/devel/py-pluggy/Makefile
index 41af18db648c..10ea518232e2 100644
--- a/devel/py-pluggy/Makefile
+++ b/devel/py-pluggy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Plugin and hook calling mechanisms for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-positional/Makefile b/devel/py-positional/Makefile
index 729dced228b6..8482902db9f2 100644
--- a/devel/py-positional/Makefile
+++ b/devel/py-positional/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library to enforce positional or key-word arguments
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
 
 NO_ARCH=	yes
 
diff --git a/devel/py-pretend/Makefile b/devel/py-pretend/Makefile
index edb5df3e6b4f..e9155d415e5f 100644
--- a/devel/py-pretend/Makefile
+++ b/devel/py-pretend/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library for stubbing in Python
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-prioritized_methods/Makefile b/devel/py-prioritized_methods/Makefile
index a2df0afa8d44..81f390d99c44 100644
--- a/devel/py-prioritized_methods/Makefile
+++ b/devel/py-prioritized_methods/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Extension to PEAK-Rules to prioritize methods
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:${PORTSDIR}/devel/py-PEAK-Rules
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:devel/py-PEAK-Rules
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-prompt_toolkit/Makefile b/devel/py-prompt_toolkit/Makefile
index b69aad6d3cda..596f19f8f733 100644
--- a/devel/py-prompt_toolkit/Makefile
+++ b/devel/py-prompt_toolkit/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Library for building powerful interactive command lines in Python
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}wcwidth>=0:${PORTSDIR}/devel/py-wcwidth
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
index 207b364c2f38..df1db4901d35 100644
--- a/devel/py-protobuf/Makefile
+++ b/devel/py-protobuf/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Google protobuf Python Client Library
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:${PORTSDIR}/devel/py-google-apputils \
-		protoc:${PORTSDIR}/devel/protobuf
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:${PORTSDIR}/devel/py-google-apputils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:devel/py-google-apputils \
+		protoc:devel/protobuf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:devel/py-google-apputils
 
 DO_MAKE_TEST=	${PYTHON_CMD} ${PYDISTUTILS_SETUP}
 NO_ARCH=	yes
diff --git a/devel/py-protocols-devel/Makefile b/devel/py-protocols-devel/Makefile
index 2a5d2e11d5df..73e7e4d0e78f 100644
--- a/devel/py-protocols-devel/Makefile
+++ b/devel/py-protocols-devel/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-1.0a0dev-r2302
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Protocol Definition, Declaration, and Adaptation for Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-ptrace/Makefile b/devel/py-ptrace/Makefile
index b5fd1a755b5e..7a522c50f0b3 100644
--- a/devel/py-ptrace/Makefile
+++ b/devel/py-ptrace/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python binding of ptrace
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distorm>0:${PORTSDIR}/devel/py-distorm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distorm>0:devel/py-distorm
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pudb/Makefile b/devel/py-pudb/Makefile
index 3c2304ab4a98..0e9de2700b89 100644
--- a/devel/py-pudb/Makefile
+++ b/devel/py-pudb/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Full-screen, console-based Python debugger
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:${PORTSDIR}/devel/py-urwid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:devel/py-urwid
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-py/Makefile b/devel/py-py/Makefile
index 7aea459c3e15..62c33484da63 100644
--- a/devel/py-py/Makefile
+++ b/devel/py-py/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library with cross-python path, ini-parsing, io, code, log facilities
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pyasn1-modules/Makefile b/devel/py-pyasn1-modules/Makefile
index e943594c8989..253a198ecc3c 100644
--- a/devel/py-pyasn1-modules/Makefile
+++ b/devel/py-pyasn1-modules/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of ASN.1 data structures for py-asn1
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:${PORTSDIR}/devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1
 
 NO_ARCH=	yes
 USES=		python shebangfix
diff --git a/devel/py-pycallgraph/Makefile b/devel/py-pycallgraph/Makefile
index 36262345aaed..ef61cc4bef30 100644
--- a/devel/py-pycallgraph/Makefile
+++ b/devel/py-pycallgraph/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python library that creates call graphs for Python programs
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+=	dot:graphics/graphviz
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-pycmd/Makefile b/devel/py-pycmd/Makefile
index 2d4f2a40a1ca..0b2ed678506c 100644
--- a/devel/py-pycmd/Makefile
+++ b/devel/py-pycmd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tools for managing/searching Python related files
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.4.9:${PORTSDIR}/devel/py-py
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.4.9:devel/py-py
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-pydenticon/Makefile b/devel/py-pydenticon/Makefile
index 146075ef1b2e..e8178002ea89 100644
--- a/devel/py-pydenticon/Makefile
+++ b/devel/py-pydenticon/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Library for generating identicons - an enhanced port of Sigil
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pydoop/Makefile b/devel/py-pydoop/Makefile
index a667f647c60b..8b9a5b022bd7 100644
--- a/devel/py-pydoop/Makefile
+++ b/devel/py-pydoop/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Python interface to Hadoop
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/yarn:${PORTSDIR}/devel/hadoop2
-RUN_DEPENDS=	${LOCALBASE}/bin/yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/bin/yarn:devel/hadoop2
+RUN_DEPENDS=	${LOCALBASE}/bin/yarn:devel/hadoop2
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pyev/Makefile b/devel/py-pyev/Makefile
index 5c342d768e09..342179305d76 100644
--- a/devel/py-pyev/Makefile
+++ b/devel/py-pyev/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python libev interface
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index d8cc03457359..22211cbc19a9 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python bindings for libgit2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:${PORTSDIR}/devel/py-cffi
-LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi
+LIB_DEPENDS=	libgit2.so:devel/libgit2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index 640f0944a3a2..f12557064798 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -22,6 +22,6 @@ MAKE_ENV+=	PYICU_INCLUDES="${PREFIX}/include" \
 		PYICU_CFLAGS="-w:-DPYICU_VER=\"${PORTVERSION}\"" \
 		PYICU_LFLAGS="-L${PREFIX}/lib"
 
-LIB_DEPENDS+=	libicudata.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicudata.so:devel/icu
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyinotify/Makefile b/devel/py-pyinotify/Makefile
index c79c824e4129..692143bd017c 100644
--- a/devel/py-pyinotify/Makefile
+++ b/devel/py-pyinotify/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python interface to (lib)inotify
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4/Makefile
index 3b752c1d5a8a..f0ef7380c784 100644
--- a/devel/py-pykde4/Makefile
+++ b/devel/py-pykde4/Makefile
@@ -11,19 +11,19 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for KDE
 
-LIB_DEPENDS=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:${PORTSDIR}/devel/py-qt4-designer \
-		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_SITELIBDIR}/PyQt4/QtOpenGL.so:${PORTSDIR}/x11/py-qt4-opengl \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sql \
-		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/phonon.so:${PORTSDIR}/multimedia/py-qt4-phonon \
-		${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:${PORTSDIR}/devel/py-qt4-declarative
+LIB_DEPENDS=	libqwt.so:x11-toolkits/qwt5
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:devel/py-qt4-designer \
+		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \
+		${PYTHON_SITELIBDIR}/PyQt4/QtOpenGL.so:x11/py-qt4-opengl \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:databases/py-qt4-sql \
+		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:textproc/py-qt4-xml \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
+		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \
+		${PYTHON_SITELIBDIR}/PyQt4/phonon.so:multimedia/py-qt4-phonon \
+		${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:devel/py-qt4-declarative
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbussupport
+		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:devel/py-qt4-dbussupport
 
 USE_KDE4=	kdelibs kdeprefix nepomuk-core okular pimlibs \
 		akonadi automoc4 soprano
diff --git a/devel/py-pyke/Makefile b/devel/py-pyke/Makefile
index 2b7f2503d426..a27178a55210 100644
--- a/devel/py-pyke/Makefile
+++ b/devel/py-pyke/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python Knowledge Engine
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=2.3:${PORTSDIR}/devel/py-ply
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=2.3:devel/py-ply
 
 USES=		python zip
 USE_PYTHON=	distutils
diff --git a/devel/py-pymarc/Makefile b/devel/py-pymarc/Makefile
index 06210c3564f9..ba886ac9a313 100644
--- a/devel/py-pymarc/Makefile
+++ b/devel/py-pymarc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Read Write And Modify MARC Bibliographic Data
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-pymtbl/Makefile b/devel/py-pymtbl/Makefile
index 349d0fdef147..7563253fa8be 100644
--- a/devel/py-pymtbl/Makefile
+++ b/devel/py-pymtbl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python wrapper for devel/mtbl
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libmtbl.so:${PORTSDIR}/devel/mtbl
+LIB_DEPENDS=	libmtbl.so:devel/mtbl
 
 USE_PYTHON=	autoplist distutils
 USES=		pkgconfig python shebangfix uniquefiles:dirs
diff --git a/devel/py-pyopencl/Makefile b/devel/py-pyopencl/Makefile
index 10d3d438dbf0..5e16b0ac2ebd 100644
--- a/devel/py-pyopencl/Makefile
+++ b/devel/py-pyopencl/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Python wrapper for OpenCL
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/include/CL/cl.h:${PORTSDIR}/devel/opencl \
-		${PYTHON_PKGNAMEPREFIX}numpy>0:${PORTSDIR}/math/py-numpy
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libOpenCL.so:${PORTSDIR}/devel/ocl-icd
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytools>0:${PORTSDIR}/devel/py-pytools \
-		${PYTHON_PKGNAMEPREFIX}numpy>0:${PORTSDIR}/math/py-numpy \
-		${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako
+BUILD_DEPENDS=	${LOCALBASE}/include/CL/cl.h:devel/opencl \
+		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+		libOpenCL.so:devel/ocl-icd
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytools>0:devel/py-pytools \
+		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \
+		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako
 
 USE_PYTHON=	autoplist distutils
 USES=		python
diff --git a/devel/py-pyrfc3339/Makefile b/devel/py-pyrfc3339/Makefile
index 5f368e689a1b..0c63498694ad 100644
--- a/devel/py-pyrfc3339/Makefile
+++ b/devel/py-pyrfc3339/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Generate and parse RFC 3339 timestamps
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-pyro/Makefile b/devel/py-pyro/Makefile
index b231c7bc8be2..46954120125d 100644
--- a/devel/py-pyro/Makefile
+++ b/devel/py-pyro/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Distributed Object Middleware for Python(IPC/RPC)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serpent>=1.11:${PORTSDIR}/devel/py-serpent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serpent>=1.11:devel/py-serpent
 
 NO_ARCH=	yes
 USES=		dos2unix python
diff --git a/devel/py-pytest-cache/Makefile b/devel/py-pytest-cache/Makefile
index 5b990280b136..ccf61a2859fc 100644
--- a/devel/py-pytest-cache/Makefile
+++ b/devel/py-pytest-cache/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Pytest plugin with mechanisms for caching across test runs
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.2:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}execnet>=1.2:${PORTSDIR}/sysutils/py-execnet
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.2:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}execnet>=1.2:sysutils/py-execnet
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 OPTIONS_DEFINE=	TESTS
 
diff --git a/devel/py-pytest-capturelog/Makefile b/devel/py-pytest-capturelog/Makefile
index bb3e9dfa6f7e..23c7b39420b5 100644
--- a/devel/py-pytest-capturelog/Makefile
+++ b/devel/py-pytest-capturelog/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Py.test plugin to capture log messages
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.1.1:${PORTSDIR}/devel/py-py
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py-py
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pytest-django/Makefile b/devel/py-pytest-django/Makefile
index 70b6476482be..7109012d8225 100644
--- a/devel/py-pytest-django/Makefile
+++ b/devel/py-pytest-django/Makefile
@@ -10,14 +10,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Django plugin for py.test
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-configurations>=0:${PORTSDIR}/www/py-django-configurations \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:${PORTSDIR}/devel/py-pytest-xdist \
-		${PYTHON_PKGNAMEPREFIX}tox>=0:${PORTSDIR}/devel/py-tox \
-		${PYTHON_PKGNAMEPREFIX}wheel>=0:${PORTSDIR}/devel/py-wheel \
-		${PYTHON_PKGNAMEPREFIX}twine>=0:${PORTSDIR}/devel/py-twine \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:${PORTSDIR}/devel/py-setuptools_scm \
-		${PYTHON_PKGNAMEPREFIX}south>=0:${PORTSDIR}/databases/py-south
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}django-configurations>=0:www/py-django-configurations \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist \
+		${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel \
+		${PYTHON_PKGNAMEPREFIX}twine>=0:devel/py-twine \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm \
+		${PYTHON_PKGNAMEPREFIX}south>=0:databases/py-south
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		python
diff --git a/devel/py-pytest-localserver/Makefile b/devel/py-pytest-localserver/Makefile
index a3b81a0f05c3..089f82d0e3a6 100644
--- a/devel/py-pytest-localserver/Makefile
+++ b/devel/py-pytest-localserver/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Py.test Plugin to test server connections locally
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:${PORTSDIR}/www/py-werkzeug
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pytest-runner/Makefile b/devel/py-pytest-runner/Makefile
index 790c4b2111dc..5594148e95b9 100644
--- a/devel/py-pytest-runner/Makefile
+++ b/devel/py-pytest-runner/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Test support for pytest runner in setup.py
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>=0:${PORTSDIR}/devel/py-hgtools
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>=0:devel/py-hgtools
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pytest-timeout/Makefile b/devel/py-pytest-timeout/Makefile
index 872b781acbb1..1aea318ea13f 100644
--- a/devel/py-pytest-timeout/Makefile
+++ b/devel/py-pytest-timeout/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pytest plugin to abort hanging tests
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.6.4:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.6.4:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pytest-xdist/Makefile b/devel/py-pytest-xdist/Makefile
index 5f170dea02fb..8133b2efeddf 100644
--- a/devel/py-pytest-xdist/Makefile
+++ b/devel/py-pytest-xdist/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Py.test plugin for distributed testing and loop-on-failing modes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:${PORTSDIR}/devel/py-setuptools_scm
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}execnet>=1.1:${PORTSDIR}/sysutils/py-execnet \
-		${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}py>=1.4.22:${PORTSDIR}/devel/py-py
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pexpect>0:${PORTSDIR}/misc/py-pexpect
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet \
+		${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}py>=1.4.22:devel/py-py
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile
index 6e0ad168946b..98f5d2d89add 100644
--- a/devel/py-pytest/Makefile
+++ b/devel/py-pytest/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Simple powerful testing with Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.4.29:${PORTSDIR}/devel/py-py
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}pexpect>0:${PORTSDIR}/misc/py-pexpect \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:${PORTSDIR}/devel/py-pytest-xdist
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.4.29:devel/py-py
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-python-bugzilla/Makefile b/devel/py-python-bugzilla/Makefile
index 45457199bef4..b731239127f6 100644
--- a/devel/py-python-bugzilla/Makefile
+++ b/devel/py-python-bugzilla/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bugzilla XMLRPC access module
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-python-jenkins/Makefile b/devel/py-python-jenkins/Makefile
index ae55385f733c..2f6c20fc744c 100644
--- a/devel/py-python-jenkins/Makefile
+++ b/devel/py-python-jenkins/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Python bindings for the remote Jenkins API
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:${PORTSDIR}/devel/py-pbr \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-python-pcre/Makefile b/devel/py-python-pcre/Makefile
index 59acafafe84a..a5f7f8515a20 100644
--- a/devel/py-python-pcre/Makefile
+++ b/devel/py-python-pcre/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python PCRE bindings
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pcre>=6.0:${PORTSDIR}/devel/pcre
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	pcre>=6.0:devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pytools/Makefile b/devel/py-pytools/Makefile
index e374851b8bb0..fead676c4a91 100644
--- a/devel/py-pytools/Makefile
+++ b/devel/py-pytools/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Collection of tools for Python
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:${PORTSDIR}/devel/py-appdirs \
-		${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs \
+		${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index 5a019c3f883c..7506e0940044 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Collection of mature utilities for Python programmers
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}zbase32>=1.1.0:${PORTSDIR}/converters/zbase32
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}zbase32>=1.1.0:converters/zbase32
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pyvisa-py/Makefile b/devel/py-pyvisa-py/Makefile
index ebfabd1219b8..79bd82d67a47 100644
--- a/devel/py-pyvisa-py/Makefile
+++ b/devel/py-pyvisa-py/Makefile
@@ -19,9 +19,9 @@ DRIVERS_DESC=	Additional modules
 OPTIONS_GROUP_DRIVERS=	SERIAL USB
 
 SERIAL_DESC=		Access to devices via RS-232
-SERIAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serial>0:${PORTSDIR}/comms/py-serial
+SERIAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial
 
 USB_DESC=		Access to devices via USB
-USB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>0:${PORTSDIR}/devel/py-usb
+USB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyvisa/Makefile b/devel/py-pyvisa/Makefile
index 77cb31972269..0ab779d0d42e 100644
--- a/devel/py-pyvisa/Makefile
+++ b/devel/py-pyvisa/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Python VISA bindings for GPIB, RS232, and USB instruments
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyvisa-py>0:${PORTSDIR}/devel/py-pyvisa-py
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyvisa-py>0:devel/py-pyvisa-py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hgrecco
@@ -19,7 +19,7 @@ USE_PYTHON=	autoplist concurrent distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 144fc86a3497..22451a5bf90f 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtAssistant API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index 7a7b64ceb255..dc85de1c1ef3 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtCore API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.pre.mk>
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index d484f836ff82..293ddcf7407b 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDBus API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile
index 0988077c9903..102b057aac9d 100644
--- a/devel/py-qt4-dbussupport/Makefile
+++ b/devel/py-qt4-dbussupport/Makefile
@@ -28,9 +28,9 @@ PLIST_FILES=	%%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_MAJOR_VER} == 2
-PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus
+PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus
 .elif ${PYTHON_MAJOR_VER} == 3
-PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py3-dbus
+PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py3-dbus
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile
index 1e91da6deed0..4570088ef23b 100644
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDeclarative API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index 6042dc1f0ed7..3ddb7b1f9ddd 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDesigner API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
index 4cfa3f87542c..306cfdc90ba8 100644
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtHelp API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index 8e3b0aed1bea..91affa7b776f 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${QSCI2_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for QScintilla2 (PyQt4), QSci module
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2/distinfo
 DESTDIRNAME=	INSTALL_ROOT
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index 356af8fe1c2b..6b14fba9774c 100644
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtScript API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index a17efdc970e6..b9cd16dc014f 100644
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtScriptTools API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index 4b0986a6fff8..d84981c26f89 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtTest API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile
index 2fed8e4f2326..14ee561a9785 100644
--- a/devel/py-qt5-core/Makefile
+++ b/devel/py-qt5-core/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtCore API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 
 DEBUG_CONFIGURE_ON=	--debug --trace
 
diff --git a/devel/py-qt5-dbus/Makefile b/devel/py-qt5-dbus/Makefile
index 98fabb912feb..96038d60cb24 100644
--- a/devel/py-qt5-dbus/Makefile
+++ b/devel/py-qt5-dbus/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDBus API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-dbussupport/Makefile b/devel/py-qt5-dbussupport/Makefile
index 893a1a05b491..d3442d8b5546 100644
--- a/devel/py-qt5-dbussupport/Makefile
+++ b/devel/py-qt5-dbussupport/Makefile
@@ -27,9 +27,9 @@ PLIST_FILES=	%%PYTHON_SITELIBDIR%%/dbus/mainloop/pyqt5.so
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_MAJOR_VER} == 2
-PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus
+PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus
 .elif ${PYTHON_MAJOR_VER} == 3
-PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py3-dbus
+PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py3-dbus
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt5-designer/Makefile b/devel/py-qt5-designer/Makefile
index f145d8d0975e..4ebc921d1b3b 100644
--- a/devel/py-qt5-designer/Makefile
+++ b/devel/py-qt5-designer/Makefile
@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDesigner API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index d37ee592c62d..b729f15da718 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${QSCI2_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for QScintilla2 (PyQt5), QSci module
 
-LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt5/distinfo
 DESTDIRNAME=	INSTALL_ROOT
diff --git a/devel/py-qt5-test/Makefile b/devel/py-qt5-test/Makefile
index d391b9701804..17f319b33e17 100644
--- a/devel/py-qt5-test/Makefile
+++ b/devel/py-qt5-test/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtTest API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/devel/py-rauth/Makefile b/devel/py-rauth/Makefile
index 463d5ec8c2e4..4370fb4bdaa5 100644
--- a/devel/py-rauth/Makefile
+++ b/devel/py-rauth/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Python library for OAuth 1.0/a, 2.0, and Ofly consumers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:${PORTSDIR}/www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-rednose/Makefile b/devel/py-rednose/Makefile
index 494db5cab80f..f5e01d24c7c1 100644
--- a/devel/py-rednose/Makefile
+++ b/devel/py-rednose/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Coloured output for nosetests
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:${PORTSDIR}/devel/py-colorama \
-		${PYTHON_PKGNAMEPREFIX}termstyle>0:${PORTSDIR}/devel/py-termstyle
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama \
+		${PYTHON_PKGNAMEPREFIX}termstyle>0:devel/py-termstyle
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-repoze.tm2/Makefile b/devel/py-repoze.tm2/Makefile
index 785b5b71b77a..357acd3392eb 100644
--- a/devel/py-repoze.tm2/Makefile
+++ b/devel/py-repoze.tm2/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Zope-like transaction manager via WSGI middleware
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=1.0.0:${PORTSDIR}/devel/py-transaction
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=1.0.0:devel/py-transaction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.what-pylons/Makefile b/devel/py-repoze.what-pylons/Makefile
index 9bd9dccb4fce..d58e1f272dc0 100644
--- a/devel/py-repoze.what-pylons/Makefile
+++ b/devel/py-repoze.what-pylons/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	The repoze.what v1 plugin for Pylons/TG2 integration
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:${PORTSDIR}/www/py-pylons \
-		${PYTHON_PKGNAMEPREFIX}repoze.what>=0:${PORTSDIR}/devel/py-repoze.what \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:www/py-pylons \
+		${PYTHON_PKGNAMEPREFIX}repoze.what>=0:devel/py-repoze.what \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.what/Makefile b/devel/py-repoze.what/Makefile
index 5fcc63f6700a..ede04a546eba 100644
--- a/devel/py-repoze.what/Makefile
+++ b/devel/py-repoze.what/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Authorization for WSGI applications
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:${PORTSDIR}/www/py-paste \
-		${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:${PORTSDIR}/devel/py-repoze.who-testutil
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste \
+		${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:devel/py-repoze.who-testutil
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.who-friendlyform/Makefile b/devel/py-repoze.who-friendlyform/Makefile
index 64ea1eec8a0c..86c18bd1f85e 100644
--- a/devel/py-repoze.who-friendlyform/Makefile
+++ b/devel/py-repoze.who-friendlyform/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Collection of developer-friendly for repoze.who-powered
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:${PORTSDIR}/devel/py-repoze.who
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:${PORTSDIR}/devel/py-repoze.who
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \
+		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \
+		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-repoze.who-testutil/Makefile b/devel/py-repoze.who-testutil/Makefile
index f27812ce4c12..6ef32c5add4c 100644
--- a/devel/py-repoze.who-testutil/Makefile
+++ b/devel/py-repoze.who-testutil/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Test utilities for repoze.who-powered applications
 
 LICENSE=	BSD4CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:${PORTSDIR}/devel/py-repoze.who \
-		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:${PORTSDIR}/www/py-pastedeploy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who \
+		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:www/py-pastedeploy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.who/Makefile b/devel/py-repoze.who/Makefile
index 782730bf655c..32b0a9eae730 100644
--- a/devel/py-repoze.who/Makefile
+++ b/devel/py-repoze.who/Makefile
@@ -16,8 +16,8 @@ LICENSE_NAME=	Repoze License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.xmliter/Makefile b/devel/py-repoze.xmliter/Makefile
index 74dc817dd21d..e0fbd9775dad 100644
--- a/devel/py-repoze.xmliter/Makefile
+++ b/devel/py-repoze.xmliter/Makefile
@@ -14,8 +14,8 @@ LICENSE_NAME=	Repoze License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}future>0:${PORTSDIR}/devel/py-future
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-responses/Makefile b/devel/py-responses/Makefile
index 45f3cc03a8b7..4dc94779d389 100644
--- a/devel/py-responses/Makefile
+++ b/devel/py-responses/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Utility library for mocking out the requests Python library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.0.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}cookies>0:${PORTSDIR}/www/py-cookies
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.0.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}cookies>0:www/py-cookies
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-riak_pb/Makefile b/devel/py-riak_pb/Makefile
index ac80b85b9c85..78d722f49b5e 100644
--- a/devel/py-riak_pb/Makefile
+++ b/devel/py-riak_pb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Riak Protocol Buffers Messages
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:${PORTSDIR}/devel/py-protobuf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:devel/py-protobuf
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-robotframework-pabot/Makefile b/devel/py-robotframework-pabot/Makefile
index 4e6a84f5ed4f..c0f4943f0a28 100644
--- a/devel/py-robotframework-pabot/Makefile
+++ b/devel/py-robotframework-pabot/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Parallel executor for Robot Framework test cases
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework \
-		${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:${PORTSDIR}/devel/py-robotremoteserver
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \
+		${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:devel/py-robotremoteserver
 
 NO_ARCH=	yes
 USES=		python:-2.7
diff --git a/devel/py-robotframework-ride/Makefile b/devel/py-robotframework-ride/Makefile
index 8a5ef4ecf2b4..1301651e892c 100644
--- a/devel/py-robotframework-ride/Makefile
+++ b/devel/py-robotframework-ride/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Test data editor for Robot Framework
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework \
-		${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:${PORTSDIR}/devel/py-robotframework-selenium2library \
-		${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \
+		${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:devel/py-robotframework-selenium2library \
+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments
 
 NO_ARCH=	yes
 USES=		python:-2.7
diff --git a/devel/py-robotframework-selenium2library/Makefile b/devel/py-robotframework-selenium2library/Makefile
index 323918970470..1a9e6f812226 100644
--- a/devel/py-robotframework-selenium2library/Makefile
+++ b/devel/py-robotframework-selenium2library/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Web testing library for Robot Framework
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework \
-		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:${PORTSDIR}/devel/py-decorator
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \
+		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-robotremoteserver/Makefile b/devel/py-robotremoteserver/Makefile
index 9ffa2926c48c..1fd851b458d3 100644
--- a/devel/py-robotremoteserver/Makefile
+++ b/devel/py-robotremoteserver/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Python Remote Server for Robot Framework
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-roxlib/Makefile b/devel/py-roxlib/Makefile
index c93c372462bc..c34983ef3eed 100644
--- a/devel/py-roxlib/Makefile
+++ b/devel/py-roxlib/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python libraries for ROX
 USES=		python tar:bzip2
 USE_GNOME=	pygtk2:run
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
diff --git a/devel/py-rq/Makefile b/devel/py-rq/Makefile
index 007d6b0d0f4e..6bc663125fe5 100644
--- a/devel/py-rq/Makefile
+++ b/devel/py-rq/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple library for creating background jobs, and processing them
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.7:${PORTSDIR}/databases/py-redis \
-		${PYTHON_PKGNAMEPREFIX}click>=4.1:${PORTSDIR}/devel/py-click
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.7:databases/py-redis \
+		${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-rtree/Makefile b/devel/py-rtree/Makefile
index 1c4cb143f06b..f56d7264d815 100644
--- a/devel/py-rtree/Makefile
+++ b/devel/py-rtree/Makefile
@@ -13,7 +13,7 @@ COMMENT=	R-Tree Spatial Index For Python GIS
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS+=	${LOCALBASE}/include/spatialindex/SpatialIndex.h:${PORTSDIR}/devel/spatialindex
+BUILD_DEPENDS+=	${LOCALBASE}/include/spatialindex/SpatialIndex.h:devel/spatialindex
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile
index 3c78d6343626..a658f68fe960 100644
--- a/devel/py-ruledispatch/Makefile
+++ b/devel/py-ruledispatch/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Rule-based Dispatching and Generic Functions
 LICENSE=	PSFL ZPL21
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Extremes>=1.1:${PORTSDIR}/devel/py-extremes \
-		${PYTHON_PKGNAMEPREFIX}PyProtocols>=1.0.a0.r2302:${PORTSDIR}/devel/py-protocols-devel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Extremes>=1.1:devel/py-extremes \
+		${PYTHON_PKGNAMEPREFIX}PyProtocols>=1.0.a0.r2302:devel/py-protocols-devel
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-sanetime/Makefile b/devel/py-sanetime/Makefile
index b07db677ea6b..00912658aa9e 100644
--- a/devel/py-sanetime/Makefile
+++ b/devel/py-sanetime/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Sane date/time Python interface, with Django support
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2010:${PORTSDIR}/devel/py-pytz
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2:${PORTSDIR}/devel/py-unittest2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2010:devel/py-pytz
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2:devel/py-unittest2
 
 OPTIONS_DEFINE=	TESTS
 TESTS_DESC=	Include tools for unit tests
diff --git a/devel/py-scripttest/Makefile b/devel/py-scripttest/Makefile
index 9fe6d09ec225..ef3cfa8380d9 100644
--- a/devel/py-scripttest/Makefile
+++ b/devel/py-scripttest/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Helper to test command-line scripts
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-selection/Makefile b/devel/py-selection/Makefile
index e227b88bbc29..80d135ab9b94 100644
--- a/devel/py-selection/Makefile
+++ b/devel/py-selection/Makefile
@@ -11,9 +11,9 @@ COMMENT=	API to extract content from HTML & XML documents
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}weblib>0:${PORTSDIR}/devel/py-weblib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-semantic_version/Makefile b/devel/py-semantic_version/Makefile
index f9470dbb8fd7..5d60ff846b27 100644
--- a/devel/py-semantic_version/Makefile
+++ b/devel/py-semantic_version/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python library provides a few tools to handle SemVer in Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 OPTIONS_DEFINE=	TESTS
 
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 1e9cd7ab9234..4559a07ecc18 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -32,9 +32,9 @@ SUB_LIST+=	PYTHON_VER=${PYTHON_VER}
 
 # These create dependency loops in redports/poudriere, because setuptools
 # is currently an explicit BUILD & RUN dependency in Uses/python.mk.
-#TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+#TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 #.if ${PYTHON_REL} < 3300
-#TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+#TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 #.endif
 
 post-install:
diff --git a/devel/py-setuptools_darcs/Makefile b/devel/py-setuptools_darcs/Makefile
index 1ab0ec40e00d..6fe67b2ab5d3 100644
--- a/devel/py-setuptools_darcs/Makefile
+++ b/devel/py-setuptools_darcs/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Setuptools plugin for darcs
 
-BUILD_DEPENDS=		darcsver:${PORTSDIR}/devel/py-darcsver
+BUILD_DEPENDS=		darcsver:devel/py-darcsver
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-shapely/Makefile b/devel/py-shapely/Makefile
index c6ce3ce00977..6cc58efb4a1e 100644
--- a/devel/py-shapely/Makefile
+++ b/devel/py-shapely/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python Package for Manipulation 2D Geospatial Geometry
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libgeos_c.so:${PORTSDIR}/graphics/geos
+LIB_DEPENDS=	libgeos_c.so:graphics/geos
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile
index e3a353a09d0c..c64589d4e566 100644
--- a/devel/py-simpy/Makefile
+++ b/devel/py-simpy/Makefile
@@ -21,7 +21,7 @@ TKINTER_DESC=	py-tkinter for plot
 
 PORTDOCS=	*
 
-TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/py-six/Makefile b/devel/py-six/Makefile
index f5d410dc691a..05108f2f6b3d 100644
--- a/devel/py-six/Makefile
+++ b/devel/py-six/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python 2 and 3 compatibility utilities
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-snack/Makefile b/devel/py-snack/Makefile
index 91b68dc1fdd8..7b1c8665a649 100644
--- a/devel/py-snack/Makefile
+++ b/devel/py-snack/Makefile
@@ -14,9 +14,9 @@ LICENSE=	GPLv2
 
 BROKEN=		conflicts with devel/newt
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2 \
-		libpopt.so:${PORTSDIR}/devel/popt \
-		libnewt.so:${PORTSDIR}/devel/newt
+LIB_DEPENDS=	libslang.so:devel/libslang2 \
+		libpopt.so:devel/popt \
+		libnewt.so:devel/newt
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/devel/py-snackwich/Makefile b/devel/py-snackwich/Makefile
index f95832e2c8a4..6f727525bab8 100644
--- a/devel/py-snackwich/Makefile
+++ b/devel/py-snackwich/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Configuration-based Console UI Framework
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snack>0:${PORTSDIR}/devel/py-snack
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snack>0:devel/py-snack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile
index e2b10a4e1095..7947e1efb857 100644
--- a/devel/py-spyder/Makefile
+++ b/devel/py-spyder/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Scientific PYthon Development EnviRonment, an alternative to IDLE
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
+		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \
+		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network
 
 USES=		desktop-file-utils python
 USE_PYTHON=	autoplist distutils
@@ -48,22 +48,22 @@ SCIPY_DESC=	Signal/image processing
 SPHINX_DESC=	Rich text help on the Object Inspector
 SYMPY_DESC=	Symbolic mathematics in the IPython Console
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:${PORTSDIR}/textproc/py-sphinx
-IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=1.0:${PORTSDIR}/devel/ipython \
-	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:${PORTSDIR}/net/py-pyzmq
-JEDI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jedi>=0.8.1:${PORTSDIR}/devel/py-jedi
-MATPLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:${PORTSDIR}/math/py-matplotlib
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx
+IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython \
+	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq
+JEDI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jedi>=0.8.1:devel/py-jedi
+MATPLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib
 NUMPY_RUN_DEPENDS=	${PYNUMPY}
-PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:${PORTSDIR}/math/py-pandas
-PEP8_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pep8>=0.6:${PORTSDIR}/devel/pep8
-PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.3:${PORTSDIR}/sysutils/py-psutil
-PYFLAKES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:${PORTSDIR}/devel/py-pyflakes
-PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:${PORTSDIR}/textproc/py-pygments
-PYLINT_RUN_DEPENDS=	pylint${PYTHON_PKGNAMESUFFIX}>=0.25:${PORTSDIR}/devel/pylint
-ROPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:${PORTSDIR}/devel/py-rope
-SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy
+PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas
+PEP8_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pep8>=0.6:devel/pep8
+PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil
+PYFLAKES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes
+PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments
+PYLINT_RUN_DEPENDS=	pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint
+ROPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope
+SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
 SPHINX_RUN_DEPENDS=	${DOCS_BUILD_DEPENDS}
-SYMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:${PORTSDIR}/math/py-sympy
+SYMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:math/py-sympy
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|'linux'|'${OPSYS:tl}'|" \
diff --git a/devel/py-sqlcc/Makefile b/devel/py-sqlcc/Makefile
index 884ea84869da..d7c2cdf357a3 100644
--- a/devel/py-sqlcc/Makefile
+++ b/devel/py-sqlcc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python SQL Command Composer
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pythk>=0:${PORTSDIR}/devel/pythk
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pythk>=0:devel/pythk
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-statgrab/Makefile b/devel/py-statgrab/Makefile
index 8af0235f87de..87810e68a88a 100644
--- a/devel/py-statgrab/Makefile
+++ b/devel/py-statgrab/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Set of Python bindings for libstatgrab
 
-LIB_DEPENDS=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
+LIB_DEPENDS=	libstatgrab.so:devel/libstatgrab
 
 USES=		pkgconfig python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile
index 8e5cffc427d1..5dbeeab32186 100644
--- a/devel/py-stevedore/Makefile
+++ b/devel/py-stevedore/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Manage dynamic plugins for Python applications
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.3.0:${PORTSDIR}/devel/py-pbr # <2.0
-RUN_DEPENDS=	${PKGNAMEPREFIX}argparse>=1.2.1:${PORTSDIR}/devel/py-argparse \
-		${PKGNAMEPREFIX}pbr>=1.3.0:${PORTSDIR}/devel/py-pbr \
-		${PKGNAMEPREFIX}six>=1.9.0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.3.0:devel/py-pbr # <2.0
+RUN_DEPENDS=	${PKGNAMEPREFIX}argparse>=1.2.1:devel/py-argparse \
+		${PKGNAMEPREFIX}pbr>=1.3.0:devel/py-pbr \
+		${PKGNAMEPREFIX}six>=1.9.0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-stsci.distutils/Makefile b/devel/py-stsci.distutils/Makefile
index 7ce846e5d65d..4a32abf121f6 100644
--- a/devel/py-stsci.distutils/Makefile
+++ b/devel/py-stsci.distutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Packaging utilities used by some of STScI's packages
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}d2to1>0:${PORTSDIR}/devel/py-d2to1
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}d2to1>0:devel/py-d2to1
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-subvertpy/Makefile b/devel/py-subvertpy/Makefile
index c04496d9d630..9159f5db1a3b 100644
--- a/devel/py-subvertpy/Makefile
+++ b/devel/py-subvertpy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python bindings for subversion
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS+=	svn:devel/subversion
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
diff --git a/devel/py-sure/Makefile b/devel/py-sure/Makefile
index c5211103675a..a4c88430cd35 100644
--- a/devel/py-sure/Makefile
+++ b/devel/py-sure/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Utility belt for automated testing in Python for Python
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python:2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index 87b5501ff234..514243531649 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Hierarchical database for Python
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${LOCALBASE}/bin/cython:${PORTSDIR}/lang/cython \
-		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:${PORTSDIR}/math/py-numexpr
-LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libucl.so:${PORTSDIR}/archivers/ucl
+		${LOCALBASE}/bin/cython:lang/cython \
+		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr
+LIB_DEPENDS=	libhdf5.so:science/hdf5 \
+		liblzo2.so:archivers/lzo2 \
+		libucl.so:archivers/ucl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		fortran python
@@ -27,7 +27,7 @@ PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		PYREX EXAMPLES
 PYREX_DESC=		Use code generated by Pyrex to build
-PYREX_BUILD_DEPENDS=	pyrex>0:${PORTSDIR}/devel/pyrex
+PYREX_BUILD_DEPENDS=	pyrex>0:devel/pyrex
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/setup.py
diff --git a/devel/py-tarantool-queue/Makefile b/devel/py-tarantool-queue/Makefile
index 982ba1ba6294..40f70e940e8f 100644
--- a/devel/py-tarantool-queue/Makefile
+++ b/devel/py-tarantool-queue/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python bindings for Tarantool queue
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tarantool>=0:${PORTSDIR}/databases/py-tarantool \
-		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:${PORTSDIR}/devel/py-msgpack-python
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tarantool>=0:databases/py-tarantool \
+		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-tempora/Makefile b/devel/py-tempora/Makefile
index 90fde28d4d34..fa66723f6beb 100644
--- a/devel/py-tempora/Makefile
+++ b/devel/py-tempora/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Objects and routines pertaining to date and time
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:${PORTSDIR}/devel/py-setuptools_scm
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-tempstorage/Makefile b/devel/py-tempstorage/Makefile
index 012b60aaa966..a535fc2b1362 100644
--- a/devel/py-tempstorage/Makefile
+++ b/devel/py-tempstorage/Makefile
@@ -13,8 +13,8 @@ COMMENT=	RAM-based storage for ZODB
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile
index dac5912590d2..190329401f04 100644
--- a/devel/py-testtools/Makefile
+++ b/devel/py-testtools/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Extensions to the Python library's unit testing framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}extras>=0.0.3:${PORTSDIR}/devel/py-extras
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}extras>=0.0.3:devel/py-extras
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-tinyarray/Makefile b/devel/py-tinyarray/Makefile
index eca2cb09ac64..e224be966e55 100644
--- a/devel/py-tinyarray/Makefile
+++ b/devel/py-tinyarray/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Arrays of numbers for Python, optimized for small sizes
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile
index cd6697ab330f..dd20fd6f06fb 100644
--- a/devel/py-tox/Makefile
+++ b/devel/py-tox/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Virtualenv-based automation of test activities
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:${PORTSDIR}/devel/py-virtualenv \
-		${PYTHON_PKGNAMEPREFIX}py>=1.4.17:${PORTSDIR}/devel/py-py \
-		${PYTHON_PKGNAMEPREFIX}pluggy>0:${PORTSDIR}/devel/py-pluggy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:devel/py-virtualenv \
+		${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py-py \
+		${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox \
-		${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:${PORTSDIR}/devel/py-pytest-timeout
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox \
+		${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
@@ -29,7 +29,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != 2.7 && ${PYTHON_VER} < 3.2
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse
 .endif
 
 do-test:
diff --git a/devel/py-transaction/Makefile b/devel/py-transaction/Makefile
index 8e9d0c3816f9..3954fa44c953 100644
--- a/devel/py-transaction/Makefile
+++ b/devel/py-transaction/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Transaction management for Python
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-trollius/Makefile b/devel/py-trollius/Makefile
index a22d8dcaa8c6..4730f7e49da6 100644
--- a/devel/py-trollius/Makefile
+++ b/devel/py-trollius/Makefile
@@ -20,10 +20,10 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}futures>0:${PORTSDIR}/devel/py-futures
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 .if ${PYTHON_REL} < 3300
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 .endif
 
diff --git a/devel/py-turbocheetah/Makefile b/devel/py-turbocheetah/Makefile
index eea6658b798e..ded1fc1030f2 100644
--- a/devel/py-turbocheetah/Makefile
+++ b/devel/py-turbocheetah/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	TurboGears plugin to support use of Cheetah templates
 
-RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah
+RUN_DEPENDS=	cheetah:devel/py-cheetah
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-turbojson/Makefile b/devel/py-turbojson/Makefile
index 6f646d082480..fce3c3772050 100644
--- a/devel/py-turbojson/Makefile
+++ b/devel/py-turbojson/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Python template plugin for TurboGears that supports json
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0:${PORTSDIR}/devel/py-PEAK-Rules
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0:${PORTSDIR}/devel/py-PEAK-Rules
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0:devel/py-PEAK-Rules
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0:devel/py-PEAK-Rules
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-turbojson11/Makefile b/devel/py-turbojson11/Makefile
index 560aeddbd3f5..6a24c5e349ff 100644
--- a/devel/py-turbojson11/Makefile
+++ b/devel/py-turbojson11/Makefile
@@ -13,9 +13,9 @@ PKGNAMESUFFIX=	11
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python template plugin for TurboGears that supports json
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}RuleDispatch>=0.5.a0.r2306:${PORTSDIR}/devel/py-ruledispatch \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}RuleDispatch>=0.5.a0.r2306:devel/py-ruledispatch \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-turbokid/Makefile b/devel/py-turbokid/Makefile
index 9e922b6c14df..f75de7707f3e 100644
--- a/devel/py-turbokid/Makefile
+++ b/devel/py-turbokid/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python template plugin that supports Kid templates
 
-RUN_DEPENDS=	kid:${PORTSDIR}/devel/py-kid
+RUN_DEPENDS=	kid:devel/py-kid
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-tw.forms/Makefile b/devel/py-tw.forms/Makefile
index 0a0ec528ed2e..1667c1b5d7ab 100644
--- a/devel/py-tw.forms/Makefile
+++ b/devel/py-tw.forms/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Web Widgets for building and validating forms
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:${PORTSDIR}/devel/py-ToscaWidgets \
-		${PYTHON_PKGNAMEPREFIX}formencode>=0:${PORTSDIR}/www/py-formencode
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:${PORTSDIR}/devel/py-ToscaWidgets \
-		${PYTHON_PKGNAMEPREFIX}formencode>=0:${PORTSDIR}/www/py-formencode
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets \
+		${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets \
+		${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-twine/Makefile b/devel/py-twine/Makefile
index 0579a9ca64a3..61a00b4fbcf7 100644
--- a/devel/py-twine/Makefile
+++ b/devel/py-twine/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Collection of utilities for interacting with PyPI
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}clint>=0:${PORTSDIR}/devel/py-clint \
-		${PYTHON_PKGNAMEPREFIX}pkginfo>=0:${PORTSDIR}/sysutils/py-pkginfo \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:${PORTSDIR}/www/py-requests-toolbelt \
-		${PYTHON_PKGNAMEPREFIX}setuptools27>=0:${PORTSDIR}/devel/py-setuptools27
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}clint>=0:devel/py-clint \
+		${PYTHON_PKGNAMEPREFIX}pkginfo>=0:sysutils/py-pkginfo \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:www/py-requests-toolbelt \
+		${PYTHON_PKGNAMEPREFIX}setuptools27>=0:devel/py-setuptools27
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index ae7672156594..25ded442669b 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Asynchronous networking framework written in Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils
diff --git a/devel/py-twisted152/Makefile b/devel/py-twisted152/Makefile
index f41695780156..ef8f5e9b97e0 100644
--- a/devel/py-twisted152/Makefile
+++ b/devel/py-twisted152/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Metaport of Twisted, an event-driven networking engine
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:${PORTSDIR}/devel/py-twistedCore
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:devel/py-twistedCore
 
 USES=		metaport python:2
 
@@ -27,14 +27,14 @@ PAIR_DESC=	Twisted Pair can do low level TCP work
 RUNNER_DESC=	Process management
 WEB_DESC=	HTTP protocol
 WORDS_DESC=	Chat and Instant Messaging
-CONCH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedConch>=${PORTVERSION}:${PORTSDIR}/security/py-twistedConch
-LORE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedLore>=${PORTVERSION}:${PORTSDIR}/textproc/py-twistedLore
-MAIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedMail>=${PORTVERSION}:${PORTSDIR}/mail/py-twistedMail
-NAMES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNames>=${PORTVERSION}:${PORTSDIR}/dns/py-twistedNames
-NEWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNews>=${PORTVERSION}:${PORTSDIR}/news/py-twistedNews
-PAIR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedPair>=${PORTVERSION}:${PORTSDIR}/net/py-twistedPair
-RUNNER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedRunner>=${PORTVERSION}:${PORTSDIR}/devel/py-twistedRunner
-WEB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWeb>=${PORTVERSION}:${PORTSDIR}/www/py-twistedWeb
-WORDS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWords>=${PORTVERSION}:${PORTSDIR}/net-im/py-twistedWords
+CONCH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedConch>=${PORTVERSION}:security/py-twistedConch
+LORE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedLore>=${PORTVERSION}:textproc/py-twistedLore
+MAIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedMail>=${PORTVERSION}:mail/py-twistedMail
+NAMES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNames>=${PORTVERSION}:dns/py-twistedNames
+NEWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNews>=${PORTVERSION}:news/py-twistedNews
+PAIR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedPair>=${PORTVERSION}:net/py-twistedPair
+RUNNER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedRunner>=${PORTVERSION}:devel/py-twistedRunner
+WEB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWeb>=${PORTVERSION}:www/py-twistedWeb
+WORDS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWords>=${PORTVERSION}:net-im/py-twistedWords
 
 .include <bsd.port.mk>
diff --git a/devel/py-twistedCore/Makefile b/devel/py-twistedCore/Makefile
index 5bf63f2ac709..0ef7ac821b57 100644
--- a/devel/py-twistedCore/Makefile
+++ b/devel/py-twistedCore/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Asynchronous networking framework for Python (Core Module)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	VERIFY
 OPTIONS_DEFAULT=VERIFY
 
 VERIFY_DESC=		Server (SNI) and Service Verification Support (RFC6125+)
-VERIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}service_identity>=0:${PORTSDIR}/security/py-service_identity
+VERIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity
 
 # - Note that Twisted ships with some graphical examples and clients that
 #   require PyGNOME to run.  These are not central to the functioning of
diff --git a/devel/py-txaio/Makefile b/devel/py-txaio/Makefile
index 036885225b76..ea7e4e536b20 100644
--- a/devel/py-txaio/Makefile
+++ b/devel/py-txaio/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Compatibility API between asyncio/Twisted/Trollius
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-tzlocal/Makefile b/devel/py-tzlocal/Makefile
index a296b80c6c3c..9a3a75467651 100644
--- a/devel/py-tzlocal/Makefile
+++ b/devel/py-tzlocal/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Returns the tzinfo object for the local timezone
 
 LICENSE=	CC0-1.0
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 OPTIONS_DEFINE=		TEST
 OPTIONS_DEFAULT=	TEST
diff --git a/devel/py-ua_parser/Makefile b/devel/py-ua_parser/Makefile
index 9d5ae2a068d9..3c07bc6c20f8 100644
--- a/devel/py-ua_parser/Makefile
+++ b/devel/py-ua_parser/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python port of Browserscope's user agent parser
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml
-RUN_DEPENDS=	${LOCALBASE}/share/ua_parser/regexes.yaml:${PORTSDIR}/devel/ua_parser-core \
-		${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml
+RUN_DEPENDS=	${LOCALBASE}/share/ua_parser/regexes.yaml:devel/ua_parser-core \
+		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index 48fea587130b..94120a9c69d8 100644
--- a/devel/py-unittest2/Makefile
+++ b/devel/py-unittest2/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	New features in unittest backported to Python 2.4+
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/devel/py-unpaddedbase64/Makefile b/devel/py-unpaddedbase64/Makefile
index 372f05236299..ed4920e99217 100644
--- a/devel/py-unpaddedbase64/Makefile
+++ b/devel/py-unpaddedbase64/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Unpadded Base64
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-update_checker/Makefile b/devel/py-update_checker/Makefile
index dc002f4f5200..52a2095186cc 100644
--- a/devel/py-update_checker/Makefile
+++ b/devel/py-update_checker/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python module that will check for package updates
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-urwidtrees/Makefile b/devel/py-urwidtrees/Makefile
index a4c436241a32..dfa14e502fb0 100644
--- a/devel/py-urwidtrees/Makefile
+++ b/devel/py-urwidtrees/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Tree widgets for py-urwid
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:${PORTSDIR}/devel/py-urwid
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:${PORTSDIR}/devel/py-urwid
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pazz
diff --git a/devel/py-user_agents/Makefile b/devel/py-user_agents/Makefile
index a1560380f666..97604073b486 100644
--- a/devel/py-user_agents/Makefile
+++ b/devel/py-user_agents/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:S/_/-/}-${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Python library to identify devices using User-Agent string
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ua_parser/__init__.py:${PORTSDIR}/devel/py-ua_parser
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ua_parser/__init__.py:devel/py-ua_parser
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-vcrpy/Makefile b/devel/py-vcrpy/Makefile
index 7852f010e9ea..bf482afc0850 100644
--- a/devel/py-vcrpy/Makefile
+++ b/devel/py-vcrpy/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Automatically mock HTTP interactions to simplify and speed up testing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}wrapt>0:${PORTSDIR}/devel/py-wrapt \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:${PORTSDIR}/devel/py-pytest-localserver
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -32,8 +32,8 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}contextlib2>0:${PORTSDIR}/devel/py-contextlib2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2
 .endif
 
 post-patch:
diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index 7d3035d49794..dbe5d5495955 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -10,12 +10,12 @@ COMMENT=	Tool for creating isolated Python environments
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-virtualenvwrapper/Makefile b/devel/py-virtualenvwrapper/Makefile
index 2ae8b1b84dd8..1864ebf9b284 100644
--- a/devel/py-virtualenvwrapper/Makefile
+++ b/devel/py-virtualenvwrapper/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Set of extensions to virtualenv
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PKGNAMEPREFIX}stevedore>0:${PORTSDIR}/devel/py-stevedore \
-		${PKGNAMEPREFIX}virtualenv>0:${PORTSDIR}/devel/py-virtualenv \
-		${PKGNAMEPREFIX}virtualenv-clone>0:${PORTSDIR}/devel/py-virtualenv-clone
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr
+RUN_DEPENDS=	${PKGNAMEPREFIX}stevedore>0:devel/py-stevedore \
+		${PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv \
+		${PKGNAMEPREFIX}virtualenv-clone>0:devel/py-virtualenv-clone
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:${PORTSDIR}/textproc/py-sphinxcontrib-bitbucket
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
+			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index ff9c1d6d3080..12af9e6b24a6 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Python API library to monitor file system events
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}argh>=0.24.1:${PORTSDIR}/devel/py-argh \
-		${PKGNAMEPREFIX}pathtools>=0.1.2:${PORTSDIR}/devel/py-pathtools \
-		${PKGNAMEPREFIX}yaml>=3.10:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PKGNAMEPREFIX}argh>=0.24.1:devel/py-argh \
+		${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools \
+		${PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml
 
-DOCS_BUILD_DEPENDS=	${PKGNAMEPREFIX}pathtools>=0.1.2:${PORTSDIR}/devel/py-pathtools \
-		${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools \
+		${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 GH_ACCOUNT=	gorakhargosh
diff --git a/devel/py-weblib/Makefile b/devel/py-weblib/Makefile
index 572cc103a08d..5086a8232794 100644
--- a/devel/py-weblib/Makefile
+++ b/devel/py-weblib/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Set of tools for web scraping projects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytils>0:${PORTSDIR}/russian/py-pytils \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}user_agent>0:${PORTSDIR}/www/py-user_agent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytils>0:russian/py-pytils \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index 5eed7f8e6e3a..f67e3bc5d230 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -16,12 +16,12 @@ LICENSE=	MIT
 OPTIONS_DEFINE=	PIP SIGNATURE
 
 PIP_DESC=	Use pip to install wheels
-PIP_RUN_DEPENDS=	pip:${PORTSDIR}/devel/py-pip
+PIP_RUN_DEPENDS=	pip:devel/py-pip
 
 SIGNATURE_DESC=	Enable digital signature of wheels
-SIGNATURE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:${PORTSDIR}/devel/py-dirspec \
-			${PYTHON_PKGNAMEPREFIX}keyring>=1.3:${PORTSDIR}/security/py-keyring \
-			${PYTHON_PKGNAMEPREFIX}xdg>=0.25:${PORTSDIR}/devel/py-xdg
+SIGNATURE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:devel/py-dirspec \
+			${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring \
+			${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-xattr/Makefile b/devel/py-xattr/Makefile
index f3fc2985c2ac..7cdfc4cb35cd 100644
--- a/devel/py-xattr/Makefile
+++ b/devel/py-xattr/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python wrapper for extended filesystem attributes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:${PORTSDIR}/devel/py-cffi
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-xcaplib/Makefile b/devel/py-xcaplib/Makefile
index 8e2fa929f45f..e16752626c5b 100644
--- a/devel/py-xcaplib/Makefile
+++ b/devel/py-xcaplib/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Python XCAP client library
 LICENSE=	LGPL20 LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}application>=1.1.5:${PORTSDIR}/devel/py-application
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}application>=1.1.5:devel/py-application
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python twisted
diff --git a/devel/py-xmltodict/Makefile b/devel/py-xmltodict/Makefile
index 83008b75c3f5..0c0f4365d1d9 100644
--- a/devel/py-xmltodict/Makefile
+++ b/devel/py-xmltodict/Makefile
@@ -12,7 +12,7 @@ COMMENT=	XML parser that returns python dictionaries
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose:${PORTSDIR}/devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-yaml/Makefile b/devel/py-yaml/Makefile
index ddd3fec319e4..c642be0dcb76 100644
--- a/devel/py-yaml/Makefile
+++ b/devel/py-yaml/Makefile
@@ -33,7 +33,7 @@ PYDISTUTILS_SETUP+=		--with-libyaml
 PYDISTUTILS_BUILD_TARGET=	build_ext
 PYDISTUTILS_BUILDARGS+=		--include-dirs=${LOCALBASE}/include \
 				--library-dirs=${LOCALBASE}/lib
-LIB_DEPENDS+=			libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS+=			libyaml.so:textproc/libyaml
 .else
 PYDISTUTILS_SETUP+=		--without-libyaml
 .endif
diff --git a/devel/py-yandex-money-sdk/Makefile b/devel/py-yandex-money-sdk/Makefile
index daa2f52e1d61..436ff2dffa15 100644
--- a/devel/py-yandex-money-sdk/Makefile
+++ b/devel/py-yandex-money-sdk/Makefile
@@ -11,9 +11,9 @@ COMMENT=	SDK yandex money API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.4.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}future>0:${PORTSDIR}/devel/py-future \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.4.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-yum-metadata-parser/Makefile b/devel/py-yum-metadata-parser/Makefile
index 4eb7cb122b57..408ba3a925d0 100644
--- a/devel/py-yum-metadata-parser/Makefile
+++ b/devel/py-yum-metadata-parser/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	afb@rpm5.org
 COMMENT=	Fast metadata parser for yum
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libglib-2.0.so:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libsqlite3.so:databases/sqlite3 \
+		libglib-2.0.so:devel/glib20
 
 USES=		pkgconfig python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-z3c.autoinclude/Makefile b/devel/py-z3c.autoinclude/Makefile
index f23b27859f95..ff6e617fe6f3 100644
--- a/devel/py-z3c.autoinclude/Makefile
+++ b/devel/py-z3c.autoinclude/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Automatically include ZCML
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:${PORTSDIR}/devel/py-zc.buildout
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:devel/py-zc.buildout
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-z3c.batching/Makefile b/devel/py-z3c.batching/Makefile
index 045c4aa12bb6..bf87de645757 100644
--- a/devel/py-z3c.batching/Makefile
+++ b/devel/py-z3c.batching/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple sequence batching
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-z3c.caching/Makefile b/devel/py-z3c.caching/Makefile
index d0b24f907f6d..1194eca0c762 100644
--- a/devel/py-z3c.caching/Makefile
+++ b/devel/py-z3c.caching/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Caching infrastructure for web apps
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-z3c.form/Makefile b/devel/py-z3c.form/Makefile
index f068cd7c47fb..aabbaece46a3 100644
--- a/devel/py-z3c.form/Makefile
+++ b/devel/py-z3c.form/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Advanced form and widget framework for Zope 3
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:${PORTSDIR}/devel/py-zope.browserresource \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6.0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.site>0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6.0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-z3c.formwidget.query/Makefile b/devel/py-z3c.formwidget.query/Makefile
index 2d8ddce742ef..62e46595caf0 100644
--- a/devel/py-z3c.formwidget.query/Makefile
+++ b/devel/py-z3c.formwidget.query/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Source query widget for z3c.form
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-z3c.zcmlhook/Makefile b/devel/py-z3c.zcmlhook/Makefile
index 9a55d461aa23..bf2f66e14d10 100644
--- a/devel/py-z3c.zcmlhook/Makefile
+++ b/devel/py-z3c.zcmlhook/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Easily hook into the ZCML processing machinery
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zExceptions/Makefile b/devel/py-zExceptions/Makefile
index 501eba1b21ab..c058a561658b 100644
--- a/devel/py-zExceptions/Makefile
+++ b/devel/py-zExceptions/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Contains common exceptions used in Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zLOG/Makefile b/devel/py-zLOG/Makefile
index 6a3b3848e470..f6ea6e16ed71 100644
--- a/devel/py-zLOG/Makefile
+++ b/devel/py-zLOG/Makefile
@@ -13,7 +13,7 @@ COMMENT=	General logging facility
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/devel/py-zope.annotation/Makefile b/devel/py-zope.annotation/Makefile
index 78a20a8d155d..7cfcf43bccd4 100644
--- a/devel/py-zope.annotation/Makefile
+++ b/devel/py-zope.annotation/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Object annotation mechanism
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.applicationcontrol/Makefile b/devel/py-zope.app.applicationcontrol/Makefile
index 4690757b2e54..eb832c0353cf 100644
--- a/devel/py-zope.app.applicationcontrol/Makefile
+++ b/devel/py-zope.app.applicationcontrol/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Zope application control
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:${PORTSDIR}/devel/py-zope.applicationcontrol \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.appsetup/Makefile b/devel/py-zope.app.appsetup/Makefile
index 57f5a739d7a7..e7f962bd3efa 100644
--- a/devel/py-zope.app.appsetup/Makefile
+++ b/devel/py-zope.app.appsetup/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Zope app setup helper
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.error>=0:${PORTSDIR}/devel/py-zope.error \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=3.6.0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.session>=0:${PORTSDIR}/security/py-zope.session \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=3.6.0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.basicskin/Makefile b/devel/py-zope.app.basicskin/Makefile
index 1dcf999692d7..ea2aba0207ae 100644
--- a/devel/py-zope.app.basicskin/Makefile
+++ b/devel/py-zope.app.basicskin/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Zope ZMI Basic Skin
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.broken/Makefile b/devel/py-zope.app.broken/Makefile
index c6b12bab45c6..3efd2c5d3923 100644
--- a/devel/py-zope.app.broken/Makefile
+++ b/devel/py-zope.app.broken/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Zope Broken (ZODB) Object Support
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.broken>=0:${PORTSDIR}/devel/py-zope.broken \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.cache/Makefile b/devel/py-zope.app.cache/Makefile
index fd6135cb3c52..934cfb3839fd 100644
--- a/devel/py-zope.app.cache/Makefile
+++ b/devel/py-zope.app.cache/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Zope Caching Framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:${PORTSDIR}/devel/py-zope.ramcache \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.component/Makefile b/devel/py-zope.app.component/Makefile
index 0e03164c396f..c55192ec4170 100644
--- a/devel/py-zope.app.component/Makefile
+++ b/devel/py-zope.app.component/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Local Zope Component Support
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:${PORTSDIR}/devel/py-zope.app.container \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.container/Makefile b/devel/py-zope.app.container/Makefile
index 13695f66b300..f95520302c6d 100644
--- a/devel/py-zope.app.container/Makefile
+++ b/devel/py-zope.app.container/Makefile
@@ -13,24 +13,24 @@ COMMENT=	Zope Container
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:${PORTSDIR}/devel/py-zope.copypastemove \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:${PORTSDIR}/devel/py-zope.dublincore \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.content/Makefile b/devel/py-zope.app.content/Makefile
index 3f864e0402ab..81cbd28ffe33 100644
--- a/devel/py-zope.app.content/Makefile
+++ b/devel/py-zope.app.content/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Zope Content Type
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.debug/Makefile b/devel/py-zope.app.debug/Makefile
index b8e6fc8b5264..e3c3bb5d5fa1 100644
--- a/devel/py-zope.app.debug/Makefile
+++ b/devel/py-zope.app.debug/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Zope Debug Mode
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:${PORTSDIR}/devel/py-zope.app.appsetup \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.dependable/Makefile b/devel/py-zope.app.dependable/Makefile
index 3cf61e60e26e..1e6374b4d6be 100644
--- a/devel/py-zope.app.dependable/Makefile
+++ b/devel/py-zope.app.dependable/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Simple Dependency API
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.error/Makefile b/devel/py-zope.app.error/Makefile
index b9b344d03dd1..d5b98234e1f6 100644
--- a/devel/py-zope.app.error/Makefile
+++ b/devel/py-zope.app.error/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Error reporting utility management UI for Zope3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.error>=0:${PORTSDIR}/devel/py-zope.error \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.exception/Makefile b/devel/py-zope.app.exception/Makefile
index c13e09308789..fbe4f8134cbf 100644
--- a/devel/py-zope.app.exception/Makefile
+++ b/devel/py-zope.app.exception/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Zope 3 exception views
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.folder/Makefile b/devel/py-zope.app.folder/Makefile
index 488b6d55a46c..94f45008688a 100644
--- a/devel/py-zope.app.folder/Makefile
+++ b/devel/py-zope.app.folder/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Folder Content Type for Zope 3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:${PORTSDIR}/devel/py-zope.app.content
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.form/Makefile b/devel/py-zope.app.form/Makefile
index dbfdd2244169..7a78fc72d7b7 100644
--- a/devel/py-zope.app.form/Makefile
+++ b/devel/py-zope.app.form/Makefile
@@ -13,21 +13,21 @@ COMMENT=	The Original Zope 3 Form Framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zope.browsermenu \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:${PORTSDIR}/devel/py-zope.datetime \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.generations/Makefile b/devel/py-zope.app.generations/Makefile
index b8e13cf132de..1f00f8021cba 100644
--- a/devel/py-zope.app.generations/Makefile
+++ b/devel/py-zope.app.generations/Makefile
@@ -13,13 +13,13 @@ COMMENT=	ZMI UI for zope.generations
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication \
-		${PYTHON_PKGNAMEPREFIX}zope.app.renderer>=0:${PORTSDIR}/devel/py-zope.app.renderer \
-		${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:${PORTSDIR}/devel/py-zope.applicationcontrol \
-		${PYTHON_PKGNAMEPREFIX}zope.generations>=0:${PORTSDIR}/devel/py-zope.generations \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
+		${PYTHON_PKGNAMEPREFIX}zope.app.renderer>=0:devel/py-zope.app.renderer \
+		${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol \
+		${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.http/Makefile b/devel/py-zope.app.http/Makefile
index ccd44dadace2..f376df98f25f 100644
--- a/devel/py-zope.app.http/Makefile
+++ b/devel/py-zope.app.http/Makefile
@@ -13,10 +13,10 @@ COMMENT=	HTTP Behavior for the Zope Publisher
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:${PORTSDIR}/devel/py-zope.filerepresentation
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.pagetemplate/Makefile b/devel/py-zope.app.pagetemplate/Makefile
index 93079e796027..6f136958b996 100644
--- a/devel/py-zope.app.pagetemplate/Makefile
+++ b/devel/py-zope.app.pagetemplate/Makefile
@@ -13,18 +13,18 @@ COMMENT=	PageTemplate integration for Zope 3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:${PORTSDIR}/devel/py-zope.dublincore \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5.0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5.0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.publication/Makefile b/devel/py-zope.app.publication/Makefile
index eed93c45b44a..c2a89c68ddda 100644
--- a/devel/py-zope.app.publication/Makefile
+++ b/devel/py-zope.app.publication/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Zope publication
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.error>=0:${PORTSDIR}/devel/py-zope.error \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.4:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:${PORTSDIR}/devel/py-transaction
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.4:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.publisher/Makefile b/devel/py-zope.app.publisher/Makefile
index 65e308b2f988..9f3824eb8c34 100644
--- a/devel/py-zope.app.publisher/Makefile
+++ b/devel/py-zope.app.publisher/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Means for configuration of Zope 3 style views and resources
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zope.browsermenu \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:${PORTSDIR}/devel/py-zope.browserresource \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:${PORTSDIR}/devel/py-zope.datetime \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:${PORTSDIR}/devel/py-zope.ptresource \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.renderer/Makefile b/devel/py-zope.app.renderer/Makefile
index f641082e7f0f..0410ea86320f 100644
--- a/devel/py-zope.app.renderer/Makefile
+++ b/devel/py-zope.app.renderer/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Text Renderer Framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.5:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}roman>=0:${PORTSDIR}/math/py-roman \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.5:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.rotterdam/Makefile b/devel/py-zope.app.rotterdam/Makefile
index 3bde5279b3fd..7cb933610d86 100644
--- a/devel/py-zope.app.rotterdam/Makefile
+++ b/devel/py-zope.app.rotterdam/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Zope 3 ZMI Skin
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:${PORTSDIR}/devel/py-zope.app.basicskin \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.schema/Makefile b/devel/py-zope.app.schema/Makefile
index ae6af56a82b5..0d16551462fd 100644
--- a/devel/py-zope.app.schema/Makefile
+++ b/devel/py-zope.app.schema/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Component Architecture based Vocabulary Registry
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.testing/Makefile b/devel/py-zope.app.testing/Makefile
index bdea14b5cde9..46d2701bab39 100644
--- a/devel/py-zope.app.testing/Makefile
+++ b/devel/py-zope.app.testing/Makefile
@@ -13,24 +13,24 @@ COMMENT=	Zope Application Testing Support
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:${PORTSDIR}/devel/py-zope.app.appsetup \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
-		${PYTHON_PKGNAMEPREFIX}zope.app.debug>=0:${PORTSDIR}/devel/py-zope.app.debug \
-		${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:${PORTSDIR}/devel/py-zope.app.dependable \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.password>=0:${PORTSDIR}/security/py-zope.password \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:${PORTSDIR}/devel/py-zope.testbrowser \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
+		${PYTHON_PKGNAMEPREFIX}zope.app.debug>=0:devel/py-zope.app.debug \
+		${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.zcmlfiles/Makefile b/devel/py-zope.app.zcmlfiles/Makefile
index d780e4ff9d31..6aed86432aee 100644
--- a/devel/py-zope.app.zcmlfiles/Makefile
+++ b/devel/py-zope.app.zcmlfiles/Makefile
@@ -13,42 +13,42 @@ COMMENT=	Zope application server ZCML files
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary \
-		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:${PORTSDIR}/devel/py-zope.copypastemove \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:${PORTSDIR}/devel/py-zope.dublincore \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:${PORTSDIR}/devel/py-zope.app.applicationcontrol \
-		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:${PORTSDIR}/devel/py-zope.app.appsetup \
-		${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:${PORTSDIR}/devel/py-zope.app.basicskin \
-		${PYTHON_PKGNAMEPREFIX}zope.app.broken>=0:${PORTSDIR}/devel/py-zope.app.broken \
-		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:${PORTSDIR}/devel/py-zope.app.component \
-		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:${PORTSDIR}/devel/py-zope.app.container \
-		${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:${PORTSDIR}/devel/py-zope.app.content \
-		${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:${PORTSDIR}/devel/py-zope.app.dependable \
-		${PYTHON_PKGNAMEPREFIX}zope.app.error>=0:${PORTSDIR}/devel/py-zope.app.error \
-		${PYTHON_PKGNAMEPREFIX}zope.app.exception>=0:${PORTSDIR}/devel/py-zope.app.exception \
-		${PYTHON_PKGNAMEPREFIX}zope.app.folder>=0:${PORTSDIR}/devel/py-zope.app.folder \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${PYTHON_PKGNAMEPREFIX}zope.app.generations>=0:${PORTSDIR}/devel/py-zope.app.generations \
-		${PYTHON_PKGNAMEPREFIX}zope.app.http>=0:${PORTSDIR}/devel/py-zope.app.http \
-		${PYTHON_PKGNAMEPREFIX}zope.app.i18n>=0:${PORTSDIR}/textproc/py-zope.app.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:${PORTSDIR}/textproc/py-zope.app.locales \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.app.principalannotation>=0:${PORTSDIR}/security/py-zope.app.principalannotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.app.rotterdam>=0:${PORTSDIR}/devel/py-zope.app.rotterdam \
-		${PYTHON_PKGNAMEPREFIX}zope.app.schema>=0:${PORTSDIR}/devel/py-zope.app.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:${PORTSDIR}/security/py-zope.app.security \
-		${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:${PORTSDIR}/www/py-zope.app.wsgi \
-		${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:${PORTSDIR}/devel/py-zope.app.zopeappgenerations
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \
+		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:devel/py-zope.app.applicationcontrol \
+		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup \
+		${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin \
+		${PYTHON_PKGNAMEPREFIX}zope.app.broken>=0:devel/py-zope.app.broken \
+		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component \
+		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \
+		${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content \
+		${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable \
+		${PYTHON_PKGNAMEPREFIX}zope.app.error>=0:devel/py-zope.app.error \
+		${PYTHON_PKGNAMEPREFIX}zope.app.exception>=0:devel/py-zope.app.exception \
+		${PYTHON_PKGNAMEPREFIX}zope.app.folder>=0:devel/py-zope.app.folder \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${PYTHON_PKGNAMEPREFIX}zope.app.generations>=0:devel/py-zope.app.generations \
+		${PYTHON_PKGNAMEPREFIX}zope.app.http>=0:devel/py-zope.app.http \
+		${PYTHON_PKGNAMEPREFIX}zope.app.i18n>=0:textproc/py-zope.app.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.app.principalannotation>=0:security/py-zope.app.principalannotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.app.rotterdam>=0:devel/py-zope.app.rotterdam \
+		${PYTHON_PKGNAMEPREFIX}zope.app.schema>=0:devel/py-zope.app.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security \
+		${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:www/py-zope.app.wsgi \
+		${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:devel/py-zope.app.zopeappgenerations
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.zopeappgenerations/Makefile b/devel/py-zope.app.zopeappgenerations/Makefile
index 64a1927a11dd..acfd2ff98553 100644
--- a/devel/py-zope.app.zopeappgenerations/Makefile
+++ b/devel/py-zope.app.zopeappgenerations/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Zope Application ZODB Update Generations
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=0:${PORTSDIR}/security/py-zope.app.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:${PORTSDIR}/devel/py-zope.app.component \
-		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:${PORTSDIR}/devel/py-zope.copypastemove \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:${PORTSDIR}/devel/py-zope.dublincore \
-		${PYTHON_PKGNAMEPREFIX}zope.generations>=0:${PORTSDIR}/devel/py-zope.generations
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=0:security/py-zope.app.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component \
+		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \
+		${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.applicationcontrol/Makefile b/devel/py-zope.applicationcontrol/Makefile
index fc6a499b1881..b5e87545b6a0 100644
--- a/devel/py-zope.applicationcontrol/Makefile
+++ b/devel/py-zope.applicationcontrol/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Zope applicationcontrol
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.broken/Makefile b/devel/py-zope.broken/Makefile
index 7d840d3e2dfc..a915fa0985da 100644
--- a/devel/py-zope.broken/Makefile
+++ b/devel/py-zope.broken/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Zope Broken Object Interfaces
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.browser/Makefile b/devel/py-zope.browser/Makefile
index 49e8b69b2b7e..61f39ee1a12d 100644
--- a/devel/py-zope.browser/Makefile
+++ b/devel/py-zope.browser/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Shared Zope Toolkit browser components
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-zope.browsermenu/Makefile b/devel/py-zope.browsermenu/Makefile
index 33859ea2f8da..d4b6afd39c51 100644
--- a/devel/py-zope.browsermenu/Makefile
+++ b/devel/py-zope.browsermenu/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Browser menu implementation for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:${PORTSDIR}/devel/py-zope.pagetemplate
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:devel/py-zope.pagetemplate
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.browserpage/Makefile b/devel/py-zope.browserpage/Makefile
index a9479619508d..92dad31eeb16 100644
--- a/devel/py-zope.browserpage/Makefile
+++ b/devel/py-zope.browserpage/Makefile
@@ -12,16 +12,16 @@ COMMENT=	ZCML directives for configuring browser views for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=3.8:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zope.browsermenu
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=3.8:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-zope.browserresource/Makefile b/devel/py-zope.browserresource/Makefile
index 421fe7656ef6..cb8e4d2ddc89 100644
--- a/devel/py-zope.browserresource/Makefile
+++ b/devel/py-zope.browserresource/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Browser resources implementation for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:devel/py-zope.traversing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.component/Makefile b/devel/py-zope.component/Makefile
index 352ebd8d34e5..9bf4fe36a274 100644
--- a/devel/py-zope.component/Makefile
+++ b/devel/py-zope.component/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Zope Component Architecture
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:devel/py-zope.interface
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-zope.componentvocabulary/Makefile b/devel/py-zope.componentvocabulary/Makefile
index dcd593f4d334..44e5e11cccf1 100644
--- a/devel/py-zope.componentvocabulary/Makefile
+++ b/devel/py-zope.componentvocabulary/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Zope Component vocabularies
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.configuration/Makefile b/devel/py-zope.configuration/Makefile
index a5d77cbe0b67..46b56d944ce3 100644
--- a/devel/py-zope.configuration/Makefile
+++ b/devel/py-zope.configuration/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Zope Configuration Markup Language (ZCML)
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.container/Makefile b/devel/py-zope.container/Makefile
index 5afcee511614..a9856288b5a7 100644
--- a/devel/py-zope.container/Makefile
+++ b/devel/py-zope.container/Makefile
@@ -13,22 +13,22 @@ COMMENT=	Zope Container
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=3.5.4:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=3.5.2:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:${PORTSDIR}/devel/py-zope.filerepresentation \
-		${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.broken>=0:${PORTSDIR}/devel/py-zope.broken \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=3.5.4:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=3.5.2:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation \
+		${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.contentprovider/Makefile b/devel/py-zope.contentprovider/Makefile
index 88984e1a0e84..3f676e8cc1ef 100644
--- a/devel/py-zope.contentprovider/Makefile
+++ b/devel/py-zope.contentprovider/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Content Provider Framework for Zope Templates
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.copy/Makefile b/devel/py-zope.copy/Makefile
index 6c8565a91b7a..dd31065afe5f 100644
--- a/devel/py-zope.copy/Makefile
+++ b/devel/py-zope.copy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pluggable object copying mechanism
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.copypastemove/Makefile b/devel/py-zope.copypastemove/Makefile
index c1e9b45c54fe..00afd8f66ee0 100644
--- a/devel/py-zope.copypastemove/Makefile
+++ b/devel/py-zope.copypastemove/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Copy, Paste, and Move support for content components
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.copy>=0:${PORTSDIR}/devel/py-zope.copy \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.copy>=0:devel/py-zope.copy \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.deferredimport/Makefile b/devel/py-zope.deferredimport/Makefile
index cccb6a7c3e75..29d613c42d2b 100644
--- a/devel/py-zope.deferredimport/Makefile
+++ b/devel/py-zope.deferredimport/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Allows to import names that will be resolved when used in the code
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.dublincore/Makefile b/devel/py-zope.dublincore/Makefile
index f6e682c0fef6..be356f81f1a6 100644
--- a/devel/py-zope.dublincore/Makefile
+++ b/devel/py-zope.dublincore/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Zope Dublin Core implementation
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.error/Makefile b/devel/py-zope.error/Makefile
index 7c0afcb49144..9dd9a8ef83ed 100644
--- a/devel/py-zope.error/Makefile
+++ b/devel/py-zope.error/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Error reporting utility for Zope3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.exceptions/Makefile b/devel/py-zope.exceptions/Makefile
index 90722ad99a40..51042992f869 100644
--- a/devel/py-zope.exceptions/Makefile
+++ b/devel/py-zope.exceptions/Makefile
@@ -14,7 +14,7 @@ COMMENT=	General Zope Exceptions
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.filerepresentation/Makefile b/devel/py-zope.filerepresentation/Makefile
index 22dccef354f3..5b95fb891d72 100644
--- a/devel/py-zope.filerepresentation/Makefile
+++ b/devel/py-zope.filerepresentation/Makefile
@@ -13,8 +13,8 @@ COMMENT=	File-system Representation Interfaces
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.formlib/Makefile b/devel/py-zope.formlib/Makefile
index ce1a546876fa..49ecbe2fe7ef 100644
--- a/devel/py-zope.formlib/Makefile
+++ b/devel/py-zope.formlib/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Form generation and validation library for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:${PORTSDIR}/devel/py-zope.datetime
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.generations/Makefile b/devel/py-zope.generations/Makefile
index fe529d49fff5..18bc77c631de 100644
--- a/devel/py-zope.generations/Makefile
+++ b/devel/py-zope.generations/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Zope application schema generations
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.globalrequest/Makefile b/devel/py-zope.globalrequest/Makefile
index 37b89e21f8ce..64fd89e817fc 100644
--- a/devel/py-zope.globalrequest/Makefile
+++ b/devel/py-zope.globalrequest/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Global way of retrieving the currently active request
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-zope.i18n/Makefile b/devel/py-zope.i18n/Makefile
index fdfe7eb61ddb..9a1c31de880d 100644
--- a/devel/py-zope.i18n/Makefile
+++ b/devel/py-zope.i18n/Makefile
@@ -12,12 +12,12 @@ DIST_SUBDIR=	zope
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Zope Internationalization Support
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 USES=		gettext python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-zope.lifecycleevent/Makefile b/devel/py-zope.lifecycleevent/Makefile
index eba20820681c..2a0815237007 100644
--- a/devel/py-zope.lifecycleevent/Makefile
+++ b/devel/py-zope.lifecycleevent/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Object life-cycle events
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.location/Makefile b/devel/py-zope.location/Makefile
index 9892814a7a00..cc76f43d8fbb 100644
--- a/devel/py-zope.location/Makefile
+++ b/devel/py-zope.location/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Zope Location
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:devel/py-zope.schema
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.minmax/Makefile b/devel/py-zope.minmax/Makefile
index ca1e0767142d..eb4de001cc65 100644
--- a/devel/py-zope.minmax/Makefile
+++ b/devel/py-zope.minmax/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Homogeneous values favoring maximum or minimum
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.pagetemplate/Makefile b/devel/py-zope.pagetemplate/Makefile
index 86c5c00d4e31..fe4ed2f62432 100644
--- a/devel/py-zope.pagetemplate/Makefile
+++ b/devel/py-zope.pagetemplate/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Zope Page Templates
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.processlifetime/Makefile b/devel/py-zope.processlifetime/Makefile
index bc9d7128f0d9..e497e4d74cd5 100644
--- a/devel/py-zope.processlifetime/Makefile
+++ b/devel/py-zope.processlifetime/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Zope process lifetime events
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.ptresource/Makefile b/devel/py-zope.ptresource/Makefile
index 55c2a49d063b..3fe4a24a824a 100644
--- a/devel/py-zope.ptresource/Makefile
+++ b/devel/py-zope.ptresource/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Page template resource plugin for zope.browserresource
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:${PORTSDIR}/devel/py-zope.browserresource \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.publisher/Makefile b/devel/py-zope.publisher/Makefile
index b8b77c04fb7e..3b511de404c6 100644
--- a/devel/py-zope.publisher/Makefile
+++ b/devel/py-zope.publisher/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Publishes Python objects on the web
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=3.5:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=3.5:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-zope.ramcache/Makefile b/devel/py-zope.ramcache/Makefile
index 23242e5ad376..4dde4dd4273f 100644
--- a/devel/py-zope.ramcache/Makefile
+++ b/devel/py-zope.ramcache/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Zope RAM Cache
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.schema/Makefile b/devel/py-zope.schema/Makefile
index 28b1aee514c9..7942d0a5a1ac 100644
--- a/devel/py-zope.schema/Makefile
+++ b/devel/py-zope.schema/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Zope Interface extension for defining data schemas
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.site/Makefile b/devel/py-zope.site/Makefile
index dd5ed8504b87..f4c8ce6d6bee 100644
--- a/devel/py-zope.site/Makefile
+++ b/devel/py-zope.site/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Local registries for zope component architecture
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:${PORTSDIR}/devel/py-zope.location
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.size/Makefile b/devel/py-zope.size/Makefile
index 36a06d00f2c7..65e862221d32 100644
--- a/devel/py-zope.size/Makefile
+++ b/devel/py-zope.size/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Interfaces and simple adapter that give the size of an object
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.tales/Makefile b/devel/py-zope.tales/Makefile
index 0bd588537aef..8836b048d491 100644
--- a/devel/py-zope.tales/Makefile
+++ b/devel/py-zope.tales/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Zope Template Application Language Expression Syntax (TALES)
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.testbrowser/Makefile b/devel/py-zope.testbrowser/Makefile
index 8027fd70a67f..065786bf7337 100644
--- a/devel/py-zope.testbrowser/Makefile
+++ b/devel/py-zope.testbrowser/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Programmable browser for functional black-box tests
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:${PORTSDIR}/www/py-mechanize \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}WebTest>=0:${PORTSDIR}/www/py-WebTest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:www/py-mechanize \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.testing/Makefile b/devel/py-zope.testing/Makefile
index 53e92a822b6f..7c9300fd245d 100644
--- a/devel/py-zope.testing/Makefile
+++ b/devel/py-zope.testing/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Zope testing helpers
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.traversing/Makefile b/devel/py-zope.traversing/Makefile
index b64819be6bf7..638a5964c127 100644
--- a/devel/py-zope.traversing/Makefile
+++ b/devel/py-zope.traversing/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Resolving paths in the object hierarchy
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:${PORTSDIR}/devel/py-zope.location
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.viewlet/Makefile b/devel/py-zope.viewlet/Makefile
index f7f82831f182..c6463975d025 100644
--- a/devel/py-zope.viewlet/Makefile
+++ b/devel/py-zope.viewlet/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Zope Viewlets
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py3-Jinja2/Makefile b/devel/py3-Jinja2/Makefile
index 1070512d9f82..a6fabe993667 100644
--- a/devel/py3-Jinja2/Makefile
+++ b/devel/py3-Jinja2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Fast and easy to use stand-alone template engine
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py3-MarkupSafe
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py3-MarkupSafe
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py3-MarkupSafe
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py3-MarkupSafe
 
 NO_ARCH=	yes
 USES=		python:3
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	BABEL EXAMPLES
 OPTIONS_DEFAULT=	BABEL
 BABEL_DESC=		Enable Babel extension
 
-BABEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py3-babel
+BABEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel
 
 PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
 PY2TO3_ARGS=	--fix=all --no-diffs --nobackups --verbose --write
diff --git a/devel/py3-babel/Makefile b/devel/py3-babel/Makefile
index d68ab4f34485..10c551de8575 100644
--- a/devel/py3-babel/Makefile
+++ b/devel/py3-babel/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Collection of tools for internationalizing Python applications
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py3-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py3-pytz
 
 USES=		python:3
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py3-jsonschema/Makefile b/devel/py3-jsonschema/Makefile
index d3de67678939..aee47d418784 100644
--- a/devel/py3-jsonschema/Makefile
+++ b/devel/py3-jsonschema/Makefile
@@ -12,7 +12,7 @@ COMMENT=	JSON Schema validation for Python
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcversioner>0:${PORTSDIR}/devel/py3-vcversioner
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py3-vcversioner
 
 USES=		python:3
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py3-libpeas/Makefile b/devel/py3-libpeas/Makefile
index dd2da3356167..cbbbcd8ed8f7 100644
--- a/devel/py3-libpeas/Makefile
+++ b/devel/py3-libpeas/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	libpeas Python 3 support
 
-LIB_DEPENDS+=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas
+LIB_DEPENDS+=	libpeas-1.0.so:devel/libpeas
 
 LIBPEAS_SLAVE=	python3
 
diff --git a/devel/py_static_check/Makefile b/devel/py_static_check/Makefile
index cd161e4d86b7..fb541a9c906f 100644
--- a/devel/py_static_check/Makefile
+++ b/devel/py_static_check/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Statically check your python code
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:${PORTSDIR}/devel/py-pyflakes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile
index 80ac683e3e63..8e4cf5a1372a 100644
--- a/devel/pydbus-common/Makefile
+++ b/devel/pydbus-common/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	dbus-python-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	Common files for the Python bindings for the D-BUS messaging system
 
-BUILD_DEPENDS=	dbus-glib>=0:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	dbus-glib>=0:devel/dbus-glib
 
 SLAVE_PORT?=	no
 
@@ -34,7 +34,7 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	HTMLDOCS
 HTMLDOCS_DESC=	build html documentation
 HTMLDOCS_CONFIGURE_OFF=	--disable-html-docs
-HTMLDOCS_BUILD_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils
+HTMLDOCS_BUILD_DEPENDS=	rst2html:textproc/py-docutils
 
 .include <bsd.port.options.mk>
 
@@ -65,8 +65,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 .endif
 .else # slave is defined
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS+=	pydbus-common>=0:${PORTSDIR}/devel/pydbus-common
+LIB_DEPENDS+=	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS+=	pydbus-common>=0:devel/pydbus-common
 USE_LDCONFIG=	yes
 .if ${SLAVE_PORT} == python2
 USES+=		python:2
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index 8aed6f1a3c6e..431fc747f3a3 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -36,7 +36,7 @@ MAKE_ARGS=	PYTHON_VERSION=${PYTHON_VER}
 .if ${SLAVE_PORT} == no
 PORTSCOUT?=	limitw:1,even
 
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
 USES+=		gnome python:build
 USE_GNOME=	glib20:build introspection:build
 NO_BUILD=	yes
@@ -52,19 +52,19 @@ PORTSCOUT=	ignore:1
 
 USES+=		gnome
 USE_GNOME+=	glib20 introspection
-LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS+=	pygobject3-common>=0:${PORTSDIR}/devel/pygobject3-common
+LIB_DEPENDS+=	libffi.so:devel/libffi
+RUN_DEPENDS+=	pygobject3-common>=0:devel/pygobject3-common
 
 .if ${SLAVE_PORT} == python2
 USES+=		python:2
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
 .endif
 
 .if ${SLAVE_PORT} == python3
 USES+=		python:3
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo
 PLIST_SUB+=	PYTVER=${PYTHON_VER:S/.//}
 .endif
 
diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile
index 7c3b09b6d5db..0f7d99add73b 100644
--- a/devel/pylint/Makefile
+++ b/devel/pylint/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Analyzes python source code looking for bugs and signs of poor quality
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=1.3.6:${PORTSDIR}/devel/py-astroid \
-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=1.3.6:devel/py-astroid \
+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils concurrent
 
 OPTIONS_DEFINE=	GUI
 
-GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 .include <bsd.port.mk>
diff --git a/devel/pypersrc/Makefile b/devel/pypersrc/Makefile
index 0903b7330438..f9e728fc0651 100644
--- a/devel/pypersrc/Makefile
+++ b/devel/pypersrc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python/Tkinter based source browser
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE_GPL2.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Pmw>0:${PORTSDIR}/x11-toolkits/py-Pmw
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile
index f646bed582f4..05716413b21e 100644
--- a/devel/pyside-tools/Makefile
+++ b/devel/pyside-tools/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Utilities for creating PySide applications
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:${PORTSDIR}/devel/pyside
-LIB_DEPENDS=	libshiboken-${PYTHON_VERSION}.so:${PORTSDIR}/devel/shiboken
-RUN_DEPENDS=	pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:${PORTSDIR}/devel/pyside
+BUILD_DEPENDS=	pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside
+LIB_DEPENDS=	libshiboken-${PYTHON_VERSION}.so:devel/shiboken
+RUN_DEPENDS=	pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PySide
diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
index 86b7c85b50aa..b5d034977ced 100644
--- a/devel/pyside/Makefile
+++ b/devel/pyside/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Python bindings for the Qt applications and UI framework
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libapiextractor.so:${PORTSDIR}/devel/apiextractor \
-		libgenrunner.so:${PORTSDIR}/devel/generatorrunner \
-		libshiboken-${PYTHON_VERSION}.so:${PORTSDIR}/devel/shiboken
+LIB_DEPENDS=	libapiextractor.so:devel/apiextractor \
+		libgenrunner.so:devel/generatorrunner \
+		libshiboken-${PYTHON_VERSION}.so:devel/shiboken
 
 CMAKE_ARGS+=	-DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \
 		-DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include"
diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
index 86a6266ac7c2..5a123ae4111e 100644
--- a/devel/pysvn/Makefile
+++ b/devel/pysvn/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Python binding for Subversion
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion \
-		libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion \
+		libneon.so:www/neon
 
 # Python3 ready
 USES=		python
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index 86603810f1c7..2822378b85cc 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Qt interface for bzr
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4 \
-		${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4 \
+		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index ca4409cfcb5c..447226a5617c 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	KDE/stable/qca/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Cross-platform crypto API for Qt 4
 
-BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		cmake:outsource tar:xz
 CMAKE_ARGS=	-DBUILD_PLUGINS=none -DBUILD_TESTS=no \
@@ -35,13 +35,13 @@ OPTIONS_DEFAULT=GNUPG OPENSSL
 OPTIONS_SUB=	yes
 
 GNUPG_CMAKE_ON=		-DWITH_gnupg_PLUGIN=yes
-GNUPG_RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
+GNUPG_RUN_DEPENDS=	gpg2:security/gnupg
 
 OPENSSL_CMAKE_ON=	-DWITH_ossl_PLUGIN=yes
 OPENSSL_USE=		OPENSSL=yes
 
 SASL_CMAKE_ON=		-DWITH_cyrus-sasl_PLUGIN=yes
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 post-patch:
 # Qt Network module is used for tests only
diff --git a/devel/qct/Makefile b/devel/qct/Makefile
index 6d0858b97dac..fbe689e5590e 100644
--- a/devel/qct/Makefile
+++ b/devel/qct/Makefile
@@ -13,8 +13,8 @@ COMMENT=	QCT GUI commit tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/qdevelop/Makefile b/devel/qdevelop/Makefile
index 761d8a650bc0..64d253de5d06 100644
--- a/devel/qdevelop/Makefile
+++ b/devel/qdevelop/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Development environment entirely dedicated to Qt 4
 
-RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
+RUN_DEPENDS=	exctags:devel/ctags
 
 USE_QT4=	gui sql network xml designer sql-sqlite3_run \
 		moc_build uic_build rcc_build
diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
index aac57890018b..7042a17b8cfd 100644
--- a/devel/qjson/Makefile
+++ b/devel/qjson/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 .endif
 
 post-patch:
diff --git a/devel/qross/Makefile b/devel/qross/Makefile
index a1c8b19faa08..fd8ab3473922 100644
--- a/devel/qross/Makefile
+++ b/devel/qross/Makefile
@@ -24,7 +24,7 @@ OPTIONS_SUB=	yes
 PYTHON_DESC=		Python bindings
 PYTHON_CMAKE_ON=	-DENABLE_PYTHON:BOOL=true
 PYTHON_CMAKE_OFF=	-DENABLE_PYTHON:BOOL=false
-PYTHON_BUILD_DEPENDS=	sip:${PORTSDIR}/devel/py-sip
+PYTHON_BUILD_DEPENDS=	sip:devel/py-sip
 OPTIONS_DEFAULT=PYTHON
 
 post-extract:
diff --git a/devel/qscintilla2-designerplugin-qt5/Makefile b/devel/qscintilla2-designerplugin-qt5/Makefile
index e56bbda75ef8..379d08cf5733 100644
--- a/devel/qscintilla2-designerplugin-qt5/Makefile
+++ b/devel/qscintilla2-designerplugin-qt5/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${QSCI2_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt5 Designer plugin for QScintilla2
 
-LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt5/distinfo
 USE_GL=		gl
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
index 9bce26e79bde..b546dd48097a 100644
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${QSCI2_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 Designer plugin for QScintilla2
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2/distinfo
 USES=		qmake pyqt:4
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index 486ee0f3fe51..e3a6be5b62af 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt core non-graphical module
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USE_GNOME=	glib20
 USE_QT4=	qmake_build moc_build
diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile
index 08965af41867..0ee09573f2d5 100644
--- a/devel/qt4-qdbusviewer/Makefile
+++ b/devel/qt4-qdbusviewer/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4 graphical interface to D-Bus
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 USES=		pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build corelib dbus gui xml \
diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
index 6724b9a8a497..13f9cebb77a3 100644
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@@ -8,8 +8,8 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt core non-graphical module
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libicui18n.so:devel/icu \
+		libpcre.so:devel/pcre
 
 USES=		execinfo
 USE_GNOME=	glib20
diff --git a/devel/quickcheck++/Makefile b/devel/quickcheck++/Makefile
index 55395c51777e..1fcf82d25aa2 100644
--- a/devel/quickcheck++/Makefile
+++ b/devel/quickcheck++/Makefile
@@ -26,7 +26,7 @@ DOXYGEN_DESC=	Build documentation with doxygen
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 PORTDOCS+=	html
 
 pre-install:
diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index a0ccd005363a..74b69a4289a0 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Collection of bash scripts to ease working with patch files
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gcp:${PORTSDIR}/sysutils/coreutils \
-		gsed:${PORTSDIR}/textproc/gsed \
-		gpatch:${PORTSDIR}/devel/patch \
-		diffstat:${PORTSDIR}/textproc/diffstat \
-		gawk:${PORTSDIR}/lang/gawk
+BUILD_DEPENDS=	bash:shells/bash \
+		gcp:sysutils/coreutils \
+		gsed:textproc/gsed \
+		gpatch:devel/patch \
+		diffstat:textproc/diffstat \
+		gawk:lang/gawk
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		formail:${PORTSDIR}/mail/procmail
+		formail:mail/procmail
 
 USES=		desthack gmake perl5
 NO_ARCH=	yes
@@ -34,8 +34,8 @@ CONFIGURE_ARGS=	--with-sed=${LOCALBASE}/bin/gsed \
 
 PORTDOCS=	README README.MAIL quilt.pdf
 
-RPMBUILD_BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm4
-RPMBUILD_RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm4
+RPMBUILD_BUILD_DEPENDS=	rpm:archivers/rpm4
+RPMBUILD_RUN_DEPENDS=	rpm:archivers/rpm4
 RPMBUILD_CONFIGURE_OFF=	--without-rpmbuild
 
 NLS_USES=		gettext
diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index e13db8e21a18..8c1363a64c0e 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=	DOCS EXAMPLES
 DOCS_CONFIGURE_ENABLE=	manual
 DOCS_USE=		TEX=latex:build
-DOCS_BUILD_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
+DOCS_BUILD_DEPENDS=	fig2dev:print/transfig
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ragel/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 19da3d0cd4f1..ef0320f2e552 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Cross-platform GUI front-end for the Subversion revision system
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	${LOCALBASE}/bin/svn:devel/subversion \
+		xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/VERSION:textproc/docbook-xsl
 
 USE_WX=		2.8
 WX_UNICODE=	yes
diff --git a/devel/rbenv/Makefile b/devel/rbenv/Makefile
index 1b11270f2d06..c534b6ef5ac5 100644
--- a/devel/rbenv/Makefile
+++ b/devel/rbenv/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Manage multiple versions of ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sstephenson
diff --git a/devel/rbtools/Makefile b/devel/rbtools/Makefile
index 139e48a9fc95..ed89ca1e96f0 100644
--- a/devel/rbtools/Makefile
+++ b/devel/rbtools/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Set of client tools to use with Review Board
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 ORIGNAME=	RBTools
 
diff --git a/devel/rebar/Makefile b/devel/rebar/Makefile
index 01bbec99a2ac..972f64c9c51e 100644
--- a/devel/rebar/Makefile
+++ b/devel/rebar/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Build-tool for Erlang that follows OTP principles
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/escript:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	${LOCALBASE}/bin/escript:lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	BASH ZSH
diff --git a/devel/rebar3/Makefile b/devel/rebar3/Makefile
index 85c523db1c35..3edfd3fab589 100644
--- a/devel/rebar3/Makefile
+++ b/devel/rebar3/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Build tool for Erlang
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang \
-		${LOCALBASE}/bin/git:${PORTSDIR}/devel/git
-RUN_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang \
+		${LOCALBASE}/bin/git:devel/git
+RUN_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang
 
 OPTIONS_DEFINE=	BASH ZSH
 
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index c93930faefd3..8434bc3ed515 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Complete regular expressions C++ solution
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/relx/Makefile b/devel/relx/Makefile
index 927692567c55..9d42c062a0d6 100644
--- a/devel/relx/Makefile
+++ b/devel/relx/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Sane, simple release creation for Erlang
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang \
-		rebar3>=0:${PORTSDIR}/devel/rebar3
+BUILD_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang \
+		rebar3>=0:devel/rebar3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/devel/roboctl/Makefile b/devel/roboctl/Makefile
index c46d1fb72da9..60611c562e5f 100644
--- a/devel/roboctl/Makefile
+++ b/devel/roboctl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	API and tools for communicating with Lego and Vex robots
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgamepad.a:${PORTSDIR}/devel/libgamepad
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgamepad.a:devel/libgamepad
 
 MAKE_ENV=	EXTRALIBS=-lbluetooth
 MAKE_FLAGS+=	PREFIX=${STAGEDIR}${PREFIX} \
@@ -23,7 +23,7 @@ USES=		tar:xz
 OPTIONS_DEFINE=	CUTECOM
 CUTECOM_DESC=	Install cutecom for Vex debugging
 
-CUTECOM_RUN_DEPENDS=	cutecom:${PORTSDIR}/comms/cutecom
+CUTECOM_RUN_DEPENDS=	cutecom:comms/cutecom
 
 pre-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} depend)
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 206600568194..667611efa456 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Interprocess communication library
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	liblwp.so:${PORTSDIR}/devel/lwp
+LIB_DEPENDS=	liblwp.so:devel/lwp
 
 USES=		gmake libtool pathfix perl5 pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile
index fb2084611bbc..8010f3350c6a 100644
--- a/devel/rsvndump/Makefile
+++ b/devel/rsvndump/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Remote Subversion repository dumpfile generator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 
 OPTIONS_DEFINE=	DOCS NLS
 
@@ -20,8 +20,8 @@ CONFIGURE_ARGS=	--with-svn=${LOCALBASE}
 
 PLIST_FILES=	bin/rsvndump
 
-DOCS_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-			xmlto:${PORTSDIR}/textproc/xmlto
+DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+			xmlto:textproc/xmlto
 DOCS_PLIST_FILES=	man/man1/rsvndump.1.gz
 DOCS_CONFIGURE_ENABLE=	man
 
diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile
index 7a4459f80719..ea05803b3464 100644
--- a/devel/ruby-build/Makefile
+++ b/devel/ruby-build/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Compile and install different ruby versions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	autoconf>0:${PORTSDIR}/devel/autoconf \
-		curl:${PORTSDIR}/ftp/curl \
-		gmake:${PORTSDIR}/devel/gmake
+RUN_DEPENDS=	autoconf>0:devel/autoconf \
+		curl:ftp/curl \
+		gmake:devel/gmake
 
 OPTIONS_DEFINE=	RBENV
 RBENV_DESC=	Install rbenv for installation support
 OPTIONS_DEFAULT=	RBENV
-RBENV_RUN_DEPENDS=	rbenv:${PORTSDIR}/devel/rbenv
+RBENV_RUN_DEPENDS=	rbenv:devel/rbenv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sstephenson
diff --git a/devel/ruby-langscan/Makefile b/devel/ruby-langscan/Makefile
index 09cad1c08b85..92169ecc9ec6 100644
--- a/devel/ruby-langscan/Makefile
+++ b/devel/ruby-langscan/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Program analyzer for source code search engine
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI
-BUILD_DEPENDS=	flex>=2.5.31:${PORTSDIR}/textproc/flex
+RUN_DEPENDS=	p5-PPI>=0:textproc/p5-PPI
+BUILD_DEPENDS=	flex>=2.5.31:textproc/flex
 
 BROKEN_RUBY21=	yes
 BROKEN_RUBY22=	yes
diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile
index 7eca6a0c99c0..d7f2b6a4b249 100644
--- a/devel/ruby-qtruby/Makefile
+++ b/devel/ruby-qtruby/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Ruby bindings for Qt
 
-LIB_DEPENDS=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	libqwt.so:x11-toolkits/qwt5 \
+		libqscintilla2.so:devel/qscintilla2
 
 USE_KDE4=	kdeprefix smokeqt
 USE_QT4=	corelib dbus declarative gui network phonon script webkit xml \
diff --git a/devel/ruby-rbbr/Makefile b/devel/ruby-rbbr/Makefile
index 7519edc62474..e41568a2a2b3 100644
--- a/devel/ruby-rbbr/Makefile
+++ b/devel/ruby-rbbr/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	GTK+2-based Ruby module browser
 
-BUILD_DEPENDS=	rubygem-gettext>=0:${PORTSDIR}/devel/rubygem-gettext
-RUN_DEPENDS=	rubygem-gettext>=0:${PORTSDIR}/devel/rubygem-gettext \
-		rubygem-gtk2>=0:${PORTSDIR}/x11-toolkits/rubygem-gtk2
+BUILD_DEPENDS=	rubygem-gettext>=0:devel/rubygem-gettext
+RUN_DEPENDS=	rubygem-gettext>=0:devel/rubygem-gettext \
+		rubygem-gtk2>=0:x11-toolkits/rubygem-gtk2
 
 BROKEN_RUBY22=	yes
 BROKEN_RUBY23=	yes
diff --git a/devel/ruby-rbprof/Makefile b/devel/ruby-rbprof/Makefile
index dc6148592ef3..71a05e226265 100644
--- a/devel/ruby-rbprof/Makefile
+++ b/devel/ruby-rbprof/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Flexible Ruby profiler
 
 OPTIONS_DEFINE=	DOCS
 
-#RUN_DEPENDS=	${RUBY_SITELIBDIR}/runit/error.rb:${PORTSDIR}/devel/ruby-unit \
-#		${RUBY_SITELIBDIR}/aspectr.rb:${PORTSDIR}/devel/ruby-aspectr
+#RUN_DEPENDS=	${RUBY_SITELIBDIR}/runit/error.rb:devel/ruby-unit \
+#		${RUBY_SITELIBDIR}/aspectr.rb:devel/ruby-aspectr
 
 USE_RUBY=	yes
 
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index f24fb5459289..25d97d4ce7ac 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Ruby extension library to use SDL library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libSGE.so:${PORTSDIR}/devel/sdl_sge \
-		libSDLSKK.so:${PORTSDIR}/devel/sdlskk \
-		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
-RUN_DEPENDS=	rubygem-opengl>=0:${PORTSDIR}/graphics/rubygem-opengl
+LIB_DEPENDS=	libSGE.so:devel/sdl_sge \
+		libSDLSKK.so:devel/sdlskk \
+		libsmpeg.so:multimedia/smpeg
+RUN_DEPENDS=	rubygem-opengl>=0:graphics/rubygem-opengl
 
 USE_SDL=	mixer image ttf sdl
 USE_RUBY=	yes
diff --git a/devel/rubygem-actionpack-action_caching/Makefile b/devel/rubygem-actionpack-action_caching/Makefile
index 42b3803e38b3..eb938adcbc02 100644
--- a/devel/rubygem-actionpack-action_caching/Makefile
+++ b/devel/rubygem-actionpack-action_caching/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Action caching for Action Pack (removed from core in Rails 4.0)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-actionpack4>=4.0:${PORTSDIR}/www/rubygem-actionpack4
+RUN_DEPENDS=	rubygem-actionpack4>=4.0:www/rubygem-actionpack4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-actionview/Makefile b/devel/rubygem-actionview/Makefile
index c71d6510ca2c..d0d0858d4640 100644
--- a/devel/rubygem-actionview/Makefile
+++ b/devel/rubygem-actionview/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Rendering framework putting the V in MVC (part of Rails)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-builder32>=3.2:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-erubis>=2.7.0:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-rails-dom-testing>=1.0.5:${PORTSDIR}/textproc/rubygem-rails-dom-testing \
-		rubygem-rails-html-sanitizer>=1.0.1:${PORTSDIR}/textproc/rubygem-rails-html-sanitizer
+RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-builder32>=3.2:devel/rubygem-builder32 \
+		rubygem-erubis>=2.7.0:www/rubygem-erubis \
+		rubygem-rails-dom-testing>=1.0.5:textproc/rubygem-rails-dom-testing \
+		rubygem-rails-html-sanitizer>=1.0.1:textproc/rubygem-rails-html-sanitizer
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-active_scaffold/Makefile b/devel/rubygem-active_scaffold/Makefile
index 0752d1d2b998..76d960592df6 100644
--- a/devel/rubygem-active_scaffold/Makefile
+++ b/devel/rubygem-active_scaffold/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Gem to handle all CRUD user interface needs
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-rails4>=3.2.22.2:${PORTSDIR}/www/rubygem-rails4
+RUN_DEPENDS=	rubygem-rails4>=3.2.22.2:www/rubygem-rails4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-activejob/Makefile b/devel/rubygem-activejob/Makefile
index 2de7531ce20e..6aa0671f4870 100644
--- a/devel/rubygem-activejob/Makefile
+++ b/devel/rubygem-activejob/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Job class declarations for a variety of queueing backends
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-globalid>=0.3.0:${PORTSDIR}/databases/rubygem-globalid
+RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-globalid>=0.3.0:databases/rubygem-globalid
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-activemessaging/Makefile b/devel/rubygem-activemessaging/Makefile
index 0edde72932c2..fddb579edbac 100644
--- a/devel/rubygem-activemessaging/Makefile
+++ b/devel/rubygem-activemessaging/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Event-driven architecture for rails
 
-RUN_DEPENDS=	rubygem-activesupport>=2.3.11:${PORTSDIR}/devel/rubygem-activesupport
+RUN_DEPENDS=	rubygem-activesupport>=2.3.11:devel/rubygem-activesupport
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-activesupport/Makefile b/devel/rubygem-activesupport/Makefile
index 18fc5f74c500..d358fb445dc4 100644
--- a/devel/rubygem-activesupport/Makefile
+++ b/devel/rubygem-activesupport/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Utility classes and extension that are required by Rails MVC Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-i18n>=0.6.4:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-i18n>=0.6.4:devel/rubygem-i18n \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-activesupport4/Makefile b/devel/rubygem-activesupport4/Makefile
index 42cab1eb0bb3..77d683810eac 100644
--- a/devel/rubygem-activesupport4/Makefile
+++ b/devel/rubygem-activesupport4/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Utility classes and extension that are required by Rails MVC Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-i18n>=0.6.9:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-json>=1.7.7:${PORTSDIR}/devel/rubygem-json \
-		rubygem-minitest>=5.1:${PORTSDIR}/devel/rubygem-minitest \
-		rubygem-thread_safe>=0.3:${PORTSDIR}/devel/rubygem-thread_safe \
-		rubygem-tzinfo>=1.1:${PORTSDIR}/devel/rubygem-tzinfo
+RUN_DEPENDS=	rubygem-i18n>=0.6.9:devel/rubygem-i18n \
+		rubygem-json>=1.7.7:devel/rubygem-json \
+		rubygem-minitest>=5.1:devel/rubygem-minitest \
+		rubygem-thread_safe>=0.3:devel/rubygem-thread_safe \
+		rubygem-tzinfo>=1.1:devel/rubygem-tzinfo
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-analogger/Makefile b/devel/rubygem-analogger/Makefile
index 745afecc64a4..85cec439f724 100644
--- a/devel/rubygem-analogger/Makefile
+++ b/devel/rubygem-analogger/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fast, flexible, easy to use logging service for Ruby
 
 LICENSE=	RUBY
 
-RUN_DEPENDS=	rubygem-eventmachine>=0.0.0:${PORTSDIR}/devel/rubygem-eventmachine
+RUN_DEPENDS=	rubygem-eventmachine>=0.0.0:devel/rubygem-eventmachine
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-annoy/Makefile b/devel/rubygem-annoy/Makefile
index c276d1616f98..88492e0ef491 100644
--- a/devel/rubygem-annoy/Makefile
+++ b/devel/rubygem-annoy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Present the user with a simple question before a destructive action
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-highline>=1.5.0:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-highline>=1.5.0:devel/rubygem-highline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-apipie-bindings/Makefile b/devel/rubygem-apipie-bindings/Makefile
index 82e05baba452..8acedba00b9d 100644
--- a/devel/rubygem-apipie-bindings/Makefile
+++ b/devel/rubygem-apipie-bindings/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Ruby bindings for API calls that are documented with Apipie
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-json>=1.2.1:${PORTSDIR}/devel/rubygem-json \
-		rubygem-oauth>=0.4.7:${PORTSDIR}/net/rubygem-oauth \
-		rubygem-rest-client>=1.6.5:${PORTSDIR}/www/rubygem-rest-client
+RUN_DEPENDS=	rubygem-json>=1.2.1:devel/rubygem-json \
+		rubygem-oauth>=0.4.7:net/rubygem-oauth \
+		rubygem-rest-client>=1.6.5:www/rubygem-rest-client
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-app_config/Makefile b/devel/rubygem-app_config/Makefile
index adb7c9f8ef5c..ab6fdc1fdd43 100644
--- a/devel/rubygem-app_config/Makefile
+++ b/devel/rubygem-app_config/Makefile
@@ -15,8 +15,8 @@ OPTIONS_DEFAULT=SQLITE3
 MONGODB_DESC=	MongoDB backend support
 SQLITE3_DESC=	SQLite 3 backend support
 
-MONGODB_RUN_DEPENDS=	rubygem-mongo>=0:${PORTSDIR}/devel/rubygem-mongo
-SQLITE3_RUN_DEPENDS=	rubygem-sqlite3>=0:${PORTSDIR}/databases/rubygem-sqlite3
+MONGODB_RUN_DEPENDS=	rubygem-mongo>=0:devel/rubygem-mongo
+SQLITE3_RUN_DEPENDS=	rubygem-sqlite3>=0:databases/rubygem-sqlite3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-astrolabe/Makefile b/devel/rubygem-astrolabe/Makefile
index 1428a1468817..d4c5ffc75576 100644
--- a/devel/rubygem-astrolabe/Makefile
+++ b/devel/rubygem-astrolabe/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Object-oriented AST extension for rubygem-parser
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-parser>=2.2:${PORTSDIR}/devel/rubygem-parser
+RUN_DEPENDS=	rubygem-parser>=2.2:devel/rubygem-parser
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-atoulme-antwrap/Makefile b/devel/rubygem-atoulme-antwrap/Makefile
index b76dc43e5a92..c10642bc47f7 100644
--- a/devel/rubygem-atoulme-antwrap/Makefile
+++ b/devel/rubygem-atoulme-antwrap/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby wrapper for Apache Ant
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
-		rubygem-rjb>=1.0.3:${PORTSDIR}/java/rubygem-rjb
+RUN_DEPENDS=	ant:devel/apache-ant \
+		rubygem-rjb>=1.0.3:java/rubygem-rjb
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-authlogic/Makefile b/devel/rubygem-authlogic/Makefile
index 60920adfbbf1..dbdb86893481 100644
--- a/devel/rubygem-authlogic/Makefile
+++ b/devel/rubygem-authlogic/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Clean, simple, and unobtrusive Ruby authentication solution
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=3.2:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-activesupport4>=3.2:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-request_store>=1.0:${PORTSDIR}/devel/rubygem-request_store \
-		rubygem-scrypt>=1.2:${PORTSDIR}/security/rubygem-scrypt
+RUN_DEPENDS=	rubygem-activerecord4>=3.2:databases/rubygem-activerecord4 \
+		rubygem-activesupport4>=3.2:devel/rubygem-activesupport4 \
+		rubygem-request_store>=1.0:devel/rubygem-request_store \
+		rubygem-scrypt>=1.2:security/rubygem-scrypt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-axiom-types/Makefile b/devel/rubygem-axiom-types/Makefile
index b9257e9b46a1..f94687668a02 100644
--- a/devel/rubygem-axiom-types/Makefile
+++ b/devel/rubygem-axiom-types/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Abstract types for logic programming in Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-descendants_tracker>=0.0.4:${PORTSDIR}/devel/rubygem-descendants_tracker \
-		rubygem-ice_nine>=0.11.0:${PORTSDIR}/devel/rubygem-ice_nine \
-		rubygem-thread_safe>=0.3.1:${PORTSDIR}/devel/rubygem-thread_safe
+RUN_DEPENDS=	rubygem-descendants_tracker>=0.0.4:devel/rubygem-descendants_tracker \
+		rubygem-ice_nine>=0.11.0:devel/rubygem-ice_nine \
+		rubygem-thread_safe>=0.3.1:devel/rubygem-thread_safe
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-benelux/Makefile b/devel/rubygem-benelux/Makefile
index 1a984de786fd..999292f41b56 100644
--- a/devel/rubygem-benelux/Makefile
+++ b/devel/rubygem-benelux/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Mad way to time Ruby codes
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-attic>=0.5.3:${PORTSDIR}/devel/rubygem-attic \
-		rubygem-storable>=0.8.6:${PORTSDIR}/devel/rubygem-storable
+RUN_DEPENDS=	rubygem-attic>=0.5.3:devel/rubygem-attic \
+		rubygem-storable>=0.8.6:devel/rubygem-storable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-binding_of_caller/Makefile b/devel/rubygem-binding_of_caller/Makefile
index f4d35a86efd1..770a79239cc7 100644
--- a/devel/rubygem-binding_of_caller/Makefile
+++ b/devel/rubygem-binding_of_caller/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Retrieve the binding of a methods caller
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-debug_inspector>=0.0.1:${PORTSDIR}/devel/rubygem-debug_inspector
+RUN_DEPENDS=	rubygem-debug_inspector>=0.0.1:devel/rubygem-debug_inspector
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-blobstore_client/Makefile b/devel/rubygem-blobstore_client/Makefile
index ab68bfde3ca9..ca1d6bc40476 100644
--- a/devel/rubygem-blobstore_client/Makefile
+++ b/devel/rubygem-blobstore_client/Makefile
@@ -10,10 +10,10 @@ COMMENT=	BOSH blobstore client
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-aws-sdk-resources>=2.2.0:${PORTSDIR}/devel/rubygem-aws-sdk-resources \
-		rubygem-bosh_common>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-bosh_common \
-		rubygem-httpclient>=2.7.1:${PORTSDIR}/www/rubygem-httpclient \
-		rubygem-multi_json>=1.1:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-aws-sdk-resources>=2.2.0:devel/rubygem-aws-sdk-resources \
+		rubygem-bosh_common>=${PORTVERSION}:devel/rubygem-bosh_common \
+		rubygem-httpclient>=2.7.1:www/rubygem-httpclient \
+		rubygem-multi_json>=1.1:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-bones/Makefile b/devel/rubygem-bones/Makefile
index 9db9431d44a9..5480979314e1 100644
--- a/devel/rubygem-bones/Makefile
+++ b/devel/rubygem-bones/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Tool to create new projects from code skeleton
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-little-plugger>=1.1:${PORTSDIR}/devel/rubygem-little-plugger \
-		rubygem-loquacious>=1.9:${PORTSDIR}/devel/rubygem-loquacious \
-		rubygem-rake>=10.0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-little-plugger>=1.1:devel/rubygem-little-plugger \
+		rubygem-loquacious>=1.9:devel/rubygem-loquacious \
+		rubygem-rake>=10.0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-bosh-template/Makefile b/devel/rubygem-bosh-template/Makefile
index a9e4a750e72c..4e43c172b3b7 100644
--- a/devel/rubygem-bosh-template/Makefile
+++ b/devel/rubygem-bosh-template/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Renders bosh templates
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-semi_semantic>=1.1.0:${PORTSDIR}/devel/rubygem-semi_semantic
+RUN_DEPENDS=	rubygem-semi_semantic>=1.1.0:devel/rubygem-semi_semantic
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-bosh_common/Makefile b/devel/rubygem-bosh_common/Makefile
index 0982ebcb1ef6..bacac934b1d9 100644
--- a/devel/rubygem-bosh_common/Makefile
+++ b/devel/rubygem-bosh_common/Makefile
@@ -10,8 +10,8 @@ COMMENT=	BOSH common
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-logging>=1.8.2:${PORTSDIR}/devel/rubygem-logging \
-		rubygem-semi_semantic>=1.1.0:${PORTSDIR}/devel/rubygem-semi_semantic
+RUN_DEPENDS=	rubygem-logging>=1.8.2:devel/rubygem-logging \
+		rubygem-semi_semantic>=1.1.0:devel/rubygem-semi_semantic
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-bugspots/Makefile b/devel/rubygem-bugspots/Makefile
index eeeb406c8e01..085d2cf269cf 100644
--- a/devel/rubygem-bugspots/Makefile
+++ b/devel/rubygem-bugspots/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Bugspots - Bug Prediction Heuristic
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rainbow>=0:${PORTSDIR}/devel/rubygem-rainbow \
-		rubygem-rugged>=0.21.0:${PORTSDIR}/devel/rubygem-rugged
+RUN_DEPENDS=	rubygem-rainbow>=0:devel/rubygem-rainbow \
+		rubygem-rugged>=0.21.0:devel/rubygem-rugged
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cairo-gobject/Makefile b/devel/rubygem-cairo-gobject/Makefile
index 02eaa1fa7883..abebbe91ced4 100644
--- a/devel/rubygem-cairo-gobject/Makefile
+++ b/devel/rubygem-cairo-gobject/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby binding for cairo-gobject
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-cairo>=0:${PORTSDIR}/graphics/rubygem-cairo \
-		rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2
+RUN_DEPENDS=	rubygem-cairo>=0:graphics/rubygem-cairo \
+		rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-capybara/Makefile b/devel/rubygem-capybara/Makefile
index 8097e9391045..460f71efadce 100644
--- a/devel/rubygem-capybara/Makefile
+++ b/devel/rubygem-capybara/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Integration testing tool for rack based web applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-RUN_DEPENDS=	rubygem-addressable>=0:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-nokogiri>=1.3.3:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-rack16>=1.0.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-rack-test>=0.5.4:${PORTSDIR}/www/rubygem-rack-test \
-		rubygem-xpath>=2.0:${PORTSDIR}/devel/rubygem-xpath
+RUN_DEPENDS=	rubygem-addressable>=0:www/rubygem-addressable \
+		rubygem-mime-types>=1.16:misc/rubygem-mime-types \
+		rubygem-nokogiri>=1.3.3:textproc/rubygem-nokogiri \
+		rubygem-rack16>=1.0.0:www/rubygem-rack16 \
+		rubygem-rack-test>=0.5.4:www/rubygem-rack-test \
+		rubygem-xpath>=2.0:devel/rubygem-xpath
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-essentials/Makefile b/devel/rubygem-celluloid-essentials/Makefile
index 1bedfa1e158c..8f603bcd12f9 100644
--- a/devel/rubygem-celluloid-essentials/Makefile
+++ b/devel/rubygem-celluloid-essentials/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Internally used tools, and superstructural dependencies of Celluloid
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-extras/Makefile b/devel/rubygem-celluloid-extras/Makefile
index 17cb3cc5a711..608bd3d4ecf0 100644
--- a/devel/rubygem-celluloid-extras/Makefile
+++ b/devel/rubygem-celluloid-extras/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Celluloid expansion, testing, and example classes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-fsm/Makefile b/devel/rubygem-celluloid-fsm/Makefile
index 5f240e51eedd..f20040ab7ec0 100644
--- a/devel/rubygem-celluloid-fsm/Makefile
+++ b/devel/rubygem-celluloid-fsm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple finite state machines with integrated Celluloid timeout support
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-io/Makefile b/devel/rubygem-celluloid-io/Makefile
index 530be2a6309f..4a3be64966ac 100644
--- a/devel/rubygem-celluloid-io/Makefile
+++ b/devel/rubygem-celluloid-io/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Evented IO for Celluloid actors
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-celluloid>=0.17.2:${PORTSDIR}/devel/rubygem-celluloid \
-		rubygem-nio4r>=1.1:${PORTSDIR}/devel/rubygem-nio4r \
-		rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-celluloid>=0.17.2:devel/rubygem-celluloid \
+		rubygem-nio4r>=1.1:devel/rubygem-nio4r \
+		rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-pool/Makefile b/devel/rubygem-celluloid-pool/Makefile
index 068579a892b1..44e61f99bdee 100644
--- a/devel/rubygem-celluloid-pool/Makefile
+++ b/devel/rubygem-celluloid-pool/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Actor pools for Celluloid
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-supervision/Makefile b/devel/rubygem-celluloid-supervision/Makefile
index 43a5bfa1e80e..d36d8e68076b 100644
--- a/devel/rubygem-celluloid-supervision/Makefile
+++ b/devel/rubygem-celluloid-supervision/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Supervisors, supervision groups, and supervision trees for Celluloid
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid/Makefile b/devel/rubygem-celluloid/Makefile
index 387fbd6d18f3..9a3faa134685 100644
--- a/devel/rubygem-celluloid/Makefile
+++ b/devel/rubygem-celluloid/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Build concurrent programs out of concurrent objects
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-celluloid-essentials>=0:${PORTSDIR}/devel/rubygem-celluloid-essentials \
-		rubygem-celluloid-extras>=0:${PORTSDIR}/devel/rubygem-celluloid-extras \
-		rubygem-celluloid-fsm>=0:${PORTSDIR}/devel/rubygem-celluloid-fsm \
-		rubygem-celluloid-pool>=0:${PORTSDIR}/devel/rubygem-celluloid-pool \
-		rubygem-celluloid-supervision>=0:${PORTSDIR}/devel/rubygem-celluloid-supervision \
-		rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-celluloid-essentials>=0:devel/rubygem-celluloid-essentials \
+		rubygem-celluloid-extras>=0:devel/rubygem-celluloid-extras \
+		rubygem-celluloid-fsm>=0:devel/rubygem-celluloid-fsm \
+		rubygem-celluloid-pool>=0:devel/rubygem-celluloid-pool \
+		rubygem-celluloid-supervision>=0:devel/rubygem-celluloid-supervision \
+		rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-childprocess/Makefile b/devel/rubygem-childprocess/Makefile
index 1ea5015c088a..fd53538bf9ec 100644
--- a/devel/rubygem-childprocess/Makefile
+++ b/devel/rubygem-childprocess/Makefile
@@ -12,7 +12,7 @@ COMMENT=	External background process controller
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-ffi>=1.0.11:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=1.0.11:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-classifier-reborn/Makefile b/devel/rubygem-classifier-reborn/Makefile
index 806f940517a6..cba9c597dd30 100644
--- a/devel/rubygem-classifier-reborn/Makefile
+++ b/devel/rubygem-classifier-reborn/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Classifier module for Bayesian and other types of classifications
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	rubygem-fast-stemmer>=1.0.0:${PORTSDIR}/devel/rubygem-fast-stemmer
+RUN_DEPENDS=	rubygem-fast-stemmer>=1.0.0:devel/rubygem-fast-stemmer
 
 PLIST_FILES=	bin/bayes.rb bin/summarize.rb
 
diff --git a/devel/rubygem-classifier/Makefile b/devel/rubygem-classifier/Makefile
index b4950305c6d5..cc855e8851f5 100644
--- a/devel/rubygem-classifier/Makefile
+++ b/devel/rubygem-classifier/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Classifier module for Bayesian and other types of classifications
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	rubygem-fast-stemmer>=1.0.0:${PORTSDIR}/devel/rubygem-fast-stemmer
+RUN_DEPENDS=	rubygem-fast-stemmer>=1.0.0:devel/rubygem-fast-stemmer
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-climate_control/Makefile b/devel/rubygem-climate_control/Makefile
index e91bc8eb3404..2b6b1488ec3c 100644
--- a/devel/rubygem-climate_control/Makefile
+++ b/devel/rubygem-climate_control/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Modify your ENV
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activesupport>=3.0:${PORTSDIR}/devel/rubygem-activesupport
+RUN_DEPENDS=	rubygem-activesupport>=3.0:devel/rubygem-activesupport
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-cliprompt/Makefile b/devel/rubygem-cliprompt/Makefile
index 3c9980cbdb99..c28b8cf307ba 100644
--- a/devel/rubygem-cliprompt/Makefile
+++ b/devel/rubygem-cliprompt/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Env aware lib for CLI prompt
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-paint>=1.0.0:${PORTSDIR}/devel/rubygem-paint
+RUN_DEPENDS=	rubygem-paint>=1.0.0:devel/rubygem-paint
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cloudfiles/Makefile b/devel/rubygem-cloudfiles/Makefile
index 166430fdbee0..cf6ecd2f09a9 100644
--- a/devel/rubygem-cloudfiles/Makefile
+++ b/devel/rubygem-cloudfiles/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby version of the Rackspace Cloud Files API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-json>=0:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=0:devel/rubygem-json
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-cocaine/Makefile b/devel/rubygem-cocaine/Makefile
index da3839231fb8..02ea322e8bd1 100644
--- a/devel/rubygem-cocaine/Makefile
+++ b/devel/rubygem-cocaine/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small library for doing (command) lines
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-climate_control>=0.0.3:${PORTSDIR}/devel/rubygem-climate_control
+RUN_DEPENDS=	rubygem-climate_control>=0.0.3:devel/rubygem-climate_control
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-coercible/Makefile b/devel/rubygem-coercible/Makefile
index 9df05f25f7d7..a56a7667f345 100644
--- a/devel/rubygem-coercible/Makefile
+++ b/devel/rubygem-coercible/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby coercion library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-descendants_tracker>=0.0.1:${PORTSDIR}/devel/rubygem-descendants_tracker
+RUN_DEPENDS=	rubygem-descendants_tracker>=0.0.1:devel/rubygem-descendants_tracker
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-coffee-rails/Makefile b/devel/rubygem-coffee-rails/Makefile
index 7d57153c0303..5e39f9090d36 100644
--- a/devel/rubygem-coffee-rails/Makefile
+++ b/devel/rubygem-coffee-rails/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Coffee Script adapter for the Rails asset pipeline
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-coffee-script>=2.2.0:${PORTSDIR}/devel/rubygem-coffee-script \
-		rubygem-railties>=3.2.10:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-coffee-script>=2.2.0:devel/rubygem-coffee-script \
+		rubygem-railties>=3.2.10:www/rubygem-railties
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-coffee-rails4/Makefile b/devel/rubygem-coffee-rails4/Makefile
index 336cf4ce8086..cb7f81ed17c9 100644
--- a/devel/rubygem-coffee-rails4/Makefile
+++ b/devel/rubygem-coffee-rails4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Coffee Script adapter for the Rails asset pipeline
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS?=	rubygem-coffee-script>=2.2.0:${PORTSDIR}/devel/rubygem-coffee-script \
-		rubygem-railties4>=4.0.0:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS?=	rubygem-coffee-script>=2.2.0:devel/rubygem-coffee-script \
+		rubygem-railties4>=4.0.0:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-coffee-script/Makefile b/devel/rubygem-coffee-script/Makefile
index 5b2d93a7df1b..faf311eaaf86 100644
--- a/devel/rubygem-coffee-script/Makefile
+++ b/devel/rubygem-coffee-script/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-coffee-script-source>=0:${PORTSDIR}/devel/rubygem-coffee-script-source \
-		rubygem-execjs>=0:${PORTSDIR}/devel/rubygem-execjs
+RUN_DEPENDS=	rubygem-coffee-script-source>=0:devel/rubygem-coffee-script-source \
+		rubygem-execjs>=0:devel/rubygem-execjs
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-commander/Makefile b/devel/rubygem-commander/Makefile
index 1dc74de9b7ee..aeaf14c43bba 100644
--- a/devel/rubygem-commander/Makefile
+++ b/devel/rubygem-commander/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Complete solution for Ruby command-line executables
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-highline>=1.7.2:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-highline>=1.7.2:devel/rubygem-highline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-concurrent-ruby-edge/Makefile b/devel/rubygem-concurrent-ruby-edge/Makefile
index c0d8af7f029c..62dae10241ab 100644
--- a/devel/rubygem-concurrent-ruby-edge/Makefile
+++ b/devel/rubygem-concurrent-ruby-edge/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bleeding edge features for concurrent-ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0.1:${PORTSDIR}/devel/rubygem-concurrent-ruby
+RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0.1:devel/rubygem-concurrent-ruby
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cool.io/Makefile b/devel/rubygem-cool.io/Makefile
index fb35482e95d8..2c507eae5a2d 100644
--- a/devel/rubygem-cool.io/Makefile
+++ b/devel/rubygem-cool.io/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Gems for cool.io
 LICENSE=	MIT
 
 RUN_DEPENDS=	\
-	rubygem-iobuffer>=1.0.0:${PORTSDIR}/devel/rubygem-iobuffer
+	rubygem-iobuffer>=1.0.0:devel/rubygem-iobuffer
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-crack/Makefile b/devel/rubygem-crack/Makefile
index 8c5b646b78eb..277e03c387eb 100644
--- a/devel/rubygem-crack/Makefile
+++ b/devel/rubygem-crack/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby Library of Simple JSON and XML Parsing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-safe_yaml>=1.0.0:${PORTSDIR}/devel/rubygem-safe_yaml
+RUN_DEPENDS=	rubygem-safe_yaml>=1.0.0:devel/rubygem-safe_yaml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cri/Makefile b/devel/rubygem-cri/Makefile
index 01899685c72a..0323a9de257b 100644
--- a/devel/rubygem-cri/Makefile
+++ b/devel/rubygem-cri/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Allows building easy-to-use commandline interfaces
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-colored>=1.2:${PORTSDIR}/textproc/rubygem-colored
+RUN_DEPENDS=	rubygem-colored>=1.2:textproc/rubygem-colored
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-cucumber-core/Makefile b/devel/rubygem-cucumber-core/Makefile
index 5854c25ee110..0c59b930b38a 100644
--- a/devel/rubygem-cucumber-core/Makefile
+++ b/devel/rubygem-cucumber-core/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Core library for the Cucumber BDD app
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-gherkin>=3.2.0:${PORTSDIR}/textproc/rubygem-gherkin
+RUN_DEPENDS=	rubygem-gherkin>=3.2.0:textproc/rubygem-gherkin
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cucumber/Makefile b/devel/rubygem-cucumber/Makefile
index ecfb9700ee87..f1467f6e5054 100644
--- a/devel/rubygem-cucumber/Makefile
+++ b/devel/rubygem-cucumber/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Behaviour Driven Development with elegance and joy
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-builder32>=2.1.2:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-cucumber-core>=1.4.0:${PORTSDIR}/devel/rubygem-cucumber-core \
-		rubygem-cucumber-wire>=0.0.1:${PORTSDIR}/devel/rubygem-cucumber-wire \
-		rubygem-diff-lcs>=1.1.3:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-gherkin>=3.2.0:${PORTSDIR}/textproc/rubygem-gherkin \
-		rubygem-multi_json>=1.7.5:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-multi_test>=0.1.2:${PORTSDIR}/devel/rubygem-multi_test
+RUN_DEPENDS=	rubygem-builder32>=2.1.2:devel/rubygem-builder32 \
+		rubygem-cucumber-core>=1.4.0:devel/rubygem-cucumber-core \
+		rubygem-cucumber-wire>=0.0.1:devel/rubygem-cucumber-wire \
+		rubygem-diff-lcs>=1.1.3:textproc/rubygem-diff-lcs \
+		rubygem-gherkin>=3.2.0:textproc/rubygem-gherkin \
+		rubygem-multi_json>=1.7.5:devel/rubygem-multi_json \
+		rubygem-multi_test>=0.1.2:devel/rubygem-multi_test
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cyoi/Makefile b/devel/rubygem-cyoi/Makefile
index 3dbd93888bb0..6160488b0dcb 100644
--- a/devel/rubygem-cyoi/Makefile
+++ b/devel/rubygem-cyoi/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Library to prompt for infrastructure and login credentials
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-fog>=0:${PORTSDIR}/devel/rubygem-fog \
-		rubygem-highline>=1.6:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-readwritesettings>=3.0:${PORTSDIR}/devel/rubygem-readwritesettings
+RUN_DEPENDS=	rubygem-fog>=0:devel/rubygem-fog \
+		rubygem-highline>=1.6:devel/rubygem-highline \
+		rubygem-readwritesettings>=3.0:devel/rubygem-readwritesettings
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-debugger-xml/Makefile b/devel/rubygem-debugger-xml/Makefile
index 9e093e73a550..d7a65e305fa7 100644
--- a/devel/rubygem-debugger-xml/Makefile
+++ b/devel/rubygem-debugger-xml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	XML interface for rubygem-debugger
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-builder32>=2.0.0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-byebug>=0:${PORTSDIR}/devel/rubygem-byebug
+RUN_DEPENDS=	rubygem-builder32>=2.0.0:devel/rubygem-builder32 \
+		rubygem-byebug>=0:devel/rubygem-byebug
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-deface/Makefile b/devel/rubygem-deface/Makefile
index a73add234e17..786bec9148c7 100644
--- a/devel/rubygem-deface/Makefile
+++ b/devel/rubygem-deface/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Customize ERB, Haml and Slim views in a Rails application
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-colorize>=0.5.8:${PORTSDIR}/devel/rubygem-colorize \
-		rubygem-nokogiri>=1.6.0:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-polyglot>=0.3:${PORTSDIR}/devel/rubygem-polyglot \
-		rubygem-rails4>=3.1:${PORTSDIR}/www/rubygem-rails4
+RUN_DEPENDS=	rubygem-colorize>=0.5.8:devel/rubygem-colorize \
+		rubygem-nokogiri>=1.6.0:textproc/rubygem-nokogiri \
+		rubygem-polyglot>=0.3:devel/rubygem-polyglot \
+		rubygem-rails4>=3.1:www/rubygem-rails4
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-default_value_for/Makefile b/devel/rubygem-default_value_for/Makefile
index 9794779fe41d..4b1b8342120f 100644
--- a/devel/rubygem-default_value_for/Makefile
+++ b/devel/rubygem-default_value_for/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Define default values for ActiveRecord models in a declarative manner
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.1.4:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=4.1.4:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-delayed_job/Makefile b/devel/rubygem-delayed_job/Makefile
index 275a01ba7f9b..22dd0e4952ad 100644
--- a/devel/rubygem-delayed_job/Makefile
+++ b/devel/rubygem-delayed_job/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Asynchronously executing longer tasks in the background
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-activesupport4>=3.0:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=3.0:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-delayer-deferred/Makefile b/devel/rubygem-delayer-deferred/Makefile
index fc4dfbd773cb..aa7219f3114f 100644
--- a/devel/rubygem-delayer-deferred/Makefile
+++ b/devel/rubygem-delayer-deferred/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Deferred for Delayer
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-delayer>=0:${PORTSDIR}/devel/rubygem-delayer
+RUN_DEPENDS=	rubygem-delayer>=0:devel/rubygem-delayer
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-descendants_tracker/Makefile b/devel/rubygem-descendants_tracker/Makefile
index a435ab10bc7a..9b875e0fb6a8 100644
--- a/devel/rubygem-descendants_tracker/Makefile
+++ b/devel/rubygem-descendants_tracker/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Module that adds descendant tracking to a class
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-thread_safe>=0.3.1:${PORTSDIR}/devel/rubygem-thread_safe
+RUN_DEPENDS=	rubygem-thread_safe>=0.3.1:devel/rubygem-thread_safe
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-devise-async-rails4/Makefile b/devel/rubygem-devise-async-rails4/Makefile
index 1eb552af3190..9695d44f9cb1 100644
--- a/devel/rubygem-devise-async-rails4/Makefile
+++ b/devel/rubygem-devise-async-rails4/Makefile
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	-rails4
 
-RUN_DEPENDS=    rubygem-devise-rails4>=3.2:${PORTSDIR}/devel/rubygem-devise-rails4
+RUN_DEPENDS=    rubygem-devise-rails4>=3.2:devel/rubygem-devise-rails4
 
 MASTERDIR=	${.CURDIR}/../rubygem-devise-async
 
diff --git a/devel/rubygem-devise-async/Makefile b/devel/rubygem-devise-async/Makefile
index 2724f15bcbaa..1d0a643cad64 100644
--- a/devel/rubygem-devise-async/Makefile
+++ b/devel/rubygem-devise-async/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Send Devise emails in background
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS?=	rubygem-devise>=3.2:${PORTSDIR}/devel/rubygem-devise
+RUN_DEPENDS?=	rubygem-devise>=3.2:devel/rubygem-devise
 
 SLAVEDIRS=	devel/rubygem-devise-async-rails4
 
diff --git a/devel/rubygem-devise/Makefile b/devel/rubygem-devise/Makefile
index 4fefee5de619..0cc0aa0062ba 100644
--- a/devel/rubygem-devise/Makefile
+++ b/devel/rubygem-devise/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Flexible authentication solution for Rails with Warden
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-bcrypt>=3.0:${PORTSDIR}/security/rubygem-bcrypt \
-		rubygem-orm_adapter>=0.1:${PORTSDIR}/devel/rubygem-orm_adapter \
-		rubygem-thread_safe>=0.1:${PORTSDIR}/devel/rubygem-thread_safe \
-		rubygem-warden>=1.2.3:${PORTSDIR}/devel/rubygem-warden
+RUN_DEPENDS=	rubygem-bcrypt>=3.0:security/rubygem-bcrypt \
+		rubygem-orm_adapter>=0.1:devel/rubygem-orm_adapter \
+		rubygem-thread_safe>=0.1:devel/rubygem-thread_safe \
+		rubygem-warden>=1.2.3:devel/rubygem-warden
 
 NO_ARCH=	yes
 USE_RUBY=	yes
@@ -37,10 +37,10 @@ OPTIONS_DEFAULT=	RAILS3
 RAILS3_DESC=		Use Rails 3 as backend
 RAILS4_DESC=		Use Rails 4 as backend
 
-RAILS3_RUN_DEPENDS=	rubygem-railties>=3.2.6:${PORTSDIR}/www/rubygem-railties \
-			rubygem-responders-rails3>=0:${PORTSDIR}/www/rubygem-responders-rails3
-RAILS4_RUN_DEPENDS=	rubygem-railties4>=4.1.1:${PORTSDIR}/www/rubygem-railties4 \
-			rubygem-responders>=0:${PORTSDIR}/www/rubygem-responders
+RAILS3_RUN_DEPENDS=	rubygem-railties>=3.2.6:www/rubygem-railties \
+			rubygem-responders-rails3>=0:www/rubygem-responders-rails3
+RAILS4_RUN_DEPENDS=	rubygem-railties4>=4.1.1:www/rubygem-railties4 \
+			rubygem-responders>=0:www/rubygem-responders
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|, "test/rails_app/config/routes.rb"||' ${WRKSRC}/${PORTNAME}.gemspec
diff --git a/devel/rubygem-ditz/Makefile b/devel/rubygem-ditz/Makefile
index 38de9cdf0d8b..866a6be5e4e9 100644
--- a/devel/rubygem-ditz/Makefile
+++ b/devel/rubygem-ditz/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple lightweight distributed issue tracker
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-trollop>=1.9:${PORTSDIR}/devel/rubygem-trollop
+RUN_DEPENDS=	rubygem-trollop>=1.9:devel/rubygem-trollop
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-dynflow/Makefile b/devel/rubygem-dynflow/Makefile
index aadbb36b7e02..cb7da8bff6e5 100644
--- a/devel/rubygem-dynflow/Makefile
+++ b/devel/rubygem-dynflow/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Ruby workflow/orchestration engine
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-algebrick>=0.7.0:${PORTSDIR}/devel/rubygem-algebrick \
-		rubygem-apipie-params>=0:${PORTSDIR}/devel/rubygem-apipie-params \
-		rubygem-concurrent-ruby>=1.0:${PORTSDIR}/devel/rubygem-concurrent-ruby \
-		rubygem-concurrent-ruby-edge>=0.2:${PORTSDIR}/devel/rubygem-concurrent-ruby-edge \
-		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-sequel>=0:${PORTSDIR}/devel/rubygem-sequel
+RUN_DEPENDS=	rubygem-algebrick>=0.7.0:devel/rubygem-algebrick \
+		rubygem-apipie-params>=0:devel/rubygem-apipie-params \
+		rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \
+		rubygem-concurrent-ruby-edge>=0.2:devel/rubygem-concurrent-ruby-edge \
+		rubygem-multi_json>=0:devel/rubygem-multi_json \
+		rubygem-sequel>=0:devel/rubygem-sequel
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-enumerize/Makefile b/devel/rubygem-enumerize/Makefile
index 07813cd054b6..08c88e16878a 100644
--- a/devel/rubygem-enumerize/Makefile
+++ b/devel/rubygem-enumerize/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper su
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=3.2:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=3.2:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-errand/Makefile b/devel/rubygem-errand/Makefile
index ddf444c29532..72d8e9da12ae 100644
--- a/devel/rubygem-errand/Makefile
+++ b/devel/rubygem-errand/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	RG
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Ruby bindings for RRD
 
-RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
-		rubygem-rrd-ffi>=0.2.13:${PORTSDIR}/devel/rubygem-rrd-ffi
+RUN_DEPENDS=	rrdtool:databases/rrdtool \
+		rubygem-rrd-ffi>=0.2.13:devel/rubygem-rrd-ffi
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-execjs/Makefile b/devel/rubygem-execjs/Makefile
index 1562e657bc85..c49dfcf0b3bd 100644
--- a/devel/rubygem-execjs/Makefile
+++ b/devel/rubygem-execjs/Makefile
@@ -11,7 +11,7 @@ COMMENT=	ExecJS lets you run JavaScript code from Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	node:${PORTSDIR}/www/node
+RUN_DEPENDS=	node:www/node
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-faraday_middleware-multi_json/Makefile b/devel/rubygem-faraday_middleware-multi_json/Makefile
index d3ab0a485bc4..fcc0d73c14a4 100644
--- a/devel/rubygem-faraday_middleware-multi_json/Makefile
+++ b/devel/rubygem-faraday_middleware-multi_json/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Faraday response parser using MultiJson
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-faraday_middleware>0:${PORTSDIR}/www/rubygem-faraday_middleware \
-		rubygem-multi_json>0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-faraday_middleware>0:www/rubygem-faraday_middleware \
+		rubygem-multi_json>0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-fast_stack/Makefile b/devel/rubygem-fast_stack/Makefile
index 57fb37c8609f..4743c73755e0 100644
--- a/devel/rubygem-fast_stack/Makefile
+++ b/devel/rubygem-fast_stack/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Fast method for collecting stack traces
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rake-compiler>=0:${PORTSDIR}/devel/rubygem-rake-compiler
+RUN_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake \
+		rubygem-rake-compiler>=0:devel/rubygem-rake-compiler
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-fast_xor/Makefile b/devel/rubygem-fast_xor/Makefile
index fabdd16bad4b..a2a1cc0bba1e 100644
--- a/devel/rubygem-fast_xor/Makefile
+++ b/devel/rubygem-fast_xor/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Fast String XOR operator
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rake-compiler>=0:${PORTSDIR}/devel/rubygem-rake-compiler
+RUN_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake \
+		rubygem-rake-compiler>=0:devel/rubygem-rake-compiler
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-ffi-compiler/Makefile b/devel/rubygem-ffi-compiler/Makefile
index 13d7ed77d994..6202752c49d8 100644
--- a/devel/rubygem-ffi-compiler/Makefile
+++ b/devel/rubygem-ffi-compiler/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby FFI library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-ffi>=1.0.0:${PORTSDIR}/devel/rubygem-ffi \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-ffi>=1.0.0:devel/rubygem-ffi \
+		rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ffi-yajl/Makefile b/devel/rubygem-ffi-yajl/Makefile
index ee65b4a15e31..708d636a2831 100644
--- a/devel/rubygem-ffi-yajl/Makefile
+++ b/devel/rubygem-ffi-yajl/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Ruby FFI wrapper around YAJL 2.x
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	yajl>=2.0.0:${PORTSDIR}/devel/yajl \
-		rubygem-ffi>=0:${PORTSDIR}/devel/rubygem-ffi \
-		rubygem-libyajl2>=1.0.0:${PORTSDIR}/devel/rubygem-libyajl2
+RUN_DEPENDS=	yajl>=2.0.0:devel/yajl \
+		rubygem-ffi>=0:devel/rubygem-ffi \
+		rubygem-libyajl2>=1.0.0:devel/rubygem-libyajl2
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-ffi/Makefile b/devel/rubygem-ffi/Makefile
index 47129fa4788a..4f5328b8df94 100644
--- a/devel/rubygem-ffi/Makefile
+++ b/devel/rubygem-ffi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Extension for dynamic libraries & binding functions
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-file-tail/Makefile b/devel/rubygem-file-tail/Makefile
index 93991d036957..4fac3f431ce7 100644
--- a/devel/rubygem-file-tail/Makefile
+++ b/devel/rubygem-file-tail/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby library that allows Ruby to 'tail' files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-tins>=1.0:${PORTSDIR}/devel/rubygem-tins
+RUN_DEPENDS=	rubygem-tins>=1.0:devel/rubygem-tins
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-fluent-logger/Makefile b/devel/rubygem-fluent-logger/Makefile
index f017fb8b1e6c..a876fb3af902 100644
--- a/devel/rubygem-fluent-logger/Makefile
+++ b/devel/rubygem-fluent-logger/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Structured event logger for Ruby
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-msgpack>=0.5.4:${PORTSDIR}/devel/rubygem-msgpack
+RUN_DEPENDS=	rubygem-msgpack>=0.5.4:devel/rubygem-msgpack
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-fog-core/Makefile b/devel/rubygem-fog-core/Makefile
index 29f80829ab1c..f83d407ac076 100644
--- a/devel/rubygem-fog-core/Makefile
+++ b/devel/rubygem-fog-core/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Shared classes and tests for fog providers and services
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-excon>=0.45:${PORTSDIR}/devel/rubygem-excon \
-		rubygem-formatador>=0.2:${PORTSDIR}/devel/rubygem-formatador
+RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-excon>=0.45:devel/rubygem-excon \
+		rubygem-formatador>=0.2:devel/rubygem-formatador
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-fog-json/Makefile b/devel/rubygem-fog-json/Makefile
index 2d970923fb40..e366738eb7f3 100644
--- a/devel/rubygem-fog-json/Makefile
+++ b/devel/rubygem-fog-json/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Extraction of the JSON parsing tools between providers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=1.0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-multi_json>=1.10:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-fog-core>=1.0:devel/rubygem-fog-core \
+		rubygem-multi_json>=1.10:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-font-awesome-rails-rails4/Makefile b/devel/rubygem-font-awesome-rails-rails4/Makefile
index 4383b6a3750a..55708ca9b450 100644
--- a/devel/rubygem-font-awesome-rails-rails4/Makefile
+++ b/devel/rubygem-font-awesome-rails-rails4/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT OFL11
 LICENSE_COMB=	dual
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-railties4>=3.2:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-railties4>=3.2:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-font-awesome-rails/Makefile b/devel/rubygem-font-awesome-rails/Makefile
index 1f313468597e..37002b4c78fc 100644
--- a/devel/rubygem-font-awesome-rails/Makefile
+++ b/devel/rubygem-font-awesome-rails/Makefile
@@ -12,7 +12,7 @@ LICENSE=	MIT OFL11
 LICENSE_COMB=	dual
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-railties>=3.2:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-railties>=3.2:www/rubygem-railties
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-foreigner/Makefile b/devel/rubygem-foreigner/Makefile
index 2ee08bef7c9d..bff96b352867 100644
--- a/devel/rubygem-foreigner/Makefile
+++ b/devel/rubygem-foreigner/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Adds foreign key helpers to migrations
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=3.0.0:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=3.0.0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-foreman/Makefile b/devel/rubygem-foreman/Makefile
index 43153235a896..9edc21e47d6f 100644
--- a/devel/rubygem-foreman/Makefile
+++ b/devel/rubygem-foreman/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Process manager for applications with multiple components
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-thor>=0.19.1:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-thor>=0.19.1:devel/rubygem-thor
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-gemnasium-gitlab-service/Makefile b/devel/rubygem-gemnasium-gitlab-service/Makefile
index 9943c0bb6e0d..fea1f55a9f05 100644
--- a/devel/rubygem-gemnasium-gitlab-service/Makefile
+++ b/devel/rubygem-gemnasium-gitlab-service/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Gemnasium support for GitLab projects
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-rugged>=0.21:${PORTSDIR}/devel/rubygem-rugged
+RUN_DEPENDS=	rubygem-rugged>=0.21:devel/rubygem-rugged
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-generator_spec-rails4/Makefile b/devel/rubygem-generator_spec-rails4/Makefile
index 6fb49990299a..535063d6dc44 100644
--- a/devel/rubygem-generator_spec-rails4/Makefile
+++ b/devel/rubygem-generator_spec-rails4/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Test Rails generators with RSpec
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.1.4:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-railties4>=4.1.4:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-activerecord4>=4.1.4:databases/rubygem-activerecord4 \
+		rubygem-railties4>=4.1.4:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-generator_spec/Makefile b/devel/rubygem-generator_spec/Makefile
index 56b5acb1d67e..2e3e7b440540 100644
--- a/devel/rubygem-generator_spec/Makefile
+++ b/devel/rubygem-generator_spec/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Test Rails generators with RSpec
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord>=3.0.0:${PORTSDIR}/databases/rubygem-activerecord \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-activerecord>=3.0.0:databases/rubygem-activerecord \
+		rubygem-railties>=3.0.0:www/rubygem-railties
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-gettext/Makefile b/devel/rubygem-gettext/Makefile
index 5281306381d9..9cd0dab4478e 100644
--- a/devel/rubygem-gettext/Makefile
+++ b/devel/rubygem-gettext/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby implementation of the gettext library
 LICENSE=	RUBY LGPL3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-locale>=2.0.5:${PORTSDIR}/devel/rubygem-locale \
-		rubygem-text>=1.3.0:${PORTSDIR}/textproc/rubygem-text
+RUN_DEPENDS=	rubygem-locale>=2.0.5:devel/rubygem-locale \
+		rubygem-text>=1.3.0:textproc/rubygem-text
 
 USES=	shebangfix
 NO_ARCH=	yes
diff --git a/devel/rubygem-gh/Makefile b/devel/rubygem-gh/Makefile
index 6549dde0e9d5..e123673949b9 100644
--- a/devel/rubygem-gh/Makefile
+++ b/devel/rubygem-gh/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Multi-layer client for the GitHub API v3
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=0:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-backports>=0:${PORTSDIR}/devel/rubygem-backports \
-		rubygem-faraday>=0.8:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-net-http-persistent>=2.7:${PORTSDIR}/www/rubygem-net-http-persistent \
-		rubygem-net-http-pipeline>=0:${PORTSDIR}/www/rubygem-net-http-pipeline
+RUN_DEPENDS=	rubygem-addressable>=0:www/rubygem-addressable \
+		rubygem-backports>=0:devel/rubygem-backports \
+		rubygem-faraday>=0.8:www/rubygem-faraday \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-net-http-persistent>=2.7:www/rubygem-net-http-persistent \
+		rubygem-net-http-pipeline>=0:www/rubygem-net-http-pipeline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-gio2/Makefile b/devel/rubygem-gio2/Makefile
index e9d120fc9a3f..dce1a43818e9 100644
--- a/devel/rubygem-gio2/Makefile
+++ b/devel/rubygem-gio2/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby binding for GLib2
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2 \
-		rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection
+RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2 \
+		rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-git/Makefile b/devel/rubygem-git/Makefile
index 9af3d325a3e3..ac50a84138cb 100644
--- a/devel/rubygem-git/Makefile
+++ b/devel/rubygem-git/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby wrapper library around git(1)
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	git>=1.6:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git>=1.6:devel/git
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-github_api/Makefile b/devel/rubygem-github_api/Makefile
index 29f9769f184e..4a449475492f 100644
--- a/devel/rubygem-github_api/Makefile
+++ b/devel/rubygem-github_api/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Wrapper that supports all of the GitHub API v3 methods
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-addressable>=2.4.0:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-descendants_tracker>=0.0.4:${PORTSDIR}/devel/rubygem-descendants_tracker \
-		rubygem-faraday>=0.8:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-hashie>=3.4:${PORTSDIR}/devel/rubygem-hashie \
-		rubygem-multi_json>=1.7.5:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-oauth2>=0:${PORTSDIR}/net/rubygem-oauth2
+RUN_DEPENDS=	rubygem-addressable>=2.4.0:www/rubygem-addressable \
+		rubygem-descendants_tracker>=0.0.4:devel/rubygem-descendants_tracker \
+		rubygem-faraday>=0.8:www/rubygem-faraday \
+		rubygem-hashie>=3.4:devel/rubygem-hashie \
+		rubygem-multi_json>=1.7.5:devel/rubygem-multi_json \
+		rubygem-oauth2>=0:net/rubygem-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-gitlab-pygments.rb/Makefile b/devel/rubygem-gitlab-pygments.rb/Makefile
index 696ac0556a3d..db5623da1efc 100644
--- a/devel/rubygem-gitlab-pygments.rb/Makefile
+++ b/devel/rubygem-gitlab-pygments.rb/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Exposes the pygments syntax highlighter to Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:${PORTSDIR}/devel/rubygem-posix-spawn \
-		rubygem-yajl-ruby>=1.1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn \
+		rubygem-yajl-ruby>=1.1.0:devel/rubygem-yajl-ruby
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-gitlab_git/Makefile b/devel/rubygem-gitlab_git/Makefile
index ff86feb15c40..65b94670e727 100644
--- a/devel/rubygem-gitlab_git/Makefile
+++ b/devel/rubygem-gitlab_git/Makefile
@@ -11,10 +11,10 @@ COMMENT=	GitLab wrapper around git objects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activesupport4>=4.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-charlock_holmes>=0.7.3:${PORTSDIR}/textproc/rubygem-charlock_holmes \
-		rubygem-github-linguist>=4.7.0:${PORTSDIR}/textproc/rubygem-github-linguist \
-		rubygem-rugged>=0.24.0:${PORTSDIR}/devel/rubygem-rugged
+RUN_DEPENDS=	rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
+		rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
+		rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
+		rubygem-rugged>=0.24.0:devel/rubygem-rugged
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-glib2/Makefile b/devel/rubygem-glib2/Makefile
index 14e938468c7f..c155e38ec540 100644
--- a/devel/rubygem-glib2/Makefile
+++ b/devel/rubygem-glib2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby binding for GLib2
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-pkg-config>=0:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS=	rubygem-pkg-config>=0:devel/rubygem-pkg-config
 
 USE_GNOME=	glib20
 USE_RUBY=	yes
diff --git a/devel/rubygem-gobject-introspection/Makefile b/devel/rubygem-gobject-introspection/Makefile
index 61cedf64f6eb..81d806b37304 100644
--- a/devel/rubygem-gobject-introspection/Makefile
+++ b/devel/rubygem-gobject-introspection/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby binding for GObjectIntrospection
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2
+RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
 
 USE_GNOME=	introspection
 USE_RUBY=	yes
diff --git a/devel/rubygem-grape-entity/Makefile b/devel/rubygem-grape-entity/Makefile
index fd0e6e89438d..82de25f3c075 100644
--- a/devel/rubygem-grape-entity/Makefile
+++ b/devel/rubygem-grape-entity/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Entities - a simple Facade to use with your models and API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-multi_json>=1.3.2:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
+		rubygem-multi_json>=1.3.2:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-grape-swagger/Makefile b/devel/rubygem-grape-swagger/Makefile
index a22d5ecb0db0..9f919f7ddf05 100644
--- a/devel/rubygem-grape-swagger/Makefile
+++ b/devel/rubygem-grape-swagger/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Documentation tool for grape APIs
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-grape>=0.8.0:${PORTSDIR}/devel/rubygem-grape \
-		rubygem-grape-entity>=0:${PORTSDIR}/devel/rubygem-grape-entity
+RUN_DEPENDS=	rubygem-grape>=0.8.0:devel/rubygem-grape \
+		rubygem-grape-entity>=0:devel/rubygem-grape-entity
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-grape/Makefile b/devel/rubygem-grape/Makefile
index ccb5e5eef003..4fbb6b40ebe1 100644
--- a/devel/rubygem-grape/Makefile
+++ b/devel/rubygem-grape/Makefile
@@ -11,15 +11,15 @@ COMMENT=	Framework for rapid API development with great conventions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-hashie>=2.1.0:${PORTSDIR}/devel/rubygem-hashie \
-		rubygem-multi_json>=1.3.2:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-multi_xml>=0.5.2:${PORTSDIR}/textproc/rubygem-multi_xml \
-		rubygem-rack16>=1.3.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-rack-accept>=0:${PORTSDIR}/www/rubygem-rack-accept \
-		rubygem-rack-mount>=0:${PORTSDIR}/www/rubygem-rack-mount\
-		rubygem-virtus>=1.0.0:${PORTSDIR}/devel/rubygem-virtus
+RUN_DEPENDS=	rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
+		rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-hashie>=2.1.0:devel/rubygem-hashie \
+		rubygem-multi_json>=1.3.2:devel/rubygem-multi_json \
+		rubygem-multi_xml>=0.5.2:textproc/rubygem-multi_xml \
+		rubygem-rack16>=1.3.0:www/rubygem-rack16 \
+		rubygem-rack-accept>=0:www/rubygem-rack-accept \
+		rubygem-rack-mount>=0:www/rubygem-rack-mount\
+		rubygem-virtus>=1.0.0:devel/rubygem-virtus
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-grit/Makefile b/devel/rubygem-grit/Makefile
index 82098ac6f17c..355230abfa5d 100644
--- a/devel/rubygem-grit/Makefile
+++ b/devel/rubygem-grit/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Object-oriented ruby library to access git repositories
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-diff-lcs>=1.1:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-mime-types1>=1.15:${PORTSDIR}/misc/rubygem-mime-types1 \
-		rubygem-posix-spawn>=0.3.6:${PORTSDIR}/devel/rubygem-posix-spawn
+RUN_DEPENDS=	rubygem-diff-lcs>=1.1:textproc/rubygem-diff-lcs \
+		rubygem-mime-types1>=1.15:misc/rubygem-mime-types1 \
+		rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-gyoku/Makefile b/devel/rubygem-gyoku/Makefile
index 464ce6c5d6d4..6b96441a30f2 100644
--- a/devel/rubygem-gyoku/Makefile
+++ b/devel/rubygem-gyoku/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for translating Ruby hashes to XML
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-builder32>=2.1.2:${PORTSDIR}/devel/rubygem-builder32
+RUN_DEPENDS=	rubygem-builder32>=2.1.2:devel/rubygem-builder32
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-hoe/Makefile b/devel/rubygem-hoe/Makefile
index 54c7a049a570..244c6e86ad14 100644
--- a/devel/rubygem-hoe/Makefile
+++ b/devel/rubygem-hoe/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple rake/rubygems helper for project Rakefiles
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rake>=0.8:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-rake>=0.8:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-io-like/Makefile b/devel/rubygem-io-like/Makefile
index 2d1f3562f209..d1ab453ff856 100644
--- a/devel/rubygem-io-like/Makefile
+++ b/devel/rubygem-io-like/Makefile
@@ -13,8 +13,8 @@ COMMENT=	The interface of IO objects to classes providing a few simple methods
 LICENSE=	RUBY
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
-RUN_DEPENDS=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
+BUILD_DEPENDS=	${RUBYGEMBIN}:devel/ruby-gems
+RUN_DEPENDS=	${RUBYGEMBIN}:devel/ruby-gems
 
 USE_RUBY=	yes
 USE_RAKE=	yes
@@ -56,7 +56,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-ruby-1.9-temp
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	rubygem-allison>=0:${PORTSDIR}/devel/rubygem-allison
+DOCS_BUILD_DEPENDS=	rubygem-allison>=0:devel/rubygem-allison
 DOCS_VARS_OFF=		RUBYGEM_ARGS+=--no-rdoc
 
 post-patch:
diff --git a/devel/rubygem-jammit/Makefile b/devel/rubygem-jammit/Makefile
index 31abbbe2568c..76f752a0083b 100644
--- a/devel/rubygem-jammit/Makefile
+++ b/devel/rubygem-jammit/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Industrial strength asset packaging library for Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-cssmin>=1.0:${PORTSDIR}/textproc/rubygem-cssmin \
-		rubygem-jsmin>=1.0:${PORTSDIR}/textproc/rubygem-jsmin
+RUN_DEPENDS=	rubygem-cssmin>=1.0:textproc/rubygem-cssmin \
+		rubygem-jsmin>=1.0:textproc/rubygem-jsmin
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-jbuilder/Makefile b/devel/rubygem-jbuilder/Makefile
index 3948418839bf..8d6c391c75d6 100644
--- a/devel/rubygem-jbuilder/Makefile
+++ b/devel/rubygem-jbuilder/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Create JSON structures via a Builder-style DSL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS?=	rubygem-activesupport4>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-multi_json>=1.2:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS?=	rubygem-activesupport4>=3.0.0:devel/rubygem-activesupport4 \
+		rubygem-multi_json>=1.2:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-jekyll-coffeescript/Makefile b/devel/rubygem-jekyll-coffeescript/Makefile
index 349631164c05..4ef501f50d2d 100644
--- a/devel/rubygem-jekyll-coffeescript/Makefile
+++ b/devel/rubygem-jekyll-coffeescript/Makefile
@@ -11,7 +11,7 @@ COMMENT=	CoffeeScript converter for Jekyll
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-coffee-script>=2.2:${PORTSDIR}/devel/rubygem-coffee-script
+RUN_DEPENDS=	rubygem-coffee-script>=2.2:devel/rubygem-coffee-script
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-jeweler/Makefile b/devel/rubygem-jeweler/Makefile
index 4d7cc666c14e..b1e5c5b00a30 100644
--- a/devel/rubygem-jeweler/Makefile
+++ b/devel/rubygem-jeweler/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Simple and opinionated helper for creating Rubygem projects
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-bundler>=1.0:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-git>=1.2.5:${PORTSDIR}/devel/rubygem-git \
-		rubygem-github_api>=0:${PORTSDIR}/devel/rubygem-github_api \
-		rubygem-highline>=1.6.15:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-nokogiri>=1.5.10:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-bundler>=1.0:sysutils/rubygem-bundler \
+		rubygem-git>=1.2.5:devel/rubygem-git \
+		rubygem-github_api>=0:devel/rubygem-github_api \
+		rubygem-highline>=1.6.15:devel/rubygem-highline \
+		rubygem-nokogiri>=1.5.10:textproc/rubygem-nokogiri \
+		rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-jquery-ui-themes/Makefile b/devel/rubygem-jquery-ui-themes/Makefile
index 48be2125315e..e36508b9056a 100644
--- a/devel/rubygem-jquery-ui-themes/Makefile
+++ b/devel/rubygem-jquery-ui-themes/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows inclusion of pre-built jquery themes without editing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-httparty>=0:${PORTSDIR}/www/rubygem-httparty
+RUN_DEPENDS=	rubygem-httparty>=0:www/rubygem-httparty
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-kafo/Makefile b/devel/rubygem-kafo/Makefile
index 6b0dd33b6922..d2d8e7533aac 100644
--- a/devel/rubygem-kafo/Makefile
+++ b/devel/rubygem-kafo/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Ruby framework to create installers
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
-		rubygem-ansi>=0:${PORTSDIR}/devel/rubygem-ansi \
-		rubygem-clamp>=0.6.2:${PORTSDIR}/devel/rubygem-clamp \
-		rubygem-highline>=1.6.21:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-kafo_parsers>=0:${PORTSDIR}/devel/rubygem-kafo_parsers \
-		rubygem-kafo_wizards>=0:${PORTSDIR}/devel/rubygem-kafo_wizards \
-		rubygem-logging>=0:${PORTSDIR}/devel/rubygem-logging \
-		rubygem-powerbar>=0:${PORTSDIR}/devel/rubygem-powerbar
+RUN_DEPENDS=	gsed:textproc/gsed \
+		rubygem-ansi>=0:devel/rubygem-ansi \
+		rubygem-clamp>=0.6.2:devel/rubygem-clamp \
+		rubygem-highline>=1.6.21:devel/rubygem-highline \
+		rubygem-kafo_parsers>=0:devel/rubygem-kafo_parsers \
+		rubygem-kafo_wizards>=0:devel/rubygem-kafo_wizards \
+		rubygem-logging>=0:devel/rubygem-logging \
+		rubygem-powerbar>=0:devel/rubygem-powerbar
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-kafo_parsers/Makefile b/devel/rubygem-kafo_parsers/Makefile
index 15ad87835b5f..c438e60d6f94 100644
--- a/devel/rubygem-kafo_parsers/Makefile
+++ b/devel/rubygem-kafo_parsers/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Parser for puppet modules
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	puppet:${PORTSDIR}/sysutils/puppet38
+RUN_DEPENDS=	puppet:sysutils/puppet38
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-kafo_wizards/Makefile b/devel/rubygem-kafo_wizards/Makefile
index 8220ead54711..981badf75713 100644
--- a/devel/rubygem-kafo_wizards/Makefile
+++ b/devel/rubygem-kafo_wizards/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Create wizard like interfaces in terminal applications
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-highline>=0:devel/rubygem-highline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-launchy/Makefile b/devel/rubygem-launchy/Makefile
index 20e762d7ede2..53a65df6a9a3 100644
--- a/devel/rubygem-launchy/Makefile
+++ b/devel/rubygem-launchy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Helper class for launching cross-platform applications
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-launchy22/Makefile b/devel/rubygem-launchy22/Makefile
index adbf01fb0c4d..d30c2a05a813 100644
--- a/devel/rubygem-launchy22/Makefile
+++ b/devel/rubygem-launchy22/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Helper class for launching cross-platform applications
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-librarian/Makefile b/devel/rubygem-librarian/Makefile
index 39db36777376..57fc34bc82f9 100644
--- a/devel/rubygem-librarian/Makefile
+++ b/devel/rubygem-librarian/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Ruby framework for writing bundlers
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}highline>=0:${PORTSDIR}/devel/rubygem-highline \
-		${PKGNAMEPREFIX}thor>=0.15:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	${PKGNAMEPREFIX}highline>=0:devel/rubygem-highline \
+		${PKGNAMEPREFIX}thor>=0.15:devel/rubygem-thor
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-librarianp/Makefile b/devel/rubygem-librarianp/Makefile
index 71d36942b03c..52c3c23c4c6d 100644
--- a/devel/rubygem-librarianp/Makefile
+++ b/devel/rubygem-librarianp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby framework for writing bundlers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-thor>=0.15:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-thor>=0.15:devel/rubygem-thor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-licensee/Makefile b/devel/rubygem-licensee/Makefile
index 3a06de11d810..0a415ea6d91f 100644
--- a/devel/rubygem-licensee/Makefile
+++ b/devel/rubygem-licensee/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Detects under what license a project is distributed
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-rugged>=0.23:${PORTSDIR}/devel/rubygem-rugged
+RUN_DEPENDS=	rubygem-rugged>=0.23:devel/rubygem-rugged
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-listen/Makefile b/devel/rubygem-listen/Makefile
index 40356248366a..77f1a76349dc 100644
--- a/devel/rubygem-listen/Makefile
+++ b/devel/rubygem-listen/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Listen to file modifications and notify about the changes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-rb-fsevent>=0.9.3:${PORTSDIR}/devel/rubygem-rb-fsevent \
-		rubygem-rb-inotify>=0.9.7:${PORTSDIR}/devel/rubygem-rb-inotify \
-		rubygem-rb-kqueue>=0.2:${PORTSDIR}/devel/rubygem-rb-kqueue
+RUN_DEPENDS=	rubygem-rb-fsevent>=0.9.3:devel/rubygem-rb-fsevent \
+		rubygem-rb-inotify>=0.9.7:devel/rubygem-rb-inotify \
+		rubygem-rb-kqueue>=0.2:devel/rubygem-rb-kqueue
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-logging/Makefile b/devel/rubygem-logging/Makefile
index a8e24a259ff0..f059f0deb610 100644
--- a/devel/rubygem-logging/Makefile
+++ b/devel/rubygem-logging/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Logging library based on Java's log4j
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-little-plugger>=1.1.3:${PORTSDIR}/devel/rubygem-little-plugger \
-		rubygem-multi_json>=1.8.4:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-little-plugger>=1.1.3:devel/rubygem-little-plugger \
+		rubygem-multi_json>=1.8.4:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-main/Makefile b/devel/rubygem-main/Makefile
index 1904cde48829..3bede5bd6fbd 100644
--- a/devel/rubygem-main/Makefile
+++ b/devel/rubygem-main/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Class Factory and Dsl for Generating Command Line Programs
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-arrayfields>=4.7.4:${PORTSDIR}/devel/rubygem-arrayfields \
-		rubygem-chronic>=0.6.2:${PORTSDIR}/devel/rubygem-chronic \
-		rubygem-fattr>=2.2.0:${PORTSDIR}/devel/rubygem-fattr \
-		rubygem-map>=5.1.0:${PORTSDIR}/devel/rubygem-map
+RUN_DEPENDS=	rubygem-arrayfields>=4.7.4:devel/rubygem-arrayfields \
+		rubygem-chronic>=0.6.2:devel/rubygem-chronic \
+		rubygem-fattr>=2.2.0:devel/rubygem-fattr \
+		rubygem-map>=5.1.0:devel/rubygem-map
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-memoizable/Makefile b/devel/rubygem-memoizable/Makefile
index df1a8e0ed998..555c74f2aaa1 100644
--- a/devel/rubygem-memoizable/Makefile
+++ b/devel/rubygem-memoizable/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Memoize method return values
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-thread_safe>=0.3.1:${PORTSDIR}/devel/rubygem-thread_safe
+RUN_DEPENDS=	rubygem-thread_safe>=0.3.1:devel/rubygem-thread_safe
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-memoize/Makefile b/devel/rubygem-memoize/Makefile
index a83308f589dc..0b68add6e20f 100644
--- a/devel/rubygem-memoize/Makefile
+++ b/devel/rubygem-memoize/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Speeds up methods at the cost of memory (or disk space)
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	rubygem-test-unit>=2.0.2:${PORTSDIR}/devel/rubygem-test-unit
+RUN_DEPENDS=	rubygem-test-unit>=2.0.2:devel/rubygem-test-unit
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-message_bus/Makefile b/devel/rubygem-message_bus/Makefile
index a25ba88f4fe9..5d083009ba3b 100644
--- a/devel/rubygem-message_bus/Makefile
+++ b/devel/rubygem-message_bus/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Message bus for rack
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-rack16>=1.1.3:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-redis>=0:${PORTSDIR}/databases/rubygem-redis
+RUN_DEPENDS=	rubygem-rack16>=1.1.3:www/rubygem-rack16 \
+		rubygem-redis>=0:databases/rubygem-redis
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-mixlib-authentication/Makefile b/devel/rubygem-mixlib-authentication/Makefile
index 8523d4e2f9c8..e1360a7b64d3 100644
--- a/devel/rubygem-mixlib-authentication/Makefile
+++ b/devel/rubygem-mixlib-authentication/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	renchap@cocoa-x.com
 COMMENT=	Mixes in simple per-request authentication
 
-RUN_DEPENDS=	rubygem-mixlib-log>=0:${PORTSDIR}/devel/rubygem-mixlib-log
+RUN_DEPENDS=	rubygem-mixlib-log>=0:devel/rubygem-mixlib-log
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-mocha/Makefile b/devel/rubygem-mocha/Makefile
index 4420b774ff41..376bed14112a 100644
--- a/devel/rubygem-mocha/Makefile
+++ b/devel/rubygem-mocha/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for mocking and stubbing syntax like JMock and SchMock
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-metaclass>=0:${PORTSDIR}/devel/rubygem-metaclass
+RUN_DEPENDS=	rubygem-metaclass>=0:devel/rubygem-metaclass
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-mongo/Makefile b/devel/rubygem-mongo/Makefile
index c9e53c214be3..80e8125df69e 100644
--- a/devel/rubygem-mongo/Makefile
+++ b/devel/rubygem-mongo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby driver for MongoDB
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-bson1>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-bson1
+RUN_DEPENDS=	rubygem-bson1>=${PORTVERSION}:devel/rubygem-bson1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-multi_json/Makefile b/devel/rubygem-multi_json/Makefile
index 18d03c3bbf6b..bf6e6b838a7a 100644
--- a/devel/rubygem-multi_json/Makefile
+++ b/devel/rubygem-multi_json/Makefile
@@ -23,8 +23,8 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-JSON_RUN_DEPENDS=	rubygem-json>=0:${PORTSDIR}/devel/rubygem-json
-JSON_PURE_RUN_DEPENDS=	rubygem-json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure
-YAJL_RUBY_RUN_DEPENDS=	rubygem-yajl-ruby>=0:${PORTSDIR}/devel/rubygem-yajl-ruby
+JSON_RUN_DEPENDS=	rubygem-json>=0:devel/rubygem-json
+JSON_PURE_RUN_DEPENDS=	rubygem-json_pure>=0:devel/rubygem-json_pure
+YAJL_RUBY_RUN_DEPENDS=	rubygem-yajl-ruby>=0:devel/rubygem-yajl-ruby
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-newrelic-grape/Makefile b/devel/rubygem-newrelic-grape/Makefile
index 06f04f53fb27..a4bfe0091488 100644
--- a/devel/rubygem-newrelic-grape/Makefile
+++ b/devel/rubygem-newrelic-grape/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Newrelic instrument for grape
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS?=	rubygem-grape>=0:${PORTSDIR}/devel/rubygem-grape \
-		rubygem-newrelic_rpm>=0:${PORTSDIR}/devel/rubygem-newrelic_rpm
+RUN_DEPENDS?=	rubygem-grape>=0:devel/rubygem-grape \
+		rubygem-newrelic_rpm>=0:devel/rubygem-newrelic_rpm
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-nice-ffi/Makefile b/devel/rubygem-nice-ffi/Makefile
index e5ada75d4983..e27f9ff51893 100644
--- a/devel/rubygem-nice-ffi/Makefile
+++ b/devel/rubygem-nice-ffi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Convenience layer atop Ruby-FFI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-ffi>=0.5.0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=0.5.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-notiffany/Makefile b/devel/rubygem-notiffany/Makefile
index a3ceae3ea2aa..30622363cefe 100644
--- a/devel/rubygem-notiffany/Makefile
+++ b/devel/rubygem-notiffany/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Single wrapper for most popular notification libraries
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-nenv>=0.1:${PORTSDIR}/devel/rubygem-nenv \
-		rubygem-shellany>=0:${PORTSDIR}/sysutils/rubygem-shellany
+RUN_DEPENDS=	rubygem-nenv>=0.1:devel/rubygem-nenv \
+		rubygem-shellany>=0:sysutils/rubygem-shellany
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-octopress-hooks/Makefile b/devel/rubygem-octopress-hooks/Makefile
index 3b8caddd6ccd..40a4a28b11c2 100644
--- a/devel/rubygem-octopress-hooks/Makefile
+++ b/devel/rubygem-octopress-hooks/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows access to Jekyll data at different internal processing stages
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-jekyll>=2.0:${PORTSDIR}/www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-jekyll>=2.0:www/rubygem-jekyll
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-omniauth_crowd/Makefile b/devel/rubygem-omniauth_crowd/Makefile
index 6e3fa6d7cdeb..66863635bb3d 100644
--- a/devel/rubygem-omniauth_crowd/Makefile
+++ b/devel/rubygem-omniauth_crowd/Makefile
@@ -11,9 +11,9 @@ COMMENT=	OmniAuth provider for Atlassian Crowds REST API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS?=	rubygem-activesupport4>=0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-nokogiri>=1.4.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS?=	rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
+		rubygem-nokogiri>=1.4.4:textproc/rubygem-nokogiri \
+		rubygem-omniauth>=1.0:security/rubygem-omniauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-open3_backport/Makefile b/devel/rubygem-open3_backport/Makefile
index f3a04e49fc66..5f079ddf1569 100644
--- a/devel/rubygem-open3_backport/Makefile
+++ b/devel/rubygem-open3_backport/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Backport of Ruby 1.9's Open3 methods for Ruby 1.8
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}open4>=1.3:${PORTSDIR}/devel/rubygem-open4
+RUN_DEPENDS=	${PKGNAMEPREFIX}open4>=1.3:devel/rubygem-open4
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-p4ruby/Makefile b/devel/rubygem-p4ruby/Makefile
index 4c5f1d084cd1..26b6a033e29b 100644
--- a/devel/rubygem-p4ruby/Makefile
+++ b/devel/rubygem-p4ruby/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Ruby bindings for the Perforce API
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS+=	${LOCALBASE}/lib/perforce/libclient.a:${PORTSDIR}/devel/p4api
+BUILD_DEPENDS+=	${LOCALBASE}/lib/perforce/libclient.a:devel/p4api
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
diff --git a/devel/rubygem-paperclip/Makefile b/devel/rubygem-paperclip/Makefile
index c9ebcf9c28c4..2392c03b364a 100644
--- a/devel/rubygem-paperclip/Makefile
+++ b/devel/rubygem-paperclip/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Easy upload management for ActiveRecord
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=3.2.0:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-activesupport4>=3.2.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-cocaine>=0.5.5:${PORTSDIR}/devel/rubygem-cocaine \
-		rubygem-mimemagic>=0.3.0:${PORTSDIR}/misc/rubygem-mimemagic \
-		rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types
+RUN_DEPENDS=	rubygem-activemodel4>=3.2.0:databases/rubygem-activemodel4 \
+		rubygem-activesupport4>=3.2.0:devel/rubygem-activesupport4 \
+		rubygem-cocaine>=0.5.5:devel/rubygem-cocaine \
+		rubygem-mimemagic>=0.3.0:misc/rubygem-mimemagic \
+		rubygem-mime-types>=0:misc/rubygem-mime-types
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-parser/Makefile b/devel/rubygem-parser/Makefile
index b0bee54e7276..e25638a250a2 100644
--- a/devel/rubygem-parser/Makefile
+++ b/devel/rubygem-parser/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby parser written in pure Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-ast>=2.2:${PORTSDIR}/devel/rubygem-ast
+RUN_DEPENDS=	rubygem-ast>=2.2:devel/rubygem-ast
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-pluggaloid/Makefile b/devel/rubygem-pluggaloid/Makefile
index a185953acf5e..7cbaa2a37f7b 100644
--- a/devel/rubygem-pluggaloid/Makefile
+++ b/devel/rubygem-pluggaloid/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Extensible plugin system for mikutter
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-delayer>=0:${PORTSDIR}/devel/rubygem-delayer \
-		rubygem-instance_storage>=1.0.0:${PORTSDIR}/devel/rubygem-instance_storage
+RUN_DEPENDS=	rubygem-delayer>=0:devel/rubygem-delayer \
+		rubygem-instance_storage>=1.0.0:devel/rubygem-instance_storage
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-polyamorous/Makefile b/devel/rubygem-polyamorous/Makefile
index 308b3f0b4d87..7b873bef9d59 100644
--- a/devel/rubygem-polyamorous/Makefile
+++ b/devel/rubygem-polyamorous/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extraction of shared code from the Active Record Hackery gems
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=3.0:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=3.0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-popen4/Makefile b/devel/rubygem-popen4/Makefile
index 91b59e4e6e7c..70a6bced7e58 100644
--- a/devel/rubygem-popen4/Makefile
+++ b/devel/rubygem-popen4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Cross platform API for managing child processes
 LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-open4>=0.4.0:${PORTSDIR}/devel/rubygem-open4 \
-		rubygem-platform>=0.4.0:${PORTSDIR}/devel/rubygem-platform
+RUN_DEPENDS=	rubygem-open4>=0.4.0:devel/rubygem-open4 \
+		rubygem-platform>=0.4.0:devel/rubygem-platform
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-powerbar/Makefile b/devel/rubygem-powerbar/Makefile
index 1312ede5b140..f5bdeb50b5b8 100644
--- a/devel/rubygem-powerbar/Makefile
+++ b/devel/rubygem-powerbar/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Progressbar library for Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hashie>=1.1.0:${PORTSDIR}/devel/rubygem-hashie
+RUN_DEPENDS=	rubygem-hashie>=1.1.0:devel/rubygem-hashie
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-protected_attributes/Makefile b/devel/rubygem-protected_attributes/Makefile
index 8db1bf9044bd..4d1f00965d0e 100644
--- a/devel/rubygem-protected_attributes/Makefile
+++ b/devel/rubygem-protected_attributes/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Protect attributes from mass assignment
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activemodel4>=4.0.1:${PORTSDIR}/databases/rubygem-activemodel4
+RUN_DEPENDS=	rubygem-activemodel4>=4.0.1:databases/rubygem-activemodel4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-prototype-rails/Makefile b/devel/rubygem-prototype-rails/Makefile
index e891806e468b..f972b0a83ac0 100644
--- a/devel/rubygem-prototype-rails/Makefile
+++ b/devel/rubygem-prototype-rails/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Provides Prototype, Scriptaculous, and RJS for Rails
 
-RUN_DEPENDS=	rubygem-rails>=3.2.0:${PORTSDIR}/www/rubygem-rails
+RUN_DEPENDS=	rubygem-rails>=3.2.0:www/rubygem-rails
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-pry-rails/Makefile b/devel/rubygem-pry-rails/Makefile
index b676a176dde2..5a7e2891afa3 100644
--- a/devel/rubygem-pry-rails/Makefile
+++ b/devel/rubygem-pry-rails/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Use Pry as your rails console
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	rubygem-pry>=0.9.10:${PORTSDIR}/devel/rubygem-pry
+RUN_DEPENDS=	rubygem-pry>=0.9.10:devel/rubygem-pry
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-pry-remote-em/Makefile b/devel/rubygem-pry-remote-em/Makefile
index b820b3cdecad..4fdf557c79f8 100644
--- a/devel/rubygem-pry-remote-em/Makefile
+++ b/devel/rubygem-pry-remote-em/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Connect to Pry remotely using EventMachine
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-eventmachine>=0:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-pry>=0.9:${PORTSDIR}/devel/rubygem-pry
+RUN_DEPENDS=	rubygem-eventmachine>=0:devel/rubygem-eventmachine \
+		rubygem-highline>=0:devel/rubygem-highline \
+		rubygem-pry>=0.9:devel/rubygem-pry
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-pry/Makefile b/devel/rubygem-pry/Makefile
index dabd5b9c89b5..aea16b9e73cb 100644
--- a/devel/rubygem-pry/Makefile
+++ b/devel/rubygem-pry/Makefile
@@ -13,9 +13,9 @@ COMMENT=	IRB alternative and runtime developer console
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-coderay>=1.1.0:${PORTSDIR}/textproc/rubygem-coderay \
-		rubygem-method_source>=0.8.1:${PORTSDIR}/devel/rubygem-method_source \
-		rubygem-slop3>=3.4.0:${PORTSDIR}/devel/rubygem-slop3
+RUN_DEPENDS=	rubygem-coderay>=1.1.0:textproc/rubygem-coderay \
+		rubygem-method_source>=0.8.1:devel/rubygem-method_source \
+		rubygem-slop3>=3.4.0:devel/rubygem-slop3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ptreloaded/Makefile b/devel/rubygem-ptreloaded/Makefile
index ac446acb27d3..b19a5cdd7ef6 100644
--- a/devel/rubygem-ptreloaded/Makefile
+++ b/devel/rubygem-ptreloaded/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	ParseTreeReloaded-${PORTVERSION}
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Reimplementation of ParseTree using RubyInlineAcceleration
 
-RUN_DEPENDS=	rubygem-rubyinlineaccel>=0.0.1:${PORTSDIR}/devel/rubygem-rubyinlineaccel
+RUN_DEPENDS=	rubygem-rubyinlineaccel>=0.0.1:devel/rubygem-rubyinlineaccel
 
 LICENSE=	GPLv2
 
diff --git a/devel/rubygem-pygments.rb/Makefile b/devel/rubygem-pygments.rb/Makefile
index a7b874f864fa..daba1b41e770 100644
--- a/devel/rubygem-pygments.rb/Makefile
+++ b/devel/rubygem-pygments.rb/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Exposes the pygments syntax highlighter to Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:${PORTSDIR}/devel/rubygem-posix-spawn \
-		rubygem-yajl-ruby>=1.2.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn \
+		rubygem-yajl-ruby>=1.2.0:devel/rubygem-yajl-ruby
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rack-mini-profiler/Makefile b/devel/rubygem-rack-mini-profiler/Makefile
index f449395eed0e..f12c72f93b0f 100644
--- a/devel/rubygem-rack-mini-profiler/Makefile
+++ b/devel/rubygem-rack-mini-profiler/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Profiles loading speed for rack applications
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=1.2.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=1.2.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rack-raw-upload/Makefile b/devel/rubygem-rack-raw-upload/Makefile
index 6e94e59dea80..5ef98bd96c4f 100644
--- a/devel/rubygem-rack-raw-upload/Makefile
+++ b/devel/rubygem-rack-raw-upload/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Converts mimetype of application/octet-stream into normal form input
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-multi_json>=0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rails-deprecated_sanitizer/Makefile b/devel/rubygem-rails-deprecated_sanitizer/Makefile
index e63de668ebdf..b4f74b6cbaac 100644
--- a/devel/rubygem-rails-deprecated_sanitizer/Makefile
+++ b/devel/rubygem-rails-deprecated_sanitizer/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Deprecated sanitizer API extracted from Action View
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activesupport4>=4.2.1:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=4.2.1:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rails-observers/Makefile b/devel/rubygem-rails-observers/Makefile
index 962ef21f680d..9eb29d8fc92f 100644
--- a/devel/rubygem-rails-observers/Makefile
+++ b/devel/rubygem-rails-observers/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Observer classes for Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=4.0:${PORTSDIR}/databases/rubygem-activemodel4
+RUN_DEPENDS=	rubygem-activemodel4>=4.0:databases/rubygem-activemodel4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rake-compiler/Makefile b/devel/rubygem-rake-compiler/Makefile
index 9b065bf7b4fb..bf438d5a7e6f 100644
--- a/devel/rubygem-rake-compiler/Makefile
+++ b/devel/rubygem-rake-compiler/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Build and package Ruby extensions (C, Java) using Rake
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ransack/Makefile b/devel/rubygem-ransack/Makefile
index 3102f87828ab..bebb2aa44fbe 100644
--- a/devel/rubygem-ransack/Makefile
+++ b/devel/rubygem-ransack/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Successor to the MetaSearch gem
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=3.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activerecord4>=3.0:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-activesupport4>=3.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-i18n>=0:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-polyamorous>=1.2:${PORTSDIR}/devel/rubygem-polyamorous
+RUN_DEPENDS=	rubygem-actionpack4>=3.0:www/rubygem-actionpack4 \
+		rubygem-activerecord4>=3.0:databases/rubygem-activerecord4 \
+		rubygem-activesupport4>=3.0:devel/rubygem-activesupport4 \
+		rubygem-i18n>=0:devel/rubygem-i18n \
+		rubygem-polyamorous>=1.2:devel/rubygem-polyamorous
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rash/Makefile b/devel/rubygem-rash/Makefile
index 84cd44017077..02ff096ef19f 100644
--- a/devel/rubygem-rash/Makefile
+++ b/devel/rubygem-rash/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple extension to Hashie::Mash for rubyfied keys
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-hashie>=2.0.0:${PORTSDIR}/devel/rubygem-hashie
+RUN_DEPENDS=	rubygem-hashie>=2.0.0:devel/rubygem-hashie
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rb-inotify/Makefile b/devel/rubygem-rb-inotify/Makefile
index 643dc1f1cd08..f47f838c0bf3 100644
--- a/devel/rubygem-rb-inotify/Makefile
+++ b/devel/rubygem-rb-inotify/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby wrapper for libinotify, using ffi
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
-RUN_DEPENDS=	rubygem-ffi>=0.5.0:${PORTSDIR}/devel/rubygem-ffi
+LIB_DEPENDS=	libinotify.so:devel/libinotify
+RUN_DEPENDS=	rubygem-ffi>=0.5.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rb-kqueue/Makefile b/devel/rubygem-rb-kqueue/Makefile
index 25e170acb0fb..bd2ecacb2f4f 100644
--- a/devel/rubygem-rb-kqueue/Makefile
+++ b/devel/rubygem-rb-kqueue/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby wrapper for BSD kqueue, using FFI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-ffi>=0.5.0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=0.5.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rbtrace/Makefile b/devel/rubygem-rbtrace/Makefile
index 511bebe9f5aa..1415d96fe652 100644
--- a/devel/rubygem-rbtrace/Makefile
+++ b/devel/rubygem-rbtrace/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Shows method calls inside another ruby process in real time
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-xRUN_DEPENDS=	rubygem-ffi>=1.0.6:${PORTSDIR}/devel/rubygem-ffi \
-		rubygem-msgpack>=0.4.3:${PORTSDIR}/devel/rubygem-msgpack \
-		rubygem-trollop>=1.16.2:${PORTSDIR}/devel/rubygem-trollop
+xRUN_DEPENDS=	rubygem-ffi>=1.0.6:devel/rubygem-ffi \
+		rubygem-msgpack>=0.4.3:devel/rubygem-msgpack \
+		rubygem-trollop>=1.16.2:devel/rubygem-trollop
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-rdoc/Makefile b/devel/rubygem-rdoc/Makefile
index 57461f6b28c1..3239a3e41421 100644
--- a/devel/rubygem-rdoc/Makefile
+++ b/devel/rubygem-rdoc/Makefile
@@ -12,7 +12,7 @@ LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.rdoc
 
-RUN_DEPENDS=	rubygem-json>=1.4:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=1.4:devel/rubygem-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rdoc3/Makefile b/devel/rubygem-rdoc3/Makefile
index e05a12a47e1f..3e8b30becd79 100644
--- a/devel/rubygem-rdoc3/Makefile
+++ b/devel/rubygem-rdoc3/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.rdoc
 
-RUN_DEPENDS=	rubygem-json>=1.4:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=1.4:devel/rubygem-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-redis-activesupport/Makefile b/devel/rubygem-redis-activesupport/Makefile
index 0fd6b93165e4..1ab1ce106dd7 100644
--- a/devel/rubygem-redis-activesupport/Makefile
+++ b/devel/rubygem-redis-activesupport/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Redis store for ActiveSupport::Cache
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=3:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-redis-store>=1.1.0:${PORTSDIR}/devel/rubygem-redis-store
+RUN_DEPENDS=	rubygem-activesupport4>=3:devel/rubygem-activesupport4 \
+		rubygem-redis-store>=1.1.0:devel/rubygem-redis-store
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-redis-store/Makefile b/devel/rubygem-redis-store/Makefile
index 0866dcab7421..5253497fe57f 100644
--- a/devel/rubygem-redis-store/Makefile
+++ b/devel/rubygem-redis-store/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Namespaced Redis stores for Ruby web frameworks
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-redis>=2.2:${PORTSDIR}/databases/rubygem-redis
+RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rgl/Makefile b/devel/rubygem-rgl/Makefile
index 2702b81a5271..b2c009e68809 100644
--- a/devel/rubygem-rgl/Makefile
+++ b/devel/rubygem-rgl/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Framework for graph datastructures and algorithms implemented in Ruby
 
-RUN_DEPENDS=	rubygem-algorithms>=0.6.1:${PORTSDIR}/devel/rubygem-algorithms \
-		rubygem-stream>=0.5.0:${PORTSDIR}/devel/rubygem-stream
+RUN_DEPENDS=	rubygem-algorithms>=0.6.1:devel/rubygem-algorithms \
+		rubygem-stream>=0.5.0:devel/rubygem-stream
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rodzilla/Makefile b/devel/rubygem-rodzilla/Makefile
index d6d18dccf098..de2adddaf9aa 100644
--- a/devel/rubygem-rodzilla/Makefile
+++ b/devel/rubygem-rodzilla/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bugzilla API Client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-httparty>=0.12.0:${PORTSDIR}/www/rubygem-httparty
+RUN_DEPENDS=	rubygem-httparty>=0.12.0:www/rubygem-httparty
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rrd-ffi/Makefile b/devel/rubygem-rrd-ffi/Makefile
index 01d21f684f06..9f00054ea243 100644
--- a/devel/rubygem-rrd-ffi/Makefile
+++ b/devel/rubygem-rrd-ffi/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Ruby bindings for RRD functions
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
-		rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-ffi>=0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rrdtool:databases/rrdtool \
+		rubygem-activesupport>=0:devel/rubygem-activesupport \
+		rubygem-ffi>=0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rspec-core/Makefile b/devel/rubygem-rspec-core/Makefile
index 4ae79c33db58..3f46ed038d47 100644
--- a/devel/rubygem-rspec-core/Makefile
+++ b/devel/rubygem-rspec-core/Makefile
@@ -12,7 +12,7 @@ COMMENT=	RSpec Core provides the structure for writing executable examples
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-rspec-support>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-support
+RUN_DEPENDS=	rubygem-rspec-support>=${PORTVERSION:R}:devel/rubygem-rspec-support
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rspec-expectations/Makefile b/devel/rubygem-rspec-expectations/Makefile
index 6b5db5554cc1..c39423dbc5bb 100644
--- a/devel/rubygem-rspec-expectations/Makefile
+++ b/devel/rubygem-rspec-expectations/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Rspec-expectations adds should and should_not to every object
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-diff-lcs>=1.2.0:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-rspec-support>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-support
+RUN_DEPENDS=	rubygem-diff-lcs>=1.2.0:textproc/rubygem-diff-lcs \
+		rubygem-rspec-support>=${PORTVERSION:R}:devel/rubygem-rspec-support
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rspec-mocks/Makefile b/devel/rubygem-rspec-mocks/Makefile
index 6748144c1ebe..64c780187dde 100644
--- a/devel/rubygem-rspec-mocks/Makefile
+++ b/devel/rubygem-rspec-mocks/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Rspec-mocks provides a test-double framework for rspec
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-diff-lcs>=1.2.0:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-rspec-support>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-support
+RUN_DEPENDS=	rubygem-diff-lcs>=1.2.0:textproc/rubygem-diff-lcs \
+		rubygem-rspec-support>=${PORTVERSION:R}:devel/rubygem-rspec-support
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rspec-rails/Makefile b/devel/rubygem-rspec-rails/Makefile
index 2ec85540bc14..347eea9ae73c 100644
--- a/devel/rubygem-rspec-rails/Makefile
+++ b/devel/rubygem-rspec-rails/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Testing framework for Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/License.md
 
-RUN_DEPENDS=	rubygem-actionpack4>=3.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activesupport4>=3.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-railties4>=3.0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-rspec-core>=${PORTVERSION:R}.0:${PORTSDIR}/devel/rubygem-rspec-core \
-		rubygem-rspec-expectations>=${PORTVERSION:R}.0:${PORTSDIR}/devel/rubygem-rspec-expectations \
-		rubygem-rspec-mocks>=${PORTVERSION:R}.0:${PORTSDIR}/devel/rubygem-rspec-mocks \
-		rubygem-rspec-support>=${PORTVERSION:R}.0:${PORTSDIR}/devel/rubygem-rspec-support
+RUN_DEPENDS=	rubygem-actionpack4>=3.0:www/rubygem-actionpack4 \
+		rubygem-activesupport4>=3.0:devel/rubygem-activesupport4 \
+		rubygem-railties4>=3.0:www/rubygem-railties4 \
+		rubygem-rspec-core>=${PORTVERSION:R}.0:devel/rubygem-rspec-core \
+		rubygem-rspec-expectations>=${PORTVERSION:R}.0:devel/rubygem-rspec-expectations \
+		rubygem-rspec-mocks>=${PORTVERSION:R}.0:devel/rubygem-rspec-mocks \
+		rubygem-rspec-support>=${PORTVERSION:R}.0:devel/rubygem-rspec-support
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rspec/Makefile b/devel/rubygem-rspec/Makefile
index 1e1925ebe437..8b59377b1c68 100644
--- a/devel/rubygem-rspec/Makefile
+++ b/devel/rubygem-rspec/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Behaviour Driven Development in Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-rspec-core>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-core \
-		rubygem-rspec-expectations>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-expectations \
-		rubygem-rspec-mocks>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-mocks
+RUN_DEPENDS=	rubygem-rspec-core>=${PORTVERSION:R}:devel/rubygem-rspec-core \
+		rubygem-rspec-expectations>=${PORTVERSION:R}:devel/rubygem-rspec-expectations \
+		rubygem-rspec-mocks>=${PORTVERSION:R}:devel/rubygem-rspec-mocks
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rubigen/Makefile b/devel/rubygem-rubigen/Makefile
index 307a12f9f74c..741b72176534 100644
--- a/devel/rubygem-rubigen/Makefile
+++ b/devel/rubygem-rubigen/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby generic generator framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activesupport>=2.3.5:${PORTSDIR}/devel/rubygem-activesupport
+RUN_DEPENDS=	rubygem-activesupport>=2.3.5:devel/rubygem-activesupport
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-ruby-atmos-pure/Makefile b/devel/rubygem-ruby-atmos-pure/Makefile
index 7d96dd71ba3f..7e81a3c166c7 100644
--- a/devel/rubygem-ruby-atmos-pure/Makefile
+++ b/devel/rubygem-ruby-atmos-pure/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Client library for EMC Atmos REST API
 
-RUN_DEPENDS=	rubygem-log4r>=1.1.9:${PORTSDIR}/sysutils/rubygem-log4r \
-		rubygem-ruby-hmac>=0.4.0:${PORTSDIR}/security/rubygem-ruby-hmac
+RUN_DEPENDS=	rubygem-log4r>=1.1.9:sysutils/rubygem-log4r \
+		rubygem-ruby-hmac>=0.4.0:security/rubygem-ruby-hmac
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruby-bugzilla/Makefile b/devel/rubygem-ruby-bugzilla/Makefile
index 7f41cd862094..ec401d3b6e7b 100644
--- a/devel/rubygem-ruby-bugzilla/Makefile
+++ b/devel/rubygem-ruby-bugzilla/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Access to Bugzilla through WebService APIs in Ruby
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-gruff>=0:${PORTSDIR}/graphics/rubygem-gruff \
-		rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-gruff>=0:graphics/rubygem-gruff \
+		rubygem-highline>=0:devel/rubygem-highline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruby-fogbugz/Makefile b/devel/rubygem-ruby-fogbugz/Makefile
index 1bc1c51f69a7..a576d7ea2af9 100644
--- a/devel/rubygem-ruby-fogbugz/Makefile
+++ b/devel/rubygem-ruby-fogbugz/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Simple Ruby wrapper for the Fogbugz XML API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-crack>=0.4:${PORTSDIR}/devel/rubygem-crack
+RUN_DEPENDS=	rubygem-crack>=0.4:devel/rubygem-crack
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruby-libvirt/Makefile b/devel/rubygem-ruby-libvirt/Makefile
index b562350a08ae..448970ebb4f4 100644
--- a/devel/rubygem-ruby-libvirt/Makefile
+++ b/devel/rubygem-ruby-libvirt/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby bindings for libvirt
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	libvirt.so:devel/libvirt
 
 USES=		pkgconfig
 
diff --git a/devel/rubygem-ruby-sdl-ffi/Makefile b/devel/rubygem-ruby-sdl-ffi/Makefile
index 89e3a5d7fb7c..1b8b40ffc911 100644
--- a/devel/rubygem-ruby-sdl-ffi/Makefile
+++ b/devel/rubygem-ruby-sdl-ffi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Low-level binding to SDL and related libraries using Ruby-FFI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-nice-ffi>=0.2:${PORTSDIR}/devel/rubygem-nice-ffi
+RUN_DEPENDS=	rubygem-nice-ffi>=0.2:devel/rubygem-nice-ffi
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-ruby2ruby/Makefile b/devel/rubygem-ruby2ruby/Makefile
index ffec9cf86296..112c7d569cfc 100644
--- a/devel/rubygem-ruby2ruby/Makefile
+++ b/devel/rubygem-ruby2ruby/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Pure ruby code generator easily from ParseTree's Sexps # '
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-ruby_parser>=3.1:${PORTSDIR}/devel/rubygem-ruby_parser \
-		rubygem-sexp_processor>=4.0:${PORTSDIR}/devel/rubygem-sexp_processor
+RUN_DEPENDS=	rubygem-ruby_parser>=3.1:devel/rubygem-ruby_parser \
+		rubygem-sexp_processor>=4.0:devel/rubygem-sexp_processor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruby_parser/Makefile b/devel/rubygem-ruby_parser/Makefile
index 9686802a1a94..27f711a9f38a 100644
--- a/devel/rubygem-ruby_parser/Makefile
+++ b/devel/rubygem-ruby_parser/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby parser written in pure ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-sexp_processor>=4.1:${PORTSDIR}/devel/rubygem-sexp_processor
+RUN_DEPENDS=	rubygem-sexp_processor>=4.1:devel/rubygem-sexp_processor
 
 USES=		shebangfix
 USE_RUBY=	yes
diff --git a/devel/rubygem-rubygame/Makefile b/devel/rubygem-rubygame/Makefile
index 038913e2c146..e108533d1ce0 100644
--- a/devel/rubygem-rubygame/Makefile
+++ b/devel/rubygem-rubygame/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Game-development extension and library for the ruby language
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	rubygem-ruby-sdl-ffi>=0.1.0:${PORTSDIR}/devel/rubygem-ruby-sdl-ffi
+RUN_DEPENDS=	rubygem-ruby-sdl-ffi>=0.1.0:devel/rubygem-ruby-sdl-ffi
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rubygems-mirror/Makefile b/devel/rubygem-rubygems-mirror/Makefile
index d4c7832975f5..7e612971cb6e 100644
--- a/devel/rubygem-rubygems-mirror/Makefile
+++ b/devel/rubygem-rubygems-mirror/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Mirror rubygems
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-net-http-persistent>=2.9:${PORTSDIR}/www/rubygem-net-http-persistent
+RUN_DEPENDS=	rubygem-net-http-persistent>=2.9:www/rubygem-net-http-persistent
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rubygems-test/Makefile b/devel/rubygem-rubygems-test/Makefile
index fd66a5c8811e..0a9c24860706 100644
--- a/devel/rubygem-rubygems-test/Makefile
+++ b/devel/rubygem-rubygems-test/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Run automated tests
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rake>=0.8.7:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-rake>=0.8.7:devel/rubygem-rake
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rubyinline/Makefile b/devel/rubygem-rubyinline/Makefile
index 08db5f3da6b5..6bcb1a58e7db 100644
--- a/devel/rubygem-rubyinline/Makefile
+++ b/devel/rubygem-rubyinline/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Inline::C allows you to embed C/Ruby directly in ruby scripts
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-zentest>=4.3:${PORTSDIR}/devel/rubygem-zentest
+RUN_DEPENDS=	rubygem-zentest>=4.3:devel/rubygem-zentest
 
 GEM_NAME=	${DISTNAME}
 
diff --git a/devel/rubygem-rubyinlineaccel/Makefile b/devel/rubygem-rubyinlineaccel/Makefile
index bea2c1c792b3..49d9a148e6b0 100644
--- a/devel/rubygem-rubyinlineaccel/Makefile
+++ b/devel/rubygem-rubyinlineaccel/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	RubyInlineAcceleration-${PORTVERSION}
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Extension to RubyInline
 
-RUN_DEPENDS=	rubygem-rubyinline>=3.6.3:${PORTSDIR}/devel/rubygem-rubyinline
+RUN_DEPENDS=	rubygem-rubyinline>=3.6.3:devel/rubygem-rubyinline
 
 LICENSE=	GPLv2
 
diff --git a/devel/rubygem-rubytree/Makefile b/devel/rubygem-rubytree/Makefile
index 03c5c4a9c685..f0caa6c87864 100644
--- a/devel/rubygem-rubytree/Makefile
+++ b/devel/rubygem-rubytree/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Implementation of the Tree data structure for the Ruby
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-json>=1.8:${PORTSDIR}/devel/rubygem-json \
-		rubygem-structured_warnings>=0.2:${PORTSDIR}/devel/rubygem-structured_warnings
+RUN_DEPENDS=	rubygem-json>=1.8:devel/rubygem-json \
+		rubygem-structured_warnings>=0.2:devel/rubygem-structured_warnings
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rugged/Makefile b/devel/rubygem-rugged/Makefile
index 3acc8833d2bf..a27fee6af7a3 100644
--- a/devel/rubygem-rugged/Makefile
+++ b/devel/rubygem-rugged/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Rugged is a Ruby binding to the libgit2 linkable library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake \
-		libgit2>=${PORTVERSION:R}:${PORTSDIR}/devel/libgit2
-LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+BUILD_DEPENDS=	cmake:devel/cmake \
+		libgit2>=${PORTVERSION:R}:devel/libgit2
+LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 CONFIGURE_ARGS=	--use-system-libraries
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruport/Makefile b/devel/rubygem-ruport/Makefile
index c3f6f23306f4..ed879c7759bb 100644
--- a/devel/rubygem-ruport/Makefile
+++ b/devel/rubygem-ruport/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby Reports (Ruport) is an extensible reporting system
 LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-fastercsv>=0:${PORTSDIR}/devel/rubygem-fastercsv \
-		rubygem-pdf-writer>=1.1.8:${PORTSDIR}/print/rubygem-pdf-writer
+RUN_DEPENDS=	rubygem-fastercsv>=0:devel/rubygem-fastercsv \
+		rubygem-pdf-writer>=1.1.8:print/rubygem-pdf-writer
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-sdoc/Makefile b/devel/rubygem-sdoc/Makefile
index 151a0c7fa4dc..88d49b967d16 100644
--- a/devel/rubygem-sdoc/Makefile
+++ b/devel/rubygem-sdoc/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Create rdoc html with javascript search index
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-json>=1.7.7:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=1.7.7:devel/rubygem-json
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-sentry-raven/Makefile b/devel/rubygem-sentry-raven/Makefile
index fd411686dc99..15c40b367d9c 100644
--- a/devel/rubygem-sentry-raven/Makefile
+++ b/devel/rubygem-sentry-raven/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Client interface for the Sentry error logger
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-faraday>=0.7.6:${PORTSDIR}/www/rubygem-faraday
+RUN_DEPENDS=	rubygem-faraday>=0.7.6:www/rubygem-faraday
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-shoulda-matchers/Makefile b/devel/rubygem-shoulda-matchers/Makefile
index 0da13108351b..4c609ab69849 100644
--- a/devel/rubygem-shoulda-matchers/Makefile
+++ b/devel/rubygem-shoulda-matchers/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Making tests easy on the fingers and eyes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=4.0.0:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=4.0.0:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-shoulda/Makefile b/devel/rubygem-shoulda/Makefile
index 9497415e88d0..c52abbbb1e3d 100644
--- a/devel/rubygem-shoulda/Makefile
+++ b/devel/rubygem-shoulda/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Making tests easy on the fingers and eyes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-shoulda-context>=1.0.1:${PORTSDIR}/devel/rubygem-shoulda-context \
-		rubygem-shoulda-matchers>=1.4.1:${PORTSDIR}/devel/rubygem-shoulda-matchers
+RUN_DEPENDS=	rubygem-shoulda-context>=1.0.1:devel/rubygem-shoulda-context \
+		rubygem-shoulda-matchers>=1.4.1:devel/rubygem-shoulda-matchers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sidekiq-cron/Makefile b/devel/rubygem-sidekiq-cron/Makefile
index 25305cfa6642..b725d68d1701 100644
--- a/devel/rubygem-sidekiq-cron/Makefile
+++ b/devel/rubygem-sidekiq-cron/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Enables to set jobs to be run in specified time (using CRON notation)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-redis-namespace>=1.5.2:${PORTSDIR}/databases/rubygem-redis-namespace \
-		rubygem-rufus-scheduler>=2.0.24:${PORTSDIR}/devel/rubygem-rufus-scheduler \
-		rubygem-sidekiq>=4.0.0:${PORTSDIR}/devel/rubygem-sidekiq
+RUN_DEPENDS=	rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \
+		rubygem-rufus-scheduler>=2.0.24:devel/rubygem-rufus-scheduler \
+		rubygem-sidekiq>=4.0.0:devel/rubygem-sidekiq
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sidekiq/Makefile b/devel/rubygem-sidekiq/Makefile
index caf0c53961bd..7ca5df7e59f7 100644
--- a/devel/rubygem-sidekiq/Makefile
+++ b/devel/rubygem-sidekiq/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Simple, efficient background processing for Ruby
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0.0:${PORTSDIR}/devel/rubygem-concurrent-ruby \
-		rubygem-connection_pool>=2.2:${PORTSDIR}/net/rubygem-connection_pool \
-		rubygem-redis>=3.2.1:${PORTSDIR}/databases/rubygem-redis
+RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0.0:devel/rubygem-concurrent-ruby \
+		rubygem-connection_pool>=2.2:net/rubygem-connection_pool \
+		rubygem-redis>=3.2.1:databases/rubygem-redis
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sidetiq/Makefile b/devel/rubygem-sidetiq/Makefile
index 9e1579a80d6c..50830bdaa1fb 100644
--- a/devel/rubygem-sidetiq/Makefile
+++ b/devel/rubygem-sidetiq/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Recurring jobs for Sidekiq
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-celluloid>=0.17.3:${PORTSDIR}/devel/rubygem-celluloid \
-		rubygem-ice_cube>=0.13.2:${PORTSDIR}/devel/rubygem-ice_cube \
-		rubygem-sidekiq>=4.0.0:${PORTSDIR}/devel/rubygem-sidekiq
+RUN_DEPENDS=	rubygem-celluloid>=0.17.3:devel/rubygem-celluloid \
+		rubygem-ice_cube>=0.13.2:devel/rubygem-ice_cube \
+		rubygem-sidekiq>=4.0.0:devel/rubygem-sidekiq
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-simple_form/Makefile b/devel/rubygem-simple_form/Makefile
index 9d35b8343ac9..611371339c5c 100644
--- a/devel/rubygem-simple_form/Makefile
+++ b/devel/rubygem-simple_form/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Forms made easy
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=4:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-actionpack4>=4:${PORTSDIR}/www/rubygem-actionpack4
+RUN_DEPENDS=	rubygem-activemodel4>=4:databases/rubygem-activemodel4 \
+		rubygem-actionpack4>=4:www/rubygem-actionpack4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-simplecov/Makefile b/devel/rubygem-simplecov/Makefile
index 99b49b746c43..34416dfee21d 100644
--- a/devel/rubygem-simplecov/Makefile
+++ b/devel/rubygem-simplecov/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Powerful configuration library and automatic merging of coverage across
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-docile>=1.1.0:${PORTSDIR}/devel/rubygem-docile \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-simplecov-html>=0.8.0:${PORTSDIR}/textproc/rubygem-simplecov-html
+RUN_DEPENDS=	rubygem-docile>=1.1.0:devel/rubygem-docile \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-simplecov-html>=0.8.0:textproc/rubygem-simplecov-html
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-slim/Makefile b/devel/rubygem-slim/Makefile
index ddefb1787228..df284e361582 100644
--- a/devel/rubygem-slim/Makefile
+++ b/devel/rubygem-slim/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Template language whose goal is reduce the syntax to essential parts
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-temple>=0.7.3:${PORTSDIR}/devel/rubygem-temple \
-		rubygem-tilt>=1.3.3:${PORTSDIR}/devel/rubygem-tilt
+RUN_DEPENDS=	rubygem-temple>=0.7.3:devel/rubygem-temple \
+		rubygem-tilt>=1.3.3:devel/rubygem-tilt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-soap4r/Makefile b/devel/rubygem-soap4r/Makefile
index 35bd71784bc1..ccaa1b6fc102 100644
--- a/devel/rubygem-soap4r/Makefile
+++ b/devel/rubygem-soap4r/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby implementation of SOAP 1.1
 LICENSE=	GPLv2 GPLv3 RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-httpclient>=2.1.1:${PORTSDIR}/www/rubygem-httpclient
+RUN_DEPENDS=	rubygem-httpclient>=2.1.1:www/rubygem-httpclient
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-sprockets-helpers/Makefile b/devel/rubygem-sprockets-helpers/Makefile
index e5fff33c4197..cd3d3d85dd43 100644
--- a/devel/rubygem-sprockets-helpers/Makefile
+++ b/devel/rubygem-sprockets-helpers/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Asset path helpers for Sprockets 2.x applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-sprockets3>=2.2:${PORTSDIR}/devel/rubygem-sprockets3
+RUN_DEPENDS=	rubygem-sprockets3>=2.2:devel/rubygem-sprockets3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sprockets-rails/Makefile b/devel/rubygem-sprockets-rails/Makefile
index c5f137da253a..63134fc28f06 100644
--- a/devel/rubygem-sprockets-rails/Makefile
+++ b/devel/rubygem-sprockets-rails/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Sprockets Rails integration
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS?=	rubygem-actionpack4>=4.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activesupport4>=4.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-sprockets3>=3.0.0:${PORTSDIR}/devel/rubygem-sprockets3
+RUN_DEPENDS?=	rubygem-actionpack4>=4.0:www/rubygem-actionpack4 \
+		rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
+		rubygem-sprockets3>=3.0.0:devel/rubygem-sprockets3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sprockets-sass/Makefile b/devel/rubygem-sprockets-sass/Makefile
index 960b1eb85a80..b356303c1c8d 100644
--- a/devel/rubygem-sprockets-sass/Makefile
+++ b/devel/rubygem-sprockets-sass/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Implements a sprockets-aware sass importer
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-sprockets>=2.0:${PORTSDIR}/devel/rubygem-sprockets \
-		rubygem-tilt1>=1.1:${PORTSDIR}/devel/rubygem-tilt1
+RUN_DEPENDS=	rubygem-sprockets>=2.0:devel/rubygem-sprockets \
+		rubygem-tilt1>=1.1:devel/rubygem-tilt1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sprockets/Makefile b/devel/rubygem-sprockets/Makefile
index 19a77818a12b..803eeea3d165 100644
--- a/devel/rubygem-sprockets/Makefile
+++ b/devel/rubygem-sprockets/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Ruby library that preprocesses and concatenates JavaScript files
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hike>=1.2:${PORTSDIR}/devel/rubygem-hike \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-tilt1>=1.1:${PORTSDIR}/devel/rubygem-tilt1
+RUN_DEPENDS=	rubygem-hike>=1.2:devel/rubygem-hike \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-rack16>=1.0:www/rubygem-rack16 \
+		rubygem-tilt1>=1.1:devel/rubygem-tilt1
 
 CONFLICTS_INSTALL=	rubygem-sprockets211-[0-9]*
 
diff --git a/devel/rubygem-sprockets211/Makefile b/devel/rubygem-sprockets211/Makefile
index ea7854900f73..54ed7999237e 100644
--- a/devel/rubygem-sprockets211/Makefile
+++ b/devel/rubygem-sprockets211/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Ruby library that preprocesses and concatenates JavaScript files
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hike>=1.2:${PORTSDIR}/devel/rubygem-hike \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-tilt1>=1.1:${PORTSDIR}/devel/rubygem-tilt1
+RUN_DEPENDS=	rubygem-hike>=1.2:devel/rubygem-hike \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-rack16>=1.0:www/rubygem-rack16 \
+		rubygem-tilt1>=1.1:devel/rubygem-tilt1
 
 CONFLICTS_INSTALL=	rubygem-sprockets-[0-9]*
 
diff --git a/devel/rubygem-sprockets22/Makefile b/devel/rubygem-sprockets22/Makefile
index 45fb8f65b082..696043e66914 100644
--- a/devel/rubygem-sprockets22/Makefile
+++ b/devel/rubygem-sprockets22/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Ruby library that preprocesses and concatenates JavaScript files
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hike>=1.2:${PORTSDIR}/devel/rubygem-hike \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-tilt1>=1.1:${PORTSDIR}/devel/rubygem-tilt1
+RUN_DEPENDS=	rubygem-hike>=1.2:devel/rubygem-hike \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-rack16>=1.0:www/rubygem-rack16 \
+		rubygem-tilt1>=1.1:devel/rubygem-tilt1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sprockets3/Makefile b/devel/rubygem-sprockets3/Makefile
index 807602918b01..149a036a28b1 100644
--- a/devel/rubygem-sprockets3/Makefile
+++ b/devel/rubygem-sprockets3/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Ruby library that preprocesses and concatenates JavaScript files
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0:${PORTSDIR}/devel/rubygem-concurrent-ruby \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \
+		rubygem-rack16>=1.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-statsd/Makefile b/devel/rubygem-statsd/Makefile
index ace37da1debd..dbe4bde244c0 100644
--- a/devel/rubygem-statsd/Makefile
+++ b/devel/rubygem-statsd/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby port of the statsd python and node.js tools
 
-RUN_DEPENDS=	rubygem-erubis>=2.6.6:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-eventmachine>=0.12.10:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-mongo>=1.2.4:${PORTSDIR}/devel/rubygem-mongo
+RUN_DEPENDS=	rubygem-erubis>=2.6.6:www/rubygem-erubis \
+		rubygem-eventmachine>=0.12.10:devel/rubygem-eventmachine \
+		rubygem-mongo>=1.2.4:devel/rubygem-mongo
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-stella/Makefile b/devel/rubygem-stella/Makefile
index 509fd3b383cf..e85990a2d5cc 100644
--- a/devel/rubygem-stella/Makefile
+++ b/devel/rubygem-stella/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Define realistic testplans and run them against your webapps
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-benelux>=0.6.1:${PORTSDIR}/devel/rubygem-benelux \
-		rubygem-drydock>=0.6.9:${PORTSDIR}/devel/rubygem-drydock \
-		rubygem-familia>=0.7.1:${PORTSDIR}/databases/rubygem-familia \
-		rubygem-gibbler>=0.8.9:${PORTSDIR}/devel/rubygem-gibbler \
-		rubygem-nokogiri>=1.4.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-public_suffix_service>=0.8.1:${PORTSDIR}/dns/rubygem-public_suffix_service \
-		rubygem-storable>=0.8.8:${PORTSDIR}/devel/rubygem-storable \
-		rubygem-sysinfo>=0.7.3:${PORTSDIR}/devel/rubygem-sysinfo \
-		rubygem-whois>=1.6.6:${PORTSDIR}/net/rubygem-whois \
-		rubygem-yajl-ruby>=0.7.9:${PORTSDIR}/devel/rubygem-yajl-ruby
+RUN_DEPENDS=	rubygem-benelux>=0.6.1:devel/rubygem-benelux \
+		rubygem-drydock>=0.6.9:devel/rubygem-drydock \
+		rubygem-familia>=0.7.1:databases/rubygem-familia \
+		rubygem-gibbler>=0.8.9:devel/rubygem-gibbler \
+		rubygem-nokogiri>=1.4.4:textproc/rubygem-nokogiri \
+		rubygem-public_suffix_service>=0.8.1:dns/rubygem-public_suffix_service \
+		rubygem-storable>=0.8.8:devel/rubygem-storable \
+		rubygem-sysinfo>=0.7.3:devel/rubygem-sysinfo \
+		rubygem-whois>=1.6.6:net/rubygem-whois \
+		rubygem-yajl-ruby>=0.7.9:devel/rubygem-yajl-ruby
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-svn2git/Makefile b/devel/rubygem-svn2git/Makefile
index 663c59a75277..30eeb41c8a13 100644
--- a/devel/rubygem-svn2git/Makefile
+++ b/devel/rubygem-svn2git/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby utilities for exporting SVN repo to git
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
+RUN_DEPENDS=	git-subversion>0:devel/git-subversion
 
 CONFLICTS_INSTALL=	svn2git-[0-9]*
 
diff --git a/devel/rubygem-sysinfo/Makefile b/devel/rubygem-sysinfo/Makefile
index a2a20cc34f3d..bf2d92c1e274 100644
--- a/devel/rubygem-sysinfo/Makefile
+++ b/devel/rubygem-sysinfo/Makefile
@@ -12,8 +12,8 @@ COMMENT=	All your system-independent infoz in one handy class
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-drydock>=0:${PORTSDIR}/devel/rubygem-drydock \
-		rubygem-storable>=0:${PORTSDIR}/devel/rubygem-storable
+RUN_DEPENDS=	rubygem-drydock>=0:devel/rubygem-drydock \
+		rubygem-storable>=0:devel/rubygem-storable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-templater/Makefile b/devel/rubygem-templater/Makefile
index 387de19e658f..63d765b98a83 100644
--- a/devel/rubygem-templater/Makefile
+++ b/devel/rubygem-templater/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Ruby code generation framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-diff-lcs>=1.1.2:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-extlib>=0.9.5:${PORTSDIR}/devel/rubygem-extlib \
-		rubygem-highline>=1.4.0:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-diff-lcs>=1.1.2:textproc/rubygem-diff-lcs \
+		rubygem-extlib>=0.9.5:devel/rubygem-extlib \
+		rubygem-highline>=1.4.0:devel/rubygem-highline
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-term-ansicolor/Makefile b/devel/rubygem-term-ansicolor/Makefile
index 837b6cd284d0..b385adda294c 100644
--- a/devel/rubygem-term-ansicolor/Makefile
+++ b/devel/rubygem-term-ansicolor/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Term::ANSIColor for Ruby
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-tins>=1.0:${PORTSDIR}/devel/rubygem-tins
+RUN_DEPENDS=	rubygem-tins>=1.0:devel/rubygem-tins
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-test-unit/Makefile b/devel/rubygem-test-unit/Makefile
index 3d4e18c4afac..5e940380be03 100644
--- a/devel/rubygem-test-unit/Makefile
+++ b/devel/rubygem-test-unit/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/GPL
 LICENSE_FILE_PSFL=	${WRKSRC}/PSFL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-power_assert>=0:${PORTSDIR}/devel/rubygem-power_assert
+RUN_DEPENDS=	rubygem-power_assert>=0:devel/rubygem-power_assert
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-thread_safe1/Makefile b/devel/rubygem-thread_safe1/Makefile
index 577d1a439914..2ba2544c8a2c 100644
--- a/devel/rubygem-thread_safe1/Makefile
+++ b/devel/rubygem-thread_safe1/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Thread-safe collections and utilities for Ruby
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-atomic>=0:${PORTSDIR}/devel/rubygem-atomic
+RUN_DEPENDS=	rubygem-atomic>=0:devel/rubygem-atomic
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-timers/Makefile b/devel/rubygem-timers/Makefile
index 5e02c2fe7045..6a1b8b6fd917 100644
--- a/devel/rubygem-timers/Makefile
+++ b/devel/rubygem-timers/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Pure Ruby one-shot and periodic timers
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hitimes>=0:${PORTSDIR}/devel/rubygem-hitimes
+RUN_DEPENDS=	rubygem-hitimes>=0:devel/rubygem-hitimes
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-toml/Makefile b/devel/rubygem-toml/Makefile
index 3e0133d9f605..8aae19638a4b 100644
--- a/devel/rubygem-toml/Makefile
+++ b/devel/rubygem-toml/Makefile
@@ -12,7 +12,7 @@ COMMENT=	TOML parser
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-parslet>=1.5.0:${PORTSDIR}/textproc/rubygem-parslet
+RUN_DEPENDS=	rubygem-parslet>=1.5.0:textproc/rubygem-parslet
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-travis/Makefile b/devel/rubygem-travis/Makefile
index f2c9fe650e78..caedcff74b9c 100644
--- a/devel/rubygem-travis/Makefile
+++ b/devel/rubygem-travis/Makefile
@@ -12,14 +12,14 @@ COMMENT=	CLI and Ruby client library for Travis CI
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-backports>=0:${PORTSDIR}/devel/rubygem-backports \
-		rubygem-faraday>=0.9:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-faraday_middleware>=0.9.1:${PORTSDIR}/www/rubygem-faraday_middleware \
-		rubygem-gh>=0.13:${PORTSDIR}/devel/rubygem-gh \
-		rubygem-highline>=1.6:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-launchy>=2.1:${PORTSDIR}/devel/rubygem-launchy \
-		rubygem-pusher-client>=0.4:${PORTSDIR}/www/rubygem-pusher-client \
-		rubygem-typhoeus>=0.6.8:${PORTSDIR}/www/rubygem-typhoeus
+RUN_DEPENDS=	rubygem-backports>=0:devel/rubygem-backports \
+		rubygem-faraday>=0.9:www/rubygem-faraday \
+		rubygem-faraday_middleware>=0.9.1:www/rubygem-faraday_middleware \
+		rubygem-gh>=0.13:devel/rubygem-gh \
+		rubygem-highline>=1.6:devel/rubygem-highline \
+		rubygem-launchy>=2.1:devel/rubygem-launchy \
+		rubygem-pusher-client>=0.4:www/rubygem-pusher-client \
+		rubygem-typhoeus>=0.6.8:www/rubygem-typhoeus
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-treetop/Makefile b/devel/rubygem-treetop/Makefile
index 31c66945eee1..53ed6981b471 100644
--- a/devel/rubygem-treetop/Makefile
+++ b/devel/rubygem-treetop/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby-based DSL for text parsing and interpretation
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-polyglot>=0.3:${PORTSDIR}/devel/rubygem-polyglot
+RUN_DEPENDS=	rubygem-polyglot>=0.3:devel/rubygem-polyglot
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-turn/Makefile b/devel/rubygem-turn/Makefile
index 76d63e65d39c..644aa1d98bd9 100644
--- a/devel/rubygem-turn/Makefile
+++ b/devel/rubygem-turn/Makefile
@@ -12,8 +12,8 @@ COMMENT=	New output format for Test::Unit
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-ansi>=0:${PORTSDIR}/devel/rubygem-ansi \
-		rubygem-minitest>=4:${PORTSDIR}/devel/rubygem-minitest
+RUN_DEPENDS=	rubygem-ansi>=0:devel/rubygem-ansi \
+		rubygem-minitest>=4:devel/rubygem-minitest
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-tzinfo/Makefile b/devel/rubygem-tzinfo/Makefile
index 8f9edf6a90c6..f1196a14e293 100644
--- a/devel/rubygem-tzinfo/Makefile
+++ b/devel/rubygem-tzinfo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Daylight-savings aware timezone support for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-thread_safe1>=0.1:${PORTSDIR}/devel/rubygem-thread_safe1
+RUN_DEPENDS=	rubygem-thread_safe1>=0.1:devel/rubygem-thread_safe1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-uuid/Makefile b/devel/rubygem-uuid/Makefile
index b8d21be60920..feb89540f0fe 100644
--- a/devel/rubygem-uuid/Makefile
+++ b/devel/rubygem-uuid/Makefile
@@ -11,7 +11,7 @@ COMMENT=	UUID Generator for Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-macaddr>=1.0:${PORTSDIR}/net/rubygem-macaddr
+RUN_DEPENDS=	rubygem-macaddr>=1.0:net/rubygem-macaddr
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-versionomy/Makefile b/devel/rubygem-versionomy/Makefile
index 2b29a4ad8cd1..2726c9ddeb9d 100644
--- a/devel/rubygem-versionomy/Makefile
+++ b/devel/rubygem-versionomy/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Generalized version number library for Ruby
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	rubygem-blockenspiel>=0.5:${PORTSDIR}/devel/rubygem-blockenspiel
+RUN_DEPENDS=	rubygem-blockenspiel>=0.5:devel/rubygem-blockenspiel
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-virtus/Makefile b/devel/rubygem-virtus/Makefile
index 430dcfedda7b..84f62fde1fbb 100644
--- a/devel/rubygem-virtus/Makefile
+++ b/devel/rubygem-virtus/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Attributes on Steroids for Plain Old Ruby Objects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-axiom-types>=0.1:${PORTSDIR}/devel/rubygem-axiom-types \
-		rubygem-coercible>=1.0:${PORTSDIR}/devel/rubygem-coercible \
-		rubygem-descendants_tracker>=0.0.3:${PORTSDIR}/devel/rubygem-descendants_tracker \
-		rubygem-equalizer>=0.0.9:${PORTSDIR}/devel/rubygem-equalizer
+RUN_DEPENDS=	rubygem-axiom-types>=0.1:devel/rubygem-axiom-types \
+		rubygem-coercible>=1.0:devel/rubygem-coercible \
+		rubygem-descendants_tracker>=0.0.3:devel/rubygem-descendants_tracker \
+		rubygem-equalizer>=0.0.9:devel/rubygem-equalizer
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-warbler/Makefile b/devel/rubygem-warbler/Makefile
index f6289e1bd72f..ef332c5a7995 100644
--- a/devel/rubygem-warbler/Makefile
+++ b/devel/rubygem-warbler/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Constructor of .war files of Rails applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	jruby:${PORTSDIR}/lang/jruby \
-		rubygem-jruby-jars>=1.5.6:${PORTSDIR}/devel/rubygem-jruby-jars \
-		rubygem-jruby-rack>=1.1.1:${PORTSDIR}/www/rubygem-jruby-rack \
-		rubygem-rake>=0.9.6:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rubyzip>=0.9:${PORTSDIR}/archivers/rubygem-rubyzip
+RUN_DEPENDS=	jruby:lang/jruby \
+		rubygem-jruby-jars>=1.5.6:devel/rubygem-jruby-jars \
+		rubygem-jruby-rack>=1.1.1:www/rubygem-jruby-rack \
+		rubygem-rake>=0.9.6:devel/rubygem-rake \
+		rubygem-rubyzip>=0.9:archivers/rubygem-rubyzip
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-warden/Makefile b/devel/rubygem-warden/Makefile
index 943f0a4b7e38..6b4adf93679e 100644
--- a/devel/rubygem-warden/Makefile
+++ b/devel/rubygem-warden/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Rack middleware that provides authentication for rack applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=1.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-web-console/Makefile b/devel/rubygem-web-console/Makefile
index c661eb097cbe..b43881293518 100644
--- a/devel/rubygem-web-console/Makefile
+++ b/devel/rubygem-web-console/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Debugging tool for your Ruby on Rails applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=4.0:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-binding_of_caller>=0.7.2:${PORTSDIR}/devel/rubygem-binding_of_caller \
-		rubygem-railties4>=4.0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-sprockets-rails>=2.0:${PORTSDIR}/devel/rubygem-sprockets-rails
+RUN_DEPENDS=	rubygem-activemodel4>=4.0:databases/rubygem-activemodel4 \
+		rubygem-binding_of_caller>=0.7.2:devel/rubygem-binding_of_caller \
+		rubygem-railties4>=4.0:www/rubygem-railties4 \
+		rubygem-sprockets-rails>=2.0:devel/rubygem-sprockets-rails
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-webby/Makefile b/devel/rubygem-webby/Makefile
index 6f48f8e8244a..83a68df36679 100644
--- a/devel/rubygem-webby/Makefile
+++ b/devel/rubygem-webby/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Small website management system
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-bones>=2.5.0:${PORTSDIR}/devel/rubygem-bones \
-		rubygem-directory_watcher>=1.1.2:${PORTSDIR}/devel/rubygem-directory_watcher \
-		rubygem-hpricot>=0.6.0:${PORTSDIR}/www/rubygem-hpricot \
-		rubygem-launchy>=0.3.2:${PORTSDIR}/devel/rubygem-launchy \
-		rubygem-logging>=0.9.7:${PORTSDIR}/devel/rubygem-logging \
-		rubygem-loquacious>=1.3.0:${PORTSDIR}/devel/rubygem-loquacious \
-		rubygem-rspec>=1.2.2:${PORTSDIR}/devel/rubygem-rspec
+RUN_DEPENDS=	rubygem-bones>=2.5.0:devel/rubygem-bones \
+		rubygem-directory_watcher>=1.1.2:devel/rubygem-directory_watcher \
+		rubygem-hpricot>=0.6.0:www/rubygem-hpricot \
+		rubygem-launchy>=0.3.2:devel/rubygem-launchy \
+		rubygem-logging>=0.9.7:devel/rubygem-logging \
+		rubygem-loquacious>=1.3.0:devel/rubygem-loquacious \
+		rubygem-rspec>=1.2.2:devel/rubygem-rspec
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-xpath/Makefile b/devel/rubygem-xpath/Makefile
index cb2102f5a6de..d27f1ba84516 100644
--- a/devel/rubygem-xpath/Makefile
+++ b/devel/rubygem-xpath/Makefile
@@ -11,7 +11,7 @@ COMMENT=	DSL for generating XPath Expressions
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.3:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-nokogiri>=1.3:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 198441e6d145..385eeccf93b7 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -22,7 +22,7 @@ PORTDOCS=	*
 OPTIONS_DEFINE=		DOCS PCRE SSL
 OPTIONS_DEFAULT=	SSL
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_ENABLE=	pcre
 SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_ENABLE=	ssl
diff --git a/devel/runsnakerun/Makefile b/devel/runsnakerun/Makefile
index 5627538c0075..ac044b82a46c 100644
--- a/devel/runsnakerun/Makefile
+++ b/devel/runsnakerun/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GUI Viewer for Python profiling runs
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SquareMap>0:${PORTSDIR}/x11-toolkits/py-SquareMap \
-		${PYTHON_PKGNAMEPREFIX}meliae>0:${PORTSDIR}/devel/py-meliae
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SquareMap>0:x11-toolkits/py-SquareMap \
+		${PYTHON_PKGNAMEPREFIX}meliae>0:devel/py-meliae
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index 9e5ba96a2b51..fb9b881d6911 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Persistent VM library
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	liblwp.so:${PORTSDIR}/devel/lwp
+LIB_DEPENDS=	liblwp.so:devel/lwp
 
 USES=		gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile
index feaddff4962d..854064639b99 100644
--- a/devel/sbt/Makefile
+++ b/devel/sbt/Makefile
@@ -26,7 +26,7 @@ PLIST_FILES=	bin/sbt \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MADVANCED}
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 PLIST_FILES+=	%%DATADIR%%/sbt \
 		%%DATADIR%%/sbt-launch-lib.bash
diff --git a/devel/scalatest/Makefile b/devel/scalatest/Makefile
index 2faab65a16aa..34b1f38fe9e3 100644
--- a/devel/scalatest/Makefile
+++ b/devel/scalatest/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Regression testing utility for use with the Scala Language
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	scala>=2.9.0:${PORTSDIR}/lang/scala
+RUN_DEPENDS=	scala>=2.9.0:lang/scala
 
 USES=		zip
 USE_JAVA=	yes
diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index 7fe1da468075..a2bb5de70635 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Build tool alternative to make
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS=	gm4:devel/m4
 
 USES=		python:2 shebangfix
 SHEBANG_FILES=	script/scons
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 6c696c3abf92..26303613ce9c 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Cross-platform multimedia development API
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 USES=		gmake iconv libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
@@ -41,18 +41,18 @@ OPTIONS_DEFAULT+=	VGL
 .endif
 
 AALIB_CONFIGURE_ENABLE=		video-aalib
-AALIB_LIB_DEPENDS=		libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
 ESOUND_USE=			GNOME=esound
 ESOUND_CONFIGURE_ENABLE=	esd esdtest
 NAS_CONFIGURE_ENABLE=		nas
-NAS_LIB_DEPENDS=		libaudio.so:${PORTSDIR}/audio/nas
+NAS_LIB_DEPENDS=		libaudio.so:audio/nas
 OPENGL_CONFIGURE_ENABLE=	video-opengl
 OPENGL_USE=			GL=yes
 OSS_CONFIGURE_ENABLE=		oss
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
-PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/pulseaudio
 SVGALIB_CONFIGURE_ENABLE=	video-svga
-SVGALIB_LIB_DEPENDS=		libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_LIB_DEPENDS=		libvga.so:graphics/svgalib
 VGL_CONFIGURE_ENABLE=		video-vgl
 X11_CONFIGURE_ENABLE=		video-x11
 X11_USE=			XORG=x11,xrender,xrandr,xextproto
diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile
index 159f694f0378..659c2b9968dc 100644
--- a/devel/sdl20/Makefile
+++ b/devel/sdl20/Makefile
@@ -107,7 +107,7 @@ SDL_VIDEO_CONFIGURE_ENABLE=	video
 IGNORE=	option ALSA requires SDL_AUDIO
 .endif
 CONFIGURE_ARGS+=	--enable-alsa --enable-alsa-shared
-LIB_DEPENDS+=		libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=		libasound.so:audio/alsa-lib
 .else
 CONFIGURE_ARGS+=	--disable-alsa --disable-alsa-shared
 .endif
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+=	--disable-esd --disable-esd-shared
 IGNORE=	option NAS requires SDL_AUDIO
 .endif
 CONFIGURE_ARGS+=	--enable-nas --enable-nas-shared
-LIB_DEPENDS+=		libaudio.so:${PORTSDIR}/audio/nas
+LIB_DEPENDS+=		libaudio.so:audio/nas
 .else
 CONFIGURE_ARGS+=	--disable-nas --disable-nas-shared
 .endif
diff --git a/devel/sdl2pp/Makefile b/devel/sdl2pp/Makefile
index 44fc5c878a43..a952a2ff41c8 100644
--- a/devel/sdl2pp/Makefile
+++ b/devel/sdl2pp/Makefile
@@ -24,7 +24,7 @@ TEST_TARGET=	test
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	all doxygen
 DOXYGEN_IMPLIES=	DOCS
 
diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
index 90259b4530ab..45f95b7aed48 100644
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@@ -28,7 +28,7 @@ SDL_DESC=	Enable support for SDL_image
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	libfreetype.so:print/freetype2
 MAKE_ARGS+=	USE_FT=y
 .else
 MAKE_ARGS+=	USE_FT=n
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 2c49e1c48efa..a1787dd2bd19 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://thor-f5.er.usgs.gov/sdts/sdtsxx/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library for SDTS related development
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 DOS2UNIX_FILES=	sdts++/io/sio_Utils.cpp
 USES=		autoreconf bison dos2unix gmake libtool makeinfo
diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile
index 9228cb1f39f6..c028ea386436 100644
--- a/devel/sfml/Makefile
+++ b/devel/sfml/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	SFML-${PORTVERSION}-sources
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple and Fast Multimedia Library
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libfreetype.so:print/freetype2
 
 USES=		cmake dos2unix jpeg openal:al zip:infozip
 DOS2UNIX_FILES=	CMakeLists.txt
@@ -28,6 +28,6 @@ PORTDATA=	*
 OPTIONS_DEFINE=	DOXYGEN
 
 DOXYGEN_CMAKE_ON=	-DSFML_BUILD_DOC:BOOL=YES
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 .include <bsd.port.mk>
diff --git a/devel/sfml1/Makefile b/devel/sfml1/Makefile
index 4f6726162364..5c4233ae6471 100644
--- a/devel/sfml1/Makefile
+++ b/devel/sfml1/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Simple and Fast Multimedia Library
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		gmake jpeg openal:al pkgconfig dos2unix
 DOS2UNIX_GLOB=	Makefile ResourcePtr.inl
diff --git a/devel/sgb/Makefile b/devel/sgb/Makefile
index d2db09447943..7fde401a2f62 100644
--- a/devel/sgb/Makefile
+++ b/devel/sgb/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	sgb-2009-08-10
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	The Stanford GraphBase: A Platform for Combinatorial Computing
 
-BUILD_DEPENDS=	ctangle:${PORTSDIR}/devel/cweb
+BUILD_DEPENDS=	ctangle:devel/cweb
 
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	lib tests
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index 998b49d59001..502e8cf1fed9 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
-PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
+PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile
index 85baeec40da9..8ee73af0329e 100644
--- a/devel/shiboken/Makefile
+++ b/devel/shiboken/Makefile
@@ -13,8 +13,8 @@ COMMENT=	C++ code generator for CPython extensions
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libxslt.so:textproc/libxslt
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		PYTHON_VERSION=${PYTHON_VERSION}
@@ -39,7 +39,7 @@ CMAKE_ARGS=	-DNO_INSTALL_MANPAGES:BOOL="ON"
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 ALL_TARGET+=	doc
 post-install:
 	if [ -d ${WRKSRC}/doc/html ]; then \
diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile
index f1eedc1743b5..468a6080efa2 100644
--- a/devel/shmap/Makefile
+++ b/devel/shmap/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shared-memory-based hashmaps
 
-LIB_DEPENDS=	libmm.so:${PORTSDIR}/devel/mm
+LIB_DEPENDS=	libmm.so:devel/mm
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 721121ae718b..21c765761b57 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Toolkit for 3D games and simulations
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libosg.so:${PORTSDIR}/graphics/osg
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
+RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libosg.so:graphics/osg
 
 USE_XORG=	ice sm x11 xext xi xmu xt
 USE_GL=		gl glu glut
diff --git a/devel/simian/Makefile b/devel/simian/Makefile
index 82346ad5d869..6f0ed9e08c87 100644
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@@ -48,7 +48,7 @@ SUB_LIST+=	JAVA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMONO}
-RUN_DEPENDS+=	mono:${PORTSDIR}/lang/mono
+RUN_DEPENDS+=	mono:lang/mono
 PLIST_SUB+=	MONO=""
 SUB_LIST+=	MONO=""
 .else
diff --git a/devel/simple_components/Makefile b/devel/simple_components/Makefile
index e66918f53df8..81e2598ed2c1 100644
--- a/devel/simple_components/Makefile
+++ b/devel/simple_components/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple Ada Components
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada tar:tgz
 DEST=		${STAGEDIR}${PREFIX}
diff --git a/devel/smack/Makefile b/devel/smack/Makefile
index c2bad793856b..1bacac641e12 100644
--- a/devel/smack/Makefile
+++ b/devel/smack/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Low-level I/O storage library which packs data
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs \
-		libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
+		libsnappy.so:archivers/snappy
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zloidemon
diff --git a/devel/smokeqt/Makefile b/devel/smokeqt/Makefile
index 311a67f4975b..6e23de58e132 100644
--- a/devel/smokeqt/Makefile
+++ b/devel/smokeqt/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	SMOKE bindings for Qt
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2 \
+		libqwt.so:x11-toolkits/qwt5
 
 USE_KDE4=	kdeprefix smokegen qimageblitz
 USE_QT4=	corelib dbus declarative designer_build gui help \
diff --git a/devel/sope/Makefile b/devel/sope/Makefile
index cfd90483d05a..d1d271ae013a 100644
--- a/devel/sope/Makefile
+++ b/devel/sope/Makefile
@@ -12,8 +12,8 @@ COMMENT=		Extensive set of GNUstep web application frameworks
 
 LICENSE=		LGPL20
 
-LIB_DEPENDS=		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-			libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
+			libmemcached.so:databases/libmemcached
 
 WRKSRC=			${WRKDIR}/SOPE
 
@@ -38,7 +38,7 @@ CONFIGURE_ARGS=		--with-gnustep --disable-debug --enable-strip
 LDAP_USE=	OPENLDAP=client
 PGSQL_USES=	pgsql
 MYSQL_USE=	MYSQL=client
-MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:${PORTSDIR}/databases/memcached
+MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:databases/memcached
 
 post-patch-LDAP-off:
 	@${REINPLACE_CMD} -e '/checkLinking "ldap"/d' ${WRKSRC}/configure
diff --git a/devel/sope3/Makefile b/devel/sope3/Makefile
index 0b5d55d87dd8..9cf041b5fa82 100644
--- a/devel/sope3/Makefile
+++ b/devel/sope3/Makefile
@@ -12,8 +12,8 @@ COMMENT=		Extensive set of GNUstep web application frameworks
 
 LICENSE=		LGPL20
 
-LIB_DEPENDS=		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-			libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
+			libmemcached.so:databases/libmemcached
 
 WRKSRC=			${WRKDIR}/SOPE
 
@@ -41,7 +41,7 @@ CONFIGURE_ENV+=		CC="${CC}"
 LDAP_USE=	OPENLDAP=client
 PGSQL_USES=	pgsql
 MYSQL_USE=	MYSQL=client
-MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:${PORTSDIR}/databases/memcached
+MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:databases/memcached
 
 post-patch-LDAP-off:
 	@${REINPLACE_CMD} -e '/checkLinking "ldap"/d' ${WRKSRC}/configure
diff --git a/devel/spark/Makefile b/devel/spark/Makefile
index f90aab551255..09740fd3c149 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Fast big data processing engine
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven33/bin/mvn:${PORTSDIR}/devel/maven33 \
-		${LOCALBASE}/lib/libsnappyjava.so:${PORTSDIR}/archivers/snappy-java
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33 \
+		${LOCALBASE}/lib/libsnappyjava.so:archivers/snappy-java
+RUN_DEPENDS=	bash:shells/bash \
+		yarn:devel/hadoop2
 
 USES=		python:2
 USE_JAVA=	yes
diff --git a/devel/spice-protocol/Makefile b/devel/spice-protocol/Makefile
index e950aeab884d..5cddbce38003 100644
--- a/devel/spice-protocol/Makefile
+++ b/devel/spice-protocol/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple Protocol for Independent Computing Environments
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig python tar:bzip2
diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile
index c89e96672941..1e47746c0d86 100644
--- a/devel/srecord/Makefile
+++ b/devel/srecord/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Collection of powerful tools for manipulating EPROM load files
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USES=		ghostscript libtool:build
 GNU_CONFIGURE=	yes
diff --git a/devel/statik/Makefile b/devel/statik/Makefile
index 208407cd4333..6e6e851dba1e 100644
--- a/devel/statik/Makefile
+++ b/devel/statik/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Embed static files into a Go executable
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go:lang/go
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile
index 11536f4192b7..ed05c9721bbe 100644
--- a/devel/statsvn/Makefile
+++ b/devel/statsvn/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Subversion repository activity report generator
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	subversion>=1.3:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	subversion>=1.3:devel/subversion
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index 6b3676c28dd4..3abf0e5f434a 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Qt4 based multiplatform subversion client, diff & merge tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libsvn_client-1.so:devel/subversion
 
 CONFLICTS=	subcommander-1.*
 
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 22a45b13992c..5c6072fbaaf2 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -61,7 +61,7 @@ PLIST_SUB+=	NO_SVNSERVE_WRAPPER=""
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC}
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 44f781eaef58..65df3c8e3bbb 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -19,9 +19,9 @@ CPE_VENDOR=	apache
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^9].[0-9]*
 
-LIB_DEPENDS+=		libapr-1.so:${PORTSDIR}/devel/apr1 \
-			libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-			libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
+			libsqlite3.so:databases/sqlite3 \
+			libexpat.so:textproc/expat2
 
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--without-swig \
 
 .if defined(SVN_BUILD_ADDONS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[^9].[0-9]*
-LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion
 OPTIONS_NAME=		devel_subversion
 .endif
 
@@ -46,11 +46,11 @@ NLS_USES=			gettext
 
 SASL_CONFIGURE_OFF=		--without-sasl
 SASL_CONFIGURE_ON=		--with-sasl=${LOCALBASE}
-SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 SERF_CONFIGURE_OFF=		--without-serf
 SERF_CONFIGURE_ON=		--with-serf
-SERF_LIB_DEPENDS=		libserf-1.so:${PORTSDIR}/www/serf
+SERF_LIB_DEPENDS=		libserf-1.so:www/serf
 
 STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
 
diff --git a/devel/subversion18/Makefile b/devel/subversion18/Makefile
index f269310f262a..9ee9a9041431 100644
--- a/devel/subversion18/Makefile
+++ b/devel/subversion18/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+=	NO_SVNSERVE_WRAPPER=""
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC}
diff --git a/devel/subversion18/Makefile.common b/devel/subversion18/Makefile.common
index 62dfdfa927f9..4a55e5f0cb91 100644
--- a/devel/subversion18/Makefile.common
+++ b/devel/subversion18/Makefile.common
@@ -21,9 +21,9 @@ CPE_VENDOR=	apache
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^8].[0-9]*
 
-LIB_DEPENDS+=		libapr-1.so:${PORTSDIR}/devel/apr1 \
-			libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-			libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
+			libsqlite3.so:databases/sqlite3 \
+			libexpat.so:textproc/expat2
 
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=	--without-swig \
 
 .if defined(SVN_BUILD_ADDONS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[^8].[0-9]*
-LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion18
+LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion18
 OPTIONS_NAME=		devel_subversion18
 .endif
 
@@ -49,11 +49,11 @@ NLS_USES=			gettext
 
 SASL_CONFIGURE_OFF=		--without-sasl
 SASL_CONFIGURE_ON=		--with-sasl=${LOCALBASE}
-SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 SERF_CONFIGURE_OFF=		--without-serf
 SERF_CONFIGURE_ON=		--with-serf
-SERF_LIB_DEPENDS=		libserf-1.so:${PORTSDIR}/www/serf
+SERF_LIB_DEPENDS=		libserf-1.so:www/serf
 
 STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
 
diff --git a/devel/subversive/Makefile b/devel/subversive/Makefile
index 3bf83c11398d..f48533b3db9a 100644
--- a/devel/subversive/Makefile
+++ b/devel/subversive/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Eclipse plug-in that provides Subversion support
 
 LICENSE=	EPL
 
-RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse
+RUN_DEPENDS=	eclipse:java/eclipse
 
 CONNECTORS=	Subversive-connectors-allplatforms-4.0.2.I20140528-1700.zip
 
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 1b0e61a3f907..5db619584d5b 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -15,40 +15,40 @@ COMMENT=	Distributed Version Control System
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Algorithm-Annotate>=0:${PORTSDIR}/devel/p5-Algorithm-Annotate \
-		p5-App-CLI>=0:${PORTSDIR}/devel/p5-App-CLI \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-FreezeThaw>=0:${PORTSDIR}/devel/p5-FreezeThaw \
-		p5-IO-Digest>=0:${PORTSDIR}/devel/p5-IO-Digest \
-		p5-IO-Pager>=0:${PORTSDIR}/devel/p5-IO-Pager \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Pod-Escapes>=0:${PORTSDIR}/textproc/p5-Pod-Escapes \
-		p5-Pod-Simple>=0:${PORTSDIR}/textproc/p5-Pod-Simple \
-		p5-Regexp-Shellish>=0:${PORTSDIR}/devel/p5-Regexp-Shellish \
-		p5-SVN-Mirror>=0:${PORTSDIR}/devel/p5-SVN-Mirror \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Algorithm-Diff>=1.1901:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-Class-Autouse>=1.15:${PORTSDIR}/devel/p5-Class-Autouse \
-		p5-Data-Hierarchy>=0.30:${PORTSDIR}/devel/p5-Data-Hierarchy \
-		p5-Locale-Maketext-Lexicon>=0.62:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-Locale-Maketext-Simple>=0.16:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
-		p5-Path-Class>=0.16:${PORTSDIR}/devel/p5-Path-Class \
-		p5-PerlIO-eol>=0.13:${PORTSDIR}/devel/p5-PerlIO-eol \
-		p5-PerlIO-gzip>=0.18:${PORTSDIR}/archivers/p5-PerlIO-gzip \
-		p5-PerlIO-via-Bzip2>=0.02:${PORTSDIR}/archivers/p5-PerlIO-via-Bzip2 \
-		p5-PerlIO-via-dynamic>=0.11:${PORTSDIR}/devel/p5-PerlIO-via-dynamic \
-		p5-PerlIO-via-symlink>=0.02:${PORTSDIR}/devel/p5-PerlIO-via-symlink \
-		p5-SVN-Dump>=0.04:${PORTSDIR}/devel/p5-SVN-Dump \
-		p5-SVN-Simple>=0.27:${PORTSDIR}/devel/p5-SVN-Simple \
-		p5-SVN-Mirror>=0.71:${PORTSDIR}/devel/p5-SVN-Mirror \
-		p5-Time-Progress>=0:${PORTSDIR}/devel/p5-Time-Progress \
-		p5-YAML-Syck>=0.60:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-subversion>=0:devel/p5-subversion \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Algorithm-Annotate>=0:devel/p5-Algorithm-Annotate \
+		p5-App-CLI>=0:devel/p5-App-CLI \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-FreezeThaw>=0:devel/p5-FreezeThaw \
+		p5-IO-Digest>=0:devel/p5-IO-Digest \
+		p5-IO-Pager>=0:devel/p5-IO-Pager \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Pod-Escapes>=0:textproc/p5-Pod-Escapes \
+		p5-Pod-Simple>=0:textproc/p5-Pod-Simple \
+		p5-Regexp-Shellish>=0:devel/p5-Regexp-Shellish \
+		p5-SVN-Mirror>=0:devel/p5-SVN-Mirror \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-URI>=0:net/p5-URI \
+		p5-Algorithm-Diff>=1.1901:devel/p5-Algorithm-Diff \
+		p5-Class-Autouse>=1.15:devel/p5-Class-Autouse \
+		p5-Data-Hierarchy>=0.30:devel/p5-Data-Hierarchy \
+		p5-Locale-Maketext-Lexicon>=0.62:devel/p5-Locale-Maketext-Lexicon \
+		p5-Locale-Maketext-Simple>=0.16:devel/p5-Locale-Maketext-Simple \
+		p5-Path-Class>=0.16:devel/p5-Path-Class \
+		p5-PerlIO-eol>=0.13:devel/p5-PerlIO-eol \
+		p5-PerlIO-gzip>=0.18:archivers/p5-PerlIO-gzip \
+		p5-PerlIO-via-Bzip2>=0.02:archivers/p5-PerlIO-via-Bzip2 \
+		p5-PerlIO-via-dynamic>=0.11:devel/p5-PerlIO-via-dynamic \
+		p5-PerlIO-via-symlink>=0.02:devel/p5-PerlIO-via-symlink \
+		p5-SVN-Dump>=0.04:devel/p5-SVN-Dump \
+		p5-SVN-Simple>=0.27:devel/p5-SVN-Simple \
+		p5-SVN-Mirror>=0.71:devel/p5-SVN-Mirror \
+		p5-Time-Progress>=0:devel/p5-Time-Progress \
+		p5-YAML-Syck>=0.60:textproc/p5-YAML-Syck \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/svn2git/Makefile b/devel/svn2git/Makefile
index 412813af6ea9..6988db16edeb 100644
--- a/devel/svn2git/Makefile
+++ b/devel/svn2git/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Imports svn repositories into git
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
-RUN_DEPENDS+=	git:${PORTSDIR}/devel/git \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
+RUN_DEPENDS+=	git:devel/git \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-subversion>=0:devel/p5-subversion
 
 USES=		qmake tar:xz
 USE_GITHUB=	yes
diff --git a/devel/svn_load_dirs/Makefile b/devel/svn_load_dirs/Makefile
index a72e4dade6f8..79c06e8e9705 100644
--- a/devel/svn_load_dirs/Makefile
+++ b/devel/svn_load_dirs/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Perl script to load directories into a Subversion repository
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI \
+		${LOCALBASE}/bin/svn:devel/subversion
 
 USES=		perl5
 
diff --git a/devel/svndelta/Makefile b/devel/svndelta/Makefile
index a8b16b86a043..d928d8120c64 100644
--- a/devel/svndelta/Makefile
+++ b/devel/svndelta/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Summarizes and manages differences between local files and Subversion
 
 BROKEN=		unfetchable
-RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	${LOCALBASE}/bin/svn:devel/subversion
 
 USE_RUBY=	yes
 NO_BUILD=	yes
diff --git a/devel/svntrac/Makefile b/devel/svntrac/Makefile
index e06245a37d1d..4981ce70b88f 100644
--- a/devel/svntrac/Makefile
+++ b/devel/svntrac/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 
 COMMENT=	Web-Based Bug And Patch-Set Tracking System For Subversion
 
-RUN_DEPENDS=	subversion>=0:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	subversion>=0:devel/subversion
 
 MASTERDIR=	${.CURDIR}/../cvstrac
 MAKE_ARGS=	APPNAME=svntrac
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 9dd9b304c126..edfc0ead7e0b 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generate wrappers for calling C/C++ code from other languages
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake lua:51
 
diff --git a/devel/swig30/Makefile b/devel/swig30/Makefile
index 810d9d0547f5..95f734f5fd21 100644
--- a/devel/swig30/Makefile
+++ b/devel/swig30/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generate wrappers for calling C/C++ code from other languages
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index 2f47d1a49057..891977bcb356 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -11,17 +11,17 @@ COMMENT=	Vector based 2D animation package
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	etl>=0.04.19_1:${PORTSDIR}/devel/etl
-LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libmlt.so:${PORTSDIR}/multimedia/mlt \
-		libmng.so:${PORTSDIR}/graphics/libmng \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libdv.so:${PORTSDIR}/multimedia/libdv
+BUILD_DEPENDS=	etl>=0.04.19_1:devel/etl
+LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
+		libltdl.so:devel/libltdl \
+		libMagickWand-6.so:graphics/ImageMagick \
+		libIlmImf.so:graphics/OpenEXR \
+		libmlt.so:multimedia/mlt \
+		libmng.so:graphics/libmng \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libavcodec.so:multimedia/ffmpeg \
+		libdv.so:multimedia/libdv
 
 USES=		iconv jpeg libtool pathfix pkgconfig
 USE_GNOME=	cairo glibmm libxml++26
diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile
index 619e27364048..9000005a566f 100644
--- a/devel/tailor/Makefile
+++ b/devel/tailor/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Migrates changesets between version control systems
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index a2491774d571..2ba09187e986 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -48,8 +48,8 @@ PLIST_FILES+=		include/pytalloc.h \
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 .endif
 
 PLIST_FILES+=		include/talloc.h \
diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile
index 31937e670fd9..6c8080f55dbc 100644
--- a/devel/tcl-memchan/Makefile
+++ b/devel/tcl-memchan/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Memchan${PORTVERSION}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Two new channel types for in-memory channels in TCL8
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/tcllib/doctools/pkgIndex.tcl:${PORTSDIR}/devel/tcllib
+BUILD_DEPENDS=	${LOCALBASE}/lib/tcllib/doctools/pkgIndex.tcl:devel/tcllib
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/devel/tcllauncher/Makefile b/devel/tcllauncher/Makefile
index 427ca00512bf..7d7ead7db342 100644
--- a/devel/tcllauncher/Makefile
+++ b/devel/tcllauncher/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Launcher program for Tcl applications
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libtclx8.4.so:${PORTSDIR}/lang/tclX
+LIB_DEPENDS=	libtclx8.4.so:lang/tclX
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
diff --git a/devel/tcllibc/Makefile b/devel/tcllibc/Makefile
index 854d25d03f7e..c1f684892af4 100644
--- a/devel/tcllibc/Makefile
+++ b/devel/tcllibc/Makefile
@@ -5,7 +5,7 @@ PKGNAMESUFFIX=	c
 
 COMMENT=	Compiled implementations of some of the modules of Tcllib
 
-BUILD_DEPENDS=	critcl:${PORTSDIR}/devel/critcl
+BUILD_DEPENDS=	critcl:devel/critcl
 RUN_DEPENDS=	${PREFIX}/lib/tcllib/pkgIndex.tcl:${MASTERDIR}	# PREFIX, not LOCALBASE
 
 MASTERDIR=	${.CURDIR:H}/tcllib
diff --git a/devel/tclthread/Makefile b/devel/tclthread/Makefile
index 1e7e8be9d4c7..56bb0e85bfdf 100644
--- a/devel/tclthread/Makefile
+++ b/devel/tclthread/Makefile
@@ -35,7 +35,7 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 CONFIGURE_ARGS+=--with-gdbm
 .endif
 
diff --git a/devel/tclvfs/Makefile b/devel/tclvfs/Makefile
index 804c69c029ef..35a25c37fdcb 100644
--- a/devel/tclvfs/Makefile
+++ b/devel/tclvfs/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Tcl VirtualFileSystem layer
 
-LIB_DEPENDS=	libTrf2.1.4.so:${PORTSDIR}/devel/tcl-trf
+LIB_DEPENDS=	libTrf2.1.4.so:devel/tcl-trf
 
 USES+=		gmake tcl
 GNU_CONFIGURE=	yes
diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile
index 5b67bf32c10f..5533d7ff9d10 100644
--- a/devel/tclxml/Makefile
+++ b/devel/tclxml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	API for parsing XML documents using Tcl
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS?=	dtplite:${PORTSDIR}/devel/tcllib
+LIB_DEPENDS=	libxslt.so:textproc/libxslt
+RUN_DEPENDS?=	dtplite:devel/tcllib
 
 PORTDOCS=	README.xml html.xsl man.macros nroff.xsl tcldoc-1.0.dtd \
 		tcldom.html tcldom.xml tclxml.css tclxml.html tclxml.xml \
diff --git a/devel/tesla/Makefile b/devel/tesla/Makefile
index 47b6b76ef496..d3e25a601aa8 100644
--- a/devel/tesla/Makefile
+++ b/devel/tesla/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Temporally Enhanced Security Logic Assertions
 
 USES=		cmake:outsource execinfo ninja
 
-BUILD_DEPENDS=	clang33:${PORTSDIR}/lang/clang33
-RUN_DEPENDS=	clang33:${PORTSDIR}/lang/clang33
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+BUILD_DEPENDS=	clang33:lang/clang33
+RUN_DEPENDS=	clang33:lang/clang33
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-TESLA
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index e5167f7dddcf..b1e34dc6c815 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
-BUILD_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc
+BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
 .include <bsd.port.options.mk>
@@ -50,8 +50,8 @@ PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/_tevent.so \
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 .endif
 
 PLIST_FILES+=		include/tevent.h \
diff --git a/devel/tex-web2c/Makefile b/devel/tex-web2c/Makefile
index 2357adaf9707..d6e04e48c2cf 100644
--- a/devel/tex-web2c/Makefile
+++ b/devel/tex-web2c/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	TeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX implementation translating WEB to C
 
-LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libzzip.so:${PORTSDIR}/devel/zziplib \
-		libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15 \
+		libpng.so:graphics/png \
+		libzzip.so:devel/zziplib \
+		libmpfr.so:math/mpfr
 
 USES=		pkgconfig libtool tar:xz
 USE_TEX=	kpathsea ptexenc
diff --git a/devel/thrift-c_glib/Makefile b/devel/thrift-c_glib/Makefile
index cd77805cc166..74e33d5104f1 100644
--- a/devel/thrift-c_glib/Makefile
+++ b/devel/thrift-c_glib/Makefile
@@ -16,7 +16,7 @@ PKGNAMESUFFIX=	-c_glib
 
 BUILDIR=	${WRKDIR}/${DISTNAME}/lib/c_glib
 
-LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libglib-2.0.so:devel/glib20
 
 DISTINFO_FILE=	${.CURDIR}/../thrift/distinfo
 
diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
index 62fcb49c2e9e..921af9910cd4 100644
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -15,8 +15,8 @@ COMMENT=	C++ interface to Thrift
 
 DISTINFO_FILE=		${.CURDIR}/../thrift/distinfo
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libevent.so:devel/libevent2
 
 USES=			autoreconf pkgconfig gmake compiler:c++11-lang libtool
 GNU_CONFIGURE=		yes
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index 16991bbc891e..27cbc78be70d 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -24,9 +24,9 @@ OPTIONS_DEFAULT=	SVN
 GIT_DESC=	Git support
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+GIT_RUN_DEPENDS=	git:devel/git
 GIT_CONFIGURE_ENABLE=	git
-SVN_LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+SVN_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 SVN_CONFIGURE_ENABLE=	subversion
 OPTIONS_SUB=	yes
 
diff --git a/devel/tig/Makefile b/devel/tig/Makefile
index f9598ae8a8a5..116da3a86846 100644
--- a/devel/tig/Makefile
+++ b/devel/tig/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Text-mode interface for git
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE}
@@ -26,8 +26,8 @@ PLIST_FILES=	bin/tig etc/tigrc
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
-MANPAGES_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-			xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+			xmlto:textproc/xmlto
 MANPAGES_ALL_TARGET=	doc-man
 MANPAGES_INSTALL_TARGET=	install-doc-man
 MANPAGES_PLIST_FILES=	man/man1/tig.1.gz \
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 373742857726..d9e125e1e0b6 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tcl/Tk frontends to CVS and Subversion
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	tkdiff:${PORTSDIR}/textproc/tkdiff
+RUN_DEPENDS=	tkdiff:textproc/tkdiff
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/devel/tkinspect/Makefile b/devel/tkinspect/Makefile
index f19116272e6c..4e551acf538c 100644
--- a/devel/tkinspect/Makefile
+++ b/devel/tkinspect/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=   SF/tkcon/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tk program browser
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
 
 # this would do an interactive install:
 #do-install:
diff --git a/devel/tkmerge/Makefile b/devel/tkmerge/Makefile
index e8c0b2d0b835..02bafceba611 100644
--- a/devel/tkmerge/Makefile
+++ b/devel/tkmerge/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://immure.com/ports/tkmerge/
 MAINTAINER=	bob@immure.com
 COMMENT=	Tk script to aid in merging changes between two files
 
-RUN_DEPENDS+=	${LOCALBASE}/lib/bwidget/label.tcl:${PORTSDIR}/x11-toolkits/bwidget
+RUN_DEPENDS+=	${LOCALBASE}/lib/bwidget/label.tcl:x11-toolkits/bwidget
 
 USES=		tk:run
 
diff --git a/devel/tkp4/Makefile b/devel/tkp4/Makefile
index 51c0c463b2ff..de4f88a07d19 100644
--- a/devel/tkp4/Makefile
+++ b/devel/tkp4/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tcl/Tk frontends to Perforce's p4
 
 OPTIONS_DEFINE=	DOCS
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index f85b918ee21b..345b75e5a268 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -13,9 +13,9 @@ COMMENT=	The original arch source control management CLI written in C
 
 OPTIONS_DEFINE=	DOCS
 
-BUILD_DEPENDS=	gpatch:${PORTSDIR}/devel/patch \
-		gdiff:${PORTSDIR}/textproc/diffutils \
-		gtar:${PORTSDIR}/archivers/gtar
+BUILD_DEPENDS=	gpatch:devel/patch \
+		gdiff:textproc/diffutils \
+		gtar:archivers/gtar
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index 73f31461df28..d4b84a648f17 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -12,18 +12,18 @@ COMMENT=	THg script from TortoiseHG
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.11.4:${PORTSDIR}/textproc/py-qt4-xml
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		hg:${PORTSDIR}/devel/mercurial \
-		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:${PORTSDIR}/devel/py-iniparse \
-		pygmentize:${PORTSDIR}/textproc/py-pygments
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:devel/py-qt4-qscintilla2 \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.11.4:textproc/py-qt4-xml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:devel/py-qt4-qscintilla2 \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:x11-toolkits/py-qt4-gui \
+		hg:devel/mercurial \
+		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse \
+		pygmentize:textproc/py-pygments
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
diff --git a/devel/trac-bitten/Makefile b/devel/trac-bitten/Makefile
index d60ab2bcdae2..d62cd0ade2c4 100644
--- a/devel/trac-bitten/Makefile
+++ b/devel/trac-bitten/Makefile
@@ -30,7 +30,7 @@ BITTEN_MASTER_DESC=	Build bitten master
 
 OPTIONS_DEFAULT=	BITTEN_MASTER
 
-BITTEN_MASTER_RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+BITTEN_MASTER_RUN_DEPENDS=	tracd:www/trac
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/devel/uatraits/Makefile b/devel/uatraits/Makefile
index 2c3e9b1dddcc..ef6d48eda03c 100644
--- a/devel/uatraits/Makefile
+++ b/devel/uatraits/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://people.freebsd.org/~demon/
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	User-Agent detection library
 
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+		libpcre.so:devel/pcre \
+		libxml2.so:textproc/libxml2
 
 USES=		autoreconf libtool pkgconfig python
 GNU_CONFIGURE=	yes
diff --git a/devel/udis86/Makefile b/devel/udis86/Makefile
index 5980e02cf67c..c25bef177d00 100644
--- a/devel/udis86/Makefile
+++ b/devel/udis86/Makefile
@@ -38,7 +38,7 @@ post-patch:
 .endif
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=		${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS+=		${LOCALBASE}/bin/yasm:devel/yasm
 CONFIGURE_ENV+=		PYTHON="${PYTHON_CMD}" YASM="${LOCALBASE}/bin/yasm"
 USES+=			python:build
 
diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
index 838db3ab73bd..117dcd6f9580 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	UML modeller for KDE
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_GNOME=	libxml2 libxslt
diff --git a/devel/umlgraph/Makefile b/devel/umlgraph/Makefile
index b3b27f9c0923..2288b0737b4c 100644
--- a/devel/umlgraph/Makefile
+++ b/devel/umlgraph/Makefile
@@ -17,8 +17,8 @@ USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.8
 
-BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-		pic2plot:${PORTSDIR}/graphics/plotutils
+BUILD_DEPENDS=	dot:graphics/graphviz \
+		pic2plot:graphics/plotutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_FILES=	bin/umlgraph %%JAVAJARDIR%%/UmlGraph.jar
diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile
index 802586759fce..5090902b9f9f 100644
--- a/devel/universalindentgui/Makefile
+++ b/devel/universalindentgui/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/universalindent/uigui/UniversalIndentGUI_${PORTVERSION}
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Graphical UI for multiple source code indent/format/beautify tools
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 
 USES=		dos2unix qmake shebangfix
 SHEBANG_FILES=	indenters/pindent.py \
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 96ab73471670..475cdde3f7dd 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${BUILD_WRKSRC}/Core/Copying
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libnotify.so:devel/libnotify
 
 USES=		execinfo gmake
 USE_XORG=	xft
diff --git a/devel/urjtag/Makefile b/devel/urjtag/Makefile
index 800aa9b48ce8..c413b8123bac 100644
--- a/devel/urjtag/Makefile
+++ b/devel/urjtag/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extended utility to work with JTAG-aware boards
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake readline shebangfix tar:bzip2
 SHEBANG_FILES=	src/bsdl2jtag
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=	FTDI USB
 OPTIONS_SUB=		yes
 
 FTDI_DESC=		FTDI-based USB JTAG adapters support
-FTDI_LIB_DEPENDS=	libftdi.so:${PORTSDIR}/devel/libftdi
+FTDI_LIB_DEPENDS=	libftdi.so:devel/libftdi
 FTDI_CONFIGURE_WITH=	libftdi
 
 JEDEC_DESC=		Experimental JEDEC flash detection
@@ -42,7 +42,7 @@ USB_CONFIGURE_ON=	--with-libusb=/usr
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>0:textproc/flex
 CONFIGURE_ENV+=	LEX=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
index dd8f3346b06d..4cdcb166c3ed 100644
--- a/devel/valgrind-devel/Makefile
+++ b/devel/valgrind-devel/Makefile
@@ -26,8 +26,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 LIB32_PATH?=	${DESTDIR}/usr/lib32/libc.so
 
-BUILD_DEPENDS+=		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		docbook-xsl>=0:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 
 OPTIONS_DEFINE=		MPI DOCS
 OPTIONS_DEFINE_amd64=	32BIT
@@ -37,7 +37,7 @@ OPTIONS_DEFAULT_amd64=	32BIT
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
-MPI_LIB_DEPENDS=	libmpich.so:${PORTSDIR}/net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 
 OPTIONS_SUB=	yes
 USES=		pathfix pkgconfig gmake perl5 shebangfix autoreconf
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index eb108524a924..04615821ee29 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -25,8 +25,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 LIB32_PATH?=	${DESTDIR}/usr/lib32/libc.so
 
-BUILD_DEPENDS+=		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		docbook-xsl>=0:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 
 OPTIONS_DEFINE=		MPI DOCS
 OPTIONS_DEFINE_amd64=	32BIT
@@ -36,7 +36,7 @@ OPTIONS_DEFAULT_amd64=	32BIT
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
-MPI_LIB_DEPENDS=	libmpich.so:${PORTSDIR}/net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 
 OPTIONS_SUB=	yes
 USES=		pathfix pkgconfig gmake perl5 shebangfix autoreconf
diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile
index 7d909bb81f1d..af45a899c1e5 100644
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28config%20lib%29/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Configuration System for the STAGE Server
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/vera++/Makefile b/devel/vera++/Makefile
index 4ff3b2e4d635..897d535214e7 100644
--- a/devel/vera++/Makefile
+++ b/devel/vera++/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tool for verification of C++ source code
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
-BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 
 USES=		cmake:outsource tk
 
@@ -33,10 +33,10 @@ OPTIONS_DEFAULT=	LUA PYTHON
 
 PYTHON_CMAKE_OFF=	-DVERA_PYTHON:BOOL=OFF
 PYTHON_CMAKE_ON=	-DVERA_PYTHON:BOOL=ON
-PYTHON_LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+PYTHON_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 LUA_CMAKE_OFF=	-DVERA_LUA:BOOL=OFF
 LUA_CMAKE_ON=	-DVERA_LUA:BOOL=ON
-LUA_LIB_DEPENDS=	libluabind.so:${PORTSDIR}/devel/luabind
+LUA_LIB_DEPENDS=	libluabind.so:devel/luabind
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^add_subdirectory(doc/d' \
diff --git a/devel/visualparadigm/Makefile b/devel/visualparadigm/Makefile
index 5117575f8460..596008314cba 100644
--- a/devel/visualparadigm/Makefile
+++ b/devel/visualparadigm/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	Visual_Paradigm_CE_${PORTVERSION:C/\./_/g}_Unix_InstallFree
 MAINTAINER=	fernando.apesteguia@gmail.com
 COMMENT=	Visual modeling tool for all kinds of UML diagrams
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libsqlitejdbc.so:${PORTSDIR}/java/sqlitejdbc
+RUN_DEPENDS=	${LOCALBASE}/lib/libsqlitejdbc.so:java/sqlitejdbc
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
diff --git a/devel/wandio/Makefile b/devel/wandio/Makefile
index ced23aee97d5..3df34d25b134 100644
--- a/devel/wandio/Makefile
+++ b/devel/wandio/Makefile
@@ -33,9 +33,9 @@ HTTP_DESC=	Support for reading files over HTTP
 ZLIB_CONFIGURE_WITH=	zlib
 BZIP2_CONFIGURE_WITH=	bzip2
 LZO_CONFIGURE_WITH=	lzo
-LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZMA_CONFIGURE_WITH=	lzma
 HTTP_CONFIGURE_WITH=	http
-HTTP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+HTTP_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 .include <bsd.port.mk>
diff --git a/devel/winpdb/Makefile b/devel/winpdb/Makefile
index a85b47c2d065..7f5cf2245db3 100644
--- a/devel/winpdb/Makefile
+++ b/devel/winpdb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Advanced Python debugger
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/xc3sprog/Makefile b/devel/xc3sprog/Makefile
index 4593bb8eb9d6..489802b162b3 100644
--- a/devel/xc3sprog/Makefile
+++ b/devel/xc3sprog/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	http://opsec.eu/src/xc3sprog/
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Free programmer for Xilinx Spartan S3E Starter Kit
 
-LIB_DEPENDS=	libftdi.so:${PORTSDIR}/devel/libftdi
-RUN_DEPENDS=	${LOCALBASE}/sbin/fxload:${PORTSDIR}/misc/fxload
+LIB_DEPENDS=	libftdi.so:devel/libftdi
+RUN_DEPENDS=	${LOCALBASE}/sbin/fxload:misc/fxload
 
 USES=		tar:xz cmake
 ALL_TARGET=	xc3sprog
diff --git a/devel/xdg-user-dirs/Makefile b/devel/xdg-user-dirs/Makefile
index 5ac50e2e9c80..88ea5ebd2233 100644
--- a/devel/xdg-user-dirs/Makefile
+++ b/devel/xdg-user-dirs/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://user-dirs.freedesktop.org/releases/
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Tool to help manage personal user directories
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake iconv
diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile
index fbde757b3703..497a133e00aa 100644
--- a/devel/xdg-utils/Makefile
+++ b/devel/xdg-utils/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	http://portland.freedesktop.org/download/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to allow all applications to integrate with the free desktop
 
-BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		xprop:${PORTSDIR}/x11/xprop \
-		xset:${PORTSDIR}/x11/xset
+BUILD_DEPENDS=	xmlto:textproc/xmlto
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		xprop:x11/xprop \
+		xset:x11/xset
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index fa8d1f1ca0be..eb12ed0dccff 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Xfce development tools
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
-		automake-1.15:${PORTSDIR}/devel/automake \
-		libtoolize:${PORTSDIR}/devel/libtool \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
+		automake-1.15:devel/automake \
+		libtoolize:devel/libtool \
+		bash:shells/bash
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile
index 6b4dff23b5c8..f3e59230c3d2 100644
--- a/devel/xfce4-vala/Makefile
+++ b/devel/xfce4-vala/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Vala binding for the Xfce core libraries
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 
 GNU_CONFIGURE=	yes
 USES=	pkgconfig gmake pathfix xfce tar:bzip2
diff --git a/devel/xmltooling/Makefile b/devel/xmltooling/Makefile
index 5acec7cafcb1..3bffef9ad554 100644
--- a/devel/xmltooling/Makefile
+++ b/devel/xmltooling/Makefile
@@ -9,12 +9,12 @@ MASTER_SITES=	http://shibboleth.net/downloads/c++-opensaml/2.5.5/
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Low level XML support for SAML
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		liblog4shib.so:${PORTSDIR}/devel/log4shib \
-		libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
-		libxml-security-c.so:${PORTSDIR}/security/apache-xml-security-c
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		liblog4shib.so:devel/log4shib \
+		libxerces-c.so.3:textproc/xerces-c3 \
+		libxml-security-c.so:security/apache-xml-security-c
 
-BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-log4shib=${LOCALBASE} --with-openssl=${OPENSSLBASE} --with-curl=${LOCALBASE} --disable-doxygen-doc
diff --git a/devel/xsd/Makefile b/devel/xsd/Makefile
index cdeb8929dca6..3cdd93180229 100644
--- a/devel/xsd/Makefile
+++ b/devel/xsd/Makefile
@@ -16,12 +16,12 @@ LICENSE_NAME_FLOSSE=	FLOSS Exception
 LICENSE_FILE_FLOSSE=	${WRKSRC}/xsd/FLOSSE
 LICENSE_PERMS_FLOSSE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/build-0.3/abspath.make:${PORTSDIR}/devel/build
+BUILD_DEPENDS=	${LOCALBASE}/include/build-0.3/abspath.make:devel/build
 # libxsd-frontend should come from a separate port as well, but at the moment
 # its distribution as a separate tarball is so poor that it does not even have
 # a `make install'.
-LIB_DEPENDS=	libcutl.so:${PORTSDIR}/devel/libcutl \
-		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
+LIB_DEPENDS=	libcutl.so:devel/libcutl \
+		libxerces-c.so:textproc/xerces-c3
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/yajl-tcl/Makefile b/devel/yajl-tcl/Makefile
index 467d1311ab3a..25eaaea393b6 100644
--- a/devel/yajl-tcl/Makefile
+++ b/devel/yajl-tcl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tcl bindings for Yet Another JSON Library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS=	libyajl.so:devel/yajl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
diff --git a/devel/yaml-cpp/Makefile b/devel/yaml-cpp/Makefile
index 4bf63ac74603..eb122e35f925 100644
--- a/devel/yaml-cpp/Makefile
+++ b/devel/yaml-cpp/Makefile
@@ -12,8 +12,8 @@ COMMENT=	YAML parser and emitter in C++ matching the YAML 1.2 spec
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jbeder
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index 40a4d81edb27..ba6f8d4ce8a2 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -10,11 +10,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/current
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Coordination Service for Distributed Applications
 
-RUN_DEPENDS=	slf4j>=1.7.5:${PORTSDIR}/devel/slf4j \
-		netty>=3.5.5:${PORTSDIR}/java/netty \
-		jline>=0.9.94:${PORTSDIR}/devel/jline \
-		log4j>=1.2.16:${PORTSDIR}/devel/log4j \
-		libzookeeper>=3.4.7:${PORTSDIR}/devel/libzookeeper
+RUN_DEPENDS=	slf4j>=1.7.5:devel/slf4j \
+		netty>=3.5.5:java/netty \
+		jline>=0.9.94:devel/jline \
+		log4j>=1.2.16:devel/log4j \
+		libzookeeper>=3.4.7:devel/libzookeeper
 
 USERS=	zookeeper
 GROUPS=	zookeeper
diff --git a/devel/zpu-gcc/Makefile b/devel/zpu-gcc/Makefile
index 304bba642313..233246cab56c 100644
--- a/devel/zpu-gcc/Makefile
+++ b/devel/zpu-gcc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	ZPU gcc compiler
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/zpu/bin/zpu-elf-as:${PORTSDIR}/devel/zpu-binutils
+BUILD_DEPENDS=	${LOCALBASE}/zpu/bin/zpu-elf-as:devel/zpu-binutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/toolchain
diff --git a/devel/ztcl/Makefile b/devel/ztcl/Makefile
index 1091c232c494..a5c1919b6cf9 100644
--- a/devel/ztcl/Makefile
+++ b/devel/ztcl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Zlib extension library for the Tcl
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libtclmore0.so:${PORTSDIR}/devel/tclmore
+LIB_DEPENDS=	libtclmore0.so:devel/tclmore
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 895c30a2207e..727bcc7bf444 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library to provide transparent read access to zipped files
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	zip:archivers/zip
 
 USES=		gmake libtool pathfix pkgconfig python:2,build tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/dns/adns/Makefile b/dns/adns/Makefile
index 1e700a5ac2e9..fe543922c02d 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -19,7 +19,7 @@ PORTSCOUT=	skipv:1.5.0~rc0,1.5.0~rc1
 LIBVERSION=	1
 PLIST_SUB+=	LIBVERSION="${LIBVERSION}"
 
-BUILD_DEPENDS+=		gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS+=		gm4:devel/m4
 CFLAGS+=		-Ds6_addr16=__u6_addr.__u6_addr16
 CFLAGS+=		-Ds6_addr32=__u6_addr.__u6_addr32
 MAKE_FLAGS+=		M4=gm4
diff --git a/dns/adsuck/Makefile b/dns/adsuck/Makefile
index 741b3e766ec5..c7d31f764ae4 100644
--- a/dns/adsuck/Makefile
+++ b/dns/adsuck/Makefile
@@ -14,8 +14,8 @@ COMMENT=	DNS relay for ad blocking
 
 LICENSE=	ISCL
 
-LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libldns.so:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	libevent.so:devel/libevent2 \
+		libldns.so:dns/ldns
 
 CFLAGS+= 	-I${LOCALBASE}/include
 
diff --git a/dns/autotrust/Makefile b/dns/autotrust/Makefile
index fe9cd4ca6b30..3fde5b9dff3e 100644
--- a/dns/autotrust/Makefile
+++ b/dns/autotrust/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.nlnetlabs.nl/downloads/autotrust/
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool to automatically update DNSSEC trust anchors
 
-LIB_DEPENDS+=	libldns.so:${PORTSDIR}/dns/ldns \
-		libunbound.so:${PORTSDIR}/dns/unbound
+LIB_DEPENDS+=	libldns.so:dns/ldns \
+		libunbound.so:dns/unbound
 
 GNU_CONFIGURE=	yes
 CFLAGS=		-I${LOCALBASE}/include
diff --git a/dns/axfr2acl/Makefile b/dns/axfr2acl/Makefile
index c4704599cda6..bcb6ca1f6cf9 100644
--- a/dns/axfr2acl/Makefile
+++ b/dns/axfr2acl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Transfer A records from DNS zones and convert to BIND ACLs
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 04d877e6124f..7855829d4141 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -32,7 +32,7 @@ CPE_VERSION=	${ISCVERSION:C/-.*//}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--localstatedir=/var --disable-linux-caps \
@@ -111,7 +111,7 @@ NEWSTATS_CONFIGURE_ENABLE=	newstats
 
 IDN_USES=		iconv
 IDN_CONFIGURE_ON=	--with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
-IDN_LIB_DEPENDS=	libidnkit.so:${PORTSDIR}/dns/idnkit
+IDN_LIB_DEPENDS=	libidnkit.so:dns/idnkit
 IDN_CONFIGURE_OFF=	--without-idn
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
@@ -125,7 +125,7 @@ FILTER_AAAA_CONFIGURE_ENABLE=	filter-aaaa
 NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
 
 GEOIP_CONFIGURE_WITH=	geoip
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 GOST_CONFIGURE_ON=	--with-gost
 GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index f508e5686c62..fc2bc61a544a 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -41,7 +41,7 @@ CPE_VERSION=	${ISCVERSION:C/-.*//}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--localstatedir=/var --disable-linux-caps \
@@ -133,7 +133,7 @@ NEWSTATS_CONFIGURE_ENABLE=	newstats
 
 IDN_USES=		iconv
 IDN_CONFIGURE_ON=	--with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
-IDN_LIB_DEPENDS=	libidnkit.so:${PORTSDIR}/dns/idnkit
+IDN_LIB_DEPENDS=	libidnkit.so:dns/idnkit
 IDN_CONFIGURE_OFF=	--without-idn
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
@@ -147,7 +147,7 @@ FILTER_AAAA_CONFIGURE_ENABLE=	filter-aaaa
 NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
 
 GEOIP_CONFIGURE_WITH=	geoip
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 GOST_CONFIGURE_ON=	--with-gost
 GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index f00f89dd1cf4..4373bf8f267e 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -27,7 +27,7 @@ CPE_VERSION=	${ISCVERSION:C/-.*//}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -98,7 +98,7 @@ NEWSTATS_CONFIGURE_ENABLE=	newstats
 
 IDN_USES=		iconv
 IDN_CONFIGURE_ON=	--with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
-IDN_LIB_DEPENDS=	libidnkit.so:${PORTSDIR}/dns/idnkit
+IDN_LIB_DEPENDS=	libidnkit.so:dns/idnkit
 IDN_CONFIGURE_OFF=	--without-idn
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
diff --git a/dns/bindgraph/Makefile b/dns/bindgraph/Makefile
index aecbbfa5d2a0..6e2323e0aa19 100644
--- a/dns/bindgraph/Makefile
+++ b/dns/bindgraph/Makefile
@@ -12,8 +12,8 @@ COMMENT=	RRDtool frontend for BIND statistics
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool	\
-		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
+RUN_DEPENDS=	rrdtool>=0:databases/rrdtool	\
+		p5-File-Tail>=0:devel/p5-File-Tail
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix tar:tgz
diff --git a/dns/bundy/Makefile b/dns/bundy/Makefile
index e3da41447825..858ccf6d30d9 100644
--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@@ -16,16 +16,16 @@ LICENSE_NAME=	ISC License
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp:${PORTSDIR}/devel/boost-libs \
-		${LOCALBASE}/include/log4cplus/logger.h:${PORTSDIR}/devel/log4cplus \
-		sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/${PYTHON_PKGNAMEPREFIX}sqlite3
-LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110 \
-		liblog4cplus.so:${PORTSDIR}/devel/log4cplus \
-		libicuuc.so:${PORTSDIR}/devel/icu \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/${PYTHON_PKGNAMEPREFIX}sqlite3
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp:devel/boost-libs \
+		${LOCALBASE}/include/log4cplus/logger.h:devel/log4cplus \
+		sqlite3>=3.3.9:databases/sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
+LIB_DEPENDS=	libbotan-1.10.so:security/botan110 \
+		liblog4cplus.so:devel/log4cplus \
+		libicuuc.so:devel/icu \
+		libgmp.so:math/gmp \
+		libsqlite3.so:databases/sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bundy-dns
diff --git a/dns/cli53/Makefile b/dns/cli53/Makefile
index f5b5f1ad5a77..ce9918980a07 100644
--- a/dns/cli53/Makefile
+++ b/dns/cli53/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	dns
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Command line management of Route53 domains
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:${PORTSDIR}/devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/dns/curvedns/Makefile b/dns/curvedns/Makefile
index 715495f9fb94..e754d9a5f4d0 100644
--- a/dns/curvedns/Makefile
+++ b/dns/curvedns/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	dns
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Forwarder adding DNSCurve to an authoritative nameserver
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev \
-		libsodium.so:${PORTSDIR}/security/libsodium
-RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libev.so:devel/libev \
+		libsodium.so:security/libsodium
+RUN_DEPENDS=	setuidgid:sysutils/daemontools
+BUILD_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
diff --git a/dns/ddclient/Makefile b/dns/ddclient/Makefile
index 045da491dfa4..d18eb889681a 100644
--- a/dns/ddclient/Makefile
+++ b/dns/ddclient/Makefile
@@ -24,8 +24,8 @@ SUB_FILES=	pkg-message ddclient_force
 OPTIONS_DEFINE=	SSL
 OPTIONS_DEFAULT=SSL
 
-SSL_RUN_DEPENDS=ca_root_nss>0:${PORTSDIR}/security/ca_root_nss \
-		p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL
+SSL_RUN_DEPENDS=ca_root_nss>0:security/ca_root_nss \
+		p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL
 
 PORTDOCS=	COPYRIGHT Changelog README.cisco README.ssl README.md \
 		sample-etc_cron.d_ddclient sample-etc_dhclient-exit-hooks \
diff --git a/dns/dhisd/Makefile b/dns/dhisd/Makefile
index abda15d610ae..8eeae9799a20 100644
--- a/dns/dhisd/Makefile
+++ b/dns/dhisd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	DHIS server for dynamic updates on the server using specific engines
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 CFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index aba4bdaedb3a..9a56660bfa76 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -14,8 +14,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER?=	lx@FreeBSD.org
 COMMENT?=	Collection of secure and reliable DNS tools
 
-RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
-		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	setuidgid:sysutils/daemontools \
+		tcpserver:sysutils/ucspi-tcp
 
 CONFLICTS=	djbdns-tools-[0-9]*
 LEGAL_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
@@ -111,7 +111,7 @@ PATCHFILES+=	djbdns-dnscurve-20090602.patch:dnscurve
 PATCH_DIST_STRIP=	-p1
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LDFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-BUILD_DEPENDS+=	nacl-sha256:${PORTSDIR}/security/nacl
+BUILD_DEPENDS+=	nacl-sha256:security/nacl
 .endif
 
 DJBDNS_VER=	1.05
diff --git a/dns/dnscheckengine/Makefile b/dns/dnscheckengine/Makefile
index 5f6bc5cd28f5..679b74586587 100644
--- a/dns/dnscheckengine/Makefile
+++ b/dns/dnscheckengine/Makefile
@@ -14,23 +14,23 @@ COMMENT=	DNS checker from the folks that run the .SE top level domain
 LICENSE=	BSD2CLAUSE
 LICENSE_FILES=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random \
-		p5-Digest-BubbleBabble>=0:${PORTSDIR}/security/p5-Digest-BubbleBabble \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-IO-Socket-INET6>=2.51:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-Net-DNS>=0.65:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0.15:${PORTSDIR}/dns/p5-Net-DNS-SEC \
-		p5-Socket6>=0.19:${PORTSDIR}/net/p5-Socket6 \
-		p5-Sys-Syslog>=0:${PORTSDIR}/sysutils/p5-Sys-Syslog \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-Mail-RFC822-Address>=0:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-Random>=0:security/p5-Crypt-OpenSSL-Random \
+		p5-Digest-BubbleBabble>=0:security/p5-Digest-BubbleBabble \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
+		p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0.15:dns/p5-Net-DNS-SEC \
+		p5-Socket6>=0.19:net/p5-Socket6 \
+		p5-Sys-Syslog>=0:sysutils/p5-Sys-Syslog \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-Mail-RFC822-Address>=0:mail/p5-Mail-RFC822-Address \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile
index a97c044d7e1c..7d7927f858e1 100644
--- a/dns/dnscrypt-proxy/Makefile
+++ b/dns/dnscrypt-proxy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Boost privacy and security of DNS
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 GNU_CONFIGURE=	yes
 USES=		execinfo gmake
diff --git a/dns/dnscrypt-wrapper/Makefile b/dns/dnscrypt-wrapper/Makefile
index 1a488784947f..f3a8b513e8f3 100644
--- a/dns/dnscrypt-wrapper/Makefile
+++ b/dns/dnscrypt-wrapper/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Adds dnscrypt support to any name resolver
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libsodium.so:security/libsodium \
+		libevent.so:devel/libevent2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cofyc
diff --git a/dns/dnsdbck/Makefile b/dns/dnsdbck/Makefile
index 572c771d092c..ade5e2b5c9b8 100644
--- a/dns/dnsdbck/Makefile
+++ b/dns/dnsdbck/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Verify consistency of DNS information in an SQL database
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR \
+		p5-Net-DNS>0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
index 538d9f669405..8b001678e827 100644
--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@@ -16,9 +16,9 @@ LICENSE_NAME_UNLICENSE=	The Unlicense
 LICENSE_FILE_UNLICENSE=	${WRKSRC}/ext/incbin/UNLICENSE
 LICENSE_PERMS_UNLICENSE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops
-LIB_DEPENDS=	libboost_serialization.so:${PORTSDIR}/devel/boost-libs \
-		libsodium.so:${PORTSDIR}/security/libsodium
+BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
+LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
+		libsodium.so:security/libsodium
 
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 LDFLAGS+=	-L${LOCALBASE}/lib -latomic
diff --git a/dns/dnshistory/Makefile b/dns/dnshistory/Makefile
index 696c67b17a91..ac4183cbf6b3 100644
--- a/dns/dnshistory/Makefile
+++ b/dns/dnshistory/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Store DNS lookups to a DB
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_BDB=	yes
 GNU_CONFIGURE=	yes
diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index 6c886a47c4eb..b199a90e9e40 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -50,7 +50,7 @@ CFLAGS+=	-DNO_IPV6
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext gmake iconv pkgconfig
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 PLIST_SUB+=	NLS=""
 ALL_TARGET=	all-i18n
 _intllibs=	-lintl
@@ -60,13 +60,13 @@ PLIST_SUB+=	NLS="@comment "
 .if ${PORT_OPTIONS:MIDN}
 USES+=		iconv
 CFLAGS+=	-DHAVE_IDN
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 _intllibs+=	-lidn
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 USES+=		pkgconfig
 CPPFLAGS+=	`pkg-config --cflags dbus-1`
 CFLAGS+=	-DHAVE_DBUS
@@ -83,8 +83,8 @@ USES+=		lua
 .if ${PORT_OPTIONS:MDNSSEC}
 CFLAGS+=	-DHAVE_DNSSEC
 USES+=		pkgconfig
-LIB_DEPENDS+=	libnettle.so:${PORTSDIR}/security/nettle
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libnettle.so:security/nettle
+LIB_DEPENDS+=	libgmp.so:math/gmp
 .endif
 
 USE_RC_SUBR=	dnsmasq
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index a5af54da048d..f631a513302c 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -47,7 +47,7 @@ CFLAGS+=	-DNO_IPV6
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext gmake iconv pkgconfig
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 PLIST_SUB+=	NLS=""
 ALL_TARGET=	all-i18n
 _intllibs=	-lintl
@@ -57,13 +57,13 @@ PLIST_SUB+=	NLS="@comment "
 .if ${PORT_OPTIONS:MIDN}
 USES+=		iconv
 CFLAGS+=	-DHAVE_IDN
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 _intllibs+=	-lidn
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 USES+=		pkgconfig
 CPPFLAGS+=	`pkg-config --cflags dbus-1`
 CFLAGS+=	-DHAVE_DBUS
@@ -80,8 +80,8 @@ USES+=		lua
 .if ${PORT_OPTIONS:MDNSSEC}
 CFLAGS+=	-DHAVE_DNSSEC
 USES+=		pkgconfig
-LIB_DEPENDS+=	libnettle.so:${PORTSDIR}/security/nettle
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libnettle.so:security/nettle
+LIB_DEPENDS+=	libgmp.so:math/gmp
 .endif
 
 USE_RC_SUBR=	dnsmasq
diff --git a/dns/dnsmax-perl/Makefile b/dns/dnsmax-perl/Makefile
index fd50bbb9faa1..aedd3ac16e06 100644
--- a/dns/dnsmax-perl/Makefile
+++ b/dns/dnsmax-perl/Makefile
@@ -10,9 +10,9 @@ DISTNAME=	${PORTNAME:tl}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
 MAINTAINER=	dan@algenta.com
 COMMENT=	DNSMax-perl is a perl DNS update client for the REST DNSMax protocol
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 
 NO_BUILD=	yes
 USES=		perl5 zip shebangfix
diff --git a/dns/dnsperf/Makefile b/dns/dnsperf/Makefile
index 13f497d18c9c..16f6def39ca3 100644
--- a/dns/dnsperf/Makefile
+++ b/dns/dnsperf/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Accurate performance metrics of Domain Name Services
 
-BUILD_DEPENDS=	isc-config.sh:${PORTSDIR}/dns/bind910
+BUILD_DEPENDS=	isc-config.sh:dns/bind910
 
 USES=		iconv
 GNU_CONFIGURE=	yes
diff --git a/dns/dnsproxy/Makefile b/dns/dnsproxy/Makefile
index 61388a6f47bc..e536b7e11f74 100644
--- a/dns/dnsproxy/Makefile
+++ b/dns/dnsproxy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.wolfermann.org/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	proxy for DNS queries
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 GNU_CONFIGURE=	yes
 
diff --git a/dns/dnstable/Makefile b/dns/dnstable/Makefile
index bf09b24cda12..6f4531246dfe 100644
--- a/dns/dnstable/Makefile
+++ b/dns/dnstable/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Encoding format, library, and utilities for passive DNS data
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-BUILD_DEPENDS=	sie-nmsg>0:${PORTSDIR}/net/sie-nmsg
-LIB_DEPENDS=	libmtbl.so:${PORTSDIR}/devel/mtbl	\
-		libyajl.so:${PORTSDIR}/devel/yajl	\
-		libwdns.so:${PORTSDIR}/dns/wdns 	\
-		libnmsg.so:${PORTSDIR}/net/nmsg
-RUN_DEPENDS=	sie-nmsg>0:${PORTSDIR}/net/sie-nmsg
+BUILD_DEPENDS=	sie-nmsg>0:net/sie-nmsg
+LIB_DEPENDS=	libmtbl.so:devel/mtbl	\
+		libyajl.so:devel/yajl	\
+		libwdns.so:dns/wdns 	\
+		libnmsg.so:net/nmsg
+RUN_DEPENDS=	sie-nmsg>0:net/sie-nmsg
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/dns/dnsutl/Makefile b/dns/dnsutl/Makefile
index 2ab327cba3ce..31add42537fa 100644
--- a/dns/dnsutl/Makefile
+++ b/dns/dnsutl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Programs to make using DNS easier
 
-LIB_DEPENDS=	libexplain.so:${PORTSDIR}/devel/libexplain
+LIB_DEPENDS=	libexplain.so:devel/libexplain
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all sure
diff --git a/dns/dnsviz/Makefile b/dns/dnsviz/Makefile
index 8dc3a84c6f48..a82d0974d9ac 100644
--- a/dns/dnsviz/Makefile
+++ b/dns/dnsviz/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Analysis and visualization of DNS/DNSSEC behavior
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:${PORTSDIR}/graphics/py-pygraphviz \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
-		${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz \
+		${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \
+		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/dns/dnswalk/Makefile b/dns/dnswalk/Makefile
index a42016e5638b..a4f204574f35 100644
--- a/dns/dnswalk/Makefile
+++ b/dns/dnswalk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	DNS debugger - requests a zone transfer and analyzes the result
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 NO_WRKSUBDIR=	YES
 NO_BUILD=	YES
diff --git a/dns/doc/Makefile b/dns/doc/Makefile
index 73f823088e04..1ea174b0832a 100644
--- a/dns/doc/Makefile
+++ b/dns/doc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=   LOCAL/sanpei \
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	Diagnose unhealthy DNS domains
 
-RUN_DEPENDS=	dig:${PORTSDIR}/dns/bind-tools
+RUN_DEPENDS=	dig:dns/bind-tools
 
 USES=		tar:bzip2
 
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index 2cf3720db015..d7864931960a 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Programs to get DNS and domain ownership information from web logs
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
-RUN_DEPENDS=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
+LIB_DEPENDS=	libadns.so:dns/adns
+RUN_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 
 USES=		perl5 tar:bzip2
 USE_BDB=	yes
diff --git a/dns/firedns/Makefile b/dns/firedns/Makefile
index 210a982de699..69e37b4078b6 100644
--- a/dns/firedns/Makefile
+++ b/dns/firedns/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://BSDforge.com/projects/source/dns/firedns/ \
 MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	C library for handling asynchronous DNS queries
 
-BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring
+BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:misc/firestring
 
 USES=		tar:bzip2
 HAS_CONFIGURE=	yes
diff --git a/dns/fpdns/Makefile b/dns/fpdns/Makefile
index 6f85df6573c9..50a81ac7b3cc 100644
--- a/dns/fpdns/Makefile
+++ b/dns/fpdns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fingerprinting DNS servers
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/dns/gdnsd/Makefile b/dns/gdnsd/Makefile
index e4427b3f8831..67ef8b744f44 100644
--- a/dns/gdnsd/Makefile
+++ b/dns/gdnsd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Authoritative-only GeoIP-aware DNS server
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 FETCH_ARGS=	-Fpr
 
@@ -34,11 +34,11 @@ OPTIONS_DEFINE=	DOCS GEOIP URCU
 OPTIONS_DEFAULT=	GEOIP
 
 GEOIP_DESC=		Enable GeoIP Support
-GEOIP_RUN_DEPENDS=	GeoIP>=0:${PORTSDIR}/net/GeoIP
+GEOIP_RUN_DEPENDS=	GeoIP>=0:net/GeoIP
 
 URCU_DESC=		Read-Copy-Update Support (Faster Zone Parsing)
 URCU_CONFIGURE_WITH=	urcu
-URCU_LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
+URCU_LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libgdnsd.so
diff --git a/dns/gdnsd2/Makefile b/dns/gdnsd2/Makefile
index e85fbc6c8f8c..062bef947aa1 100644
--- a/dns/gdnsd2/Makefile
+++ b/dns/gdnsd2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Authoritative-only GeoIP-aware DNS server
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
-BUILD_DEPENDS=	ragel>0:${PORTSDIR}/devel/ragel
+LIB_DEPENDS=	libev.so:devel/libev
+BUILD_DEPENDS=	ragel>0:devel/ragel
 
 FETCH_ARGS=	-Fpr
 
@@ -37,11 +37,11 @@ OPTIONS_DEFINE=	DOCS GEOIP URCU
 OPTIONS_DEFAULT=GEOIP
 
 GEOIP_DESC=		Enable GeoIP Support
-GEOIP_RUN_DEPENDS=	GeoIP>=0:${PORTSDIR}/net/GeoIP
+GEOIP_RUN_DEPENDS=	GeoIP>=0:net/GeoIP
 
 URCU_DESC=		Read-Copy-Update Support (Faster Zone Parsing)
 URCU_CONFIGURE_WITH=	urcu
-URCU_LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
+URCU_LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${localstatedir}/lib/$${PACKAGE_NAME}|/var/db/${PORTNAME}|g' \
diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile
index 81a6df389708..03f7a7543a26 100644
--- a/dns/getdns/Makefile
+++ b/dns/getdns/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Modern asynchronous DNS API
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libldns.so:${PORTSDIR}/dns/ldns \
-		libunbound.so:${PORTSDIR}/dns/unbound
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libidn.so:dns/libidn \
+		libldns.so:dns/ldns \
+		libunbound.so:dns/unbound
 
 USES=		libtool
 USE_LDCONFIG=	yes
@@ -37,11 +37,11 @@ LIBEV_DESC=	Build with libev extension
 LIBUV_DESC=	Build with libuv extension
 LIBEVENT_DESC=	Build with libevent extension
 
-LIBEV_LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIBEV_LIB_DEPENDS=	libev.so:devel/libev
 LIBEV_CONFIGURE_WITH=	libev
-LIBUV_LIB_DEPENDS=	libuv.so:${PORTSDIR}/devel/libuv
+LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
 LIBUV_CONFIGURE_WITH=	libuv
-LIBEVENT_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIBEVENT_LIB_DEPENDS=	libevent.so:devel/libevent2
 LIBEVENT_CONFIGURE_WITH=libevent
 
 .include <bsd.port.options.mk>
diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index ed6192d65eef..9d4674774786 100644
--- a/dns/hesiod/Makefile
+++ b/dns/hesiod/Makefile
@@ -28,7 +28,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIDN}
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 .else
 CONFIGURE_ARGS+=--without-libidn
 .endif
diff --git a/dns/hs-gnuidn/Makefile b/dns/hs-gnuidn/Makefile
index 632d48a796fb..9e8bf9387547 100644
--- a/dns/hs-gnuidn/Makefile
+++ b/dns/hs-gnuidn/Makefile
@@ -14,7 +14,7 @@ USE_CABAL=	text
 USE_C2HS=	yes
 
 USES=		pkgconfig
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libidn.so:dns/libidn
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/dns/ironsides/Makefile b/dns/ironsides/Makefile
index efcbf7d9137b..353ce3309a99 100644
--- a/dns/ironsides/Makefile
+++ b/dns/ironsides/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	IRONSIDES - Free software, unlimited redistribution
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/spark2012/spark.ads:${PORTSDIR}/devel/libspark2012
+BUILD_DEPENDS=	${LOCALBASE}/include/spark2012/spark.ads:devel/libspark2012
 
 USES=		ada dos2unix zip
 DOS2UNIX_FILES=	dfcs.usafa.edu.zonefile ironsides.1
diff --git a/dns/knot1/Makefile b/dns/knot1/Makefile
index 707e40471d48..6649b5a9510c 100644
--- a/dns/knot1/Makefile
+++ b/dns/knot1/Makefile
@@ -13,8 +13,8 @@ COMMENT=	High performance authoritative-only DNS server
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	flex>=2.5.35_1:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
+BUILD_DEPENDS=	flex>=2.5.35_1:textproc/flex
+LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
 CONFLICTS=	knot-2.* knot2-.*
 
@@ -48,14 +48,14 @@ DNSTAP_DESC=		dnstap support (see dnstap.info)
 LMDB_DESC=		Enable LMDB backend
 
 DNSTAP_CONFIGURE_ENABLE=	dnstap
-DNSTAP_LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
-			libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+DNSTAP_LIB_DEPENDS=	libfstrm.so:devel/fstrm \
+			libprotobuf-c.so:devel/protobuf-c
 
 IDN_CONFIGURE_WITH=	libidn
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 
 LMDB_CONFIGURE_ENABLE=	lmdb
-LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
diff --git a/dns/knot2/Makefile b/dns/knot2/Makefile
index fb00b53169bf..f98faa2f3cad 100644
--- a/dns/knot2/Makefile
+++ b/dns/knot2/Makefile
@@ -14,12 +14,12 @@ COMMENT=	High performance authoritative-only DNS server
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libjansson.so:${PORTSDIR}/devel/jansson \
-		liblmdb.so:${PORTSDIR}/databases/lmdb \
-		libnettle.so:${PORTSDIR}/security/nettle \
-		liburcu.so:${PORTSDIR}/sysutils/liburcu
+LIB_DEPENDS=	libfstrm.so:devel/fstrm \
+		libgnutls.so:security/gnutls \
+		libjansson.so:devel/jansson \
+		liblmdb.so:databases/lmdb \
+		libnettle.so:security/nettle \
+		liburcu.so:sysutils/liburcu
 
 CONFLICTS=	knot-1.* knot1-[0-6].*
 
@@ -50,7 +50,7 @@ OPTIONS_DEFINE=			DNSTAP FASTPARSER IDN
 
 DNSTAP_DESC=			dnstap support (see dnstap.info)
 DNSTAP_CONFIGURE_ENABLE=	dnstap
-DNSTAP_LIB_DEPENDS=		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+DNSTAP_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 # XXX: because `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from
 # `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which
 # should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure
@@ -62,7 +62,7 @@ FASTPARSER_DESC=		Fast zone parser (demanding compilation)
 FASTPARSER_CONFIGURE_ENABLE=	fastparser
 
 IDN_CONFIGURE_WITH=		libidn
-IDN_LIB_DEPENDS=		libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=		libidn.so:dns/libidn
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
diff --git a/dns/ldapdns/Makefile b/dns/ldapdns/Makefile
index 7ec4e067c533..de2c3e96a548 100644
--- a/dns/ldapdns/Makefile
+++ b/dns/ldapdns/Makefile
@@ -13,8 +13,8 @@ COMMENT=	LDAP-backed DNS server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
-		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	setuidgid:sysutils/daemontools \
+		tcpserver:sysutils/ucspi-tcp
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index fad9af698113..1213868a6f6f 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -48,8 +48,8 @@ ALL_TARGET=	pyldns
 INSTALL_TARGET=	install-pyldns
 
 CONFIGURE_ARGS+=--with-pyldns
-LIB_DEPENDS+=	libldns.so:${PORTSDIR}/dns/ldns
-BUILD_DEPENDS+=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
+LIB_DEPENDS+=	libldns.so:dns/ldns
+BUILD_DEPENDS+=	${LOCALBASE}/bin/swig:devel/swig13
 
 post-patch:
 	@${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in
@@ -62,7 +62,7 @@ ALL_TARGET=	p5-dns-ldns
 INSTALL_TARGET=	install-p5-dns-ldns
 
 CONFIGURE_ARGS+=--with-p5-dns-ldns
-LIB_DEPENDS+=	libldns.so:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	libldns.so:dns/ldns
 
 post-patch:
 	@${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in
@@ -71,7 +71,7 @@ ALL_TARGET=	all
 INSTALL_TARGET=	install-lib install-h install-config
 
 .if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 ALL_TARGET+=	doc
 INSTALL_TARGET+=install-manpages
 .endif
@@ -80,7 +80,7 @@ INSTALL_TARGET+=install-manpages
 
 .if ${PORT_OPTIONS:MGOST}
 . if ${OSVERSION} < 1000015
-BUILD_DEPENDS+=	openssl>=1.0:${PORTSDIR}/security/openssl
+BUILD_DEPENDS+=	openssl>=1.0:security/openssl
 CONFLICTS+=	libressl-*
 . endif
 .else
diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile
index c385f702e6fc..2333b9b992dd 100644
--- a/dns/libpsl/Makefile
+++ b/dns/libpsl/Makefile
@@ -12,8 +12,8 @@ COMMENT=	C library to handle the Public Suffix List
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	public_suffix_list>=0:${PORTSDIR}/dns/public_suffix_list \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list \
+		xsltproc:textproc/libxslt
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SINGLE=	IDNA
@@ -36,14 +36,14 @@ GH_ACCOUNT=	rockdaboot
 USE_GITHUB=	yes
 
 ICU_CONFIGURE_ON=	--enable-builtin=libicu --enable-runtime=libicu
-ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 IDN_CONFIGURE_ON=	--enable-builtin=libidn --enable-runtime=libidn
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-			libunistring.so:${PORTSDIR}/devel/libunistring
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn \
+			libunistring.so:devel/libunistring
 IDN_USES=		iconv
 IDN2_CONFIGURE_ON=	--enable-builtin=libidn2 --enable-runtime=libidn2
-IDN2_LIB_DEPENDS=	libidn2.so:${PORTSDIR}/dns/libidn2 \
-			libunistring.so:${PORTSDIR}/devel/libunistring
+IDN2_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
+			libunistring.so:devel/libunistring
 IDN2_USES=		iconv
 NLS_CPPFLAGS=		-DENABLE_NLS=1
 NLS_USES=		gettext
diff --git a/dns/mDNSResponder_nss/Makefile b/dns/mDNSResponder_nss/Makefile
index 6964fe89bcef..125606295ba2 100644
--- a/dns/mDNSResponder_nss/Makefile
+++ b/dns/mDNSResponder_nss/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Apple mDNS responder - FreeBSD nsswitch module
 LICENSE=	APACHE20 BSD3CLAUSE
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 
 CONFLICTS_INSTALL=	nss_mdns-[0-9]*
 
diff --git a/dns/nsd/Makefile b/dns/nsd/Makefile
index d8a686ec6b04..d88d7425b361 100644
--- a/dns/nsd/Makefile
+++ b/dns/nsd/Makefile
@@ -69,7 +69,7 @@ RRL_DESC=		Response Rate Limiting
 ZONE_STATS_DESC=	Separate statistics for each zone
 MUNIN_PLUGIN_DESC=	Install Munin plugin (requires BIND8_STATS)
 
-LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS+=	libevent.so:devel/libevent2
 
 ROOT_SERVER_CONFIGURE_ENABLE=	root-server
 LARGEFILE_CONFIGURE_ENABLE=	largefile
diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile
index 21771195a4c4..8b76c2cce987 100644
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@@ -14,7 +14,7 @@ COMMENT=	NSS module implementing multicast DNS name resolution
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
 CONFLICTS_INSTALL=	mDNSResponder_nss-[0-9]*
 
diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index b84e3450f4de..3aae5fdfbebb 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Tool suite for maintaining DNSSEC
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/dns/ldns
-LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
+BUILD_DEPENDS=	ldns>=1.6.16:dns/ldns
+LIB_DEPENDS=	libldns.so:dns/ldns
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
@@ -56,7 +56,7 @@ SCRIPTDATA=	migrate_adapters_1.mysql migrate_keyshare_mysql.pl \
 .if ${PORT_OPTIONS:MSQLITE}
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-database-backend=sqlite3
-BUILD_DEPENDS+=	sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS+=	sqlite3>=3.3.9:databases/sqlite3
 SCRIPTDATA=	database_create.sqlite3 migrate_keyshare_sqlite3.pl \
 		migrate_adapters_1.sqlite3 migrate_to_ng_sqlite.pl \
 		migrate_1_4_8.sqlite3
@@ -64,7 +64,7 @@ SCRIPTDATA=	database_create.sqlite3 migrate_keyshare_sqlite3.pl \
 
 .if ${PORT_OPTIONS:MSOFTHSM}
 CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so
-RUN_DEPENDS+=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
+RUN_DEPENDS+=	softhsm>=1.2.0:security/softhsm
 .endif
 
 SCRIPTDATA+=	convert_database.pl
diff --git a/dns/opendnssec13/Makefile b/dns/opendnssec13/Makefile
index 68f746ac8711..0159b9669a32 100644
--- a/dns/opendnssec13/Makefile
+++ b/dns/opendnssec13/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tool suite for maintaining DNSSEC
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/dns/ldns
-LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
+BUILD_DEPENDS=	ldns>=1.6.16:dns/ldns
+LIB_DEPENDS=	libldns.so:dns/ldns
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
@@ -37,18 +37,18 @@ AUDITOR_DESC=		Build with Auditor
 OPTIONS_DEFAULT=	AUDITOR
 OPTIONS_SUB=		yes
 
-AUDITOR_BUILD_DEPENDS=	rubygem-soap4r>=0:${PORTSDIR}/devel/rubygem-soap4r \
-			rubygem-dnsruby>=1.53:${PORTSDIR}/dns/rubygem-dnsruby
+AUDITOR_BUILD_DEPENDS=	rubygem-soap4r>=0:devel/rubygem-soap4r \
+			rubygem-dnsruby>=1.53:dns/rubygem-dnsruby
 AUDITOR_CONFIGURE_ENABLE=	auditor
 AUDITOR_USE=		RUBY=yes
-MYSQL_BUILD_DEPENDS_OFF=sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
+MYSQL_BUILD_DEPENDS_OFF=sqlite3>=3.3.9:databases/sqlite3
 MYSQL_CONFIGURE_OFF=	--with-sqlite3=${LOCALBASE} --with-database-backend=sqlite3
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE} --with-database-backend=mysql
-MYSQL_LIB_DEPENDS_OFF=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+MYSQL_LIB_DEPENDS_OFF=	libsqlite3.so:databases/sqlite3
 MYSQL_USE=		MYSQL=compat
 MYSQL_USE_OFF=		SQLITE=yes
 SOFTHSM_CONFIGURE_ON=	--with-softhsm --with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so
-SOFTHSM_RUN_DEPENDS=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
+SOFTHSM_RUN_DEPENDS=	softhsm>=1.2.0:security/softhsm
 
 PKGMESSAGE=	${WRKSRC}/MIGRATION
 
diff --git a/dns/p5-AnyEvent-CacheDNS/Makefile b/dns/p5-AnyEvent-CacheDNS/Makefile
index 56aba6073628..95ab3529ad7f 100644
--- a/dns/p5-AnyEvent-CacheDNS/Makefile
+++ b/dns/p5-AnyEvent-CacheDNS/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple DNS resolver with caching
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-BIND-Config-Parser/Makefile b/dns/p5-BIND-Config-Parser/Makefile
index 9a5747e42a55..2867086561da 100644
--- a/dns/p5-BIND-Config-Parser/Makefile
+++ b/dns/p5-BIND-Config-Parser/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse BIND Config files
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-DNS-EasyDNS/Makefile b/dns/p5-DNS-EasyDNS/Makefile
index 300592c7c9cb..099237bda3a6 100644
--- a/dns/p5-DNS-EasyDNS/Makefile
+++ b/dns/p5-DNS-EasyDNS/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Update your EasyDNS dynamic DNS entries
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Data-Validate-Domain/Makefile b/dns/p5-Data-Validate-Domain/Makefile
index acfa2b65558f..69f22039b399 100644
--- a/dns/p5-Data-Validate-Domain/Makefile
+++ b/dns/p5-Data-Validate-Domain/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::Validate::Domain - domain validation methods
 
-BUILD_DEPENDS=	p5-Net-Domain-TLD>=0:${PORTSDIR}/dns/p5-Net-Domain-TLD
+BUILD_DEPENDS=	p5-Net-Domain-TLD>=0:dns/p5-Net-Domain-TLD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-IO-Async-Resolver-DNS/Makefile b/dns/p5-IO-Async-Resolver-DNS/Makefile
index ce1d3d7c5b46..d0f71754e8a7 100644
--- a/dns/p5-IO-Async-Resolver-DNS/Makefile
+++ b/dns/p5-IO-Async-Resolver-DNS/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Resolve DNS queries using IO::Async
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>=0:${PORTSDIR}/devel/p5-Future \
-		p5-IO-Async>=0.52:${PORTSDIR}/devel/p5-IO-Async \
-		p5-List-UtilsBy>=0.07:${PORTSDIR}/devel/p5-List-UtilsBy \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Future>=0:devel/p5-Future \
+		p5-IO-Async>=0.52:devel/p5-IO-Async \
+		p5-List-UtilsBy>=0.07:devel/p5-List-UtilsBy \
+		p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Mozilla-PublicSuffix/Makefile b/dns/p5-Mozilla-PublicSuffix/Makefile
index 084befa77d2b..10477badfee9 100644
--- a/dns/p5-Mozilla-PublicSuffix/Makefile
+++ b/dns/p5-Mozilla-PublicSuffix/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Get public suffix of domain name via Mozilla Public Suffix List
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
-PATCH_DEPENDS=	public_suffix_list>=0:${PORTSDIR}/dns/public_suffix_list
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
+PATCH_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-Amazon-Route53/Makefile b/dns/p5-Net-Amazon-Route53/Makefile
index e1fb0471cb9a..fbecf2737bfb 100644
--- a/dns/p5-Net-Amazon-Route53/Makefile
+++ b/dns/p5-Net-Amazon-Route53/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Manage your DNS entries on Amazon's Route53 service
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-XML-Bare>=0:${PORTSDIR}/textproc/p5-XML-Bare \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-XML-Bare>=0:textproc/p5-XML-Bare \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	py[23][0-9]-boto-devel-[0-9]*
diff --git a/dns/p5-Net-Bonjour/Makefile b/dns/p5-Net-Bonjour/Makefile
index 877f38ed9385..b5695cc9c954 100644
--- a/dns/p5-Net-Bonjour/Makefile
+++ b/dns/p5-Net-Bonjour/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Module for DNS service discovery
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.5:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0.5:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-DNS-Async/Makefile b/dns/p5-Net-DNS-Async/Makefile
index 027238f1c163..41801513cfed 100644
--- a/dns/p5-Net-DNS-Async/Makefile
+++ b/dns/p5-Net-DNS-Async/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Asynchronous DNS helper for high volume applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-DNS-Check/Makefile b/dns/p5-Net-DNS-Check/Makefile
index 341c0d8bfa3e..333a01ae2516 100644
--- a/dns/p5-Net-DNS-Check/Makefile
+++ b/dns/p5-Net-DNS-Check/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Module for easy domain name checking
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/p5-Net-DNS-Lite/Makefile b/dns/p5-Net-DNS-Lite/Makefile
index 1d203a451694..6f896851da10 100644
--- a/dns/p5-Net-DNS-Lite/Makefile
+++ b/dns/p5-Net-DNS-Lite/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Pure-Perl DNS resolver with support for timeout
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Cache-LRU>=0:${PORTSDIR}/devel/p5-Cache-LRU \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Cache-LRU>=0:devel/p5-Cache-LRU \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
index d3be14f46485..7f3b373d756d 100644
--- a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
+++ b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Orders SRV records by priority and weight for Net::DNS
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Sort-Naturally>=1.03:${PORTSDIR}/textproc/p5-Sort-Naturally
+BUILD_DEPENDS=	p5-Net-DNS>=0.68:dns/p5-Net-DNS \
+		p5-Sort-Naturally>=1.03:textproc/p5-Sort-Naturally
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-DNS-Resolver-Programmable/Makefile b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
index fa078d15acb4..54a6998ffec6 100644
--- a/dns/p5-Net-DNS-Resolver-Programmable/Makefile
+++ b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	gmc@sonologic.nl
 COMMENT=	Programmable DNS resolver for off-line testing
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-DNS-SEC/Makefile b/dns/p5-Net-DNS-SEC/Makefile
index 9d4a69bb22d6..db30ec7ba74a 100644
--- a/dns/p5-Net-DNS-SEC/Makefile
+++ b/dns/p5-Net-DNS-SEC/Makefile
@@ -12,14 +12,14 @@ COMMENT=	DNSSEC extensions to Net::DNS
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0.04:${PORTSDIR}/security/p5-Crypt-OpenSSL-Bignum \
-		p5-Crypt-OpenSSL-DSA>=0.14:${PORTSDIR}/security/p5-Crypt-OpenSSL-DSA \
-		p5-Crypt-OpenSSL-EC>=1.01:${PORTSDIR}/security/p5-Crypt-OpenSSL-EC \
-		p5-Crypt-OpenSSL-ECDSA>=0.6:${PORTSDIR}/security/p5-Crypt-OpenSSL-ECDSA \
-		p5-Crypt-OpenSSL-RSA>=0.27:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-Crypt-OpenSSL-Random>=0.06:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0.04:security/p5-Crypt-OpenSSL-Bignum \
+		p5-Crypt-OpenSSL-DSA>=0.14:security/p5-Crypt-OpenSSL-DSA \
+		p5-Crypt-OpenSSL-EC>=1.01:security/p5-Crypt-OpenSSL-EC \
+		p5-Crypt-OpenSSL-ECDSA>=0.6:security/p5-Crypt-OpenSSL-ECDSA \
+		p5-Crypt-OpenSSL-RSA>=0.27:security/p5-Crypt-OpenSSL-RSA \
+		p5-Crypt-OpenSSL-Random>=0.06:security/p5-Crypt-OpenSSL-Random
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Net-DNS>=1.01:${PORTSDIR}/dns/p5-Net-DNS
+TEST_DEPENDS=	p5-Net-DNS>=1.01:dns/p5-Net-DNS
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/dns/p5-Net-DNS-TestNS/Makefile b/dns/p5-Net-DNS-TestNS/Makefile
index 7f456183f0d6..80139f404680 100644
--- a/dns/p5-Net-DNS-TestNS/Makefile
+++ b/dns/p5-Net-DNS-TestNS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl extension for simulating simple Nameservers
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.64:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-XML-LibXML>=1.53:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Net-DNS>=0.64:dns/p5-Net-DNS \
+		p5-XML-LibXML>=1.53:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-DNS-ToolKit/Makefile b/dns/p5-Net-DNS-ToolKit/Makefile
index 30bc941d6913..530ef817a517 100644
--- a/dns/p5-Net-DNS-ToolKit/Makefile
+++ b/dns/p5-Net-DNS-ToolKit/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tools for working with DNS packets
 LICENSE=	ART10 GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS-Codes>=0.09:${PORTSDIR}/dns/p5-Net-DNS-Codes \
-		p5-NetAddr-IP>=1.30:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
+		p5-NetAddr-IP>=1.30:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/dns/p5-Net-DNS-Zone-Parser/Makefile b/dns/p5-Net-DNS-Zone-Parser/Makefile
index 201e0bf2edd0..c2c02d900b2d 100644
--- a/dns/p5-Net-DNS-Zone-Parser/Makefile
+++ b/dns/p5-Net-DNS-Zone-Parser/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jimmy@sigint.se
 COMMENT=	Perl5 preprocessor for normalising a zone file
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.64:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0.15:${PORTSDIR}/dns/p5-Net-DNS-SEC
-RUN_DEPENDS=	p5-Net-DNS>=0.64:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0.15:${PORTSDIR}/dns/p5-Net-DNS-SEC
+BUILD_DEPENDS=	p5-Net-DNS>=0.64:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0.15:dns/p5-Net-DNS-SEC
+RUN_DEPENDS=	p5-Net-DNS>=0.64:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0.15:dns/p5-Net-DNS-SEC
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
index ec9f95e5ee7c..a423c866af4d 100644
--- a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl module to parse BIND8/9 zone files
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.65:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0.15:${PORTSDIR}/dns/p5-Net-DNS-SEC
+BUILD_DEPENDS=	p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0.15:dns/p5-Net-DNS-SEC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index 337fc25beddc..aa4b9c137f61 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl5 interface to the DNS resolver, and dynamic updates
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=1.03:${PORTSDIR}/security/p5-Digest-HMAC
+BUILD_DEPENDS=	p5-Digest-HMAC>=1.03:security/p5-Digest-HMAC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Digest-BubbleBabble>=0:${PORTSDIR}/security/p5-Digest-BubbleBabble \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Digest-BubbleBabble>=0:security/p5-Digest-BubbleBabble \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 OPTIONS_DEFINE=	GOST IDN IPV6 SSHFP
 GOST_DESC=	GOST support
@@ -28,18 +28,18 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-GOST_BUILD_DEPENDS=	p5-Digest-GOST>=0.06:${PORTSDIR}/security/p5-Digest-GOST
-GOST_RUN_DEPENDS=	p5-Digest-GOST>=0.06:${PORTSDIR}/security/p5-Digest-GOST
-IDN_BUILD_DEPENDS=	p5-Net-LibIDN>=0.12:${PORTSDIR}/dns/p5-Net-LibIDN
-IDN_RUN_DEPENDS=	p5-Net-LibIDN>=0.12:${PORTSDIR}/dns/p5-Net-LibIDN
-SSHFP_BUILD_DEPENDS=	p5-Digest-BubbleBabble>=0.01:${PORTSDIR}/security/p5-Digest-BubbleBabble
-SSHFP_RUN_DEPENDS=	p5-Digest-BubbleBabble>=0.01:${PORTSDIR}/security/p5-Digest-BubbleBabble
+GOST_BUILD_DEPENDS=	p5-Digest-GOST>=0.06:security/p5-Digest-GOST
+GOST_RUN_DEPENDS=	p5-Digest-GOST>=0.06:security/p5-Digest-GOST
+IDN_BUILD_DEPENDS=	p5-Net-LibIDN>=0.12:dns/p5-Net-LibIDN
+IDN_RUN_DEPENDS=	p5-Net-LibIDN>=0.12:dns/p5-Net-LibIDN
+SSHFP_BUILD_DEPENDS=	p5-Digest-BubbleBabble>=0.01:security/p5-Digest-BubbleBabble
+SSHFP_RUN_DEPENDS=	p5-Digest-BubbleBabble>=0.01:security/p5-Digest-BubbleBabble
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MIPV6} && ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.32:${PORTSDIR}/net/p5-IO-Socket-IP
-RUN_DEPENDS+=	p5-IO-Socket-IP>=0.32:${PORTSDIR}/net/p5-IO-Socket-IP
+BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.32:net/p5-IO-Socket-IP
+RUN_DEPENDS+=	p5-IO-Socket-IP>=0.32:net/p5-IO-Socket-IP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/dns/p5-Net-DNSBL-MultiDaemon/Makefile b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
index e13323d42301..715324f7c671 100644
--- a/dns/p5-Net-DNSBL-MultiDaemon/Makefile
+++ b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
@@ -14,20 +14,20 @@ COMMENT=	Net::DNSBL::MultiDaemon - multi DNSBL prioritization
 LICENSE=	ART10 GPLv1 GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-SafeDO>=0.12:${PORTSDIR}/devel/p5-File-SafeDO \
-		p5-Geo-IP-PurePerl>=1.10:${PORTSDIR}/net/p5-Geo-IP-PurePerl \
-		p5-Net-DNS-Codes>=0.09:${PORTSDIR}/dns/p5-Net-DNS-Codes \
-		p5-Net-DNS-ToolKit>=0.47:${PORTSDIR}/dns/p5-Net-DNS-ToolKit \
-		p5-Net-NBsocket>=0.23:${PORTSDIR}/net/p5-Net-NBsocket \
-		p5-NetAddr-IP>=4.067:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		p5-Unix-Syslog>=0.97:${PORTSDIR}/sysutils/p5-Unix-Syslog
+BUILD_DEPENDS=	p5-File-SafeDO>=0.12:devel/p5-File-SafeDO \
+		p5-Geo-IP-PurePerl>=1.10:net/p5-Geo-IP-PurePerl \
+		p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
+		p5-Net-DNS-ToolKit>=0.47:dns/p5-Net-DNS-ToolKit \
+		p5-Net-NBsocket>=0.23:net/p5-Net-NBsocket \
+		p5-NetAddr-IP>=4.067:net-mgmt/p5-NetAddr-IP \
+		p5-Unix-Syslog>=0.97:sysutils/p5-Unix-Syslog
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	RHBL
 OPTIONS_DEFAULT=RHBL
 RHBL_DESC=	RHBL checking of URBL domains
-RHBL_BUILD_DEPENDS=	p5-URBL-Prepare>=0.08:${PORTSDIR}/dns/p5-URBL-Prepare
-RHBL_RUN_DEPENDS=	p5-URBL-Prepare>=0.08:${PORTSDIR}/dns/p5-URBL-Prepare
+RHBL_BUILD_DEPENDS=	p5-URBL-Prepare>=0.08:dns/p5-URBL-Prepare
+RHBL_RUN_DEPENDS=	p5-URBL-Prepare>=0.08:dns/p5-URBL-Prepare
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/dns/p5-Net-DNSBL-Statistics/Makefile b/dns/p5-Net-DNSBL-Statistics/Makefile
index a7b3a143388c..1ab45a8a82bd 100644
--- a/dns/p5-Net-DNSBL-Statistics/Makefile
+++ b/dns/p5-Net-DNSBL-Statistics/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Gather DNSBL Statistics
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS-Codes>=0.09:${PORTSDIR}/dns/p5-Net-DNS-Codes \
-		p5-Net-DNS-ToolKit>=0.41:${PORTSDIR}/dns/p5-Net-DNS-ToolKit \
-		p5-Net-DNSBL-MultiDaemon>=0.26:${PORTSDIR}/dns/p5-Net-DNSBL-MultiDaemon
+BUILD_DEPENDS=	p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
+		p5-Net-DNS-ToolKit>=0.41:dns/p5-Net-DNS-ToolKit \
+		p5-Net-DNSBL-MultiDaemon>=0.26:dns/p5-Net-DNSBL-MultiDaemon
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-DRI/Makefile b/dns/p5-Net-DRI/Makefile
index aed812f967f9..2d8b77e46585 100644
--- a/dns/p5-Net-DRI/Makefile
+++ b/dns/p5-Net-DRI/Makefile
@@ -15,23 +15,23 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-ISO8601>0.06:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-DateTime-Format-Strptime>0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime-TimeZone>0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Accessor-Chained>0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-Time-HiRes>0:${PORTSDIR}/devel/p5-Time-HiRes \
-		p5-Email-Valid>0:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-IO-Socket-SSL>0.90:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-XML-LibXML>1.61:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-SOAP-Lite>0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-SOAP-WSDL>0:${PORTSDIR}/devel/p5-SOAP-WSDL \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-Digest-MD5>0:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-MIME-Tools>0:${PORTSDIR}/mail/p5-MIME-Tools
+RUN_DEPENDS=	p5-DateTime>0:devel/p5-DateTime \
+		p5-DateTime-Format-ISO8601>0.06:devel/p5-DateTime-Format-ISO8601 \
+		p5-DateTime-Format-Strptime>0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime-TimeZone>0:devel/p5-DateTime-TimeZone \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Class-Accessor-Chained>0:devel/p5-Class-Accessor-Chained \
+		p5-Time-HiRes>0:devel/p5-Time-HiRes \
+		p5-Email-Valid>0:mail/p5-Email-Valid \
+		p5-IO-Socket-SSL>0.90:security/p5-IO-Socket-SSL \
+		p5-XML-LibXML>1.61:textproc/p5-XML-LibXML \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+		p5-SOAP-Lite>0:net/p5-SOAP-Lite \
+		p5-SOAP-WSDL>0:devel/p5-SOAP-WSDL \
+		p5-libwww>0:www/p5-libwww \
+		p5-Digest-MD5>0:security/p5-Digest-MD5 \
+		p5-Net-DNS>0:dns/p5-Net-DNS \
+		p5-MIME-Tools>0:mail/p5-MIME-Tools
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/dns/p5-Net-Domain-ExpireDate/Makefile b/dns/p5-Net-Domain-ExpireDate/Makefile
index f360daaeb33f..88972f6137fc 100644
--- a/dns/p5-Net-Domain-ExpireDate/Makefile
+++ b/dns/p5-Net-Domain-ExpireDate/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module obtain expiration date of domain names
 
-BUILD_DEPENDS=	p5-Net-Whois-Raw>=0:${PORTSDIR}/net/p5-Net-Whois-Raw
+BUILD_DEPENDS=	p5-Net-Whois-Raw>=0:net/p5-Net-Whois-Raw
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-LibIDN/Makefile b/dns/p5-Net-LibIDN/Makefile
index ebe582c8a943..a677a360ad22 100644
--- a/dns/p5-Net-LibIDN/Makefile
+++ b/dns/p5-Net-LibIDN/Makefile
@@ -13,7 +13,7 @@ COMMENT=	This module provides access to the libidn library
 
 LICENSE=	ART10
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libidn.so:dns/libidn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/p5-Net-Nslookup/Makefile b/dns/p5-Net-Nslookup/Makefile
index 5aabd0dc218e..ac2a394e0cec 100644
--- a/dns/p5-Net-Nslookup/Makefile
+++ b/dns/p5-Net-Nslookup/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides the capabilities of the standard tool nslookup(1)
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-RBLClient/Makefile b/dns/p5-Net-RBLClient/Makefile
index 6e29dbba00c6..9121ac57e7a4 100644
--- a/dns/p5-Net-RBLClient/Makefile
+++ b/dns/p5-Net-RBLClient/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Queries multiple Realtime Blackhole Lists in parallel
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
index f4b2d0739680..694d1c275d68 100644
--- a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
+++ b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Recursive DNS client for POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-IP-Minimal>=0:${PORTSDIR}/net/p5-Net-IP-Minimal \
-		p5-POE>=1.004:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-IP-Minimal>=0:net/p5-Net-IP-Minimal \
+		p5-POE>=1.004:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index c2dc76899192..9c9ba620270f 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -15,10 +15,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.65:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-POE>=1.249:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+		p5-POE>=1.249:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/dns/p5-POE-Component-Client-DNSBL/Makefile b/dns/p5-POE-Component-Client-DNSBL/Makefile
index 4cbfd9112d86..12b0914ecbbe 100644
--- a/dns/p5-POE-Component-Client-DNSBL/Makefile
+++ b/dns/p5-POE-Component-Client-DNSBL/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl POE component that provides non-blocking DNSBL lookups
 
-BUILD_DEPENDS=	p5-POE>=1.004:${PORTSDIR}/devel/p5-POE \
-		p5-Net-IP-Minimal>=0:${PORTSDIR}/net/p5-Net-IP-Minimal \
-		p5-POE-Component-Client-DNS>=0:${PORTSDIR}/dns/p5-POE-Component-Client-DNS
+BUILD_DEPENDS=	p5-POE>=1.004:devel/p5-POE \
+		p5-Net-IP-Minimal>=0:net/p5-Net-IP-Minimal \
+		p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-POE-Component-Resolver/Makefile b/dns/p5-POE-Component-Resolver/Makefile
index c5ca6d3d266d..e10b7bbb538c 100644
--- a/dns/p5-POE-Component-Resolver/Makefile
+++ b/dns/p5-POE-Component-Resolver/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Non-blocking getaddrinfo() resolver
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
-		p5-Socket>=2.001:${PORTSDIR}/net/p5-Socket
+BUILD_DEPENDS=	p5-POE>=1.311:devel/p5-POE \
+		p5-Socket>=2.001:net/p5-Socket
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-POE-Component-Server-DNS/Makefile b/dns/p5-POE-Component-Server-DNS/Makefile
index a2716b2d2b61..1225e3109b83 100644
--- a/dns/p5-POE-Component-Server-DNS/Makefile
+++ b/dns/p5-POE-Component-Server-DNS/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.58:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-POE>=0.38:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Client-DNS>=1.051:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \
-		p5-POE-Component-Client-DNS-Recursive>=1.04:${PORTSDIR}/dns/p5-POE-Component-Client-DNS-Recursive \
-		p5-POE-Component-Generic>=0.09.10:${PORTSDIR}/net/p5-POE-Component-Generic \
-		p5-POE-Filter-DNS-TCP>=0.04:${PORTSDIR}/dns/p5-POE-Filter-DNS-TCP
+BUILD_DEPENDS=	p5-Net-DNS>=0.58:dns/p5-Net-DNS \
+		p5-POE>=0.38:devel/p5-POE \
+		p5-POE-Component-Client-DNS>=1.051:dns/p5-POE-Component-Client-DNS \
+		p5-POE-Component-Client-DNS-Recursive>=1.04:dns/p5-POE-Component-Client-DNS-Recursive \
+		p5-POE-Component-Generic>=0.09.10:net/p5-POE-Component-Generic \
+		p5-POE-Filter-DNS-TCP>=0.04:dns/p5-POE-Filter-DNS-TCP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-POE-Filter-DNS-TCP/Makefile b/dns/p5-POE-Filter-DNS-TCP/Makefile
index 6d4fdab62c0f..d709f1222536 100644
--- a/dns/p5-POE-Filter-DNS-TCP/Makefile
+++ b/dns/p5-POE-Filter-DNS-TCP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	POE Filter to handle DNS over TCP connections
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.66:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-POE>=1.311:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Net-DNS>=0.66:dns/p5-Net-DNS \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-POE>=1.311:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Tie-DNS/Makefile b/dns/p5-Tie-DNS/Makefile
index 1bf4ff8248c5..010bbb3b3157 100644
--- a/dns/p5-Tie-DNS/Makefile
+++ b/dns/p5-Tie-DNS/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Tie interface to Net::DNS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Tie-Cache>=0:${PORTSDIR}/devel/p5-Tie-Cache
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Tie-Cache>=0:devel/p5-Tie-Cache
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-CheckManifest>=0:${PORTSDIR}/devel/p5-Test-CheckManifest \
-		p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic
+TEST_DEPENDS=	p5-Test-CheckManifest>=0:devel/p5-Test-CheckManifest \
+		p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/dns/p5-pgeodns/Makefile b/dns/p5-pgeodns/Makefile
index fdbd495d4d81..4a51db74b732 100644
--- a/dns/p5-pgeodns/Makefile
+++ b/dns/p5-pgeodns/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Geographic NameServer
 
-BUILD_DEPENDS=	p5-Geo-IP>=0:${PORTSDIR}/net/p5-Geo-IP \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Geo-IP>=0:net/p5-Geo-IP \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/pear-File_DNS/Makefile b/dns/pear-File_DNS/Makefile
index 087792898673..763772cd4245 100644
--- a/dns/pear-File_DNS/Makefile
+++ b/dns/pear-File_DNS/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	dns devel pear
 MAINTAINER=	chris@ctgameinfo.com
 COMMENT=	PEAR class to read and write RFC1033-style DNS Zonefiles
 
-BUILD_DEPENDS=	${PEARDIR}/File.php:${PORTSDIR}/sysutils/pear-File
-RUN_DEPENDS=	${PEARDIR}/File.php:${PORTSDIR}/sysutils/pear-File
+BUILD_DEPENDS=	${PEARDIR}/File.php:sysutils/pear-File
+RUN_DEPENDS=	${PEARDIR}/File.php:sysutils/pear-File
 
 USES=	pear
 
diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
index db633cfd18d2..b4367d51118a 100644
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Advanced DNS recursor
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
-		${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	bjam:devel/boost-jam \
+		${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USES=		cpe gmake tar:bzip2
 GNU_CONFIGURE=	YES
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 886387fc6d8c..7b1458398fb9 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Advanced DNS server with multiple backends including SQL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_serialization.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs
 
 USES=		cpe gmake libtool lua pkgconfig tar:bzip2
 USE_LDCONFIG=	YES
@@ -50,15 +50,15 @@ OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
 OPTIONS_SUB=		yes
 
 BOTAN110_CONFIGURE_ON=	--enable-botan1.10
-BOTAN110_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110
+BOTAN110_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
 
 GEO_VARS=		MODULES+=geo
 
-GEOIP_LIB_DEPENDS=	libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \
-			libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libyaml-cpp.so:devel/yaml-cpp \
+			libGeoIP.so:net/GeoIP
 GEOIP_VARS=		MODULES+=geoip
 
-LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_VARS=		MODULES+=lmdb
 
 LUA_VARS=		MODULES+=lua
@@ -72,7 +72,7 @@ MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_USE=		MYSQL=YES
 MYSQL_VARS=		MODULES+=gmysql
 
-OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx
+OPENDBX_LIB_DEPENDS=	libopendbx.so:databases/opendbx
 OPENDBX_VARS=		MODULES+=opendbx
 
 OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
@@ -85,7 +85,7 @@ PGSQL_USES=		pgsql
 PGSQL_VARS=		MODULES+=gpgsql
 
 POLARSSL_CONFIGURE_ARGS=	--without-system-polarssl
-POLARSSL_LIB_DEPENDS_OFF=	libmbedtls.so:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS_OFF=	libmbedtls.so:security/polarssl13
 
 REMOTE_VARS=		MODULES+=remote
 
@@ -93,11 +93,11 @@ SQLITE3_USE=		SQLITE=3
 SQLITE3_VARS=		MODULES+=gsqlite3
 
 TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
-TINYDNS_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
+TINYDNS_LIB_DEPENDS=	libcdb.so:databases/tinycdb
 TINYDNS_VARS=		MODULES+=tinydns
 
 ZEROMQ_CONFIGURE_ARGS=	--enable-remotebackend-zeromq
-ZEROMQ_LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq4
+ZEROMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 
 TOOLS_CONFIGURE_ENABLE=	tools
 
diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile
index 1bc965412f13..0b6654b977f0 100644
--- a/dns/py-adns/Makefile
+++ b/dns/py-adns/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	adns-python-${PORTVERSION}
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Python Interface to adns, the asynchronous DNS library
 
-LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
+LIB_DEPENDS=	libadns.so:dns/adns
 
 PROJECTHOST=	adns-python
 USES=		python
diff --git a/dns/py-bonjour/Makefile b/dns/py-bonjour/Makefile
index b0f7e33938fd..fc02f89e0aef 100644
--- a/dns/py-bonjour/Makefile
+++ b/dns/py-bonjour/Makefile
@@ -17,7 +17,7 @@ USE_PYTHON=	distutils autoplist
 OPTIONS_SINGLE=			ZEROCONF
 OPTIONS_SINGLE_ZEROCONF=	AVAHI MDNSRESPONDER
 OPTIONS_DEFAULT=		MDNSRESPONDER
-AVAHI_LIB_DEPENDS=		libdns_sd.so:${PORTSDIR}/net/avahi-libdns
-MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+AVAHI_LIB_DEPENDS=		libdns_sd.so:net/avahi-libdns
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 
 .include <bsd.port.mk>
diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile
index 31db8e86d08b..5cbf2fe01fd9 100644
--- a/dns/py-dnspython/Makefile
+++ b/dns/py-dnspython/Makefile
@@ -24,7 +24,7 @@ PORTEXAMPLES=	ddns.py e164.py mx.py name.py reverse.py reverse_name.py \
 		xfr.py zonediff.py
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
-PYCRYPTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+PYCRYPTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
 
 .include <bsd.port.pre.mk>
 
diff --git a/dns/py-easyzone/Makefile b/dns/py-easyzone/Makefile
index d5065db18d5b..99fc8eca2a20 100644
--- a/dns/py-easyzone/Makefile
+++ b/dns/py-easyzone/Makefile
@@ -13,7 +13,7 @@ COMMENT=	DNS Zone abstraction module for Python
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/dns/py-idnkit2/Makefile b/dns/py-idnkit2/Makefile
index 7372eb7bcafe..605dc9e7aee5 100644
--- a/dns/py-idnkit2/Makefile
+++ b/dns/py-idnkit2/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	fbsd@grid.einherjar.de
 COMMENT=	Python bindings for Internationalized Domain Name toolkit 2
 
-LIB_DEPENDS=	libidnkitlite.so:${PORTSDIR}/dns/idnkit2
+LIB_DEPENDS=	libidnkitlite.so:dns/idnkit2
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils autoplist
diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index 27a9aa241297..dd6f38b2f3d5 100644
--- a/dns/py-namebench/Makefile
+++ b/dns/py-namebench/Makefile
@@ -15,18 +15,18 @@ COMMENT=	Open Source DNS benchmark utility
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:${PORTSDIR}/devel/py-Jinja2 \
-	${PYTHON_PKGNAMEPREFIX}graphy>=1.0:${PORTSDIR}/graphics/py-graphy \
-	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython \
-	${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:${PORTSDIR}/www/py-httplib2 \
-	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:${PORTSDIR}/devel/py-simplejson
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:devel/py-Jinja2 \
+	${PYTHON_PKGNAMEPREFIX}graphy>=1.0:graphics/py-graphy \
+	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython \
+	${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:www/py-httplib2 \
+	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:devel/py-simplejson
 
 USES=	python tar:tgz
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:x11-toolkits/py-tkinter
 .endif
 
 MAKE_ENV+=	NO_THIRD_PARTY=yes
diff --git a/dns/py-py3dns/Makefile b/dns/py-py3dns/Makefile
index 9169bcebbe69..a426073fe497 100644
--- a/dns/py-py3dns/Makefile
+++ b/dns/py-py3dns/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	CNRI LICENSE AGREEMENT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/dns/py-pydnstable/Makefile b/dns/py-pydnstable/Makefile
index fa6e588b80dc..37e842249ed7 100644
--- a/dns/py-pydnstable/Makefile
+++ b/dns/py-pydnstable/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python wrapper for dns/dnstable
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libdnstable.so:${PORTSDIR}/dns/dnstable
+LIB_DEPENDS=	libdnstable.so:dns/dnstable
 
 USE_PYTHON=	autoplist distutils
 USES=		pkgconfig python
diff --git a/dns/py-pywdns/Makefile b/dns/py-pywdns/Makefile
index b51ea2bdd316..a270918c937a 100644
--- a/dns/py-pywdns/Makefile
+++ b/dns/py-pywdns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python wrapper for dns/wdns
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libwdns.so:${PORTSDIR}/dns/wdns
+LIB_DEPENDS=	libwdns.so:dns/wdns
 
 USE_PYTHON=	autoplist distutils
 USES=		pkgconfig python
diff --git a/dns/py-tldextract/Makefile b/dns/py-tldextract/Makefile
index c54bbf7d872e..4ca76d78d211 100644
--- a/dns/py-tldextract/Makefile
+++ b/dns/py-tldextract/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Separate the TLD from the registered domain and subdomains of a URL
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}idna>=2.0:${PORTSDIR}/dns/py-idna
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna
 
 USES=	python
 USE_PYTHON=	autoplist distutils
diff --git a/dns/rbllookup-ng/Makefile b/dns/rbllookup-ng/Makefile
index 193463a4b382..d4d57bd75b19 100644
--- a/dns/rbllookup-ng/Makefile
+++ b/dns/rbllookup-ng/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.mavetju.org/download/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Check given IP/Host presence in RBLs
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/dns/rbllookup/Makefile b/dns/rbllookup/Makefile
index 19bb5799583d..a04e5dc6997c 100644
--- a/dns/rbllookup/Makefile
+++ b/dns/rbllookup/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	drixter@e-utp.net
 COMMENT=	Check given IP/Host presence in 106 RBLs
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	rbl.pl
diff --git a/dns/renewck/Makefile b/dns/renewck/Makefile
index 768c1ce8cab0..29dfa1dd5bcf 100644
--- a/dns/renewck/Makefile
+++ b/dns/renewck/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Check for expiring domains and send email notifications
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Time-modules>0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-Mail-Tools>0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-GDBM>0:${PORTSDIR}/databases/p5-GDBM
+RUN_DEPENDS=	p5-Time-modules>0:devel/p5-Time-modules \
+		p5-Mail-Tools>0:mail/p5-Mail-Tools \
+		p5-GDBM>0:databases/p5-GDBM
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/rpsl2acl/Makefile b/dns/rpsl2acl/Makefile
index 0772a8903aaa..c7cd694e382a 100644
--- a/dns/rpsl2acl/Makefile
+++ b/dns/rpsl2acl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Query set of RPSL database objects and convert to BIND ACLs
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR
+RUN_DEPENDS=	p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/rubygem-public_suffix/Makefile b/dns/rubygem-public_suffix/Makefile
index fbbaddbb8960..4b3c3edfe5b4 100644
--- a/dns/rubygem-public_suffix/Makefile
+++ b/dns/rubygem-public_suffix/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Ruby domain name parser based on the Public Suffix List
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-PATCH_DEPENDS=	public_suffix_list>=0:${PORTSDIR}/dns/public_suffix_list
+PATCH_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/dns/rubygem-public_suffix_service/Makefile b/dns/rubygem-public_suffix_service/Makefile
index 1720672dc00b..6260e14854c8 100644
--- a/dns/rubygem-public_suffix_service/Makefile
+++ b/dns/rubygem-public_suffix_service/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Parse and decompose domain names into TLD, domain, and subdomains
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PATCH_DEPENDS=	public_suffix_list>=0:${PORTSDIR}/dns/public_suffix_list
+PATCH_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile
index 5acac16218b6..b096a8ad77dd 100644
--- a/dns/samba-nsupdate/Makefile
+++ b/dns/samba-nsupdate/Makefile
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--with-gssapi="${HEIMDAL_HOME}"
 .elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config)
 CONFIGURE_ARGS+=	--with-gssapi="/usr"
 .else
-LIB_DEPENDS+=		libkrb5.so:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=		libkrb5.so:security/heimdal
 CONFIGURE_ARGS+=	--with-gssapi="${LOCALBASE}"
 .endif
 
diff --git a/dns/scavenge/Makefile b/dns/scavenge/Makefile
index a4f55faadaa1..0674a9b14891 100644
--- a/dns/scavenge/Makefile
+++ b/dns/scavenge/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://mark.foster.cc/pub/scavenge/
 MAINTAINER=	mark@foster.cc
 COMMENT=	Discover/audit forward and reverse DNS records
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		nmap:${PORTSDIR}/security/nmap
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		nmap:security/nmap
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/dns/sleuth/Makefile b/dns/sleuth/Makefile
index 19676355d97c..6d99bf3dcb54 100644
--- a/dns/sleuth/Makefile
+++ b/dns/sleuth/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool for checking, and diagnosing DNS zones
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 USES=		shebangfix perl5
 SHEBANG_FILES=	sleuth
diff --git a/dns/sshfp/Makefile b/dns/sshfp/Makefile
index 3b4f149af2c4..342617ce066b 100644
--- a/dns/sshfp/Makefile
+++ b/dns/sshfp/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Generate SSHFP DNS records from knownhosts files or ssh-keyscan
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}argparse>=0.8.0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:${PORTSDIR}/net-mgmt/py-ipcalc \
-		${PYTHON_SITELIBDIR}/ldns.py:${PORTSDIR}/dns/py-ldns
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}argparse>=0.8.0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:net-mgmt/py-ipcalc \
+		${PYTHON_SITELIBDIR}/ldns.py:dns/py-ldns
 
 USES=		python shebangfix
 NO_BUILD=	yes
diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index 90759e3b05bc..9acbc8de4cb8 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -41,8 +41,8 @@ DNSTAP_DESC=	Enable dnstap logging support
 
 .include <bsd.port.options.mk>
 
-LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libldns.so:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	libexpat.so:textproc/expat2 \
+		libldns.so:dns/ldns
 
 STRIP_FILES=	.libs/libunbound.so unbound-checkconf unbound \
 		unbound-control .libs/unbound-host .libs/unbound-anchor
@@ -50,7 +50,7 @@ STRIP_FILES=	.libs/libunbound.so unbound-checkconf unbound \
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python:2
 CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes LDFLAGS="-L${LOCALBASE}/lib"
-BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS+=	swig:devel/swig13
 STRIP_FILES+=	.libs/_unbound.so
 .endif
 
@@ -71,8 +71,8 @@ CONFIGURE_ARGS+=--disable-ecdsa
 
 .if ${PORT_OPTIONS:MDNSTAP}
 CONFIGURE_ARGS+=--enable-dnstap
-LIB_DEPENDS+=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
-LIB_DEPENDS+=	libfstrm.so:${PORTSDIR}/devel/fstrm
+LIB_DEPENDS+=	libprotobuf-c.so:devel/protobuf-c
+LIB_DEPENDS+=	libfstrm.so:devel/fstrm
 .endif
 
 .if ${PORT_OPTIONS:MMUNIN_PLUGIN}
@@ -82,7 +82,7 @@ MUNIN_PLUGIN_ALL=	hits queue memory by_type by_class by_opcode by_rcode \
 .endif
 
 .if ${PORT_OPTIONS:MLIBEVENT}
-LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS+=	libevent.so:devel/libevent2
 USES+=		pkgconfig
 CONFIGURE_ARGS+=--with-libevent
 CPPFLAGS+=	$$(pkg-config libevent --cflags-only-I)
diff --git a/dns/validns/Makefile b/dns/validns/Makefile
index b87e42bfa302..7f5b500fefc9 100644
--- a/dns/validns/Makefile
+++ b/dns/validns/Makefile
@@ -11,7 +11,7 @@ COMMENT=	High performance DNS/DNSSEC zone validator
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libJudy.so:${PORTSDIR}/devel/judy
+LIB_DEPENDS=	libJudy.so:devel/judy
 
 USE_OPENSSL=	yes
 WITH_OPENSSL_PORT=yes
diff --git a/dns/vhostcname/Makefile b/dns/vhostcname/Makefile
index adac27934ddc..093dbcadc5ba 100644
--- a/dns/vhostcname/Makefile
+++ b/dns/vhostcname/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Synchronize DNS with server names and aliases from Apache vhost
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/walker/Makefile b/dns/walker/Makefile
index 94a4311e03e7..cdc0fadf6412 100644
--- a/dns/walker/Makefile
+++ b/dns/walker/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://josefsson.org/walker/releases/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Recover zone file information from servers that use DNSSEC
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0:${PORTSDIR}/dns/p5-Net-DNS-SEC
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0:dns/p5-Net-DNS-SEC
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	walker
diff --git a/dns/whoseip/Makefile b/dns/whoseip/Makefile
index 84c2a869344f..e0beeda6a3de 100644
--- a/dns/whoseip/Makefile
+++ b/dns/whoseip/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Get information about IP addresses: country code and network
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID
+RUN_DEPENDS=	p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR \
+		p5-Data-UUID>0:devel/p5-Data-UUID
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/wrapsrv/Makefile b/dns/wrapsrv/Makefile
index 270201a9caff..5644a4949f3f 100644
--- a/dns/wrapsrv/Makefile
+++ b/dns/wrapsrv/Makefile
@@ -12,7 +12,7 @@ COMMENT=	DNS SRV record command line wrapper
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-BUILD_DEPENDS=	docbook2mdoc:${PORTSDIR}/textproc/docbook2mdoc
+BUILD_DEPENDS=	docbook2mdoc:textproc/docbook2mdoc
 
 PLIST_FILES=	bin/wrapsrv man/man1/wrapsrv.1.gz
 
diff --git a/dns/zkt/Makefile b/dns/zkt/Makefile
index a0b51b16a127..7784b0275a93 100644
--- a/dns/zkt/Makefile
+++ b/dns/zkt/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=		${WRKSRC}/LICENSE
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 1000055
-BUILD_DEPENDS=	dnssec-signzone:${PORTSDIR}/dns/bind99
+BUILD_DEPENDS=	dnssec-signzone:dns/bind99
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 .endif
 
diff --git a/dns/zonecheck/Makefile b/dns/zonecheck/Makefile
index 41e7698738eb..483b442cb61f 100644
--- a/dns/zonecheck/Makefile
+++ b/dns/zonecheck/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perform consistency checks on DNS zones
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/GPL
 
-RUN_DEPENDS=	rubygem-dnsruby>=1.47:${PORTSDIR}/dns/rubygem-dnsruby
+RUN_DEPENDS=	rubygem-dnsruby>=1.47:dns/rubygem-dnsruby
 
 USES=		gmake tar:tgz
 USE_RUBY=	yes
diff --git a/editors/abiword-docs/Makefile b/editors/abiword-docs/Makefile
index 53f926690245..041e63bbed0f 100644
--- a/editors/abiword-docs/Makefile
+++ b/editors/abiword-docs/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	AbiWord
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	AbiWord help files
 
-BUILD_DEPENDS=	abiword:${PORTSDIR}/editors/abiword
-RUN_DEPENDS=	abiword:${PORTSDIR}/editors/abiword
+BUILD_DEPENDS=	abiword:editors/abiword
+RUN_DEPENDS=	abiword:editors/abiword
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 72c9135a8295..6d198f5eb894 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Open-source, cross-platform WYSIWYG word processor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libpopt.so:${PORTSDIR}/devel/popt \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libwv.so:${PORTSDIR}/textproc/wv \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libgoffice-0.10.so:${PORTSDIR}/devel/goffice010
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libpopt.so:devel/popt \
+		libpng.so:graphics/png \
+		libwv.so:textproc/wv \
+		libfribidi.so:converters/fribidi \
+		libgoffice-0.10.so:devel/goffice010
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu
 
 USES=		desktop-file-utils gmake iconv jpeg libtool pathfix pkgconfig
 USE_GNOME=	libxml2 gtk30 librsvg2 libxslt
@@ -75,56 +75,56 @@ ABIWORD_PLUGINS=	garble loadbindings opml xslfo bmp iscii sdw babelfish \
 # Plugins we don't support:
 # gda
 
-AIKSAURUS_LIB_DEPENDS=		libAiksaurusGTK-1.2.so:${PORTSDIR}/textproc/aiksaurus-gtk
+AIKSAURUS_LIB_DEPENDS=		libAiksaurusGTK-1.2.so:textproc/aiksaurus-gtk
 
 CLIPART_CONFIGURE_ENABLE=	clipart
 
 COLFAKE_CONFIGURE_ENABLE=	collab-backend-fake
 
 COLSERVICE_CONFIGURE_ENABLE=	collab-backend-service
-COLSERVICE_BUILD_DEPENDS=	${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
-COLSERVICE_LIB_DEPENDS=		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-				libgnutls.so:${PORTSDIR}/security/gnutls
-COLSERVICE_RUN_DEPENDS=		${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
+COLSERVICE_BUILD_DEPENDS=	${LOCALBASE}/include/asio.hpp:net/asio
+COLSERVICE_LIB_DEPENDS=		libsoup-2.4.so:devel/libsoup \
+				libgnutls.so:security/gnutls
+COLSERVICE_RUN_DEPENDS=		${LOCALBASE}/include/asio.hpp:net/asio
 
 COLSIP_CONFIGURE_ENABLE=	collab-backend-sip
 
 COLSUGAR_CONFIGURE_ENABLE=	collab-backend-sugar
-COLSUGAR_LIB_DEPENDS=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+COLSUGAR_LIB_DEPENDS=		libdbus-glib-1.so:devel/dbus-glib
 
 COLTCP_CONFIGURE_ENABLE=	collab-backend-tcp
-COLTCP_BUILD_DEPENDS=		${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
-COLTCP_RUN_DEPENDS=		${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
+COLTCP_BUILD_DEPENDS=		${LOCALBASE}/include/asio.hpp:net/asio
+COLTCP_RUN_DEPENDS=		${LOCALBASE}/include/asio.hpp:net/asio
 
 COLTELEPATHY_CONFIGURE_ENABLE=	collab-backend-telepathy
-COLTELEPATHY_LIB_DEPENDS=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+COLTELEPATHY_LIB_DEPENDS=	libtelepathy-glib.so:net-im/telepathy-glib
 
 COLXMPP_CONFIGURE_ENABLE=	collab-backend-xmpp
-COLXMPP_LIB_DEPENDS=		libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
+COLXMPP_LIB_DEPENDS=		libloudmouth-1.so:net-im/loudmouth
 
 DEBUG_CONFIGURE_ENABLE=		debug
 
-GRAMMAR_LIB_DEPENDS=		liblink-grammar.so:${PORTSDIR}/textproc/link-grammar
+GRAMMAR_LIB_DEPENDS=		liblink-grammar.so:textproc/link-grammar
 
 MATHVIEW_USES=			bison
-MATHVIEW_LIB_DEPENDS=		libmathview.so:${PORTSDIR}/x11-toolkits/gtkmathview
+MATHVIEW_LIB_DEPENDS=		libmathview.so:x11-toolkits/gtkmathview
 
 NLS_USES=			gettext
 NLS_CONFIGURE_ENABLE=		nls
 
-OTS_LIB_DEPENDS=		libots-1.so:${PORTSDIR}/textproc/ots
+OTS_LIB_DEPENDS=		libots-1.so:textproc/ots
 
-PSION_LIB_DEPENDS=		libpsiconv.so:${PORTSDIR}/converters/psiconv
+PSION_LIB_DEPENDS=		libpsiconv.so:converters/psiconv
 
-SPELLCHECK_LIB_DEPENDS=		libenchant.so:${PORTSDIR}/textproc/enchant
+SPELLCHECK_LIB_DEPENDS=		libenchant.so:textproc/enchant
 SPELLCHECK_CONFIGURE_ENABLE=	spell
 
 TEMPLATES_CONFIGURE_ENABLE=	templates
 
 WP_USE=		gnome=libgsf
-WP_LIB_DEPENDS=	libwpg-0.3.so:${PORTSDIR}/graphics/libwpg03 \
-		libwpd-0.10.so:${PORTSDIR}/textproc/libwpd010 \
-		libwps-0.4.so:${PORTSDIR}/textproc/libwps
+WP_LIB_DEPENDS=	libwpg-0.3.so:graphics/libwpg03 \
+		libwpd-0.10.so:textproc/libwpd010 \
+		libwps-0.4.so:textproc/libwps
 
 .include <bsd.port.options.mk>
 
diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index e57b040171ee..9521f1ea7cbf 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -37,7 +37,7 @@ SLANG_DESC=	Use S-Lang based display renderer
 BROKEN_powerpc=		Does not compile
 BROKEN_sparc64=		Does not compile
 
-SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_CONFIGURE_ON=	--enable-slang
 SLANG_CONFIGURE_OFF=	--enable-curses
 
diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile
index 5fcb8e5a8a06..847a2a41542d 100644
--- a/editors/calligra-l10n/Makefile
+++ b/editors/calligra-l10n/Makefile
@@ -44,7 +44,7 @@ ${lang}_OPT=		${lang:S/@/_/}
 LANG_OPT_ALL+=		${${lang}_OPT}
 ${${lang}_OPT}_DESC=	${${lang}_NAME} localization
 
-${${lang}_OPT}_RUN_DEPENDS=${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
+${${lang}_OPT}_RUN_DEPENDS=${${lang}_DETECT}:${${lang}_PORT}
 ALL_RUN_DEPENDS+=	${${${lang}_OPT}_RUN_DEPENDS}
 .endfor
 
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 7b2e770920c7..336ccab5dac7 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -10,30 +10,30 @@ DIST_SUBDIR=	KDE/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE graphic art and office suite
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libwpd-0.10.so:${PORTSDIR}/textproc/libwpd010 \
-		libwpg-0.3.so:${PORTSDIR}/graphics/libwpg03 \
-		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
-		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgsl.so:${PORTSDIR}/math/gsl \
-		libwps-0.3.so:${PORTSDIR}/textproc/libwps03 \
-		libvisio-0.1.so:${PORTSDIR}/textproc/libvisio01 \
-		libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio \
-		libodfgen-0.1.so:${PORTSDIR}/textproc/libodfgen01 \
-		libetonyek-0.1.so:${PORTSDIR}/graphics/libetonyek01 \
-		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3 \
-		pstoedit:${PORTSDIR}/graphics/pstoedit
-RUN_DEPENDS=	pstoedit:${PORTSDIR}/graphics/pstoedit
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libIlmImf.so:graphics/OpenEXR \
+		libboost_thread.so:devel/boost-libs \
+		libqca.so:devel/qca \
+		libexiv2.so:graphics/exiv2 \
+		liblcms2.so:graphics/lcms2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libwpd-0.10.so:textproc/libwpd010 \
+		libwpg-0.3.so:graphics/libwpg03 \
+		libpoppler-qt4.so:graphics/poppler-qt4 \
+		libopenjpeg.so:graphics/openjpeg15 \
+		libfftw3.so:math/fftw3 \
+		libtiff.so:graphics/tiff \
+		libgsl.so:math/gsl \
+		libwps-0.3.so:textproc/libwps03 \
+		libvisio-0.1.so:textproc/libvisio01 \
+		libOpenColorIO.so:graphics/opencolorio \
+		libodfgen-0.1.so:textproc/libodfgen01 \
+		libetonyek-0.1.so:graphics/libetonyek01 \
+		librevenge-0.0.so:textproc/librevenge
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \
+		pstoedit:graphics/pstoedit
+RUN_DEPENDS=	pstoedit:graphics/pstoedit
 
 USE_GL=		glew
 USE_GNOME=	glib20 libxml2 libxslt
@@ -71,12 +71,12 @@ MYSQL_USE=	MYSQL=yes
 MYSQL_CMAKE_OFF=-DWITH_MySQL:BOOL=FALSE
 
 PGSQL_DESC=	PostgreSQL database support in Kexi
-PGSQL_LIB_DEPENDS=libpqxx-3.1.so:${PORTSDIR}/databases/postgresql-libpqxx3
+PGSQL_LIB_DEPENDS=libpqxx-3.1.so:databases/postgresql-libpqxx3
 PGSQL_USES=	pgsql
 PGSQL_CMAKE_OFF=-DWITH_PostgreSQL:BOOL=FALSE
 
 SYBASE_DESC=	Sybase database support in Kexi
-SYBASE_LIB_DEPENDS=libsybdb.so:${PORTSDIR}/databases/freetds
+SYBASE_LIB_DEPENDS=libsybdb.so:databases/freetds
 SYBASE_CMAKE_OFF=-DWITH_FreeTDS:BOOL=FALSE
 
 post-patch:
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 56b591e8fd23..a14aa16c621b 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Open Source IDE for C/C++
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
+RUN_DEPENDS=	xterm:x11/xterm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eranif
@@ -38,21 +38,21 @@ OPTIONS_SUB=		yes
 
 CLANG_DESC=		Clang code-completion
 CLANG34_DESC=		Clang 3.4.x
-CLANG34_BUILD_DEPENDS=	clang34>0:${PORTSDIR}/lang/clang34
-CLANG34_RUN_DEPENDS=	clang34>0:${PORTSDIR}/lang/clang34
+CLANG34_BUILD_DEPENDS=	clang34>0:lang/clang34
+CLANG34_RUN_DEPENDS=	clang34>0:lang/clang34
 CLANG35_DESC=		Clang 3.5.x
-CLANG35_BUILD_DEPENDS=	clang35>0:${PORTSDIR}/lang/clang35
-CLANG35_RUN_DEPENDS=	clang35>0:${PORTSDIR}/lang/clang35
+CLANG35_BUILD_DEPENDS=	clang35>0:lang/clang35
+CLANG35_RUN_DEPENDS=	clang35>0:lang/clang35
 CLANG36_DESC=		Clang 3.6.x
-CLANG36_BUILD_DEPENDS=	clang36>0:${PORTSDIR}/lang/clang36
-CLANG36_RUN_DEPENDS=	clang36>0:${PORTSDIR}/lang/clang36
+CLANG36_BUILD_DEPENDS=	clang36>0:lang/clang36
+CLANG36_RUN_DEPENDS=	clang36>0:lang/clang36
 CLANG37_DESC=		Clang 3.7.x
-CLANG37_BUILD_DEPENDS=	clang37>0:${PORTSDIR}/lang/clang37
-CLANG37_RUN_DEPENDS=	clang37>0:${PORTSDIR}/lang/clang37
+CLANG37_BUILD_DEPENDS=	clang37>0:lang/clang37
+CLANG37_RUN_DEPENDS=	clang37>0:lang/clang37
 CSCOPE_DESC=		CScope integration
-CSCOPE_RUN_DEPENDS=	cscope:${PORTSDIR}/devel/cscope
+CSCOPE_RUN_DEPENDS=	cscope:devel/cscope
 SFTP_DESC=		Secure FTP support via libssh
-SFTP_LIB_DEPENDS=	libssh.so:${PORTSDIR}/security/libssh
+SFTP_LIB_DEPENDS=	libssh.so:security/libssh
 SFTP_CMAKE_OFF=		-DENABLE_SFTP:STRING=0
 SFTP_USES=		localbase
 
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 2cc913a67a3c..cba97869670a 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -19,6 +19,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	ENCHANT DOCS
 
-ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 .include <bsd.port.mk>
diff --git a/editors/cream/Makefile b/editors/cream/Makefile
index 98cbb182fa20..765874a1a748 100644
--- a/editors/cream/Makefile
+++ b/editors/cream/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Gvim extension with many features
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim
+RUN_DEPENDS=	${LOCALBASE}/bin/gvim:editors/vim
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/editors/deforaos-editor/Makefile b/editors/deforaos-editor/Makefile
index 31411f4d6d20..97db7062381b 100644
--- a/editors/deforaos-editor/Makefile
+++ b/editors/deforaos-editor/Makefile
@@ -14,11 +14,11 @@ COMMENT=	DeforaOS desktop text editor
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+		docbook-xsl>=0:textproc/docbook-xsl
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 USES=		desktop-file-utils gettext pkgconfig
diff --git a/editors/dkns/Makefile b/editors/dkns/Makefile
index 7d538adf8314..abebb8aadb34 100644
--- a/editors/dkns/Makefile
+++ b/editors/dkns/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.mammothcheese.ca/
 MAINTAINER=	jimmy@mammothcheese.ca
 COMMENT=	Simple console text editor
 
-RUN_DEPENDS=	munger:${PORTSDIR}/lang/munger
+RUN_DEPENDS=	munger:lang/munger
 
 MAKE_ENV=	INSTALL_MAN="${INSTALL_MAN}" INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
diff --git a/editors/e3/Makefile b/editors/e3/Makefile
index 271871693f8b..b890770199c0 100644
--- a/editors/e3/Makefile
+++ b/editors/e3/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://sites.google.com/site/e3editor/Home/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full featured text editor written in assembler
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 USES=		gmake tar:tgz
 MAKE_ARGS=	OS=FREEBSD
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 5a798c36af81..e5ca75b3ba77 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -83,13 +83,13 @@ LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
 
 SOUND_CONFIGURE_OFF=	--with-sound=no
 ALSA_CONFIGURE_ON=	--with-sound=alsa
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 OSS_CONFIGURE_ON=	--with-sound=oss
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 
 XML_USE=		GNOME=libxml2
@@ -108,7 +108,7 @@ GTK2_CONFIGURE_ON=	-with-x-toolkit=gtk2
 GTK3_USE=		GNOME=gtk30
 GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
 
-XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
 
 XAW_USE=		XORG=xaw
@@ -124,29 +124,29 @@ SYNC_INPUT_CONFIGURE_WITH=sync-input
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_WITH=	tiff
 
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_WITH=	gif
 
-PNG_LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS+=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 
 XPM_USE=		XORG=xpm
 XPM_CONFIGURE_WITH=	xpm
 
 XFT_USE=		XORG=xft
-XFT_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
 XFT_CONFIGURE_WITH=	xft
 
-M17N_LIB_DEPENDS=	libm17n.so:${PORTSDIR}/devel/m17n-lib
+M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
 M17N_CONFIGURE_WITH=	m17n-flt
 
-OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
+OTF_LIB_DEPENDS=	libotf.so:print/libotf
 OTF_CONFIGURE_WITH=	libotf
 
-MAGICK_LIB_DEPENDS=libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=libMagickCore-6.so:graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick
 
 GSETTINGS_USE=		gnome=glib20
@@ -172,7 +172,7 @@ CAIRO_CONFIGURE_ON=	--with-cairo
 MODULES_CONFIGURE_ON=	--with-modules
 
 XWIDGETS_CONFIGURE_ON=	--with-xwidgets
-XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 
 .include <bsd.port.options.mk>
 
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 9113faabe2ba..a6d7c9a6da9e 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -88,17 +88,17 @@ CANNA_CONFIGURE_ON=	--with-canna \
 			--with-canna-libraries=${LOCALBASE}/lib
 CANNA_PATCH_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ LOCAL
 CANNA_PATCHFILES=	emacs24.4canna-20141030.diff.gz
-CANNA_LIB_DEPENDS=	libcanna.so:${PORTSDIR}/japanese/canna-lib
+CANNA_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
 
 SOUND_CONFIGURE_OFF=	--with-sound=no
 ALSA_CONFIGURE_ON=	--with-sound=alsa
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 OSS_CONFIGURE_ON=	--with-sound=oss
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 
 XML_USE=		GNOME=libxml2
@@ -117,7 +117,7 @@ GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
 GTK3_USE=		GNOME=gtk30
 GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
 
-XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
 
 XAW_USE=		XORG=xaw
@@ -131,29 +131,29 @@ SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_WITH=	tiff
 
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_WITH=	gif
 
-PNG_LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS+=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 
 XPM_USE=		XORG=xpm
 XPM_CONFIGURE_WITH=	xpm
 
 XFT_USE=		XORG=xft
-XFT_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
 XFT_CONFIGURE_WITH=	xft
 
-M17N_LIB_DEPENDS=	libm17n.so:${PORTSDIR}/devel/m17n-lib
+M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
 M17N_CONFIGURE_WITH=	m17n-flt
 
-OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
+OTF_LIB_DEPENDS=	libotf.so:print/libotf
 OTF_CONFIGURE_WITH=	libotf
 
-MAGICK_LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick
 
 GSETTINGS_USE=		gnome=glib20
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index b945020d6958..5364f84c19eb 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -61,13 +61,13 @@ PLIST=		${PKGDIR}/pkg-plist.emacs21
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:${PORTSDIR}/editors/xemacs-packages
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:${PORTSDIR}/editors/xemacs-packages
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:editors/xemacs-packages
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:editors/xemacs-packages
 MAKE_ARGS+=	PACKAGEDIR="${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}"
 .else
 # depends on apel (case of gnu emacsen etc...)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel${DEPPORT_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel${DEPPORT_SUFFIX}
 .endif
 .else
 .BEGIN:
@@ -78,7 +78,7 @@ RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
-BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
+BUILD_DEPENDS+=	nkf:japanese/nkf
 .endif
 
 # makeinfo stuff
diff --git a/editors/fxite/Makefile b/editors/fxite/Makefile
index 8145071c8314..060ed9130784 100644
--- a/editors/fxite/Makefile
+++ b/editors/fxite/Makefile
@@ -33,12 +33,12 @@ OPTIONS_SINGLE_TOOLKIT=	FOX16 FOX17
 OPTIONS_DEFAULT=	FOX16
 
 FOX16_DESC=		Fox 1.6 GUI toolkit support
-FOX16_LIB_DEPENDS=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
+FOX16_LIB_DEPENDS=	libFOX-1.6.so:x11-toolkits/fox16
 FOX16_CONFIGURE_ENV=	FOX_CFLAGS="$$(fox-config --cflags)" \
 			FOX_LIBS="$$(fox-config --libs)" \
 			RESWRAP="${LOCALBASE}/bin/reswrap"
 FOX17_DESC=		Fox 1.7 GUI toolkit support
-FOX17_LIB_DEPENDS=	libFOX-1.7.so:${PORTSDIR}/x11-toolkits/fox17
+FOX17_LIB_DEPENDS=	libFOX-1.7.so:x11-toolkits/fox17
 FOX17_CONFIGURE_ENV=	FOX_CFLAGS="$$(pkgconf fox17 --cflags)" \
 			FOX_LIBS="$$(pkgconf fox17 --libs) -lX11" \
 			RESWRAP="${LOCALBASE}/bin/fox-1.7/reswrap"
diff --git a/editors/gate/Makefile b/editors/gate/Makefile
index 4834d08b6ee8..9025e680cd2b 100644
--- a/editors/gate/Makefile
+++ b/editors/gate/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.unixpapa.com/software/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple and unobtrusive line-oriented text editor
 
-BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS=	aspell:textproc/aspell
+RUN_DEPENDS=	aspell:textproc/aspell
 
 USES=		ncurses
 GNU_CONFIGURE=	yes
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index a9e0a61fb061..05a4c7cbd84c 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -10,13 +10,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plugins for GEdit 3
 
-BUILD_DEPENDS=	gedit>=0:${PORTSDIR}/editors/gedit \
-		valac:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libzeitgeist-2.0.so:${PORTSDIR}/sysutils/zeitgeist \
-		libgit2-glib-1.0.so:${PORTSDIR}/devel/libgit2-glib
-RUN_DEPENDS=	gedit>=0:${PORTSDIR}/editors/gedit
+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
 
@@ -33,10 +33,10 @@ GLIB_SCHEMAS=	org.gnome.gedit.plugins.drawspaces.gschema.xml \
 		org.gnome.gedit.plugins.wordcompletion.gschema.xml
 
 USES+=		python
-BUILD_DEPENDS+=	py3?-dbus>=0:${PORTSDIR}/devel/py3-dbus
-LIB_DEPENDS+=	libgucharmap_2_90.so:${PORTSDIR}/deskutils/gucharmap
-RUN_DEPENDS+=	py3?-dbus>=0:${PORTSDIR}/devel/py3-dbus \
-		${PYTHON_PKGNAMEPREFIX}libpeas>=0:${PORTSDIR}/devel/py3-libpeas
+BUILD_DEPENDS+=	py3?-dbus>=0:devel/py3-dbus
+LIB_DEPENDS+=	libgucharmap_2_90.so:deskutils/gucharmap
+RUN_DEPENDS+=	py3?-dbus>=0:devel/py3-dbus \
+		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
 USE_GNOME+=	vte3
 CONFIGURE_ARGS+=--enable-python
 GLIB_SCHEMAS+=	org.gnome.gedit.plugins.terminal.gschema.xml
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 36218998e25b..f0aac383d2de 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -10,16 +10,16 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Small but powerful text editor for GNOME 3 Desktop Environment
 
-BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		vala:${PORTSDIR}/lang/vala \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
-		libpeas-gtk-1.0.so:${PORTSDIR}/devel/libpeas \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		${PYTHON_PKGNAMEPREFIX}libpeas>=0:${PORTSDIR}/devel/py3-libpeas
+BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		vala:lang/vala \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libenchant.so:textproc/enchant \
+		libpeas-gtk-1.0.so:devel/libpeas \
+		libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 623478008b4f..5cb3735b8b60 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 hex editor
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk30 intlhack libxml2:build
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 619364de9c1e..3caee3559780 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Free collaborative editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libobby.so:${PORTSDIR}/devel/obby \
-		libnet6.so:${PORTSDIR}/net/net6 \
-		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libobby.so:devel/obby \
+		libnet6.so:net/net6 \
+		libxml++-2.6.so:textproc/libxml++26 \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 OPTIONS_DEFINE=	GTKSPELL NLS
 GTKSPELL_DESC=	Enable GtkSpell support
@@ -28,7 +28,7 @@ INSTALLS_ICONS=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+LIB_DEPENDS+=	libgtkspell.so:textproc/gtkspell
 CONFIGURE_ARGS+=--with-gtkspell
 .else
 CONFIGURE_ARGS+=--without-gtkspell
diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile
index 581d62d90b82..f493a77d0652 100644
--- a/editors/gwrite/Makefile
+++ b/editors/gwrite/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Simple HTML format editor
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:${PORTSDIR}/devel/py-python-distutils-extra \
-		${PYTHON_PKGNAMEPREFIX}jswebkit>=0:${PORTSDIR}/www/py-jswebkit \
-		${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		wvHtml:${PORTSDIR}/textproc/wv \
-		${PYTHON_PKGNAMEPREFIX}jswebkit>=0:${PORTSDIR}/www/py-jswebkit \
-		${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:devel/py-python-distutils-extra \
+		${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		wvHtml:textproc/wv \
+		${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk
 
 NO_ARCH=	yes
 USES=		desktop-file-utils gettext-tools python
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index 602ac5e6c04b..f1dd53d00b58 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -26,7 +26,7 @@ X11_DESC=	X11 textmode support
 NOT_FOR_ARCHS=	ia64
 NOT_FOR_ARCHS_REASON=	does not build on ia64
 
-LZO2_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO2_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO2_CONFIGURE_OFF=	--with-included-lzo
 X11_USE=		XORG=x11
 X11_CPPFLAGS=		-I${LOCALBASE}/include
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index a765992cb61d..268cb12f8803 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -14,7 +14,7 @@ COMMENT=	SLang-based text editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS=	libslang.so:devel/libslang2
 
 CONFLICTS=	jed-devel-[0-9]*
 
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index e92bbcf969ac..9c8c764745ed 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Joe's Own Editor
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS=	aspell:textproc/aspell
+RUN_DEPENDS=	aspell:textproc/aspell
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index b6e2a8e01ce3..2e3473071c1c 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -12,7 +12,7 @@ COMMENT?=	Joe's Own Editor
 
 OPTIONS_DEFINE=	DOCS
 
-RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+RUN_DEPENDS=	ispell:textproc/aspell-ispell
 
 PKGNAMESUFFIX=	2
 CONFLICTS=	joe-3*
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index 7ab3057a2e08..c89aaa9fc389 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic editor framework for the KDE system
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 USE_KDE4=	kdelibs kdeprefix automoc4 kactivities
 USES=		cmake:outsource gettext perl5 tar:xz
diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index 87541c94b505..1418ac9cab1a 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${DISTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	LaTeX source editor for KDE
 
-RUN_DEPENDS=	identify:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	identify:graphics/ImageMagick
 
 USES=		cmake gettext-tools shared-mime-info tar:bzip2
 USE_QT4=	qmake_build moc_build rcc_build uic_build
diff --git a/editors/latexila/Makefile b/editors/latexila/Makefile
index 139830873d1c..79bb66592be2 100644
--- a/editors/latexila/Makefile
+++ b/editors/latexila/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Integrated LaTeX environment
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala \
-	itstool:${PORTSDIR}/textproc/itstool \
-	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libgee-0.8.so:${PORTSDIR}/devel/libgee \
-	libgspell-1.so:${PORTSDIR}/textproc/gspell
+BUILD_DEPENDS=	valac:lang/vala \
+	itstool:textproc/itstool \
+	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
+	libgspell-1.so:textproc/gspell
 
 USES=	compiler:c11 desktop-file-utils gettext-tools gmake pkgconfig \
 	tar:xz
diff --git a/editors/lazarus-lcl-gtk2/Makefile b/editors/lazarus-lcl-gtk2/Makefile
index 8d41b0f21a53..650926540400 100644
--- a/editors/lazarus-lcl-gtk2/Makefile
+++ b/editors/lazarus-lcl-gtk2/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-lcl-gtk2
 
 COMMENT=	Lazarus components library - GTK2 backend
 
-BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units
+BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units
 
 USE_FPC=	cairo fcl-base fcl-db fcl-image fcl-res fcl-registry \
 		fcl-xml gtk2 pasjpeg x11
diff --git a/editors/lazarus-lcl-nogui/Makefile b/editors/lazarus-lcl-nogui/Makefile
index 484aab5a3452..0cb47e573b4c 100644
--- a/editors/lazarus-lcl-nogui/Makefile
+++ b/editors/lazarus-lcl-nogui/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-lcl-nogui
 
 COMMENT=	Lazarus components library - No gui backend
 
-BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units
+BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units
 
 LCL_INTERFACE=	nogui
 
diff --git a/editors/lazarus-lcl-qt/Makefile b/editors/lazarus-lcl-qt/Makefile
index 7870a0417816..e6d1f9ef6e13 100644
--- a/editors/lazarus-lcl-qt/Makefile
+++ b/editors/lazarus-lcl-qt/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-lcl-qt
 
 COMMENT=	Lazarus components library - QT backend
 
-BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units
+BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units
 
 USE_FPC=	fcl-base fcl-db fcl-image fcl-registry fcl-res \
 		fcl-xml pasjpeg x11
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index e8b726bb1d98..98caba8d3d1e 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -50,12 +50,12 @@ BUILDNAME=	${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_UNITS_DIR=	${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}
 
 .if !defined(PKGNAMESUFFIX)
-BUILD_DEPENDS+=	fpcres:${PORTSDIR}/lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-nogui
-RUN_DEPENDS+=	fpcres:${PORTSDIR}/lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-nogui
+BUILD_DEPENDS+=	fpcres:lang/fpc-utils \
+		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
+		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
+RUN_DEPENDS+=	fpcres:lang/fpc-utils \
+		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
+		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
 
 USES+=		gettext iconv
 USE_FPC+=	chm
@@ -65,21 +65,21 @@ SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR="${PORTSDIR}"
 
 .if ${PORT_OPTIONS:MGDB}
-RUN_DEPENDS+=	${LOCALBASE}/bin/gdb:${PORTSDIR}/devel/gdb
+RUN_DEPENDS+=	${LOCALBASE}/bin/gdb:devel/gdb
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	gtk20 gdkpixbuf
 LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
-RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
+RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
+LIB_DEPENDS+=	libQt4Pas.so:x11-toolkits/qt4pas
 LCL_PLATFORM=	qt
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
-RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
+RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
 .endif
 
 post-extract:
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index b99c16df8ebe..64353e350eec 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Advanced outline editor for programmers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>0:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils \
-		silvercity>0:${PORTSDIR}/textproc/silvercity \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>0:${PORTSDIR}/x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt4-svg>0:graphics/py-qt4-svg \
+		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \
+		silvercity>0:textproc/silvercity \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>0:x11-toolkits/py-qt4-gui
 
 NO_ARCH=	yes
 
@@ -32,7 +32,7 @@ DESKTOP_ENTRIES="Leo" "Literate Editor with Outlines" \
 OPTIONS_DEFINE=		PYENCHANT
 
 PYENCHANT_DESC=		Spell checking support via PyEnchant
-PYENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>0:${PORTSDIR}/textproc/py-enchant
+PYENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant
 
 post-patch:
 	@${LN} -sf leo/dist/leo-install.py ${WRKSRC}/leo-install.py
diff --git a/editors/libreoffice-i18n/Makefile b/editors/libreoffice-i18n/Makefile
index 93a0bf1a8325..539e276e5cdc 100644
--- a/editors/libreoffice-i18n/Makefile
+++ b/editors/libreoffice-i18n/Makefile
@@ -42,7 +42,7 @@ ${lang}_DETECT?=	${PREFIX}/lib/${PORTNAME}/readmes/README_${lang:S/_/-/}
 ${lang}_NAME?=		${lang}
 ${lang:tu}_PORT?=	editors/${PORTNAME}-${lang}
 ${lang:tu}_DESC=	${${lang}_NAME} localization data
-${lang:tu}_RUN_DEPENDS=	${${lang}_DETECT}:${PORTSDIR}/${${lang:tu}_PORT}
+${lang:tu}_RUN_DEPENDS=	${${lang}_DETECT}:${${lang:tu}_PORT}
 .endfor
 
 all-lang-list:
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 59a356fda4d6..62f23fceab78 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -13,69 +13,69 @@ EXTRACT_ONLY:=	${DISTFILES}
 
 COMMENT=	Full integrated office productivity suite
 
-BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		zip:${PORTSDIR}/archivers/zip \
-		${LOCALBASE}/include/sqlext.h:${PORTSDIR}/databases/unixODBC \
-		cppunit-config:${PORTSDIR}/devel/cppunit \
-		dmake:${PORTSDIR}/devel/dmake \
-		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		mdds>=0.9.0:${PORTSDIR}/devel/mdds \
-		gpatch:${PORTSDIR}/devel/patch \
-		ucpp:${PORTSDIR}/devel/ucpp \
-		${LOCALBASE}/include/sane/sane.h:${PORTSDIR}/graphics/sane-backends \
-		vigra-config:${PORTSDIR}/graphics/vigra \
-		${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm \
-		bash:${PORTSDIR}/shells/bash \
-		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS=	libfbembed.so:${PORTSDIR}/databases/firebird25-client \
-		libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libicutu.so:${PORTSDIR}/devel/icu \
-		liblangtag.so:${PORTSDIR}/devel/liblangtag \
-		liborcus-0.10.so:${PORTSDIR}/devel/liborcus \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libcdr-0.1.so:${PORTSDIR}/graphics/libcdr01 \
-		libetonyek-0.1.so:${PORTSDIR}/graphics/libetonyek01 \
-		libfreehand-0.1.so:${PORTSDIR}/graphics/libfreehand \
-		libgltf-0.0.so:${PORTSDIR}/graphics/libgltf \
-		libwpg-0.3.so:${PORTSDIR}/graphics/libwpg03 \
-		libGeneratedSaxParser.so:${PORTSDIR}/graphics/opencollada \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libpoppler.so:${PORTSDIR}/graphics/poppler \
-		libCoinMP.so:${PORTSDIR}/math/coinmp \
-		liblpsolve55.so:${PORTSDIR}/math/lp_solve \
-		libcmis-0.5.so:${PORTSDIR}/net/libcmis \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libmspub-0.1.so:${PORTSDIR}/print/libmspub01 \
-		libpagemaker-0.0.so:${PORTSDIR}/print/libpagemaker \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libclucene-core.so:${PORTSDIR}/textproc/clucene \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
-		libhyphen.so:${PORTSDIR}/textproc/hyphen \
-		libabw-0.1.so:${PORTSDIR}/textproc/libabw \
-		libe-book-0.1.so:${PORTSDIR}/textproc/libe-book \
-		libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat \
-		libmwaw-0.3.so:${PORTSDIR}/textproc/libmwaw03 \
-		libodfgen-0.1.so:${PORTSDIR}/textproc/libodfgen01 \
-		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge \
-		libvisio-0.1.so:${PORTSDIR}/textproc/libvisio01 \
-		libwpd-0.10.so:${PORTSDIR}/textproc/libwpd010 \
-		libwps-0.4.so:${PORTSDIR}/textproc/libwps \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libmythes-1.2.so:${PORTSDIR}/textproc/mythes \
-		librdf.so:${PORTSDIR}/textproc/redland \
-		libserf-1.so:${PORTSDIR}/www/serf
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
-		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
-		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
-		${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic \
-		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
-		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g
+BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		zip:archivers/zip \
+		${LOCALBASE}/include/sqlext.h:databases/unixODBC \
+		cppunit-config:devel/cppunit \
+		dmake:devel/dmake \
+		${LOCALBASE}/bin/gperf:devel/gperf \
+		mdds>=0.9.0:devel/mdds \
+		gpatch:devel/patch \
+		ucpp:devel/ucpp \
+		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
+		vigra-config:graphics/vigra \
+		${LOCALBASE}/include/glm/glm.hpp:math/glm \
+		bash:shells/bash \
+		gsed:textproc/gsed
+LIB_DEPENDS=	libfbembed.so:databases/firebird25-client \
+		libapr-1.so:devel/apr1 \
+		libboost_date_time.so:devel/boost-libs \
+		libicutu.so:devel/icu \
+		liblangtag.so:devel/liblangtag \
+		liborcus-0.10.so:devel/liborcus \
+		libcurl.so:ftp/curl \
+		libcairo.so:graphics/cairo \
+		libgraphite2.so:graphics/graphite2 \
+		liblcms2.so:graphics/lcms2 \
+		libcdr-0.1.so:graphics/libcdr01 \
+		libetonyek-0.1.so:graphics/libetonyek01 \
+		libfreehand-0.1.so:graphics/libfreehand \
+		libgltf-0.0.so:graphics/libgltf \
+		libwpg-0.3.so:graphics/libwpg03 \
+		libGeneratedSaxParser.so:graphics/opencollada \
+		libpng.so:graphics/png \
+		libpoppler.so:graphics/poppler \
+		libCoinMP.so:math/coinmp \
+		liblpsolve55.so:math/lp_solve \
+		libcmis-0.5.so:net/libcmis \
+		libharfbuzz.so:print/harfbuzz \
+		libmspub-0.1.so:print/libmspub01 \
+		libpagemaker-0.0.so:print/libpagemaker \
+		libnss3.so:security/nss \
+		libclucene-core.so:textproc/clucene \
+		libexpat.so:textproc/expat2 \
+		libhunspell-1.3.so:textproc/hunspell \
+		libhyphen.so:textproc/hyphen \
+		libabw-0.1.so:textproc/libabw \
+		libe-book-0.1.so:textproc/libe-book \
+		libexttextcat-2.0.so:textproc/libexttextcat \
+		libmwaw-0.3.so:textproc/libmwaw03 \
+		libodfgen-0.1.so:textproc/libodfgen01 \
+		librevenge-0.0.so:textproc/librevenge \
+		libvisio-0.1.so:textproc/libvisio01 \
+		libwpd-0.10.so:textproc/libwpd010 \
+		libwps-0.4.so:textproc/libwps \
+		libxml2.so:textproc/libxml2 \
+		libxslt.so:textproc/libxslt \
+		libmythes-1.2.so:textproc/mythes \
+		librdf.so:textproc/redland \
+		libserf-1.so:www/serf
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
+		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
+		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
+		${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \
+		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \
+		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
 
 DISTFILES+=	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src \
 		4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src
@@ -114,11 +114,11 @@ VERBOSE_DESC=	Increase build verbosity
 WEBDAV_DESC=	Enable webdav protocol
 
 CUPS_CONFIGURE_ENABLE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 GNOME_CONFIGURE_ENABLE=	dbus gconf lockdown
 GNOME_IMPLIES=	GTK2
-GNOME_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+GNOME_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 GNOME_USE=	GNOME=gconf2
 
 GTK_USE_GNOME=	gtk-update-icon-cache
@@ -135,13 +135,13 @@ GTK3_USE=	GNOME=gtk30,${GTK_USE_GNOME}
 GTK3_USES=	${GTK_USES}
 GTK3_VARS=	${GTK_VARS}
 
-JAVA_BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
-			${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec \
-			${JAVAJARDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
-			${JAVAJARDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
-			${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-			${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit \
-			${JAVAJARDIR}/bsh.jar:${PORTSDIR}/lang/bsh
+JAVA_BUILD_DEPENDS=	ant:devel/apache-ant \
+			${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec \
+			${JAVAJARDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \
+			${JAVAJARDIR}/commons-lang.jar:java/jakarta-commons-lang \
+			${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging \
+			${JAVAJARDIR}/junit.jar:java/junit \
+			${JAVAJARDIR}/bsh.jar:lang/bsh
 JAVA_CATEGORIES=	java
 JAVA_CONFIGURE_ON=	--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-beanshell-jar=${JAVAJARDIR}/bsh.jar \
@@ -187,7 +187,7 @@ PGSQL_CONFIGURE_ENABLE=	postgresql-sdbc
 PGSQL_CONFIGURE_WITH=	gssapi krb5
 PGSQL_USES=	pgsql
 
-SDK_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+SDK_BUILD_DEPENDS=	doxygen:devel/doxygen
 SDK_CONFIGURE_ENABLE=	odk
 SDK_CONFIGURE_OFF=	--without-doxygen
 SDK_CONFIGURE_ON=	--with-doxygen=${LOCALBASE}/bin/doxygen
@@ -200,7 +200,7 @@ TEST_CONFIGURE_ENABLE=	cve-tests
 VERBOSE_CONFIGURE_ON=	--enable-verbose
 
 WEBDAV_CONFIGURE_ENABLE=	neon
-WEBDAV_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+WEBDAV_LIB_DEPENDS=	libneon.so:www/neon
 
 ACLOCAL_ARGS=	-I "${WRKSRC}/m4"
 CPPFLAGS+=	-isystem ${LOCALBASE}/include
@@ -274,7 +274,7 @@ BROKEN=		Build with system libstdc++ is unsupported
 .endif
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CONFIGURE_ENV+=	FLEX=${LOCALBASE}/bin/flex
 .endif
 .endif # FreeBSD
diff --git a/editors/libreoffice/Makefile.i18n b/editors/libreoffice/Makefile.i18n
index 04383f301b16..65c500d81471 100644
--- a/editors/libreoffice/Makefile.i18n
+++ b/editors/libreoffice/Makefile.i18n
@@ -20,7 +20,7 @@ DIST_SUBDIR=	libreoffice/i18n
 
 COMMENT?=	${LO_I18N} language pack for ${PORTNAME}
 
-RUN_DEPENDS?=	libreoffice:${PORTSDIR}/editors/libreoffice
+RUN_DEPENDS?=	libreoffice:editors/libreoffice
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile
index 460c6176ce44..c1e2e6031630 100644
--- a/editors/libreoffice4/Makefile
+++ b/editors/libreoffice4/Makefile
@@ -19,64 +19,64 @@ COMMENT=	Full integrated office productivity suite
 LICENSE=	LGPL3 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		zip:${PORTSDIR}/archivers/zip \
-		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
-		cppunit-config:${PORTSDIR}/devel/cppunit \
-		dmake:${PORTSDIR}/devel/dmake \
-		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		mdds>=0.9.0:${PORTSDIR}/devel/mdds \
-		gpatch:${PORTSDIR}/devel/patch \
-		ucpp:${PORTSDIR}/devel/ucpp \
-		vigra-config:${PORTSDIR}/graphics/vigra \
-		${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm \
-		bash:${PORTSDIR}/shells/bash \
-		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libicutu.so:${PORTSDIR}/devel/icu \
-		liblangtag.so:${PORTSDIR}/devel/liblangtag \
-		liborcus-0.8.so:${PORTSDIR}/devel/liborcus07 \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libcdr-0.1.so:${PORTSDIR}/graphics/libcdr01 \
-		libetonyek-0.1.so:${PORTSDIR}/graphics/libetonyek01 \
-		libfreehand-0.1.so:${PORTSDIR}/graphics/libfreehand \
-		libgltf-0.0.so:${PORTSDIR}/graphics/libgltf \
-		libwpg-0.3.so:${PORTSDIR}/graphics/libwpg03 \
-		libGeneratedSaxParser.so:${PORTSDIR}/graphics/opencollada \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libpoppler.so:${PORTSDIR}/graphics/poppler \
-		liblpsolve55.so:${PORTSDIR}/math/lp_solve \
-		libcmis-0.5.so:${PORTSDIR}/net/libcmis \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libmspub-0.1.so:${PORTSDIR}/print/libmspub01 \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libclucene-core.so:${PORTSDIR}/textproc/clucene \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
-		libhyphen.so:${PORTSDIR}/textproc/hyphen \
-		libabw-0.1.so:${PORTSDIR}/textproc/libabw \
-		libe-book-0.1.so:${PORTSDIR}/textproc/libe-book \
-		libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat \
-		libmwaw-0.3.so:${PORTSDIR}/textproc/libmwaw03 \
-		libodfgen-0.1.so:${PORTSDIR}/textproc/libodfgen01 \
-		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge \
-		libvisio-0.1.so:${PORTSDIR}/textproc/libvisio01 \
-		libwpd-0.10.so:${PORTSDIR}/textproc/libwpd010 \
-		libwps-0.3.so:${PORTSDIR}/textproc/libwps03 \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libmythes-1.2.so:${PORTSDIR}/textproc/mythes \
-		librdf.so:${PORTSDIR}/textproc/redland \
-		libserf-1.so:${PORTSDIR}/www/serf
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
-		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
-		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
-		${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic \
-		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
-		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g
+BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		zip:archivers/zip \
+		${LOCALBASE}/lib/libboost_regex.a:devel/boost-libs \
+		cppunit-config:devel/cppunit \
+		dmake:devel/dmake \
+		${LOCALBASE}/bin/gperf:devel/gperf \
+		mdds>=0.9.0:devel/mdds \
+		gpatch:devel/patch \
+		ucpp:devel/ucpp \
+		vigra-config:graphics/vigra \
+		${LOCALBASE}/include/glm/glm.hpp:math/glm \
+		bash:shells/bash \
+		gsed:textproc/gsed
+LIB_DEPENDS=	libapr-1.so:devel/apr1 \
+		libicutu.so:devel/icu \
+		liblangtag.so:devel/liblangtag \
+		liborcus-0.8.so:devel/liborcus07 \
+		libcurl.so:ftp/curl \
+		libcairo.so:graphics/cairo \
+		libgraphite2.so:graphics/graphite2 \
+		liblcms2.so:graphics/lcms2 \
+		libcdr-0.1.so:graphics/libcdr01 \
+		libetonyek-0.1.so:graphics/libetonyek01 \
+		libfreehand-0.1.so:graphics/libfreehand \
+		libgltf-0.0.so:graphics/libgltf \
+		libwpg-0.3.so:graphics/libwpg03 \
+		libGeneratedSaxParser.so:graphics/opencollada \
+		libpng.so:graphics/png \
+		libpoppler.so:graphics/poppler \
+		liblpsolve55.so:math/lp_solve \
+		libcmis-0.5.so:net/libcmis \
+		libharfbuzz.so:print/harfbuzz \
+		libmspub-0.1.so:print/libmspub01 \
+		libnss3.so:security/nss \
+		libclucene-core.so:textproc/clucene \
+		libexpat.so:textproc/expat2 \
+		libhunspell-1.3.so:textproc/hunspell \
+		libhyphen.so:textproc/hyphen \
+		libabw-0.1.so:textproc/libabw \
+		libe-book-0.1.so:textproc/libe-book \
+		libexttextcat-2.0.so:textproc/libexttextcat \
+		libmwaw-0.3.so:textproc/libmwaw03 \
+		libodfgen-0.1.so:textproc/libodfgen01 \
+		librevenge-0.0.so:textproc/librevenge \
+		libvisio-0.1.so:textproc/libvisio01 \
+		libwpd-0.10.so:textproc/libwpd010 \
+		libwps-0.3.so:textproc/libwps03 \
+		libxml2.so:textproc/libxml2 \
+		libxslt.so:textproc/libxslt \
+		libmythes-1.2.so:textproc/mythes \
+		librdf.so:textproc/redland \
+		libserf-1.so:www/serf
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
+		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
+		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
+		${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \
+		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \
+		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
 
 CONFLICTS_INSTALL=	libreoffice-5.*
 ONLY_FOR_ARCHS=	amd64 i386
@@ -217,13 +217,13 @@ TEST_DESC=	Run all regression tests
 VERBOSE_DESC=	Increase build verbosity
 WEBDAV_DESC=	Enable webdav protocol
 
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CONFIGURE_ENABLE=	cups
 
 DEBUG_CONFIGURE_ON=	--enable-crashdump --enable-dbgutil --enable-debug
 DEBUG_CONFIGURE_OFF=	--enable-release-build
 
-GNOME_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+GNOME_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 GNOME_USE=	GNOME=gconf2
 GNOME_CONFIGURE_ENABLE=	dbus gconf lockdown
 
@@ -251,8 +251,8 @@ JAVA_DISTFILES=	048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip:src \
 		ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz:src \
 		eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \
 		f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src
-JAVA_BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
-			${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit
+JAVA_BUILD_DEPENDS=	ant:devel/apache-ant \
+			${JAVAJARDIR}/junit.jar:java/junit
 # XXX jni.h from GNU classpath causes ABI conflicts.
 JAVA_CONFLICTS_BUILD=	classpath-[0-9]*
 JAVA_CONFIGURE_ON=	--enable-ext-wiki-publisher \
@@ -280,7 +280,7 @@ PGSQL_CONFIGURE_ENABLE=	postgresql-sdbc
 PGSQL_CONFIGURE_WITH=	gssapi krb5
 
 SDK_DISTFILES=	185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext
-SDK_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+SDK_BUILD_DEPENDS=	doxygen:devel/doxygen
 SDK_CONFIGURE_ENABLE=	odk
 SDK_CONFIGURE_ON=	--with-doxygen=${LOCALBASE}/bin/doxygen
 SDK_CONFIGURE_OFF=	--without-doxygen
@@ -289,7 +289,7 @@ SYSTRAY_CONFIGURE_ENABLE=	systray
 
 TEST_CONFIGURE_ENABLE=	cve-tests
 
-WEBDAV_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+WEBDAV_LIB_DEPENDS=	libneon.so:www/neon
 WEBDAV_CONFIGURE_ENABLE=	neon
 
 # for dynamic plist generation
@@ -339,7 +339,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-configure.ac
 .endif
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CONFIGURE_ENV+=	FLEX=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index 75d9e2232a8b..5764133d7af9 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Open-source and cross-platform text/hex editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
 USES=		gettext pkgconfig dos2unix desktop-file-utils
 USE_WX=		2.8+
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index dead73a75058..513a981e820e 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -11,12 +11,12 @@ MASTER_SITES=	http://www.morlardf.net/src/ \
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	RDF editor
 
-LIB_DEPENDS=	libnxml.so:${PORTSDIR}/textproc/libnxml \
-		librdf.so:${PORTSDIR}/textproc/redland \
-		libraptor2.so:${PORTSDIR}/textproc/raptor2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
-RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS=	libnxml.so:textproc/libnxml \
+		librdf.so:textproc/redland \
+		libraptor2.so:textproc/raptor2 \
+		libcurl.so:ftp/curl
+BUILD_DEPENDS=	dot:graphics/graphviz
+RUN_DEPENDS=	dot:graphics/graphviz
 
 OPTIONS_DEFINE=	XULRUNNER
 XULRUNNER_DESC=	Xulrunner as JavaScript engine
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index 3c1614ba0be5..cc396bf915cf 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple text editor for the Xfce Desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USES=	desktop-file-utils gettext gmake libtool perl5 pkgconfig tar:bzip2
diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index 1fc020180cea..1f0ad666f976 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -29,7 +29,7 @@ NLS_USES=		gettext
 NLS_CONFIGURE_WITH=	gettext
 GTK2_USE=		gnome=gtk20
 GTK3_USE=		gnome=gtk30
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_WITH=	pcre
 QT4_USE=		qt4=corelib,gui,moc_build
 QT4_CONFIGURE_ENV=	CPP="${CXX}" CCLINK="${CXX}"
diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index fe8faddf49e9..edd425d4b399 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -11,15 +11,15 @@ COMMENT=	Next generation Vim
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LUA_MODSHAREDIR}/MessagePack.lua:${PORTSDIR}/devel/lua-MessagePack \
-		${LUA_MODLIBDIR}/bit.so:${PORTSDIR}/devel/lua-bitop \
-		${LUA_MODLIBDIR}/lpeg.so:${PORTSDIR}/devel/lua-lpeg
-LIB_DEPENDS=	libunibilium.so:${PORTSDIR}/devel/unibilium \
-		libvterm.so:${PORTSDIR}/devel/libvterm \
-		libtermkey.so:${PORTSDIR}/devel/libtermkey \
-		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
-		libuv.so:${PORTSDIR}/devel/libuv \
-		libmsgpack.so:${PORTSDIR}/devel/msgpack
+BUILD_DEPENDS=	${LUA_MODSHAREDIR}/MessagePack.lua:devel/lua-MessagePack \
+		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop \
+		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg
+LIB_DEPENDS=	libunibilium.so:devel/unibilium \
+		libvterm.so:devel/libvterm \
+		libtermkey.so:devel/libtermkey \
+		libluajit-5.1.so:lang/luajit \
+		libuv.so:devel/libuv \
+		libmsgpack.so:devel/msgpack
 
 USES=		cmake gettext-tools lua gmake pkgconfig
 USE_GITHUB=	yes
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index ce6323e64c31..65868c59eefb 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+=	--enable-multibyte
 
 .if ${PORT_OPTIONS:MCANNA}
 CONFIGURE_ARGS+=	--enable-canna=${PREFIX}
-LIB_DEPENDS=	libcanna.so:${PORTSDIR}/japanese/canna-lib
+LIB_DEPENDS=	libcanna.so:japanese/canna-lib
 .endif
 
 post-patch:
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 45a2812e122f..fca4ca3fef45 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -47,53 +47,53 @@ LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=								\
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip	\
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww			\
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser	\
-		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	\
-		zip:${PORTSDIR}/archivers/zip				\
-		ant:${PORTSDIR}/devel/apache-ant			\
-		${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \
-		dmake:${PORTSDIR}/devel/dmake				\
-		epm:${PORTSDIR}/devel/epm				\
-		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf		\
-		imake:${PORTSDIR}/devel/imake				\
-		gpatch:${PORTSDIR}/devel/patch				\
-		${LOCALBASE}/include/sane/sane.h:${PORTSDIR}/graphics/sane-backends \
-		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
-		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
-		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit		\
-		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh		\
-		bash:${PORTSDIR}/shells/bash				\
-		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+		p5-Archive-Zip>=0:archivers/p5-Archive-Zip	\
+		p5-libwww>=0:www/p5-libwww			\
+		p5-XML-Parser>=0:textproc/p5-XML-Parser	\
+		${LOCALBASE}/bin/unzip:archivers/unzip	\
+		zip:archivers/zip				\
+		ant:devel/apache-ant			\
+		${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \
+		dmake:devel/dmake				\
+		epm:devel/epm				\
+		${LOCALBASE}/bin/gperf:devel/gperf		\
+		imake:devel/imake				\
+		gpatch:devel/patch				\
+		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
+		${LOCALBASE}/bin/vigra-config:graphics/vigra \
+		${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \
+		${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \
+		${JAVALIBDIR}/junit.jar:java/junit		\
+		${JAVALIBDIR}/bsh.jar:lang/bsh		\
+		bash:shells/bash				\
+		${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene \
+		p5-libwww>=0:www/p5-libwww
 LIB_DEPENDS=								\
-		libapr-1.so:${PORTSDIR}/devel/apr1			\
-		libnspr4.so:${PORTSDIR}/devel/nspr			\
-		libcurl.so:${PORTSDIR}/ftp/curl				\
-		libcairo.so:${PORTSDIR}/graphics/cairo			\
-		libpng.so:${PORTSDIR}/graphics/png			\
-		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
-		libgraphite.so:${PORTSDIR}/graphics/silgraphite		\
-		libCoinMP.so:${PORTSDIR}/math/coinmp			\
-		libfreetype.so:${PORTSDIR}/print/freetype2		\
-		libnss3.so:${PORTSDIR}/security/nss			\
-		libexpat.so:${PORTSDIR}/textproc/expat2			\
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	\
-		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
-		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
-		libmythes-1.2.so:${PORTSDIR}/textproc/mythes		\
-		librdf.so:${PORTSDIR}/textproc/redland			\
-		libserf-1.so:${PORTSDIR}/www/serf			\
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+		libapr-1.so:devel/apr1			\
+		libnspr4.so:devel/nspr			\
+		libcurl.so:ftp/curl				\
+		libcairo.so:graphics/cairo			\
+		libpng.so:graphics/png			\
+		libpoppler-glib.so:graphics/poppler-glib	\
+		libgraphite.so:graphics/silgraphite		\
+		libCoinMP.so:math/coinmp			\
+		libfreetype.so:print/freetype2		\
+		libnss3.so:security/nss			\
+		libexpat.so:textproc/expat2			\
+		libhunspell-1.3.so:textproc/hunspell	\
+		libhyphen.so:textproc/hyphen		\
+		libtextcat.so:textproc/libtextcat		\
+		libmythes-1.2.so:textproc/mythes		\
+		librdf.so:textproc/redland			\
+		libserf-1.so:www/serf			\
+		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=								\
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
-		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
-		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
-		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
-		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
+		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \
+		${JAVALIBDIR}/bsh.jar:lang/bsh \
+		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
+		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
+		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
 
 AOOVERSION1=	4
 AOOVERSION2=	1
@@ -146,10 +146,10 @@ WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
 CCACHE_DESC=		Mimimize compile time of C/C++ programs
 
 CUPS_CONFIGURE_ENABLE=		cups
-CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=		libcups.so:print/cups
 
 GNOME_CONFIGURE_ENABLE=		dbus gconf lockdown
-GNOME_LIB_DEPENDS=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+GNOME_LIB_DEPENDS=		libdbus-glib-1.so:devel/dbus-glib
 GNOME_USE=			GNOME=gconf2
 
 GNOMEVFS_CONFIGURE_ENABLE=	gnome-vfs
@@ -188,7 +188,7 @@ PACKAGE_PREFIX=		Apache_OpenOffice
 LOCALIZED_LANG?=	en-US
 
 .if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE)
-BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+BUILD_DEPENDS+=	ccache:devel/ccache
 CCACHE_PREFIX=	ccache
 AOOCC=		${CCACHE_PREFIX} ${CC}
 AOOCXX=		${CCACHE_PREFIX} ${CXX}
diff --git a/editors/openoffice-4/files/Makefile.localized b/editors/openoffice-4/files/Makefile.localized
index 1b6364941f2f..557c88dbc811 100644
--- a/editors/openoffice-4/files/Makefile.localized
+++ b/editors/openoffice-4/files/Makefile.localized
@@ -163,7 +163,7 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES+=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:japanese/font-std
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ka"
@@ -384,14 +384,14 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 CATEGORIES+=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES+=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 3758f8caa7a1..b807a6cd4542 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -49,52 +49,52 @@ LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=								\
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip	\
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww			\
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser	\
-		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	\
-		zip:${PORTSDIR}/archivers/zip				\
-		ant:${PORTSDIR}/devel/apache-ant			\
-		dmake:${PORTSDIR}/devel/dmake				\
-		epm:${PORTSDIR}/devel/epm				\
-		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf		\
-		imake:${PORTSDIR}/devel/imake				\
-		gpatch:${PORTSDIR}/devel/patch				\
-		${LOCALBASE}/include/sane/sane.h:${PORTSDIR}/graphics/sane-backends \
-		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
-		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
-		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit		\
-		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh		\
-		bash:${PORTSDIR}/shells/bash				\
-		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+		p5-Archive-Zip>=0:archivers/p5-Archive-Zip	\
+		p5-libwww>=0:www/p5-libwww			\
+		p5-XML-Parser>=0:textproc/p5-XML-Parser	\
+		${LOCALBASE}/bin/unzip:archivers/unzip	\
+		zip:archivers/zip				\
+		ant:devel/apache-ant			\
+		dmake:devel/dmake				\
+		epm:devel/epm				\
+		${LOCALBASE}/bin/gperf:devel/gperf		\
+		imake:devel/imake				\
+		gpatch:devel/patch				\
+		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
+		${LOCALBASE}/bin/vigra-config:graphics/vigra \
+		${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \
+		${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \
+		${JAVALIBDIR}/junit.jar:java/junit		\
+		${JAVALIBDIR}/bsh.jar:lang/bsh		\
+		bash:shells/bash				\
+		${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene \
+		p5-libwww>=0:www/p5-libwww
 LIB_DEPENDS=								\
-		libapr-1.so:${PORTSDIR}/devel/apr1			\
-		libnspr4.so:${PORTSDIR}/devel/nspr			\
-		libcurl.so:${PORTSDIR}/ftp/curl				\
-		libcairo.so:${PORTSDIR}/graphics/cairo			\
-		libpng.so:${PORTSDIR}/graphics/png			\
-		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
-		libgraphite.so:${PORTSDIR}/graphics/silgraphite		\
-		libCoinMP.so:${PORTSDIR}/math/coinmp			\
-		libfreetype.so:${PORTSDIR}/print/freetype2		\
-		libnss3.so:${PORTSDIR}/security/nss			\
-		libexpat.so:${PORTSDIR}/textproc/expat2			\
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	\
-		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
-		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
-		libmythes-1.2.so:${PORTSDIR}/textproc/mythes		\
-		librdf.so:${PORTSDIR}/textproc/redland			\
-		libserf-1.so:${PORTSDIR}/www/serf			\
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+		libapr-1.so:devel/apr1			\
+		libnspr4.so:devel/nspr			\
+		libcurl.so:ftp/curl				\
+		libcairo.so:graphics/cairo			\
+		libpng.so:graphics/png			\
+		libpoppler-glib.so:graphics/poppler-glib	\
+		libgraphite.so:graphics/silgraphite		\
+		libCoinMP.so:math/coinmp			\
+		libfreetype.so:print/freetype2		\
+		libnss3.so:security/nss			\
+		libexpat.so:textproc/expat2			\
+		libhunspell-1.3.so:textproc/hunspell	\
+		libhyphen.so:textproc/hyphen		\
+		libtextcat.so:textproc/libtextcat		\
+		libmythes-1.2.so:textproc/mythes		\
+		librdf.so:textproc/redland			\
+		libserf-1.so:www/serf			\
+		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=								\
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
-		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
-		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
-		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
-		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
+		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \
+		${JAVALIBDIR}/bsh.jar:lang/bsh \
+		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
+		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
+		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
 
 AOOVERSION1=	4
 AOOVERSION2=	2
@@ -158,10 +158,10 @@ WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
 CCACHE_DESC=		Mimimize compile time of C/C++ programs
 
 CUPS_CONFIGURE_ENABLE=		cups
-CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=		libcups.so:print/cups
 
 GNOME_CONFIGURE_ENABLE=		dbus gconf lockdown
-GNOME_LIB_DEPENDS=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+GNOME_LIB_DEPENDS=		libdbus-glib-1.so:devel/dbus-glib
 GNOME_USE=			GNOME=gconf2
 
 GNOMEVFS_CONFIGURE_ENABLE=	gnome-vfs
@@ -175,8 +175,8 @@ MMEDIA_USE=			GSTREAMER=yes
 SDK_CONFIGURE_ENABLE=		odk
 
 PDFIMPORT_CONFIGURE_ENABLE=	pdfimport
-PDFIMPORT_LIB_DEPENDS=		libboost_system.so:${PORTSDIR}/devel/boost-libs
-PDFIMPORT_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+PDFIMPORT_LIB_DEPENDS=		libboost_system.so:devel/boost-libs
+PDFIMPORT_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
 
@@ -203,7 +203,7 @@ PACKAGE_PREFIX=		Apache_OpenOffice
 LOCALIZED_LANG?=	en-US
 
 .if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE)
-BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+BUILD_DEPENDS+=	ccache:devel/ccache
 CCACHE_PREFIX=	ccache
 AOOCC=		${CCACHE_PREFIX} ${CC}
 AOOCXX=		${CCACHE_PREFIX} ${CXX}
diff --git a/editors/openoffice-devel/files/Makefile.localized b/editors/openoffice-devel/files/Makefile.localized
index 15d12c9e6f09..284c47768be3 100644
--- a/editors/openoffice-devel/files/Makefile.localized
+++ b/editors/openoffice-devel/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES+=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:japanese/font-std
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ka"
@@ -383,14 +383,14 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 CATEGORIES+=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES+=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index cd0311de7063..b257dc6e25e0 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -15,56 +15,56 @@ COMMENT=	Perl Application Development and Refactoring Environment
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-XS>=2.29:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-DBD-SQLite>=1.35:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=1.58:${PORTSDIR}/databases/p5-DBI \
-		databases/p5-ORLite-Migrate>0:${PORTSDIR}/databases/p5-ORLite-Migrate \
-		p5-Algorithm-Diff>=1.19:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-App-cpanminus>=0.9923:${PORTSDIR}/devel/p5-App-cpanminus \
-		p5-Capture-Tiny>0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Class-Adapter>=1.05:${PORTSDIR}/devel/p5-Class-Adapter \
-		p5-Class-Inspector>=1.22:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Class-XSAccessor>=1.13:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-Data-Dumper>=2.101:${PORTSDIR}/devel/p5-Data-Dumper \
-		p5-Debug-Client>=0.20:${PORTSDIR}/devel/p5-Debug-Client \
-		p5-Devel-Dumpvar>=0.04:${PORTSDIR}/devel/p5-Devel-Dumpvar \
-		p5-Devel-Refactor>=0.05:${PORTSDIR}/devel/p5-Devel-Refactor \
-		p5-File-Copy-Recursive>=0.37:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Find-Rule>=0.30:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-HomeDir>=0.84:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Path>=2.08:${PORTSDIR}/devel/p5-File-Path \
-		p5-File-ShareDir>=1.00:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-IPC-Run>=0.83:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Locale-Msgfmt>=0.14:${PORTSDIR}/devel/p5-Locale-Msgfmt \
-		p5-Module-Manifest>=0.07:${PORTSDIR}/devel/p5-Module-Manifest \
-		p5-PPI>=1.213:${PORTSDIR}/textproc/p5-PPI \
-		p5-Module-Starter>=1.60:${PORTSDIR}/devel/p5-Module-Starter \
-		p5-Parse-ErrorString-Perl>=0.14:${PORTSDIR}/devel/p5-Parse-ErrorString-Perl \
-		p5-Parse-ExuberantCTags>=1.00:${PORTSDIR}/devel/p5-Parse-ExuberantCTags \
-		p5-Pod-Abstract>=0.16:${PORTSDIR}/textproc/p5-Pod-Abstract \
-		p5-Sort-Versions>=1.5:${PORTSDIR}/devel/p5-Sort-Versions \
-		p5-Test-Exception>=0.27:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-MockObject>=1.09:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-NoWarnings>=0.084:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Script>=1.07:${PORTSDIR}/devel/p5-Test-Script \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-Pod-POM>=0.17:${PORTSDIR}/textproc/p5-Pod-POM \
-		p5-POD2-Base>=0.043:${PORTSDIR}/textproc/p5-POD2-Base \
-		p5-PPIx-EditorTools>=0.13:${PORTSDIR}/textproc/p5-PPIx-EditorTools \
-		p5-PPIx-Regexp>=0.011:${PORTSDIR}/textproc/p5-PPIx-Regexp \
-		p5-Template-Tiny>=0.11:${PORTSDIR}/textproc/p5-Template-Tiny \
-		p5-Text-Diff>=1.41:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-Text-FindIndent>=0.10:${PORTSDIR}/textproc/p5-Text-FindIndent \
-		p5-Text-Patch>=1.8:${PORTSDIR}/textproc/p5-Text-Patch \
-		p5-YAML-Tiny>=1.32:${PORTSDIR}/textproc/p5-YAML-Tiny \
-		p5-HTML-Parser>=3.58:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=5.815:${PORTSDIR}/www/p5-libwww \
-		p5-Wx>=0.97:${PORTSDIR}/x11-toolkits/p5-Wx \
-		p5-Wx-Perl-ProcessStream>=0.25:${PORTSDIR}/x11-toolkits/p5-Wx-Perl-ProcessStream
+BUILD_DEPENDS=	p5-JSON-XS>=2.29:converters/p5-JSON-XS \
+		p5-DBD-SQLite>=1.35:databases/p5-DBD-SQLite \
+		p5-DBI>=1.58:databases/p5-DBI \
+		databases/p5-ORLite-Migrate>0:databases/p5-ORLite-Migrate \
+		p5-Algorithm-Diff>=1.19:devel/p5-Algorithm-Diff \
+		p5-App-cpanminus>=0.9923:devel/p5-App-cpanminus \
+		p5-Capture-Tiny>0:devel/p5-Capture-Tiny \
+		p5-Class-Adapter>=1.05:devel/p5-Class-Adapter \
+		p5-Class-Inspector>=1.22:devel/p5-Class-Inspector \
+		p5-Class-XSAccessor>=1.13:devel/p5-Class-XSAccessor \
+		p5-Data-Dumper>=2.101:devel/p5-Data-Dumper \
+		p5-Debug-Client>=0.20:devel/p5-Debug-Client \
+		p5-Devel-Dumpvar>=0.04:devel/p5-Devel-Dumpvar \
+		p5-Devel-Refactor>=0.05:devel/p5-Devel-Refactor \
+		p5-File-Copy-Recursive>=0.37:devel/p5-File-Copy-Recursive \
+		p5-File-Find-Rule>=0.30:devel/p5-File-Find-Rule \
+		p5-File-HomeDir>=0.84:devel/p5-File-HomeDir \
+		p5-File-Path>=2.08:devel/p5-File-Path \
+		p5-File-ShareDir>=1.00:devel/p5-File-ShareDir \
+		p5-IO-stringy>=2.110:devel/p5-IO-stringy \
+		p5-IPC-Run>=0.83:devel/p5-IPC-Run \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+		p5-Locale-Msgfmt>=0.14:devel/p5-Locale-Msgfmt \
+		p5-Module-Manifest>=0.07:devel/p5-Module-Manifest \
+		p5-PPI>=1.213:textproc/p5-PPI \
+		p5-Module-Starter>=1.60:devel/p5-Module-Starter \
+		p5-Parse-ErrorString-Perl>=0.14:devel/p5-Parse-ErrorString-Perl \
+		p5-Parse-ExuberantCTags>=1.00:devel/p5-Parse-ExuberantCTags \
+		p5-Pod-Abstract>=0.16:textproc/p5-Pod-Abstract \
+		p5-Sort-Versions>=1.5:devel/p5-Sort-Versions \
+		p5-Test-Exception>=0.27:devel/p5-Test-Exception \
+		p5-Test-MockObject>=1.09:devel/p5-Test-MockObject \
+		p5-Test-NoWarnings>=0.084:devel/p5-Test-NoWarnings \
+		p5-Test-Script>=1.07:devel/p5-Test-Script \
+		p5-URI>0:net/p5-URI \
+		p5-Pod-POM>=0.17:textproc/p5-Pod-POM \
+		p5-POD2-Base>=0.043:textproc/p5-POD2-Base \
+		p5-PPIx-EditorTools>=0.13:textproc/p5-PPIx-EditorTools \
+		p5-PPIx-Regexp>=0.011:textproc/p5-PPIx-Regexp \
+		p5-Template-Tiny>=0.11:textproc/p5-Template-Tiny \
+		p5-Text-Diff>=1.41:textproc/p5-Text-Diff \
+		p5-Text-FindIndent>=0.10:textproc/p5-Text-FindIndent \
+		p5-Text-Patch>=1.8:textproc/p5-Text-Patch \
+		p5-YAML-Tiny>=1.32:textproc/p5-YAML-Tiny \
+		p5-HTML-Parser>=3.58:www/p5-HTML-Parser \
+		p5-libwww>=5.815:www/p5-libwww \
+		p5-Wx>=0.97:x11-toolkits/p5-Wx \
+		p5-Wx-Perl-ProcessStream>=0.25:x11-toolkits/p5-Wx-Perl-ProcessStream
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-Module-Build>=0.36:${PORTSDIR}/devel/p5-Module-Build
+BUILD_DEPENDS+=	p5-Module-Build>=0.36:devel/p5-Module-Build
 
 USES=		compiler:c++11-lib gettext perl5
 USE_PERL5=	configure
@@ -90,8 +90,8 @@ WXSC_DISTFILE=	${WXSC_DISTNAME}.tar.gz
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502100
-BUILD_DEPENDS+=	p5-CGI>0:${PORTSDIR}/www/p5-CGI
-RUN_DEPENDS+=	p5-CGI>0:${PORTSDIR}/www/p5-CGI
+BUILD_DEPENDS+=	p5-CGI>0:www/p5-CGI
+RUN_DEPENDS+=	p5-CGI>0:www/p5-CGI
 .endif
 
 .if exists(${PERL})
diff --git a/editors/p5-Proc-InvokeEditor/Makefile b/editors/p5-Proc-InvokeEditor/Makefile
index b77d5cc244f7..55eab09cbc20 100644
--- a/editors/p5-Proc-InvokeEditor/Makefile
+++ b/editors/p5-Proc-InvokeEditor/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension for starting a text editor
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Assert>=0:${PORTSDIR}/devel/p5-Carp-Assert
+BUILD_DEPENDS=	p5-Carp-Assert>=0:devel/p5-Carp-Assert
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/editors/p5-Vimana/Makefile b/editors/p5-Vimana/Makefile
index 64cff7b2010a..bd444be7a4bd 100644
--- a/editors/p5-Vimana/Makefile
+++ b/editors/p5-Vimana/Makefile
@@ -12,23 +12,23 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Vim script manager
 
-BUILD_DEPENDS=	vim:${PORTSDIR}/editors/vim
-RUN_DEPENDS=	vim:${PORTSDIR}/editors/vim \
-		p5-App-CLI>=0.08:${PORTSDIR}/devel/p5-App-CLI \
-		p5-Archive-Extract>=0.34:${PORTSDIR}/archivers/p5-Archive-Extract \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Digest-MD5>=2.39:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-Exporter-Lite>=0.2:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-File-Type>=0.22:${PORTSDIR}/devel/p5-File-Type \
-		p5-File-Path>=2.07:${PORTSDIR}/devel/p5-File-Path \
-		p5-File-Temp>=0.22:${PORTSDIR}/devel/p5-File-Temp \
-		p5-HTTP-Lite>=0:${PORTSDIR}/www/p5-HTTP-Lite \
-		p5-JSON-PP>=0:${PORTSDIR}/converters/p5-JSON-PP \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
-		p5-URI>=1.37:${PORTSDIR}/net/p5-URI \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=5.835:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	vim:editors/vim
+RUN_DEPENDS=	vim:editors/vim \
+		p5-App-CLI>=0.08:devel/p5-App-CLI \
+		p5-Archive-Extract>=0.34:archivers/p5-Archive-Extract \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Digest-MD5>=2.39:security/p5-Digest-MD5 \
+		p5-Exporter-Lite>=0.2:devel/p5-Exporter-Lite \
+		p5-File-Type>=0.22:devel/p5-File-Type \
+		p5-File-Path>=2.07:devel/p5-File-Path \
+		p5-File-Temp>=0.22:devel/p5-File-Temp \
+		p5-HTTP-Lite>=0:www/p5-HTTP-Lite \
+		p5-JSON-PP>=0:converters/p5-JSON-PP \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-PathTools>=0:devel/p5-PathTools \
+		p5-URI>=1.37:net/p5-URI \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-libwww>=5.835:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/editors/pluma/Makefile b/editors/pluma/Makefile
index d6b4a9e4ff6c..9ee75715b315 100644
--- a/editors/pluma/Makefile
+++ b/editors/pluma/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Small but powerful text editor for MATE Desktop Environment
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
+LIB_DEPENDS=	libenchant.so:textproc/enchant \
+		libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 862e51c55ede..1e360b92a5b7 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Gettext catalogs (.po files) editor
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		liblucene++.so:${PORTSDIR}/textproc/luceneplusplus
+BUILD_DEPENDS=	zip:archivers/zip
+LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell \
+		libboost_thread.so:devel/boost-libs \
+		liblucene++.so:textproc/luceneplusplus
 
 USES=		compiler:c++11-lib desktop-file-utils gettext gmake pkgconfig
 USE_WX=		3.0
diff --git a/editors/py-room/Makefile b/editors/py-room/Makefile
index 22c71deb9b94..e867ad002a19 100644
--- a/editors/py-room/Makefile
+++ b/editors/py-room/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	arundel@FreeBSD.org
 COMMENT=	PyRoom is a clone of WriteRoom and features "distraction-free writing"
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg
 
 USES=		gettext python
 USE_PYTHON=	distutils
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index 34cd1a8bacaa..7c706651364c 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	edit-${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Text editor for the ROX desktop
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
 
 USES=		python tar:bzip2
 
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index bda751434f37..70e0d19cc4c5 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME=	License for Scintilla and SciTE
 LICENSE_FILE=	${WRKSRC}/../License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libscintilla.so:${PORTSDIR}/x11-toolkits/scintilla
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index e64b3c163754..841d95399c80 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -58,8 +58,8 @@ DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
 PLIST=		${PKGDIR}/pkg-plist.emacs20
 .endif
 # depends on flim
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX}
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX}
+BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:editors/flim${DEPPORT_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:editors/flim${DEPPORT_SUFFIX}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
@@ -69,7 +69,7 @@ RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${D
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
-BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
+BUILD_DEPENDS+=	nkf:japanese/nkf
 .endif
 
 MAKEINFO=		makeinfo --no-split --no-validate
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index 1daac85af1f9..7d530b4872eb 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	${LICENSE:S/_/ /}
 LICENSE_TEXT=	The license: ${_LICENSE} (${_LICENSE_NAME}) is standard, please read from the web.
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	texinfo>=5.2:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS=	texinfo>=5.2:print/texinfo
 
 USES=		gmake
 USE_EMACS=	yes
diff --git a/editors/ssam/Makefile b/editors/ssam/Makefile
index 5dbcf0d9d8aa..c96d7a199ef9 100644
--- a/editors/ssam/Makefile
+++ b/editors/ssam/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Stream editor that uses the UTF routines with the sam(1) command set
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ure.h:${PORTSDIR}/misc/libutf
+BUILD_DEPENDS=	${LOCALBASE}/include/ure.h:misc/libutf
 
 GNU_CONFIGURE=	YES
 ALL_TARGET=	ssam
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index b60f0cba1d04..8bb5e11881b3 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -25,11 +25,11 @@ PORTDOCS=	*
 DESKTOP_ENTRIES="TEA" "" "${PREFIX}/share/pixmaps/tea_icon_v2.png" \
 		"${PORTNAME}" "" ""
 
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_QMAKE_ON=	USE_ASPELL=true
 ASPELL_QMAKE_OFF=	USE_ASPELL=false
 
-HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 HUNSPELL_QMAKE_ON=	USE_HUNSPELL=true
 HUNSPELL_QMAKE_OFF=	USE_HUNSPELL=false
 
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index f4d3bcf787c0..8d2a87eda4fc 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -15,11 +15,11 @@ COMMENT=	X11 based RTF editor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/gpl.txt
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpaper.so:${PORTSDIR}/print/libpaper
-RUN_DEPENDS=	gsfonts>0:${PORTSDIR}/print/gsfonts
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libpaper.so:print/libpaper
+RUN_DEPENDS=	gsfonts>0:print/gsfonts
 
 WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
 
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index 36c9f601c0c3..d3a3cb4feff9 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -14,8 +14,8 @@ COMMENT=	WYSIWYG scientific text editor
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
+LIB_DEPENDS=	libguile.so:lang/guile
+RUN_DEPENDS=	fig2dev:print/transfig
 
 USES=		cpe desktop-file-utils gmake iconv pkgconfig python \
 		shared-mime-info shebangfix
@@ -38,15 +38,15 @@ OPTIONS_DEFINE=	ASPELL FREETYPE GHOSTSCRIPT IMLIB2 PDF QT4 SQLITE
 OPTIONS_DEFAULT=ASPELL FREETYPE GHOSTSCRIPT IMLIB2 PDF QT4 SQLITE
 OPTIONS_SUB=	yes
 
-ASPELL_RUN_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
 FREETYPE_CONFIGURE_ENV_OFF=	FREETYPE_CFLAGS=" " FREETYPE_LDFLAGS=" " \
 				ac_cv_header_ft2build_h=no
 GHOSTSCRIPT_USES=	ghostscript:x11
 GHOSTSCRIPT_CONFIGURE_ON=	--with-gs=yes
 GHOSTSCRIPT_CONFIGURE_OFF=	--with-gs=no
-IMLIB2_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_CONFIGURE_WITH=	imlib2
 PDF_CONFIGURE_ENABLE=	pdf-renderer
 PDF_LDFLAGS=		-lz
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index fc7b69cf9a35..aebd2f8af7a8 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.xm1math.net/texmaker/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	LaTeX Development Environment
 
-LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS=	libpoppler.so:graphics/poppler
 
 USES=		desktop-file-utils ghostscript:x11,run pkgconfig qmake tar:bzip2
 _USE_QT4=	gui network xml webkit \
@@ -28,8 +28,8 @@ OPTIONS_DEFAULT=	QT5
 
 TOOLKIT_DESC=	Qt toolkit
 QT4_USE=	${_USE_QT4:S/^/QT4=/}
-QT4_LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+QT4_LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
 QT5_USE=	${_USE_QT5:S/^/QT5=/}
-QT5_LIB_DEPENDS=	libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5
+QT5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
 
 .include <bsd.port.mk>
diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile
index ef38de99ab62..b89a366ddbcd 100644
--- a/editors/texstudio/Makefile
+++ b/editors/texstudio/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
 MAINTAINER=	abiliojr@gmail.com
 COMMENT=	Integrated writing environment for LaTeX documents
 
-LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS=	libpoppler.so:graphics/poppler
 
 USES=		desktop-file-utils dos2unix execinfo ghostscript:run \
 		pkgconfig qmake
@@ -30,9 +30,9 @@ OPTIONS_DEFAULT=	QT5
 
 TOOLKIT_DESC=	Qt toolkit
 QT4_USE=	${_USE_QT4:S/^/QT4=/}
-QT4_LIB_DEPENDS=libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+QT4_LIB_DEPENDS=libpoppler-qt4.so:graphics/poppler-qt4
 QT5_USE=	${_USE_QT5:S/^/QT5=/}
-QT5_LIB_DEPENDS=libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5
+QT5_LIB_DEPENDS=libpoppler-qt5.so:graphics/poppler-qt5
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \
diff --git a/editors/textroom/Makefile b/editors/textroom/Makefile
index d0098166f082..1a20598257ba 100644
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Full screen text editor
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
-		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libhunspell-1.3.so:textproc/hunspell \
+		libxml++-2.6.so:textproc/libxml++26
 
 USES=		desktop-file-utils pkgconfig qmake
 USE_GL=		gl
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index 9961bb3ae09a..4e9b56df01b0 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple TeX front-end program
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	hunspell:${PORTSDIR}/textproc/hunspell
-LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+BUILD_DEPENDS=	hunspell:textproc/hunspell
+LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
 
 USES=		pkgconfig qmake
 USE_GITHUB=	yes
diff --git a/editors/the/Makefile b/editors/the/Makefile
index d730b73b3cf5..1d75a92f771d 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -31,27 +31,27 @@ BROKEN=		Does not configure on powerpc
 
 .if ${PORT_OPTIONS:MXAW3D}
 CONFIGURE_ARGS+=--with-xaw3d
-LIB_DEPENDS+=	libxaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS+=	libxaw3d.so:x11-toolkits/Xaw3d
 .endif
 
 .if ${PORT_OPTIONS:MXCURSES}
 CONFIGURE_ARGS+=--with-xcurses \
 		--with-cursesincdir=${LOCALBASE}/include \
 		--with-curseslibdir=${LOCALBASE}/lib
-BUILD_DEPENDS+=	pdcurses:${PORTSDIR}/devel/pdcurses
-LIB_DEPENDS+=	libxcurses.so:${PORTSDIR}/devel/pdcurses
+BUILD_DEPENDS+=	pdcurses:devel/pdcurses
+LIB_DEPENDS+=	libxcurses.so:devel/pdcurses
 PLIST_SUB=	XCURSES="" NCURSES="@comment "
 .else
 PLIST_SUB=	XCURSES="@comment " NCURSES=""
 .endif
 
 .if ${PORT_OPTIONS:MREXX_IMC}
-BUILD_DEPENDS+=	rexx:${PORTSDIR}/lang/rexx-imc
-RUN_DEPENDS+=	rexx:${PORTSDIR}/lang/rexx-imc
+BUILD_DEPENDS+=	rexx:lang/rexx-imc
+RUN_DEPENDS+=	rexx:lang/rexx-imc
 CONFIGURE_ARGS+=	--with-rexx=rexximc
 .else
-BUILD_DEPENDS+=	regina:${PORTSDIR}/lang/rexx-regina
-RUN_DEPENDS+=	regina:${PORTSDIR}/lang/rexx-regina
+BUILD_DEPENDS+=	regina:lang/rexx-regina
+RUN_DEPENDS+=	regina:lang/rexx-regina
 CONFIGURE_ARGS+=	--with-rexx=regina
 .endif
 
diff --git a/editors/tpad/Makefile b/editors/tpad/Makefile
index 8b2f917adb9d..a92256b742ca 100644
--- a/editors/tpad/Makefile
+++ b/editors/tpad/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF/tclpad/tclpad/${PORTVERSION} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Windows XP (TM) enhanced Notepad clone written in Tcl/Tk
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
 
 NO_BUILD=	yes
 
diff --git a/editors/vanubi/Makefile b/editors/vanubi/Makefile
index 96527590bcab..29b08026c8ae 100644
--- a/editors/vanubi/Makefile
+++ b/editors/vanubi/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Programming editor written in Vala
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 
 GH_TAGNAME=	eedac1d
 
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 36102ba226d2..0741ef72cd74 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -16,7 +16,7 @@ COMMENT=	VI Like Emacs -- console version
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	reflex:${PORTSDIR}/textproc/reflex
+BUILD_DEPENDS=	reflex:textproc/reflex
 
 USES=		ncurses pkgconfig shebangfix tar:tgz
 SHEBANG_FILES=	perl/vileget
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 0a8a6a72859d..ddf78af56ade 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -71,8 +71,8 @@ ATHENA_USE=		XORG=xaw
 CONSOLE_MAKE_ARGS=	CONF_OPT_GUI="--enable-gui=no --without-x"
 CONSOLE_PLIST_SUB=	GUI="@comment "
 CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
-CSCOPE_RUN_DEPENDS=	cscope:${PORTSDIR}/devel/cscope
-EXUBERANT_CTAGS_RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
+CSCOPE_RUN_DEPENDS=	cscope:devel/cscope
+EXUBERANT_CTAGS_RUN_DEPENDS=	exctags:devel/ctags
 GNOME_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt"
 GNOME_PLIST_SUB=	GUI=""
 GNOME_USE=		GNOME=libgnomeui XORG=glproto,xpm,xt
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 849614dbb4e4..4c5522a47812 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -13,12 +13,12 @@ COMMENT=	LaTeX editor based on BlueFish
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell \
-		libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	dos2unix:${PORTSDIR}/converters/unix2dos \
-		gv:${PORTSDIR}/print/gv \
-		tidy:${PORTSDIR}/www/tidy-lib \
-		xpdf:${PORTSDIR}/graphics/xpdf
+LIB_DEPENDS=	libaspell.so:textproc/aspell \
+		libpcre.so:devel/pcre
+RUN_DEPENDS=	dos2unix:converters/unix2dos \
+		gv:print/gv \
+		tidy:www/tidy-lib \
+		xpdf:graphics/xpdf
 
 CONFIGURE_ARGS=	--with-freedesktop_org-menu=${GNOME_LOCALSTATEDIR}/applications \
 		--with-icon-path=${GNOME_LOCALSTATEDIR}/pixmaps --disable-update-databases
diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile
index 605d3706171b..5667cc3caaf3 100644
--- a/editors/with-editor/Makefile
+++ b/editors/with-editor/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Use the Emacsclient as the $EDITOR of child processes
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	dash.el>0:${PORTSDIR}/devel/dash.el
-RUN_DEPENDS=	dash.el>0:${PORTSDIR}/devel/dash.el
+BUILD_DEPENDS=	dash.el>0:devel/dash.el
+RUN_DEPENDS=	dash.el>0:devel/dash.el
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
diff --git a/editors/wordgrinder/Makefile b/editors/wordgrinder/Makefile
index d96400684679..05808adf5235 100644
--- a/editors/wordgrinder/Makefile
+++ b/editors/wordgrinder/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	editors
 MAINTAINER=	vmagerya@gmail.com
 COMMENT=	Simple Unicode-aware console and X11-based word processor
 
-RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem
+RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	davidgiven
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 3a24fc9d0bca..510b843b4078 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Fast validating XML editor
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libaspell.so:${PORTSDIR}/textproc/aspell \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libxerces-c.so.3:textproc/xerces-c3 \
+		libxslt.so:textproc/libxslt \
+		libaspell.so:textproc/aspell \
+		libpcre.so:devel/pcre \
+		libxml2.so:textproc/libxml2 \
+		libexpat.so:textproc/expat2
 
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 965ba82e905f..16b57a2ada4a 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -17,7 +17,7 @@ COMMENT=	VI Like Emacs -- X11 version
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	reflex:${PORTSDIR}/textproc/reflex
+BUILD_DEPENDS=	reflex:textproc/reflex
 
 USES=		pkgconfig shebangfix tar:tgz
 SHEBANG_FILES=	macros/lxvile macros/lxvile-fonts perl/vileget
@@ -57,7 +57,7 @@ XAW_DESC=		X Athena Widgets
 XAW_USE=		XORG=xaw
 XAW_CONFIGURE_ON=	--with-screen=athena
 XAW3D_DESC=		X Athena Widgets with 3D effect
-XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 XAW3D_CONFIGURE_ON=	--enable-colored-menus \
 			--with-Xaw3d \
 			--with-screen=xaw3d
diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile
index 68686abdf6b4..11c3e0b8c612 100644
--- a/editors/yzis/Makefile
+++ b/editors/yzis/Makefile
@@ -39,8 +39,8 @@ NYZIS_DESC=	Build nyzis (ncurses frontend)
 NYZIS_CPPFLAGS=	-D_XOPEN_SOURCE_EXTENDED
 NYZIS_CMAKE_ON=	-DENABLE_NYZIS:BOOL=ON
 NYZIS_CMAKE_OFF=	-DENABLE_NYZIS:BOOL=OFF
-DOCS_BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-		doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	dot:graphics/graphviz \
+		doxygen:devel/doxygen
 DOCS_CMAKE_ON=	-DENABLE_DOCUMENTATION:BOOL=ON
 DOCS_CMAKE_OFF=	-DENABLE_DOCUMENTATION:BOOL=OFF
 
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 3c17913d6404..569fd3158167 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Small emacs-like text editor
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
-BUILD_DEPENDS=	${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man
+LIB_DEPENDS=	libgc.so:devel/boehm-gc
+BUILD_DEPENDS=	${LOCALBASE}/bin/help2man:misc/help2man
 
 USES=		gmake ncurses perl5 pkgconfig compiler:c++11-lang
 USE_PERL5=	build
diff --git a/emulators/advancemame/Makefile b/emulators/advancemame/Makefile
index 80f72d920378..10d2ab109841 100644
--- a/emulators/advancemame/Makefile
+++ b/emulators/advancemame/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SDL MAME port with advanced TV and monitor video support
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake ncurses
 USE_SDL=	sdl
@@ -33,12 +33,12 @@ OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT=	FREETYPE
 OPTIONS_DEFAULT_i386=	ASM
 
-ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+ASM_BUILD_DEPENDS=	nasm:devel/nasm
 ASM_USE=		gcc=any
 ASM_CONFIGURE_ENABLE=	asm
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
-SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_CONFIGURE_ENABLE=	slang
 SLANG_LDFLAGS=		-lncurses
 
diff --git a/emulators/advancemenu/Makefile b/emulators/advancemenu/Makefile
index 000ed501da3f..32b1503fd039 100644
--- a/emulators/advancemenu/Makefile
+++ b/emulators/advancemenu/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Frontend for AdvanceMAME, MAME, MESS, RAINE
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake
 USE_SDL=	sdl
@@ -30,10 +30,10 @@ OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT=	FREETYPE
 OPTIONS_DEFAULT_i386=	ASM
 
-ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+ASM_BUILD_DEPENDS=	nasm:devel/nasm
 ASM_USE=		gcc=any
 ASM_CONFIGURE_ENABLE=	asm
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/emulators/advancemess/Makefile b/emulators/advancemess/Makefile
index 5c3cedf8113c..dafa00d5feee 100644
--- a/emulators/advancemess/Makefile
+++ b/emulators/advancemess/Makefile
@@ -12,8 +12,8 @@ COMMENT=	SDL MESS port with advanced TV and monitor video support
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
-RUN_DEPENDS=	advancemame>=1.4:${PORTSDIR}/emulators/advancemame
+LIB_DEPENDS=	libexpat.so:textproc/expat2
+RUN_DEPENDS=	advancemame>=1.4:emulators/advancemame
 
 USES=		gmake ncurses
 USE_SDL=	sdl
@@ -36,12 +36,12 @@ OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT=	FREETYPE
 OPTIONS_DEFAULT_i386=	ASM
 
-ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+ASM_BUILD_DEPENDS=	nasm:devel/nasm
 ASM_USE=		gcc=any
 ASM_CONFIGURE_ENABLE=	asm
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
-SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_CONFIGURE_ENABLE=	slang
 SLANG_LDFLAGS=		-lncurses
 
diff --git a/emulators/aqemu/Makefile b/emulators/aqemu/Makefile
index 811480cf57a6..f3f287d0fdb8 100644
--- a/emulators/aqemu/Makefile
+++ b/emulators/aqemu/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S,.0$,,}/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt 4 based Qemu frontend
 
-LIB_DEPENDS=	libvncclient.so:${PORTSDIR}/net/libvncserver
+LIB_DEPENDS=	libvncclient.so:net/libvncserver
 
 USE_QT4=	gui network qtestlib xml linguisttools_build \
 		moc_build qmake_build rcc_build uic_build
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 4c0b182a2186..1e123181890d 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Atari 8-bit computer emulator
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	${UNZIP_CMD}:archivers/unzip
+LIB_DEPENDS=	libpng.so:graphics/png
 
 RESTRICTED=	xf25 contains copyright ROMs and cannot be distributed.
 
diff --git a/emulators/bfe/Makefile b/emulators/bfe/Makefile
index 1671380f8c9c..deebce177f58 100644
--- a/emulators/bfe/Makefile
+++ b/emulators/bfe/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-23jul2003
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 GUI for the bochs debugger (revision 2)
 
-RUN_DEPENDS=	bochs:${PORTSDIR}/emulators/bochs
+RUN_DEPENDS=	bochs:emulators/bochs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index f3360ebba788..3ac6f74d4fb2 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -119,7 +119,7 @@ SHOW_IPS_DESC=		Enable logging of measured IPS
 SHOW_IPS_CONFIGURE_ENABLE=	show-ips
 SMP_DESC=		Enable SMP simulation support (CPU level 6)
 SMP_CONFIGURE_ENABLE=	smp
-SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_WITH=	svga
 SVM_DESC=		Enable SVM (AMD: secure virtual machine) emulation
 SVM_CONFIGURE_ENABLE=	svm
@@ -135,7 +135,7 @@ USB_XHCI_DESC=		Enable experimental USB xHCI support
 USB_XHCI_CONFIGURE_ENABLE=	usb-xhci
 VMX_DESC=		Enable Virtialization extensions
 VNCSERVER_DESC= 		Use LibVNCServer (works with VNC viewer)
-VNCSERVER_LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver
+VNCSERVER_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VNCSERVER_CONFIGURE_WITH=	vncsrv
 VOODOO_DESC=		Enable 3dfx Voodoo Graphics emulation
 VOODOO_CONFIGURE_ENABLE=	voodoo
diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index e4b475b77694..4c97b3c66c59 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GUI for openMSX
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
-RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
+BUILD_DEPENDS=	openmsx:emulators/openmsx
+RUN_DEPENDS=	openmsx:emulators/openmsx
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
diff --git a/emulators/cpmtools2/Makefile b/emulators/cpmtools2/Makefile
index 4b1cc65b892f..2dd87e387cbe 100644
--- a/emulators/cpmtools2/Makefile
+++ b/emulators/cpmtools2/Makefile
@@ -23,7 +23,7 @@ LIBDSK_DESC=	Access to disks and disk images support
 
 LIBDSK_CONFIGURE_ON=	--with-libdsk=${LOCALBASE}
 LIBDSK_CONFIGURE_OFF=	--with-libdsk=''
-LIBDSK_LIB_DEPENDS=	libdsk.so:${PORTSDIR}/emulators/libdsk
+LIBDSK_LIB_DEPENDS=	libdsk.so:emulators/libdsk
 
 # remove unneeded getopt*.c
 # remove curses from all but fsed.cpm
diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile
index 99cae3d0410a..ffb0a37baf4b 100644
--- a/emulators/darcnes/Makefile
+++ b/emulators/darcnes/Makefile
@@ -42,7 +42,7 @@ PKGNAMESUFFIX=	-gtk
 .endif
 
 .if ${PORT_OPTIONS:MSVGALIB}
-LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvga.so:graphics/svgalib
 MAKE_ARGS+=	TARGET=Linux_svgalib
 PKGNAMESUFFIX=	-svgalib
 .endif
diff --git a/emulators/dboxfe/Makefile b/emulators/dboxfe/Makefile
index ed5a0a6ad96c..a099e9c95209 100644
--- a/emulators/dboxfe/Makefile
+++ b/emulators/dboxfe/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt4 based configuration manager for DOSBox
 
-RUN_DEPENDS=	dosbox:${PORTSDIR}/emulators/dosbox
+RUN_DEPENDS=	dosbox:emulators/dosbox
 
 USE_QT4=	gui network xml uic_build moc_build qmake_build rcc_build
 USES=		qmake tar:bzip2
diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile
index cceba39162bf..3f92cd675c59 100644
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Nintendo DS emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libSoundTouch.so:${PORTSDIR}/audio/soundtouch
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libSoundTouch.so:audio/soundtouch
 
 USE_GL=		gl
 USE_SDL=	sdl
diff --git a/emulators/dgen-sdl/Makefile b/emulators/dgen-sdl/Makefile
index 128938702202..a46a3005b3a2 100644
--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	bin/dgen \
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:devel/nasm
 .else
 CONFIGURE_ARGS+=	--disable-asm
 .endif
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index da89c9a989df..6f828adfec75 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -15,12 +15,12 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 # Notes on dependencies:
 # - keep enet from externals as Dolphin's version diverges
 # - xxhash and SOIL are not (yet) in ports
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libSoundTouch.so:${PORTSDIR}/audio/soundtouch \
-		libmbedtls.so.9:${PORTSDIR}/security/polarssl13 \
-		libsfml-system.so:${PORTSDIR}/devel/sfml
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		liblzo2.so:archivers/lzo2 \
+		libpng.so:graphics/png \
+		libSoundTouch.so:audio/soundtouch \
+		libmbedtls.so.9:security/polarssl13 \
+		libsfml-system.so:devel/sfml
 
 USE_GITHUB=	yes
 GH_PROJECT=	dolphin
@@ -54,24 +54,24 @@ CMAKE_ARGS+=	-DDOLPHIN_WC_BRANCH:STRING="stable" \
 OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP NLS
 OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP NLS
 OPTIONS_SUB=	yes
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DDISABLE_PULSEAUDIO:BOOL=OFF
 PULSEAUDIO_CMAKE_OFF=	-DDISABLE_PULSEAUDIO:BOOL=ON
 PORTAUDIO_DESC=	Enable PortAudio (mic) support
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_ON=	-DDISABLE_PORTAUDIO:BOOL=OFF
 PORTAUDIO_CMAKE_OFF=	-DDISABLE_PORTAUDIO:BOOL=ON
 DEBUG_MAKE_ENV=	VERBOSE=yes
 DEBUG_CMAKE_ON=	-DFASTLOG:BOOL=ON
 DEBUG_CMAKE_OFF=	-DFASTLOG:BOOL=OFF
 FRAMEDUMPS_DESC=	Encode framedumps in AVI format
-FRAMEDUMPS_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-			libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-			libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
-			libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+FRAMEDUMPS_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+			libavformat.so:multimedia/ffmpeg \
+			libswscale.so:multimedia/ffmpeg \
+			libavutil.so:multimedia/ffmpeg
 FRAMEDUMPS_CMAKE_ON=	-DENCODE_FRAMEDUMPS:BOOL=ON
 FRAMEDUMPS_CMAKE_OFF=	-DENCODE_FRAMEDUMPS:BOOL=OFF
-UPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CMAKE_ON=	-DUSE_UPNP:BOOL=ON
 UPNP_CMAKE_OFF=	-DUSE_UPNP:BOOL=OFF
 NLS_USES=	gettext
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index a0182c7bd186..2918139bd924 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Emulator of a PC with DOS
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl net sound
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index 7356ca40f897..84ca66957550 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Text-based front end for Dynamips development version
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>=4.4.0:${PORTSDIR}/devel/py-configobj \
-		dynamips:${PORTSDIR}/emulators/dynamips-community
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>=4.4.0:devel/py-configobj \
+		dynamips:emulators/dynamips-community
 
 PLIST_FILES=	bin/dynagen "@sample etc/dynagen.ini.sample"
 
diff --git a/emulators/dynagui/Makefile b/emulators/dynagui/Makefile
index 68e262f10726..5d834cf21ee8 100644
--- a/emulators/dynagui/Makefile
+++ b/emulators/dynagui/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	dynagui
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI frontend to the dynamips router simulator
 
-BUILD_DEPENDS=	dynagen:${PORTSDIR}/emulators/dynagen
+BUILD_DEPENDS=	dynagen:emulators/dynagen
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/emulators/dynamips-community/Makefile b/emulators/dynamips-community/Makefile
index 5e75b0c3c027..d2d8d4e8ed85 100644
--- a/emulators/dynamips-community/Makefile
+++ b/emulators/dynamips-community/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Cisco 1700/2600/3600/3700/7200 Simulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libelf.so:${PORTSDIR}/devel/libelf \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libelf.so:devel/libelf \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 CFLAGS+=	-I${PREFIX}/include/libelf
 
diff --git a/emulators/dynamips-devel/Makefile b/emulators/dynamips-devel/Makefile
index fad4f2415704..9c11015607a7 100644
--- a/emulators/dynamips-devel/Makefile
+++ b/emulators/dynamips-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Cisco 1700/2600/3600/3700/7200 Simulator
 LICENSE=	GPLv2
 
 BROKEN=		Does not fetch
-LIB_DEPENDS=	libelf.so.0:${PORTSDIR}/devel/libelf
+LIB_DEPENDS=	libelf.so.0:devel/libelf
 
 CONFLICTS=	dynamips-[0-9]* dynamips-community-[0-9]*
 
diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile
index 8d7425ddcc8f..04a52a8873cb 100644
--- a/emulators/dynamips/Makefile
+++ b/emulators/dynamips/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Cisco 3600/7200 Simulator
 
 BROKEN=		Does not fetch
 
-LIB_DEPENDS=	libelf.so:${PORTSDIR}/devel/libelf
+LIB_DEPENDS=	libelf.so:devel/libelf
 
 USES=		gmake
 ALL_TARGET=	${PORTNAME} nvram_export
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index 59e300fb23d2..b7a5be2ed8c1 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Portable NES/Famicom emulator based on Bero's original FCE
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
+RUN_DEPENDS=	zenity:x11/zenity
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -42,7 +42,7 @@ GTK3_USE=		GNOME=gtk30
 GTK3_MAKE_ARGS=		GTK3=1
 GTK3_MAKE_ARGS_OFF=	GTK3=0
 LOGO_DESC=		Enable a logoscreen when creating avis
-LOGO_LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LOGO_LIB_DEPENDS=	libgd.so:graphics/gd
 LOGO_MAKE_ARGS=		LOGO=1
 LOGO_MAKE_ARG_OFF=	LOGO=0
 LUA_USES=		lua:51
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 414bd1ad456b..55b8bdd1a768 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	FrodoV4_1b.Src
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Emulates a Commodore 64
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
 
 USE_XORG=	x11 xt xext sm ice
 ALL_TARGET=	Frodo
diff --git a/emulators/fs-uae/Makefile b/emulators/fs-uae/Makefile
index 1fa4f8bcbc3b..bef88c96afaa 100644
--- a/emulators/fs-uae/Makefile
+++ b/emulators/fs-uae/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Amiga emulator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libopenal.so:${PORTSDIR}/audio/openal-soft
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libopenal.so:audio/openal-soft
 
 USES=		gettext gmake pkgconfig
 USE_SDL=	sdl
diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index d14a8e3d1ef9..0bf51c767b3f 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig
 
-LIB_DEPENDS=	libspectrum.so:${PORTSDIR}/emulators/libspectrum
+LIB_DEPENDS=	libspectrum.so:emulators/libspectrum
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libspectrum-prefix=${LOCALBASE} \
 		--with-local-prefix=${LOCALBASE}
@@ -28,10 +28,10 @@ AUDIOTOOLS_DESC=	Build audio <-> tape utilities
 OPTIONS_SUB=	yes
 
 AUDIOTOOLS_CONFIGURE_WITH=	audiofile
-AUDIOTOOLS_LIB_DEPENDS=		libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+AUDIOTOOLS_LIB_DEPENDS=		libaudiofile.so:audio/libaudiofile
 
 # FIXME no way to specify ffmpeg1 paths to configure script
-#FFMPEG_LIB_DEPENDS=	libavformat1.so:${PORTSDIR}/multimedia/ffmpeg1
+#FFMPEG_LIB_DEPENDS=	libavformat1.so:multimedia/ffmpeg1
 #FFMPEG_CONFIGURE_WITH=	ffmpeg
 
 post-install:
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 5d0c78fc45ab..53f6565151ba 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Free Unix (Sinclair ZX-)Spectrum Emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libspectrum.so:${PORTSDIR}/emulators/libspectrum \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libspectrum.so:emulators/libspectrum \
+		libpng.so:graphics/png \
+		libgcrypt.so:security/libgcrypt
 
 GNU_CONFIGURE=	yes
 USES=		gmake localbase pkgconfig
@@ -31,7 +31,7 @@ OPTIONS_SINGLE_UI=	GTK2 GTK3 SDL SVGALIB
 
 OPTIONS_SUB=		yes
 AO_CONFIGURE_WITH=	libao
-AO_LIB_DEPENDS=		libao.so:${PORTSDIR}/audio/libao
+AO_LIB_DEPENDS=		libao.so:audio/libao
 ICONS_USES=		desktop-file-utils shared-mime-info
 ICONS_CONFIGURE_ENABLE=	desktop-integration
 GTK2_USE=		GNOME=gtk20
@@ -42,10 +42,10 @@ GTK3_CONFIGURE_ENABLE=	gtk3
 SDL_USE=		SDL=sdl
 SDL_CONFIGURE_WITH=	sdl
 SDL_CONFIGURE_ON=	--without-gtk
-SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_WITH=	svgalib
 SVGALIB_CONFIGURE_ON=	--without-gtk
-ROMS_RUN_DEPENDS=	fuse-roms>0:${PORTSDIR}/emulators/fuse-roms
+ROMS_RUN_DEPENDS=	fuse-roms>0:emulators/fuse-roms
 
 PORTDOCS=	AUTHORS ChangeLog README THANKS README.copyright
 
diff --git a/emulators/gem5/Makefile b/emulators/gem5/Makefile
index 762e8df9e614..2449879fd3e8 100644
--- a/emulators/gem5/Makefile
+++ b/emulators/gem5/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	emulators
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	gem5 Simulator System
 
-BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20 \
-		scons:${PORTSDIR}/devel/scons
+BUILD_DEPENDS=	swig2.0:devel/swig20 \
+		scons:devel/scons
 
 BROKEN_i386=	does not build
 
diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile
index 1e8f3c02de7d..1bb49bb34079 100644
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFINE_i386=	RAZE
 
 OPTIMIZED_CFLAGS_CONFIGURE_OFF=	--without-gcc
 RAZE_DESC=		Use RAZE z80 emulation
-RAZE_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+RAZE_BUILD_DEPENDS=	nasm:devel/nasm
 RAZE_CONFIGURE_ON=	--with-raze
 SDL_DESC=		Use SDL for audio
 SDL_CONFIGURE_ON=	--with-sdl-audio
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index f07b98b95adc..16fedf81b38d 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -32,7 +32,7 @@ OPTIONS_DEFINE_i386=	RAZE
 OPTIMIZED_CFLAGS_CONFIGURE_ON=	--with-gcc=3
 OPTIMIZED_CFLAGS_CONFIGURE_OFF=	--without-gcc
 RAZE_DESC=		Use RAZE z80 emulation
-RAZE_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+RAZE_BUILD_DEPENDS=	nasm:devel/nasm
 RAZE_CONFIGURE_ON=	--with-raze
 SDL_DESC=		Use SDL for audio
 SDL_CONFIGURE_ON=	--with-sdl-audio
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index 27c9c2154611..01c779a2bfe7 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Sega Genesis/CD/32X emulator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	uses i386 assembly code
diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile
index 0eefac1fab36..9a686f5114bb 100644
--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@@ -34,7 +34,7 @@ STAR_DESC=	Use Starscream as 68k emulator (broken)
 
 .if ${PORT_OPTIONS:MI386ASM} || ${PORT_OPTIONS:MRAZE} || \
     ${PORT_OPTIONS:MSTAR}
-BUILD_DEPENDS+=		nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=		nasm:devel/nasm
 .endif
 
 .if ${PORT_OPTIONS:MI386ASM}
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index 17ab227a78c8..3e2279e016a7 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Graphical Cisco network simulator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
-		dynamips:${PORTSDIR}/emulators/dynamips-community \
-		dynagen:${PORTSDIR}/emulators/dynagen \
-		xdotool:${PORTSDIR}/x11/xdotool
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
+		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \
+		dynamips:emulators/dynamips-community \
+		dynagen:emulators/dynagen \
+		xdotool:x11/xdotool
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-legacy-GNS3-${PORTVERSION}
 
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index daa4b5cac1e7..fd1a7cc74c5d 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Nintendo GameBoy emulator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS=	libvga.so:graphics/svgalib
 
 USES=		autoreconf compiler
 USE_SDL=	sdl
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 818e04eea6c5..1f255e978afe 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Atari ST emulator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/gpl.txt
 
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libportaudio.so:audio/portaudio \
+		libpng.so:graphics/png
 
 USES=		cmake desktop-file-utils python readline shared-mime-info \
 		shebangfix tar:bzip2
diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile
index 909685ab9fa7..fd05695e21b2 100644
--- a/emulators/higan/Makefile
+++ b/emulators/higan/Makefile
@@ -68,7 +68,7 @@ XSHM_VARS=	VIDEO_DRIVER+=video.xshm
 XV_USE=		XORG=xv
 XV_VARS=	VIDEO_DRIVER+=video.xv
 
-AO_LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+AO_LIB_DEPENDS=	libao.so:audio/libao
 AO_VARS=	AUDIO_DRIVER+=audio.ao
 
 OPENAL_USES=	openal:al
@@ -76,7 +76,7 @@ OPENAL_VARS=	AUDIO_DRIVER+=audio.openal
 
 OSS_VARS=	AUDIO_DRIVER+=audio.oss
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	AUDIO_DRIVER+=audio.pulseaudio
 
 INPUT_SDL_USE=	SDL=sdl
diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile
index 45090584331e..1979dd298d1a 100644
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PC Engine (TurboGrafx 16) emulator
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone
+LIB_DEPENDS=	libargp.so:devel/argp-standalone
 
 OPTIONS_DEFINE=	GTK2 DOCS NETPLAY SDL_MIXER
 OPTIONS_DEFAULT=GTK2
@@ -50,7 +50,7 @@ CONFIGURE_ENV+=	ac_cv_lib_SDL_net_main=no
 .endif
 
 .if ${PORT_OPTIONS:MSDL_MIXER}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 USE_SDL+=	mixer
 CFLAGS+=	-DOGG_SUPPORT
 .else
diff --git a/emulators/i386-wine-devel/Makefile.i386 b/emulators/i386-wine-devel/Makefile.i386
index e3f47aef7bb0..ef74ed7ed09a 100644
--- a/emulators/i386-wine-devel/Makefile.i386
+++ b/emulators/i386-wine-devel/Makefile.i386
@@ -12,7 +12,7 @@ MASTERDIR=	${SLAVEDIR}/../wine-devel
 PKGINSTALL=	${SLAVEDIR}/files/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
 
-RUN_DEPENDS=	dri>0:${PORTSDIR}/graphics/dri
+RUN_DEPENDS=	dri>0:graphics/dri
 
 CONFLICTS_INSTALL?=	wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \
 			i386-wine-[0-9]* i386-wine-staging-[0-9]*
diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index 38d078127d0d..92284108647d 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -42,8 +42,8 @@ USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
 USES=		tar:xz
 BUNDLE_LIBS=	yes
 
-GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.44-x86.msi:${PORTSDIR}/emulators/wine-gecko-devel
-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.6.0.msi:${PORTSDIR}/emulators/wine-mono-devel
+GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.44-x86.msi:emulators/wine-gecko-devel
+MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.6.0.msi:emulators/wine-mono-devel
 
 # Included for OPSYS and OSVERSION
 .include <bsd.port.pre.mk>
diff --git a/emulators/i386-wine/Makefile.i386 b/emulators/i386-wine/Makefile.i386
index 57e8f39338b0..b8106a656ab8 100644
--- a/emulators/i386-wine/Makefile.i386
+++ b/emulators/i386-wine/Makefile.i386
@@ -12,7 +12,7 @@ MASTERDIR=	${SLAVEDIR}/../wine
 PKGINSTALL=	${SLAVEDIR}/files/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
 
-RUN_DEPENDS=	dri>0:${PORTSDIR}/graphics/dri
+RUN_DEPENDS=	dri>0:graphics/dri
 
 CONFLICTS_INSTALL?=	wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \
 			i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
diff --git a/emulators/i386-wine/Makefile.inc b/emulators/i386-wine/Makefile.inc
index ef1bc3463027..2c29baed3b37 100644
--- a/emulators/i386-wine/Makefile.inc
+++ b/emulators/i386-wine/Makefile.inc
@@ -41,8 +41,8 @@ USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
 USES=		tar:xz
 BUNDLE_LIBS=	yes
 
-GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.40-x86.msi:${PORTSDIR}/emulators/wine-gecko
-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.6.msi:${PORTSDIR}/emulators/wine-mono
+GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.40-x86.msi:emulators/wine-gecko
+MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.6.msi:emulators/wine-mono
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile
index 0f5b6c37212e..9453fc18ea29 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nintendo Entertainment System emlator for X
 
-LIB_DEPENDS=	libc.so.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS=	libc.so.5:misc/compat5x
 
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	is an i386 binary
diff --git a/emulators/javatari/Makefile b/emulators/javatari/Makefile
index e4eb4478ecdd..160aab135abb 100644
--- a/emulators/javatari/Makefile
+++ b/emulators/javatari/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Multiplayer Atari 2600 emulator written in pure Java
 
 LICENSE=	AGPLv3
 
-EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/emulators/kcemu/Makefile b/emulators/kcemu/Makefile
index bd1a91979a5d..7b6674b152ad 100644
--- a/emulators/kcemu/Makefile
+++ b/emulators/kcemu/Makefile
@@ -11,16 +11,16 @@ DISTNAME=	KCemu-${PORTVERSION}
 MAINTAINER=	hardy.schumacher@gmx.de
 COMMENT=	KC85 emulator
 
-BUILD_DEPENDS=	pngtopnm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile \
-		libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-		libdirac_encoder.so:${PORTSDIR}/multimedia/dirac \
-		libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libvncserver.so:${PORTSDIR}/net/libvncserver \
-		libxvidcore.so:${PORTSDIR}/multimedia/xvid \
-		libz80ex.so:${PORTSDIR}/devel/z80ex
+BUILD_DEPENDS=	pngtopnm:graphics/netpbm
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile \
+		libavformat.so:multimedia/ffmpeg \
+		libdirac_encoder.so:multimedia/dirac \
+		libschroedinger-1.0.so:multimedia/schroedinger \
+		libsndfile.so:audio/libsndfile \
+		libtheora.so:multimedia/libtheora \
+		libvncserver.so:net/libvncserver \
+		libxvidcore.so:multimedia/xvid \
+		libz80ex.so:devel/z80ex
 
 GNU_CONFIGURE=	yes
 USE_XORG=	xmu
diff --git a/emulators/lib765/Makefile b/emulators/lib765/Makefile
index 856c4a28e51f..998782e24e17 100644
--- a/emulators/lib765/Makefile
+++ b/emulators/lib765/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFAULT=	LIBDSK
 LIBDSK_DESC=	Include LibDSK support (recommended)
 LIBDSK_CONFIGURE_ON=	--with-libdsk --with-libdsk-path=${LOCALBASE}
 LIBDSK_CONFIGURE_OFF=	--without-libdsk
-LIBDSK_LIB_DEPENDS=	libdsk.so:${PORTSDIR}/emulators/libdsk
+LIBDSK_LIB_DEPENDS=	libdsk.so:emulators/libdsk
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib765.so
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index 81d788b2533a..7f95678c927d 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Handling of ZX-Spectrum emulator files formats
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
@@ -22,7 +22,7 @@ USES=		gmake pkgconfig libtool
 OPTIONS_DEFINE=	AUDIOFILE DOCS
 AUDIOFILE_DESC=	Support loading from .wav files
 
-AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 AUDIOFILE_CONFIGURE_OFF=	--without-libaudiofile
 
 INSTALL_TARGET=	install-strip
diff --git a/emulators/linux-c6/Makefile b/emulators/linux-c6/Makefile
index b81e3145dfe4..c4af03a4812f 100644
--- a/emulators/linux-c6/Makefile
+++ b/emulators/linux-c6/Makefile
@@ -15,79 +15,79 @@ USE_LINUX=	c6
 
 # non-base
 
-RUN_DEPENDS+=	linux-${USE_LINUX}-libasyncns>0:${PORTSDIR}/dns/linux-c6-libasyncns \
-		linux-${USE_LINUX}-tk85>0:${PORTSDIR}/x11-toolkits/linux-c6-tk85 \
-		linux-${USE_LINUX}-gtk2>0:${PORTSDIR}/x11-toolkits/linux-c6-gtk2 \
-		linux-${USE_LINUX}-hicolor-icon-theme>0:${PORTSDIR}/x11-themes/linux-c6-hicolor-icon-theme \
-		linux-${USE_LINUX}-qt47-x11>0:${PORTSDIR}/x11-toolkits/linux-c6-qt47-x11 \
-		linux-${USE_LINUX}-pango>0:${PORTSDIR}/x11-toolkits/linux-c6-pango \
-		linux-${USE_LINUX}-openmotif>0:${PORTSDIR}/x11-toolkits/linux-c6-openmotif \
-		linux-${USE_LINUX}-atk>0:${PORTSDIR}/accessibility/linux-c6-atk \
-		linux-${USE_LINUX}-sqlite>0:${PORTSDIR}/databases/linux-c6-sqlite3 \
-		linux-${USE_LINUX}-tcl85>0:${PORTSDIR}/lang/linux-c6-tcl85 \
-		linux-${USE_LINUX}-nspr>0:${PORTSDIR}/devel/linux-c6-nspr \
-		linux-${USE_LINUX}-libsigc++20>0:${PORTSDIR}/devel/linux-c6-libsigc++20 \
-		linux-${USE_LINUX}-sdl>0:${PORTSDIR}/devel/linux-c6-sdl12 \
-		linux-${USE_LINUX}-libpciaccess>0:${PORTSDIR}/devel/linux-c6-libpciaccess \
-		linux-${USE_LINUX}-libglade2>0:${PORTSDIR}/devel/linux-c6-libglade2 \
-		linux-${USE_LINUX}-devtools>0:${PORTSDIR}/devel/linux-c6-devtools \
-		linux-${USE_LINUX}-dbus-libs>0:${PORTSDIR}/devel/linux-c6-dbus-libs \
-		linux-${USE_LINUX}-qt47>0:${PORTSDIR}/devel/linux-c6-qt47 \
-		linux-${USE_LINUX}-dbus-glib>0:${PORTSDIR}/devel/linux-c6-dbus-glib \
-		linux-${USE_LINUX}-ncurses-base>0:${PORTSDIR}/devel/linux-c6-ncurses-base \
-		linux-${USE_LINUX}-xorg-libs>0:${PORTSDIR}/x11/linux-c6-xorg-libs \
-		linux-${USE_LINUX}-fontconfig>0:${PORTSDIR}/x11-fonts/linux-c6-fontconfig \
-		linux-${USE_LINUX}-cups-libs>0:${PORTSDIR}/print/linux-c6-cups-libs \
-		linux-${USE_LINUX}-flac>0:${PORTSDIR}/audio/linux-c6-flac \
-		linux-${USE_LINUX}-alsa-utils>0:${PORTSDIR}/audio/linux-c6-alsa-utils \
-		linux-${USE_LINUX}-alsa-lib>0:${PORTSDIR}/audio/linux-c6-alsa-lib \
-		linux-${USE_LINUX}-libaudiofile>0:${PORTSDIR}/audio/linux-c6-libaudiofile \
-		linux-${USE_LINUX}-esound>0:${PORTSDIR}/audio/linux-c6-esound \
-		linux-${USE_LINUX}-alsa-plugins-oss>0:${PORTSDIR}/audio/linux-c6-alsa-plugins-oss \
-		linux-${USE_LINUX}-sdl_mixer>0:${PORTSDIR}/audio/linux-c6-sdl_mixer \
-		linux-${USE_LINUX}-alsa-plugins-pulseaudio>0:${PORTSDIR}/audio/linux-c6-alsa-plugins-pulseaudio \
-		linux-${USE_LINUX}-libsndfile>0:${PORTSDIR}/audio/linux-c6-libsndfile \
-		linux-${USE_LINUX}-libogg>0:${PORTSDIR}/audio/linux-c6-libogg \
-		linux-${USE_LINUX}-arts>0:${PORTSDIR}/audio/linux-c6-arts \
-		linux-${USE_LINUX}-pulseaudio-utils>0:${PORTSDIR}/audio/linux-c6-pulseaudio-utils \
-		linux-${USE_LINUX}-pulseaudio-libs>0:${PORTSDIR}/audio/linux-c6-pulseaudio-libs \
-		linux-${USE_LINUX}-mikmod>0:${PORTSDIR}/audio/linux-c6-mikmod \
-		linux-${USE_LINUX}-openal-soft>0:${PORTSDIR}/audio/linux-c6-openal-soft \
-		linux-${USE_LINUX}-libvorbis>0:${PORTSDIR}/audio/linux-c6-libvorbis \
-		linux-${USE_LINUX}-nas-libs>0:${PORTSDIR}/audio/linux-c6-nas-libs \
-		linux-${USE_LINUX}-libtheora>0:${PORTSDIR}/multimedia/linux-c6-libtheora \
-		linux-${USE_LINUX}-libv4l>0:${PORTSDIR}/multimedia/linux-c6-libv4l \
-		linux-${USE_LINUX}-qt47-webkit>0:${PORTSDIR}/www/linux-c6-qt47-webkit \
-		linux-${USE_LINUX}-flashplugin>0:${PORTSDIR}/www/linux-c6-flashplugin11 \
-		linux-${USE_LINUX}-cyrus-sasl2>0:${PORTSDIR}/security/linux-c6-cyrus-sasl2 \
-		linux-${USE_LINUX}-libssh2>0:${PORTSDIR}/security/linux-c6-libssh2 \
-		linux-${USE_LINUX}-openssl-compat>0:${PORTSDIR}/security/linux-c6-openssl-compat \
-		linux-${USE_LINUX}-openssl>0:${PORTSDIR}/security/linux-c6-openssl \
-		linux-${USE_LINUX}-gnutls>0:${PORTSDIR}/security/linux-c6-gnutls \
-		linux-${USE_LINUX}-libgcrypt>0:${PORTSDIR}/security/linux-c6-libgcrypt \
-		linux-${USE_LINUX}-nss>0:${PORTSDIR}/security/linux-c6-nss \
-		linux-${USE_LINUX}-libtasn1>0:${PORTSDIR}/security/linux-c6-libtasn1 \
-		linux-${USE_LINUX}-libgpg-error>0:${PORTSDIR}/security/linux-c6-libgpg-error \
-		linux-${USE_LINUX}-curl>0:${PORTSDIR}/ftp/linux-c6-curl \
-		linux-${USE_LINUX}-tcp_wrappers-libs>0:${PORTSDIR}/net/linux-c6-tcp_wrappers-libs \
-		linux-${USE_LINUX}-openldap>0:${PORTSDIR}/net/linux-c6-openldap \
-		linux-${USE_LINUX}-avahi-libs>0:${PORTSDIR}/net/linux-c6-avahi-libs \
-		linux-${USE_LINUX}-expat>0:${PORTSDIR}/textproc/linux-c6-expat \
-		linux-${USE_LINUX}-aspell>0:${PORTSDIR}/textproc/linux-c6-aspell \
-		linux-${USE_LINUX}-libxml2>0:${PORTSDIR}/textproc/linux-c6-libxml2 \
-		linux-${USE_LINUX}-sdl_image>0:${PORTSDIR}/graphics/linux-c6-sdl_image \
-		linux-${USE_LINUX}-sdl_ttf>0:${PORTSDIR}/graphics/linux-c6-sdl_ttf \
-		linux-${USE_LINUX}-png>0:${PORTSDIR}/graphics/linux-c6-png \
-		linux-${USE_LINUX}-tiff>0:${PORTSDIR}/graphics/linux-c6-tiff \
-		linux-${USE_LINUX}-jpeg>0:${PORTSDIR}/graphics/linux-c6-jpeg \
-		linux-${USE_LINUX}-glx-utils>0:${PORTSDIR}/graphics/linux-c6-glx-utils \
-		linux-${USE_LINUX}-gdk-pixbuf2>0:${PORTSDIR}/graphics/linux-c6-gdk-pixbuf2 \
-		linux-${USE_LINUX}-cairo>0:${PORTSDIR}/graphics/linux-c6-cairo
+RUN_DEPENDS+=	linux-${USE_LINUX}-libasyncns>0:dns/linux-c6-libasyncns \
+		linux-${USE_LINUX}-tk85>0:x11-toolkits/linux-c6-tk85 \
+		linux-${USE_LINUX}-gtk2>0:x11-toolkits/linux-c6-gtk2 \
+		linux-${USE_LINUX}-hicolor-icon-theme>0:x11-themes/linux-c6-hicolor-icon-theme \
+		linux-${USE_LINUX}-qt47-x11>0:x11-toolkits/linux-c6-qt47-x11 \
+		linux-${USE_LINUX}-pango>0:x11-toolkits/linux-c6-pango \
+		linux-${USE_LINUX}-openmotif>0:x11-toolkits/linux-c6-openmotif \
+		linux-${USE_LINUX}-atk>0:accessibility/linux-c6-atk \
+		linux-${USE_LINUX}-sqlite>0:databases/linux-c6-sqlite3 \
+		linux-${USE_LINUX}-tcl85>0:lang/linux-c6-tcl85 \
+		linux-${USE_LINUX}-nspr>0:devel/linux-c6-nspr \
+		linux-${USE_LINUX}-libsigc++20>0:devel/linux-c6-libsigc++20 \
+		linux-${USE_LINUX}-sdl>0:devel/linux-c6-sdl12 \
+		linux-${USE_LINUX}-libpciaccess>0:devel/linux-c6-libpciaccess \
+		linux-${USE_LINUX}-libglade2>0:devel/linux-c6-libglade2 \
+		linux-${USE_LINUX}-devtools>0:devel/linux-c6-devtools \
+		linux-${USE_LINUX}-dbus-libs>0:devel/linux-c6-dbus-libs \
+		linux-${USE_LINUX}-qt47>0:devel/linux-c6-qt47 \
+		linux-${USE_LINUX}-dbus-glib>0:devel/linux-c6-dbus-glib \
+		linux-${USE_LINUX}-ncurses-base>0:devel/linux-c6-ncurses-base \
+		linux-${USE_LINUX}-xorg-libs>0:x11/linux-c6-xorg-libs \
+		linux-${USE_LINUX}-fontconfig>0:x11-fonts/linux-c6-fontconfig \
+		linux-${USE_LINUX}-cups-libs>0:print/linux-c6-cups-libs \
+		linux-${USE_LINUX}-flac>0:audio/linux-c6-flac \
+		linux-${USE_LINUX}-alsa-utils>0:audio/linux-c6-alsa-utils \
+		linux-${USE_LINUX}-alsa-lib>0:audio/linux-c6-alsa-lib \
+		linux-${USE_LINUX}-libaudiofile>0:audio/linux-c6-libaudiofile \
+		linux-${USE_LINUX}-esound>0:audio/linux-c6-esound \
+		linux-${USE_LINUX}-alsa-plugins-oss>0:audio/linux-c6-alsa-plugins-oss \
+		linux-${USE_LINUX}-sdl_mixer>0:audio/linux-c6-sdl_mixer \
+		linux-${USE_LINUX}-alsa-plugins-pulseaudio>0:audio/linux-c6-alsa-plugins-pulseaudio \
+		linux-${USE_LINUX}-libsndfile>0:audio/linux-c6-libsndfile \
+		linux-${USE_LINUX}-libogg>0:audio/linux-c6-libogg \
+		linux-${USE_LINUX}-arts>0:audio/linux-c6-arts \
+		linux-${USE_LINUX}-pulseaudio-utils>0:audio/linux-c6-pulseaudio-utils \
+		linux-${USE_LINUX}-pulseaudio-libs>0:audio/linux-c6-pulseaudio-libs \
+		linux-${USE_LINUX}-mikmod>0:audio/linux-c6-mikmod \
+		linux-${USE_LINUX}-openal-soft>0:audio/linux-c6-openal-soft \
+		linux-${USE_LINUX}-libvorbis>0:audio/linux-c6-libvorbis \
+		linux-${USE_LINUX}-nas-libs>0:audio/linux-c6-nas-libs \
+		linux-${USE_LINUX}-libtheora>0:multimedia/linux-c6-libtheora \
+		linux-${USE_LINUX}-libv4l>0:multimedia/linux-c6-libv4l \
+		linux-${USE_LINUX}-qt47-webkit>0:www/linux-c6-qt47-webkit \
+		linux-${USE_LINUX}-flashplugin>0:www/linux-c6-flashplugin11 \
+		linux-${USE_LINUX}-cyrus-sasl2>0:security/linux-c6-cyrus-sasl2 \
+		linux-${USE_LINUX}-libssh2>0:security/linux-c6-libssh2 \
+		linux-${USE_LINUX}-openssl-compat>0:security/linux-c6-openssl-compat \
+		linux-${USE_LINUX}-openssl>0:security/linux-c6-openssl \
+		linux-${USE_LINUX}-gnutls>0:security/linux-c6-gnutls \
+		linux-${USE_LINUX}-libgcrypt>0:security/linux-c6-libgcrypt \
+		linux-${USE_LINUX}-nss>0:security/linux-c6-nss \
+		linux-${USE_LINUX}-libtasn1>0:security/linux-c6-libtasn1 \
+		linux-${USE_LINUX}-libgpg-error>0:security/linux-c6-libgpg-error \
+		linux-${USE_LINUX}-curl>0:ftp/linux-c6-curl \
+		linux-${USE_LINUX}-tcp_wrappers-libs>0:net/linux-c6-tcp_wrappers-libs \
+		linux-${USE_LINUX}-openldap>0:net/linux-c6-openldap \
+		linux-${USE_LINUX}-avahi-libs>0:net/linux-c6-avahi-libs \
+		linux-${USE_LINUX}-expat>0:textproc/linux-c6-expat \
+		linux-${USE_LINUX}-aspell>0:textproc/linux-c6-aspell \
+		linux-${USE_LINUX}-libxml2>0:textproc/linux-c6-libxml2 \
+		linux-${USE_LINUX}-sdl_image>0:graphics/linux-c6-sdl_image \
+		linux-${USE_LINUX}-sdl_ttf>0:graphics/linux-c6-sdl_ttf \
+		linux-${USE_LINUX}-png>0:graphics/linux-c6-png \
+		linux-${USE_LINUX}-tiff>0:graphics/linux-c6-tiff \
+		linux-${USE_LINUX}-jpeg>0:graphics/linux-c6-jpeg \
+		linux-${USE_LINUX}-glx-utils>0:graphics/linux-c6-glx-utils \
+		linux-${USE_LINUX}-gdk-pixbuf2>0:graphics/linux-c6-gdk-pixbuf2 \
+		linux-${USE_LINUX}-cairo>0:graphics/linux-c6-cairo
 
 OPTIONS_DEFINE=	NVIDIA_GL
 
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-			linux-${USE_LINUX}-libGLU>0:${PORTSDIR}/graphics/linux-c6-libGLU
-NVIDIA_GL_RUN_DEPENDS_OFF=	linux-${USE_LINUX}-dri>0:${PORTSDIR}/graphics/linux-c6-dri
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver \
+			linux-${USE_LINUX}-libGLU>0:graphics/linux-c6-libGLU
+NVIDIA_GL_RUN_DEPENDS_OFF=	linux-${USE_LINUX}-dri>0:graphics/linux-c6-dri
 
 .include <bsd.port.mk>
diff --git a/emulators/linux-f10/Makefile b/emulators/linux-f10/Makefile
index 2a5a383d67dc..0eefa795d165 100644
--- a/emulators/linux-f10/Makefile
+++ b/emulators/linux-f10/Makefile
@@ -15,84 +15,84 @@ USE_LINUX=	f10
 
 # non-base
 
-RUN_DEPENDS+=	linux-f10-libasyncns>0:${PORTSDIR}/dns/linux-f10-libasyncns \
-		linux-f10-gtk2>0:${PORTSDIR}/x11-toolkits/linux-f10-gtk2 \
-		linux-f10-tk85>0:${PORTSDIR}/x11-toolkits/linux-f10-tk85 \
-		linux-f10-qt45>0:${PORTSDIR}/x11-toolkits/linux-f10-qt45 \
-		linux-f10-openmotif>0:${PORTSDIR}/x11-toolkits/linux-f10-openmotif \
-		linux-f10-pango>0:${PORTSDIR}/x11-toolkits/linux-f10-pango \
-		linux-f10-blt>0:${PORTSDIR}/x11-toolkits/linux-f10-blt \
-		linux-f10-atk>0:${PORTSDIR}/accessibility/linux-f10-atk \
-		linux-f10-sqlite3>0:${PORTSDIR}/databases/linux-f10-sqlite3 \
-		linux-f10-procps>0:${PORTSDIR}/sysutils/linux-f10-procps \
-		linux-f10-tcl85>0:${PORTSDIR}/lang/linux-f10-tcl85 \
-		linux-f10-libg2c>0:${PORTSDIR}/lang/linux-f10-libg2c \
-		linux-f10-sdl>0:${PORTSDIR}/devel/linux-f10-sdl12 \
-		linux-f10-libglade2>0:${PORTSDIR}/devel/linux-f10-libglade2 \
-		linux-f10-allegro>0:${PORTSDIR}/devel/linux-f10-allegro \
-		linux-f10-devtools>0:${PORTSDIR}/devel/linux-f10-devtools \
-		linux-f10-dbus-libs>0:${PORTSDIR}/devel/linux-f10-dbus-libs \
-		linux-f10-nspr>0:${PORTSDIR}/devel/linux-f10-nspr \
-		linux-f10-dbus-glib>0:${PORTSDIR}/devel/linux-f10-dbus-glib \
-		linux-f10-libsigc++20>0:${PORTSDIR}/devel/linux-f10-libsigc++20 \
-		linux-f10-ncurses-base>0:${PORTSDIR}/devel/linux-f10-ncurses-base \
-		linux_base-f10>0:${PORTSDIR}/emulators/linux_base-f10 \
-		linux-f10-xorg-libs>0:${PORTSDIR}/x11/linux-f10-xorg-libs \
-		linux-f10-fontconfig>0:${PORTSDIR}/x11-fonts/linux-f10-fontconfig \
-		linux-f10-cups-libs>0:${PORTSDIR}/print/linux-f10-cups-libs \
-		linux-f10-nas-libs>0:${PORTSDIR}/audio/linux-f10-nas-libs \
-		linux-f10-openal-soft>0:${PORTSDIR}/audio/linux-f10-openal-soft \
-		linux-f10-esound>0:${PORTSDIR}/audio/linux-f10-esound \
-		linux-f10-sdl_mixer>0:${PORTSDIR}/audio/linux-f10-sdl_mixer \
-		linux-f10-pulseaudio-libs>0:${PORTSDIR}/audio/linux-f10-pulseaudio-libs \
-		linux-f10-libogg>0:${PORTSDIR}/audio/linux-f10-libogg \
-		linux-f10-libvorbis>0:${PORTSDIR}/audio/linux-f10-libvorbis \
-		linux-f10-freealut>0:${PORTSDIR}/audio/linux-f10-freealut \
-		linux-f10-arts>0:${PORTSDIR}/audio/linux-f10-arts \
-		linux-f10-mikmod>0:${PORTSDIR}/audio/linux-f10-mikmod \
-		linux-f10-openal>0:${PORTSDIR}/audio/linux-f10-openal \
-		linux-f10-alsa-plugins-oss>0:${PORTSDIR}/audio/linux-f10-alsa-plugins-oss \
-		linux-f10-libaudiofile>0:${PORTSDIR}/audio/linux-f10-libaudiofile \
-		linux-f10-alsa-lib>0:${PORTSDIR}/audio/linux-f10-alsa-lib \
-		linux-f10-libv4l>0:${PORTSDIR}/multimedia/linux-f10-libv4l \
-		linux-f10-libtheora>0:${PORTSDIR}/multimedia/linux-f10-libtheora \
-		linux-f10-flashplugin>0:${PORTSDIR}/www/linux-f10-flashplugin11 \
-		linux-f10-nss>0:${PORTSDIR}/security/linux-f10-nss \
-		linux-f10-libtasn1>0:${PORTSDIR}/security/linux-f10-libtasn1 \
-		linux-f10-libgcrypt>0:${PORTSDIR}/security/linux-f10-libgcrypt \
-		linux-f10-libgpg-error>0:${PORTSDIR}/security/linux-f10-libgpg-error \
-		linux-f10-cyrus-sasl2>0:${PORTSDIR}/security/linux-f10-cyrus-sasl2 \
-		linux-f10-gnutls>0:${PORTSDIR}/security/linux-f10-gnutls \
-		linux-f10-openssl>0:${PORTSDIR}/security/linux-f10-openssl \
-		linux-f10-libssh2>0:${PORTSDIR}/security/linux-f10-libssh2 \
-		linux-f10-hicolor-icon-theme>0:${PORTSDIR}/x11-themes/linux-f10-hicolor-icon-theme \
-		linux-f10-qtcurve-gtk2>0:${PORTSDIR}/x11-themes/linux-f10-qtcurve-gtk2 \
-		linux-f10-curl>0:${PORTSDIR}/ftp/linux-f10-curl \
-		linux-f10-nss_ldap>0:${PORTSDIR}/net/linux-f10-nss_ldap \
-		linux-f10-openldap>0:${PORTSDIR}/net/linux-f10-openldap \
-		linux-f10-expat>0:${PORTSDIR}/textproc/linux-f10-expat \
-		linux-f10-libxml2>0:${PORTSDIR}/textproc/linux-f10-libxml2 \
-		linux-f10-scim-libs>0:${PORTSDIR}/textproc/linux-f10-scim-libs \
-		linux-f10-aspell>0:${PORTSDIR}/textproc/linux-f10-aspell \
-		linux-f10-scim-gtk>0:${PORTSDIR}/textproc/linux-f10-scim-gtk \
-		linux-f10-ucl>0:${PORTSDIR}/archivers/linux-f10-ucl \
-		linux-f10-upx>0:${PORTSDIR}/archivers/linux-f10-upx \
-		linux-f10-gdk-pixbuf>0:${PORTSDIR}/graphics/linux-f10-gdk-pixbuf \
-		linux-f10-png>0:${PORTSDIR}/graphics/linux-f10-png \
-		linux-f10-sdl_ttf>0:${PORTSDIR}/graphics/linux-f10-sdl_ttf \
-		linux-f10-jpeg>0:${PORTSDIR}/graphics/linux-f10-jpeg \
-		linux-f10-tiff>0:${PORTSDIR}/graphics/linux-f10-tiff \
-		linux-f10-imlib>0:${PORTSDIR}/graphics/linux-f10-imlib \
-		linux-f10-ungif>0:${PORTSDIR}/graphics/linux-f10-ungif \
-		linux-f10-libmng>0:${PORTSDIR}/graphics/linux-f10-libmng \
-		linux-f10-sdl_image>0:${PORTSDIR}/graphics/linux-f10-sdl_image \
-		linux-f10-glew>0:${PORTSDIR}/graphics/linux-f10-glew \
-		linux-f10-cairo>0:${PORTSDIR}/graphics/linux-f10-cairo
+RUN_DEPENDS+=	linux-f10-libasyncns>0:dns/linux-f10-libasyncns \
+		linux-f10-gtk2>0:x11-toolkits/linux-f10-gtk2 \
+		linux-f10-tk85>0:x11-toolkits/linux-f10-tk85 \
+		linux-f10-qt45>0:x11-toolkits/linux-f10-qt45 \
+		linux-f10-openmotif>0:x11-toolkits/linux-f10-openmotif \
+		linux-f10-pango>0:x11-toolkits/linux-f10-pango \
+		linux-f10-blt>0:x11-toolkits/linux-f10-blt \
+		linux-f10-atk>0:accessibility/linux-f10-atk \
+		linux-f10-sqlite3>0:databases/linux-f10-sqlite3 \
+		linux-f10-procps>0:sysutils/linux-f10-procps \
+		linux-f10-tcl85>0:lang/linux-f10-tcl85 \
+		linux-f10-libg2c>0:lang/linux-f10-libg2c \
+		linux-f10-sdl>0:devel/linux-f10-sdl12 \
+		linux-f10-libglade2>0:devel/linux-f10-libglade2 \
+		linux-f10-allegro>0:devel/linux-f10-allegro \
+		linux-f10-devtools>0:devel/linux-f10-devtools \
+		linux-f10-dbus-libs>0:devel/linux-f10-dbus-libs \
+		linux-f10-nspr>0:devel/linux-f10-nspr \
+		linux-f10-dbus-glib>0:devel/linux-f10-dbus-glib \
+		linux-f10-libsigc++20>0:devel/linux-f10-libsigc++20 \
+		linux-f10-ncurses-base>0:devel/linux-f10-ncurses-base \
+		linux_base-f10>0:emulators/linux_base-f10 \
+		linux-f10-xorg-libs>0:x11/linux-f10-xorg-libs \
+		linux-f10-fontconfig>0:x11-fonts/linux-f10-fontconfig \
+		linux-f10-cups-libs>0:print/linux-f10-cups-libs \
+		linux-f10-nas-libs>0:audio/linux-f10-nas-libs \
+		linux-f10-openal-soft>0:audio/linux-f10-openal-soft \
+		linux-f10-esound>0:audio/linux-f10-esound \
+		linux-f10-sdl_mixer>0:audio/linux-f10-sdl_mixer \
+		linux-f10-pulseaudio-libs>0:audio/linux-f10-pulseaudio-libs \
+		linux-f10-libogg>0:audio/linux-f10-libogg \
+		linux-f10-libvorbis>0:audio/linux-f10-libvorbis \
+		linux-f10-freealut>0:audio/linux-f10-freealut \
+		linux-f10-arts>0:audio/linux-f10-arts \
+		linux-f10-mikmod>0:audio/linux-f10-mikmod \
+		linux-f10-openal>0:audio/linux-f10-openal \
+		linux-f10-alsa-plugins-oss>0:audio/linux-f10-alsa-plugins-oss \
+		linux-f10-libaudiofile>0:audio/linux-f10-libaudiofile \
+		linux-f10-alsa-lib>0:audio/linux-f10-alsa-lib \
+		linux-f10-libv4l>0:multimedia/linux-f10-libv4l \
+		linux-f10-libtheora>0:multimedia/linux-f10-libtheora \
+		linux-f10-flashplugin>0:www/linux-f10-flashplugin11 \
+		linux-f10-nss>0:security/linux-f10-nss \
+		linux-f10-libtasn1>0:security/linux-f10-libtasn1 \
+		linux-f10-libgcrypt>0:security/linux-f10-libgcrypt \
+		linux-f10-libgpg-error>0:security/linux-f10-libgpg-error \
+		linux-f10-cyrus-sasl2>0:security/linux-f10-cyrus-sasl2 \
+		linux-f10-gnutls>0:security/linux-f10-gnutls \
+		linux-f10-openssl>0:security/linux-f10-openssl \
+		linux-f10-libssh2>0:security/linux-f10-libssh2 \
+		linux-f10-hicolor-icon-theme>0:x11-themes/linux-f10-hicolor-icon-theme \
+		linux-f10-qtcurve-gtk2>0:x11-themes/linux-f10-qtcurve-gtk2 \
+		linux-f10-curl>0:ftp/linux-f10-curl \
+		linux-f10-nss_ldap>0:net/linux-f10-nss_ldap \
+		linux-f10-openldap>0:net/linux-f10-openldap \
+		linux-f10-expat>0:textproc/linux-f10-expat \
+		linux-f10-libxml2>0:textproc/linux-f10-libxml2 \
+		linux-f10-scim-libs>0:textproc/linux-f10-scim-libs \
+		linux-f10-aspell>0:textproc/linux-f10-aspell \
+		linux-f10-scim-gtk>0:textproc/linux-f10-scim-gtk \
+		linux-f10-ucl>0:archivers/linux-f10-ucl \
+		linux-f10-upx>0:archivers/linux-f10-upx \
+		linux-f10-gdk-pixbuf>0:graphics/linux-f10-gdk-pixbuf \
+		linux-f10-png>0:graphics/linux-f10-png \
+		linux-f10-sdl_ttf>0:graphics/linux-f10-sdl_ttf \
+		linux-f10-jpeg>0:graphics/linux-f10-jpeg \
+		linux-f10-tiff>0:graphics/linux-f10-tiff \
+		linux-f10-imlib>0:graphics/linux-f10-imlib \
+		linux-f10-ungif>0:graphics/linux-f10-ungif \
+		linux-f10-libmng>0:graphics/linux-f10-libmng \
+		linux-f10-sdl_image>0:graphics/linux-f10-sdl_image \
+		linux-f10-glew>0:graphics/linux-f10-glew \
+		linux-f10-cairo>0:graphics/linux-f10-cairo
 # don't pull in graphics/linux-f10-libGLU -- conflicts with graphics/linux-f10-dri
 
 OPTIONS_DEFINE=	NVIDIA_GL
 
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-NVIDIA_GL_RUN_DEPENDS_OFF=	linux-f10-dri>0:${PORTSDIR}/graphics/linux-f10-dri
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
+NVIDIA_GL_RUN_DEPENDS_OFF=	linux-f10-dri>0:graphics/linux-f10-dri
 
 .include <bsd.port.mk>
diff --git a/emulators/lisaem/Makefile b/emulators/lisaem/Makefile
index 06caef8b9eb0..8c0c3cce225d 100644
--- a/emulators/lisaem/Makefile
+++ b/emulators/lisaem/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://lisaem.sunder.net/downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apple Lisa 2 Emulator
 
-BUILD_DEPENDS=	pngtopnm:${PORTSDIR}/graphics/netpbm
+BUILD_DEPENDS=	pngtopnm:graphics/netpbm
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/emulators/loemu/Makefile b/emulators/loemu/Makefile
index d0b54087845e..efc47579fb7d 100644
--- a/emulators/loemu/Makefile
+++ b/emulators/loemu/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Simple frontend for various game emulators
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 \
+		${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
+		${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt
 
 USES=		gettext python shebangfix
 USE_PYTHON=	distutils
@@ -27,9 +27,9 @@ OPTIONS_DEFAULT=	MAME SNES9X
 MAME_DESC=		Install mame emulator
 SNES9X_DESC=		Install snes9x emulator
 ZSNES_DESC=		Install zsnes emulator
-MAME_RUN_DEPENDS=	mame>=0.154:${PORTSDIR}/emulators/mame
-SNES9X_RUN_DEPENDS=	snes9x:${PORTSDIR}/emulators/snes9x
-ZSNES_RUN_DEPENDS=	zsnes:${PORTSDIR}/emulators/zsnes
+MAME_RUN_DEPENDS=	mame>=0.154:emulators/mame
+SNES9X_RUN_DEPENDS=	snes9x:emulators/snes9x
+ZSNES_RUN_DEPENDS=	zsnes:emulators/zsnes
 
 .include <bsd.port.options.mk>
 
diff --git a/emulators/m2000/Makefile b/emulators/m2000/Makefile
index 8f61de2f91f4..f8faeca57c55 100644
--- a/emulators/m2000/Makefile
+++ b/emulators/m2000/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	${PORTNAME:tu}${EXTRACT_SUFX}
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Portable emulator for the Philips P2000 home computer
 
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=${UNZIP_CMD}:archivers/unzip
 
 M2000TAPES=	3DDoolhof2.cas		\
 		BrickWall.cas		\
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 34d355c67af0..3de7ef1aef0c 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	emulators
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Multi Arcade Machine Emulator
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
+RUN_DEPENDS=	liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf
 
 NOT_FOR_ARCHS=	ia64 powerpc sparc64
 
diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile
index 2281d9dcc51c..e1c2645aaa8b 100644
--- a/emulators/mastergear/Makefile
+++ b/emulators/mastergear/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SEGA Master System and Game Gear emulator for X
 
-LIB_DEPENDS=	libc.so.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS=	libc.so.5:misc/compat5x
 
 NO_WRKSUBDIR=	yes
 ONLY_FOR_ARCHS=	i386
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index 067b2f9acb19..826b395cedb0 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Portable multi-system emulator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
+		libsndfile.so:audio/libsndfile \
+		libvorbis.so:audio/libvorbis
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl net
@@ -55,7 +55,7 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=nls
 
-JACK_LIB_DEPENDS=libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=jack
 
 GB_CONFIGURE_ENABLE=gb
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index 8782b36bdce8..4ffcb2c7b9f1 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -10,19 +10,19 @@ EXTRACT_AFTER_ARGS?=	"${DISTNAME}/source/${PORTNAME}-core/*" \
 				"${DISTNAME}/source/${PORTNAME}${PKGNAMESUFFIX}/*"
 
 .if ${PKGNAMESUFFIX} == "-core"
-LIB_DEPENDS+=		libfreetype.so:${PORTSDIR}/print/freetype2 \
-			libpng.so:${PORTSDIR}/graphics/png \
-			libminizip.so:${PORTSDIR}/archivers/minizip
+LIB_DEPENDS+=		libfreetype.so:print/freetype2 \
+			libpng.so:graphics/png \
+			libminizip.so:archivers/minizip
 .else
 PLIST=			${WRKDIR}/pkg-plist
 .endif
 
 .if ${PKGNAMESUFFIX} == "-video-rice"
-LIB_DEPENDS+=		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=		libpng.so:graphics/png
 .endif
 
 .if ${PKGNAMESUFFIX} == "-video-glide64mk"
-LIB_DEPENDS+=		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS+=		libboost_thread.so:devel/boost-libs
 .endif
 
 .if ${PKGNAMESUFFIX} != "-core"
diff --git a/emulators/mupen64plus-plugins/Makefile b/emulators/mupen64plus-plugins/Makefile
index 604e2fb94b41..8eec94ef77a7 100644
--- a/emulators/mupen64plus-plugins/Makefile
+++ b/emulators/mupen64plus-plugins/Makefile
@@ -22,7 +22,7 @@ RSP_CXD4_DESC=	cxd4 RSP plugin
 OPTIONS_DEFAULT=	VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64 RSP_CXD4
 
 .for OPT in ${OPTIONS_DEFINE}
-${OPT}_RUN_DEPENDS=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-${OPT:tl:S/_/-/}.so:${PORTSDIR}/emulators/mupen64plus-${OPT:tl:S/_/-/}
+${OPT}_RUN_DEPENDS=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-${OPT:tl:S/_/-/}.so:emulators/mupen64plus-${OPT:tl:S/_/-/}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/emulators/mupen64plus-rsp-cxd4/Makefile b/emulators/mupen64plus-rsp-cxd4/Makefile
index 7cca343516d5..9abdbb13476b 100644
--- a/emulators/mupen64plus-rsp-cxd4/Makefile
+++ b/emulators/mupen64plus-rsp-cxd4/Makefile
@@ -6,7 +6,7 @@ DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Low-level RSP processor plugin for the Mupen64Plus
 
-LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
 USE_GL=		#
 USE_SDL=	#
diff --git a/emulators/mupen64plus-rsp-z64/Makefile b/emulators/mupen64plus-rsp-z64/Makefile
index 4dccf21640ad..71c8a7315ac3 100644
--- a/emulators/mupen64plus-rsp-z64/Makefile
+++ b/emulators/mupen64plus-rsp-z64/Makefile
@@ -6,7 +6,7 @@ DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Low-level RSP processor plugin for the Mupen64Plus
 
-LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
 USE_GL=		#
 USE_SDL=	#
diff --git a/emulators/mupen64plus-video-arachnoid/Makefile b/emulators/mupen64plus-video-arachnoid/Makefile
index fdacb4d1787e..2efa658c6564 100644
--- a/emulators/mupen64plus-video-arachnoid/Makefile
+++ b/emulators/mupen64plus-video-arachnoid/Makefile
@@ -6,7 +6,7 @@ DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	The arachnoid video plugin for Mupen64plus
 
-LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
 USE_GL=		gl glu
 USE_SDL=	#
diff --git a/emulators/mupen64plus-video-glide64/Makefile b/emulators/mupen64plus-video-glide64/Makefile
index 23fa2f438970..7427c9c0f3d9 100644
--- a/emulators/mupen64plus-video-glide64/Makefile
+++ b/emulators/mupen64plus-video-glide64/Makefile
@@ -7,7 +7,7 @@ DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Glide64 video plugin for Mupen64Plus
 
-LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
 USE_GL=		gl
 USE_SDL=	sdl2
diff --git a/emulators/mupen64plus-video-glide64mk2/Makefile b/emulators/mupen64plus-video-glide64mk2/Makefile
index 720d60ad2cac..718b4d713a88 100644
--- a/emulators/mupen64plus-video-glide64mk2/Makefile
+++ b/emulators/mupen64plus-video-glide64mk2/Makefile
@@ -6,8 +6,8 @@ PKGNAMESUFFIX=	-video-glide64mk2
 
 COMMENT=	Glide64mk2 video plugin for Mupen64Plus
 
-LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core \
+		libboost_thread.so:devel/boost-libs
 
 BROKEN_FreeBSD_9=	does not build
 
diff --git a/emulators/mupen64plus-video-z64/Makefile b/emulators/mupen64plus-video-z64/Makefile
index 09125943d6a8..e0148d33d7e7 100644
--- a/emulators/mupen64plus-video-z64/Makefile
+++ b/emulators/mupen64plus-video-z64/Makefile
@@ -7,7 +7,7 @@ DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Low-level RDP plugin for the Mupen64Plus
 
-LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
 USE_GL=		gl glu glew
 USE_SDL=	sdl2
diff --git a/emulators/mupen64plus/Makefile b/emulators/mupen64plus/Makefile
index f8a8bc20741d..d3ab64de375a 100644
--- a/emulators/mupen64plus/Makefile
+++ b/emulators/mupen64plus/Makefile
@@ -10,21 +10,21 @@ MAINTAINER?=	acm@FreeBSD.org
 COMMENT=	Fork of Mupen64 Nintendo 64 emulator with plugins (meta port)
 
 # Mupen64 Emulator core and ui-console
-RUN_DEPENDS+=	${LOCALBASE}/lib/libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
-RUN_DEPENDS+=	mupen64plus:${PORTSDIR}/emulators/mupen64plus-ui-console
+RUN_DEPENDS+=	${LOCALBASE}/lib/libmupen64plus.so.2:emulators/mupen64plus-core
+RUN_DEPENDS+=	mupen64plus:emulators/mupen64plus-ui-console
 
 # Audio plugins
-RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-audio-sdl.so:${PORTSDIR}/emulators/mupen64plus-audio-sdl
+RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-audio-sdl.so:emulators/mupen64plus-audio-sdl
 
 # Input plugins
-RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-input-sdl.so:${PORTSDIR}/emulators/mupen64plus-input-sdl
+RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-input-sdl.so:emulators/mupen64plus-input-sdl
 
 # Graphics plugins
-RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-rice.so:${PORTSDIR}/emulators/mupen64plus-video-rice
-RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-glide64mk2.so:${PORTSDIR}/emulators/mupen64plus-video-glide64mk2
+RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-rice.so:emulators/mupen64plus-video-rice
+RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-glide64mk2.so:emulators/mupen64plus-video-glide64mk2
 
 # RSP plugins
-RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-rsp-hle.so:${PORTSDIR}/emulators/mupen64plus-rsp-hle
+RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-rsp-hle.so:emulators/mupen64plus-rsp-hle
 
 USES=		metaport
 
diff --git a/emulators/nestopia/Makefile b/emulators/nestopia/Makefile
index 71e30918343e..f4e55839eeba 100644
--- a/emulators/nestopia/Makefile
+++ b/emulators/nestopia/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Portable NES/Famicom emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:audio/libao
 
 USES=		gmake libarchive pkgconfig
 USE_GL=		glu
diff --git a/emulators/nonpareil/Makefile b/emulators/nonpareil/Makefile
index 7b4e52581950..25e217c152dc 100644
--- a/emulators/nonpareil/Makefile
+++ b/emulators/nonpareil/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simulator for many HP calculators
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		bison pkgconfig scons
 USE_GNOME=	gtk20 libxml2
diff --git a/emulators/o2em/Makefile b/emulators/o2em/Makefile
index 7f7c653f6330..a4bb1c182022 100644
--- a/emulators/o2em/Makefile
+++ b/emulators/o2em/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	o2em117src.zip:1 \
 MAINTAINER=	techgunter@yahoo.com
 COMMENT=	Odyssey2 / Videopac console emulator
 
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS=	liballeg.so:devel/allegro
 
 WRKSRC=		${WRKDIR}/o2em117src
 MAKEFILE=	Makefile.freebsd
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 4bee759f2f44..74f55766a06b 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -31,14 +31,14 @@ X11_LDFLAGS=		-L${LOCALBASE}/lib
 X11_USE=		xorg=x11,ice,sm,xext,xineramaproto,xinerama,xrandr,xrender,xtst \
 			gnome=gtk20,gtkmm24
 X11_USES=		fuse
-LIBNOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIBNOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 UNITY_CONFIGURE_ENV=	CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
-UNITY_LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
+UNITY_LIB_DEPENDS=	liburiparser.so:net/uriparser
 UNITY_CONFIGURE_ENABLE=	unity
 DNET_CONFIGURE_WITH=	dnet
-DNET_LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
+DNET_LIB_DEPENDS=	libdnet.so:net/libdnet
 ICU_CONFIGURE_WITH=	icu
-ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 
 WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 GNU_CONFIGURE=		yes
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 4060ff351d27..ae6b8450cd47 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Open source MSX emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libtheora.so:multimedia/libtheora \
+		libao.so:audio/libao
 
 MAKEFILE=	GNUmakefile
 USES=		gmake python tcl
diff --git a/emulators/p5-Acme-6502/Makefile b/emulators/p5-Acme-6502/Makefile
index ec75af12b18a..7f5bd5bbc455 100644
--- a/emulators/p5-Acme-6502/Makefile
+++ b/emulators/p5-Acme-6502/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pure Perl 65C02 simulator
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Term-ReadKey>=2.30:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-Term-ReadKey>=2.30:devel/p5-Term-ReadKey
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index a04a9b8b3a8f..a16b9744e54e 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	pcemu1.01alpha
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	8086 PC emulator, by David Hedley
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
+RUN_DEPENDS=	mkfontdir:x11-fonts/mkfontdir \
+		mkfontscale:x11-fonts/mkfontscale
 
 USE_XORG=	x11 xext
 MAKE_ENV=	FILESDIR=${FILESDIR} STAGEDIR=${STAGEDIR}
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index 1ad333a6fe8f..ba4c16b835d1 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Playstation (PSX) emulator
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libcdio.so:${PORTSDIR}/sysutils/libcdio
+BUILD_DEPENDS=	gawk:lang/gawk
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libcdio.so:sysutils/libcdio
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/emulators/pipelight/Makefile b/emulators/pipelight/Makefile
index ec1cd69e7d51..74c1bc2eee84 100644
--- a/emulators/pipelight/Makefile
+++ b/emulators/pipelight/Makefile
@@ -17,15 +17,15 @@ COMMENT=	Wrapper for using windows plugins in web browsers
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/gpg2:${PORTSDIR}/security/gnupg \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
-		${LOCALBASE}/bin/zenity:${PORTSDIR}/x11/zenity \
-		${LOCALBASE}/bin/cabextract:${PORTSDIR}/archivers/cabextract \
-		${LOCALBASE}/bin/flock:${PORTSDIR}/sysutils/flock \
-		${LOCALBASE}/bin/gpg2:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS=	${LOCALBASE}/bin/gpg2:security/gnupg \
+		${LOCALBASE}/bin/bash:shells/bash
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
+		${LOCALBASE}/bin/wget:ftp/wget \
+		${LOCALBASE}/bin/zenity:x11/zenity \
+		${LOCALBASE}/bin/cabextract:archivers/cabextract \
+		${LOCALBASE}/bin/flock:sysutils/flock \
+		${LOCALBASE}/bin/gpg2:security/gnupg
 
 WRKSRC=		${WRKDIR}/mmueller2012-pipelight-792e7a4885a6
 USE_GCC=	yes
@@ -48,11 +48,11 @@ SUB_FILES=	pipelight-mkufs
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/wine-staging
-RUN_DEPENDS+=	${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/wine-staging
+BUILD_DEPENDS+=	${LOCALBASE}/bin/wine:emulators/wine-staging
+RUN_DEPENDS+=	${LOCALBASE}/bin/wine:emulators/wine-staging
 .elif ${ARCH} == "amd64"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/i386-wine-staging
-RUN_DEPENDS+=	${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/i386-wine-staging
+BUILD_DEPENDS+=	${LOCALBASE}/bin/wine:emulators/i386-wine-staging
+RUN_DEPENDS+=	${LOCALBASE}/bin/wine:emulators/i386-wine-staging
 .endif
 
 pre-configure:
diff --git a/emulators/playonbsd/Makefile b/emulators/playonbsd/Makefile
index ad36076135a9..fe257b5e89c2 100644
--- a/emulators/playonbsd/Makefile
+++ b/emulators/playonbsd/Makefile
@@ -10,20 +10,20 @@ COMMENT=	Easily install and run Windows software for use with wine
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip \
-		bash:${PORTSDIR}/shells/bash \
-		glxinfo:${PORTSDIR}/graphics/mesa-demos \
-		gpg:${PORTSDIR}/security/gnupg \
-		gsed:${PORTSDIR}/textproc/gsed \
-		sudo:${PORTSDIR}/security/sudo \
-		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		xterm:${PORTSDIR}/x11/xterm
+RUN_DEPENDS=	7z:archivers/p7zip \
+		bash:shells/bash \
+		glxinfo:graphics/mesa-demos \
+		gpg:security/gnupg \
+		gsed:textproc/gsed \
+		sudo:security/sudo \
+		xdg-open:devel/xdg-utils \
+		xterm:x11/xterm
 
 OPTIONS_DEFINE=	GECKO MONO
 OPTIONS_DEFAULT=	GECKO MONO
 GECKO_DESC=	Wine-gecko HTML rendering support
-MONO_RUN_DEPENDS=	wine-mono-devel>=4.5.6:${PORTSDIR}/emulators/wine-mono-devel
-GECKO_RUN_DEPENDS=	wine-gecko>=2.21:${PORTSDIR}/emulators/wine-gecko
+MONO_RUN_DEPENDS=	wine-mono-devel>=4.5.6:emulators/wine-mono-devel
+GECKO_RUN_DEPENDS=	wine-gecko>=2.21:emulators/wine-gecko
 
 ONLY_FOR_ARCHS=	amd64 i386
 
@@ -39,9 +39,9 @@ GH_PROJECT=	POL-POM-4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
-RUN_DEPENDS+=	wine:${PORTSDIR}/emulators/i386-wine-devel
+RUN_DEPENDS+=	wine:emulators/i386-wine-devel
 .else
-RUN_DEPENDS+=	wine:${PORTSDIR}/emulators/wine
+RUN_DEPENDS+=	wine:emulators/wine
 .endif
 
 NO_BUILD=	true
diff --git a/emulators/q4wine/Makefile b/emulators/q4wine/Makefile
index 9d53f2741bee..784ad635a25a 100644
--- a/emulators/q4wine/Makefile
+++ b/emulators/q4wine/Makefile
@@ -13,11 +13,11 @@ COMMENT=	QT4 front-end for WINE
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	icotool:${PORTSDIR}/graphics/icoutils
-RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo \
-		wget:${PORTSDIR}/ftp/wget \
-		cabextract:${PORTSDIR}/archivers/cabextract \
-		icotool:${PORTSDIR}/graphics/icoutils
+BUILD_DEPENDS=	icotool:graphics/icoutils
+RUN_DEPENDS=	sudo:security/sudo \
+		wget:ftp/wget \
+		cabextract:archivers/cabextract \
+		icotool:graphics/icoutils
 
 USES=		cmake desktop-file-utils
 CMAKE_ARGS+=	-DMANPAGE_ENTRY_PATH=${MANPREFIX}/man
@@ -41,7 +41,7 @@ DBUS_USE=		QT4=dbus
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
-RUN_DEPENDS+=	wine:${PORTSDIR}/emulators/wine-devel
+RUN_DEPENDS+=	wine:emulators/wine-devel
 .endif
 
 post-patch:
diff --git a/emulators/qemu-cheri128/Makefile b/emulators/qemu-cheri128/Makefile
index 3764a1d6ddbc..99cb8e79b2eb 100644
--- a/emulators/qemu-cheri128/Makefile
+++ b/emulators/qemu-cheri128/Makefile
@@ -5,7 +5,7 @@ PKGNAMESUFFIX=	-cheri128
 
 COMMENT=	QEMU emulator with CHERI CPU support (128-bit)
 
-RUN_DEPENDS=	qemu-system-cheri:${PORTSDIR}/emulators/qemu-cheri
+RUN_DEPENDS=	qemu-system-cheri:emulators/qemu-cheri
 
 MASTERDIR=	${.CURDIR}/../qemu-cheri
 
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 96a9e27b2baf..f6745c983e52 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -43,28 +43,28 @@ X11_CONFIGURE_OFF=	--disable-sdl
 GTK2_USE=	GNOME=gtk20,vte
 GTK2_USES=	gettext
 GTK2_CONFIGURE_OFF=	--disable-gtk --disable-vte
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_OFF=	--disable-gnutls
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_OFF=	--disable-vnc-sasl
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_OFF=	--disable-vnc-jpeg
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_OFF=	--disable-vnc-png
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=	--disable-curl
 OPENGL_USE=	GL=yes
 OPENGL_CONFIGURE_OFF=	--disable-opengl
-USBREDIR_BUILD_DEPENDS=	usbredir>=0.6:${PORTSDIR}/net/usbredir
-USBREDIR_RUN_DEPENDS=	usbredir>=0.6:${PORTSDIR}/net/usbredir
+USBREDIR_BUILD_DEPENDS=	usbredir>=0.6:net/usbredir
+USBREDIR_RUN_DEPENDS=	usbredir>=0.6:net/usbredir
 USBREDIR_CONFIGURE_OFF=	--disable-usb-redir
 PCAP_CONFIGURE_ON=	--enable-pcap
 PCAP_EXTRA_PATCHES=	${FILESDIR}/pcap-patch
 STATIC_LINK_CONFIGURE_ON=	--static
 STATIC_LINK_PREVENTS=		GTK2 X11
 STATIC_LINK_PREVENTS_MSG=	X11 ui cannot be built static
-SAMBA_RUN_DEPENDS=	${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba36
-DOCS_BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
+SAMBA_RUN_DEPENDS=	${LOCALBASE}/sbin/smbd:net/samba36
+DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
 DOCS_USES=		makeinfo
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=1
 
diff --git a/emulators/qemu-launcher/Makefile b/emulators/qemu-launcher/Makefile
index 66f01f5d4f6f..49f41d0e7eac 100644
--- a/emulators/qemu-launcher/Makefile
+++ b/emulators/qemu-launcher/Makefile
@@ -10,9 +10,9 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK front-end to Qemu
 
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Glade2>=0:${PORTSDIR}/x11-toolkits/p5-Glade2 \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Glade2>=0:x11-toolkits/p5-Glade2 \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index 256c1f4787a3..53eb5a4f262f 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -147,13 +147,13 @@ PLIST_SUB+=	GTK2=""
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 .endif
 
 .if empty(PORT_OPTIONS:MSASL)
 CONFIGURE_ARGS+=	--disable-vnc-sasl
 .else
-LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
 .endif
 
 .if empty(PORT_OPTIONS:MJPEG)
@@ -165,13 +165,13 @@ USES+=		jpeg
 .if empty(PORT_OPTIONS:MPNG)
 CONFIGURE_ARGS+=	--disable-vnc-png
 .else
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 .endif
 
 .if empty(PORT_OPTIONS:MCURL)
 CONFIGURE_ARGS+=	--disable-curl
 .else
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 .endif
 
 .if empty(PORT_OPTIONS:MOPENGL)
@@ -183,8 +183,8 @@ USE_GL=		yes
 .if empty(PORT_OPTIONS:MUSBREDIR)
 CONFIGURE_ARGS+=	--disable-usb-redir
 .else
-BUILD_DEPENDS+=	usbredir>=0.6:${PORTSDIR}/net/usbredir
-RUN_DEPENDS+=	usbredir>=0.6:${PORTSDIR}/net/usbredir
+BUILD_DEPENDS+=	usbredir>=0.6:net/usbredir
+RUN_DEPENDS+=	usbredir>=0.6:net/usbredir
 .endif
 
 .if ${PORT_OPTIONS:MPCAP}
@@ -201,11 +201,11 @@ CONFIGURE_ARGS+=	--static
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
-RUN_DEPENDS+=	${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba36
+RUN_DEPENDS+=	${LOCALBASE}/sbin/smbd:net/samba36
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
+BUILD_DEPENDS+=	texi2html:textproc/texi2html
 USES+=		makeinfo
 .else
 MAKE_ARGS+=	NOPORTDOCS=1
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index e8adec8822c0..50fc3858d481 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -45,25 +45,25 @@ X11_CONFIGURE_OFF=	--disable-sdl
 GTK2_USE=	GNOME=gtk20,vte
 GTK2_USES=	gettext
 GTK2_CONFIGURE_OFF=	--disable-gtk --disable-vte
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_OFF=	--disable-vnc-tls
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_OFF=	--disable-vnc-sasl
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_OFF=	--disable-vnc-jpeg
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_OFF=	--disable-vnc-png
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=	--disable-curl
 OPENGL_USE=	GL=yes
 OPENGL_CONFIGURE_OFF=	--disable-opengl
-USBREDIR_BUILD_DEPENDS=	usbredir>=0.6:${PORTSDIR}/net/usbredir
-USBREDIR_RUN_DEPENDS=	usbredir>=0.6:${PORTSDIR}/net/usbredir
+USBREDIR_BUILD_DEPENDS=	usbredir>=0.6:net/usbredir
+USBREDIR_RUN_DEPENDS=	usbredir>=0.6:net/usbredir
 USBREDIR_CONFIGURE_OFF=	--disable-usb-redir
 PCAP_CONFIGURE_ON=	--enable-pcap
 STATIC_LINK_CONFIGURE_ON=	--static
-SAMBA_RUN_DEPENDS=	${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba36
-DOCS_BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
+SAMBA_RUN_DEPENDS=	${LOCALBASE}/sbin/smbd:net/samba36
+DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
 DOCS_USES=		makeinfo
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=1
 
diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index 7ec1bdf8a5bd..b044be4d5436 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SF
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Qt4 based UNIX MAME/MESS frontend
 
-RUN_DEPENDS=	mame>=0.154:${PORTSDIR}/emulators/mame \
-		mess>=0.154:${PORTSDIR}/emulators/mess
+RUN_DEPENDS=	mame>=0.154:emulators/mame \
+		mess>=0.154:emulators/mess
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index dfde0be106e9..df7aeb3d1d07 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Arcade Emulator for M68000, M68020 and Z80 based hardware
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	nasm>0:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	nasm>0:devel/nasm
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/emulators/rubygem-fission/Makefile b/emulators/rubygem-fission/Makefile
index 5332f50b5eab..f651cdb3e69e 100644
--- a/emulators/rubygem-fission/Makefile
+++ b/emulators/rubygem-fission/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utility to manage VMware Fusion VMs from the command line
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-CFPropertyList>=2.2:${PORTSDIR}/devel/rubygem-CFPropertyList
+RUN_DEPENDS=	rubygem-CFPropertyList>=2.2:devel/rubygem-CFPropertyList
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/emulators/snes9express/Makefile b/emulators/snes9express/Makefile
index fd90339eed54..1f676e8bf477 100644
--- a/emulators/snes9express/Makefile
+++ b/emulators/snes9express/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GTK interface for snes9x
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	snes9x:${PORTSDIR}/emulators/snes9x
+RUN_DEPENDS=	snes9x:emulators/snes9x
 
 USE_GNOME=	gtk20
 USES=		gettext pkgconfig
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index 4ef4264afa7b..5d81d645e958 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -17,7 +17,7 @@ LICENSE_NAME=	Snes9x License
 LICENSE_FILE=	${WRKDIR}/${DISTNAME}/docs/snes9x-license.txt
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_XORG=	x11 sm ice xext
 USES=		gettext gmake perl5 desktop-file-utils pkgconfig tar:bzip2 desktop-file-utils
@@ -49,12 +49,12 @@ XV_USE=	XORG=xv
 XRANDR_CONFIGURE_WITH=	xrandr
 XRANDR_USE=	XORG=xrandr
 ALSA_CONFIGURE_WITH=	alsa
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_USES=	compiler:c++11-lang
 PORTAUDIO_CONFIGURE_WITH=	portaudio
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:audio/portaudio2
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 PLIST_FILES=	bin/snes9x-gtk \
 		share/pixmaps/snes9x.svg \
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 6dab63ae6133..368d4a9b4bcc 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Super Nintendo Entertainment System(SNES) Emulator
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_XORG=	x11 sm ice xext
 USES=		gmake tar:bzip2
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=	--without-debug
 
 .if ${ARCH} == "i386"
 .if ${PORT_OPTIONS:MX86_ASM}
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:devel/nasm
 CONFIGURE_ARGS+=	--with-assembler
 .else
 CONFIGURE_ARGS+=	--without-assembler
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 883281e7f350..9b0d1ec77ad3 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Multi-platform Atari 2600 VCS emulator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index 6cadf457212d..eff7a0b0c972 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -10,11 +10,11 @@ DISTNAME=	STonX-0.6.7.6
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	AtariST emulator
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		gccmakedep:${PORTSDIR}/devel/gccmakedep \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
-		${LOCALBASE}/share/fonts/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		gccmakedep:devel/gccmakedep \
+		mkfontdir:x11-fonts/mkfontdir \
+		mkfontscale:x11-fonts/mkfontscale \
+		${LOCALBASE}/share/fonts/misc/10x20-ISO8859-1.pcf.gz:x11-fonts/font-misc-misc
 
 RESTRICTED=	Contains ROM (C) by Atari
 
diff --git a/emulators/swine/Makefile b/emulators/swine/Makefile
index bf998e78acd4..358b51091aef 100644
--- a/emulators/swine/Makefile
+++ b/emulators/swine/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Qt4 graphical Wine frontend
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	pyrcc4:${PORTSDIR}/textproc/py-qt4-xml
-RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm \
-		cabextract:${PORTSDIR}/archivers/cabextract \
-		icotool:${PORTSDIR}/graphics/icoutils \
-		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+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
 
 DATADIRLIB=	${PREFIX}/lib/${PORTNAME}
 
@@ -35,7 +35,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
-RUN_DEPENDS+=	wine:${PORTSDIR}/emulators/wine-devel
+RUN_DEPENDS+=	wine:emulators/wine-devel
 .endif
 
 post-patch:
diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile
index 4c3c4dec5cb2..9b593209bfbe 100644
--- a/emulators/tiemu3/Makefile
+++ b/emulators/tiemu3/Makefile
@@ -12,9 +12,9 @@ EXTRACT_SUFX=	-nogdb.tar.gz
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	TI89(ti)/92(+)/V200 hand-helds emulator
 
-LIB_DEPENDS=	libticalcs2.so:${PORTSDIR}/comms/libticalcs2 \
-		libticables2.so:${PORTSDIR}/comms/libticables2 \
-		libtifiles2.so:${PORTSDIR}/devel/libtifiles2
+LIB_DEPENDS=	libticalcs2.so:comms/libticalcs2 \
+		libticables2.so:comms/libticables2 \
+		libtifiles2.so:devel/libtifiles2
 
 USES=		gmake libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/emulators/tilem/Makefile b/emulators/tilem/Makefile
index 9d3d303c71be..ce54593a6931 100644
--- a/emulators/tilem/Makefile
+++ b/emulators/tilem/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Emulator for the Z80 series of Texas Instruments calculators
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libticalcs2.so:${PORTSDIR}/comms/libticalcs2
+LIB_DEPENDS=	libticalcs2.so:comms/libticalcs2
 
 USES=		desktop-file-utils pkgconfig shared-mime-info tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 2c1d1310b362..28f9f5133733 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Emulator for Sun 2/120, 3/150, and SPARCstation 2 machines
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		autoreconf compiler gettext gmake iconv libtool perl5 pkgconfig
 USE_GNOME=	gdkpixbuf2 gtk20
diff --git a/emulators/tpm-emulator/Makefile b/emulators/tpm-emulator/Makefile
index 4ba01ff56ef3..b8a991b43a43 100644
--- a/emulators/tpm-emulator/Makefile
+++ b/emulators/tpm-emulator/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Trusted Platform Module (TPM) emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 CONFLICTS=	trousers-tddl-[0-9]*
 
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index 4588cfd64509..6ee0a085ece9 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Open source Gameboy Advance emulator
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	nasm:devel/nasm
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gettext gmake
 GNU_CONFIGURE=	yes
@@ -35,7 +35,7 @@ OPTIONS_SUB=	yes
 PROFILING_DESC=	Enable profiling
 
 GTK2_CONFIGURE_ON=	--enable-gtk=2.4
-GTK2_LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24
+GTK2_LIB_DEPENDS=	libglademm-2.4.so:devel/libglademm24
 GTK2_USES=		pkgconfig
 PROFILING_CONFIGURE_ENABLE=	profiling
 
diff --git a/emulators/vboxtool/Makefile b/emulators/vboxtool/Makefile
index 28ee8fbc9913..2f562bc8bf91 100644
--- a/emulators/vboxtool/Makefile
+++ b/emulators/vboxtool/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Provides effective control of VirtualBox machines
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-RUN_DEPENDS=	VBoxManage:${PORTSDIR}/emulators/virtualbox-ose\
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	VBoxManage:emulators/virtualbox-ose\
+		bash:shells/bash
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/emulators/vgb-bin/Makefile b/emulators/vgb-bin/Makefile
index d8950f61d7b8..f689702b6b6e 100644
--- a/emulators/vgb-bin/Makefile
+++ b/emulators/vgb-bin/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nintendo GameBoy(tm) emulator (closed binary version of vgb)
 
-LIB_DEPENDS=	libc.so.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS=	libc.so.5:misc/compat5x
 
 IA32_BINARY_PORT=	yes
 NO_BUILD=	no
diff --git a/emulators/vgba-bin/Makefile b/emulators/vgba-bin/Makefile
index 12ef51e3839f..0b0082663285 100644
--- a/emulators/vgba-bin/Makefile
+++ b/emulators/vgba-bin/Makefile
@@ -13,8 +13,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emulator of Nintendo GameBoy Advance(TM)
 
-LIB_DEPENDS=	libc.so.5:${PORTSDIR}/misc/compat5x \
-		libm.so.2:${PORTSDIR}/misc/compat4x
+LIB_DEPENDS=	libc.so.5:misc/compat5x \
+		libm.so.2:misc/compat4x
 
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	no
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index f3e5b5cd75cb..6872edf04945 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libmp3lame.so:${PORTSDIR}/audio/lame \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontdir:x11-fonts/mkfontdir \
+		mkfontscale:x11-fonts/mkfontscale
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libgif.so:graphics/giflib \
+		libmp3lame.so:audio/lame \
+		libavcodec.so:multimedia/ffmpeg
 
 RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 
@@ -78,14 +78,14 @@ PULSE_DESC=	build with pulseaudio support
 
 GNOMEUI_CONFIGURE_ENABLE=	gnomeui
 XAW3D_CONFIGURE_WITH=	xaw3d
-XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 SDL_USE=		SDL=sdl
 SDL_CONFIGURE_ON=	--with-sdlsound
 SDL_CPPFLAGS=		-I${LOCALBASE}/include/SDL
 ASOUND_CONFIGURE_OFF=	--without-alsa
-ASOUND_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ASOUND_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 PULSE_CONFIGURE_OFF=	--without-pulse
-PULSE_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSE_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 .include <bsd.port.options.mk>
 
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 08e0b1aa8726..74dbd36b1730 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -16,8 +16,8 @@ COMMENT=	VirtualBox additions for FreeBSD guests
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
-		kmk:${PORTSDIR}/devel/kBuild
+BUILD_DEPENDS=	yasm:devel/yasm \
+		kmk:devel/kBuild
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
@@ -85,7 +85,7 @@ VBOX_LIBS=	VBoxOGL.so \
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/X:${PORTSDIR}/x11-servers/xorg-server
+BUILD_DEPENDS+=	${LOCALBASE}/bin/X:x11-servers/xorg-server
 USE_XORG=	xcursor xmu inputproto xorg-server xrandr
 USES+=		pkgconfig
 VBOX_WITH_X11=	1
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index baf9f603b00a..4e0274a445c0 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -16,7 +16,7 @@ COMMENT=	VirtualBox kernel module for FreeBSD
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	kmk:${PORTSDIR}/devel/kBuild
+BUILD_DEPENDS=	kmk:devel/kBuild
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index c303d31725ea..fb5dc7c42512 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -17,16 +17,16 @@ COMMENT=	General-purpose full virtualizer for x86 hardware
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		kmk:${PORTSDIR}/devel/kBuild \
-		gtar:${PORTSDIR}/archivers/gtar \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:${PORTSDIR}/emulators/virtualbox-ose-kmod \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS=	yasm:devel/yasm \
+		xsltproc:textproc/libxslt \
+		kmk:devel/kBuild \
+		gtar:archivers/gtar \
+		cdrecord:sysutils/cdrtools
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libxslt.so:textproc/libxslt \
+		libcurl.so:ftp/curl
+RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod \
+		cdrecord:sysutils/cdrtools
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
@@ -76,12 +76,12 @@ VNC_DESC=	Build with VNC support
 VPX_DESC=	Use vpx for video capturing
 WEBSERVICE_DESC=	Build Webservice
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-VNC_LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver
-VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
+VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 
-VDE_RUN_DEPENDS=	vde_switch:${PORTSDIR}/net/vde2
+VDE_RUN_DEPENDS=	vde_switch:net/vde2
 
 DBUS_CONFIGURE_OFF=	--disable-dbus
 DEBUG_CONFIGURE_ON=	--build-debug
@@ -167,7 +167,7 @@ VBOX_WITH_QT4=
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
-BUILD_DEPENDS+=	soapcpp2:${PORTSDIR}/devel/gsoap
+BUILD_DEPENDS+=	soapcpp2:devel/gsoap
 USE_RC_SUBR+=	vboxwebsrv
 VBOX_LINKS+=	vboxwebsrv
 VBOX_UTILS+=	vboxwebsrv webtest
@@ -202,7 +202,7 @@ KMK_FLAGS+=	-j${MAKE_JOBS_NUMBER}
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
-PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:${PORTSDIR}/devel/kBuild
+PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-Config.kmk \
 		${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk \
 		${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index 757a5f0703d0..f283ce1a82bc 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Game Boy Advance emulator with GTK frontend
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	NLS FFMPEG LINK LIRC DEBUGGER
 OPTIONS_MULTI=	INTERFACE
@@ -46,7 +46,7 @@ CMAKE_ARGS+=	-DVERSION:STRING="${PORTVERSION}" \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MASMCORE} || ${PORT_OPTIONS:MASMSCALERS}
-BUILD_DEPENDS+=	as:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	as:devel/binutils
 .if ${PORT_OPTIONS:MASMCORE}
 CMAKE_ARGS+=	-DENABLE_ASM_CORE:BOOL=yes
 .else
@@ -61,12 +61,12 @@ CMAKE_ARGS+=	-DENABLE_ASM_SCALERS:BOOL=no
 
 .if ${PORT_OPTIONS:MGVBAM}
 USE_GNOME=	gtk20
-LIB_DEPENDS+=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		libglibmm-2.4.so:${PORTSDIR}/devel/glibmm \
-		libgiomm-2.4.so:${PORTSDIR}/devel/glibmm \
-		libcairomm-1.0.so:${PORTSDIR}/graphics/cairomm \
-		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libgdkglextmm-x11-1.2.so:${PORTSDIR}/x11-toolkits/gtkglextmm
+LIB_DEPENDS+=	libgtkmm-2.4.so:x11-toolkits/gtkmm24 \
+		libglibmm-2.4.so:devel/glibmm \
+		libgiomm-2.4.so:devel/glibmm \
+		libcairomm-1.0.so:graphics/cairomm \
+		libglademm-2.4.so:devel/libglademm24 \
+		libgdkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm
 CMAKE_ARGS+=	-DENABLE_GTK:BOOL=yes
 USES+=	desktop-file-utils
 .else
@@ -89,7 +89,7 @@ CMAKE_ARGS+=	-DENABLE_DEBUGGER:BOOL=no
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 CMAKE_ARGS+=	-DENABLE_FFMPEG:BOOL=yes
 .else
 CMAKE_ARGS+=	-DENABLE_FFMPEG:BOOL=no
@@ -103,14 +103,14 @@ CMAKE_ARGS+=	-DENABLE_NLS:BOOL=no
 
 .if ${PORT_OPTIONS:MLINK}
 CMAKE_ARGS+=	-DENABLE_LINK:BOOL=yes
-LIB_DEPENDS+=	libsfml1-system.so:${PORTSDIR}/devel/sfml1
+LIB_DEPENDS+=	libsfml1-system.so:devel/sfml1
 .else
 CMAKE_ARGS+=	-DENABLE_LINK:BOOL=no
 .endif
 
 .if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+=	liblirc_client.so:${PORTSDIR}/comms/lirc
-RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
+LIB_DEPENDS+=	liblirc_client.so:comms/lirc
+RUN_DEPENDS+=	lircd:comms/lirc
 CMAKE_ARGS+=	-DENABLE_LIRC:BOOL=yes
 .else
 CMAKE_ARGS+=	-DENABLE_LIRC:BOOL=no
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 6057e321d734..38aa43cfa81a 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -18,9 +18,9 @@ LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		prelink:${PORTSDIR}/sysutils/prelink
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
+		prelink:sysutils/prelink
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 CONFLICTS_INSTALL=	wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \
 			i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
@@ -65,47 +65,47 @@ GECKO_DESC=	Bundle Gecko MSI package for Wine
 MONO_DESC=	Bundle Mono MSI package for Wine
 
 CUPS_CONFIGURE_WITH=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
-DOSBOX_RUN_DEPENDS=	dosbox:${PORTSDIR}/emulators/dosbox
+DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
 
-GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.44-x86.msi:${PORTSDIR}/emulators/wine-gecko-devel
+GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.44-x86.msi:emulators/wine-gecko-devel
 
 GNUTLS_CONFIGURE_WITH=	gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 HAL_CONFIGURE_WITH=	hal
-HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
 LIBXSLT_CONFIGURE_WITH=	xslt
-LIBXSLT_LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt
+LIBXSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 
-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.6.0.msi:${PORTSDIR}/emulators/wine-mono-devel
+MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.6.0.msi:emulators/wine-mono-devel
 
 MPG123_CONFIGURE_WITH=	mpg123
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 
 OPENAL_CONFIGURE_WITH=	openal
 OPENAL_USES=		openal
 
-STAGING_LIB_DEPENDS=	libtxc_dxtn.so:${PORTSDIR}/graphics/s2tc
+STAGING_LIB_DEPENDS=	libtxc_dxtn.so:graphics/s2tc
 
 V4L_CONFIGURE_WITH=	v4l
-V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
 
-WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
+WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
 
 X11_CONFIGURE_WITH=	x cms fontconfig freetype glu jpeg opengl png xinput2 xrandr xrender
 X11_USES=		jpeg
 X11_USE=		GL=glu XORG=xcomposite,xcursor,xi,xrandr,xrender
-X11_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-			libfreetype.so:${PORTSDIR}/print/freetype2 \
-			liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-			libpng.so:${PORTSDIR}/graphics/png
+X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+			libfreetype.so:print/freetype2 \
+			liblcms2.so:graphics/lcms2 \
+			libpng.so:graphics/png
 
 .include <bsd.port.pre.mk>
 
@@ -147,8 +147,8 @@ MASTER_SITES+=	https://github.com/compholio/wine-compholio-daily/archive/:cho
 COMP_DIST=	v${DISTVERSION}.tar.gz
 DISTFILES+=	${COMP_DIST}:cho
 
-EXTRACT_DEPENDS=bash:${PORTSDIR}/shells/bash \
-		git:${PORTSDIR}/devel/git \
+EXTRACT_DEPENDS=bash:shells/bash \
+		git:devel/git \
 		${AUTOCONF_DEPENDS}
 
 # Fix build on FreeBSD 9.x (false positive: powl)
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 2ff197a55ebc..35dbca71ee98 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -16,8 +16,8 @@ LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 CONFLICTS_INSTALL=	wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \
 			i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
@@ -63,44 +63,44 @@ MONO_DESC=	Bundle Mono MSI package for Wine
 PORTSCOUT=	limitw:1,even
 
 CUPS_CONFIGURE_WITH=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
-DOSBOX_RUN_DEPENDS=	dosbox:${PORTSDIR}/emulators/dosbox
+DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
 
-GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.40-x86.msi:${PORTSDIR}/emulators/wine-gecko
+GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.40-x86.msi:emulators/wine-gecko
 
 GNUTLS_CONFIGURE_WITH=	gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 HAL_CONFIGURE_WITH=	hal
-HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
 LIBXSLT_CONFIGURE_WITH=	xslt
-LIBXSLT_LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt
+LIBXSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 
-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.6.msi:${PORTSDIR}/emulators/wine-mono
+MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.6.msi:emulators/wine-mono
 
 MPG123_CONFIGURE_WITH=	mpg123
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 
 OPENAL_CONFIGURE_WITH=	openal
 OPENAL_USES=		openal
 
 V4L_CONFIGURE_WITH=	v4l
-V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
+V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
 
-WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
+WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
 
 X11_CONFIGURE_WITH=	x cms fontconfig freetype glu jpeg opengl png xinput2 xrandr xrender
 X11_USES=		jpeg
 X11_USE=		GL=glu XORG=xcomposite,xcursor,xi,xrandr,xrender
-X11_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-			libfreetype.so:${PORTSDIR}/print/freetype2 \
-			liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-			libpng.so:${PORTSDIR}/graphics/png
+X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+			libfreetype.so:print/freetype2 \
+			liblcms2.so:graphics/lcms2 \
+			libpng.so:graphics/png
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/wxmupen64plus/Makefile b/emulators/wxmupen64plus/Makefile
index 495f78a5d5b9..22c2472748c9 100644
--- a/emulators/wxmupen64plus/Makefile
+++ b/emulators/wxmupen64plus/Makefile
@@ -13,13 +13,13 @@ DIST_SUBDIR=	${PORTNAME:S/wx//}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Mupen64Plus 2.0 GUI frontend written using wxWidgets
 
-LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
-RUN_DEPENDS=	${LOCALBASE}/lib/libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core \
-		${LOCALBASE}/lib/mupen64plus/mupen64plus-audio-sdl.so:${PORTSDIR}/emulators/mupen64plus-audio-sdl \
-		${LOCALBASE}/lib/mupen64plus/mupen64plus-input-sdl.so:${PORTSDIR}/emulators/mupen64plus-input-sdl \
-		${LOCALBASE}/lib/mupen64plus/mupen64plus-rsp-hle.so:${PORTSDIR}/emulators/mupen64plus-rsp-hle \
-		${LOCALBASE}/lib/mupen64plus/mupen64plus-video-rice.so:${PORTSDIR}/emulators/mupen64plus-video-rice \
-		mupen64plus:${PORTSDIR}/emulators/mupen64plus-ui-console
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
+RUN_DEPENDS=	${LOCALBASE}/lib/libmupen64plus.so.2:emulators/mupen64plus-core \
+		${LOCALBASE}/lib/mupen64plus/mupen64plus-audio-sdl.so:emulators/mupen64plus-audio-sdl \
+		${LOCALBASE}/lib/mupen64plus/mupen64plus-input-sdl.so:emulators/mupen64plus-input-sdl \
+		${LOCALBASE}/lib/mupen64plus/mupen64plus-rsp-hle.so:emulators/mupen64plus-rsp-hle \
+		${LOCALBASE}/lib/mupen64plus/mupen64plus-video-rice.so:emulators/mupen64plus-video-rice \
+		mupen64plus:emulators/mupen64plus-ui-console
 
 PROJECTHOST=	bsdistfiles
 USES=		compiler:c++11-lib python
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 952e28fe73a9..0031a165655c 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -15,8 +15,8 @@ COMMENT=	HP48 SX/GX graphic calculator emulator
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/misc/7x14B-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc \
-		${LOCALBASE}/share/fonts/75dpi/helvR12-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75dpi
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/misc/7x14B-ISO8859-1.pcf.gz:x11-fonts/font-misc-misc \
+		${LOCALBASE}/share/fonts/75dpi/helvR12-ISO8859-1.pcf.gz:x11-fonts/font-adobe-75dpi
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/emulators/xcpc/Makefile b/emulators/xcpc/Makefile
index 908913f1f491..2611cd3e69cf 100644
--- a/emulators/xcpc/Makefile
+++ b/emulators/xcpc/Makefile
@@ -19,9 +19,9 @@ USE_XORG=	ice
 USE_GNOME=	glib20
 USES=		gettext iconv pkgconfig
 
-LIB_DEPENDS+=	libicui18n.so:${PORTSDIR}/devel/icu \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libdsk.so:${PORTSDIR}/emulators/libdsk
+LIB_DEPENDS+=	libicui18n.so:devel/icu \
+		libpcre.so:devel/pcre \
+		libdsk.so:emulators/libdsk
 
 OPTIONS_DEFINE=	MOTIF ATHENA XSHM DEBUG
 OPTIONS_DEFAULT=	MOTIF XSHM
@@ -51,7 +51,7 @@ CONFIGURE_ARGS+=--without-motif1
 .endif
 
 .if ${PORT_OPTIONS:MATHENA}
-LIB_DEPENDS+=	libXaw.so:${PORTSDIR}/x11-toolkits/libXaw
+LIB_DEPENDS+=	libXaw.so:x11-toolkits/libXaw
 CONFIGURE_ARGS+=--with-athena
 .else
 CONFIGURE_ARGS+=--without-athena
diff --git a/emulators/xen/Makefile b/emulators/xen/Makefile
index f4cfa2364588..b8c2fe856244 100644
--- a/emulators/xen/Makefile
+++ b/emulators/xen/Makefile
@@ -12,8 +12,8 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64
 
-RUN_DEPENDS=	/boot/xen:${PORTSDIR}/emulators/xen-kernel \
-		xl:${PORTSDIR}/sysutils/xen-tools
+RUN_DEPENDS=	/boot/xen:emulators/xen-kernel \
+		xl:sysutils/xen-tools
 
 USES=		metaport
 
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 76c59b979e5f..6d71b51b54cd 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -26,7 +26,7 @@ OPTIONS_SINGLE=		GUI
 OPTIONS_SINGLE_GUI=	GTK2 QT4 QT5
 OPTIONS_DEFAULT=	QT4
 
-GTK2_LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+GTK2_LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 GTK2_USE=		gnome=gtk20
 GTK2_CMAKE_ON=		-DYAB_PORTS:STRING=gtk
 GTK2_CMAKE_OFF=		-DYAB_PORTS:STRING=qt
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 0783972340ac..ee7682294411 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Intel x86 only Super Nintendo Entertainment System (SNES) Emulator
 
 # This must be >= 0.98!
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	nasm:devel/nasm
+LIB_DEPENDS=	libpng.so:graphics/png
 
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	non-portable, for a portable emulator see emulators/snes9x
@@ -39,7 +39,7 @@ JMA_CONFIGURE_ENABLE=	jma
 X11_CONFIGURE_WITH=	x
 OPENGL_CONFIGURE_ENABLE=	opengl
 
-AO_LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+AO_LIB_DEPENDS=	libao.so:audio/libao
 AO_CONFIGURE_ENABLE=	libao
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/finance/R-cran-AER/Makefile b/finance/R-cran-AER/Makefile
index f1aeb3f69ab4..9c7a8be0ec89 100644
--- a/finance/R-cran-AER/Makefile
+++ b/finance/R-cran-AER/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Applied Econometrics with R
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-car>=2.0.1:${PORTSDIR}/math/R-cran-car \
-		R-cran-lmtest>=0:${PORTSDIR}/finance/R-cran-lmtest \
-		R-cran-Formula>=0.2.0:${PORTSDIR}/math/R-cran-Formula \
-		R-cran-zoo>=0:${PORTSDIR}/math/R-cran-zoo
+RUN_DEPENDS=	R-cran-car>=2.0.1:math/R-cran-car \
+		R-cran-lmtest>=0:finance/R-cran-lmtest \
+		R-cran-Formula>=0.2.0:math/R-cran-Formula \
+		R-cran-zoo>=0:math/R-cran-zoo
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-PerformanceAnalytics/Makefile b/finance/R-cran-PerformanceAnalytics/Makefile
index 1777e3a69b60..7ed19e92f2fe 100644
--- a/finance/R-cran-PerformanceAnalytics/Makefile
+++ b/finance/R-cran-PerformanceAnalytics/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Econometric tools for performance and risk analysis
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-zoo>0:${PORTSDIR}/math/R-cran-zoo \
-		R-cran-xts>=0.9:${PORTSDIR}/math/R-cran-xts
+RUN_DEPENDS=	R-cran-zoo>0:math/R-cran-zoo \
+		R-cran-xts>=0.9:math/R-cran-xts
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-RFinanceYJ/Makefile b/finance/R-cran-RFinanceYJ/Makefile
index 7573bba1d3da..fe76ea17e976 100644
--- a/finance/R-cran-RFinanceYJ/Makefile
+++ b/finance/R-cran-RFinanceYJ/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Japanese stock market from Yahoo!-finance-Japan
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	R-cran-XML>0:${PORTSDIR}/textproc/R-cran-XML \
-		R-cran-xts>0:${PORTSDIR}/math/R-cran-xts
+RUN_DEPENDS=	R-cran-XML>0:textproc/R-cran-XML \
+		R-cran-xts>0:math/R-cran-xts
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-TTR/Makefile b/finance/R-cran-TTR/Makefile
index 2f6b606d669d..7bc8b976ea23 100644
--- a/finance/R-cran-TTR/Makefile
+++ b/finance/R-cran-TTR/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Technical Trading Rules
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-xts>=0.9.3:${PORTSDIR}/math/R-cran-xts
+RUN_DEPENDS=	R-cran-xts>=0.9.3:math/R-cran-xts
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-fBasics/Makefile b/finance/R-cran-fBasics/Makefile
index 41bfc9859a60..091dbf549996 100644
--- a/finance/R-cran-fBasics/Makefile
+++ b/finance/R-cran-fBasics/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Markets and Basic Statistics
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-timeDate>0:${PORTSDIR}/finance/R-cran-timeDate \
-		R-cran-timeSeries>=2100.84:${PORTSDIR}/finance/R-cran-timeSeries \
-		R-cran-stabledist>0:${PORTSDIR}/math/R-cran-stabledist \
-		R-cran-gss>0:${PORTSDIR}/math/R-cran-gss
+RUN_DEPENDS=	R-cran-timeDate>0:finance/R-cran-timeDate \
+		R-cran-timeSeries>=2100.84:finance/R-cran-timeSeries \
+		R-cran-stabledist>0:math/R-cran-stabledist \
+		R-cran-gss>0:math/R-cran-gss
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-fGarch/Makefile b/finance/R-cran-fGarch/Makefile
index 5145da4f23a2..1f0512592523 100644
--- a/finance/R-cran-fGarch/Makefile
+++ b/finance/R-cran-fGarch/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Autoregressive Conditional Heteroskedastic Modelling
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-timeDate>0:${PORTSDIR}/finance/R-cran-timeDate \
-		R-cran-timeSeries>0:${PORTSDIR}/finance/R-cran-timeSeries \
-		R-cran-fBasics>=2100.78:${PORTSDIR}/finance/R-cran-fBasics
+RUN_DEPENDS=	R-cran-timeDate>0:finance/R-cran-timeDate \
+		R-cran-timeSeries>0:finance/R-cran-timeSeries \
+		R-cran-fBasics>=2100.78:finance/R-cran-fBasics
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-gmm/Makefile b/finance/R-cran-gmm/Makefile
index e2303a5aaba1..d3145d6872d2 100644
--- a/finance/R-cran-gmm/Makefile
+++ b/finance/R-cran-gmm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generalized Method of Moments and Generalized Empirical Likelihood
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-sandwich>0:${PORTSDIR}/math/R-cran-sandwich
+RUN_DEPENDS=	R-cran-sandwich>0:math/R-cran-sandwich
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-lmtest/Makefile b/finance/R-cran-lmtest/Makefile
index 166ea22aacca..a7cd658daeaf 100644
--- a/finance/R-cran-lmtest/Makefile
+++ b/finance/R-cran-lmtest/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Testing Linear Regression Models
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-zoo>=0:${PORTSDIR}/math/R-cran-zoo \
-		R-cran-strucchange>0:${PORTSDIR}/finance/R-cran-strucchange \
-		R-cran-sandwich>=2.2.4:${PORTSDIR}/math/R-cran-sandwich
+RUN_DEPENDS=	R-cran-zoo>=0:math/R-cran-zoo \
+		R-cran-strucchange>0:finance/R-cran-strucchange \
+		R-cran-sandwich>=2.2.4:math/R-cran-sandwich
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-plm/Makefile b/finance/R-cran-plm/Makefile
index 74c9090da368..a68b1c66062d 100644
--- a/finance/R-cran-plm/Makefile
+++ b/finance/R-cran-plm/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Linear Models for Panel Data
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-Formula>=0.2.0:${PORTSDIR}/math/R-cran-Formula \
-		R-cran-bdsmatrix>0:${PORTSDIR}/math/R-cran-bdsmatrix \
-		R-cran-zoo>0:${PORTSDIR}/math/R-cran-zoo \
-		R-cran-sandwich>0:${PORTSDIR}/math/R-cran-sandwich \
-		R-cran-car>0:${PORTSDIR}/math/R-cran-car \
-		R-cran-lmtest>0:${PORTSDIR}/finance/R-cran-lmtest
+RUN_DEPENDS=	R-cran-Formula>=0.2.0:math/R-cran-Formula \
+		R-cran-bdsmatrix>0:math/R-cran-bdsmatrix \
+		R-cran-zoo>0:math/R-cran-zoo \
+		R-cran-sandwich>0:math/R-cran-sandwich \
+		R-cran-car>0:math/R-cran-car \
+		R-cran-lmtest>0:finance/R-cran-lmtest
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-quantmod/Makefile b/finance/R-cran-quantmod/Makefile
index 3a5bc5b7f79d..d8eea413d69a 100644
--- a/finance/R-cran-quantmod/Makefile
+++ b/finance/R-cran-quantmod/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Quantitative Financial Modelling and Trading Framework for R
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	R-cran-xts>=0.9.0:${PORTSDIR}/math/R-cran-xts \
-		R-cran-zoo>0:${PORTSDIR}/math/R-cran-zoo \
-		R-cran-TTR>=0.2:${PORTSDIR}/finance/R-cran-TTR
+RUN_DEPENDS=	R-cran-xts>=0.9.0:math/R-cran-xts \
+		R-cran-zoo>0:math/R-cran-zoo \
+		R-cran-TTR>=0.2:finance/R-cran-TTR
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-strucchange/Makefile b/finance/R-cran-strucchange/Makefile
index f5d109cff4ac..defcbe0c8ff6 100644
--- a/finance/R-cran-strucchange/Makefile
+++ b/finance/R-cran-strucchange/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Testing, Monitoring, and Dating Structural Changes
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-zoo>0:${PORTSDIR}/math/R-cran-zoo \
-		R-cran-sandwich>0:${PORTSDIR}/math/R-cran-sandwich
+RUN_DEPENDS=	R-cran-zoo>0:math/R-cran-zoo \
+		R-cran-sandwich>0:math/R-cran-sandwich
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-timeSeries/Makefile b/finance/R-cran-timeSeries/Makefile
index 74b5f7777930..978804e7f7f4 100644
--- a/finance/R-cran-timeSeries/Makefile
+++ b/finance/R-cran-timeSeries/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Financial Time Series Objects
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-timeDate>=2150.95:${PORTSDIR}/finance/R-cran-timeDate
-TEST_DEPENDS=	R-cran-RUnit>=0:${PORTSDIR}/devel/R-cran-RUnit \
-		R-cran-xts>=0:${PORTSDIR}/math/R-cran-xts \
-		R-cran-PerformanceAnalytics>=0:${PORTSDIR}/finance/R-cran-PerformanceAnalytics
+RUN_DEPENDS=	R-cran-timeDate>=2150.95:finance/R-cran-timeDate
+TEST_DEPENDS=	R-cran-RUnit>=0:devel/R-cran-RUnit \
+		R-cran-xts>=0:math/R-cran-xts \
+		R-cran-PerformanceAnalytics>=0:finance/R-cran-PerformanceAnalytics
 
 USES=	cran
 
diff --git a/finance/R-cran-tseries/Makefile b/finance/R-cran-tseries/Makefile
index 6eeb7d2a5019..2ca2e07cfcc1 100644
--- a/finance/R-cran-tseries/Makefile
+++ b/finance/R-cran-tseries/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Time series analysis and computational finance
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	R-cran-quadprog>0:${PORTSDIR}/math/R-cran-quadprog \
-		R-cran-zoo>0:${PORTSDIR}/math/R-cran-zoo
-RUN_DEPENDS=	R-cran-quadprog>0:${PORTSDIR}/math/R-cran-quadprog \
-		R-cran-zoo>0:${PORTSDIR}/math/R-cran-zoo
+BUILD_DEPENDS=	R-cran-quadprog>0:math/R-cran-quadprog \
+		R-cran-zoo>0:math/R-cran-zoo
+RUN_DEPENDS=	R-cran-quadprog>0:math/R-cran-quadprog \
+		R-cran-zoo>0:math/R-cran-zoo
 
 USES=	cran:auto-plist
 
diff --git a/finance/R-cran-vars/Makefile b/finance/R-cran-vars/Makefile
index bf4eeb8c73e3..01e2f024b9ab 100644
--- a/finance/R-cran-vars/Makefile
+++ b/finance/R-cran-vars/Makefile
@@ -13,10 +13,10 @@ COMMENT=	VAR Modelling
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-strucchange>0:${PORTSDIR}/finance/R-cran-strucchange \
-		R-cran-urca>=1.1.6:${PORTSDIR}/finance/R-cran-urca \
-		R-cran-lmtest>=0.9.26:${PORTSDIR}/finance/R-cran-lmtest \
-		R-cran-sandwich>=2.2.4:${PORTSDIR}/math/R-cran-sandwich
+RUN_DEPENDS=	R-cran-strucchange>0:finance/R-cran-strucchange \
+		R-cran-urca>=1.1.6:finance/R-cran-urca \
+		R-cran-lmtest>=0.9.26:finance/R-cran-lmtest \
+		R-cran-sandwich>=2.2.4:math/R-cran-sandwich
 
 USES=	cran:auto-plist
 
diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index 8765b63a3842..c9a925db5e6e 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Online banking interface and financial data framework
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgwenhywfar.so:${PORTSDIR}/devel/gwenhywfar \
-		libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgwenhywfar.so:devel/gwenhywfar \
+		libgmp.so:math/gmp
 
 USES=		compiler:features gettext gmake libtool pathfix pkgconfig
 
@@ -33,12 +33,12 @@ OPTIONS_DEFINE=		DOCS DOXYGEN EBICS KTOBLZCHECK
 OPTIONS_DEFAULT=	KTOBLZCHECK
 OPTIONS_SUB=		yes
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENABLE=	full-doc
 
 EBICS_DESC=		Enable EBICS backend
-EBICS_LIB_DEPENDS=	libxmlsec1-gnutls.so:${PORTSDIR}/security/xmlsec1
+EBICS_LIB_DEPENDS=	libxmlsec1-gnutls.so:security/xmlsec1
 EBICS_USE=		GNOME=libxml2,libxslt
 EBICS_CONFIGURE_OFF=	--with-backends="aqhbci aqnone aqofxconnect"
 
@@ -51,7 +51,7 @@ IGNORE=		(Re)Install security/xmlsec1 with the GNUTLS option ON
 .endif
 
 .if ${PORT_OPTIONS:MKTOBLZCHECK} || exists(${LOCALBASE}/lib/libktoblzcheck.so)
-LIB_DEPENDS+=	libktoblzcheck.so:${PORTSDIR}/finance/ktoblzcheck
+LIB_DEPENDS+=	libktoblzcheck.so:finance/ktoblzcheck
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} && !${PORT_OPTIONS:MDOXYGEN}
diff --git a/finance/aqmoney/Makefile b/finance/aqmoney/Makefile
index 50b3b892bac6..49a4abe4d789 100644
--- a/finance/aqmoney/Makefile
+++ b/finance/aqmoney/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Manage your credit institute accounts using openhbci
 
-LIB_DEPENDS=	libopenhbci.so:${PORTSDIR}/finance/openhbci
+LIB_DEPENDS=	libopenhbci.so:finance/openhbci
 
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/aqmoney \
diff --git a/finance/beanie/Makefile b/finance/beanie/Makefile
index 50aa55035a10..f4737caac255 100644
--- a/finance/beanie/Makefile
+++ b/finance/beanie/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Open Source accounting system
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	dbow:${PORTSDIR}/databases/dbow
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	dbow:databases/dbow
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 LATE_INSTALL_ARGS=	BEANIEROOT="${STAGEDIR}${PREFIX}/beanie"
 MAKE_JOBS_UNSAFE=	yes
diff --git a/finance/bitcoin-armory/Makefile b/finance/bitcoin-armory/Makefile
index 49f6832b2278..23995df4cf7b 100644
--- a/finance/bitcoin-armory/Makefile
+++ b/finance/bitcoin-armory/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Desktop bitcoin management system
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/swig3.0:${PORTSDIR}/devel/swig30 \
-		${LOCALBASE}/bin/pyrcc4:${PORTSDIR}/textproc/py-qt4-xml \
-		${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}twistedCore>=14.0.0:${PORTSDIR}/devel/py-twistedCore \
-		${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:${PORTSDIR}/sysutils/py-psutil \
-		${LOCALBASE}/bin/bitcoind:${PORTSDIR}/net-p2p/bitcoin-daemon
+BUILD_DEPENDS=	${LOCALBASE}/bin/swig3.0:devel/swig30 \
+		${LOCALBASE}/bin/pyrcc4:textproc/py-qt4-xml \
+		${LOCALBASE}/bin/rsync:net/rsync
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}twistedCore>=14.0.0:devel/py-twistedCore \
+		${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:sysutils/py-psutil \
+		${LOCALBASE}/bin/bitcoind:net-p2p/bitcoin-daemon
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	etotheipi
diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index 6babd10b3a12..eeaeb99e8a5c 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Easy to use Bitcoin client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}slowaes>0:${PORTSDIR}/security/py-slowaes \
-		${PYTHON_PKGNAMEPREFIX}ecdsa>0:${PORTSDIR}/security/py-ecdsa \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.10.3:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:${PORTSDIR}/textproc/py-qrcode \
-		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.6:${PORTSDIR}/security/py-tlslite \
-		${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:${PORTSDIR}/security/py-pbkdf2 \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:${PORTSDIR}/devel/py-protobuf \
-		${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}slowaes>0:security/py-slowaes \
+		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.10.3:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode \
+		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.6:security/py-tlslite \
+		${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2 \
+		${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py-protobuf \
+		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython
 
 USES=		desktop-file-utils python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/finance/fixc/Makefile b/finance/fixc/Makefile
index 06b8c9a17d42..077be668f8aa 100644
--- a/finance/fixc/Makefile
+++ b/finance/fixc/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	finance
 MAINTAINER=	blttll@gmail.com
 COMMENT=	Simple Financial Information eXchange (FIX) protocol console client
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 PLIST_FILES=	bin/fixc
 USE_GITHUB=	yes
diff --git a/finance/frontaccounting/Makefile b/finance/frontaccounting/Makefile
index 5b55b9ae819c..03cf0720bb9e 100644
--- a/finance/frontaccounting/Makefile
+++ b/finance/frontaccounting/Makefile
@@ -26,8 +26,8 @@ OPTIONS_DEFAULT=	APACHE MYSQL_SERVER
 
 MYSQL_SERVER_DESC=	MySQL server support
 NGINX_DESC=		NGINX web server
-LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
-NGINX_RUN_DEPENDS=	nginx:${PORTSDIR}/www/nginx
+LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
+NGINX_RUN_DEPENDS=	nginx:www/nginx
 MYSQL_SERVER_USE=	MYSQL=server
 APACHE_USE=		APACHE_RUN=22+
 NLS_USES=		gettext
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index 5800fb2756e6..d67234f3cab1 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	SF/gnucash/${PORTNAME}/${PORTVERSION} \
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Documentation for gnucash
 
-LIB_DEPENDS=	librarian.so:${PORTSDIR}/textproc/rarian
-RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
+LIB_DEPENDS=	librarian.so:textproc/rarian
+RUN_DEPENDS=	yelp:x11/yelp
 
 INSTALLS_OMF=	yes
 USES=		autoreconf gmake
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 7305e5de0f2a..b9da5f2c0aef 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Quicken-like money and finance manager
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \
-		libgoffice-0.8.so:${PORTSDIR}/devel/goffice
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote
+LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring \
+		libwebkitgtk-1.0.so:www/webkit-gtk2 \
+		libgoffice-0.8.so:devel/goffice
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Finance-Quote>=0:finance/p5-Finance-Quote
 
 OPTIONS_DEFINE=	AQBANKING OFX DATABASE LOCALE_TAX PYTHON GTKMM DOCS
 OPTIONS_SINGLE=	GV
@@ -34,15 +34,15 @@ GUILE2_DESC=	Use lang/guile2
 
 OPTIONS_SUB=		yes
 AQBANKING_CONFIGURE_ENABLE=aqbanking
-AQBANKING_LIB_DEPENDS=	libgwengui-gtk2.so:${PORTSDIR}/devel/gwenhywfar-gtk2 \
-			libktoblzcheck.so:${PORTSDIR}/finance/ktoblzcheck \
-			libaqbanking.so:${PORTSDIR}/finance/aqbanking
+AQBANKING_LIB_DEPENDS=	libgwengui-gtk2.so:devel/gwenhywfar-gtk2 \
+			libktoblzcheck.so:finance/ktoblzcheck \
+			libaqbanking.so:finance/aqbanking
 OFX_CONFIGURE_ENABLE=	ofx
-OFX_LIB_DEPENDS=	libofx.so:${PORTSDIR}/finance/libofx
+OFX_LIB_DEPENDS=	libofx.so:finance/libofx
 DATABASE_CONFIGURE_ENABLE=dbi
-DATABASE_BUILD_DEPENDS=	libdbi-drivers>=0:${PORTSDIR}/databases/libdbi-drivers
-DATABASE_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
-DATABASE_RUN_DEPENDS=	libdbi-drivers>=0:${PORTSDIR}/databases/libdbi-drivers
+DATABASE_BUILD_DEPENDS=	libdbi-drivers>=0:databases/libdbi-drivers
+DATABASE_LIB_DEPENDS=	libdbi.so:databases/libdbi
+DATABASE_RUN_DEPENDS=	libdbi-drivers>=0:databases/libdbi-drivers
 DATABASE_CONFIGURE_ON=	--with-dbi-dbd-dir=${LOCALBASE}/lib/dbd
 LOCALE_TAX_CONFIGURE_ON=--enable-locale-specific-tax
 PYTHON_CONFIGURE_ON=	--enable-python
@@ -50,12 +50,12 @@ PYTHON_USES=		python
 GTKMM_USE=		GNOME=gtkmm24
 GTKMM_CONFIGURE_ON=	--enable-gtkmm
 GTKMM_CONFIGURE_OFF=	--disable-gtkmm
-GUILE1_LIB_DEPENDS=     libguile.so:${PORTSDIR}/lang/guile
-GUILE1_BUILD_DEPENDS=	slib-guile>0:${PORTSDIR}/lang/slib-guile
-GUILE1_RUN_DEPENDS=	slib-guile>0:${PORTSDIR}/lang/slib-guile
-GUILE2_LIB_DEPENDS=     libguile-2.0.so:${PORTSDIR}/lang/guile2
-GUILE2_BUILD_DEPENDS=	slib-guile2>0:${PORTSDIR}/lang/slib-guile2
-GUILE2_RUN_DEPENDS=	slib-guile2>0:${PORTSDIR}/lang/slib-guile2
+GUILE1_LIB_DEPENDS=     libguile.so:lang/guile
+GUILE1_BUILD_DEPENDS=	slib-guile>0:lang/slib-guile
+GUILE1_RUN_DEPENDS=	slib-guile>0:lang/slib-guile
+GUILE2_LIB_DEPENDS=     libguile-2.0.so:lang/guile2
+GUILE2_BUILD_DEPENDS=	slib-guile2>0:lang/slib-guile2
+GUILE2_RUN_DEPENDS=	slib-guile2>0:lang/slib-guile2
 
 USE_XORG=	x11
 USES=		compiler:c++11-lib desktop-file-utils gettext gmake libtool perl5 \
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 43ca23511d4f..73f3352c3bb9 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Personal accounting application
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libofx.so:${PORTSDIR}/finance/libofx
+LIB_DEPENDS=	libofx.so:finance/libofx
 
 USES=		tar:bzip2 desktop-file-utils gmake iconv pkgconfig shared-mime-info
 GNU_CONFIGURE=	yes
diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index b43e2507e139..0a7053494b70 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Free, easy, personal accounting for everyone
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libosp.so:${PORTSDIR}/textproc/opensp
+LIB_DEPENDS=	libosp.so:textproc/opensp
 
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gettext gmake pkgconfig shared-mime-info
@@ -27,7 +27,7 @@ OFX_DESC=	OFX file format support
 OPTIONS_DEFAULT=OFX
 
 OFX_CONFIGURE_WITH=	ofx
-OFX_LIB_DEPENDS=	libofx.so:${PORTSDIR}/finance/libofx
+OFX_LIB_DEPENDS=	libofx.so:finance/libofx
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index c8a45a1d8365..a0d647603487 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -12,8 +12,8 @@ COMMENT=	KDE4 personal finance manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_graph.so:${PORTSDIR}/devel/boost-libs \
-		libalkimia.so:${PORTSDIR}/finance/libalkimia
+LIB_DEPENDS=	libboost_graph.so:devel/boost-libs \
+		libalkimia.so:finance/libalkimia
 
 USES=		cmake pkgconfig shared-mime-info shebangfix tar:xz
 USE_QT4=	gui dbus network phonon sql svg xml \
@@ -33,28 +33,28 @@ NLS_CMAKE_ON=		-DBUILD_po:BOOL=ON
 NLS_CMAKE_OFF=		-DBUILD_po:BOOL=OFF
 
 CALENDAR_DESC=		Enable Calendar plugin
-CALENDAR_LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+CALENDAR_LIB_DEPENDS=	libical.so:devel/libical
 CALENDAR_CMAKE_ON=	-DENABLE_LIBICAL:BOOL=ON
 CALENDAR_CMAKE_OFF=	-DENABLE_LIBICAL:BOOL=OFF
 
 KBANKING_DESC=		Enable KBanking plugin
-KBANKING_LIB_DEPENDS=	libgwengui-qt4.so:${PORTSDIR}/devel/gwenhywfar-qt4 \
-			libaqbanking.so:${PORTSDIR}/finance/aqbanking
+KBANKING_LIB_DEPENDS=	libgwengui-qt4.so:devel/gwenhywfar-qt4 \
+			libaqbanking.so:finance/aqbanking
 KBANKING_CMAKE_ON=	-DENABLE_KBANKING:BOOL=ON
 KBANKING_CMAKE_OFF=	-DENABLE_KBANKING:BOOL=OFF
 
 OFX_DESC=		Enable OFX plugin
-OFX_LIB_DEPENDS=	libofx.so:${PORTSDIR}/finance/libofx
+OFX_LIB_DEPENDS=	libofx.so:finance/libofx
 OFX_CMAKE_ON=		-DENABLE_LIBOFX:BOOL=ON
 OFX_CMAKE_OFF=		-DENABLE_LIBOFX:BOOL=OFF
 
 QUOTES_DESC=		Enable online price quotes
 QUOTES_USES=		perl5
 QUOTES_USE=		PERL5=run
-QUOTES_RUN_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-			p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote \
-			p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-			p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
-			p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+QUOTES_RUN_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
+			p5-Finance-Quote>=0:finance/p5-Finance-Quote \
+			p5-XML-Parser>=0:textproc/p5-XML-Parser \
+			p5-XML-Writer>=0:textproc/p5-XML-Writer \
+			p5-libwww>=0:www/p5-libwww
 
 .include <bsd.port.mk>
diff --git a/finance/ledger/Makefile b/finance/ledger/Makefile
index 822d9ee25727..54d6f37de7e5 100644
--- a/finance/ledger/Makefile
+++ b/finance/ledger/Makefile
@@ -12,10 +12,10 @@ COMMENT=	John Wiegley's command line accounting program
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	${LOCALBASE}/include/utf8.h:${PORTSDIR}/devel/utf8cpp
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/utf8.h:devel/utf8cpp
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libboost_system.so:devel/boost-libs
 
 USE_GITHUB=	yes
 
diff --git a/finance/ledgersmb/Makefile b/finance/ledgersmb/Makefile
index 8a489a158cc1..4563e6c80e88 100644
--- a/finance/ledgersmb/Makefile
+++ b/finance/ledgersmb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/Releases/archive-1.1/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Double entry accounting system
 
-BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+BUILD_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
diff --git a/finance/ledgersmb12/Makefile b/finance/ledgersmb12/Makefile
index be2af9eeaf7d..0839be3406da 100644
--- a/finance/ledgersmb12/Makefile
+++ b/finance/ledgersmb12/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/ledger-smb/Releases/archive-1.2/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Double entry accounting system
 
-BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std
+BUILD_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-Config-Std>=0:devel/p5-Config-Std
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/finance/libalkimia/Makefile b/finance/libalkimia/Makefile
index 04c7e44f9d87..95bd06331aa2 100644
--- a/finance/libalkimia/Makefile
+++ b/finance/libalkimia/Makefile
@@ -11,7 +11,7 @@ COMMENT=	KDE4 financial data handling library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		cmake:outsource pathfix tar:xz
 USE_KDE4=	automoc4 kdeprefix kdelibs
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index d5b77fada263..fd10e2c6ecbd 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -12,9 +12,9 @@ COMMENT=	OpenSource implementation of the OFX (Open Financial eXchange)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
-		libosp.so:${PORTSDIR}/textproc/opensp
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libxml++-2.6.so:textproc/libxml++26 \
+		libosp.so:textproc/opensp
 
 USES=		gmake iconv pkgconfig pathfix libtool
 CONFIGURE_ARGS=	--disable-doxygen --disable-dot --disable-gengetopt \
diff --git a/finance/moneymanagerex/Makefile b/finance/moneymanagerex/Makefile
index 5df76aa0e2f6..bcfbf3768c05 100644
--- a/finance/moneymanagerex/Makefile
+++ b/finance/moneymanagerex/Makefile
@@ -52,7 +52,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == "gcc"
-LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS+=	libboost_system.so:devel/boost-libs
 LDFLAGS+=	-lboost_system
 .endif
 
diff --git a/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile b/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
index 7c48b9e0c8e5..78c27001deec 100644
--- a/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
+++ b/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	Business-MaxMind-${PORTVERSION}
 MAINTAINER=	vivek@khera.org
 COMMENT=	Interface to MaxMind minFraud service
 
-RUN_DEPENDS+=	p5-libwww>0.0:${PORTSDIR}/www/p5-libwww \
-		p5-LWP-Protocol-https>0.0:${PORTSDIR}/www/p5-LWP-Protocol-https
-BUILD_DEPENDS+=	p5-libwww>0.0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS+=	p5-libwww>0.0:www/p5-libwww \
+		p5-LWP-Protocol-https>0.0:www/p5-LWP-Protocol-https
+BUILD_DEPENDS+=	p5-libwww>0.0:www/p5-libwww
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	example*.pl
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
index 3b39119a2cb1..c36a4eadb726 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for 2CheckOut authorization service
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
index 2b85745c0b4a..9e5b10e0eb1b 100644
--- a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Business::OnlinePayment backend module for Authorize.Net
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Business-OnlinePayment>=3:${PORTSDIR}/finance/p5-Business-OnlinePayment \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS=	p5-Business-OnlinePayment>=3:finance/p5-Business-OnlinePayment \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
index 6573922875bd..e6015a8f55d8 100644
--- a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
+++ b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for Bank of America eStores
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-Beanstream/Makefile b/finance/p5-Business-OnlinePayment-Beanstream/Makefile
index ac585fface2d..297aa9e5524b 100644
--- a/finance/p5-Business-OnlinePayment-Beanstream/Makefile
+++ b/finance/p5-Business-OnlinePayment-Beanstream/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for Beanstream
 
-RUN_DEPENDS=	p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
+		p5-URI>=0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-Cardstream/Makefile b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
index 935b9a64ee6f..9d06108b9c97 100644
--- a/finance/p5-Business-OnlinePayment-Cardstream/Makefile
+++ b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for Cardstream
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-Jettis/Makefile b/finance/p5-Business-OnlinePayment-Jettis/Makefile
index 9979d29c21f3..05ee34cab873 100644
--- a/finance/p5-Business-OnlinePayment-Jettis/Makefile
+++ b/finance/p5-Business-OnlinePayment-Jettis/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for Jettis
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
index 1245cec38268..bc6a97b1f461 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for LinkPoint
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
index 6678fd5c0267..6fdb124dfcca 100644
--- a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
+++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for MerchantCommerce authorization service
 
-BUILD_DEPENDS=	p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
index ad5121f213fd..2bc6dcb0a7fb 100644
--- a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
+++ b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for Network1 Financial
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-OCV/Makefile b/finance/p5-Business-OnlinePayment-OCV/Makefile
index 2520c5aad0c9..92a2c6b8550b 100644
--- a/finance/p5-Business-OnlinePayment-OCV/Makefile
+++ b/finance/p5-Business-OnlinePayment-OCV/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Business::OnlinePayment backend module for OCV
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Business-OCV>=0:${PORTSDIR}/finance/p5-Business-OCV \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-OCV>=0:finance/p5-Business-OCV \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-PayConnect/Makefile b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
index 706c24cf13d1..1ed2d6ece8d6 100644
--- a/finance/p5-Business-OnlinePayment-PayConnect/Makefile
+++ b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for PaymentOne PayConnect
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
index f47837f474b5..17365e9392c8 100644
--- a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PaymenTech backend for Business::OnlinePayment
 
-BUILD_DEPENDS=	p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment \
-		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Net-HTTPS-Any>=0.10:${PORTSDIR}/net/p5-Net-HTTPS-Any
+BUILD_DEPENDS=	p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
+		p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Net-HTTPS-Any>=0.10:net/p5-Net-HTTPS-Any
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
index 5d26c6fc22e6..e1158f44f345 100644
--- a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for PaymentsGateway.net ACH Direct
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-SurePay/Makefile b/finance/p5-Business-OnlinePayment-SurePay/Makefile
index 9007d868a003..0e8aec2f09a5 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/Makefile
+++ b/finance/p5-Business-OnlinePayment-SurePay/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for SurePay authorization service
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-TCLink/Makefile b/finance/p5-Business-OnlinePayment-TCLink/Makefile
index 653f06a2bda8..2617e105d8b5 100644
--- a/finance/p5-Business-OnlinePayment-TCLink/Makefile
+++ b/finance/p5-Business-OnlinePayment-TCLink/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for TrustCommerce
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment \
-		p5-Net-TCLink>=0:${PORTSDIR}/net/p5-Net-TCLink
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
+		p5-Net-TCLink>=0:net/p5-Net-TCLink
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
index 46e4b470eafc..12fdff292fff 100644
--- a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for Vital VirtualNet
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-File-CounterFile>=0:${PORTSDIR}/misc/p5-File-CounterFile \
-		p5-String-Parity>=0:${PORTSDIR}/devel/p5-String-Parity \
-		p5-String-LRC>=0:${PORTSDIR}/devel/p5-String-LRC
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-File-CounterFile>=0:misc/p5-File-CounterFile \
+		p5-String-Parity>=0:devel/p5-String-Parity \
+		p5-String-LRC>=0:devel/p5-String-LRC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-eSec/Makefile b/finance/p5-Business-OnlinePayment-eSec/Makefile
index aab4e4f476f3..6133dbc7ea32 100644
--- a/finance/p5-Business-OnlinePayment-eSec/Makefile
+++ b/finance/p5-Business-OnlinePayment-eSec/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Business::OnlinePayment backend module for eSec
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
index 78e6d897a0f6..b5a37ce11da5 100644
--- a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
+++ b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Business::OnlinePayment backend module for iAuthorizer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment
+BUILD_DEPENDS=	p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/finance/p5-Business-OnlinePayment/Makefile b/finance/p5-Business-OnlinePayment/Makefile
index 9b3a8930eb7e..62051d72ceff 100644
--- a/finance/p5-Business-OnlinePayment/Makefile
+++ b/finance/p5-Business-OnlinePayment/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Generic interface for processing online credit card payments
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-HTTPS-Any>=0:${PORTSDIR}/net/p5-Net-HTTPS-Any \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS=	p5-Net-HTTPS-Any>=0:net/p5-Net-HTTPS-Any \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	limit:^[0-9\.]*$$
diff --git a/finance/p5-Business-PayPal-IPN/Makefile b/finance/p5-Business-PayPal-IPN/Makefile
index 4e77966ff6d8..c82639da99db 100644
--- a/finance/p5-Business-PayPal-IPN/Makefile
+++ b/finance/p5-Business-PayPal-IPN/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	coryking@mozimedia.com
 COMMENT=	Perl extension that implements PayPal IPN v1.5
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0.56:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-Crypt-SSLeay>=0.56:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0.56:security/p5-Crypt-SSLeay \
+		p5-libwww>=5.805:www/p5-libwww
+RUN_DEPENDS=	p5-Crypt-SSLeay>=0.56:security/p5-Crypt-SSLeay \
+		p5-libwww>=5.805:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/finance/p5-Business-Stripe/Makefile b/finance/p5-Business-Stripe/Makefile
index 56e4a6025128..18c49bef29d4 100644
--- a/finance/p5-Business-Stripe/Makefile
+++ b/finance/p5-Business-Stripe/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module interface for the Stripe.com payment system
 
-RUN_DEPENDS=	p5-HTTP-Message>=0.0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0.0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>0.0:${PORTSDIR}/www/p5-libwww \
-		p5-MIME-Base64>=0.0:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-HTTP-Message>=0.0:www/p5-HTTP-Message \
+		p5-JSON>=0.0:converters/p5-JSON \
+		p5-libwww>0.0:www/p5-libwww \
+		p5-MIME-Base64>=0.0:converters/p5-MIME-Base64
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
diff --git a/finance/p5-Business-TW-Invoice-U420/Makefile b/finance/p5-Business-TW-Invoice-U420/Makefile
index 3c1d979989db..4573fa898ac2 100644
--- a/finance/p5-Business-TW-Invoice-U420/Makefile
+++ b/finance/p5-Business-TW-Invoice-U420/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Print Taiwan Unified Invoice with U420 printer
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-TW-TSIB-CStorePayment/Makefile b/finance/p5-Business-TW-TSIB-CStorePayment/Makefile
index 4d9eadd55081..f5c95ec571b4 100644
--- a/finance/p5-Business-TW-TSIB-CStorePayment/Makefile
+++ b/finance/p5-Business-TW-TSIB-CStorePayment/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module for Taishin Bank Convenient Store Payment Management
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile b/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile
index 6ddc3266a960..34a4aad7461d 100644
--- a/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile
+++ b/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Module for Taishin Bank Virtual Account Management
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Business-WorldPay-Junior/Makefile b/finance/p5-Business-WorldPay-Junior/Makefile
index 6abf058f33cc..acb00a9309ae 100644
--- a/finance/p5-Business-WorldPay-Junior/Makefile
+++ b/finance/p5-Business-WorldPay-Junior/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl module to handle WorldPay Junior for payment services
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Business-CreditCard>=0:${PORTSDIR}/finance/p5-Business-CreditCard \
-		p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-Business-CreditCard>=0:finance/p5-Business-CreditCard \
+		p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Data-Currency/Makefile b/finance/p5-Data-Currency/Makefile
index 632643c0fcaa..6854b130b97a 100644
--- a/finance/p5-Data-Currency/Makefile
+++ b/finance/p5-Data-Currency/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Container class for currency conversion/formatting
 
-BUILD_DEPENDS=	p5-Class-Accessor-Grouped>=0:${PORTSDIR}/devel/p5-Class-Accessor-Grouped \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Finance-Currency-Convert-WebserviceX>=0:${PORTSDIR}/finance/p5-Finance-Currency-Convert-WebserviceX \
-		p5-Locale-Codes>=0:${PORTSDIR}/misc/p5-Locale-Codes \
-		p5-Locale-Currency-Format>=0:${PORTSDIR}/finance/p5-Locale-Currency-Format
+BUILD_DEPENDS=	p5-Class-Accessor-Grouped>=0:devel/p5-Class-Accessor-Grouped \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-Finance-Currency-Convert-WebserviceX>=0:finance/p5-Finance-Currency-Convert-WebserviceX \
+		p5-Locale-Codes>=0:misc/p5-Locale-Codes \
+		p5-Locale-Currency-Format>=0:finance/p5-Locale-Currency-Format
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Finance-Bitcoin/Makefile b/finance/p5-Finance-Bitcoin/Makefile
index d5d748cac8f1..25b37e3c3ca4 100644
--- a/finance/p5-Finance-Bitcoin/Makefile
+++ b/finance/p5-Finance-Bitcoin/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl interface to a bitcoin instance
 
-BUILD_DEPENDS=	p5-JSON-RPC>=0.96:${PORTSDIR}/devel/p5-JSON-RPC \
-		p5-Class-Accessor>=0.34:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Module-Signature>=0.66:${PORTSDIR}/security/p5-Module-Signature \
-		p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Object-AUTHORITY>=0:${PORTSDIR}/devel/p5-Object-Authority
+BUILD_DEPENDS=	p5-JSON-RPC>=0.96:devel/p5-JSON-RPC \
+		p5-Class-Accessor>=0.34:devel/p5-Class-Accessor \
+		p5-Module-Signature>=0.66:security/p5-Module-Signature \
+		p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Object-AUTHORITY>=0:devel/p5-Object-Authority
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
index d3c9b479b943..9cbd96d01a11 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Lightweight currency conversion using WebserviceX.NET
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Module-Install>=0.65:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Module-Install>=0.65:devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Finance-Currency-Convert-XE/Makefile b/finance/p5-Finance-Currency-Convert-XE/Makefile
index 8341bf1f1760..b738d268b8d1 100644
--- a/finance/p5-Finance-Currency-Convert-XE/Makefile
+++ b/finance/p5-Finance-Currency-Convert-XE/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Currency conversion module
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-WWW-Mechanize>=1.60:${PORTSDIR}/www/p5-WWW-Mechanize
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-WWW-Mechanize>=1.60:www/p5-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/finance/p5-Finance-Quote/Makefile b/finance/p5-Finance-Quote/Makefile
index 15385fcafeec..eeeef5456946 100644
--- a/finance/p5-Finance-Quote/Makefile
+++ b/finance/p5-Finance-Quote/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Get stock and mutual fund quotes from various exchanges
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-HTML-TableExtract>=0:${PORTSDIR}/www/p5-HTML-TableExtract \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Mozilla-CA>=0:${PORTSDIR}/www/p5-Mozilla-CA \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Kwalitee>=0:${PORTSDIR}/devel/p5-Test-Kwalitee \
-		p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic
+TEST_DEPENDS=	p5-Test-Kwalitee>=0:devel/p5-Test-Kwalitee \
+		p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/finance/p5-Finance-QuoteHist/Makefile b/finance/p5-Finance-QuoteHist/Makefile
index 32523e89ac5b..d440f4fc1d7e 100644
--- a/finance/p5-Finance-QuoteHist/Makefile
+++ b/finance/p5-Finance-QuoteHist/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl module for fetching historical stock quotes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-HTML-TableExtract>=2.07:${PORTSDIR}/www/p5-HTML-TableExtract \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-HTML-TableExtract>=2.07:www/p5-HTML-TableExtract \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/finance/p5-Finance-QuoteTW/Makefile b/finance/p5-Finance-QuoteTW/Makefile
index d0c37b33124b..00d2760e7eb5 100644
--- a/finance/p5-Finance-QuoteTW/Makefile
+++ b/finance/p5-Finance-QuoteTW/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fetch quotes of mutual funds in Taiwan
 
-RUN_DEPENDS=	p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper \
-		p5-HTML-Encoding>=0.6:${PORTSDIR}/www/p5-HTML-Encoding \
-		p5-HTML-TableExtract>=2.1:${PORTSDIR}/www/p5-HTML-TableExtract \
-		p5-Spiffy>=0.3:${PORTSDIR}/devel/p5-Spiffy \
-		p5-WWW-Mechanize>=1.34:${PORTSDIR}/www/p5-WWW-Mechanize
+RUN_DEPENDS=	p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+		p5-HTML-Encoding>=0.6:www/p5-HTML-Encoding \
+		p5-HTML-TableExtract>=2.1:www/p5-HTML-TableExtract \
+		p5-Spiffy>=0.3:devel/p5-Spiffy \
+		p5-WWW-Mechanize>=1.34:www/p5-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Finance-TW-EmergingQuote/Makefile b/finance/p5-Finance-TW-EmergingQuote/Makefile
index aae38b928e64..eed9261df59b 100644
--- a/finance/p5-Finance-TW-EmergingQuote/Makefile
+++ b/finance/p5-Finance-TW-EmergingQuote/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Check stock quotes from Taiwan Emerging Stock
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-Finance-TW-TSEQuote/Makefile b/finance/p5-Finance-TW-TSEQuote/Makefile
index 0e08c18f400b..ea99fc3e76eb 100644
--- a/finance/p5-Finance-TW-TSEQuote/Makefile
+++ b/finance/p5-Finance-TW-TSEQuote/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Check stock quotes from Taiwan Security Exchange
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cache>=0:${PORTSDIR}/devel/p5-App-Cache \
-		p5-HTML-TableExtract>=0:${PORTSDIR}/www/p5-HTML-TableExtract \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-App-Cache>=0:devel/p5-App-Cache \
+		p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-URI>=0:net/p5-URI \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/finance/p5-Finance-YahooQuote/Makefile b/finance/p5-Finance-YahooQuote/Makefile
index d263d747517a..a0cee581ff8d 100644
--- a/finance/p5-Finance-YahooQuote/Makefile
+++ b/finance/p5-Finance-YahooQuote/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Get stock quotes from Yahoo! Finance
 
-RUN_DEPENDS=	p5-HTML-Parser>=2.2:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=1.62:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-HTML-Parser>=2.2:www/p5-HTML-Parser \
+		p5-libwww>=1.62:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/finance/p5-PayflowPro/Makefile b/finance/p5-PayflowPro/Makefile
index 7c60e1f29512..83d9f6501752 100644
--- a/finance/p5-PayflowPro/Makefile
+++ b/finance/p5-PayflowPro/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Pure Perl PayflowPro payment gateway interface
 
-RUN_DEPENDS+=	p5-libwww>0.0:${PORTSDIR}/www/p5-libwww
-BUILD_DEPENDS+=	p5-libwww>0.0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS+=	p5-libwww>0.0:www/p5-libwww
+BUILD_DEPENDS+=	p5-libwww>0.0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/finance/py-python-obelisk/Makefile b/finance/py-python-obelisk/Makefile
index a3beaff9f122..f745aa4ee06f 100644
--- a/finance/py-python-obelisk/Makefile
+++ b/finance/py-python-obelisk/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Python native client for the obelisk blockchain server
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>0:${PORTSDIR}/devel/py-twistedCore \
-		${PYTHON_PKGNAMEPREFIX}ecdsa>0:${PORTSDIR}/security/py-ecdsa \
-		${PYTHON_PKGNAMEPREFIX}pyzmq>=14.5.0:${PORTSDIR}/net/py-pyzmq
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>0:devel/py-twistedCore \
+		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \
+		${PYTHON_PKGNAMEPREFIX}pyzmq>=14.5.0:net/py-pyzmq
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/finance/py-stripe/Makefile b/finance/py-stripe/Makefile
index c3436a908a28..9cd560736436 100644
--- a/finance/py-stripe/Makefile
+++ b/finance/py-stripe/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Stripe Python bindings
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0.8.8:${PORTSDIR}/www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycurl>=7.19:${PORTSDIR}/ftp/py-pycurl \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0.8.8:www/py-requests
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycurl>=7.19:ftp/py-pycurl \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/finance/py-vatnumber/Makefile b/finance/py-vatnumber/Makefile
index 6e9994db3ae6..cffb05983be5 100644
--- a/finance/py-vatnumber/Makefile
+++ b/finance/py-vatnumber/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python module to validate VAT numbers
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}stdnum>=1.1:${PORTSDIR}/devel/py-stdnum
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}stdnum>=1.1:devel/py-stdnum
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index a13a122cc668..f9bee7ea7bee 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple Qt-based financial manager
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-		libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6
+LIB_DEPENDS=	libgpgme.so:security/gpgme \
+		libqwt6.so:x11-toolkits/qwt6
 
 USES=		compiler:c++11-lib qmake:norecursive tar:tgz
 USE_QT4=	corelib gui sql moc_build rcc_build uic_build
diff --git a/finance/rubygem-money/Makefile b/finance/rubygem-money/Makefile
index 3ca9920b44a4..81b30faeaf1f 100644
--- a/finance/rubygem-money/Makefile
+++ b/finance/rubygem-money/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for handling money and different currencies
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-i18n>=0.6.4:${PORTSDIR}/devel/rubygem-i18n
+RUN_DEPENDS=	rubygem-i18n>=0.6.4:devel/rubygem-i18n
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/finance/sabernetdcs-client/Makefile b/finance/sabernetdcs-client/Makefile
index 04258399468b..31b8e1983e2f 100644
--- a/finance/sabernetdcs-client/Makefile
+++ b/finance/sabernetdcs-client/Makefile
@@ -15,7 +15,7 @@ COMMENT=	SaberNet DCS - A labor data collection system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyro>=0:${PORTSDIR}/devel/py-pyro
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyro>=0:devel/py-pyro
 
 USE_GNOME=	pygtk2
 USE_PYTHON=	distutils
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index ec0bd257546b..a6a1e0f8352f 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -8,11 +8,11 @@ MASTER_SITES=	KDE/stable/${PORTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE4 personal finance manager
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libofx.so:${PORTSDIR}/finance/libofx \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee \
-		libkactivities.so:${PORTSDIR}/x11/kactivities
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
+LIB_DEPENDS=	libofx.so:finance/libofx \
+		libqca.so:devel/qca \
+		libgrantlee_gui.so:devel/grantlee \
+		libkactivities.so:x11/kactivities
 
 USES=		cmake:outsource gettext shared-mime-info sqlite:3 tar:xz
 USE_QT4=	qmake_build moc_build uic_build rcc_build designer_build \
diff --git a/finance/sql-ledger/Makefile b/finance/sql-ledger/Makefile
index 2a26f3adbbbc..59f51a76a83b 100644
--- a/finance/sql-ledger/Makefile
+++ b/finance/sql-ledger/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Double entry accounting system
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+BUILD_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
diff --git a/finance/tryton28/Makefile b/finance/tryton28/Makefile
index 751041121151..68ce15c68989 100644
--- a/finance/tryton28/Makefile
+++ b/finance/tryton28/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Gtk+ Client)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2012:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz
 
 CONFLICTS=	tryton-2.[46].*
 
diff --git a/finance/trytond28/Makefile b/finance/trytond28/Makefile
index 3bc779c05392..c81693ef48da 100644
--- a/finance/trytond28/Makefile
+++ b/finance/trytond28/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Tryton Application Platform (Server)
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mx/__init__.py:${PORTSDIR}/lang/py-mx-base \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}Genshi>0.5.1:${PORTSDIR}/textproc/py-genshi \
-		${PYTHON_PKGNAMEPREFIX}relatorio>=0.6.0:${PORTSDIR}/print/py-relatorio \
-		${PYTHON_PKGNAMEPREFIX}polib>=0.7.0:${PORTSDIR}/devel/py-polib \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mx/__init__.py:lang/py-mx-base \
+		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}Genshi>0.5.1:textproc/py-genshi \
+		${PYTHON_PKGNAMEPREFIX}relatorio>=0.6.0:print/py-relatorio \
+		${PYTHON_PKGNAMEPREFIX}polib>=0.7.0:devel/py-polib \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	trytond-2.[46].*
@@ -52,19 +52,19 @@ post-patch:
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWEBDAV}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:${PORTSDIR}/www/py-pywebdav
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav
 .endif
 
 .if ${PORT_OPTIONS:MPYOPENSSL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 .endif
 
 .if ${PORT_OPTIONS:MPYDOT}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pydot>=0:${PORTSDIR}/graphics/py-pydot
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot
 .endif
 
 .if ${PORT_OPTIONS:MPYTZ}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz
 .endif
 
 post-install:
diff --git a/finance/trytond28_account/Makefile b/finance/trytond28_account/Makefile
index 946cfff823e1..c497a40db0e7 100644
--- a/finance/trytond28_account/Makefile
+++ b/finance/trytond28_account/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tryton Application Platform (Account Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28 \
-		trytond28_company>=2.8.0:${PORTSDIR}/finance/trytond28_company \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28 \
+		trytond28_company>=2.8.0:finance/trytond28_company \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil
 
 CONFLICTS=	trytond_account-2.[46].*
 
diff --git a/finance/trytond28_account_asset/Makefile b/finance/trytond28_account_asset/Makefile
index 571546b7e7ea..ad7cbbdb359b 100644
--- a/finance/trytond28_account_asset/Makefile
+++ b/finance/trytond28_account_asset/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Account Asset Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product \
-		trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice
+RUN_DEPENDS=	trytond28_product>=2.8.0:finance/trytond28_product \
+		trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
 
 CONFLICTS=	trytond_account-2.[46].*
 
diff --git a/finance/trytond28_account_be/Makefile b/finance/trytond28_account_be/Makefile
index 7d891a3e72a7..7da9ef4f9af3 100644
--- a/finance/trytond28_account_be/Makefile
+++ b/finance/trytond28_account_be/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Belgian Account Chart)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account>=2.8.1:${PORTSDIR}/finance/trytond28_account
+RUN_DEPENDS=	trytond28_account>=2.8.1:finance/trytond28_account
 
 CONFLICTS=	trytond_account-2.[46].*
 
diff --git a/finance/trytond28_account_invoice/Makefile b/finance/trytond28_account_invoice/Makefile
index 1287e967c5fc..a1d333a9aa09 100644
--- a/finance/trytond28_account_invoice/Makefile
+++ b/finance/trytond28_account_invoice/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Account Invoice Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account_product>=2.8.0:${PORTSDIR}/finance/trytond28_account_product
+RUN_DEPENDS=	trytond28_account_product>=2.8.0:finance/trytond28_account_product
 
 CONFLICTS=	trytond_account_invoice-2.[46].*
 
diff --git a/finance/trytond28_account_invoice_history/Makefile b/finance/trytond28_account_invoice_history/Makefile
index f6794a5eecd2..1d3679a76a7c 100644
--- a/finance/trytond28_account_invoice_history/Makefile
+++ b/finance/trytond28_account_invoice_history/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Account Invoice History Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice
+RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
 
 CONFLICTS=	trytond_account_invoice_history-2.[46].*
 
diff --git a/finance/trytond28_account_invoice_line_standalone/Makefile b/finance/trytond28_account_invoice_line_standalone/Makefile
index 8e113ba5de1a..a8d12325aa84 100644
--- a/finance/trytond28_account_invoice_line_standalone/Makefile
+++ b/finance/trytond28_account_invoice_line_standalone/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Account Invoice Line Standalone Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice
+RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
 
 CONFLICTS=	trytond_account_invoice_line_standalone-2.[46].*
 
diff --git a/finance/trytond28_account_product/Makefile b/finance/trytond28_account_product/Makefile
index 822a2dd99949..4939365a8b32 100644
--- a/finance/trytond28_account_product/Makefile
+++ b/finance/trytond28_account_product/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tryton Application Platform (Account Product Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account>=2.8.1:${PORTSDIR}/finance/trytond28_account \
-		trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product
+RUN_DEPENDS=	trytond28_account>=2.8.1:finance/trytond28_account \
+		trytond28_product>=2.8.0:finance/trytond28_product
 
 CONFLICTS=	trytond_account_product-2.[46].*
 
diff --git a/finance/trytond28_account_statement/Makefile b/finance/trytond28_account_statement/Makefile
index 8a178588772c..d78c03eb35f2 100644
--- a/finance/trytond28_account_statement/Makefile
+++ b/finance/trytond28_account_statement/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Account Statement Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice
+RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
 
 CONFLICTS=	trytond_account_statement-2.[46].*
 
diff --git a/finance/trytond28_account_stock_anglo_saxon/Makefile b/finance/trytond28_account_stock_anglo_saxon/Makefile
index 36aec30ed91c..12b5892472c3 100644
--- a/finance/trytond28_account_stock_anglo_saxon/Makefile
+++ b/finance/trytond28_account_stock_anglo_saxon/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Account Stock Anglo Saxon Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice \
-		trytond28_account_stock_continental>=2.8.1:${PORTSDIR}/finance/trytond28_account_stock_continental
+RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice \
+		trytond28_account_stock_continental>=2.8.1:finance/trytond28_account_stock_continental
 
 CONFLICTS=	trytond_account_stock_anglo_saxon-2.[46].*
 
diff --git a/finance/trytond28_account_stock_continental/Makefile b/finance/trytond28_account_stock_continental/Makefile
index c4b543325b6c..4819fd0f7efa 100644
--- a/finance/trytond28_account_stock_continental/Makefile
+++ b/finance/trytond28_account_stock_continental/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tryton Application Platform (Account Stock Continental Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account_product>=2.8.0:${PORTSDIR}/finance/trytond28_account_product \
-		trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_account_product>=2.8.0:finance/trytond28_account_product \
+		trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_account_stock_continental-2.[46].*
 
diff --git a/finance/trytond28_analytic_account/Makefile b/finance/trytond28_analytic_account/Makefile
index fabb75ac0b2c..9d04fbb98158 100644
--- a/finance/trytond28_analytic_account/Makefile
+++ b/finance/trytond28_analytic_account/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Tryton Application Platform (Analytic Account Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_company>=2.8.0:${PORTSDIR}/finance/trytond28_company \
-		trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party \
-		trytond28_currency>=2.8.0:${PORTSDIR}/finance/trytond28_currency \
-		trytond28_account>=2.8.1:${PORTSDIR}/finance/trytond28_account
+RUN_DEPENDS=	trytond28_company>=2.8.0:finance/trytond28_company \
+		trytond28_party>=2.8.0:finance/trytond28_party \
+		trytond28_currency>=2.8.0:finance/trytond28_currency \
+		trytond28_account>=2.8.1:finance/trytond28_account
 
 CONFLICTS=	trytond_analytic_account-2.[46].*
 
diff --git a/finance/trytond28_analytic_invoice/Makefile b/finance/trytond28_analytic_invoice/Makefile
index 442d311071cf..a62c7c60b85e 100644
--- a/finance/trytond28_analytic_invoice/Makefile
+++ b/finance/trytond28_analytic_invoice/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tryton Application Platform (Analytic Invoice Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_analytic_account>=2.8.0:${PORTSDIR}/finance/trytond28_analytic_account \
-		trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice
+RUN_DEPENDS=	trytond28_analytic_account>=2.8.0:finance/trytond28_analytic_account \
+		trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
 
 CONFLICTS=	trytond_analytic_invoice-2.[46].*
 
diff --git a/finance/trytond28_analytic_purchase/Makefile b/finance/trytond28_analytic_purchase/Makefile
index e2867cbf4376..d03eda58a8b9 100644
--- a/finance/trytond28_analytic_purchase/Makefile
+++ b/finance/trytond28_analytic_purchase/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tryton Application Platform (Analytic Purchase Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_analytic_account>=2.8.0:${PORTSDIR}/finance/trytond28_analytic_account \
-		trytond28_analytic_invoice>=2.8.0:${PORTSDIR}/finance/trytond28_analytic_invoice \
-		trytond28_purchase>=2.8.0:${PORTSDIR}/finance/trytond28_purchase
+RUN_DEPENDS=	trytond28_analytic_account>=2.8.0:finance/trytond28_analytic_account \
+		trytond28_analytic_invoice>=2.8.0:finance/trytond28_analytic_invoice \
+		trytond28_purchase>=2.8.0:finance/trytond28_purchase
 
 CONFLICTS=	trytond_analytic_purchase-2.[46].*
 
diff --git a/finance/trytond28_analytic_sale/Makefile b/finance/trytond28_analytic_sale/Makefile
index 1c23e25134f6..8fd412b78a24 100644
--- a/finance/trytond28_analytic_sale/Makefile
+++ b/finance/trytond28_analytic_sale/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tryton Application Platform (Analytic Sale Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_analytic_account>=2.8.0:${PORTSDIR}/finance/trytond28_analytic_account \
-		trytond28_analytic_invoice>=2.8.0:${PORTSDIR}/finance/trytond28_analytic_invoice \
-		trytond28_sale>=2.8.1:${PORTSDIR}/finance/trytond28_sale
+RUN_DEPENDS=	trytond28_analytic_account>=2.8.0:finance/trytond28_analytic_account \
+		trytond28_analytic_invoice>=2.8.0:finance/trytond28_analytic_invoice \
+		trytond28_sale>=2.8.1:finance/trytond28_sale
 
 CONFLICTS=	trytond_analytic_sale-2.[46].*
 
diff --git a/finance/trytond28_calendar/Makefile b/finance/trytond28_calendar/Makefile
index 4962dee670bb..13580f940fb6 100644
--- a/finance/trytond28_calendar/Makefile
+++ b/finance/trytond28_calendar/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Tryton Application Platform (Calendar Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28 \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:${PORTSDIR}/deskutils/py-vobject \
-		${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:${PORTSDIR}/www/py-pywebdav \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28 \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject \
+		${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil
 
 CONFLICTS=	trytond_calendar-2.[46].*
 
diff --git a/finance/trytond28_calendar_classification/Makefile b/finance/trytond28_calendar_classification/Makefile
index 33fb8c3a93b0..5055838da072 100644
--- a/finance/trytond28_calendar_classification/Makefile
+++ b/finance/trytond28_calendar_classification/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Calendar Classification Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_calendar>=2.8.0:${PORTSDIR}/finance/trytond28_calendar
+RUN_DEPENDS=	trytond28_calendar>=2.8.0:finance/trytond28_calendar
 
 CONFLICTS=	trytond_calendar_classification-2.[46].*
 
diff --git a/finance/trytond28_calendar_scheduling/Makefile b/finance/trytond28_calendar_scheduling/Makefile
index c6528c54dd06..e4999adaf47d 100644
--- a/finance/trytond28_calendar_scheduling/Makefile
+++ b/finance/trytond28_calendar_scheduling/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Calendar Scheduling Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_calendar>=2.8.0:${PORTSDIR}/finance/trytond28_calendar
+RUN_DEPENDS=	trytond28_calendar>=2.8.0:finance/trytond28_calendar
 
 CONFLICTS=	trytond_calendar_scheduling-2.[46].*
 
diff --git a/finance/trytond28_calendar_todo/Makefile b/finance/trytond28_calendar_todo/Makefile
index bf195bc4e8b4..a27fe62c50a0 100644
--- a/finance/trytond28_calendar_todo/Makefile
+++ b/finance/trytond28_calendar_todo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Calendar Todo Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_calendar>=2.8.0:${PORTSDIR}/finance/trytond28_calendar
+RUN_DEPENDS=	trytond28_calendar>=2.8.0:finance/trytond28_calendar
 
 CONFLICTS=	trytond_calendar_todo-2.[46].*
 
diff --git a/finance/trytond28_carrier/Makefile b/finance/trytond28_carrier/Makefile
index e9e399efdfd4..e0a9d256396c 100644
--- a/finance/trytond28_carrier/Makefile
+++ b/finance/trytond28_carrier/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tryton Application Platform (Carrier Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party \
-		trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product
+RUN_DEPENDS=	trytond28_party>=2.8.0:finance/trytond28_party \
+		trytond28_product>=2.8.0:finance/trytond28_product
 
 CONFLICTS=	trytond_carrier-2.[46].*
 
diff --git a/finance/trytond28_carrier_percentage/Makefile b/finance/trytond28_carrier_percentage/Makefile
index df8b0dda7c93..902f0a6c6b40 100644
--- a/finance/trytond28_carrier_percentage/Makefile
+++ b/finance/trytond28_carrier_percentage/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tryton Application Platform (Carrier Percentage Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_carrier>=2.8.0:${PORTSDIR}/finance/trytond28_carrier \
-		trytond28_currency>=2.8.0:${PORTSDIR}/finance/trytond28_currency
+RUN_DEPENDS=	trytond28_carrier>=2.8.0:finance/trytond28_carrier \
+		trytond28_currency>=2.8.0:finance/trytond28_currency
 
 CONFLICTS=	trytond_carrier_percentage-2.[46].*
 
diff --git a/finance/trytond28_carrier_weight/Makefile b/finance/trytond28_carrier_weight/Makefile
index 19df82a22263..eda078171e40 100644
--- a/finance/trytond28_carrier_weight/Makefile
+++ b/finance/trytond28_carrier_weight/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Carrier Weight Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product_measurements>=2.8.0:${PORTSDIR}/finance/trytond28_product_measurements \
-		trytond28_carrier>=2.8.0:${PORTSDIR}/finance/trytond28_carrier
+RUN_DEPENDS=	trytond28_product_measurements>=2.8.0:finance/trytond28_product_measurements \
+		trytond28_carrier>=2.8.0:finance/trytond28_carrier
 
 CONFLICTS=	trytond_carrier_weight-2.[46].*
 
diff --git a/finance/trytond28_company/Makefile b/finance/trytond28_company/Makefile
index 63650bab7753..f3b503d5a12e 100644
--- a/finance/trytond28_company/Makefile
+++ b/finance/trytond28_company/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tryton Application Platform (Company Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party \
-		trytond28_currency>=2.8.0:${PORTSDIR}/finance/trytond28_currency
+RUN_DEPENDS=	trytond28_party>=2.8.0:finance/trytond28_party \
+		trytond28_currency>=2.8.0:finance/trytond28_currency
 
 CONFLICTS=	trytond_company-2.[46].*
 
diff --git a/finance/trytond28_company_work_time/Makefile b/finance/trytond28_company_work_time/Makefile
index fc520bbbce0b..ae9d022b61b2 100644
--- a/finance/trytond28_company_work_time/Makefile
+++ b/finance/trytond28_company_work_time/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Company Work Time Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_company>=2.8.0:${PORTSDIR}/finance/trytond28_company
+RUN_DEPENDS=	trytond28_company>=2.8.0:finance/trytond28_company
 
 CONFLICTS=	trytond_company_work_time-2.[46].*
 
diff --git a/finance/trytond28_country/Makefile b/finance/trytond28_country/Makefile
index 00911e65252a..d78c79cd1ecc 100644
--- a/finance/trytond28_country/Makefile
+++ b/finance/trytond28_country/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Country Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28
 
 CONFLICTS=	trytond_country-2.[46].*
 
diff --git a/finance/trytond28_currency/Makefile b/finance/trytond28_currency/Makefile
index 5a542bfd1a26..04ed570f6be4 100644
--- a/finance/trytond28_currency/Makefile
+++ b/finance/trytond28_currency/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Currency Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28
 
 CONFLICTS=	trytond_currency-2.[46].*
 
diff --git a/finance/trytond28_dashboard/Makefile b/finance/trytond28_dashboard/Makefile
index 15c1631e3972..ce7a54f5b297 100644
--- a/finance/trytond28_dashboard/Makefile
+++ b/finance/trytond28_dashboard/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Dashboard Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28
 
 CONFLICTS=	trytond_dashboard-2.[46].*
 
diff --git a/finance/trytond28_ldap_authentication/Makefile b/finance/trytond28_ldap_authentication/Makefile
index 8fe577263a92..a7921b437f66 100644
--- a/finance/trytond28_ldap_authentication/Makefile
+++ b/finance/trytond28_ldap_authentication/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (LDAP Authentication Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_ldap_connection>=2.8.0:${PORTSDIR}/finance/trytond28_ldap_connection
+RUN_DEPENDS=	trytond28_ldap_connection>=2.8.0:finance/trytond28_ldap_connection
 
 CONFLICTS=	trytond_ldap_authentication-2.[46].*
 
diff --git a/finance/trytond28_ldap_connection/Makefile b/finance/trytond28_ldap_connection/Makefile
index 92cd38488445..80cf6d737aa2 100644
--- a/finance/trytond28_ldap_connection/Makefile
+++ b/finance/trytond28_ldap_connection/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tryton Application Platform (LDAP Connection Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28 \
-		${PYTHON_PKGNAMEPREFIX}ldap>=2.4.10:${PORTSDIR}/net/py-ldap
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28 \
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.4.10:net/py-ldap
 
 CONFLICTS=	trytond_ldap_connection-2.[46].*
 
diff --git a/finance/trytond28_party/Makefile b/finance/trytond28_party/Makefile
index 894a83e7ae8b..95755481688e 100644
--- a/finance/trytond28_party/Makefile
+++ b/finance/trytond28_party/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tryton Application Platform (Party Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28 \
-		trytond28_country>=2.8.0:${PORTSDIR}/finance/trytond28_country \
-		${PYTHON_PKGNAMEPREFIX}vatnumber>=1.0.0:${PORTSDIR}/finance/py-vatnumber
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28 \
+		trytond28_country>=2.8.0:finance/trytond28_country \
+		${PYTHON_PKGNAMEPREFIX}vatnumber>=1.0.0:finance/py-vatnumber
 
 CONFLICTS=	trytond_party-2.[46].*
 
diff --git a/finance/trytond28_party_siret/Makefile b/finance/trytond28_party_siret/Makefile
index 54326c504375..1010095eb630 100644
--- a/finance/trytond28_party_siret/Makefile
+++ b/finance/trytond28_party_siret/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Party Siret Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party
+RUN_DEPENDS=	trytond28_party>=2.8.0:finance/trytond28_party
 
 CONFLICTS=	trytond_party_siret-2.[46].*
 
diff --git a/finance/trytond28_party_vcarddav/Makefile b/finance/trytond28_party_vcarddav/Makefile
index d03e49e2ab5a..e420c601c1bd 100644
--- a/finance/trytond28_party_vcarddav/Makefile
+++ b/finance/trytond28_party_vcarddav/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tryton Application Platform (Party VCardDAV Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:${PORTSDIR}/deskutils/py-vobject \
-		${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:${PORTSDIR}/www/py-pywebdav
+RUN_DEPENDS=	trytond28_party>=2.8.0:finance/trytond28_party \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject \
+		${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav
 
 CONFLICTS=	trytond_party_vcarddav-2.[46].*
 
diff --git a/finance/trytond28_product/Makefile b/finance/trytond28_product/Makefile
index dc62b7c2e28f..d7c3f131287c 100644
--- a/finance/trytond28_product/Makefile
+++ b/finance/trytond28_product/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Product Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28
 
 CONFLICTS=	trytond_product-2.[46].*
 
diff --git a/finance/trytond28_product_attribute/Makefile b/finance/trytond28_product_attribute/Makefile
index 4385e95eab78..950d7e91805b 100644
--- a/finance/trytond28_product_attribute/Makefile
+++ b/finance/trytond28_product_attribute/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Product Attribute Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product
+RUN_DEPENDS=	trytond28_product>=2.8.0:finance/trytond28_product
 
 CONFLICTS=	trytond_product_attribute-2.[46].*
 
diff --git a/finance/trytond28_product_cost_fifo/Makefile b/finance/trytond28_product_cost_fifo/Makefile
index 3dcd098df3ed..c44d59792f56 100644
--- a/finance/trytond28_product_cost_fifo/Makefile
+++ b/finance/trytond28_product_cost_fifo/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Product Cost Fifo Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product \
-		trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_product>=2.8.0:finance/trytond28_product \
+		trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_product_cost_fifo-2.[46].*
 
diff --git a/finance/trytond28_product_cost_history/Makefile b/finance/trytond28_product_cost_history/Makefile
index b7d5da4e8118..c520759db487 100644
--- a/finance/trytond28_product_cost_history/Makefile
+++ b/finance/trytond28_product_cost_history/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Product Cost History Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product
+RUN_DEPENDS=	trytond28_product>=2.8.0:finance/trytond28_product
 
 CONFLICTS=	trytond_product_cost_history-2.[46].*
 
diff --git a/finance/trytond28_product_measurements/Makefile b/finance/trytond28_product_measurements/Makefile
index d76c2cda303a..723ddca28527 100644
--- a/finance/trytond28_product_measurements/Makefile
+++ b/finance/trytond28_product_measurements/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Product Measurements Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product
+RUN_DEPENDS=	trytond28_product>=2.8.0:finance/trytond28_product
 
 CONFLICTS=	trytond_product_measurements-2.[46].*
 
diff --git a/finance/trytond28_product_price_list/Makefile b/finance/trytond28_product_price_list/Makefile
index 4a71c74cd360..0979eb2fa282 100644
--- a/finance/trytond28_product_price_list/Makefile
+++ b/finance/trytond28_product_price_list/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tryton Application Platform (Product Price List Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product \
-		trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party \
-		trytond28_company>=2.8.0:${PORTSDIR}/finance/trytond28_company
+RUN_DEPENDS=	trytond28_product>=2.8.0:finance/trytond28_product \
+		trytond28_party>=2.8.0:finance/trytond28_party \
+		trytond28_company>=2.8.0:finance/trytond28_company
 
 CONFLICTS=	trytond_product_price_list-2.[46].*
 
diff --git a/finance/trytond28_production/Makefile b/finance/trytond28_production/Makefile
index 43d0e3480207..a6a65c4d8989 100644
--- a/finance/trytond28_production/Makefile
+++ b/finance/trytond28_production/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tryton Application Platform (Production Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product \
-		trytond28_company>=2.8.0:${PORTSDIR}/finance/trytond28_company \
-		trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_product>=2.8.0:finance/trytond28_product \
+		trytond28_company>=2.8.0:finance/trytond28_company \
+		trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_production-2.[46].*
 
diff --git a/finance/trytond28_project/Makefile b/finance/trytond28_project/Makefile
index 343df98b3793..25051008081c 100644
--- a/finance/trytond28_project/Makefile
+++ b/finance/trytond28_project/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tryton Application Platform (Project Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28 \
-		trytond28_timesheet>=2.8.0:${PORTSDIR}/finance/trytond28_timesheet \
-		trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28 \
+		trytond28_timesheet>=2.8.0:finance/trytond28_timesheet \
+		trytond28_party>=2.8.0:finance/trytond28_party
 
 CONFLICTS=	trytond_project-2.[46].*
 
diff --git a/finance/trytond28_project_invoice/Makefile b/finance/trytond28_project_invoice/Makefile
index bf7cd03f7ee5..b18f173bd8d5 100644
--- a/finance/trytond28_project_invoice/Makefile
+++ b/finance/trytond28_project_invoice/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Tryton Application Platform (Project Invoice Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_timesheet>=2.8.0:${PORTSDIR}/finance/trytond28_timesheet \
-		trytond28_project_revenue>=2.8.0:${PORTSDIR}/finance/trytond28_project_revenue \
-		trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice \
-		trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product
+RUN_DEPENDS=	trytond28_timesheet>=2.8.0:finance/trytond28_timesheet \
+		trytond28_project_revenue>=2.8.0:finance/trytond28_project_revenue \
+		trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice \
+		trytond28_product>=2.8.0:finance/trytond28_product
 
 CONFLICTS=	trytond_project_invoice-2.[46].*
 
diff --git a/finance/trytond28_project_plan/Makefile b/finance/trytond28_project_plan/Makefile
index 2ed58735f332..3913baacdb98 100644
--- a/finance/trytond28_project_plan/Makefile
+++ b/finance/trytond28_project_plan/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Project Plan Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_project>=2.8.0:${PORTSDIR}/finance/trytond28_project
+RUN_DEPENDS=	trytond28_project>=2.8.0:finance/trytond28_project
 
 CONFLICTS=	trytond_project_plan-2.[46].*
 
diff --git a/finance/trytond28_project_revenue/Makefile b/finance/trytond28_project_revenue/Makefile
index 9a619301b534..b0f049d18027 100644
--- a/finance/trytond28_project_revenue/Makefile
+++ b/finance/trytond28_project_revenue/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Project Revenue Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_project>=2.8.0:${PORTSDIR}/finance/trytond28_project \
-		trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product
+RUN_DEPENDS=	trytond28_project>=2.8.0:finance/trytond28_project \
+		trytond28_product>=2.8.0:finance/trytond28_product
 
 CONFLICTS=	trytond_project_revenue-2.[46].*
 
diff --git a/finance/trytond28_purchase/Makefile b/finance/trytond28_purchase/Makefile
index f241ae2b0f9b..4412e2474134 100644
--- a/finance/trytond28_purchase/Makefile
+++ b/finance/trytond28_purchase/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Purchase Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock \
-		trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice
+RUN_DEPENDS=	trytond28_stock>=2.8.2:finance/trytond28_stock \
+		trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
 
 CONFLICTS=	trytond_purchase-2.[46].*
 
diff --git a/finance/trytond28_purchase_invoice_line_standalone/Makefile b/finance/trytond28_purchase_invoice_line_standalone/Makefile
index f1e16a430908..929d91943c37 100644
--- a/finance/trytond28_purchase_invoice_line_standalone/Makefile
+++ b/finance/trytond28_purchase_invoice_line_standalone/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Purchase Invoice Line Standalone Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_purchase>=2.8.0:${PORTSDIR}/finance/trytond28_purchase \
-		trytond28_account_invoice_line_standalone>=2.8.0:${PORTSDIR}/finance/trytond28_account_invoice_line_standalone
+RUN_DEPENDS=	trytond28_purchase>=2.8.0:finance/trytond28_purchase \
+		trytond28_account_invoice_line_standalone>=2.8.0:finance/trytond28_account_invoice_line_standalone
 
 CONFLICTS=	trytond_purchase_invoice_line_standalone-2.[46].*
 
diff --git a/finance/trytond28_purchase_shipment_cost/Makefile b/finance/trytond28_purchase_shipment_cost/Makefile
index 7bc702687752..845b8da4661a 100644
--- a/finance/trytond28_purchase_shipment_cost/Makefile
+++ b/finance/trytond28_purchase_shipment_cost/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tryton Application Platform (Purchase Shipment Cost Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_carrier>=2.8.0:${PORTSDIR}/finance/trytond28_carrier \
-		trytond28_currency>=2.8.0:${PORTSDIR}/finance/trytond28_currency \
-		trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_carrier>=2.8.0:finance/trytond28_carrier \
+		trytond28_currency>=2.8.0:finance/trytond28_currency \
+		trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_purchase_shipment_cost-2.[46].*
 
diff --git a/finance/trytond28_sale/Makefile b/finance/trytond28_sale/Makefile
index 5c89304263fe..d8fd6e88f8db 100644
--- a/finance/trytond28_sale/Makefile
+++ b/finance/trytond28_sale/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Sale Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice \
-		trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice \
+		trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_sale-2.[46].*
 
diff --git a/finance/trytond28_sale_opportunity/Makefile b/finance/trytond28_sale_opportunity/Makefile
index 9599369f8344..78d861fa75ca 100644
--- a/finance/trytond28_sale_opportunity/Makefile
+++ b/finance/trytond28_sale_opportunity/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Sale Opportunity Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_sale>=2.8.1:${PORTSDIR}/finance/trytond28_sale
+RUN_DEPENDS=	trytond28_sale>=2.8.1:finance/trytond28_sale
 
 CONFLICTS=	trytond_sale_opportunity-2.[46].*
 
diff --git a/finance/trytond28_sale_price_list/Makefile b/finance/trytond28_sale_price_list/Makefile
index 6b355059edea..ff5fb9f92629 100644
--- a/finance/trytond28_sale_price_list/Makefile
+++ b/finance/trytond28_sale_price_list/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tryton Application Platform (Sale Price List Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party \
-		trytond28_sale>=2.8.1:${PORTSDIR}/finance/trytond28_sale \
-		trytond28_product_price_list>=2.8.0:${PORTSDIR}/finance/trytond28_product_price_list
+RUN_DEPENDS=	trytond28_party>=2.8.0:finance/trytond28_party \
+		trytond28_sale>=2.8.1:finance/trytond28_sale \
+		trytond28_product_price_list>=2.8.0:finance/trytond28_product_price_list
 
 CONFLICTS=	trytond_sale_price_list-2.[46].*
 
diff --git a/finance/trytond28_sale_shipment_cost/Makefile b/finance/trytond28_sale_shipment_cost/Makefile
index 3ec449eae766..e65dc368b6d7 100644
--- a/finance/trytond28_sale_shipment_cost/Makefile
+++ b/finance/trytond28_sale_shipment_cost/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Tryton Application Platform (Sale Shipment Cost Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_carrier>=2.8.0:${PORTSDIR}/finance/trytond28_carrier \
-		trytond28_sale>=2.8.1:${PORTSDIR}/finance/trytond28_sale \
-		trytond28_account_invoice>=2.8.2:${PORTSDIR}/finance/trytond28_account_invoice \
-		trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_carrier>=2.8.0:finance/trytond28_carrier \
+		trytond28_sale>=2.8.1:finance/trytond28_sale \
+		trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice \
+		trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_sale_shipment_cost-2.[46].*
 
diff --git a/finance/trytond28_sale_supply/Makefile b/finance/trytond28_sale_supply/Makefile
index 69966150b662..49f09a19638b 100644
--- a/finance/trytond28_sale_supply/Makefile
+++ b/finance/trytond28_sale_supply/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Sale Supply Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_sale>=2.8.1:${PORTSDIR}/finance/trytond28_sale
+RUN_DEPENDS=	trytond28_sale>=2.8.1:finance/trytond28_sale
 
 CONFLICTS=	trytond_sale_supply-2.[46].*
 
diff --git a/finance/trytond28_sale_supply_drop_shipment/Makefile b/finance/trytond28_sale_supply_drop_shipment/Makefile
index 38320c7494d8..48b96e683c68 100644
--- a/finance/trytond28_sale_supply_drop_shipment/Makefile
+++ b/finance/trytond28_sale_supply_drop_shipment/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Sale Supply Drop Shipment Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_sale_supply>=2.8.1:${PORTSDIR}/finance/trytond28_sale_supply
+RUN_DEPENDS=	trytond28_sale_supply>=2.8.1:finance/trytond28_sale_supply
 
 CONFLICTS=	trytond_sale_supply_drop_shipment-2.[46].*
 
diff --git a/finance/trytond28_stock/Makefile b/finance/trytond28_stock/Makefile
index e5add38cdd79..6d4fb63cd2ef 100644
--- a/finance/trytond28_stock/Makefile
+++ b/finance/trytond28_stock/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Tryton Application Platform (Stock Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party \
-		trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product \
-		trytond28_company>=2.8.0:${PORTSDIR}/finance/trytond28_company \
-		trytond28_currency>=2.8.0:${PORTSDIR}/finance/trytond28_currency
+RUN_DEPENDS=	trytond28_party>=2.8.0:finance/trytond28_party \
+		trytond28_product>=2.8.0:finance/trytond28_product \
+		trytond28_company>=2.8.0:finance/trytond28_company \
+		trytond28_currency>=2.8.0:finance/trytond28_currency
 
 CONFLICTS=	trytond_stock-2.[46].*
 
diff --git a/finance/trytond28_stock_forecast/Makefile b/finance/trytond28_stock_forecast/Makefile
index 9c23b91af437..58cbd6912d89 100644
--- a/finance/trytond28_stock_forecast/Makefile
+++ b/finance/trytond28_stock_forecast/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Stock Forecast Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_stock_forecast-2.[46].*
 
diff --git a/finance/trytond28_stock_inventory_location/Makefile b/finance/trytond28_stock_inventory_location/Makefile
index 62e37811225d..5f75cf5dcf4f 100644
--- a/finance/trytond28_stock_inventory_location/Makefile
+++ b/finance/trytond28_stock_inventory_location/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Stock Inventory Location Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_stock_inventory_location-2.[46].*
 
diff --git a/finance/trytond28_stock_location_sequence/Makefile b/finance/trytond28_stock_location_sequence/Makefile
index b2a241fc9aa7..a90b81939dc7 100644
--- a/finance/trytond28_stock_location_sequence/Makefile
+++ b/finance/trytond28_stock_location_sequence/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Stock Location Sequence Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_stock_location_sequence-2.[46].*
 
diff --git a/finance/trytond28_stock_lot/Makefile b/finance/trytond28_stock_lot/Makefile
index c0bd2f1fab8a..961e049895b2 100644
--- a/finance/trytond28_stock_lot/Makefile
+++ b/finance/trytond28_stock_lot/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Stock Lot Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product \
-		trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_product>=2.8.0:finance/trytond28_product \
+		trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_stock_lot-2.[46].*
 
diff --git a/finance/trytond28_stock_product_location/Makefile b/finance/trytond28_stock_product_location/Makefile
index c94d639329dc..33cf5302dc5a 100644
--- a/finance/trytond28_stock_product_location/Makefile
+++ b/finance/trytond28_stock_product_location/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Stock Product Location Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product \
-		trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_product>=2.8.0:finance/trytond28_product \
+		trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_stock_product_location-2.[46].*
 
diff --git a/finance/trytond28_stock_split/Makefile b/finance/trytond28_stock_split/Makefile
index a6066de2a7bb..16a17bee654f 100644
--- a/finance/trytond28_stock_split/Makefile
+++ b/finance/trytond28_stock_split/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Stock Split Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock
+RUN_DEPENDS=	trytond28_stock>=2.8.2:finance/trytond28_stock
 
 CONFLICTS=	trytond_stock_split-2.[46].*
 
diff --git a/finance/trytond28_stock_supply/Makefile b/finance/trytond28_stock_supply/Makefile
index 5d4564e73442..1bee68076b8e 100644
--- a/finance/trytond28_stock_supply/Makefile
+++ b/finance/trytond28_stock_supply/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Stock Supply Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock \
-		trytond28_purchase>=2.8.0:${PORTSDIR}/finance/trytond28_purchase
+RUN_DEPENDS=	trytond28_stock>=2.8.2:finance/trytond28_stock \
+		trytond28_purchase>=2.8.0:finance/trytond28_purchase
 
 CONFLICTS=	trytond_stock_supply-2.[46].*
 
diff --git a/finance/trytond28_stock_supply_day/Makefile b/finance/trytond28_stock_supply_day/Makefile
index 9cde35918e05..7c6cf582559e 100644
--- a/finance/trytond28_stock_supply_day/Makefile
+++ b/finance/trytond28_stock_supply_day/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tryton Application Platform (Stock Supply Day Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_stock>=2.8.2:${PORTSDIR}/finance/trytond28_stock \
-		trytond28_purchase>=2.8.0:${PORTSDIR}/finance/trytond28_purchase
+RUN_DEPENDS=	trytond28_stock>=2.8.2:finance/trytond28_stock \
+		trytond28_purchase>=2.8.0:finance/trytond28_purchase
 
 CONFLICTS=	trytond_stock_supply_day-2.[46].*
 
diff --git a/finance/trytond28_stock_supply_forecast/Makefile b/finance/trytond28_stock_supply_forecast/Makefile
index a4c5b75d1cbc..d4bf8e03077c 100644
--- a/finance/trytond28_stock_supply_forecast/Makefile
+++ b/finance/trytond28_stock_supply_forecast/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tryton Application Platform (Stock Supply Forecast Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_stock_supply>=2.8.1:${PORTSDIR}/finance/trytond28_stock_supply \
-		trytond28_stock_forecast>=2.8.0:${PORTSDIR}/finance/trytond28_stock_forecast
+RUN_DEPENDS=	trytond28_stock_supply>=2.8.1:finance/trytond28_stock_supply \
+		trytond28_stock_forecast>=2.8.0:finance/trytond28_stock_forecast
 
 CONFLICTS=	trytond_stock_supply_forecast-2.[46].*
 
diff --git a/finance/trytond28_stock_supply_production/Makefile b/finance/trytond28_stock_supply_production/Makefile
index 3595cb7a9d69..8d18e8c2921c 100644
--- a/finance/trytond28_stock_supply_production/Makefile
+++ b/finance/trytond28_stock_supply_production/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Tryton Application Platform (Stock Supply Production Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28 \
-		trytond28_stock_supply>=2.8.1:${PORTSDIR}/finance/trytond28_stock_supply \
-		trytond28_production>=2.8.0:${PORTSDIR}/finance/trytond28_production \
-		trytond28_product>=2.8.0:${PORTSDIR}/finance/trytond28_product
+RUN_DEPENDS=	trytond28>=2.8.2:finance/trytond28 \
+		trytond28_stock_supply>=2.8.1:finance/trytond28_stock_supply \
+		trytond28_production>=2.8.0:finance/trytond28_production \
+		trytond28_product>=2.8.0:finance/trytond28_product
 
 CONFLICTS=	trytond_stock_supply_production-2.[46].*
 
diff --git a/finance/trytond28_timesheet/Makefile b/finance/trytond28_timesheet/Makefile
index f75e5783c6ee..23b8da1b1750 100644
--- a/finance/trytond28_timesheet/Makefile
+++ b/finance/trytond28_timesheet/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (Timesheet Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_company_work_time>=2.8.0:${PORTSDIR}/finance/trytond28_company_work_time
+RUN_DEPENDS=	trytond28_company_work_time>=2.8.0:finance/trytond28_company_work_time
 
 CONFLICTS=	trytond_timesheet-2.[46].*
 
diff --git a/finance/vanitygen/Makefile b/finance/vanitygen/Makefile
index 9b82b7ae9b8a..9bd47a597a00 100644
--- a/finance/vanitygen/Makefile
+++ b/finance/vanitygen/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Standalone vanity address generator for bitcoin
 
 LICENSE=	AGPLv3
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	samr7
diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile
index 6b2e670419ef..c33075c6ec29 100644
--- a/finance/xtrader/Makefile
+++ b/finance/xtrader/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/OldFiles
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Technical analysis program for financial instruments
 
-LIB_DEPENDS=	libptypes.so:${PORTSDIR}/devel/ptypes \
-		libfltk.so.1:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libptypes.so:devel/ptypes \
+		libfltk.so.1:x11-toolkits/fltk
 
 MAKEFILE=	Makefile.linux
 USE_XORG=	x11 xpm
diff --git a/french/aster/Makefile b/french/aster/Makefile
index f39a1370601c..bc600ba17bb9 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -31,18 +31,18 @@ LICENSE=	GPLv2
 #
 #-----------------------------------------------------------------------
 
-BUILD_DEPENDS+=	astk-serveur>0:${PORTSDIR}/cad/astk-serveur	\
-		${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}		\
-		${LOCALBASE}/lib/libscotch.a:${PORTSDIR}/cad/scotch		\
-		python:${PORTSDIR}/lang/python					\
+BUILD_DEPENDS+=	astk-serveur>0:cad/astk-serveur	\
+		${SHELL_INSTALL_ASTER}:shells/${SHIADEP}		\
+		${LOCALBASE}/lib/libscotch.a:cad/scotch		\
+		python:lang/python					\
 		${PYNUMPY}
-LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5				\
-		libmed.so:${PORTSDIR}/french/med				\
-		libmetis.so.0:${PORTSDIR}/math/metis-edf
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gnuplot>0:${PORTSDIR}/math/py-gnuplot	\
-		${LOCALBASE}/bin/onmetis:${PORTSDIR}/math/metis-edf		\
-		${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}		\
-		astk-serveur>0:${PORTSDIR}/cad/astk-serveur
+LIB_DEPENDS+=	libhdf5.so:science/hdf5				\
+		libmed.so:french/med				\
+		libmetis.so.0:math/metis-edf
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot	\
+		${LOCALBASE}/bin/onmetis:math/metis-edf		\
+		${SHELL_INSTALL_ASTER}:shells/${SHIADEP}		\
+		astk-serveur>0:cad/astk-serveur
 
 USES=		bison fortran tk python:2
 USE_BINUTILS=	yes
@@ -81,25 +81,25 @@ FLAGARCH=	-DLINUX64
 .endif
 
 .if !defined(WITHOUT_ASTK_CLI)
-RUN_DEPENDS+=	astk-client>0:${PORTSDIR}/cad/astk-client
+RUN_DEPENDS+=	astk-client>0:cad/astk-client
 PLIST_SUB+=	ASTK_CLIENT=""  ASTKDIR=${ASTKDIR}
 .else
 PLIST_SUB+=	ASTK_CLIENT="@comment " ASTKDIR=""
 .endif
 .if !defined(WITHOUT_EFICAS)
-RUN_DEPENDS+=	fr-eficas>0:${PORTSDIR}/french/eficas
+RUN_DEPENDS+=	fr-eficas>0:french/eficas
 PLIST_SUB+=	EFICAS=""
 .else
 PLIST_SUB+=	EFICAS="@comment "
 .endif
 .if !defined(WITHOUT_GMSH)
-RUN_DEPENDS+=	${LOCALBASE}/bin/gmsh:${PORTSDIR}/cad/gmsh
+RUN_DEPENDS+=	${LOCALBASE}/bin/gmsh:cad/gmsh
 PLIST_SUB+=	GMSH=""
 .else
 PLIST_SUB+=	GMSH="@comment "
 .endif
 .if !defined(WITHOUT_GRACE)
-RUN_DEPENDS+=	xmgrace:${PORTSDIR}/math/grace
+RUN_DEPENDS+=	xmgrace:math/grace
 PLIST_SUB+=	GRACE=""
 .else
 PLIST_SUB+=	GRACE="@comment "
@@ -111,15 +111,15 @@ RUN_DEPENDS+=	${PYNUMPY}
 .if !defined(WITH_MPI)
 MUMPS_PORT=	mumps
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs	\
-		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libblacs.a:math/blacs	\
+		${LOCALBASE}/lib/libscalapack.a:math/scalapack
 MUMPS_PORT=	mumps-mpich
 MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich -lmpl
 .endif
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcmumps.a:${PORTSDIR}/math/${MUMPS_PORT}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcmumps.a:math/${MUMPS_PORT}
 
 .if defined(WITH_MPI)
-LIB_DEPENDS+=	libmpich.so:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	libmpich.so:net/mpich2
 HOME_MPI=	${LOCALBASE}
 .endif
 
@@ -143,19 +143,19 @@ SHIADEP=	${SHIA}
 .if !defined(WITH_ED)
 . if exists(${LOCALBASE}/bin/nedit)
 WITH_ED=	nedit
-RUN_DEPENDS+=	${LOCALBASE}/bin/nedit:${PORTSDIR}/editors/nedit
+RUN_DEPENDS+=	${LOCALBASE}/bin/nedit:editors/nedit
 . elif exists(${LOCALBASE}/bin/gvim)
 WITH_ED=	gvim
-RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim
+RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:editors/vim
 . elif exists(${LOCALBASE}/bin/emacs)
 WITH_ED=	emacs
-RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/emacs
+RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:editors/emacs
 . elif exists(${LOCALBASE}/bin/gedit)
 WITH_ED=	gedit
-RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:${PORTSDIR}/editors/gedit
+RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:editors/gedit
 . elif exists(${LOCALBASE}/bin/xedit)
 WITH_ED=	xedit
-RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:${PORTSDIR}/x11/xedit
+RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:x11/xedit
 . else
 WITH_ED=	vi
 . endif
diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index c788430b260c..9bb2ab06c510 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -10,9 +10,9 @@ COMMENT=	ASter Command FIle Editor
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Pmw>0:${PORTSDIR}/x11-toolkits/py-Pmw	\
-		${PYTHON_PKGNAMEPREFIX}mx-base>0:${PORTSDIR}/lang/py-mx-base		\
-		bash:${PORTSDIR}/shells/bash					\
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw	\
+		${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base		\
+		bash:shells/bash					\
 		${PYNUMPY}
 
 USES=		shebangfix python
@@ -34,8 +34,8 @@ EF_LANG=	fr
 EF_LANG=	ang
 .endif
 
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui	\
-		xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui	\
+		xdg-open:devel/xdg-utils
 
 FIXUBIN=	Openturns_Study/prefs_OPENTURNS_STUDY.py	\
 		Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py	\
diff --git a/french/geonext/Makefile b/french/geonext/Makefile
index 7ce62bd82827..512a3bdb2df4 100644
--- a/french/geonext/Makefile
+++ b/french/geonext/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	french
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive (dynamic) elementary Geometry Software
 
-RUN_DEPENDS=	geonext>=0:${PORTSDIR}/math/geonext
+RUN_DEPENDS=	geonext>=0:math/geonext
 
 WITH_LANG=	fr
 MASTERDIR=	${.CURDIR}/../../math/geonext
diff --git a/french/homard/Makefile b/french/homard/Makefile
index 24195858c4c5..9ff64b3fa6cf 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	french cad linux
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Refinement and de-refinement mesh tool
 
-BUILD_DEPENDS=	${LOCALBASE}/aster/${VER}/bin/aster:${PORTSDIR}/french/aster
-RUN_DEPENDS=	${LOCALBASE}/aster/${VER}/bin/aster:${PORTSDIR}/french/aster
+BUILD_DEPENDS=	${LOCALBASE}/aster/${VER}/bin/aster:french/aster
+RUN_DEPENDS=	${LOCALBASE}/aster/${VER}/bin/aster:french/aster
 
 RESTRICTED=	The free downloading of HOMARD software is only allowed for coupling\
 		with Code_Aster. For any other use, a license agreement is requested.\
diff --git a/french/med/Makefile b/french/med/Makefile
index e3bcd99760cb..0dcf08841eb2 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Modelisation et Echanges de Donnees
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
+LIB_DEPENDS=	libhdf5.so:science/hdf5
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/french/trytond28_account_fr/Makefile b/french/trytond28_account_fr/Makefile
index 4f0bf4199f16..0713f3701a2e 100644
--- a/french/trytond28_account_fr/Makefile
+++ b/french/trytond28_account_fr/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (French Account Chart)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account>=2.8.1:${PORTSDIR}/finance/trytond28_account
+RUN_DEPENDS=	trytond28_account>=2.8.1:finance/trytond28_account
 
 CONFLICTS=	trytond_account_fr-2.[46].*
 
diff --git a/french/tvdownloader/Makefile b/french/tvdownloader/Makefile
index d8a64d6a057e..57893a64ab7d 100644
--- a/french/tvdownloader/Makefile
+++ b/french/tvdownloader/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Download podcasts and videos from French websites
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	msdl:${PORTSDIR}/multimedia/msdl	\
-		rtmpdump:${PORTSDIR}/multimedia/rtmpdump	\
-		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui	\
-		${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto\
-		${PYTHON_SITELIBDIR}/mechanize/_mechanize.py:${PORTSDIR}/www/py-mechanize
+RUN_DEPENDS=	msdl:multimedia/msdl	\
+		rtmpdump:multimedia/rtmpdump	\
+		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui	\
+		${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto\
+		${PYTHON_SITELIBDIR}/mechanize/_mechanize.py:www/py-mechanize
 
 DEPRECATED=	Many channels have modified their protocols and cannot be DL anymore
 EXPIRATION_DATE=	2016-04-14
diff --git a/ftp/R-cran-RCurl/Makefile b/ftp/R-cran-RCurl/Makefile
index 230d4e71f849..c60dea835f5e 100644
--- a/ftp/R-cran-RCurl/Makefile
+++ b/ftp/R-cran-RCurl/Makefile
@@ -11,9 +11,9 @@ COMMENT=	General network client interface for R
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	curl-config:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	R-cran-bitops>0:${PORTSDIR}/devel/R-cran-bitops
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	curl-config:ftp/curl
+RUN_DEPENDS=	R-cran-bitops>0:devel/R-cran-bitops
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=	cran:auto-plist
 
diff --git a/ftp/R-cran-curl/Makefile b/ftp/R-cran-curl/Makefile
index 6b1ea751a4a0..15f7a03fd520 100644
--- a/ftp/R-cran-curl/Makefile
+++ b/ftp/R-cran-curl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Modern and Flexible Web Client for R
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/include/curl/curl.h:${PORTSDIR}/ftp/curl
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	${LOCALBASE}/include/curl/curl.h:ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=	cran:auto-plist
 
diff --git a/ftp/bareftp/Makefile b/ftp/bareftp/Makefile
index 5db45e832e77..abe526cbfc19 100644
--- a/ftp/bareftp/Makefile
+++ b/ftp/bareftp/Makefile
@@ -30,8 +30,8 @@ OPTIONS_DEFAULT=GNOMEKEYRING
 OPTIONS_SUB=	yes
 
 GNOMEKEYRING_CONFIGURE_WITH=	gnomekeyring
-GNOMEKEYRING_BUILD_DEPENDS=	gnome-keyring-sharp>0:${PORTSDIR}/security/gnome-keyring-sharp
-GNOMEKEYRING_RUN_DEPENDS=	gnome-keyring-sharp>0:${PORTSDIR}/security/gnome-keyring-sharp
+GNOMEKEYRING_BUILD_DEPENDS=	gnome-keyring-sharp>0:security/gnome-keyring-sharp
+GNOMEKEYRING_RUN_DEPENDS=	gnome-keyring-sharp>0:security/gnome-keyring-sharp
 NLS_CONFIGURE_ENABLE=	nls
 
 # TODO
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 8c43c0dd0a83..d90503ba35b0 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -73,14 +73,14 @@ SLAVEDIRS=	ftp/curl-hiphop
 
 CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle
 CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 CARES_CONFIGURE_ENABLE=	ares
-CARES_LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares
+CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 COOKIES_CONFIGURE_ENABLE=	cookies
 CURL_DEBUG_CONFIGURE_ENABLE=	curldebug
 DEBUG_CONFIGURE_ENABLE=	debug
 GNUTLS_CONFIGURE_WITH=	gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
 GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
@@ -97,25 +97,25 @@ GSSAPI_MIT_LDFLAGS=	${GSSAPILDFLAGS}
 GSSAPI_MIT_LIBS=	${GSSAPILIBS}
 GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
-HTTP2_BUILD_DEPENDS=	nghttp2>=1.0.0:${PORTSDIR}/www/nghttp2
+HTTP2_BUILD_DEPENDS=	nghttp2>=1.0.0:www/nghttp2
 HTTP2_CONFIGURE_WITH=	nghttp2
-HTTP2_LIB_DEPENDS=	libnghttp2.so:${PORTSDIR}/www/nghttp2
-HTTP2_RUN_DEPENDS=	nghttp2>=1.0.0:${PORTSDIR}/www/nghttp2
+HTTP2_LIB_DEPENDS=	libnghttp2.so:www/nghttp2
+HTTP2_RUN_DEPENDS=	nghttp2>=1.0.0:www/nghttp2
 HTTP2_USES=		pkgconfig
 IDN_CONFIGURE_WITH=	libidn
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_ENABLE=	ipv6
 LDAP_CONFIGURE_ENABLE=	ldap
 LDAP_USE=		OPENLDAP=yes
 LDAPS_CONFIGURE_ENABLE=	ldaps
 LIBSSH2_CONFIGURE_WITH=	libssh2
-LIBSSH2_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 METALINK_CONFIGURE_WITH=libmetalink
-METALINK_LIB_DEPENDS=	libmetalink.so:${PORTSDIR}/misc/libmetalink
+METALINK_LIB_DEPENDS=	libmetalink.so:misc/libmetalink
 METALINK_LIBS=		-lcrypto
 NSS_CONFIGURE_WITH=	nss
-NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+NSS_LIB_DEPENDS=	libnss3.so:security/nss
 NSS_USES=		pkgconfig
 OPENSSL_CONFIGURE_OFF=	--without-ssl
 OPENSSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
@@ -123,17 +123,17 @@ OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
 OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
 OPENSSL_USE=		OPENSSL=yes
 POLARSSL_CONFIGURE_WITH=polarssl
-POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:security/polarssl13
 PROXY_CONFIGURE_ENABLE=	proxy
 PSL_CONFIGURE_WITH=	libpsl
-PSL_LIB_DEPENDS=	libpsl.so:${PORTSDIR}/dns/libpsl
+PSL_LIB_DEPENDS=	libpsl.so:dns/libpsl
 RTMP_CONFIGURE_WITH=	librtmp
-RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
+RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 RTMP_USES=		pkgconfig
 THREADED_RESOLVER_CONFIGURE_ENABLE=	threaded-resolver
 TLS_SRP_CONFIGURE_ENABLE=	tls-srp
 WOLFSSL_CONFIGURE_WITH=	cyassl
-WOLFSSL_LIB_DEPENDS=	libwolfssl.so:${PORTSDIR}/security/wolfssl
+WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
 
 .include <bsd.port.options.mk>
 
diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index c623a3ae88fa..6fd218cd4f73 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C++ wrapper for libcurl
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 OPTIONS_DEFINE=	BOOST DOCS EXAMPLES
 
@@ -30,7 +30,7 @@ PORTEXAMPLES=	*
 GH_ACCOUNT=	jpbarrette
 USE_GITHUB=	yes
 
-BOOST_BUILD_DEPENDS=	boost-libs>=1.20.0:${PORTSDIR}/devel/boost-libs
+BOOST_BUILD_DEPENDS=	boost-libs>=1.20.0:devel/boost-libs
 BOOST_RUN_DEPENDS=	${BOOST_BUILD_DEPENDS}
 BOOST_CONFIGURE_ON=	--with-boost=${LOCALBASE}
 BOOST_CONFIGURE_OFF=	--without-boost
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 6bb399c04310..baafbcda2b37 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Fast and reliable cross-platform FTP, FTPS, and SFTP client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-LIB_DEPENDS=	libfilezilla.so:${PORTSDIR}/ftp/libfilezilla \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libpugixml.so:${PORTSDIR}/textproc/pugixml
+LIB_DEPENDS=	libfilezilla.so:ftp/libfilezilla \
+		libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls \
+		libidn.so:dns/libidn \
+		libpugixml.so:textproc/pugixml
 
 BROKEN_FreeBSD_9=	requires C++14 complier, 9.x lacks C++11 standard library
 
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=	DBUS NLS
 OPTIONS_DEFAULT=DBUS NLS
 OPTIONS_SUB=	yes
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
 
 NLS_USES=		gettext
diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile
index f0a86318a2df..c6eb56166ede 100644
--- a/ftp/fpc-libcurl/Makefile
+++ b/ftp/fpc-libcurl/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBCURL
 LIBCURL_DESC=	Install curl tools and library
 OPTIONS_DEFAULT=	LIBCURL
 
-LIBCURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIBCURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 .include "${MASTERDIR}/Makefile"
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index 82b95ac62b14..0da378ae3d72 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utility to mirror directory hierarchy with FTP
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
+RUN_DEPENDS=	p5-Socket6>=0:net/p5-Socket6
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/ftp/ftpsync/Makefile b/ftp/ftpsync/Makefile
index 4841a8e5b1aa..75bf24516800 100644
--- a/ftp/ftpsync/Makefile
+++ b/ftp/ftpsync/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Synchronizes a local and a remote FTP directory trees
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=5.805:www/p5-libwww
 
 USES=		perl5 shebangfix tar:bzip2
 NO_BUILD=	yes
diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index b647f95a8f71..08579c740c41 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME wget front-end
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	wget:ftp/wget
 
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=	NOTIFY
@@ -29,8 +29,8 @@ CONFIGURE_ARGS=	--disable-epiphany-extension
 GCONF_SCHEMAS=	${PORTNAME}.schemas
 
 NOTIFY_CONFIGURE_ENABLE=	libnotify
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-NOTIFY_RUN_DEPENDS=	${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
+NOTIFY_RUN_DEPENDS=	${LOCALBASE}/libexec/notification-daemon:deskutils/notification-daemon
 
 post-patch:
 	@${REINPLACE_CMD} 's|glib/gerror|glib|' \
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index ac8476dd0a4e..a070bff22172 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Haskell binding to libcurl
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/ftp/hsftp/Makefile b/ftp/hsftp/Makefile
index 2835b26ee72a..c2b5a44235b7 100644
--- a/ftp/hsftp/Makefile
+++ b/ftp/hsftp/Makefile
@@ -23,7 +23,7 @@ MAKEFILE=	makefile
 
 PLIST_FILES=	bin/hsftp man/man1/hsftp.1.gz
 
-OPENSSH_RUN_DEPENDS=		ssh:${PORTSDIR}/security/openssh-portable
+OPENSSH_RUN_DEPENDS=		ssh:security/openssh-portable
 OPENSSH_CONFIGURE_WITH=		openssh
 
 READLINE_USES=			readline
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 1a4a5a0d3ba2..45f25c555c9a 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Shell-like command line ftp client
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		charsetfix iconv libtool localbase readline shebangfix
 GNU_CONFIGURE=	yes
@@ -42,7 +42,7 @@ NLS_CONFIGURE_ENABLE=	nls
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_USE=	OPENSSL=yes
 GNUTLS_CONFIGURE_WITH=	gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES=	pkgconfig
 
 .include <bsd.port.options.mk>
diff --git a/ftp/ocaml-ocurl/Makefile b/ftp/ocaml-ocurl/Makefile
index 0bb54074b181..6d54a5acbccf 100644
--- a/ftp/ocaml-ocurl/Makefile
+++ b/ftp/ocaml-ocurl/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Interface for OCaml to the curl lib
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
+BUILD_DEPENDS=	ocamlc:lang/ocaml \
+		ocamlfind:devel/ocaml-findlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake
 GNU_CONFIGURE=	yes
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	LWT
 OPTIONS_DEFAULT=LWT
 OPTIONS_SUB=	yes
 LWT_DESC=	Include threading support (ocaml-lwt)
-LWT_RUN_DEPENDS=${LOCALBASE}/${OCAML_SITELIBDIR}/lwt/lwt.a:${PORTSDIR}/devel/ocaml-lwt
+LWT_RUN_DEPENDS=${LOCALBASE}/${OCAML_SITELIBDIR}/lwt/lwt.a:devel/ocaml-lwt
 LWT_BUILD_DEPENDS=${LWT_RUN_DEPENDS}
 
 post-install:
diff --git a/ftp/p5-Net-FTP-Common/Makefile b/ftp/p5-Net-FTP-Common/Makefile
index 691e7cb38437..6b55ff955b16 100644
--- a/ftp/p5-Net-FTP-Common/Makefile
+++ b/ftp/p5-Net-FTP-Common/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module to provide simplify common usages of Net::FTP
 
-RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Net>=0:net/p5-Net
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/ftp/p5-Net-FTP-Recursive/Makefile b/ftp/p5-Net-FTP-Recursive/Makefile
index b01c502ce95c..94d190e8dfe2 100644
--- a/ftp/p5-Net-FTP-Recursive/Makefile
+++ b/ftp/p5-Net-FTP-Recursive/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module to provide recursive FTP client class
 
-BUILD_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS=	p5-Net>=0:net/p5-Net
+RUN_DEPENDS=	p5-Net>=0:net/p5-Net
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/ftp/p5-Net-FTPSSL/Makefile b/ftp/p5-Net-FTPSSL/Makefile
index 8c4ae48e12f6..c07b7536dd11 100644
--- a/ftp/p5-Net-FTPSSL/Makefile
+++ b/ftp/p5-Net-FTPSSL/Makefile
@@ -13,8 +13,8 @@ COMMENT=	FTP over SSL/TLS class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.26:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.26:security/p5-IO-Socket-SSL \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index da0d63686308..979297fcd5fd 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Full-featured, secure, extensible, and configurable Perl FTP server
 
-RUN_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM \
-		p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-File-Sync>=0:${PORTSDIR}/devel/p5-File-Sync \
-		p5-IO-stringy>=1.126:${PORTSDIR}/devel/p5-IO-stringy
+RUN_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-Authen-PAM>=0:security/p5-Authen-PAM \
+		p5-BSD-Resource>=0:devel/p5-BSD-Resource \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-File-Sync>=0:devel/p5-File-Sync \
+		p5-IO-stringy>=1.126:devel/p5-IO-stringy
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 MAKE_ENV+=	NOCONF=1
diff --git a/ftp/p5-POE-Component-Client-FTP/Makefile b/ftp/p5-POE-Component-Client-FTP/Makefile
index 4e5d9bd86c4e..864b3813bbec 100644
--- a/ftp/p5-POE-Component-Client-FTP/Makefile
+++ b/ftp/p5-POE-Component-Client-FTP/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implements an FTP client POE Component
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/ftp/p5-SOAP-Transport-FTP/Makefile b/ftp/p5-SOAP-Transport-FTP/Makefile
index 44673dab88c5..57e996568dbf 100644
--- a/ftp/p5-SOAP-Transport-FTP/Makefile
+++ b/ftp/p5-SOAP-Transport-FTP/Makefile
@@ -13,7 +13,7 @@ COMMENT=	FTP Client support for SOAP::Lite
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-SOAP-Lite>=0.711:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-SOAP-Lite>=0.711:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/ftp/paraget/Makefile b/ftp/paraget/Makefile
index 821608cb8c95..f7de08d99765 100644
--- a/ftp/paraget/Makefile
+++ b/ftp/paraget/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Parallel ftp-fetching program
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker
+BUILD_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index daafa550a49e..9ce7a348a55b 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -34,7 +34,7 @@ GTK2_USE=		GNOME=gtk20
 DANTE_CONFIGURE_ENABLE=	socks
 DANTE_CONFIGURE_ON=	--with-socks-includes=${LOCALBASE}/include \
 			--with-socks-libraries=${LOCALBASE}/lib
-DANTE_LIB_DEPENDS=	libsocks.so:${PORTSDIR}/net/dante
+DANTE_LIB_DEPENDS=	libsocks.so:net/dante
 
 pre-patch:
 	@${FIND}  ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/ftp/proftpd-mod_geoip/Makefile b/ftp/proftpd-mod_geoip/Makefile
index c721531d9fd1..6fe8339830e7 100644
--- a/ftp/proftpd-mod_geoip/Makefile
+++ b/ftp/proftpd-mod_geoip/Makefile
@@ -10,7 +10,7 @@ COMMENT=	GeoIP ProFTPD module
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 DESCR=		${.CURDIR}/pkg-descr
 
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index c89ff7be2cf4..d150d4300952 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -22,8 +22,8 @@ LICENSE?=	GPLv2
 LICENSE_FILE?=	${WRKSRC}/COPYING
 
 .if defined(_BUILDING_PROFTPD_MODULE)
-BUILD_DEPENDS+=	${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd
-RUN_DEPENDS+=	${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd
+BUILD_DEPENDS+=	${LOCALBASE}/sbin/proftpd:ftp/proftpd
+RUN_DEPENDS+=	${LOCALBASE}/sbin/proftpd:ftp/proftpd
 .endif
 
 PROFTPD_VERSION=	1.3.5a
@@ -157,7 +157,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:devel/pcre
 CONFIGURE_ARGS+=	--enable-pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
@@ -166,7 +166,7 @@ CONFIGURE_ARGS+=	--disable-pcre
 .if ${PORT_OPTIONS:MMEMCACHE}
 MODULES+=		mod_memcache \
 			mod_tls_memcache
-LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS+=		libmemcached.so:databases/libmemcached
 CONFIGURE_ARGS+=	--enable-memcache
 LIBS+=			-L${LOCALBASE}/lib -lmemcached -lmemcachedutil
 PLIST_SUB+=	MEMCACHE=""
diff --git a/ftp/profxp/Makefile b/ftp/profxp/Makefile
index 2ab2fa8fdf73..c2d01e32c0d3 100644
--- a/ftp/profxp/Makefile
+++ b/ftp/profxp/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION:S/p/-pre/}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FXP (server-to-server FTP) client
 
-RUN_DEPENDS=	p5-SOCKS>=0:${PORTSDIR}/net/p5-Socks \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl
+RUN_DEPENDS=	p5-SOCKS>=0:net/p5-Socks \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index a56cf46c1acd..62292ff116eb 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -77,7 +77,7 @@ PERUSERLIMITS_CONFIGURE_WITH=	peruserlimits
 PGSQL_CONFIGURE_WITH=	pgsql
 PGSQL_USES=		pgsql
 PRIVSEP_CONFIGURE_WITH=	privsep
-SCRYPT_LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+SCRYPT_LIB_DEPENDS=	libsodium.so:security/libsodium
 SENDFILE_CONFIGURE_WITH=sendfile
 THROTTLING_CONFIGURE_WITH=	throttling
 TLS_CONFIGURE_WITH=	tls
diff --git a/ftp/py-pycurl/Makefile b/ftp/py-pycurl/Makefile
index a70274d4b5a4..406133e21347 100644
--- a/ftp/py-pycurl/Makefile
+++ b/ftp/py-pycurl/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python interface to libcurl
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_PYTHON=	autoplist concurrent distutils
 USES=		python
diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile
index 135e6a2a3b5d..a900da7ac3e3 100644
--- a/ftp/py-pyftpdlib/Makefile
+++ b/ftp/py-pyftpdlib/Makefile
@@ -21,8 +21,8 @@ OPTIONS_DEFAULT=	SENDFILE OPENSSL
 SENDFILE_DESC=		Enable sendfile(2) support
 OPENSSL_DESC=		Enable FTP over SSL/TLS (RFC4217)
 
-SENDFILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysendfile>0:${PORTSDIR}/net/py-pysendfile
-OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl
+SENDFILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysendfile>0:net/py-pysendfile
+OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
diff --git a/ftp/rubygem-curb/Makefile b/ftp/rubygem-curb/Makefile
index 9ccead1c15c0..fb18bef6f47f 100644
--- a/ftp/rubygem-curb/Makefile
+++ b/ftp/rubygem-curb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby bindings for libcurl
 LICENSE=	RUBY
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/ftp/twoftpd/Makefile b/ftp/twoftpd/Makefile
index 0db32c4b11be..9a6455986d38 100644
--- a/ftp/twoftpd/Makefile
+++ b/ftp/twoftpd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple, secure, efficient FTP server
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bg-installer:${PORTSDIR}/devel/bglibs
-LIB_DEPENDS=	libcvm-v2client.so:${PORTSDIR}/security/cvm
+BUILD_DEPENDS=	${LOCALBASE}/bin/bg-installer:devel/bglibs
+LIB_DEPENDS=	libcvm-v2client.so:security/cvm
 
 USES=		localbase
 
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index d2a705a39501..b93dc7141d7a 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/urlget/Urlgfe%20%28legacy%29/${PORTVERSION}
 MAINTAINER=	chip-set@mail.ru
 COMMENT=	Download manager
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		dos2unix libtool pkgconfig
diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile
index 3edd1258b4cb..b914e01312c9 100644
--- a/ftp/vsftpd-ext/Makefile
+++ b/ftp/vsftpd-ext/Makefile
@@ -42,7 +42,7 @@ CONFLICTS=	vsftpd-3* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-3*
 .if exists(/usr/bin/clang)
 CC=		clang
 .else
-BUILD_DEPENDS+=	clang33:${PORTSDIR}/lang/clang33
+BUILD_DEPENDS+=	clang33:lang/clang33
 CC=		clang33
 .endif
 .endif
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 79daa47dafa4..6a59f31f38bf 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -34,11 +34,11 @@ NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LDFLAGS=		-L${LOCALBASE}/lib
 
 IDN_USES=		iconv
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_ENABLE=	iri
 IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CPPFLAGS=		-I${LOCALBASE}/include
 PCRE_LDFLAGS=		-L${LOCALBASE}/lib
 PCRE_CONFIGURE_ENV_OFF=	ac_cv_header_pcre_h=no
@@ -52,7 +52,7 @@ CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .elif ${PORT_OPTIONS:MGNUTLS}
 USES+=		pkgconfig
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile
index f651de8c0fc8..1a5318182148 100644
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Dock app for Window Maker providing wget functionality
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_XORG=	x11 xpm
 USES=		gmake
diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile
index 1ac2bfcad0c8..f1aa1d92ea95 100644
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	TLS NLS DOCS EXAMPLES
 OPTIONS_DEFAULT=TLS
 OPTIONS_SUB=	yes
 
-TLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+TLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 TLS_CONFIGURE_WITH=	ssl
 NLS_USES=		gettext iconv
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index e0c3ce743971..dd938426da7f 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -44,7 +44,7 @@ OPENSSL_CONFIGURE_ENABLE=	openssl
 OPENSSL_USE=		OPENSSL=yes
 
 GNUTLS_CONFIGURE_ENABLE=	gnutls
-GNUTLS_LIB_DEPENDS=		libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
@@ -62,12 +62,12 @@ SQLITE_CONFIGURE_ENABLE=	sqlite3
 SQLITE_USE=			SQLITE=3
 
 AVAHI_CONFIGURE_ON=	--with-zeroconf --enable-avahi
-AVAHI_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-			libavahi-core.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+			libavahi-core.so:net/avahi-app
 
 HOWL_CONFIGURE_ON=	--with-zeroconf --enable-howl
 HOWL_CPPFLAGS=		-I${LOCALBASE}/include/howl
-HOWL_LIB_DEPENDS=	libhowl.so:${PORTSDIR}/net/howl
+HOWL_LIB_DEPENDS=	libhowl.so:net/howl
 
 .include <bsd.port.options.mk>
 
diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile
index 07522d5eee37..6fd832c30635 100644
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@@ -39,7 +39,7 @@ NLS_PLIST_FILES=	share/locale/de/LC_MESSAGES/yafc.mo \
 READLINE_USES=		readline
 READLINE_CONFIGURE_WITH=readline
 
-SSH_LIB_DEPENDS=	libssh.so:${PORTSDIR}/security/libssh
+SSH_LIB_DEPENDS=	libssh.so:security/libssh
 SSH_CONFIGURE_OFF=	--without-ssh
 
 BASH_CONFIGURE_ON=	--with-bash-completion=yes
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index 9ce232b38f93..095eb8e7326f 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -10,17 +10,17 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Real-time strategy (RTS) game of ancient warfare
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		cmake:${PORTSDIR}/devel/cmake
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libgloox.so:${PORTSDIR}/net-im/gloox \
-		libminiupnpc.so:${PORTSDIR}/net/miniupnpc \
-		libnspr4.so:${PORTSDIR}/devel/nspr \
-		libenet.so:${PORTSDIR}/net/enet
+BUILD_DEPENDS=	zip:archivers/zip \
+		cmake:devel/cmake
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libpng.so:graphics/png \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libcurl.so:ftp/curl \
+		libgloox.so:net-im/gloox \
+		libminiupnpc.so:net/miniupnpc \
+		libnspr4.so:devel/nspr \
+		libenet.so:net/enet
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha
 BUILD_WRKSRC=	${WRKSRC}/build/workspaces/gcc
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 13453099ffb5..908b296ccc34 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	3-Dimensional Chess for X Window System
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../GPL
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 USES=		perl5
 USE_PERL5=	build
diff --git a/games/3omns/Makefile b/games/3omns/Makefile
index de71983d5063..f858c9712376 100644
--- a/games/3omns/Makefile
+++ b/games/3omns/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Old-school bomb-dropping Deathmatch
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \
-		asciidoc:${PORTSDIR}/textproc/asciidoc \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:devel/argp-standalone \
+		asciidoc:textproc/asciidoc \
+		docbook-xml>0:textproc/docbook-xml \
+		xsltproc:textproc/libxslt \
+		docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chazomaticus
diff --git a/games/54321/Makefile b/games/54321/Makefile
index 24cbc7d42bd1..f32451d3fe9a 100644
--- a/games/54321/Makefile
+++ b/games/54321/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Five games in four-, three-, or two-dimensions for one player
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake tar:tgz
 USE_SDL=	image sdl
diff --git a/games/7kaa/Makefile b/games/7kaa/Makefile
index 11a09ea3a549..6798d26da1b4 100644
--- a/games/7kaa/Makefile
+++ b/games/7kaa/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Seven Kingdoms: Ancient Adversaries
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet
+LIB_DEPENDS=	libenet.so:net/enet
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules \
diff --git a/games/acm/Makefile b/games/acm/Makefile
index ff760c871388..73b7df3f9d1a 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -26,7 +26,7 @@ MAKE_ARGS+=	prefix=${STAGEDIR}${PREFIX}/ OBVDIR=${STAGEDIR}${DATADIR}/
 
 OPTIONS_DEFINE=	SOUND
 
-SOUND_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
+SOUND_LIB_DEPENDS=	libaudio.so:audio/nas
 
 .include <bsd.port.options.mk>
 
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 0ff42135deed..5387b11e4651 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -15,9 +15,9 @@ BROKEN=		unfetchable
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libfreetype.so:print/freetype2
 
 USES=		execinfo gmake jpeg libtool tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index f75c211eefb9..0e730a75d59c 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Free role playing game
 LICENSE=	GPLv2
 LICENSE_DISTFILES=	${DISTFILES}
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libfreetype.so:print/freetype2
 
 USES=		gettext gmake python
 USE_SDL=	mixer ttf sdl
diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile
index 06c504f103a3..4e08f47b6dbd 100644
--- a/games/afternoonstalker/Makefile
+++ b/games/afternoonstalker/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Clone of the 1981 Night Stalker video game
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libflatzebra-0.1.so:${PORTSDIR}/devel/flatzebra
+LIB_DEPENDS=	libflatzebra-0.1.so:devel/flatzebra
 
 USES=		pkgconfig
 USE_SDL=	mixer sdl
diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile
index c3217ea1bd13..75fe49599f14 100644
--- a/games/aisleriot/Makefile
+++ b/games/aisleriot/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of patience games written in guile scheme
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		appstream-builder:${PORTSDIR}/devel/appstream-glib \
-		bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2 \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		appstream-builder:devel/appstream-glib \
+		bash:shells/bash
+LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 CONFLICTS=	sol-*
 PORTSCOUT=	limitw:1,even
diff --git a/games/alephone-data/Makefile b/games/alephone-data/Makefile
index 5278e4dc4c01..bf28370b9638 100644
--- a/games/alephone-data/Makefile
+++ b/games/alephone-data/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	alephone
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Released Marathon data files for the Aleph One port
 
-RUN_DEPENDS=	alephone:${PORTSDIR}/games/alephone
+RUN_DEPENDS=	alephone:games/alephone
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/games/alephone-scenarios/Makefile b/games/alephone-scenarios/Makefile
index e738e1a357cb..0752bf5bcdb0 100644
--- a/games/alephone-scenarios/Makefile
+++ b/games/alephone-scenarios/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	#
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free scenarios for the Aleph One engine
 
-RUN_DEPENDS=	alephone:${PORTSDIR}/games/alephone
+RUN_DEPENDS=	alephone:games/alephone
 
 USES=		zip
 NO_BUILD=	yes
@@ -52,7 +52,7 @@ DATADIR!=	cd ${PORTSDIR}/games/alephone && ${MAKE} -V DATADIR
 
 .if ${PORT_OPTIONS:MEMR}
 . if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-EXTRACT_DEPENDS=gtar:${PORTSDIR}/archivers/gtar
+EXTRACT_DEPENDS=gtar:archivers/gtar
 TAR=		${LOCALBASE}/bin/gtar
 . endif
 EMR_FILE=	emr-3.0-0602.tgz
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 7df7dc2b6be3..74be32874c7f 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	AlephOne-${PORTVERSION}
 MAINTAINER=	fiziologus@gmail.com
 COMMENT=	The open source version of Bungie's Marathon game
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
 
 USES=		gmake localbase pkgconfig tar:bzip2
 USE_SDL=	image net sdl ttf
@@ -29,23 +29,23 @@ FFMPEG_DESC=	Use ffmpeg for film export and playback
 SMPEG_DESC=	Use SMPEG for movie playback
 ZZIP_DESC=	Enable zziplib support
 
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_WITH=	mad
-FMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FMPEG_CONFIGURE_WITH=	ffmpeg
-OGG_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+OGG_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 OGG_CONFIGURE_WITH=	vorbis
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_WITH=	speex
-SMPEG_LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+SMPEG_LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 SMPEG_CONFIGURE_WITH=	smpeg
-ZZIP_LIB_DEPENDS=	libzzip.so:${PORTSDIR}/devel/zziplib
+ZZIP_LIB_DEPENDS=	libzzip.so:devel/zziplib
 ZZIP_CONFIGURE_WITH=	zzip
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_WITH=	sndfile
 
 post-install-DOCS-on:
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index b375ee9ac647..20654f81e077 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Single player 2D role-playing game
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libboost_thread.so:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake iconv jpeg lua:51 openal:al
diff --git a/games/angband/Makefile b/games/angband/Makefile
index 1f9d5a1a0163..f7ffd53ad6e8 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -23,13 +23,13 @@ CONFIGURE_ARGS=	--localstatedir=/var
 CPPFLAGS+=	-I${NCURSESINC}
 LDFLAGS+=	-L${NCURSESLIB} -lncursesw
 
-DOCS_BUILD_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils
+DOCS_BUILD_DEPENDS=	rst2html:textproc/py-docutils
 
 SDL_USE=		SDL=image,mixer,ttf,sdl
 SDL_CONFIGURE_ENABLE=	sdl
 
 X11_USE=		XORG=sm,x11
-X11_RUN_DEPENDS=	xorg-fonts-miscbitmaps>=0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps
+X11_RUN_DEPENDS=	xorg-fonts-miscbitmaps>=0:x11-fonts/xorg-fonts-miscbitmaps
 X11_CONFIGURE_ENABLE=	x11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/anki/Makefile b/games/anki/Makefile
index 31e41d8908f3..c7ae4c3b9434 100644
--- a/games/anki/Makefile
+++ b/games/anki/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Flashcard trainer with spaced repetition
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		${PYTHON_PKGNAMEPREFIX}pyaudio>0:${PORTSDIR}/audio/py-pyaudio \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.4:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.4:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_PKGNAMEPREFIX}send2trash>0:${PORTSDIR}/deskutils/py-send2trash
+RUN_DEPENDS=	lame:audio/lame \
+		mplayer:multimedia/mplayer \
+		${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.4:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \
+		${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2 \
+		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.4:www/py-qt4-webkit \
+		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash
 
 USES=		desktop-file-utils python:2 shared-mime-info shebangfix tar:tgz
 SHEBANG_FILES=	tools/build_ui.sh tools/tests.sh
diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile
index 96cb6792a1df..7638be9f33c3 100644
--- a/games/armagetron/Makefile
+++ b/games/armagetron/Makefile
@@ -19,9 +19,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-etc --disable-initscripts
 CXXFLAGS+=	${CFLAGS} -I${LOCALBASE}/include
 
-BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS+=	bash:shells/bash
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libxml2.so:textproc/libxml2
 
 OPTIONS_DEFINE=	MUSIC ARMA_SERVER_ONLY
 MUSIC_DESC=	Compile in support for background music
diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile
index cab75141fd68..a18d29b6cc9b 100644
--- a/games/arx-libertatis/Makefile
+++ b/games/arx-libertatis/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Cross-platform port of Arx Fatalis
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/ARX_PUBLIC_LICENSE.txt
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/foreach.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libfreetype.so:print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/foreach.hpp:devel/boost-libs
 
 USES=		cmake openal tar:xz
 USE_SDL=	sdl
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 7c7ceb697dc1..1ae9b0aac866 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -16,13 +16,13 @@ COMMENT=	Turn based, multiplayer strategic game with nice graphics
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	zip:archivers/zip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libloki.so:${PORTSDIR}/devel/loki
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libboost_regex.so:devel/boost-libs \
+		libsigc-2.0.so:devel/libsigc++20 \
+		libexpat.so:textproc/expat2 \
+		libloki.so:devel/loki
 
 USES=		compiler:c++11-lib gmake libtool lua perl5 pkgconfig tar:bzip2 
 USE_CXXSTD=	c++11
@@ -57,7 +57,7 @@ OPTIONS_DEFINE=		MUSIC XVID
 MUSIC_DESC=		Install extra music files
 MUSIC_DISTFILES=	${ASC_MUSICS:S,$,:music,}
 MUSIC_PLIST_FILES=	${ASC_MUSICS:S,^,%%DATADIR%%/music/,}
-XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENV_OFF=	ac_cv_lib_xvidcore_xvid_encore=no
 ASC_MUSICS=		frontiers.ogg time_to_strike.ogg machine_wars.ogg
 
diff --git a/games/asciiquarium/Makefile b/games/asciiquarium/Makefile
index c8d8b06267b7..d7adde69467d 100644
--- a/games/asciiquarium/Makefile
+++ b/games/asciiquarium/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	aquarium/sea animation in ASCII art
 
-RUN_DEPENDS=	p5-Term-Animation>=0:${PORTSDIR}/devel/p5-Term-Animation
+RUN_DEPENDS=	p5-Term-Animation>=0:devel/p5-Term-Animation
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile
index fc079c9ea3c9..fac59081fc48 100644
--- a/games/assaultcube/Makefile
+++ b/games/assaultcube/Makefile
@@ -41,8 +41,8 @@ OPTIONS_DEFAULT=	CLIENT DEDICATED
 CLIENT_DESC=	Build client
 CLIENT_USES=		gettext-runtime openal:al
 CLIENT_USE=		GL=gl SDL=image,sdl XORG=x11
-CLIENT_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-			libcurl.so:${PORTSDIR}/ftp/curl
+CLIENT_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
+			libcurl.so:ftp/curl
 CLIENT_ALL_TARGET=	client
 CLIENT_PLIST_FILES=	bin/${PORTNAME}_client libexec/${PORTNAME}_client \
 			share/pixmaps/${PORTNAME}.png
@@ -63,7 +63,7 @@ DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \
 .endif
 
 .if ${PORT_OPTIONS:MPORT_ENET}
-LIB_DEPENDS+=	libenet.so:${PORTSDIR}/net/enet
+LIB_DEPENDS+=	libenet.so:net/enet
 .else
 ALL_TARGET+=	libenet
 GNU_CONFIGURE=		yes
diff --git a/games/atanks/Makefile b/games/atanks/Makefile
index b45be5a12c55..ed94c3a4caf4 100644
--- a/games/atanks/Makefile
+++ b/games/atanks/Makefile
@@ -12,7 +12,7 @@ COMMENT=	2D tank game with large, cartoonish weapons
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS=	liballeg.so:devel/allegro
 
 USES=		gmake
 MAKE_ARGS+=	PREFIX=${PREFIX}/
diff --git a/games/atris-sounds/Makefile b/games/atris-sounds/Makefile
index 212d765d315c..74b727b9b928 100644
--- a/games/atris-sounds/Makefile
+++ b/games/atris-sounds/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sounds for Atris: Alizarin Tetris
 
-RUN_DEPENDS=	atris:${PORTSDIR}/games/atris
+RUN_DEPENDS=	atris:games/atris
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/games/avoision/Makefile b/games/avoision/Makefile
index b33be33f7589..e757182be0ac 100644
--- a/games/avoision/Makefile
+++ b/games/avoision/Makefile
@@ -17,11 +17,11 @@ LICENSE_FILE=	${WRKSRC}/License.txt
 LICENSE_FILE_CCbyNCSA3=${WRKSRC}/License.txt
 LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libradius-engine.a:${PORTSDIR}/graphics/radius-engine
-LIB_DEPENDS=	liblua-5.1.so:${PORTSDIR}/lang/lua51 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libphysfs.so:${PORTSDIR}/devel/physfs
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	${LOCALBASE}/lib/libradius-engine.a:graphics/radius-engine
+LIB_DEPENDS=	liblua-5.1.so:lang/lua51 \
+		libpng.so:graphics/png \
+		libphysfs.so:devel/physfs
+RUN_DEPENDS=	zip:archivers/zip
 
 USES=		pkgconfig
 USE_SDL=	sdl sound
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index 054b6be38843..14c49cfe45fb 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -13,13 +13,13 @@ COMMENT=	3D adventure and roleplaying game
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libcal3d.so:${PORTSDIR}/graphics/cal3d \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	soya_editor:${PORTSDIR}/graphics/py-soya3d \
-		${PYTHON_PKGNAMEPREFIX}openal>0:${PORTSDIR}/audio/py-openal \
-		${PYTHON_PKGNAMEPREFIX}vorbis>0:${PORTSDIR}/audio/py-vorbis \
-		${PYTHON_PKGNAMEPREFIX}tofu>0:${PORTSDIR}/net/py-tofu \
-		${PYTHON_PKGNAMEPREFIX}cerealizer>0:${PORTSDIR}/security/py-cerealizer
+LIB_DEPENDS=	libcal3d.so:graphics/cal3d \
+		libfreetype.so:print/freetype2
+RUN_DEPENDS=	soya_editor:graphics/py-soya3d \
+		${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal \
+		${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \
+		${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu \
+		${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer
 
 NO_ARCH=	yes
 
diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile
index f0ed817f9d89..9cce7c3e8ba8 100644
--- a/games/balazarbrothers/Makefile
+++ b/games/balazarbrothers/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Free software 3D puzzle game
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcal3d.so:${PORTSDIR}/graphics/cal3d \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vorbis>0:${PORTSDIR}/audio/py-vorbis \
-		${PYTHON_PKGNAMEPREFIX}soya3d>0:${PORTSDIR}/graphics/py-soya3d \
-		${PYTHON_PKGNAMEPREFIX}tofu>0:${PORTSDIR}/net/py-tofu \
-		${PYTHON_PKGNAMEPREFIX}cerealizer>0:${PORTSDIR}/security/py-cerealizer
+LIB_DEPENDS=	libcal3d.so:graphics/cal3d \
+		libfreetype.so:print/freetype2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \
+		${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d \
+		${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu \
+		${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer
 
 NO_ARCH=	yes
 
@@ -37,7 +37,7 @@ DESKTOP_ENTRIES="BalazarBrothers" "" "" "balazarbrothers" "" ""
 OPTIONS_DEFINE=		OPENAL
 OPTIONS_DEFAULT=	OPENAL
 
-OPENAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openal>0:${PORTSDIR}/audio/py-openal
+OPENAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/games/bass/Makefile b/games/bass/Makefile
index 0120a115b85d..84255b92e122 100644
--- a/games/bass/Makefile
+++ b/games/bass/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	no name
 LICENSE_FILE=	${WRKSRC}/readme.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
+RUN_DEPENDS=	scummvm:games/scummvm
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/games/bastet/Makefile b/games/bastet/Makefile
index 8890692f0f0d..677dc49fbc69 100644
--- a/games/bastet/Makefile
+++ b/games/bastet/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ncurses Tetris clone which is harder than every other Tetris
 
 LICENSE=	GPLv3+
 
-LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs
 
 USES=		gmake ncurses tar:tgz
 
diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile
index d400745d489e..95d27df8b056 100644
--- a/games/battletanks/Makefile
+++ b/games/battletanks/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Fast 2D tank arcade game with multiplayer and split-screen modes
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+BUILD_DEPENDS=	zip:archivers/zip
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
+		libexpat.so:textproc/expat2 \
+		libvorbisfile.so:audio/libvorbis \
+		libsmpeg.so:multimedia/smpeg
 
 USES=		openal:al pkgconfig lua:51 python:build scons tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/games/biorythm/Makefile b/games/biorythm/Makefile
index bddc17d5b5d9..38cfa5b90fd0 100644
--- a/games/biorythm/Makefile
+++ b/games/biorythm/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple biorhythm calculation program
 
-LIB_DEPENDS=	libshhmsg.so:${PORTSDIR}/devel/libshhmsg \
-		libshhopt.so:${PORTSDIR}/devel/libshhopt
+LIB_DEPENDS=	libshhmsg.so:devel/libshhmsg \
+		libshhopt.so:devel/libshhopt
 
 PORTDOCS=	ChangeLog README
 PLIST_FILES=	bin/${PORTNAME} man/man6/${PORTNAME}.6.gz
diff --git a/games/blackshadeselite/Makefile b/games/blackshadeselite/Makefile
index 69f404deeccb..a04100b17159 100644
--- a/games/blackshadeselite/Makefile
+++ b/games/blackshadeselite/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Psychic Bodyguard FPS - protect the VIP
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 USES=		tar:bzip2 gmake openal:al,alut
 USE_SDL=	sdl
diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile
index 4fc409ee0203..051b18283d4f 100644
--- a/games/blinkensisters/Makefile
+++ b/games/blinkensisters/Makefile
@@ -47,7 +47,7 @@ SDL_NET_PLIST_FILES=	bin/blpmatrix \
 			bin/mcufviewer
 
 THEORA_CMAKE_ON=	-DUSE_THEORA:BOOL=ON
-THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 
 .include <bsd.port.options.mk>
 
diff --git a/games/blobby/Makefile b/games/blobby/Makefile
index a125dc5af2cc..7d1ab090d26f 100644
--- a/games/blobby/Makefile
+++ b/games/blobby/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Official continuation of the famous Blobby Volley 1.x game
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs \
-		libdrm.so:${PORTSDIR}/graphics/libdrm
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		${LOCALBASE}/include/boost/crc.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libphysfs.so:devel/physfs \
+		libdrm.so:graphics/libdrm
+BUILD_DEPENDS=	zip:archivers/zip \
+		${LOCALBASE}/include/boost/crc.hpp:devel/boost-libs
 
 USE_XORG=	ice x11 xext xxf86vm xdamage xfixes xau xdmcp xrandr xrender
 USE_SDL=	sdl
diff --git a/games/blockout/Makefile b/games/blockout/Makefile
index 1ff1d2a9913c..25b412434649 100644
--- a/games/blockout/Makefile
+++ b/games/blockout/Makefile
@@ -19,7 +19,7 @@ USE_SDL=	mixer sdl
 USES=		gmake dos2unix
 DOS2UNIX_FILES=	${WRKSRC}/ImageLib/src/gif/gif.h \
 		${WRKSRC}/ImageLib/src/gif/gif.cpp ${WRKSRC}/BlockOut/*.cpp
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:audio/alsa-lib
 USE_GL=		gl glu
 
 WRKSRC=		${WRKDIR}/BL_SRC
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index c8e557fe0575..f1f89675c50a 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Word game for X Window System
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
 
 EXTRACT_CMD=	${GZIP_CMD}
 EXTRACT_BEFORE_ARGS=	-dc
diff --git a/games/bombherman/Makefile b/games/bombherman/Makefile
index 7f50ab3948b3..427653d5125a 100644
--- a/games/bombherman/Makefile
+++ b/games/bombherman/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Bomberman clone written in C++
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Keruspe
diff --git a/games/bomns/Makefile b/games/bomns/Makefile
index 11c4edfb5ce6..daaf4db2285d 100644
--- a/games/bomns/Makefile
+++ b/games/bomns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Best old-school Deathmatch game ever (only for two players)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	keithfancher
diff --git a/games/boswars/Makefile b/games/boswars/Makefile
index 7a6cd227c654..c1771a163550 100644
--- a/games/boswars/Makefile
+++ b/games/boswars/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Futuristic real-time strategy game
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtheora.so:multimedia/libtheora \
+		libvorbis.so:audio/libvorbis
 
 USES=		lua:51 scons shebangfix
 SHEBANG_FILES=	languages/updatepo.sh
diff --git a/games/bouncy/Makefile b/games/bouncy/Makefile
index fb31f686a9bb..d98440b57904 100644
--- a/games/bouncy/Makefile
+++ b/games/bouncy/Makefile
@@ -19,7 +19,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GPL.txt
 
 RUN_DEPENDS=	${PYGAME} \
-		${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl
+		${PYTHON_PKGNAMEPREFIX}opengl>=0:graphics/py-opengl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-post-${DISTVERSION}
 
diff --git a/games/brainworkshop/Makefile b/games/brainworkshop/Makefile
index 40b971b4e60c..103177de5ac4 100644
--- a/games/brainworkshop/Makefile
+++ b/games/brainworkshop/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Brain%20Workshop%20${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Free open-source version of the Dual N-Back mental exercise
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyglet/__init__.py:${PORTSDIR}/graphics/py-pyglet
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyglet/__init__.py:graphics/py-pyglet
 
 USES=		dos2unix python:run zip
 NO_BUILD=	yes
diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile
index 418c5de94ce5..1a65696eea91 100644
--- a/games/briquolo/Makefile
+++ b/games/briquolo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Breakout clone with an OpenGL 3D representation
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		tar:bzip2 gmake iconv desktop-file-utils
 USE_GL=		gl
diff --git a/games/brutalchess/Makefile b/games/brutalchess/Makefile
index d9dd3afa98a6..aec57bc0b197 100644
--- a/games/brutalchess/Makefile
+++ b/games/brutalchess/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-alpha/${PORTNAME}-alpha-${PORTVERSION}
 DISTNAME=	${PORTNAME}-alpha-${PORTVERSION}-src
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 MAINTAINER=	gustau.perez@gmail.com
 COMMENT=	Nice looking OpenGL chess game
diff --git a/games/bugsquish/Makefile b/games/bugsquish/Makefile
index 1a555e3cffb4..adadef2ba9fd 100644
--- a/games/bugsquish/Makefile
+++ b/games/bugsquish/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Action game not unlike light gun arcade games
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:audio/libogg
 
 USES=		gmake
 USE_SDL=	image mixer sdl
diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index af5966e295e4..cc50e573c578 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -13,7 +13,7 @@ COMMENT=	BurgerTime clone
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libflatzebra-0.1.so:${PORTSDIR}/devel/flatzebra
+LIB_DEPENDS=	libflatzebra-0.1.so:devel/flatzebra
 
 USES=		pkgconfig
 USE_SDL=	mixer sdl
diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile
index ed84979979d6..40e566a857d4 100644
--- a/games/burrtools/Makefile
+++ b/games/burrtools/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Puzzle solver
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	netpbm>0:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libxmlwrapp.so:${PORTSDIR}/textproc/xmlwrapp \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+BUILD_DEPENDS=	netpbm>0:graphics/netpbm
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libpng.so:graphics/png \
+		libxmlwrapp.so:textproc/xmlwrapp \
+		libfltk.so:x11-toolkits/fltk
 
 USES=		gmake
 USE_XORG=	x11 xt xext xmu xi
diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index 55bccdf9e9d4..4f22d65b09f4 100644
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # needed to save/load games
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS=	zip:archivers/zip \
+		unzip:archivers/unzip
 
 USES=		gettext pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index a8b22719de6c..399eb497c1ac 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -12,7 +12,7 @@ COMMENT?=	Multiplayer 3D tank battle game
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		libtool tar:bzip2
diff --git a/games/caph/Makefile b/games/caph/Makefile
index 1eca8419c9cb..1cbd6ce13a77 100644
--- a/games/caph/Makefile
+++ b/games/caph/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Physics-based sandbox game
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/doc/caph/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		tar:bzip2 iconv
 USE_SDL=	sdl
diff --git a/games/capicity/Makefile b/games/capicity/Makefile
index 980a3f635ed9..a4be851f0463 100644
--- a/games/capicity/Makefile
+++ b/games/capicity/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Qt client for the Monopd server
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copying.txt
 
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 WRKSRC=		${WRKDIR}/CapiCity_${PORTVERSION}
 
diff --git a/games/capitalism/Makefile b/games/capitalism/Makefile
index 296598cc716e..5de58fa6d48d 100644
--- a/games/capitalism/Makefile
+++ b/games/capitalism/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Qt client for the Monopd server
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copying.txt
 
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 WRKSRC=		${WRKDIR}/Capitalism-${PORTVERSION}
 
diff --git a/games/cataclysm-dda/Makefile b/games/cataclysm-dda/Makefile
index 23b14a02f0b5..8b5a2bd33001 100644
--- a/games/cataclysm-dda/Makefile
+++ b/games/cataclysm-dda/Makefile
@@ -42,7 +42,7 @@ NCURSES_USES=	ncurses
 SDL_USE=	SDL=image2,ttf2
 SDL_USES=	pkgconfig
 SDL_MAKE_ARGS=	TILES=1 TILESTARGET=cataclysm
-SDL_RUN_DEPENDS=terminus-font>0:${PORTSDIR}/x11-fonts/terminus-font
+SDL_RUN_DEPENDS=terminus-font>0:x11-fonts/terminus-font
 SDL_CPPFLAGS=	$$(sdl2-config --cflags)
 SDL_LDFLAGS=	$$(sdl2-config --libs)
 SDL_DESKTOP_ENTRIES="Cataclysm-DDA" "" "" "cataclysm" "" ""
diff --git a/games/catesc/Makefile b/games/catesc/Makefile
index 75ece0051035..3ee9d93404aa 100644
--- a/games/catesc/Makefile
+++ b/games/catesc/Makefile
@@ -17,7 +17,7 @@ LICENSE_TEXT_CCbySA40=	https://creativecommons.org/licenses/by-sa/4.0/legalcode
 LICENSE_PERMS_CCbySA30=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_CCbySA40=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	instead:${PORTSDIR}/games/instead
+RUN_DEPENDS=	instead:games/instead
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gl00my
diff --git a/games/cheech/Makefile b/games/cheech/Makefile
index 405ac5f31663..d988b44f274f 100644
--- a/games/cheech/Makefile
+++ b/games/cheech/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Multiplayer Chinese Checkers game
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
+LIB_DEPENDS=	libgnet-2.0.so:net/gnet2
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/chessx/Makefile b/games/chessx/Makefile
index 40683773cbf0..76e479a536dc 100644
--- a/games/chessx/Makefile
+++ b/games/chessx/Makefile
@@ -24,9 +24,9 @@ PLIST_FILES=	bin/chessx \
 OPTIONS_DEFINE=	STOCKFISH CRAFTY
 
 STOCKFISH_DESC=	Install Stockfish Chess Engine
-STOCKFISH_RUN_DEPENDS=	stockfish:${PORTSDIR}/games/stockfish
+STOCKFISH_RUN_DEPENDS=	stockfish:games/stockfish
 
 CRAFTY_DESC=	Install Crafty Chess Application
-CRAFTY_RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
+CRAFTY_RUN_DEPENDS=	crafty:games/crafty
 
 .include <bsd.port.mk>
diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile
index 3e7dcee42f93..e4672a9325b4 100644
--- a/games/childsplay/Makefile
+++ b/games/childsplay/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Educative games for children
 LICENSE=	GPLv3 # only
 LICENSE_FILE=	${WRKSRC}/gpl-3.0.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
 
 NO_BUILD=	yes
 
diff --git a/games/chocolate-doom/Makefile b/games/chocolate-doom/Makefile
index 12217f5a259d..b4540a87de96 100644
--- a/games/chocolate-doom/Makefile
+++ b/games/chocolate-doom/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Doom/Heretic/Hexen/Strife engine port compatible with the originals
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
+BUILD_DEPENDS=	python:lang/python
 
 USES=		gmake
 USE_SDL=	mixer net sdl
diff --git a/games/chroma/Makefile b/games/chroma/Makefile
index fab49490b84d..c1efc1d451d6 100644
--- a/games/chroma/Makefile
+++ b/games/chroma/Makefile
@@ -32,7 +32,7 @@ CURSES_USES=		ncurses
 CURSES_CONFIGURE_ENABLE=curses
 CURSES_PLIST_FILES=	bin/${PORTNAME}-curses
 SDL_CONFIGURE_ENABLE=	sdl
-SDL_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+SDL_LIB_DEPENDS=	libfreetype.so:print/freetype2
 SDL_USE=		SDL=sdl,image
 SDL_PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index 8949fe930139..de363fd8ac8a 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/Chromium%20B.S.U.%20source%20code/
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Arcade-style, top-scrolling space shooter
 
-LIB_DEPENDS=	libglpng.so:${PORTSDIR}/graphics/glpng \
-		libftgl.so:${PORTSDIR}/graphics/ftgl \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libglpng.so:graphics/glpng \
+		libftgl.so:graphics/ftgl \
+		libfontconfig.so:x11-fonts/fontconfig
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/games/cleanq3/Makefile b/games/cleanq3/Makefile
index b3d0331eae90..345e647e3a3d 100644
--- a/games/cleanq3/Makefile
+++ b/games/cleanq3/Makefile
@@ -39,7 +39,7 @@ GAMELIBS_DESC=		Build game libraries (when not mandatory)
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 .endif
 
 .for i in ${ARCH}
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 166df3d93e2f..2e8aa128bd2a 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simulation game where the goal is to crash each other's programs
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
+BUILD_DEPENDS=	${LOCALBASE}/lib/libargp.a:devel/argp-standalone
 
 USE_GNOME=	gtk12
 
diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile
index bc0a2b67e58a..20e06c6c4db2 100644
--- a/games/corsix-th/Makefile
+++ b/games/corsix-th/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Open source clone of Theme Hospital
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem \
-		${LUA_MODLIBDIR}/lpeg.so:${PORTSDIR}/devel/lua-lpeg
+LIB_DEPENDS=	libfreetype.so:print/freetype2
+RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem \
+		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg
 
 USES=		cmake compiler:c++11-lang dos2unix iconv lua pkgconfig
 USE_SDL=	mixer2
@@ -34,7 +34,7 @@ MOVIES_DESC=	Play in-game movies
 
 MOVIES_CMAKE_ON=	-DWITH_MOVIES=ON
 MOVIES_CMAKE_OFF=	-DWITH_MOVIES=OFF
-MOVIES_LIB_DEPENDS=	libswresample.so:${PORTSDIR}/multimedia/ffmpeg
+MOVIES_LIB_DEPENDS=	libswresample.so:multimedia/ffmpeg
 
 post-patch:
 # Allow the game to find its resources without wrapper scripts
diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile
index 950328a7b0f2..2f53284d85e6 100644
--- a/games/cosmosmash/Makefile
+++ b/games/cosmosmash/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Clone of the Intellivision(TM) game Astrosmash(TM)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libflatzebra-0.1.so:${PORTSDIR}/devel/flatzebra \
-		libaa.so:${PORTSDIR}/graphics/aalib \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS=	libflatzebra-0.1.so:devel/flatzebra \
+		libaa.so:graphics/aalib \
+		libmikmod.so:audio/libmikmod \
+		libaudiofile.so:audio/libaudiofile
 
 USE_SDL=	sdl image mixer
 USE_XORG=	x11 xau xdmcp
diff --git a/games/craft/Makefile b/games/craft/Makefile
index 9ce40a523aec..20004b474364 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Simple Minecraft clone written in C using modern OpenGL
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	daniloegea
@@ -27,8 +27,8 @@ USE_XORG=	x11 xi xrandr
 USE_GL=		gl glu
 
 SERVER_USES=		python
-SERVER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.2:${PORTSDIR}/www/py-requests \
-			${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+SERVER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.2:www/py-requests \
+			${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 SERVER_CMAKE_ON=	-DSERVER:BOOL=ON
 
 .include <bsd.port.options.mk>
diff --git a/games/crafty-open-enormous/Makefile b/games/crafty-open-enormous/Makefile
index b9e635ba70dd..73fc2ff4cfd4 100644
--- a/games/crafty-open-enormous/Makefile
+++ b/games/crafty-open-enormous/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	crafty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enormous opening book (about 270 MByte) for crafty
 
-BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
-RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
+BUILD_DEPENDS=	crafty:games/crafty
+RUN_DEPENDS=	crafty:games/crafty
 
 USES=		zip
 NO_WRKSUBDIR=	yes
diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile
index 9d5ba8195819..a9a89a572b3f 100644
--- a/games/crafty-open-large/Makefile
+++ b/games/crafty-open-large/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	crafty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Large opening book for crafty
 
-BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
-RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
+BUILD_DEPENDS=	crafty:games/crafty
+RUN_DEPENDS=	crafty:games/crafty
 
 USES=		zip
 NO_WRKSUBDIR=	yes
diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile
index e4c0dd263fac..299b674a6a0d 100644
--- a/games/crafty-open-medium/Makefile
+++ b/games/crafty-open-medium/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	crafty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Medium opening book (about 1.9 MByte) for crafty
 
-BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
-RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
+BUILD_DEPENDS=	crafty:games/crafty
+RUN_DEPENDS=	crafty:games/crafty
 
 USES=		zip
 NO_WRKSUBDIR=	yes
diff --git a/games/crafty-tablebase-no-pawn/Makefile b/games/crafty-tablebase-no-pawn/Makefile
index 72c1d0a959b6..81b95ac96e20 100644
--- a/games/crafty-tablebase-no-pawn/Makefile
+++ b/games/crafty-tablebase-no-pawn/Makefile
@@ -45,7 +45,7 @@ EXTRACT_ONLY=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	These are the tablebases for crafty, minus the pawn tbs
 
-RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
+RUN_DEPENDS=	crafty:games/crafty
 
 NO_BUILD=	yes
 NO_PACKAGE=	Way too big
diff --git a/games/crafty-tablebase-pawn/Makefile b/games/crafty-tablebase-pawn/Makefile
index 704377c13614..829197aaec7d 100644
--- a/games/crafty-tablebase-pawn/Makefile
+++ b/games/crafty-tablebase-pawn/Makefile
@@ -36,7 +36,7 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	These are the pawn tablebases (3,4,5 man) for crafty
 
-RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
+RUN_DEPENDS=	crafty:games/crafty
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/games/cretan-hubris/Makefile b/games/cretan-hubris/Makefile
index 2ec679561b93..874f6b08eaf1 100644
--- a/games/cretan-hubris/Makefile
+++ b/games/cretan-hubris/Makefile
@@ -17,11 +17,11 @@ LICENSE_FILE=	${WRKSRC}/License.txt
 LICENSE_FILE_CCbyNCSA3=${WRKSRC}/License.txt
 LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libradius-engine.a:${PORTSDIR}/graphics/radius-engine
-LIB_DEPENDS=	liblua-5.1.so:${PORTSDIR}/lang/lua51 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libphysfs.so.1:${PORTSDIR}/devel/physfs
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	${LOCALBASE}/lib/libradius-engine.a:graphics/radius-engine
+LIB_DEPENDS=	liblua-5.1.so:lang/lua51 \
+		libpng.so:graphics/png \
+		libphysfs.so.1:devel/physfs
+RUN_DEPENDS=	zip:archivers/zip
 
 USES=		pkgconfig
 USE_SDL=	sdl sound
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index aaf4655087d6..c278f791d873 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -15,8 +15,8 @@ COMMENT=	SDL/OpenGL space shoot'em up game
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpng.so:graphics/png
 
 USES=		dos2unix tar:bzip2
 DOS2UNIX_FILES=	tinyxml/*.cpp tinyxml/*.h
diff --git a/games/critterding/Makefile b/games/critterding/Makefile
index a9d13df2f74a..36145339978b 100644
--- a/games/critterding/Makefile
+++ b/games/critterding/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sources
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Evolving Artificial Life
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		autoreconf libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 73455815fd27..ac7f958e2ff3 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Cooperative multiplayer graphical RPG and adventure game
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig tar:bzip2
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 2b65489d626a..92534868f984 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -18,9 +18,9 @@ COMMENT=	Server for multiplayer graphical arcade and adventure game
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpng.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpng.so:graphics/png
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake libtool perl5 python shebangfix tar:bzip2 \
 		uidfix
diff --git a/games/crrcsim/Makefile b/games/crrcsim/Makefile
index b03e182705d9..d45c6e05f7f7 100644
--- a/games/crrcsim/Makefile
+++ b/games/crrcsim/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	BERLIOS
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Model-airplane flight simulation program
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
+LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 GNU_CONFIGURE=	yes
 USES=		gmake jpeg
diff --git a/games/cube/Makefile b/games/cube/Makefile
index 4de69a59fe41..46bff9de25bb 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	${CUBE_DATA} ${CUBE_SRC}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL 3D FPS (first person shooter) game
 
-LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet
+LIB_DEPENDS=	libenet.so:net/enet
 
 USES=		dos2unix gmake
 EXTRACT_AFTER_ARGS=--exclude enet
diff --git a/games/cultivation/Makefile b/games/cultivation/Makefile
index 8581c6ae6143..9b49359cf9be 100644
--- a/games/cultivation/Makefile
+++ b/games/cultivation/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Cultivation_${PORTVERSION}_UnixSource
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Unique game of conflict and cooperation in a gardening community
 
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 USES=		gmake
 USE_XORG=	x11 xi xext xmu
diff --git a/games/cuyo/Makefile b/games/cuyo/Makefile
index e9337a318fab..4efe99c81c23 100644
--- a/games/cuyo/Makefile
+++ b/games/cuyo/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=		DOCS NLS
 OPTIONS_SUB=		yes
 
 NLS_CONFIGURE_ENABLE=	nls
-NLS_BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
+NLS_BUILD_DEPENDS=	gsed:textproc/gsed
 NLS_USES=		gettext perl5
 NLS_USE=		perl5=build
 NLS_LDFLAGS=		-lintl
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index 070667959526..c1b0a3258b1a 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -15,8 +15,8 @@ DISTFILES=	${PORTNAME}-src-${PORTVERSION}.rar:source \
 MAINTAINER=	aragon@phat.za.net
 COMMENT=	Community Unix port of Descent 2 Game
 
-EXTRACT_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
-RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
+EXTRACT_DEPENDS=	unrar:archivers/unrar
+RUN_DEPENDS=	unrar:archivers/unrar
 
 DATAVERSION=	1.14.95
 
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index 94298032caf7..e4ea07edd447 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -15,8 +15,8 @@ COMMENT=	F/OSS Massively Multiplayer On-line Role-playing Game (MMORPG)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../../License
 
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libphysfs.so:devel/physfs \
+		libcurl.so:ftp/curl
 
 USES=		autoreconf
 GNU_CONFIGURE=	yes
@@ -46,7 +46,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-wrapper.c
 .endif
 
 .if ${PORT_OPTIONS:MMUSIC}
-RUN_DEPENDS+=	${DATADIR}/media/AnichGiantTrouble.ogg:${PORTSDIR}/games/daimonin-music
+RUN_DEPENDS+=	${DATADIR}/media/AnichGiantTrouble.ogg:games/daimonin-music
 .endif
 
 pre-patch:
diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile
index e513672fd525..890052e1397c 100644
--- a/games/dangerdeep/Makefile
+++ b/games/dangerdeep/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source World War II German submarine simulation
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	dangerdeep-data>0:${PORTSDIR}/games/dangerdeep-data
+LIB_DEPENDS=	libfftw3.so:math/fftw3
+RUN_DEPENDS=	dangerdeep-data>0:games/dangerdeep-data
 
 USES=		execinfo scons
 USE_GL=		yes
diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile
index 0261393b0c0c..c4f396e3137d 100644
--- a/games/darkplaces/Makefile
+++ b/games/darkplaces/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Quake engine modification
 
 # Loads libraries at run-time, thus RUN_DEPENDS.
-RUN_DEPENDS=	${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis
+RUN_DEPENDS=	${LOCALBASE}/lib/libvorbis.so:audio/libvorbis
 
 USES=		gmake jpeg zip:infozip
 USE_XORG=	xxf86dga xpm
diff --git a/games/dhewm3/Makefile b/games/dhewm3/Makefile
index f42b8fb6a27a..d9f96ce5f68d 100644
--- a/games/dhewm3/Makefile
+++ b/games/dhewm3/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Doom 3 GPL source port
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/../COPYING.txt
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dhewm
diff --git a/games/diameter/Makefile b/games/diameter/Makefile
index 23c89ea7c2f7..6b36a3bb289c 100644
--- a/games/diameter/Makefile
+++ b/games/diameter/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/game${PORTNAME}/game${PORTNAME}/${PORTNAME}-0.4.0
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Arcade-style game with elements of economy and adventure
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libguichan.so:${PORTSDIR}/devel/guichan
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libguichan.so:devel/guichan
 
 USES=		tar:bzip2 gmake pkgconfig python
 GNU_CONFIGURE=	yes
diff --git a/games/diaspora/Makefile b/games/diaspora/Makefile
index 380f1d4707e3..5266c4c07667 100644
--- a/games/diaspora/Makefile
+++ b/games/diaspora/Makefile
@@ -24,11 +24,11 @@ LICENSE_FILE_GPLv2=	${WRKDIR_DIASPORA}/wxlauncher/GPLv2.txt
 LICENSE_PERMS_CCBYNCSAv3=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 LICENSE_PERMS_VOLITION=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-LIB_DEPENDS+=	libjansson.so:${PORTSDIR}/devel/jansson \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=	libjansson.so:devel/jansson \
+		libpng.so:graphics/png \
+		libogg.so:audio/libogg \
+		libvorbisfile.so:audio/libvorbis \
+		libtheora.so:multimedia/libtheora
 
 USES=	autoreconf jpeg lua:51 openal pkgconfig tar:lzma
 USE_GL=	yes
@@ -58,7 +58,7 @@ INCJOYBTNS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-increase_joy_buttons_fixed.pat
 SPEECH_DESC=	Text to speech
 SPEECH_CONFIGURE_ENABLE=	speech
 WXLAUNCHER_DESC=	Use wxlauncher to manage application profile
-WXLAUNCHER_RUN_DEPENDS=	wxlauncher:${PORTSDIR}/games/wxlauncher
+WXLAUNCHER_RUN_DEPENDS=	wxlauncher:games/wxlauncher
 
 .include <bsd.port.options.mk>
 
diff --git a/games/doom-data/Makefile.include b/games/doom-data/Makefile.include
index c73dc7faca71..9506a6b7f494 100644
--- a/games/doom-data/Makefile.include
+++ b/games/doom-data/Makefile.include
@@ -12,5 +12,5 @@ PLIST_SUB+=	DMDIR="${DMDIR:S/${LOCALBASE}\///}"
 SUB_LIST+=	DMDIR="${DMDIR}"
 
 .if ${PORTNAME} != "data"
-RUN_DEPENDS+=	doom-data>0:${PORTSDIR}/games/doom-data
+RUN_DEPENDS+=	doom-data>0:games/doom-data
 .endif
diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile
index a7cf971ac43c..92ff1293aa2d 100644
--- a/games/doomlegacy/Makefile
+++ b/games/doomlegacy/Makefile
@@ -32,7 +32,7 @@ OPTIONS_DEFINE+=	IPX
 IPX_DESC=	IPX protocol support
 .endif
 
-ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+ASM_BUILD_DEPENDS=	nasm:devel/nasm
 ASM_MAKE_ENV=		USEASM=1 OLD_DEPENDENCIES=1
 
 .include <bsd.port.options.mk>
diff --git a/games/doomsday/Makefile b/games/doomsday/Makefile
index 2c6681a48a3c..5f602f62eb51 100644
--- a/games/doomsday/Makefile
+++ b/games/doomsday/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Enhanced Doom, Heretic, and Hexen source port
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libassimp.so:${PORTSDIR}/multimedia/assimp
-RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
+BUILD_DEPENDS=	zip:archivers/zip
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libassimp.so:multimedia/assimp
+RUN_DEPENDS=	timidity:audio/timidity
 
 USE_GL=		gl glu
 USE_LDCONFIG=	yes
diff --git a/games/duel/Makefile b/games/duel/Makefile
index 33b4bf927199..d94d2eac269b 100644
--- a/games/duel/Makefile
+++ b/games/duel/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Overhead, OpenGL space shooter
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libftgl.so:${PORTSDIR}/graphics/ftgl
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libftgl.so:graphics/ftgl
 
 USES=		tar:bzip2 libtool
 USE_GL=		gl
diff --git a/games/dustrac/Makefile b/games/dustrac/Makefile
index 16d788dfeb28..1f6c8ca31c83 100644
--- a/games/dustrac/Makefile
+++ b/games/dustrac/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	games
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	2D top-view racing game
 
-LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 
 USES=		compiler:c++11-lib cmake:outsource openal pkgconfig
 USE_GL=		glu
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index b796cf5ee2c2..5afcc0dfbf2e 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GTK+ chess board interface (mainly for FICS and chessd)
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 EXTRAS=		1pl2 2
 USES=		shebangfix pkgconfig perl5 tar:bzip2
@@ -44,8 +44,8 @@ DESKTOP_ENTRIES="eboard" \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJOYSTICK}
-BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
-RUN_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
+BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:devel/linux-js
+RUN_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:devel/linux-js
 .endif
 
 post-extract:
diff --git a/games/edge/Makefile b/games/edge/Makefile
index e17a2a9a44be..9da61cf78ed3 100644
--- a/games/edge/Makefile
+++ b/games/edge/Makefile
@@ -17,8 +17,8 @@ COMMENT=	DOOM style engine aimed at the Total Conversion developer
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libpng.so:graphics/png
 
 USES=		alias gmake jpeg tar:bzip2
 USE_GL=		glew
diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index 2e7833643100..8cd047057452 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Duke Nukem 3D Port based on JFDuke and EDuke
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/source/gpl-2.0.txt
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libvpx.so:${PORTSDIR}/multimedia/libvpx
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libvpx.so:multimedia/libvpx
 
 USES=		execinfo gmake tar:xz
 USE_GCC=	any
@@ -43,16 +43,16 @@ OPTIONS_DEFAULT=TIMIDITY
 OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT_i386=	ASM
 
-ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+ASM_BUILD_DEPENDS=	nasm:devel/nasm
 HRP_DESC=	Install High Resolution Pack
 MIDI_DESC=	MIDI music support
 OFFENSIVE_DESC=	Install full XXX Pack
 OFFENSIVE_IMPLIES=	HRP
 SHAREWARE_DESC=	Install shareware game data version 1.3
 TIMIDITY_DESC=	Use Timidity for music support
-TIMIDITY_RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
+TIMIDITY_RUN_DEPENDS=	timidity:audio/timidity
 TIMIDITYPLUS_DESC=	Use Timidity++ for music support
-TIMIDITYPLUS_RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity++
+TIMIDITYPLUS_RUN_DEPENDS=	timidity:audio/timidity++
 
 .include <bsd.port.options.mk>
 
diff --git a/games/egl/Makefile b/games/egl/Makefile
index fafdfc625985..8a2fa15cba66 100644
--- a/games/egl/Makefile
+++ b/games/egl/Makefile
@@ -33,7 +33,7 @@ GAME_DESC=	Build main game (default mod)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 USES+=		jpeg
 USE_GL=		gl
 PLIST_SUB+=	CLIENT=""
diff --git a/games/el/Makefile b/games/el/Makefile
index 0265fdf286bc..27905156b170 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	LOCAL/rene
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Eternal Lands is a free 3D MMORPG
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libcal3d.so:${PORTSDIR}/graphics/cal3d
-RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis \
+		libcal3d.so:graphics/cal3d
+RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/el.ini:games/el-data
 
 BROKEN_sparc64=	Does not build on sparc64
 
diff --git a/games/ember/Makefile b/games/ember/Makefile
index 1f6115915673..068336049891 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -15,15 +15,15 @@ COMMENT=	Ember is a WorldForge 3D client using the OGRE 3D library
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d
-RUN_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		liberis-1.3.so:${PORTSDIR}/devel/eris \
-		libvarconf-1.0.so:${PORTSDIR}/devel/varconf \
-		libmercator-0.3.so:${PORTSDIR}/devel/mercator \
-		libwfut-0.2.so:${PORTSDIR}/devel/libwfut \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libCEGUIBase-0.so:${PORTSDIR}/graphics/cegui
+BUILD_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so:graphics/ogre3d
+RUN_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so:graphics/ogre3d
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
+		liberis-1.3.so:devel/eris \
+		libvarconf-1.0.so:devel/varconf \
+		libmercator-0.3.so:devel/mercator \
+		libwfut-0.2.so:devel/libwfut \
+		libboost_thread.so:devel/boost-libs \
+		libCEGUIBase-0.so:graphics/cegui
 
 CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc \
 		--program-transform-name= --disable-cppunit --disable-debug \
diff --git a/games/endgame-singularity/Makefile b/games/endgame-singularity/Makefile
index 2df77c928e2d..52c19a143029 100644
--- a/games/endgame-singularity/Makefile
+++ b/games/endgame-singularity/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simulates the life of a true AI
 
-RUN_DEPENDS=	py*-game>=1.8:${PORTSDIR}/devel/py-game \
+RUN_DEPENDS=	py*-game>=1.8:devel/py-game \
 		${PYNUMPY}
 
 USES=		python
@@ -25,7 +25,7 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=	MUSIC DOCS
 OPTIONS_DEFAULT=	MUSIC
 MUSIC_DESC=	Install original music pack
-MUSIC_RUN_DEPENDS=	endgame-singularity-music>=006:${PORTSDIR}/games/endgame-singularity-music
+MUSIC_RUN_DEPENDS=	endgame-singularity-music>=006:games/endgame-singularity-music
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.pyc' -delete
diff --git a/games/endless-sky/Makefile b/games/endless-sky/Makefile
index c0483f7fab28..b99cedbda8a2 100644
--- a/games/endless-sky/Makefile
+++ b/games/endless-sky/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Space exploration and combat game similar to Escape Velocity
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 BROKEN_FreeBSD_9=	does not build # revisit when ports gcc is switched to 4.9
 
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 869ed23a287b..1c195634489d 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-64bit
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Enigma is a reimplementation of Oxyd, a puzzle game
 
-LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtolua++-${LUA_VER}.so:${PORTSDIR}/lang/tolua++ \
-		libenet.so:${PORTSDIR}/net/enet
+LIB_DEPENDS=	libxerces-c.so.3:textproc/xerces-c3 \
+		libpng.so:graphics/png \
+		libtolua++-${LUA_VER}.so:lang/tolua++ \
+		libenet.so:net/enet
 
 USES=		gettext gmake lua:51
 USE_SDL=	image mixer sdl ttf
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index 6b86d4f3a50b..196fc6ebd86f 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Assemble given shapes from primitives
 
-LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libmikmod.so:audio/libmikmod \
+		libpng.so:graphics/png
 
 USES=		gmake
 USE_XORG=	xmu
diff --git a/games/epiar/Makefile b/games/epiar/Makefile
index 0b4d5e76ac4c..6ee20beeed03 100644
--- a/games/epiar/Makefile
+++ b/games/epiar/Makefile
@@ -15,10 +15,10 @@ LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported
 LICENSE_FILE_CCbyNCSA3=${WRKSRC}/LICENSE.music
 LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libftgl.so:${PORTSDIR}/graphics/ftgl \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libphysfs.so:${PORTSDIR}/devel/physfs
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libftgl.so:graphics/ftgl \
+		libxml2.so:textproc/libxml2 \
+		libphysfs.so:devel/physfs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	knowknowledge
diff --git a/games/etracer/Makefile b/games/etracer/Makefile
index a2b745ecc0fe..2638ababb8c4 100644
--- a/games/etracer/Makefile
+++ b/games/etracer/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Latest and greatest fork of the classic Tux Racer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USE_SDL=	mixer sdl image
 USE_GCC=	yes
diff --git a/games/evilfinder/Makefile b/games/evilfinder/Makefile
index f2467181a3dc..ce922b55c5ab 100644
--- a/games/evilfinder/Makefile
+++ b/games/evilfinder/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	WRAPPER
 WRAPPER_DESC=	Evilfinder local wrapper
 OPTIONS_DEFAULT=	WRAPPER
 
-WRAPPER_RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
+WRAPPER_RUN_DEPENDS=	lynx:www/lynx
 
 post-extract:
 	@${CP} ${DISTDIR}/evilnumbers.dat ${WRKSRC}
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 7e218d7c3e4f..cc107ebebff3 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Marriage of XreaL and Icculus.org Q3 w/ Improvements
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		gmake dos2unix tar:bzip2
 ALL_TARGET=	release
@@ -61,7 +61,7 @@ MAKE_ENV+=	HAVE_VM_COMPILED=true
 .if ${PORT_OPTIONS:MCLIENT} || !empty(PORT_OPTIONS:MSMP)
 # curl
 .   if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 MAKE_ENV+=	USE_CURL=1
 .       if ${PORT_OPTIONS:MCURL_DLOPEN}
 MAKE_ENV+=	USE_CURL_DLOPEN=1
@@ -78,12 +78,12 @@ MAKE_ENV+=	USE_OPENAL_DLOPEN=1
 USE_SDL=	sdl
 # VOIP
 .   if ${PORT_OPTIONS:MVOIP}
-LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:audio/speex
 MAKE_ENV+=	USE_VOIP=1
 .   endif
 # Vorbis
 .   if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 MAKE_ENV+=	USE_CODEC_VORBIS=1
 .   endif
 .endif
diff --git a/games/excido/Makefile b/games/excido/Makefile
index f0291fabf081..f291f47cad74 100644
--- a/games/excido/Makefile
+++ b/games/excido/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Portable fast-paced 3D shooter
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
+LIB_DEPENDS=	libphysfs.so:devel/physfs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 8ac5b4679d9e..c3a2cdab1117 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -16,8 +16,8 @@ BROKEN=		unfetchable
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
-RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
+BUILD_DEPENDS=	timidity:audio/timidity
+RUN_DEPENDS=	timidity:audio/timidity
 
 USE_SDL=	sdl mixer
 USE_XORG=	x11
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index dc3bab15f539..cb7cd899dc47 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -15,11 +15,11 @@ DISTFILES=	${PORTNAME}_source_${PORTVERSION}.7z:ezquake \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modern QuakeWorld client
 
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
-		7z:${PORTSDIR}/archivers/p7zip
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png
+EXTRACT_DEPENDS=${UNZIP_CMD}:archivers/unzip \
+		7z:archivers/p7zip
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png
 
 USES=		gmake tcl dos2unix
 DOS2UNIX_GLOB=	*.[ch] Makefile*
diff --git a/games/f1spirit-remake/Makefile b/games/f1spirit-remake/Makefile
index 8a0f39eaa306..216718886b9d 100644
--- a/games/f1spirit-remake/Makefile
+++ b/games/f1spirit-remake/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	f1spirit-linux
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Remake of classic F1 Spirit racing game
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		dos2unix gmake zip
 USE_SDL=	sdl net image mixer sound
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index 30f597b72f14..75fc8d9608d1 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	nethack_source_331_jtp_${PORTVERSION:S/.//g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NetHack derivative
 
-RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
+RUN_DEPENDS=	timidity:audio/timidity
 
 USES=		ncurses perl5 zip
 DATADIR=	${PREFIX}/share/falconseyedir
diff --git a/games/fargoal/Makefile b/games/fargoal/Makefile
index 77b1a24ab7b6..bd9224a145b2 100644
--- a/games/fargoal/Makefile
+++ b/games/fargoal/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Remake of classic roguelike game "Sword of Fargoal"
 
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS=	liballeg.so:devel/allegro
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
diff --git a/games/fbg2/Makefile b/games/fbg2/Makefile
index 68c0f4650b5f..1ad6d77d2b9c 100644
--- a/games/fbg2/Makefile
+++ b/games/fbg2/Makefile
@@ -17,11 +17,11 @@ LICENSE_FILE=	${WRKSRC}/License.txt
 LICENSE_FILE_CCbyNCSA3=${WRKSRC}/License.txt
 LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libradius-engine.a:${PORTSDIR}/graphics/radius-engine
-LIB_DEPENDS=	liblua-5.1.so:${PORTSDIR}/lang/lua51 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libphysfs.so.1:${PORTSDIR}/devel/physfs
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	${LOCALBASE}/lib/libradius-engine.a:graphics/radius-engine
+LIB_DEPENDS=	liblua-5.1.so:lang/lua51 \
+		libpng.so:graphics/png \
+		libphysfs.so.1:devel/physfs
+RUN_DEPENDS=	zip:archivers/zip
 
 USES=		pkgconfig
 USE_SDL=	sdl sound
diff --git a/games/fgkicker/Makefile b/games/fgkicker/Makefile
index 9ec127a36a6f..cc46378b4454 100644
--- a/games/fgkicker/Makefile
+++ b/games/fgkicker/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Launcher frontend for FlightGear
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	fgfs:${PORTSDIR}/games/flightgear
+RUN_DEPENDS=	fgfs:games/flightgear
 
 USE_GNOME=	gtk20
 USES=		gmake pkgconfig tar:tgz
diff --git a/games/fgrun/Makefile b/games/fgrun/Makefile
index 77f010588944..592fd1bbd68f 100644
--- a/games/fgrun/Makefile
+++ b/games/fgrun/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Graphical frontend to run FlightGear Flight Simulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libosg.so:${PORTSDIR}/graphics/osg
-BUILD_DEPENDS=	simgear>=2.10.0:${PORTSDIR}/devel/simgear \
-		${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	simgear>=2.10.0:${PORTSDIR}/devel/simgear \
-		fgfs:${PORTSDIR}/games/flightgear
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+		libosg.so:graphics/osg
+BUILD_DEPENDS=	simgear>=2.10.0:devel/simgear \
+		${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
+RUN_DEPENDS=	simgear>=2.10.0:devel/simgear \
+		fgfs:games/flightgear
 
 WRKSRC=		${WRKDIR}/${GO_ACCOUNT}-${GO_PROJECT}
 
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 6faeb726c802..5287ea9b0a11 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -39,9 +39,9 @@ DESKTOP_ENTRIES="Fish Fillets - Next Generation" \
 OPTIONS_DEFINE=	DOCS FRIBIDI SMPEG X11
 OPTIONS_DEFAULT=FRIBIDI SMPEG X11
 
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 SMPEG_DESC=		Video playback support
-SMPEG_LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+SMPEG_LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 X11_DESC=		X11 window manager support
 X11_USE=		xorg=x11
 X11_CONFIGURE_ON=	--with-X=yes
diff --git a/games/fishsupper/Makefile b/games/fishsupper/Makefile
index a2d217689bc3..b7d2708e4db3 100644
--- a/games/fishsupper/Makefile
+++ b/games/fishsupper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Guide a cat across a series of rivers, jumping from log to log
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/games/five-or-more/Makefile b/games/five-or-more/Makefile
index 985cccb94dcd..3604adc26d16 100644
--- a/games/five-or-more/Makefile
+++ b/games/five-or-more/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Form a line of 5 or more colored balls
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index f971e825c784..55e383b928f5 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Freely enjoy childlike KISS, French-KISS!
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
+RUN_DEPENDS=	lha:archivers/lha
 
 EXTRA_PATCHES=	${WRKDIR}/${PORTNAME}-${PORTVERSION}.diff
 
diff --git a/games/flare-game/Makefile b/games/flare-game/Makefile
index d653ccd1620a..f1b727f5c66f 100644
--- a/games/flare-game/Makefile
+++ b/games/flare-game/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Free Libre Action Roleplaying Engine
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	flare:${PORTSDIR}/games/flare-engine
+RUN_DEPENDS=	flare:games/flare-engine
 
 USES=		cmake
 CMAKE_BUILD_TYPE=	#empty
diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index 9a74271df053..8a88333a9b8c 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -53,7 +53,7 @@ COMMENT=	Selection of additional aircraft for the FlightGear flight simulator
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
+RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:games/flightgear-data
 
 NO_BUILD=	yes
 USES=		zip
diff --git a/games/flightgear-mb339-pan/Makefile b/games/flightgear-mb339-pan/Makefile
index c2e9918d9c53..de3741d9715f 100644
--- a/games/flightgear-mb339-pan/Makefile
+++ b/games/flightgear-mb339-pan/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	mb339pan_${PORTVERSION}
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Simulation of the MB-339 PAN aerobatic jet
 
-RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
+RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:games/flightgear-data
 
 RESTRICTED=	Redistribution prohibited
 
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 5814f0e506ca..e74eb50bd1e4 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -11,16 +11,16 @@ COMMENT=	The FlightGear flight simulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libosg.so:${PORTSDIR}/graphics/osg \
-		libspeex.so:${PORTSDIR}/audio/speex
-BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
-		${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear
-RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
-		${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear \
-		${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libboost_thread.so:devel/boost-libs \
+		libfltk.so:x11-toolkits/fltk \
+		libosg.so:graphics/osg \
+		libspeex.so:audio/speex
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
+		${LOCALBASE}/lib/libSimGearCore.a:devel/simgear
+RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
+		${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \
+		${LOCALBASE}/share/flightgear/version:games/flightgear-data
 
 USE_XORG=	ice sm x11 xext xft xi xinerama xmu xt
 USE_GL=		gl glu glut
@@ -38,7 +38,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DBUS
 OPTIONS_DEFAULT=	DBUS
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_USES=	pkgconfig
 DBUS_CMAKE_ON=	-DUSE_DBUS:BOOL=ON
 DBUS_CMAKE_OFF=	-DUSE_DBUS:BOOL=OFF
diff --git a/games/flyhard/Makefile b/games/flyhard/Makefile
index b60af250e5d2..7c101796cfb1 100644
--- a/games/flyhard/Makefile
+++ b/games/flyhard/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Game resembling Thrust, but with lots of shooting and puzzles
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libpng.so:graphics/png
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/games/fmars/Makefile b/games/fmars/Makefile
index f22f57d269eb..a1b694c03bab 100644
--- a/games/fmars/Makefile
+++ b/games/fmars/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fast Memory Array Redcode Simulator
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile
+BUILD_DEPENDS=	guile:lang/guile
 
 USES=		gmake tar:bzip2
 ALL_TARGET=	x${PORTNAME}
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 3ba2d05843da..768034d64dfe 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Free OpenGL billiards game
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 OPTIONS_DEFINE=	SDL NVIDIA_BUMPREF
 SDL_DESC=	SDL instead of glut
diff --git a/games/fotaq/Makefile b/games/fotaq/Makefile
index 1c899e66fc14..9a055b10b4b7 100644
--- a/games/fotaq/Makefile
+++ b/games/fotaq/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	FOTAQ_Talkie-${PORTVERSION}
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Flight of the Amazon Queen: a classic graphical adventure
 
-RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
+RUN_DEPENDS=	scummvm:games/scummvm
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/games/four-in-a-row/Makefile b/games/four-in-a-row/Makefile
index c58eefbb13a3..bf66f8057285 100644
--- a/games/four-in-a-row/Makefile
+++ b/games/four-in-a-row/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Make lines of the same color
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 12393ec998ef..3cefc910df6a 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 TCMALLOC_CMAKE_OFF=	-DFCS_AVOID_TCMALLOC:BOOL=ON
 
 post-patch:
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index e1c0bc2e1ac1..421b2f900442 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Free turn-based multiplayer strategy
 
-RUN_DEPENDS=	hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libcurl.so:${PORTSDIR}/ftp/curl
+RUN_DEPENDS=	hicolor-icon-theme>=0:misc/hicolor-icon-theme
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libcurl.so:ftp/curl
 
 USES=		gettext gmake iconv libtool pkgconfig tar:bzip2 python sqlite
 GNU_CONFIGURE=	yes
@@ -40,12 +40,12 @@ IGNORE=		cannot use SDL without X11: re-run make config
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libggz.so:${PORTSDIR}/games/libggz \
-		libggz-gtk.so:${PORTSDIR}/games/ggz-gtk-client \
-		libggzcore.so:${PORTSDIR}/games/ggz-client-libs \
-		libggzmod.so:${PORTSDIR}/games/ggz-client-libs
+LIB_DEPENDS+=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libggz.so:games/libggz \
+		libggz-gtk.so:games/ggz-gtk-client \
+		libggzcore.so:games/ggz-client-libs \
+		libggzmod.so:games/ggz-client-libs
 USE_XORG=	xpm
 USE_SDL+=	mixer
 USE_GNOME=	gtk20
diff --git a/games/freedink-engine/Makefile b/games/freedink-engine/Makefile
index 93a22b6ddf4f..c9779fc7b899 100644
--- a/games/freedink-engine/Makefile
+++ b/games/freedink-engine/Makefile
@@ -11,8 +11,8 @@ PKGNAMESUFFIX=	-engine
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Dink Smallwood RPG and RPG Construction Set
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libcheck.so:${PORTSDIR}/devel/libcheck
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libcheck.so:devel/libcheck
 
 USES=		gettext gmake pkgconfig
 USE_SDL=	sdl gfx ttf image mixer
@@ -24,9 +24,9 @@ OPTIONS_DEFAULT=EMBEDDED
 
 EMBEDDED_DESC=			Embedded Resources
 EMBEDDED_CONFIGURE_ENABLE=	embedded-resources
-EMBEDDED_BUILD_DEPENDS=		zip:${PORTSDIR}/archivers/zip
-EMBEDDED_LIB_DEPENDS=		libzip.so:${PORTSDIR}/archivers/libzip
-EMBEDDED_RUN_DEPENDS=		zip:${PORTSDIR}/archivers/zip
+EMBEDDED_BUILD_DEPENDS=		zip:archivers/zip
+EMBEDDED_LIB_DEPENDS=		libzip.so:archivers/libzip
+EMBEDDED_RUN_DEPENDS=		zip:archivers/zip
 
 post-patch:
 	@${CHMOD} 0755 ${WRKSRC}/autotools/install-reloc
diff --git a/games/freedink/Makefile b/games/freedink/Makefile
index d2dc8a889854..c86b5278942b 100644
--- a/games/freedink/Makefile
+++ b/games/freedink/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	games
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Metaport for FreeDink engine and data
 
-RUN_DEPENDS=	freedink-engine>=${PORTVERSION}:${PORTSDIR}/games/freedink-engine \
-		freedink-data>=1.08.20140901:${PORTSDIR}/games/freedink-data \
-		freedink-dfarc>=3.12:${PORTSDIR}/games/freedink-dfarc
+RUN_DEPENDS=	freedink-engine>=${PORTVERSION}:games/freedink-engine \
+		freedink-data>=1.08.20140901:games/freedink-data \
+		freedink-dfarc>=3.12:games/freedink-dfarc
 
 USES=		metaport
 
diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile
index 633044e96ad6..e95afcd46f1c 100644
--- a/games/freedoko/Makefile
+++ b/games/freedoko/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Play the card game Doppelkopf
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../doc/GPL
 
-LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
+LIB_DEPENDS=	libgnet-2.0.so:net/gnet2
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/\.src$//}/src
 
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index 675f8d2aee39..5b1b50f0b259 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Clone of the Commodore game Paradroid
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		iconv jpeg
 USE_SDL=	mixer image sdl
diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile
index 263961f0503b..e3378ad35ca4 100644
--- a/games/freedroidrpg/Makefile
+++ b/games/freedroidrpg/Makefile
@@ -39,8 +39,8 @@ BACKTRACE_VARS=			STRIP= # empty
 OPENGL_USE=			GL=gl
 OPENGL_CONFIGURE_ENABLE=	opengl
 
-SOUND_LIB_DEPENDS=		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-				libogg.so:${PORTSDIR}/audio/libogg
+SOUND_LIB_DEPENDS=		libvorbis.so:audio/libvorbis \
+				libogg.so:audio/libogg
 SOUND_CONFIGURE_ENABLE=		sound
 SOUND_USE=			SDL=mixer
 NLS_USES=			gettext
diff --git a/games/freeminer-default/Makefile b/games/freeminer-default/Makefile
index b1c01da01c74..45d0f2e9bfc1 100644
--- a/games/freeminer-default/Makefile
+++ b/games/freeminer-default/Makefile
@@ -11,7 +11,7 @@ COMMENT=	The main game for the Freeminer game engine
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	freeminer:${PORTSDIR}/games/freeminer
+RUN_DEPENDS=	freeminer:games/freeminer
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freeminer
diff --git a/games/freeminer/Makefile b/games/freeminer/Makefile
index 59b9ec870d96..d7a20a21b8d0 100644
--- a/games/freeminer/Makefile
+++ b/games/freeminer/Makefile
@@ -13,7 +13,7 @@ LICENSE=	LGPL21+ GPLv3+ # source mentions GPLv3+, LICENSE.txt LGPL21+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING # don't remove space
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
 
@@ -39,15 +39,15 @@ LUAJIT_DESC=	LuaJIT support
 
 CLIENT_CMAKE_ON=	-DBUILD_CLIENT=1
 CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
-CLIENT_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-			libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
+CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
+			libIrrlicht.so:x11-toolkits/irrlicht
 CLIENT_USES=		jpeg
 CLIENT_USE=		GL=gl XORG=x11
 SERVER_CMAKE_ON=	-DBUILD_SERVER=1
 SERVER_CMAKE_OFF=	-DBUILD_SERVER=0
 CURL_CMAKE_ON=		-DENABLE_CURL=1
 CURL_CMAKE_OFF=		-DENABLE_CURL=0
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 NLS_CMAKE_ON=		-DENABLE_GETTEXT=1
 NLS_CMAKE_OFF=		-DENABLE_GETTEXT=0
 NLS_USES=		gettext
@@ -56,17 +56,17 @@ SOUND_CMAKE_ON=		-DENABLE_SOUND=1
 SOUND_CMAKE_OFF=	-DENABLE_SOUND=0
 LEVELDB_CMAKE_ON=	-DENABLE_LEVELDB=1
 LEVELDB_CMAKE_OFF=	-DENABLE_LEVELDB=0
-LEVELDB_LIB_DEPENDS=	libleveldb.so:${PORTSDIR}/databases/leveldb
+LEVELDB_LIB_DEPENDS=	libleveldb.so:databases/leveldb
 FREETYPE_CMAKE_ON=	-DENABLE_FREETYPE=1
 FREETYPE_CMAKE_OFF=	-DENABLE_FREETYPE=0
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND}
 USES+=		openal
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
@@ -77,7 +77,7 @@ GROUPS=		minetest
 
 # hacky way to not bring irrlicht and X11 depends for server only
 .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSERVER}
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/x11-toolkits/irrlicht:patch
+BUILD_DEPENDS+=	${NONEXISTENT}:x11-toolkits/irrlicht:patch
 IRRLICHT_INCLUDE_DIR=	`${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include
 CMAKE_ARGS+=	-DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-irrlichtdepend
diff --git a/games/freesynd/Makefile b/games/freesynd/Makefile
index d64ea4785273..2b1030da1a91 100644
--- a/games/freesynd/Makefile
+++ b/games/freesynd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Reimplementation of the classic Bullfrog game Syndicate
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cmake
 USE_SDL=	sdl image mixer
diff --git a/games/freetennis/Makefile b/games/freetennis/Makefile
index 271394c3dd9b..8081d1a86e56 100644
--- a/games/freetennis/Makefile
+++ b/games/freetennis/Makefile
@@ -10,14 +10,14 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tennis simulation
 
-BUILD_DEPENDS=	ocamlopt:${PORTSDIR}/lang/ocaml \
-		ocaml-images>3.0:${PORTSDIR}/graphics/ocaml-images \
+BUILD_DEPENDS=	ocamlopt:lang/ocaml \
+		ocaml-images>3.0:graphics/ocaml-images \
 		${OCAML_DEPENDS}
 RUN_DEPENDS=	${OCAML_DEPENDS}
 
-OCAML_DEPENDS=	${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/gtk.ml:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
-		${LOCALBASE}/lib/ocaml/lablGL/gl.ml:${PORTSDIR}/graphics/ocaml-lablgl \
-		${LOCALBASE}/lib/ocaml/site-lib/sdl/sdl.mli:${PORTSDIR}/devel/ocaml-sdl
+OCAML_DEPENDS=	${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/gtk.ml:x11-toolkits/ocaml-lablgtk2 \
+		${LOCALBASE}/lib/ocaml/lablGL/gl.ml:graphics/ocaml-lablgl \
+		${LOCALBASE}/lib/ocaml/site-lib/sdl/sdl.mli:devel/ocaml-sdl
 
 USES=		tar:bzip2
 
diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile
index 5d3d2eab81d8..3ffd7e0010d2 100644
--- a/games/fretsonfire/Makefile
+++ b/games/fretsonfire/Makefile
@@ -13,10 +13,10 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Game of musical skill and fast fingers
 
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}game>=0:${PORTSDIR}/devel/py-game \
-		${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${LOCALBASE}/share/${PORTNAME}/default.ttf:${PORTSDIR}/games/fretsonfire-data
+		${PYTHON_PKGNAMEPREFIX}game>=0:devel/py-game \
+		${PYTHON_PKGNAMEPREFIX}opengl>=0:graphics/py-opengl \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
+		${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data
 
 USES=		dos2unix python
 DOS2UNIX_FILES=	*.txt
diff --git a/games/frobtads/Makefile b/games/frobtads/Makefile
index 44538444468b..454eaaef1b84 100644
--- a/games/frobtads/Makefile
+++ b/games/frobtads/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.tads.org/${PORTNAME}/ \
 MAINTAINER=	kaiwang27@gmail.com
 COMMENT=	TADS interpreter and the compilers for both TADS 2 and 3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 CONFLICTS=	tads-2.*
 
diff --git a/games/frogatto/Makefile b/games/frogatto/Makefile
index c4d2bcdbb0c1..9d8f7d570b53 100644
--- a/games/frogatto/Makefile
+++ b/games/frogatto/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	games
 MAINTAINER=	fiziologus@gmail.com
 COMMENT=	Old-school 2D classic adventure platformer game
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libpng.so:graphics/png
 
 NO_PACKAGE=	Package will be 144M, set FORCE_PACKAGE if you really want it
 
diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index c02f43ff02f1..a3a665cd7064 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Throw colourful bubbles to build groups and destroy the groups
 LICENSE=	GPLv2
 
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
-RUN_DEPENDS=	p5-SDL>=2.511:${PORTSDIR}/devel/p5-SDL \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-IPC-System-Simple>=0:${PORTSDIR}/devel/p5-IPC-System-Simple \
-		p5-Locale-Maketext-Simple>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
-		p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-Alien-SDL>=1.413:${PORTSDIR}/devel/p5-Alien-SDL
+		p5-File-Slurp>=0:devel/p5-File-Slurp
+RUN_DEPENDS=	p5-SDL>=2.511:devel/p5-SDL \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		p5-IPC-System-Simple>=0:devel/p5-IPC-System-Simple \
+		p5-Locale-Maketext-Simple>=0:devel/p5-Locale-Maketext-Simple \
+		p5-Locale-Maketext-Lexicon>=0:devel/p5-Locale-Maketext-Lexicon \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-Alien-SDL>=1.413:devel/p5-Alien-SDL
 
 USES=		compiler:features perl5 pkgconfig tar:bzip2
 USE_PERL5=	modbuild
diff --git a/games/fteqw/Makefile b/games/fteqw/Makefile
index 6e42a3c887c5..fcc1a24ea094 100644
--- a/games/fteqw/Makefile
+++ b/games/fteqw/Makefile
@@ -37,8 +37,8 @@ PLIST_FILES+=	bin/fteqw-sv
 .endif
 
 .if ${PORT_OPTIONS:MGLCLIENT} || !empty(PORT_OPTIONS:MSDLCLIENT)
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis
 USES+=		jpeg
 .endif
 
diff --git a/games/funnyboat/Makefile b/games/funnyboat/Makefile
index 54ba84678824..2bf073061774 100644
--- a/games/funnyboat/Makefile
+++ b/games/funnyboat/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE-CODE.txt
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MEDIA.txt
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/fxsudoku/Makefile b/games/fxsudoku/Makefile
index 5bd8b38c5497..633fd2418f78 100644
--- a/games/fxsudoku/Makefile
+++ b/games/fxsudoku/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Implementation of the Sudoku game
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
+LIB_DEPENDS=	libFOX-1.6.so:x11-toolkits/fox16
 
 USES=		tar:bzip2 gmake
 PLIST_FILES=	bin/fxsudoku
diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile
index 03c6a6ce2c3a..1d07f116bfec 100644
--- a/games/galaxyhack/Makefile
+++ b/games/galaxyhack/Makefile
@@ -15,9 +15,9 @@ COMMENT=	AI script based strategy game
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	winicontoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	winicontoppm:graphics/netpbm
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
+		libfreetype.so:print/freetype2
 
 OPTIONS_DEFINE=	FLEETS OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
@@ -41,7 +41,7 @@ DESKTOP_ENTRIES="GalaxyHack" "" "${PREFIX}/share/pixmaps/galaxyhack.png" \
 		"${PORTNAME}" "" ""
 
 FLEETS_DISTFILES=		gh_fleets_020906.zip:fleets
-FLEETS_EXTRACT_DEPENDS=		${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+FLEETS_EXTRACT_DEPENDS=		${UNZIP_CMD}:archivers/unzip
 OPTIMIZED_CFLAGS_MAKE_ENV=	OPTIMIZED_CFLAGS=YES
 
 .include <bsd.port.options.mk>
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index 31b8fa809607..c60085c426a3 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Brain teaser game and trainer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	mautil:${PORTSDIR}/devel/mono-addins \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	mautil:devel/mono-addins \
+		${LOCALBASE}/bin/bash:shells/bash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GNOME=	gtksharp20 gnomesharp20 gnomedocutils intltool
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 5acbf9a6178f..0c04ec3c4ee4 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Gnome2 educational games and activities for kids ages 2 to 10
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libao.so:${PORTSDIR}/audio/libao \
-		libassetml.so:${PORTSDIR}/devel/libassetml \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		gnucap:${PORTSDIR}/cad/gnucap
+BUILD_DEPENDS=	texi2html:textproc/texi2html \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libao.so:audio/libao \
+		libassetml.so:devel/libassetml \
+		libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		gnucap:cad/gnucap
 
 USES=		display:configure gettext gmake libtool localbase pathfix \
 		pkgconfig python:2 shebangfix sqlite tar:bzip2
diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile
index 14429f3c1989..ef937642cbed 100644
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GemRB (Game engine made with preRendered Background)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis
 
 OPTIONS_DEFINE=	DOCS OPENGL
 OPTIONS_SUB=	yes
diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index acb4ee2a90fe..87788035f668 100644
--- a/games/ggz-client-libs/Makefile
+++ b/games/ggz-client-libs/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	games
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GGZ Gaming Zone - Core Client Libraries
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gettext libtool
 GNU_CONFIGURE=	yes
diff --git a/games/ggz-gtk-games/Makefile b/games/ggz-gtk-games/Makefile
index 279b1b0198ef..3e4ee79c3a3a 100644
--- a/games/ggz-gtk-games/Makefile
+++ b/games/ggz-gtk-games/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	games
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GGZ Gaming Zone - GTK+ Games
 
-RUN_DEPENDS=	${LOCALBASE}/bin/ggz-gtk:${PORTSDIR}/games/ggz-gtk-client
+RUN_DEPENDS=	${LOCALBASE}/bin/ggz-gtk:games/ggz-gtk-client
 
 USES=		gettext pkgconfig
 USE_GNOME=	gtk20
diff --git a/games/gillo/Makefile b/games/gillo/Makefile
index 9aab0b869b94..a83548b9937f 100644
--- a/games/gillo/Makefile
+++ b/games/gillo/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Players are cars throwing a magnetic fuzzy ball into a goal
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${JAM}:${PORTSDIR}/devel/jam \
-		${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \
-		${LOCALBASE}/lib/libplibsg.a:${PORTSDIR}/x11-toolkits/plib
+BUILD_DEPENDS=	${JAM}:devel/jam \
+		${LOCALBASE}/lib/libode.a:devel/ode \
+		${LOCALBASE}/lib/libplibsg.a:x11-toolkits/plib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 1694a9003f69..dc6e8fa6f880 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	OpenGL based space-ship "shoot-em-up" game
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		dos2unix gmake
 USE_SDL=	sdl mixer
diff --git a/games/glbsp/Makefile b/games/glbsp/Makefile
index 5a121014ffae..7085a83ee6bf 100644
--- a/games/glbsp/Makefile
+++ b/games/glbsp/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 
 PORTDOCS=	README.txt USAGE.txt
 
-GUI_LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+GUI_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 .include <bsd.port.options.mk>
 
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 9286562d288a..856d1f2f4076 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D OpenGL based chess game
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext
 
 USES=		desktop-file-utils python shared-mime-info
 USE_GNOME=	gconf2
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 6044b2b415fe..4599a0bcbdca 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free 3D real-time customizable strategy game
 
-LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
-RUN_DEPENDS=	${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data
+LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3 \
+		libvorbis.so:audio/libvorbis
+BUILD_DEPENDS=	jam:devel/jam
+RUN_DEPENDS=	${DATADIR}/servers.ini:games/glest-data
 
 USES=		dos2unix openal:al,alut pkgconfig zip lua:51
 USE_AUTOTOOLS=	automake:env autoconf:env
diff --git a/games/glightoff/Makefile b/games/glightoff/Makefile
index 6a51cbd24cbf..82ec39d31073 100644
--- a/games/glightoff/Makefile
+++ b/games/glightoff/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple (but not so easy to solve!) puzzle game
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index 0c90e9cb622b..7b73df6092b9 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Globulation 2, free and innovative strategy game
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libspeex.so:audio/speex \
+		libfribidi.so:converters/fribidi \
+		libboost_thread.so:devel/boost-libs \
+		libfreetype.so:print/freetype2
 
 OPTIONS_DEFINE=	DOCS PORTAUDIO
 
@@ -40,7 +40,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+=	libportaudio.so:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS+=	libportaudio.so:audio/portaudio
 MAKE_ARGS+=	--portaudio=true
 .else
 MAKE_ARGS+=	--portaudio=false
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 0da35b5a70af..386f050523a1 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -14,7 +14,7 @@ COMMENT=	3D worm game for two players for X Window System
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake
 USE_GL=		gl
diff --git a/games/gnome-2048/Makefile b/games/gnome-2048/Makefile
index dd7cc9624e5d..834a953782c3 100644
--- a/games/gnome-2048/Makefile
+++ b/games/gnome-2048/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Move the tiles until you obtain the 2048 tile
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libgames-support.so:${PORTSDIR}/games/libgames-support
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libgee-0.8.so:devel/libgee \
+		libgames-support.so:games/libgames-support
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index 13ca45cdb929..ba2c2869a5fe 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome chess
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
@@ -29,6 +29,6 @@ GLIB_SCHEMAS=	org.gnome.chess.gschema.xml
 OPTIONS_DEFINE=	GNUCHESS
 OPTIONS_DEFAULT=GNUCHESS
 GNUCHESS_DESC=	Use gnuchess engine for computer player
-GNUCHESS_RUN_DEPENDS=	gnuchess:${PORTSDIR}/games/gnuchess
+GNUCHESS_RUN_DEPENDS=	gnuchess:games/gnuchess
 
 .include <bsd.port.mk>
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 660c3b22e9aa..0a64693e590b 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -10,25 +10,25 @@ COMMENT=	Gnome games meta port
 
 USES=		metaport
 
-RUN_DEPENDS=	five-or-more:${PORTSDIR}/games/five-or-more \
-		atomix:${PORTSDIR}/games/atomix \
-		four-in-a-row:${PORTSDIR}/games/four-in-a-row \
-		gnome-2048:${PORTSDIR}/games/gnome-2048 \
-		gnome-chess:${PORTSDIR}/games/gnome-chess \
-		gnome-klotski:${PORTSDIR}/games/gnome-klotski \
-		gnome-mahjongg:${PORTSDIR}/games/gnome-mahjongg \
-		gnome-mines:${PORTSDIR}/games/gnome-mines \
-		gnome-nibbles:${PORTSDIR}/games/gnome-nibbles \
-		gnome-robots:${PORTSDIR}/games/gnome-robots \
-		gnome-sudoku:${PORTSDIR}/games/gnome-sudoku \
-		gnome-taquin:${PORTSDIR}/games/gnome-taquin \
-		gnome-tetravex:${PORTSDIR}/games/gnome-tetravex \
-		hitori:${PORTSDIR}/games/hitori \
-		iagno:${PORTSDIR}/games/iagno \
-		lightsoff:${PORTSDIR}/games/lightsoff \
-		quadrapassel:${PORTSDIR}/games/quadrapassel \
-		aisleriot>=0:${PORTSDIR}/games/aisleriot \
-		swell-foop:${PORTSDIR}/games/swell-foop \
-		tali:${PORTSDIR}/games/tali
+RUN_DEPENDS=	five-or-more:games/five-or-more \
+		atomix:games/atomix \
+		four-in-a-row:games/four-in-a-row \
+		gnome-2048:games/gnome-2048 \
+		gnome-chess:games/gnome-chess \
+		gnome-klotski:games/gnome-klotski \
+		gnome-mahjongg:games/gnome-mahjongg \
+		gnome-mines:games/gnome-mines \
+		gnome-nibbles:games/gnome-nibbles \
+		gnome-robots:games/gnome-robots \
+		gnome-sudoku:games/gnome-sudoku \
+		gnome-taquin:games/gnome-taquin \
+		gnome-tetravex:games/gnome-tetravex \
+		hitori:games/hitori \
+		iagno:games/iagno \
+		lightsoff:games/lightsoff \
+		quadrapassel:games/quadrapassel \
+		aisleriot>=0:games/aisleriot \
+		swell-foop:games/swell-foop \
+		tali:games/tali
 
 .include <bsd.port.mk>
diff --git a/games/gnome-klotski/Makefile b/games/gnome-klotski/Makefile
index a055b0dc7623..80a8c6e22eba 100644
--- a/games/gnome-klotski/Makefile
+++ b/games/gnome-klotski/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome klotski
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/gnome-mahjongg/Makefile b/games/gnome-mahjongg/Makefile
index e35a25425beb..254524c6308f 100644
--- a/games/gnome-mahjongg/Makefile
+++ b/games/gnome-mahjongg/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome mahjongg
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/gnome-mines/Makefile b/games/gnome-mines/Makefile
index 5494b901e64f..07d4fcab0528 100644
--- a/games/gnome-mines/Makefile
+++ b/games/gnome-mines/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome minesweeper
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/gnome-nibbles/Makefile b/games/gnome-nibbles/Makefile
index 80d4b4bafcb2..40b94e07e5d1 100644
--- a/games/gnome-nibbles/Makefile
+++ b/games/gnome-nibbles/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome nibbles
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/gnome-robots/Makefile b/games/gnome-robots/Makefile
index 6719ff4b0fef..197029ecefee 100644
--- a/games/gnome-robots/Makefile
+++ b/games/gnome-robots/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome robots
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/gnome-sudoku/Makefile b/games/gnome-sudoku/Makefile
index fb4e3cbc7704..c646cad87dad 100644
--- a/games/gnome-sudoku/Makefile
+++ b/games/gnome-sudoku/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sudoku game for gnome
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libqqwing.so:${PORTSDIR}/games/qqwing \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
+		libqqwing.so:games/qqwing \
+		libjson-glib-1.0.so:devel/json-glib
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/gnome-taquin/Makefile b/games/gnome-taquin/Makefile
index 0005928636f3..46ddf947ff68 100644
--- a/games/gnome-taquin/Makefile
+++ b/games/gnome-taquin/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Move tiles so that they reach their places.
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/gnome-tetravex/Makefile b/games/gnome-tetravex/Makefile
index ccf92c420644..62ebcd3ef39d 100644
--- a/games/gnome-tetravex/Makefile
+++ b/games/gnome-tetravex/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome tetravex
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index e9d9fa16d1eb..97431a659c73 100644
--- a/games/gnomekiss/Makefile
+++ b/games/gnomekiss/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GNOME version of Kisekae Set System
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
+RUN_DEPENDS=	lha:archivers/lha
 
 USES=		gettext-tools pathfix pkgconfig
 USE_GNOME=	gnomeprefix libgnomeui
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index 498e9abd426d..13c7f24517b7 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -13,11 +13,11 @@ COMMENT=	GNU Backgammon
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
-RUN_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
+BUILD_DEPENDS=	bison:devel/bison
+RUN_DEPENDS=	sqlite3:databases/sqlite3
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libcanberra-gtk.so:audio/libcanberra
 
 CONFIGURE_ARGS=	--with-board3d --with-sqlite --with-python=${LOCALBASE}/bin/python
 CONFIGURE_ENV=	ac_cv_path_ARTSC_CONFIG=no ac_cv_path_LIBART_CONFIG=no
diff --git a/games/gnudoku/Makefile b/games/gnudoku/Makefile
index d621a0da4b4d..b1364c80a370 100644
--- a/games/gnudoku/Makefile
+++ b/games/gnudoku/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://offload2.icculus.org:9090/~jcspray/GNUDoku/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Free program for creating and solving Su Doku puzzles
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 USES=		gmake pkgconfig
 MAKE_ENV=	CXXLAGS="${CXXFLAGS}"
diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index f14fb12c7668..d5636b55ede7 100644
--- a/games/gnurobots/Makefile
+++ b/games/gnurobots/Makefile
@@ -17,7 +17,7 @@ COMMENT=	GNU diversion wherein Scheme-coded robots explore a world
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libguile.so:lang/guile
 
 USES=		pkgconfig readline
 USE_GNOME=	vte
diff --git a/games/gnustep-ladder/Makefile b/games/gnustep-ladder/Makefile
index 81bac1dcae65..eb64b4ed686c 100644
--- a/games/gnustep-ladder/Makefile
+++ b/games/gnustep-ladder/Makefile
@@ -15,7 +15,7 @@ COMMENT=	GNU Go frontend for GNUstep
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
-RUN_DEPENDS=	gnugo:${PORTSDIR}/games/gnugo
+RUN_DEPENDS=	gnugo:games/gnugo
 
 USES=		gnustep
 USE_GNUSTEP=	back build
diff --git a/games/gondola/Makefile b/games/gondola/Makefile
index 8e333347a782..03ce7d2b5a01 100644
--- a/games/gondola/Makefile
+++ b/games/gondola/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	Gondola-${PORTVERSION}-src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Create and optimize a distribution network of gondolas
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rabbyt>=0.8.1:${PORTSDIR}/graphics/py-rabbyt \
-		${PYTHON_PKGNAMEPREFIX}pyglet>=1.1:${PORTSDIR}/graphics/py-pyglet \
-		avbin>=7:${PORTSDIR}/multimedia/avbin
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rabbyt>=0.8.1:graphics/py-rabbyt \
+		${PYTHON_PKGNAMEPREFIX}pyglet>=1.1:graphics/py-pyglet \
+		avbin>=7:multimedia/avbin
 
 USES=		python:run zip
 NO_BUILD=	yes
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 534f610943cd..95bd8433bc9d 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -13,9 +13,9 @@ COMMENT=	3D motor sport simulator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png
 
 USE_GL=		glut
 USES=		gmake jpeg localbase perl5 tcl:84
diff --git a/games/gtkevemon/Makefile b/games/gtkevemon/Makefile
index cf03b508f240..121287a78ea9 100644
--- a/games/gtkevemon/Makefile
+++ b/games/gtkevemon/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	games
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Skill monitoring standalone application for EVE Online
 
-LIB_DEPENDS=	libgtkmm-3.0.so:${PORTSDIR}/x11-toolkits/gtkmm30 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libgtkmm-3.0.so:x11-toolkits/gtkmm30 \
+		libcurl.so:ftp/curl
 
 USE_GITHUB=     yes
 GH_TAGNAME=     ac2ca34
diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile
index ef9281764249..154fc837a8ae 100644
--- a/games/gtkradiant/Makefile
+++ b/games/gtkradiant/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Map editor for FPS games, by id Software and Loki Software
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libmhash.so:${PORTSDIR}/security/mhash \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libmhash.so:security/mhash \
+		libpng.so:graphics/png
 
 USES=		pkgconfig python:build scons zip
 USE_GNOME=	gtk20 libxml2
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index a6bdf502f052..9a3586a464b5 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Game for GNOME that resembles well-known Tetris and Columns
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		gmake pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix intlhack libgnomeui
diff --git a/games/gunfudeadlands/Makefile b/games/gunfudeadlands/Makefile
index 11f56db84f0e..ac4be42a5ade 100644
--- a/games/gunfudeadlands/Makefile
+++ b/games/gunfudeadlands/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Far West themed 2D shooter featuring bullet time
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/gpl.txt
 
-RUN_DEPENDS=	love07:${PORTSDIR}/devel/love07
+RUN_DEPENDS=	love07:devel/love07
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index 25db070ab236..7fdff3f1222e 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Free Worms-like turn based strategy game
 LICENSE=	GPLv2 GFDL
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
+LIB_DEPENDS=	libphysfs.so:devel/physfs
 
 USES=		cmake desktop-file-utils lua:51 tar:bzip2
 USE_SDL=	sdl mixer image ttf net
@@ -43,20 +43,20 @@ OPTIONS_DEFAULT=SERVER
 SERVER_DESC=	Build server (requires haskell)
 #VIDEOREC_DESC=	Enable video recording (requires ffmpeg)
 
-#VIDEOREC_LIB_DEPENDS=libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
+#VIDEOREC_LIB_DEPENDS=libavcodec0.so:multimedia/ffmpeg0
 #VIDEOREC_CMAKE_OFF=-DNOVIDEOREC=1
 
-SERVER_BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-			hs-vector>=0:${PORTSDIR}/devel/hs-vector \
-			hs-network>=0:${PORTSDIR}/net/hs-network \
-			hs-utf8-string>=0:${PORTSDIR}/devel/hs-utf8-string \
-			hs-bytestring-show>=0:${PORTSDIR}/devel/hs-bytestring-show \
-			hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc \
-			hs-random>=0:${PORTSDIR}/devel/hs-random \
-			hs-hslogger>=0:${PORTSDIR}/devel/hs-hslogger \
-			hs-SHA>=0:${PORTSDIR}/security/hs-SHA \
-			hs-entropy>=0:${PORTSDIR}/security/hs-entropy \
-			hs-zlib>=0:${PORTSDIR}/archivers/hs-zlib
+SERVER_BUILD_DEPENDS=	ghc:lang/ghc \
+			hs-vector>=0:devel/hs-vector \
+			hs-network>=0:net/hs-network \
+			hs-utf8-string>=0:devel/hs-utf8-string \
+			hs-bytestring-show>=0:devel/hs-bytestring-show \
+			hs-dataenc>=0:converters/hs-dataenc \
+			hs-random>=0:devel/hs-random \
+			hs-hslogger>=0:devel/hs-hslogger \
+			hs-SHA>=0:security/hs-SHA \
+			hs-entropy>=0:security/hs-entropy \
+			hs-zlib>=0:archivers/hs-zlib
 SERVER_CMAKE_OFF=	-DNOSERVER=1
 SERVER_PLIST_FILES=	bin/${PORTNAME}-server
 
diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile
index 26d664ee518a..6b0d42e08b46 100644
--- a/games/hexxagon/Makefile
+++ b/games/hexxagon/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.nesqi.se/download/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Strategy hexagon game
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/games/hitori/Makefile b/games/hitori/Makefile
index 2882786699fb..d900266f8805 100644
--- a/games/hitori/Makefile
+++ b/games/hitori/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Hitori
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile
index 11c522173416..e74eccaaa255 100644
--- a/games/holotz-castle/Makefile
+++ b/games/holotz-castle/Makefile
@@ -39,7 +39,7 @@ SOLUTIONS_DESC=	Solutions for Holotz's Castle
 
 OPTIONS_SUB=	yes
 
-SOLUTIONS_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+SOLUTIONS_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 .include <bsd.port.options.mk>
 
diff --git a/games/hoverboard-sdl/Makefile b/games/hoverboard-sdl/Makefile
index e0b732741ee1..89a47f7364ba 100644
--- a/games/hoverboard-sdl/Makefile
+++ b/games/hoverboard-sdl/Makefile
@@ -15,7 +15,7 @@ LICENSE_TEXT_CCbyNC25=	http://creativecommons.org/licenses/by-nc/2.5/
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_PERMS_CCbyNC25=	no-dist-sell dist-mirror no-pkg-sell pkg-mirror auto-accept
 
-LIB_DEPENDS=	libSDL2pp.so:${PORTSDIR}/devel/sdl2pp
+LIB_DEPENDS=	libSDL2pp.so:devel/sdl2pp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AMDmi3
diff --git a/games/hypatia_engine/Makefile b/games/hypatia_engine/Makefile
index dc9737b6c749..2e43350ba224 100644
--- a/games/hypatia_engine/Makefile
+++ b/games/hypatia_engine/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Game engine for 2D top-down, tile-based action RPGs
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYGAME} \
-		${PYTHON_PKGNAMEPREFIX}pyganim>0:${PORTSDIR}/graphics/py-pyganim \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+		${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 
 USES=		python:2
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/games/iagno/Makefile b/games/iagno/Makefile
index 99a551f65bcc..ad997168b77e 100644
--- a/games/iagno/Makefile
+++ b/games/iagno/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Iagno
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index e54e53384f07..4665d8d07636 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.ifarchive.org/if-archive/mapping-tools/
 MAINTAINER=	akosela@andykosela.com
 COMMENT=	Interactive Fiction mapper and walkthrough generator
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
 
 USES=		perl5 gmake
 GNU_CONFIGURE=	yes
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index e53246475bfe..e954b78c3f17 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -52,7 +52,7 @@ TOOLKIT=	motif
 .endif
 
 .if ${PORT_OPTIONS:MXVIEW}
-LIB_DEPENDS+=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS+=	libxview.so:x11-toolkits/xview
 TOOLKIT=	xview
 .endif
 
diff --git a/games/inform/Makefile b/games/inform/Makefile
index 8ab0fc3e5ade..862442cb5afe 100644
--- a/games/inform/Makefile
+++ b/games/inform/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	inform${PORTVERSION:S/.//}_source.zip
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compiler for producing text adventure games
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	unzip:archivers/unzip
 
 NO_WRKSUBDIR=	yes
 
diff --git a/games/inform7/Makefile b/games/inform7/Makefile
index 812d1504bc9e..1b6195cb90b2 100644
--- a/games/inform7/Makefile
+++ b/games/inform7/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	I7_6L38_FreeBSD
 MAINTAINER=	akosela@andykosela.com
 COMMENT=	Inform 7 programming language (CLI edition)
 
-RUN_DEPENDS=	frotz:${PORTSDIR}/games/frotz
+RUN_DEPENDS=	frotz:games/frotz
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 3de55ae78eae..a55052caf92a 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -98,7 +98,7 @@ ALL_TARGET=	debug
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
-RUN_DEPENDS+=	${Q3SERVER}${BINSUFFIX}:${PORTSDIR}/games/${PORTNAME}-server
+RUN_DEPENDS+=	${Q3SERVER}${BINSUFFIX}:games/${PORTNAME}-server
 .endif
 
 .if !defined(DESKTOP_ENTRIES)
@@ -130,7 +130,7 @@ MAKE_ARGS+=	BUILD_SERVER=0
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 MAKE_ARGS+=	USE_CURL=1 USE_CURL_DLOPEN=0
 .else
 MAKE_ARGS+=	USE_CURL=0
@@ -145,7 +145,7 @@ MAKE_ARGS+=	USE_OPENAL=0
 
 .if ${PORT_OPTIONS:MVORBIS}
 NEED_OGG=	yes
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 MAKE_ARGS+=	USE_CODEC_VORBIS=1
 .else
 MAKE_ARGS+=	USE_CODEC_VORBIS=0
@@ -153,15 +153,15 @@ MAKE_ARGS+=	USE_CODEC_VORBIS=0
 
 .if ${PORT_OPTIONS:MOPUS}
 NEED_OGG=	yes
-LIB_DEPENDS+=	libopusfile.so:${PORTSDIR}/audio/opusfile \
-		libopus.so:${PORTSDIR}/audio/opus
+LIB_DEPENDS+=	libopusfile.so:audio/opusfile \
+		libopus.so:audio/opus
 MAKE_ARGS+=	USE_CODEC_OPUS=1 USE_INTERNAL_OPUS=0
 .else
 MAKE_ARGS+=	USE_CODEC_OPUS=0
 .endif
 
 .if defined(NEED_OGG)
-LIB_DEPENDS+=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS+=	libogg.so:audio/libogg
 MAKE_ARGS+=	USE_INTERNAL_OGG=0
 .endif
 
diff --git a/games/iourbanterror/Makefile b/games/iourbanterror/Makefile
index 9eb2734e95e7..6b6eae17d834 100644
--- a/games/iourbanterror/Makefile
+++ b/games/iourbanterror/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	ioquake3-${DISTVERSION}
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Quake 3 engine modified for Urban Terror (based on ioquake3)
 
-RUN_DEPENDS=	urbanterror-data>0:${PORTSDIR}/games/urbanterror-data
+RUN_DEPENDS=	urbanterror-data>0:games/urbanterror-data
 
 MASTERDIR=	${.CURDIR}/../ioquake3
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index 2cdbbc6f9bb7..cc3ec92d311f 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -12,12 +12,12 @@ COMMENT=	3D physics-based puzzle game
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libBulletCollision.so:${PORTSDIR}/devel/bullet
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
+		libIrrlicht.so:x11-toolkits/irrlicht \
+		libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg \
+		libfreetype.so:print/freetype2 \
+		libBulletCollision.so:devel/bullet
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jazztickets
diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index 0055752c89e0..ea3075c958e5 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -23,7 +23,7 @@ LICENSE_NAME_BuildLic=	Build source code license
 LICENSE_FILE_BuildLic=	${WRKSRC}/jfbuild/buildlic.txt
 LICENSE_PERMS_BuildLic=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 
 JFSW_COMMIT=	5cff6a81708ff053b569ba4400fba073afe207fe
 JFBUILD_COMMIT=	a73583184aca466cebde152db2ce1020591d7049
diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile
index fadc028b11e0..09abb2bdee3b 100644
--- a/games/jigzo/Makefile
+++ b/games/jigzo/Makefile
@@ -14,7 +14,7 @@ COMMENT=	OpenGL jigsaw puzzle game
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL.txt
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake jpeg tar:tgz
 USE_SDL=	sdl mixer
diff --git a/games/jinput/Makefile b/games/jinput/Makefile
index 4c3ce209b103..d2da986bfb69 100644
--- a/games/jinput/Makefile
+++ b/games/jinput/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/loader
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java Game Controller API
 
-BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:${PORTSDIR}/games/jutils
-RUN_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:${PORTSDIR}/games/jutils
+BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:games/jutils
+RUN_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:games/jutils
 
 USES=		tar:bzip2
 USE_JAVA=	yes
diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index d98db557bad9..05d0d2bef123 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Improved NQ engine with ZQuake and FuhQuake graphical effects
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/src
 
diff --git a/games/jvgs/Makefile b/games/jvgs/Makefile
index 6b91d2b1ab07..ed80591d74be 100644
--- a/games/jvgs/Makefile
+++ b/games/jvgs/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Minimalistic platform game
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	swig:devel/swig13
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		cmake lua:51
 USE_SDL=	sdl mixer
diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile
index c7d3c5b86d6b..f18393a3d076 100644
--- a/games/kajaani-kombat/Makefile
+++ b/games/kajaani-kombat/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Funny multiplayer game... and much more
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		gmake iconv ncurses
 USE_SDL=	sdl image mixer net ttf
diff --git a/games/kartofel/Makefile b/games/kartofel/Makefile
index d835906ef202..b2f8d8e6a9cf 100644
--- a/games/kartofel/Makefile
+++ b/games/kartofel/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://kartofel.jfedor.org/downloads/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Connect the dots in order without crossing over yourself
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake
 USE_SDL=	sdl gfx mixer image ttf
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index f1b0d625f727..b128c8992675 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -20,7 +20,7 @@ OPTIONS_DEFAULT=	ALL
 ${game}_PORT?=		games/${game}
 ${game}_DETECT?=	${KDE4_PREFIX}/bin/${game}
 ${game}_DESC?=		Please fix a typo in option name/desc!
-${game}_RUN_DEPENDS=	${${game}_DETECT}:${PORTSDIR}/${${game}_PORT}
+${game}_RUN_DEPENDS=	${${game}_DETECT}:${${game}_PORT}
 ALL_RUN_DEPENDS+=	${${game}_RUN_DEPENDS}
 .endfor
 
diff --git a/games/kevedit/Makefile b/games/kevedit/Makefile
index c282d105fda6..39d64f84175c 100644
--- a/games/kevedit/Makefile
+++ b/games/kevedit/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Modern ZZT editor with necessary features
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
-RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS=	cdrecord:sysutils/cdrtools
+RUN_DEPENDS=	cdrecord:sysutils/cdrtools
 
 USE_SDL=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/kiki/Makefile b/games/kiki/Makefile
index 34d4d505fb22..13cbb9a04cf3 100644
--- a/games/kiki/Makefile
+++ b/games/kiki/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	-src.tgz
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Kiki the nanobot is a 3-D puzzle game
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS=	swig:devel/swig13
 
 USES=		compiler dos2unix gmake python
 USE_GL=		gl glu glut
diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index bbdcd757e383..5b96bb16db40 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Touchtyping trainer
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		pkgconfig gettext gmake iconv tar:bzip2
 USE_GNOME=	gtk30 intlhack
diff --git a/games/kmahjongg/Makefile b/games/kmahjongg/Makefile
index cd3588f44442..c2bbfb5bd9cb 100644
--- a/games/kmahjongg/Makefile
+++ b/games/kmahjongg/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}
 
-LIB_DEPENDS=	libkmahjongglib.so:${PORTSDIR}/games/libkmahjongg
+LIB_DEPENDS=	libkmahjongglib.so:games/libkmahjongg
 
 USE_KDE4=	kdelibs kdeprefix libkdegames automoc4
 USES=		cmake:outsource tar:xz
diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index 451e121eb98b..52051c8199b6 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://dl.dropbox.com/u/2888238/Knights/
 MAINTAINER=	syncer@gmail.com
 COMMENT=	KDE4 chess interface
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess
+RUN_DEPENDS=	${LOCALBASE}/bin/gnuchess:games/gnuchess
 
 LICENSE=	GPLv2
 
diff --git a/games/kshisen/Makefile b/games/kshisen/Makefile
index 497a735a30c2..d1d42e2cc826 100644
--- a/games/kshisen/Makefile
+++ b/games/kshisen/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}
 
-LIB_DEPENDS=	libkmahjongglib.so:${PORTSDIR}/games/libkmahjongg
+LIB_DEPENDS=	libkmahjongglib.so:games/libkmahjongg
 
 USE_KDE4=	kdelibs kdeprefix libkdegames automoc4
 USES=		cmake:outsource tar:xz
diff --git a/games/ksirk/Makefile b/games/ksirk/Makefile
index c05e85343811..9259468484f1 100644
--- a/games/ksirk/Makefile
+++ b/games/ksirk/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	libqca.so:devel/qca
 
 USE_KDE4=	kdelibs kdeprefix libkdegames automoc4
 USES=		cmake:outsource tar:xz
diff --git a/games/kuklomenos/Makefile b/games/kuklomenos/Makefile
index db414df04afc..14b91b359e69 100644
--- a/games/kuklomenos/Makefile
+++ b/games/kuklomenos/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple but challenging abstract shoot-em-up game
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 OPTIONS_DEFINE=	VORBIS
 OPTIONS_DEFAULT=	VORBIS
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	sound
 
 post-patch:
diff --git a/games/lander/Makefile b/games/lander/Makefile
index d0677c89604d..aa481cc55010 100644
--- a/games/lander/Makefile
+++ b/games/lander/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Lunar Lander clone
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libboost_filesystem.so:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 USES=		gettext pkgconfig
diff --git a/games/latrine/Makefile b/games/latrine/Makefile
index d10b104d8d8f..b5cfd9760d4c 100644
--- a/games/latrine/Makefile
+++ b/games/latrine/Makefile
@@ -14,7 +14,7 @@ BROKEN=		unfetchable
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>0:databases/p5-DBI
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 23fa621dfb06..d41452965873 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Breakout-style arcade game
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gif2png:${PORTSDIR}/graphics/gif2png
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	gif2png:graphics/gif2png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake
 USE_SDL=	mixer net sdl
diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile
index bee0b0c0872e..8c9107e02bd1 100644
--- a/games/ldmud/Makefile
+++ b/games/ldmud/Makefile
@@ -12,8 +12,8 @@ MASTER_SITES=	http://www.bearnip.com/ftp/mud/ \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Modern version of the LPMud game driver
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	help2man:misc/help2man
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
diff --git a/games/legends/Makefile b/games/legends/Makefile
index b0ac7c2cf29c..61f4e51d1086 100644
--- a/games/legends/Makefile
+++ b/games/legends/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast-paced first-person-perspective online multiplayer game
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		makeself
 USE_LINUX=	yes
diff --git a/games/libgames-support/Makefile b/games/libgames-support/Makefile
index 006153c1e7f3..a909e413306a 100644
--- a/games/libgames-support/Makefile
+++ b/games/libgames-support/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Shared code between gnome games
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgee-0.8.so:${PORTSDIR}/devel/libgee
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libgee-0.8.so:devel/libgee
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/libggz/Makefile b/games/libggz/Makefile
index 15e9c4060b04..14fe44bfc2f6 100644
--- a/games/libggz/Makefile
+++ b/games/libggz/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	games
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GGZ Gaming Zone - Base Library
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USES=		libtool pathfix
 GNU_CONFIGURE=	yes
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SINGLE=		TLS
 OPTIONS_SINGLE_TLS=	GNUTLS OPENSSL
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ARGS=	--with-tls=GnuTLS
 
 OPENSSL_USE=		OPENSSL=yes
diff --git a/games/libggz/bsd.ggz.mk b/games/libggz/bsd.ggz.mk
index 3ef94ffc6cb0..ac81e8807723 100644
--- a/games/libggz/bsd.ggz.mk
+++ b/games/libggz/bsd.ggz.mk
@@ -13,9 +13,9 @@ DIST_SUBDIR=	ggz
 
 _USE_GGZ_ALL=	core client
 
-core_LIB_DEPENDS=	libggz.so:${PORTSDIR}/games/libggz
+core_LIB_DEPENDS=	libggz.so:games/libggz
 
-client_LIB_DEPENDS=	libggzcore.so:${PORTSDIR}/games/ggz-client-libs
+client_LIB_DEPENDS=	libggzcore.so:games/ggz-client-libs
 
 .for component in ${USE_GGZ}
 LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
diff --git a/games/libkdegames/Makefile b/games/libkdegames/Makefile
index b89300744ddc..d314ac8f6f06 100644
--- a/games/libkdegames/Makefile
+++ b/games/libkdegames/Makefile
@@ -19,7 +19,7 @@ OPTIONS_DEFINE=		LOWLATENCY
 OPTIONS_DEFAULT=	LOWLATENCY
 
 LOWLATENCY_DESC=	Use OpenAL and libsndfile for lower latency
-LOWLATENCY_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+LOWLATENCY_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 LOWLATENCY_USES=	openal
 LOWLATENCY_CMAKE_ON=	-DWITH_OpenAL=on \
 			-DWITH_SndFile=on
diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile
index d945aa5c8090..18e3177abaf8 100644
--- a/games/libmt_client/Makefile
+++ b/games/libmt_client/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Client-side library of MaitreTarot, a Tarot card game
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmaitretarot.so:${PORTSDIR}/games/libmaitretarot
+LIB_DEPENDS=	libmaitretarot.so:games/libmaitretarot
 
 GNU_CONFIGURE=	yes
 USES=		libtool pkgconfig tar:bzip2
diff --git a/games/libretro-cores/Makefile b/games/libretro-cores/Makefile
index 7cffc3c0b50d..7691f4586d35 100644
--- a/games/libretro-cores/Makefile
+++ b/games/libretro-cores/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	games
 MAINTAINER=	yuri@rawbw.com
 COMMENT=	Core pack for RetroArch
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS=	cmake:devel/cmake
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/games/lightsoff/Makefile b/games/lightsoff/Makefile
index 22cd6b4b0e61..227a8f4613fb 100644
--- a/games/lightsoff/Makefile
+++ b/games/lightsoff/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome ligthsoff
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libclutter-gtk-1.0.so:graphics/clutter-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index 3925b3085ee8..527e43555aa2 100644
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	BERLIOS
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Improved rich city simulation game for X
 
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
+BUILD_DEPENDS=	jam:devel/jam
+LIB_DEPENDS=	libphysfs.so:devel/physfs
 
 USES=		pkgconfig tar:bzip2
 USE_SDL=	sdl mixer image ttf gfx
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 3eaba1be6037..6e78fe3b1f11 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Rich city simulation game for X
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake
 GNU_CONFIGURE=	yes
@@ -26,7 +26,7 @@ OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
-SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_ON=	--without-x
 SVGALIB_CONFIGURE_OFF=	--without-svga
 
diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile
index 92482928bfce..64a2e4501394 100644
--- a/games/linux-darwinia-demo/Makefile
+++ b/games/linux-darwinia-demo/Makefile
@@ -27,7 +27,7 @@ NVIDIA_DESC=	Enable nvidia graphics driver support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
diff --git a/games/linux-defcon/Makefile b/games/linux-defcon/Makefile
index a85242541ee1..6acf72dc16ec 100644
--- a/games/linux-defcon/Makefile
+++ b/games/linux-defcon/Makefile
@@ -26,7 +26,7 @@ NVIDIA_DESC=	support for nvidia
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
diff --git a/games/linux-doom3-demo/Makefile b/games/linux-doom3-demo/Makefile
index b6d1d8546811..c0fd23a122ee 100644
--- a/games/linux-doom3-demo/Makefile
+++ b/games/linux-doom3-demo/Makefile
@@ -30,7 +30,7 @@ SUB_LIST=	DOOMDIR="${DOOMDIR}"
 
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
 
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_GL_USE_OFF=	linux_apps=dri
 
 
diff --git a/games/linux-enemyterritory-etpro/Makefile b/games/linux-enemyterritory-etpro/Makefile
index e49243af09b1..40560d71461d 100644
--- a/games/linux-enemyterritory-etpro/Makefile
+++ b/games/linux-enemyterritory-etpro/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	linux-enemyterritory-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ET Pro - Enemy Territory Competition Mod
 
-RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
+RUN_DEPENDS=	et:games/linux-enemyterritory
 
 USES=		zip
 USE_LINUX=	yes
diff --git a/games/linux-enemyterritory-jaymod-21/Makefile b/games/linux-enemyterritory-jaymod-21/Makefile
index cec31538f14a..216c6e1ac094 100644
--- a/games/linux-enemyterritory-jaymod-21/Makefile
+++ b/games/linux-enemyterritory-jaymod-21/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	linux-enemyterritory-
 MAINTAINER=	bar@FreeBSD.org
 COMMENT=	Jaymod - An Enemy Territory Modification
 
-RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
+RUN_DEPENDS=	et:games/linux-enemyterritory
 
 VERSTR=		${PORTVERSION:C/([0-9])\.([0-9])\.([0-9]+)/\1\2\3/}
 PKGNAMESUFFIX=	-${VERSTR}
@@ -34,7 +34,7 @@ CLIENT_PK3=	${PORTNAME}-${PORTVERSION}.pk3
 PLIST_SUB+=	CLIENT_PK3="${CLIENT_PK3}"
 
 OB_VERSTR=	0660
-OMNIBOT_RUN_DEPENDS=	et-omni-bot-${OB_VERSTR}:${PORTSDIR}/games/linux-enemyterritory-omni-bot-${OB_VERSTR}
+OMNIBOT_RUN_DEPENDS=	et-omni-bot-${OB_VERSTR}:games/linux-enemyterritory-omni-bot-${OB_VERSTR}
 
 do-build:
 .for f in et etded
diff --git a/games/linux-enemyterritory-jaymod/Makefile b/games/linux-enemyterritory-jaymod/Makefile
index 59e564052d66..98a24d4a105d 100644
--- a/games/linux-enemyterritory-jaymod/Makefile
+++ b/games/linux-enemyterritory-jaymod/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	linux-enemyterritory-
 MAINTAINER=	bar@FreeBSD.org
 COMMENT=	Jaymod - An Enemy Territory Modification
 
-RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
+RUN_DEPENDS=	et:games/linux-enemyterritory
 
 USES=		shebangfix
 SHEBANG_FILES=	linux/convert_shrub
@@ -28,7 +28,7 @@ DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}
 CLIENT_PK3=	${PORTNAME}-${PORTVERSION}.pk3
 PLIST_SUB=	CLIENT_PK3="${CLIENT_PK3}"
 
-OMNIBOT_RUN_DEPENDS=	et-omni-bot:${PORTSDIR}/games/linux-enemyterritory-omni-bot
+OMNIBOT_RUN_DEPENDS=	et-omni-bot:games/linux-enemyterritory-omni-bot
 
 do-build:
 .for f in et etded
diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index 9544c6cede1b..0fe9b65477e9 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/0$//}
 MAINTAINER=	bar@FreeBSD.org
 COMMENT=	Omni-Bot is a bot for Enemy Territory
 
-RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
+RUN_DEPENDS=	et:games/linux-enemyterritory
 
 VERSTR=	${PORTVERSION:C/([0-9])\.([0-9]+)/\1\2/}
 PKGNAMESUFFIX=	-${VERSTR}
diff --git a/games/linux-enemyterritory-omni-bot/Makefile b/games/linux-enemyterritory-omni-bot/Makefile
index e62c6e438892..0beab12b107a 100644
--- a/games/linux-enemyterritory-omni-bot/Makefile
+++ b/games/linux-enemyterritory-omni-bot/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	omni-bot_0_831_ET_linux.zip \
 MAINTAINER=	bar@FreeBSD.org
 COMMENT=	Omni-Bot is a bot for Enemy Territory
 
-RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
+RUN_DEPENDS=	et:games/linux-enemyterritory
 
 USES=		zip
 USE_LINUX=	yes
diff --git a/games/linux-enemyterritory-shrub/Makefile b/games/linux-enemyterritory-shrub/Makefile
index 8a4acb7ed8ce..24640db072f2 100644
--- a/games/linux-enemyterritory-shrub/Makefile
+++ b/games/linux-enemyterritory-shrub/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	1.2-test13-l
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shrub - An Enemy Territory Modification
 
-RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
+RUN_DEPENDS=	et:games/linux-enemyterritory
 
 USES=		zip
 USE_LINUX=	yes
diff --git a/games/linux-enemyterritory-tce/Makefile b/games/linux-enemyterritory-tce/Makefile
index cae386f6a003..5fdb304d71e6 100644
--- a/games/linux-enemyterritory-tce/Makefile
+++ b/games/linux-enemyterritory-tce/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	tcetest049.zip
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modern tactical Enemy Territory modification
 
-RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
+RUN_DEPENDS=	et:games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		zip
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index 6425073ff0ef..539874fc25aa 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -24,7 +24,7 @@ PATCH_260B_DIR=	Enemy Territory 2.60b
 
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
 
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_GL_USE_OFF=	linux_apps=dri
 
 .include <bsd.port.options.mk>
diff --git a/games/linux-nerogame/Makefile b/games/linux-nerogame/Makefile
index d2bf7797bfad..e3a899fe2c30 100644
--- a/games/linux-nerogame/Makefile
+++ b/games/linux-nerogame/Makefile
@@ -27,7 +27,7 @@ NVIDIA_DESC=	Nvidia support
 
 .if ${PORT_OPTIONS:MNVIDIA}
 .	if !exists(${LINUXBASE}/usr/lib/libGL.so.1)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 .	endif
 .else
 USE_LINUX_APPS+=dri
diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile
index a1df89f1be03..3923321d5995 100644
--- a/games/linux-nwnclient/Makefile
+++ b/games/linux-nwnclient/Makefile
@@ -19,7 +19,7 @@ DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 MAINTAINER=	scf@FreeBSD.org
 COMMENT=	Neverwinter Nights Linux (x86) Client
 
-RUN_DEPENDS=	${LOCALBASE}/share/nwndata/docs/readme.txt:${PORTSDIR}/games/nwndata
+RUN_DEPENDS=	${LOCALBASE}/share/nwndata/docs/readme.txt:games/nwndata
 
 NO_BUILD=	yes
 RESTRICTED=	Distribution not allowed
@@ -28,7 +28,7 @@ USE_LINUX_APPS=	sdl12 xorglibs
 NWNDATADIR=	${LOCALBASE}/share/nwndata
 
 .ifdef WITH_NVIDIA_GL
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
diff --git a/games/linux-rtcw/Makefile b/games/linux-rtcw/Makefile
index ffcfd24e36fb..3ce406a1b0c4 100644
--- a/games/linux-rtcw/Makefile
+++ b/games/linux-rtcw/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	DOCS NVIDIA_GL
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNVIDIA_GL}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_GL_EXTVER=	'__GL_ExtensionStringVersion=18999 '
 .else
 USE_LINUX_APPS+=	dri
diff --git a/games/linux-unigine-heaven/Makefile b/games/linux-unigine-heaven/Makefile
index 8c66c5380a51..d2258342b705 100644
--- a/games/linux-unigine-heaven/Makefile
+++ b/games/linux-unigine-heaven/Makefile
@@ -29,7 +29,7 @@ NO_BUILD=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_GL_VARS_OFF=	USE_LINUX_APPS+=dri
 
 do-extract:
diff --git a/games/linux-unigine-valley/Makefile b/games/linux-unigine-valley/Makefile
index e7e1ccf17f2d..3eaef5c81c26 100644
--- a/games/linux-unigine-valley/Makefile
+++ b/games/linux-unigine-valley/Makefile
@@ -29,7 +29,7 @@ NO_BUILD=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_GL_VARS_OFF=	USE_LINUX_APPS+=dri
 
 do-extract:
diff --git a/games/linux-unrealgold/Makefile b/games/linux-unrealgold/Makefile
index 7c60a185da33..f091b105b149 100644
--- a/games/linux-unrealgold/Makefile
+++ b/games/linux-unrealgold/Makefile
@@ -14,8 +14,8 @@ DIST_SUBDIR=	linux-ut
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unreal Gold for Linux
 
-BUILD_DEPENDS=	ut:${PORTSDIR}/games/linux-ut
-RUN_DEPENDS=	ut:${PORTSDIR}/games/linux-ut
+BUILD_DEPENDS=	ut:games/linux-ut
+RUN_DEPENDS=	ut:games/linux-ut
 
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
@@ -46,14 +46,14 @@ ANTHOLOGY=	yes
 RELEASE_MSG=	"Unreal Anthology"
 MANUALFILES=	Manual.pdf
 PORTDOCS+=	${MANUALFILES}
-EXTRACT_DEPENDS+=	unshield:${PORTSDIR}/archivers/unshield
-PATCH_DEPENDS+=	xdelta:${PORTSDIR}/misc/xdelta
+EXTRACT_DEPENDS+=	unshield:archivers/unshield
+PATCH_DEPENDS+=	xdelta:misc/xdelta
 # Original CD
 .elif exists(${CDROM_MOUNT}/SYSTEM/UPak.u)
 ORIGINAL=	yes
 RELEASE_MSG=	"original"
 PORTDOCS+=	${MANUALFILES}
-PATCH_DEPENDS+=	xdelta:${PORTSDIR}/misc/xdelta
+PATCH_DEPENDS+=	xdelta:misc/xdelta
 # TheSINHumanHead CD
 .elif exists(${CDROM_MOUNT}/System-int.tar.bz2)
 RAVAGE=		yes
diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile
index 1f552565b974..94b007b58f71 100644
--- a/games/linux-uplink-demo/Makefile
+++ b/games/linux-uplink-demo/Makefile
@@ -31,7 +31,7 @@ NVIDIA_DESC=	support for nvidia
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
diff --git a/games/linux-ut/Makefile b/games/linux-ut/Makefile
index 54e031a13e0c..5b2a70d17d6d 100644
--- a/games/linux-ut/Makefile
+++ b/games/linux-ut/Makefile
@@ -48,7 +48,7 @@ IGNORE= 	requires CD mounting with -b option
 ANTHOLOGY=	yes
 RELEASE_MSG=	"Unreal Anthology"
 CDDIRS+=	Manual
-BUILD_DEPENDS+=	${LOCALBASE}/bin/unshield:${PORTSDIR}/archivers/unshield
+BUILD_DEPENDS+=	${LOCALBASE}/bin/unshield:archivers/unshield
 UNSHIELD=	${LOCALBASE}/bin/unshield
 PLIST_SUB+=	ANTHOLOGY="" ORIGINAL="@comment "
 .else
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index a0ef2d21a5ad..f7429405266f 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -36,7 +36,7 @@ LIBDIRS=	Animations Benchmark ForceFeedback KarmaData Maps Music \
 
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
 
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 
 .include <bsd.port.options.mk>
 
diff --git a/games/linux-virtual-jay-peak/Makefile b/games/linux-virtual-jay-peak/Makefile
index 64db4f7610f4..c2b0a81a5469 100644
--- a/games/linux-virtual-jay-peak/Makefile
+++ b/games/linux-virtual-jay-peak/Makefile
@@ -24,7 +24,7 @@ SUB_FILES=	virtual-jay-peak
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 .else
 USE_LINUX_APPS+=	dri
 .endif
diff --git a/games/linux-worldofgoo-demo/Makefile b/games/linux-worldofgoo-demo/Makefile
index f228eb60bd1d..08b6997f3d84 100644
--- a/games/linux-worldofgoo-demo/Makefile
+++ b/games/linux-worldofgoo-demo/Makefile
@@ -24,7 +24,7 @@ DOCSDIR=	${PREFIX}/share/doc/WorldOfGoo
 OPTIONS_DEFINE=	DOCS
 
 .if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 USE_LINUX_APPS+=	libglu
 .else
 USE_LINUX_APPS+=	dri
diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index 5b7830373d53..ad3c138e3e35 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://liquidwar.sunsite.dk/archive/ \
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	You control an army of liquid and have to try and eat your opponents
 
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS=	liballeg.so:devel/allegro
 
 GNU_CONFIGURE=	yes
 USES=		gmake makeinfo python:build
diff --git a/games/live-f1/Makefile b/games/live-f1/Makefile
index fef8c8f8bffb..8f8f8596a952 100644
--- a/games/live-f1/Makefile
+++ b/games/live-f1/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Native client for the official Formula 1 Live Timing service
 LICENSE=	GPLv2
 
 BROKEN=		unfetchable
-LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libneon.so:www/neon
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
diff --git a/games/lolcat/Makefile b/games/lolcat/Makefile
index 71e0cb463b1c..a32ce281e8ff 100644
--- a/games/lolcat/Makefile
+++ b/games/lolcat/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	RG
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Rainbows and unicorns
 
-RUN_DEPENDS=	rubygem-trollop1>=1.9:${PORTSDIR}/devel/rubygem-trollop1 \
-		rubygem-paint>=0.8.5:${PORTSDIR}/devel/rubygem-paint
+RUN_DEPENDS=	rubygem-trollop1>=1.9:devel/rubygem-trollop1 \
+		rubygem-paint>=0.8.5:devel/rubygem-paint
 
 NO_ARCH=	yes
 
diff --git a/games/lostfeathers/Makefile b/games/lostfeathers/Makefile
index 7fbc76708946..17c3913960fc 100644
--- a/games/lostfeathers/Makefile
+++ b/games/lostfeathers/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Help a bird to recover his magical feathers
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	avbin>=0:${PORTSDIR}/multimedia/avbin
+RUN_DEPENDS=	avbin>=0:multimedia/avbin
 
 USES=		python shebangfix zip
 SHEBANG_FILES=	run_game.py
diff --git a/games/lugaru/Makefile b/games/lugaru/Makefile
index c60e319fe5ef..219c7f39a398 100644
--- a/games/lugaru/Makefile
+++ b/games/lugaru/Makefile
@@ -14,9 +14,9 @@ COMMENT=	3D arcade with unique fighting system and anthropomorphic characters
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg
 
 USES=		cmake jpeg openal:soft pkgconfig tar:bzip2
 USE_GL=		glu
diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index 751c977fc1ac..f01b5d8a206c 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Lightweight Java Game Library
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:${PORTSDIR}/games/jutils \
-		${JAVALIBDIR}/jinput/jinput.jar:${PORTSDIR}/games/jinput
+BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:games/jutils \
+		${JAVALIBDIR}/jinput/jinput.jar:games/jinput
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 01a242c3cb99..c29d7ed7146f 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Window sitter for X11
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 RESTRICTED=	'contains commercial character data'
 
@@ -40,7 +40,7 @@ LIBS+=		-L${LOCALBASE}/lib -lX11 ${ICONV_LIB}
 
 OPTIONS_DEFINE=	DOCS GNUTLS GTK1
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls
 
 GTK1_USE=		GNOME=gtk12,gdkpixbuf
diff --git a/games/magicmaze/Makefile b/games/magicmaze/Makefile
index a183a4b88b5a..df96d323f5b6 100644
--- a/games/magicmaze/Makefile
+++ b/games/magicmaze/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING_GPL.txt
 
-RUN_DEPENDS=	ruby${RUBY_SUFFIX}-sdl>=0:${PORTSDIR}/devel/ruby-sdl
+RUN_DEPENDS=	ruby${RUBY_SUFFIX}-sdl>=0:devel/ruby-sdl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:S/./_/g}
 
diff --git a/games/magicor/Makefile b/games/magicor/Makefile
index 9f75af08f5ff..c072e8030ccd 100644
--- a/games/magicor/Makefile
+++ b/games/magicor/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Old-school, puzzle game similar to Solomon's Key
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
 
 USES=		python
 NO_BUILD=	yes
@@ -36,7 +36,7 @@ OPTIONS_DEFAULT=EDITOR
 OPTIONS_SUB=	yes
 
 EDITOR_DESC=	Enable editor
-EDITOR_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
+EDITOR_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|###CONFIG_PATH###|${PREFIX}/etc/magicor/magicor.conf|' \
diff --git a/games/maitretarot/Makefile b/games/maitretarot/Makefile
index acefe998fdd9..2a339dafc735 100644
--- a/games/maitretarot/Makefile
+++ b/games/maitretarot/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Server side of MaitreTarot, a Tarot card game
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmaitretarot.so:${PORTSDIR}/games/libmaitretarot
+LIB_DEPENDS=	libmaitretarot.so:games/libmaitretarot
 
 USES=		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/games/manaplus/Makefile b/games/manaplus/Makefile
index 70b87cb994d3..069f57688c74 100644
--- a/games/manaplus/Makefile
+++ b/games/manaplus/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Free open source 2D MMORPG client for athena and evol servers
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libphysfs.so:${PORTSDIR}/devel/physfs
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libpng.so:graphics/png \
+		libcurl.so:ftp/curl \
+		libphysfs.so:devel/physfs
 
 USES=		gettext pkgconfig:build tar:xz
 USE_SDL=	sdl2 gfx2 image2 mixer2 net2 ttf2
diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index f09f8b4fbdaa..eeaf9d220e24 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -29,10 +29,10 @@ SDL_DESC=	Display module SDL
 
 GCU_CONFIGURE_WITH=	gcu
 
-X11_LIB_DEPENDS=	libX11.so:${PORTSDIR}/x11/libX11
+X11_LIB_DEPENDS=	libX11.so:x11/libX11
 X11_CONFIGURE_WITH=	x11
 
-SDL_LIB_DEPENDS=	libX11.so:${PORTSDIR}/x11/libX11
+SDL_LIB_DEPENDS=	libX11.so:x11/libX11
 SDL_CONFIGURE_WITH=	sdl
 
 PORTEXAMPLES=	*
diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile
index a8ce1c497d04..a94e86d5aa4f 100644
--- a/games/marsnomercy/Makefile
+++ b/games/marsnomercy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Turn-based strategy game setting on Mars
 
 LICENSE=	GPLv2 # version unspecified actually
 
-BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons
+BUILD_DEPENDS=	scons:devel/scons
 
 USE_GL=		gl
 USE_SDL=	sdl image ttf
diff --git a/games/meandmyshadow/Makefile b/games/meandmyshadow/Makefile
index d4161338d189..4d3a9f2f22e7 100644
--- a/games/meandmyshadow/Makefile
+++ b/games/meandmyshadow/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Me and My Shadow puzzle/platform game
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		cmake libarchive
 USE_SDL=	sdl ttf image mixer image gfx
diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
index b99f8f9e95d0..c717204974cc 100644
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Open source 3D real-time strategy game
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/docs/gnu_gpl_3.0.txt
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
-		libftgl.so:${PORTSDIR}/graphics/ftgl \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
-BUILD_DEPENDS=	${LOCALBASE}/include/libircclient.h:${PORTSDIR}/irc/libircclient \
-		${LOCALBASE}/include/miniupnpc/miniupnpc.h:${PORTSDIR}/net/miniupnpc
-RUN_DEPENDS=	${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSDIR}/games/megaglest-data
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpng.so:graphics/png \
+		libxerces-c.so:textproc/xerces-c3 \
+		libftgl.so:graphics/ftgl \
+		libvorbis.so:audio/libvorbis
+BUILD_DEPENDS=	${LOCALBASE}/include/libircclient.h:irc/libircclient \
+		${LOCALBASE}/include/miniupnpc/miniupnpc.h:net/miniupnpc
+RUN_DEPENDS=	${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:games/megaglest-data
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MegaGlest
diff --git a/games/minecraft-client/Makefile b/games/minecraft-client/Makefile
index d9202c75e731..2670dea027d3 100644
--- a/games/minecraft-client/Makefile
+++ b/games/minecraft-client/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Client for the block building game
 
-RUN_DEPENDS=	${JAVALIBDIR}/lwjgl/lwjgl.jar:${PORTSDIR}/games/lwjgl
+RUN_DEPENDS=	${JAVALIBDIR}/lwjgl/lwjgl.jar:games/lwjgl
 
 WRKSRC=		${WRKDIR}
 USES=		openal
diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index 3cd4328b1028..b07f4b4fce4b 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -39,7 +39,7 @@ CONFIG_FILES=	banned-ips.json \
 		whitelist.json
 
 DAEMON_VARS=	USE_RC_SUBR=minecraft
-DAEMON_RUN_DEPENDS=	tmux:${PORTSDIR}/sysutils/tmux
+DAEMON_RUN_DEPENDS=	tmux:sysutils/tmux
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
diff --git a/games/minerbold/Makefile b/games/minerbold/Makefile
index b8d678f0bade..bef9b5b54d29 100644
--- a/games/minerbold/Makefile
+++ b/games/minerbold/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Remake of Bolder Dash from BK-0010 with INSTEAD engine
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	instead:${PORTSDIR}/games/instead
+RUN_DEPENDS=	instead:games/instead
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gl00my
diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index 11ea7a91f662..e6e921e28f5f 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Near-infinite-world block sandbox game
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/doc/lgpl-2.1.txt
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
+		libgmp.so:math/gmp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	minetest
@@ -40,15 +40,15 @@ SPATIAL_DESC=	Enable SpatialIndex AreaStore backend
 
 CLIENT_CMAKE_ON=	-DBUILD_CLIENT=1
 CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
-CLIENT_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-			libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
+CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
+			libIrrlicht.so:x11-toolkits/irrlicht
 CLIENT_USES=		jpeg
 CLIENT_USE=		GL=gl XORG=x11
 SERVER_CMAKE_ON=	-DBUILD_SERVER=1
 SERVER_CMAKE_OFF=	-DBUILD_SERVER=0
 CURL_CMAKE_ON=		-DENABLE_CURL=1
 CURL_CMAKE_OFF=		-DENABLE_CURL=0
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 NLS_CMAKE_ON=		-DENABLE_GETTEXT=1
 NLS_CMAKE_OFF=		-DENABLE_GETTEXT=0
 NLS_USES=		gettext
@@ -57,17 +57,17 @@ SOUND_CMAKE_ON=		-DENABLE_SOUND=1
 SOUND_CMAKE_OFF=	-DENABLE_SOUND=0
 LEVELDB_CMAKE_ON=	-DENABLE_LEVELDB=1
 LEVELDB_CMAKE_OFF=	-DENABLE_LEVELDB=0
-LEVELDB_LIB_DEPENDS=	libleveldb.so:${PORTSDIR}/databases/leveldb
+LEVELDB_LIB_DEPENDS=	libleveldb.so:databases/leveldb
 REDIS_CMAKE_ON=		-DENABLE_REDIS=1
 REDIS_CMAKE_OFF=	-DENABLE_REDIS=0
-REDIS_LIB_DEPENDS=	libhiredis.so:${PORTSDIR}/databases/hiredis
+REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 FREETYPE_CMAKE_ON=	-DENABLE_FREETYPE=1
 FREETYPE_CMAKE_OFF=	-DENABLE_FREETYPE=0
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 LUAJIT_CMAKE_ON=	-DENABLE_LUAJIT=1
 LUAJIT_CMAKE_OFF=	-DENABLE_LUAJIT=0
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
-SPATIAL_LIB_DEPENDS=	libspatialindex.so:${PORTSDIR}/devel/spatialindex
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
+SPATIAL_LIB_DEPENDS=	libspatialindex.so:devel/spatialindex
 SPATIAL_CMAKE_ON=	-DENABLE_SPATIAL=1
 SPATIAL_CMAKE_OFF=	-DENABLE_SPATIAL=0
 
@@ -75,7 +75,7 @@ SPATIAL_CMAKE_OFF=	-DENABLE_SPATIAL=0
 
 .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND}
 USES+=		openal
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
@@ -86,7 +86,7 @@ GROUPS=		${PORTNAME}
 
 # hacky way to not bring irrlicht and X11 depends for server only
 .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSERVER}
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/x11-toolkits/irrlicht:patch
+BUILD_DEPENDS+=	${NONEXISTENT}:x11-toolkits/irrlicht:patch
 IRRLICHT_INCLUDE_DIR=	`${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include
 CMAKE_ARGS+=	-DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-irrlichtdepend
diff --git a/games/minetest_game/Makefile b/games/minetest_game/Makefile
index dfc67d843481..61f572febbaf 100644
--- a/games/minetest_game/Makefile
+++ b/games/minetest_game/Makefile
@@ -10,7 +10,7 @@ COMMENT=	The main game for the Minetest game engine
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	minetest:${PORTSDIR}/games/minetest
+RUN_DEPENDS=	minetest:games/minetest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	minetest
diff --git a/games/mkgichessclub/Makefile b/games/mkgichessclub/Makefile
index d4bae125354b..036e80495f02 100644
--- a/games/mkgichessclub/Makefile
+++ b/games/mkgichessclub/Makefile
@@ -24,8 +24,8 @@ SUB_FILES=	pkg-message
 USES=		python
 USE_MYSQL=	server
 USE_PHP=	mysql pcre session
-GNUCHESS_RUN_DEPENDS=	gnuchess:${PORTSDIR}/games/gnuchess
-PHALANX_RUN_DEPENDS=	phalanx:${PORTSDIR}/games/phalanx
+GNUCHESS_RUN_DEPENDS=	gnuchess:games/gnuchess
+PHALANX_RUN_DEPENDS=	phalanx:games/phalanx
 
 WRKSRC=	${WRKDIR}/MKGIChessClub-${PORTVERSION}
 
diff --git a/games/mkhexgrid/Makefile b/games/mkhexgrid/Makefile
index 3ffdc3d1951b..751ca2040d01 100644
--- a/games/mkhexgrid/Makefile
+++ b/games/mkhexgrid/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Fully-configurable hex grid generator
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/lexical_cast.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/lexical_cast.hpp:devel/boost-libs
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=		gmake
 
diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index 1447e36548b4..5519db5c6f7c 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Gnomemm puzzle game where you have to clean the caves of monsters
 
-LIB_DEPENDS=	libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26 \
-		libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
-		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24
+LIB_DEPENDS=	libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26 \
+		libgconfmm-2.6.so:devel/gconfmm26 \
+		libglademm-2.4.so:devel/libglademm24
 
 USES=		pathfix gettext gmake pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix intlhack libgnome esound
diff --git a/games/motogt/Makefile b/games/motogt/Makefile
index 729ab75aab83..9b08718740d7 100644
--- a/games/motogt/Makefile
+++ b/games/motogt/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	MotoGT-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	2D top-viewed motorcycle racing game
 
-LIB_DEPENDS=	libsfml1-system.so:${PORTSDIR}/devel/sfml1 \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libsfml1-system.so:devel/sfml1 \
+		libpng.so:graphics/png
 
 LICENSE=	GPLv2 CCbySA
 LICENSE_COMB=	multi
diff --git a/games/mt_dolphin_ia/Makefile b/games/mt_dolphin_ia/Makefile
index b91c192640ea..7a8959b9a1e0 100644
--- a/games/mt_dolphin_ia/Makefile
+++ b/games/mt_dolphin_ia/Makefile
@@ -12,7 +12,7 @@ COMMENT=		Basic AI for MaitreTarot, a Tarot card game
 
 LICENSE=		GPLv2
 
-LIB_DEPENDS=		libmt_client.so:${PORTSDIR}/games/libmt_client
+LIB_DEPENDS=		libmt_client.so:games/libmt_client
 
 USES=			pkgconfig tar:bzip2
 GNU_CONFIGURE=		yes
diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile
index 50df3fc4b9f4..9912f0e13a7b 100644
--- a/games/mt_gtk_client/Makefile
+++ b/games/mt_gtk_client/Makefile
@@ -12,18 +12,18 @@ COMMENT=		GTK+ client for MaitreTarot, a Tarot card game
 
 LICENSE=		GPLv2
 
-LIB_DEPENDS=		libmt_client.so:${PORTSDIR}/games/libmt_client
-RUN_DEPENDS=		${LOCALBASE}/share/cardpics/images/78.png:${PORTSDIR}/games/cardpics
+LIB_DEPENDS=		libmt_client.so:games/libmt_client
+RUN_DEPENDS=		${LOCALBASE}/share/cardpics/images/78.png:games/cardpics
 
 GNU_CONFIGURE=		yes
 USES=			gettext pkgconfig tar:bzip2
 USE_GNOME=		glib20 gtk20 libxml2
 
 .if !defined(WITHOUT_SERVER)
-RUN_DEPENDS+=		${LOCALBASE}/bin/maitretarot_server:${PORTSDIR}/games/maitretarot
+RUN_DEPENDS+=		${LOCALBASE}/bin/maitretarot_server:games/maitretarot
 .endif
 .if !defined(WITHOUT_IA)
-RUN_DEPENDS+=		${LOCALBASE}/bin/mt_dolphin_ia:${PORTSDIR}/games/mt_dolphin_ia
+RUN_DEPENDS+=		${LOCALBASE}/bin/mt_dolphin_ia:games/mt_dolphin_ia
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index eaeeb1554369..b4f709fe8520 100644
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@@ -13,11 +13,11 @@ COMMENT=	GTK+ based MUD client
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libexpat.so:textproc/expat2 \
+		libsqlite3.so:databases/sqlite3
 
 USES=		gmake libtool pathfix pkgconfig python
 USE_GNOME=	gtk20 libglade2 libxml2
diff --git a/games/naev/Makefile b/games/naev/Makefile
index f015cb648858..3e6d01d974b5 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -12,12 +12,12 @@ COMMENT=	2D action/RPG space game
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libzip.so:${PORTSDIR}/archivers/libzip \
-		libcsparse.so:${PORTSDIR}/math/suitesparse
-RUN_DEPENDS=	${DATADIR}/ndata-${PORTVERSION}.zip:${PORTSDIR}/games/naev-data
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libvorbisfile.so:audio/libvorbis \
+		libzip.so:archivers/libzip \
+		libcsparse.so:math/suitesparse
+RUN_DEPENDS=	${DATADIR}/ndata-${PORTVERSION}.zip:games/naev-data
 
 USES=		autoreconf:build compiler:features gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/games/nazghul/Makefile b/games/nazghul/Makefile
index 35fe745f2a8c..b8ca1ca92387 100644
--- a/games/nazghul/Makefile
+++ b/games/nazghul/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Computer role-playing game engine
 
 LICENSE=	GPLv2+ # GPLv3 text bundled, but sources mention GPLv2+
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_SDL=	sdl image mixer
 GNU_CONFIGURE=	yes
diff --git a/games/nelly/Makefile b/games/nelly/Makefile
index d6f4ca67d123..4c859a2b3818 100644
--- a/games/nelly/Makefile
+++ b/games/nelly/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nelly's Rooftop Garden, physics-based puzzle game
 
 RUN_DEPENDS=	${PYGAME} \
-		${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl
+		${PYTHON_PKGNAMEPREFIX}opengl>=0:graphics/py-opengl
 
 USES=		python:2
 
diff --git a/games/netradiant/Makefile b/games/netradiant/Makefile
index 2223a9d4c198..9413c2c466ff 100644
--- a/games/netradiant/Makefile
+++ b/games/netradiant/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Fork of the well-known GtkRadiant 1.5 FPS games map editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libwebp.so:${PORTSDIR}/graphics/webp
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libwebp.so:graphics/webp
 
 USES=		gmake jpeg pkgconfig tar:bzip2
 USE_GL=		gl
diff --git a/games/netrek-client-cow/Makefile b/games/netrek-client-cow/Makefile
index c64d89a94b38..10fb3effec5d 100644
--- a/games/netrek-client-cow/Makefile
+++ b/games/netrek-client-cow/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.netrek.org/files/COW/ \
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	Multi-player battle simulation with a Star Trek theme
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 LICENSE_FILE=	${WRKSRC}/COPYING
 
diff --git a/games/netspades/Makefile b/games/netspades/Makefile
index 29ade8b5ba84..4c9b0db1b6b8 100644
--- a/games/netspades/Makefile
+++ b/games/netspades/Makefile
@@ -29,7 +29,7 @@ GTK1_PLIST_FILES=	bin/gspades man/man6/gspades.6.gz
 
 SLANG_USES=		readline ncurses
 SLANG_CONFIGURE_OFF=	--without-slang
-SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_LDFLAGS=		-lncurses
 SLANG_PLIST_FILES=	bin/slspades man/man6/slspades.6.gz
 
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index ba955fc5a5f6..53107c6042b5 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Tilt the floor to guide a ball through an obstacle course
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libphysfs.so:${PORTSDIR}/devel/physfs
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis \
+		libphysfs.so:devel/physfs
 
 USES=		gmake iconv jpeg
 USE_GL=		gl
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 5aff4de42ef6..71bf3080d37f 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Fast-paced, chaotic, and intense multiplayer first person shooter
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/gpl.txt
@@ -45,9 +45,9 @@ CLIENT_DESC=	Build GLX client
 SDL_CLIENT_DESC=Build SDL client
 DEDICATED_DESC=	Build dedicated server
 
-CLIENT_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug \
-			libpng.so:${PORTSDIR}/graphics/png \
-			libtheora.so:${PORTSDIR}/multimedia/libtheora
+CLIENT_LIB_DEPENDS=	libmodplug.so:audio/libmodplug \
+			libpng.so:graphics/png \
+			libtheora.so:multimedia/libtheora
 SDL_CLIENT_LIB_DEPENDS=	${CLIENT_LIB_DEPENDS}
 MAPPACK_DISTFILES=	nexmappack_r2${EXTRACT_SUFX}:mappack
 
diff --git a/games/nimuh/Makefile b/games/nimuh/Makefile
index d72435b29e70..0e1a6d2ded51 100644
--- a/games/nimuh/Makefile
+++ b/games/nimuh/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-data-${PORTVERSION}${EXTRACT_S
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Puzzle game destined to improve the knowledge of Andalusia
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/games/ninix-aya/Makefile b/games/ninix-aya/Makefile
index 7bf63f603bad..0413982377f2 100644
--- a/games/ninix-aya/Makefile
+++ b/games/ninix-aya/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Desktop mascot program compatible with "Ukagaka"
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
-		${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet \
+LIB_DEPENDS=	libpng.so:graphics/png
+RUN_DEPENDS=	unzip:archivers/unzip \
+		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet \
 		${PYNUMPY}
 
 NO_ARCH=	yes
diff --git a/games/noegnud-littlehack/Makefile b/games/noegnud-littlehack/Makefile
index 204208a1aac4..d580238cb27f 100644
--- a/games/noegnud-littlehack/Makefile
+++ b/games/noegnud-littlehack/Makefile
@@ -17,7 +17,7 @@ COMMENT=	The noeGNUd UI for the LittleHack variation of Nethack
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	noegnud-data>0:${PORTSDIR}/games/noegnud-data
+RUN_DEPENDS=	noegnud-data>0:games/noegnud-data
 
 NOEGNUDVERSION=	${PORTNAME}-0.8.0
 USES=		bison tar:bzip2
diff --git a/games/noegnud-nethack-deet/Makefile b/games/noegnud-nethack-deet/Makefile
index 42420644e47b..fba09c3fcbad 100644
--- a/games/noegnud-nethack-deet/Makefile
+++ b/games/noegnud-nethack-deet/Makefile
@@ -17,7 +17,7 @@ COMMENT=	The noeGNUd UI for Nethack with DeeT's hack font patch
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	noegnud-data>0:${PORTSDIR}/games/noegnud-data
+RUN_DEPENDS=	noegnud-data>0:games/noegnud-data
 
 NOEGNUDVERSION=	${PORTNAME}-0.8.0
 USES=		bison tar:bzip2
diff --git a/games/noegnud-nethack/Makefile b/games/noegnud-nethack/Makefile
index 79f4ec8ca46b..d912c5b9e2db 100644
--- a/games/noegnud-nethack/Makefile
+++ b/games/noegnud-nethack/Makefile
@@ -17,7 +17,7 @@ COMMENT=	The noeGNUd UI for the vanilla Nethack
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	noegnud-data>0:${PORTSDIR}/games/noegnud-data
+RUN_DEPENDS=	noegnud-data>0:games/noegnud-data
 
 NOEGNUDVERSION=	${PORTNAME}-0.8.0
 USES=		bison gmake tar:bzip2
diff --git a/games/noegnud-slashem/Makefile b/games/noegnud-slashem/Makefile
index ac6975121ade..c66bd0203e5f 100644
--- a/games/noegnud-slashem/Makefile
+++ b/games/noegnud-slashem/Makefile
@@ -17,7 +17,7 @@ COMMENT=	The noeGNUd UI for the SLASH'EM variant of Nethack
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	noegnud-data>0:${PORTSDIR}/games/noegnud-data
+RUN_DEPENDS=	noegnud-data>0:games/noegnud-data
 
 NOEGNUDVERSION=	${PORTNAME}-0.8.0
 USES=		bison gmake tar:bzip2
diff --git a/games/numptyphysics-npcomplete/Makefile b/games/numptyphysics-npcomplete/Makefile
index 68aff365c36c..2998715b8d49 100644
--- a/games/numptyphysics-npcomplete/Makefile
+++ b/games/numptyphysics-npcomplete/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	numptyphysics-
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Level pack for Numpty Physics
 
-RUN_DEPENDS=	numptyphysics:${PORTSDIR}/games/numptyphysics
+RUN_DEPENDS=	numptyphysics:games/numptyphysics
 
 USES=		tar:bzip2
 NO_BUILD=	yes
diff --git a/games/nwndata/Makefile b/games/nwndata/Makefile
index 70b4022d869a..1cc9856cb0c0 100644
--- a/games/nwndata/Makefile
+++ b/games/nwndata/Makefile
@@ -22,7 +22,7 @@ NWNVER=		1.61
 NWNREV=		0
 NWN_DIAMOND=	yes
 
-EXTRACT_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
+EXTRACT_DEPENDS+=	7z:archivers/p7zip
 
 PLIST_SUB+=	DIAMOND="" ORIGINAL="@comment "
 .else
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 882f26ac0520..8f443601aae4 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	candy@kgc.co.jp
 COMMENT=	Cat chasing a mouse all over the screen
 
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+BUILD_DEPENDS=	nkf:japanese/nkf
 
 CONFLICTS=	oneko-1.*
 
diff --git a/games/oolite/Makefile b/games/oolite/Makefile
index 07691e1b1c64..54eca7cc9695 100644
--- a/games/oolite/Makefile
+++ b/games/oolite/Makefile
@@ -17,13 +17,13 @@ LICENSE_NAME_CCBYNCSAv3=	Creative Commons Attribution-NonCommercial-ShareAlike L
 LICENSE_FILE_CCBYNCSAv3=	${WRKSRC}/Doc/LICENSE.TXT
 LICENSE_PERMS_CCBYNCSAv3=	dist-mirror pkg-mirror auto-accept
 
-BUILD_DEPENDS=		zip:${PORTSDIR}/archivers/zip \
-			${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=		libespeak.so:${PORTSDIR}/audio/espeak \
-			libnspr4.so:${PORTSDIR}/devel/nspr \
-			libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-			libpng.so:${PORTSDIR}/graphics/png \
-			libminizip.so:${PORTSDIR}/archivers/minizip
+BUILD_DEPENDS=		zip:archivers/zip \
+			${LOCALBASE}/bin/unzip:archivers/unzip
+LIB_DEPENDS=		libespeak.so:audio/espeak \
+			libnspr4.so:devel/nspr \
+			libvorbisfile.so:audio/libvorbis \
+			libpng.so:graphics/png \
+			libminizip.so:archivers/minizip
 
 USES=			gnustep openal:al perl5 python:build tar:bzip2
 USE_GL=			yes
@@ -67,7 +67,7 @@ WITH_PORTS_CLANG=	yes
 .endif
 
 .if defined(WITH_PORTS_CLANG)
-BUILD_DEPENDS+=	clang34:${PORTSDIR}/lang/clang34
+BUILD_DEPENDS+=	clang34:lang/clang34
 CC=		${LOCALBASE}/bin/clang34
 CXX=		${LOCALBASE}/bin/clang++34
 CPP=		${LOCALBASE}/bin/clang-cpp34
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 9ac33d463ac0..38f4cb89642e 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -17,9 +17,9 @@ LICENSE_NAME_CCbySA=	Creative Commons Attribution-ShareAlike
 LICENSE_FILE_CCbySA=	${WRKSRC}/GRAPHICS-LICENSE
 LICENSE_PERMS_CCbySA=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	libclanCore.so:${PORTSDIR}/devel/clanlib1 \
-	libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	zip:archivers/zip
+LIB_DEPENDS=	libclanCore.so:devel/clanlib1 \
+	libpng.so:graphics/png
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
diff --git a/games/openarena/Makefile b/games/openarena/Makefile
index b7007acf6fed..87c359d4907e 100644
--- a/games/openarena/Makefile
+++ b/games/openarena/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Quake3 total conversion based on the ioquake3 engine
 
-RUN_DEPENDS=	${DATADIR}/${Q3BASE}/pak0.pk3:${PORTSDIR}/games/openarena-data
+RUN_DEPENDS=	${DATADIR}/${Q3BASE}/pak0.pk3:games/openarena-data
 
 MASTERDIR=	${.CURDIR}/../ioquake3
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/games/openarena/Makefile.include b/games/openarena/Makefile.include
index 4a386e2987cb..7adcac29c450 100644
--- a/games/openarena/Makefile.include
+++ b/games/openarena/Makefile.include
@@ -6,7 +6,7 @@ OABASE?=	baseoa
 PLIST_SUB+=	OADIR="share/openarena"
 
 .if ! ${OABASE:Mbaseoa}
-RUN_DEPENDS+=	openarena>0:${PORTSDIR}/games/openarena
+RUN_DEPENDS+=	openarena>0:games/openarena
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/games/openastromenace/Makefile b/games/openastromenace/Makefile
index df9782b4d298..fe8ab2d80b08 100644
--- a/games/openastromenace/Makefile
+++ b/games/openastromenace/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Hardcore 3D space shooter with spaceship upgrade possibilities
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libvorbisfile.so:audio/libvorbis \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		cmake openal:al,alut tar:bzip2
 USE_XORG=	x11 xinerama
diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile
index 9290ad8e32bc..712a0172d14a 100644
--- a/games/openclonk/Makefile
+++ b/games/openclonk/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ISCL CC0-1.0
 LICENSE_COMB=	multi
 LICENSE_FILE_ISCL=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libfreetype.so:print/freetype2 \
+		libogg.so:audio/libogg \
+		libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis
 
 BROKEN_FreeBSD_9=	does not build (lack of proper c++11 support)
 
diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile
index 689d165517b6..07a6579f7342 100644
--- a/games/openlierox/Makefile
+++ b/games/openlierox/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	OpenLieroX_${DISTVERSION}.src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Extremely addictive realtime worms shoot-em-up
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libboost_signals.so:${PORTSDIR}/devel/boost-libs \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libboost_signals.so:devel/boost-libs \
+		libcurl.so:ftp/curl
 
 USES=		tar:bzip2 cmake openal:al,alut pkgconfig
 USE_SDL=	sdl image
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index eaa52fc0dc1f..f808024f44d3 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Parody of the once popular coin-up fighting game, Mortal Kombat
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		tar:bzip2 dos2unix perl5
 GNU_CONFIGURE=	yes
diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index 47ae8d9d0985..57c519fcf0d2 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Unofficial open source engine reimplementation of the game Morrowind
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/docs/license/GPL3.txt
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libBulletCollision.so:${PORTSDIR}/devel/bullet \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libMyGUIEngine.so:${PORTSDIR}/x11-toolkits/mygui \
-		libosg.so:${PORTSDIR}/graphics/osg \
-		libunshield.so:${PORTSDIR}/archivers/unshield
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libBulletCollision.so:devel/bullet \
+		libboost_thread.so:devel/boost-libs \
+		libMyGUIEngine.so:x11-toolkits/mygui \
+		libosg.so:graphics/osg \
+		libunshield.so:archivers/unshield
 
 BROKEN_FreeBSD_9=	does not build
 
diff --git a/games/opensonic/Makefile b/games/opensonic/Makefile
index a2e7b7c62e0a..0b49255362e2 100644
--- a/games/opensonic/Makefile
+++ b/games/opensonic/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	opensnc-src-${PORTVERSION}
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Game based on the "Sonic the Hedgehog" universe
 
-BUILD_DEPENDS=	alpng>=1.3:${PORTSDIR}/graphics/alpng
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+BUILD_DEPENDS=	alpng>=1.3:graphics/alpng
+LIB_DEPENDS=	liballeg.so:devel/allegro \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
 
 DESKTOP_ENTRIES="${PORTNAME}" \
 		"Sonic the Hedgehog" \
diff --git a/games/openspades/Makefile b/games/openspades/Makefile
index 6baef7a858cb..0a10ef36115a 100644
--- a/games/openspades/Makefile
+++ b/games/openspades/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Compatible client of Ace of Spades
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick # for building icons
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	convert:graphics/ImageMagick # for building icons
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 BROKEN_FreeBSD_9=	does not build on FreeBSD 9.x
 
diff --git a/games/opensurge/Makefile b/games/opensurge/Makefile
index 1c7c26ab7462..556ad3891b4b 100644
--- a/games/opensurge/Makefile
+++ b/games/opensurge/Makefile
@@ -20,13 +20,13 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_FILE_CCbyNCSA3=${WRKSRC}/licenses/CC-BY-SA-3.0.txt
 LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libaldmb.a:${PORTSDIR}/audio/dumb-allegro \
-		${LOCALBASE}/include/alfont.h:${PORTSDIR}/x11-fonts/alfont \
-		alureplay:${PORTSDIR}/audio/alure
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
-RUN_DEPENDS=	${LOCALBASE}/lib/libaldmb.a:${PORTSDIR}/audio/dumb-allegro
+BUILD_DEPENDS=	${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro \
+		${LOCALBASE}/include/alfont.h:x11-fonts/alfont \
+		alureplay:audio/alure
+LIB_DEPENDS=	liballeg.so:devel/allegro \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
+RUN_DEPENDS=	${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-build${SVN_REV}
 
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index cfee6999a92f..34095ad4311f 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Open source clone of Microprose Transport Tycoon Deluxe
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		liblzo2.so:archivers/lzo2
 
 USES=		cpe gmake pkgconfig tar:xz
 HAS_CONFIGURE=	yes
@@ -58,16 +58,16 @@ CONFIGURE_ARGS+=	--enable-dedicated
 CFLAGS+=	-I${LOCALBASE}/include
 USE_RC_SUBR=	${PORTNAME}
 .else
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS+=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 USE_SDL=	sdl
 INSTALLS_ICONS=	yes
 .endif
 
 .if defined(WITH_OPEN_GAME_FILES)
-RUN_DEPENDS+=	${LOCALBASE}/share/${PORTNAME}/baseset/opengfx/opengfx.obg:${PORTSDIR}/games/opengfx \
-		${LOCALBASE}/share/${PORTNAME}/baseset/openmsx/openmsx.obm:${PORTSDIR}/games/openmsx \
-		${LOCALBASE}/share/${PORTNAME}/baseset/opensfx/opensfx.obs:${PORTSDIR}/games/opensfx
+RUN_DEPENDS+=	${LOCALBASE}/share/${PORTNAME}/baseset/opengfx/opengfx.obg:games/opengfx \
+		${LOCALBASE}/share/${PORTNAME}/baseset/openmsx/openmsx.obm:games/openmsx \
+		${LOCALBASE}/share/${PORTNAME}/baseset/opensfx/opensfx.obs:games/opensfx
 .endif
 
 .if defined(WITH_SAVE_PASSWORDS)
diff --git a/games/openxcom/Makefile b/games/openxcom/Makefile
index 365259615255..d7431789181f 100644
--- a/games/openxcom/Makefile
+++ b/games/openxcom/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Open-source reimplementation of the original X-Com
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
+LIB_DEPENDS=	libyaml-cpp.so:devel/yaml-cpp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SupSuper
diff --git a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile
index ed3e57b798e9..8860ff685e7e 100644
--- a/games/openyahtzee/Makefile
+++ b/games/openyahtzee/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Full-featured classic dice game Yahtzee
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/scoped_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/scoped_ptr.hpp:devel/boost-libs
 
 USES=		compiler:c++11-lib tar:bzip2
 USE_WX=		2.8
diff --git a/games/optimax/Makefile b/games/optimax/Makefile
index af927f7637ff..d4dea428f2f1 100644
--- a/games/optimax/Makefile
+++ b/games/optimax/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Core War optimizer written in Perl
 
-RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 
 USES=		perl5 zip
 USE_PERL5=	run
diff --git a/games/outerspace/Makefile b/games/outerspace/Makefile
index 95a75cb38e13..9ac271e0ae15 100644
--- a/games/outerspace/Makefile
+++ b/games/outerspace/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/ospace/OSLauncher/${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	On-line strategy game
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
 
 USES=		python
 NO_BUILD=	yes
diff --git a/games/p5-Algorithm-Pair-Swiss/Makefile b/games/p5-Algorithm-Pair-Swiss/Makefile
index 493410ddc6b9..a34de21d7f73 100644
--- a/games/p5-Algorithm-Pair-Swiss/Makefile
+++ b/games/p5-Algorithm-Pair-Swiss/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Generate unique pairings for tournaments
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/games/p5-Baseball-Sabermetrics/Makefile b/games/p5-Baseball-Sabermetrics/Makefile
index a3f96a52ade1..e16b22d44efd 100644
--- a/games/p5-Baseball-Sabermetrics/Makefile
+++ b/games/p5-Baseball-Sabermetrics/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Baseball Statistics Module
 
-BUILD_DEPENDS=	p5-Data-Serializer>=0.29:${PORTSDIR}/devel/p5-Data-Serializer \
-		p5-HTML-TableExtract>=2.08:${PORTSDIR}/www/p5-HTML-TableExtract \
-		p5-libwww>=5.801:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Data-Serializer>=0.29:devel/p5-Data-Serializer \
+		p5-HTML-TableExtract>=2.08:www/p5-HTML-TableExtract \
+		p5-libwww>=5.801:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/games/p5-Games-Alak/Makefile b/games/p5-Games-Alak/Makefile
index cebbd5c988b1..4a57daf82f61 100644
--- a/games/p5-Games-Alak/Makefile
+++ b/games/p5-Games-Alak/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple game-tree implementation of a gomoku-like game
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/games/p5-Games-Bingo-Bot/Makefile b/games/p5-Games-Bingo-Bot/Makefile
index 994ea7246f63..5fba3cea0f2c 100644
--- a/games/p5-Games-Bingo-Bot/Makefile
+++ b/games/p5-Games-Bingo-Bot/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Simple class holding IRC related methods for bingo
 
-BUILD_DEPENDS=	p5-Games-Bingo>=0:${PORTSDIR}/games/p5-Games-Bingo
+BUILD_DEPENDS=	p5-Games-Bingo>=0:games/p5-Games-Bingo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/games/p5-Games-Bingo-Print/Makefile b/games/p5-Games-Bingo-Print/Makefile
index 47b37affefba..3ab7fd16ed99 100644
--- a/games/p5-Games-Bingo-Print/Makefile
+++ b/games/p5-Games-Bingo-Print/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Games::Bingo::Print - PDF Generation Class
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Games-Bingo>=0:${PORTSDIR}/games/p5-Games-Bingo \
-		p5-PDFLib>=0:${PORTSDIR}/print/p5-PDFLib
+BUILD_DEPENDS=	p5-Games-Bingo>=0:games/p5-Games-Bingo \
+		p5-PDFLib>=0:print/p5-PDFLib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Harness>=0:${PORTSDIR}/devel/p5-Test-Harness \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Harness>=0:devel/p5-Test-Harness \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/games/p5-Games-Dice/Makefile b/games/p5-Games-Dice/Makefile
index e6bcf3ffac21..c66167badb33 100644
--- a/games/p5-Games-Dice/Makefile
+++ b/games/p5-Games-Dice/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Perl module to simulate die rolls
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Test-Script>=1.06:${PORTSDIR}/devel/p5-Test-Script \
-		p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Test-Script>=1.06:devel/p5-Test-Script \
+		p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/games/pacmanarena/Makefile b/games/pacmanarena/Makefile
index e88c3d39f29d..ba24369a9909 100644
--- a/games/pacmanarena/Makefile
+++ b/games/pacmanarena/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Pacman clone in full 3D with a few surprises
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-EXTRACT_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	unzip:archivers/unzip
 
 WRKSRC=		${WRKDIR}/${PORTNAME:S/arena//}
 
diff --git a/games/paintown/Makefile b/games/paintown/Makefile
index 564bdc64cbad..c275245dbaf8 100644
--- a/games/paintown/Makefile
+++ b/games/paintown/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Fighting game similar to Streets of Rage and TMNT
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	liballeg.so:devel/allegro \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		dos2unix scons tar:bzip2
 USE_SDL=	yes
diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index 121a7a41a837..8a1030982b14 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Action flight simulation computer program using OSG
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE_GNU_GPL_2.txt
 
-LIB_DEPENDS=	libosg.so:${PORTSDIR}/graphics/osg
+LIB_DEPENDS=	libosg.so:graphics/osg
 
 USES=		alias cmake lua:51 tar:xz
 USE_GL=		gl
@@ -38,8 +38,8 @@ GUI_DESC=	Enable FLTK GUI
 
 OPTIONS_SUB=	yes
 
-GUI_LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
-PLIB_BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
+GUI_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
+PLIB_BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
 
 PORTDOCS=	*
 
diff --git a/games/pangzero/Makefile b/games/pangzero/Makefile
index b86163300670..10b84137860d 100644
--- a/games/pangzero/Makefile
+++ b/games/pangzero/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Clone of Super Pang
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Carp>=0:${PORTSDIR}/devel/p5-Carp \
-		p5-SDL>=0:${PORTSDIR}/devel/p5-SDL
+RUN_DEPENDS=	p5-Carp>=0:devel/p5-Carp \
+		p5-SDL>=0:devel/p5-SDL
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile
index 2f8e01154aec..44183fe41d7b 100644
--- a/games/penguin-command/Makefile
+++ b/games/penguin-command/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Clone of the classic game Missile Command
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		jpeg
 USE_SDL=	mixer image sdl
diff --git a/games/phlipple/Makefile b/games/phlipple/Makefile
index 074c5d59b842..b38a092edbf9 100644
--- a/games/phlipple/Makefile
+++ b/games/phlipple/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Flipping squares will never be the same
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
 
 USES=		desktop-file-utils pkgconfig
 USE_SDL=	sdl mixer image
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index c256e8639827..01272a456756 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	DOCS
 
 .if defined(WITH_ALLEGRO)
 BROKEN=		support with Allegro is (temporarily?) broken as of version 0.3.1
-LIB_DEPENDS+=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS+=	liballeg.so:devel/allegro
 CONFIGURE_ARGS+=	--with-allegro
 USE_GL+=	glu
 .else
diff --git a/games/pingus/Makefile b/games/pingus/Makefile
index 56206bc0739d..97036229dad4 100644
--- a/games/pingus/Makefile
+++ b/games/pingus/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	GOOGLE_CODE \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Free Lemmings-like game
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libboost_signals.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libboost_signals.so:devel/boost-libs
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index 22905136804e..d7c04025dbeb 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Tron-like multiplayer racing game
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
-		libprotobuf.so:${PORTSDIR}/devel/protobuf \
-		libglfw.so:${PORTSDIR}/graphics/glfw2 \
-		libHalf.so:${PORTSDIR}/graphics/ilmbase \
-		libftgl.so:${PORTSDIR}/graphics/ftgl \
-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
+LIB_DEPENDS=	libIL.so:graphics/devil \
+		libprotobuf.so:devel/protobuf \
+		libglfw.so:graphics/glfw2 \
+		libHalf.so:graphics/ilmbase \
+		libftgl.so:graphics/ftgl \
+		libsigc-2.0.so:devel/libsigc++20
 
 USES=		dos2unix pkgconfig scons tar:bzip2
 USE_GL=		gl glu
diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile
index 324e46fb914b..689a8d9339cd 100644
--- a/games/pioneer/Makefile
+++ b/games/pioneer/Makefile
@@ -29,13 +29,13 @@ LICENSE_PERMS_GLEW=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_IUP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_SIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/GL/glu.h:${PORTSDIR}/graphics/libGLU
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libassimp.so:${PORTSDIR}/multimedia/assimp
+BUILD_DEPENDS=	${LOCALBASE}/include/GL/glu.h:graphics/libGLU
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libsigc-2.0.so:devel/libsigc++20 \
+		libfreetype.so:print/freetype2 \
+		libvorbisfile.so:audio/libvorbis \
+		libpng.so:graphics/png \
+		libassimp.so:multimedia/assimp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pioneerspacesim
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 815c9f9e2d8d..3192b3e34b25 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Internet playable version of the Settlers of Catan
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
+RUN_DEPENDS=	yelp:x11/yelp
 
 USES=		gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix gtk30 intltool libgnome librsvg2
diff --git a/games/plee-the-bear/Makefile b/games/plee-the-bear/Makefile
index 80c16c5d4fac..12a60d692c8c 100644
--- a/games/plee-the-bear/Makefile
+++ b/games/plee-the-bear/Makefile
@@ -16,9 +16,9 @@ LICENSE_NAME_CCbySA3=	Attribution-ShareAlike 3.0 Unported
 LICENSE_FILE_CCbySA3=	${WRKSRC}/CCPL
 LICENSE_PERMS_CCbySA3=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man
-LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libclaw_application.so:${PORTSDIR}/devel/libclaw
+BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
+		libclaw_application.so:devel/libclaw
 
 USE_SDL=	sdl mixer
 USE_GL=		gl glu
diff --git a/games/plutocracy/Makefile b/games/plutocracy/Makefile
index ded23df80228..288a95c99a4c 100644
--- a/games/plutocracy/Makefile
+++ b/games/plutocracy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Multiplayer 3D economy/trade-based RTS
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		python tar:bzip2
 USE_SDL=	sdl pango
diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile
index 393794aa9799..31b84147ad9d 100644
--- a/games/poker-engine/Makefile
+++ b/games/poker-engine/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Python library that implements poker rules
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync \
-		${PYTHON_SITELIBDIR}/pokereval.py:${PORTSDIR}/games/py-poker-eval \
-		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
-RUN_DEPENDS=	${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync \
-		${PYTHON_SITELIBDIR}/pokereval.py:${PORTSDIR}/games/py-poker-eval \
-		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
+BUILD_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync \
+		${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval \
+		${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
+		${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt
+RUN_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync \
+		${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval \
+		${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
+		${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt
 
 USES=		gettext gmake pkgconfig python:2
 GNU_CONFIGURE=	yes
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 137f078f5506..6796188ce064 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Poker game written in C++/Qt4
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libgsasl.so:${PORTSDIR}/security/gsasl \
-		libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
-		libprotobuf.so:${PORTSDIR}/devel/protobuf
-BUILD_DEPENDS=	${LOCALBASE}/include/libircclient.h:${PORTSDIR}/irc/libircclient
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libmikmod.so:audio/libmikmod \
+		libgnutls.so:security/gnutls \
+		libcurl.so:ftp/curl \
+		libgsasl.so:security/gsasl \
+		libtinyxml.so:textproc/tinyxml \
+		libprotobuf.so:devel/protobuf
+BUILD_DEPENDS=	${LOCALBASE}/include/libircclient.h:irc/libircclient
 
 USES=		iconv gmake qmake tar:bzip2
 USE_QT4=	gui corelib network sql sql-sqlite3 \
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index 8ea5e49c2f2a..0bce6ac15ae3 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Arcade 2D shoot-em-up
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		autoreconf
 USE_XORG=	xext xxf86dga
diff --git a/games/ppracer/Makefile b/games/ppracer/Makefile
index cac4cd0a61ef..e2e373094138 100644
--- a/games/ppracer/Makefile
+++ b/games/ppracer/Makefile
@@ -14,8 +14,8 @@ COMMENT=	3D downhill racing game... kind of like TuxRacer Improved
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		gmake pkgconfig dos2unix tar:bzip2
 DOS2UNIX_REGEX=	.*\.(c|cpp|h)
diff --git a/games/prboom-plus/Makefile b/games/prboom-plus/Makefile
index c35a79317b06..2f0044af20a9 100644
--- a/games/prboom-plus/Makefile
+++ b/games/prboom-plus/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Fork of the prboom Doom game engine
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg \
+		libpng.so:graphics/png
 
 USES=		gmake
 USE_SDL=	mixer net sdl
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 3b2542e70cf4..4048a271f638 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Multiplayer-capable and modified version of ID's classic DOOM game
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 
 USES=		gmake
 USE_SDL=	mixer net sdl
diff --git a/games/primateplunge/Makefile b/games/primateplunge/Makefile
index b5a9b81d5865..3b56a9e95d0a 100644
--- a/games/primateplunge/Makefile
+++ b/games/primateplunge/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	uDevGame license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	# empty
 
-RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
+RUN_DEPENDS=	timidity:audio/timidity
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl mixer
diff --git a/games/ptkei/Makefile b/games/ptkei/Makefile
index 24c111be3c5e..97044cc64fe4 100644
--- a/games/ptkei/Makefile
+++ b/games/ptkei/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SF/ptkei2
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Python/Tk graphical client for Wolfpack Empire servers
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/py-Pmw
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+		${PYTHON_SITELIBDIR}/Pmw/__init__.py:x11-toolkits/py-Pmw
 
 USES=		python
 
diff --git a/games/pushover/Makefile b/games/pushover/Makefile
index ee6310629abc..ffcb8538426e 100644
--- a/games/pushover/Makefile
+++ b/games/pushover/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Puzzle game where the goal is to push over all dominoes
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl mixer ttf
diff --git a/games/py-fife/Makefile b/games/py-fife/Makefile
index 008ee50cbf92..5fd42f7cae3c 100644
--- a/games/py-fife/Makefile
+++ b/games/py-fife/Makefile
@@ -19,11 +19,11 @@ COMMENT=		Flexible Isometric Free Engine
 
 LICENSE=		LGPL21
 
-BUILD_DEPENDS=		${LOCALBASE}/bin/swig2.0:${PORTSDIR}/devel/swig20
-LIB_DEPENDS=		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-			libguichan.so:${PORTSDIR}/devel/guichan \
-			libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-			libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=		${LOCALBASE}/bin/swig2.0:devel/swig20
+LIB_DEPENDS=		libvorbisfile.so:audio/libvorbis \
+			libguichan.so:devel/guichan \
+			libboost_filesystem.so:devel/boost-libs \
+			libpng.so:graphics/png
 
 USES=			openal:al pkgconfig python:2 scons
 USE_GL=			gl
diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
index 1f71fc9dcfd8..8846c17194cc 100644
--- a/games/py-mnemosyne/Makefile
+++ b/games/py-mnemosyne/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Flash-card tool which optimises your learning process
 
 LICENSE=	LGPL3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.5:${PORTSDIR}/databases/py-qt4-sql \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.5:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.5:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.2.0:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2:${PORTSDIR}/www/py-cherrypy \
-		${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.5:databases/py-qt4-sql \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.5:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.5:www/py-qt4-webkit \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.2.0:math/py-matplotlib \
+		${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2:www/py-cherrypy \
+		${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob
 
 USES=		fortran python
 USE_PYTHON=	distutils autoplist
diff --git a/games/py-poker-eval/Makefile b/games/py-poker-eval/Makefile
index 9174ade948c6..137db624a9bd 100644
--- a/games/py-poker-eval/Makefile
+++ b/games/py-poker-eval/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python adaptor for the poker-eval toolkit
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpoker-eval.so:${PORTSDIR}/games/poker-eval
+LIB_DEPENDS=	libpoker-eval.so:games/poker-eval
 
 USES=		autoreconf libtool pkgconfig python:2
 GNU_CONFIGURE=	yes
diff --git a/games/py-sgfsummary/Makefile b/games/py-sgfsummary/Makefile
index bb43e575472f..63a769973901 100644
--- a/games/py-sgfsummary/Makefile
+++ b/games/py-sgfsummary/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SGF Summarizer
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sgflib.py:${PORTSDIR}/games/py-sgflib
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sgflib.py:games/py-sgflib
 
 PLIST_FILES=	bin/sgfsummary.py
 USES=		python
diff --git a/games/pyching/Makefile b/games/pyching/Makefile
index f51a0e01b476..d040cf054b3a 100644
--- a/games/pyching/Makefile
+++ b/games/pyching/Makefile
@@ -15,7 +15,7 @@ BROKEN=		unfetchable
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 NO_WRKSUBDIR=	yes
 USES=		python
diff --git a/games/pyfa/Makefile b/games/pyfa/Makefile
index 9aadd079ebcb..e6c90d83586c 100644
--- a/games/pyfa/Makefile
+++ b/games/pyfa/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Fitting tool for EVE Online
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DarkFenX
@@ -33,9 +33,9 @@ WX_COMPS=	wx:run python:run
 OPTIONS_DEFINE=		DPSGRAPHING
 DPSGRAPHING_DESC=	DPS graphing (requires NumPy and matplotlib. need fix)
 
-DPSGRAPHING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}numpy>0:${PORTSDIR}/math/py-numpy \
-		${PYTHON_PKGNAMEPREFIX}more-itertools>0:${PORTSDIR}/devel/py-more-itertools
+DPSGRAPHING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
+		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \
+		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index d4c58c78ec82..b5eb313717a6 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Real kawari8 module for ninix-aya
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-RUN_DEPENDS=	ninix:${PORTSDIR}/games/ninix-aya
+RUN_DEPENDS=	ninix:games/ninix-aya
 
 BUILD_WRKSRC=	${WRKSRC}/build/src
 
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index 1f5917239cb7..fbdf1be55455 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Solitaire game, written in Python and the successor of PySol
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 USES=		python tar:bzip2
 USE_PYTHON=	autoplist distutils
diff --git a/games/pysycache-lang/Makefile b/games/pysycache-lang/Makefile
index fe3aef75bc72..a14add4a7aa6 100644
--- a/games/pysycache-lang/Makefile
+++ b/games/pysycache-lang/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	pysycache
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The pysycache lang support
 
-RUN_DEPENDS=	pysycache.py:${PORTSDIR}/games/pysycache
+RUN_DEPENDS=	pysycache.py:games/pysycache
 
 USES=		zip:infozip
 NO_BUILD=	yes
diff --git a/games/pysycache-themes/Makefile b/games/pysycache-themes/Makefile
index e77e464453c6..f8fa15a31a80 100644
--- a/games/pysycache-themes/Makefile
+++ b/games/pysycache-themes/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Pysycache themes support
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	pysycache.py:${PORTSDIR}/games/pysycache
+RUN_DEPENDS=	pysycache.py:games/pysycache
 
 USES=		zip:infozip
 NO_BUILD=	yes
diff --git a/games/pysycache/Makefile b/games/pysycache/Makefile
index 030edbe229d8..8be926a7d06f 100644
--- a/games/pysycache/Makefile
+++ b/games/pysycache/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Educational software made in python
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
 
 USES=		python zip
 NO_BUILD=	yes
diff --git a/games/pythonchess/Makefile b/games/pythonchess/Makefile
index 116efa00a843..855b5e119d64 100644
--- a/games/pythonchess/Makefile
+++ b/games/pythonchess/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Small program for playing chess against the computer
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/gpl.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 WRKSRC=		${WRKDIR}/${PORTNAME:S/p/P/:S/c/C/}
 
diff --git a/games/pythonsudoku/Makefile b/games/pythonsudoku/Makefile
index f28f1dfa6c07..0149704d40f0 100644
--- a/games/pythonsudoku/Makefile
+++ b/games/pythonsudoku/Makefile
@@ -18,10 +18,10 @@ COMMENT=	Text and graphical program to create or resolve Sudokus
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=	libcups.so:print/cups
 RUN_DEPENDS=	${PYGAME} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1
 
 USES=		python:2 tar:bzip2
 USE_GNOME=	pygtk2
diff --git a/games/q2p/Makefile b/games/q2p/Makefile
index 4800735b7b37..f0e83fad730f 100644
--- a/games/q2p/Makefile
+++ b/games/q2p/Makefile
@@ -36,7 +36,7 @@ SDLGL_DESC=	Build SDL OpenGL renderer
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 USES+=		jpeg
 USE_GL=		glu
 .endif
@@ -46,7 +46,7 @@ USE_SDL=	sdl
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 MAKE_ENV+=	BUILD_Q2P=YES
 PLIST_SUB+=	CLIENT=""
 Q2BIN+=		${PORTNAME}
diff --git a/games/q2pro/Makefile b/games/q2pro/Makefile
index faf754ed12a7..92c269ac278a 100644
--- a/games/q2pro/Makefile
+++ b/games/q2pro/Makefile
@@ -62,7 +62,7 @@ PLIST_SUB+=	GAME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGL}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 USES+=		jpeg
 USE_GL=		gl
 ALL_TARGET+=	ref_newgl
diff --git a/games/q3cellshading/Makefile b/games/q3cellshading/Makefile
index eba9322987a2..2f8417ada0f7 100644
--- a/games/q3cellshading/Makefile
+++ b/games/q3cellshading/Makefile
@@ -39,7 +39,7 @@ SMP_CLIENT_DESC=	Build SMP (threaded) client
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 .for arch in ${ARCH}
diff --git a/games/qmars/Makefile b/games/qmars/Makefile
index 8979c06cd9da..bd13d97a10bb 100644
--- a/games/qmars/Makefile
+++ b/games/qmars/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Quicker Mars - heavily optimized mars simulator
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
+BUILD_DEPENDS=	makedepend:devel/makedepend
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/quadra/Makefile b/games/quadra/Makefile
index 81a5a8af9c99..46e40e8950dc 100644
--- a/games/quadra/Makefile
+++ b/games/quadra/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://kbrandt.sdf-eu.org/FreeBSD/distfiles/ \
 MAINTAINER=	kbrandt@sdf-eu.org
 COMMENT=	Tetris like game with multiplayer support
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		autoreconf gmake localbase tar:bzip2
 USE_SDL=	sdl
diff --git a/games/quadrapassel/Makefile b/games/quadrapassel/Makefile
index c4dc392b636f..599436e997c6 100644
--- a/games/quadrapassel/Makefile
+++ b/games/quadrapassel/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome quadrapassel
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/quake-data/Makefile.include b/games/quake-data/Makefile.include
index a34a825adb69..e588d1969e03 100644
--- a/games/quake-data/Makefile.include
+++ b/games/quake-data/Makefile.include
@@ -13,5 +13,5 @@ PLIST_SUB+=	Q1DIR="${Q1DIR:S|${LOCALBASE}/||}"
 SUB_LIST+=	Q1DIR="${Q1DIR}"
 
 .if ${PORTNAME} != data
-RUN_DEPENDS+=	${Q1DIR}/id1/pak0.pak:${PORTSDIR}/games/quake-data
+RUN_DEPENDS+=	${Q1DIR}/id1/pak0.pak:games/quake-data
 .endif
diff --git a/games/quake-dpmod/Makefile b/games/quake-dpmod/Makefile
index 802e04cdeb67..a8ad8a8c1493 100644
--- a/games/quake-dpmod/Makefile
+++ b/games/quake-dpmod/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	darkplacesmod${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake 1 modification (for DarkPlaces)
 
-RUN_DEPENDS=	darkplaces>=0:${PORTSDIR}/games/darkplaces
+RUN_DEPENDS=	darkplaces>=0:games/darkplaces
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/games/quake-source/Makefile.include b/games/quake-source/Makefile.include
index f26a935444e8..78fe7287c74a 100644
--- a/games/quake-source/Makefile.include
+++ b/games/quake-source/Makefile.include
@@ -5,5 +5,5 @@ Q1SRCDIR=	${LOCALBASE}/share/quake-source
 .if ${PORTNAME} == "source"
 DATADIR=	${Q1SRCDIR}
 .else
-RUN_DEPENDS+=	${Q1SRCDIR}/v101qc/progs.src:${PORTSDIR}/games/quake-source
+RUN_DEPENDS+=	${Q1SRCDIR}/v101qc/progs.src:games/quake-source
 .endif
diff --git a/games/quake2-data/Makefile.include b/games/quake2-data/Makefile.include
index 427ad958a7a2..d661c1f72c08 100644
--- a/games/quake2-data/Makefile.include
+++ b/games/quake2-data/Makefile.include
@@ -58,5 +58,5 @@ SUB_LIST+=	Q2DIR="${Q2DIR}"
 
 .if ${PORTNAME} != data
 # Not depending on the particular .pak file since they are OPTIONS-dependent
-RUN_DEPENDS+=	quake2-data>0:${PORTSDIR}/games/quake2-data
+RUN_DEPENDS+=	quake2-data>0:games/quake2-data
 .endif
diff --git a/games/quake2-extras/Makefile b/games/quake2-extras/Makefile
index edfffa9aaf3c..01e7a75b45ba 100644
--- a/games/quake2-extras/Makefile
+++ b/games/quake2-extras/Makefile
@@ -34,7 +34,7 @@ SKINS_DESC=		Install high quality skins
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRETEXTURE_FULL} || ${PORT_OPTIONS:MSKINS}
-BUILD_DEPENDS+=	nwreckdum:${PORTSDIR}/archivers/nwreckdum
+BUILD_DEPENDS+=	nwreckdum:archivers/nwreckdum
 PLIST_FILES+=	%%Q2DIR%%/baseq2/pak20.pak
 .endif
 
diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile
index 8e99d6c08d17..566ed2245573 100644
--- a/games/quake2lnx/Makefile
+++ b/games/quake2lnx/Makefile
@@ -107,7 +107,7 @@ PLIST_SUB+=	SDLCLIENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSVGA}
-LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvga.so:graphics/svgalib
 MAKE_ARGS+=	BUILD_SVGA=YES
 REF_TARGETS+=	soft
 PLIST_SUB+=	SVGA=""
@@ -116,7 +116,7 @@ PLIST_SUB+=	SVGA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAA}
-LIB_DEPENDS+=	libaa.so:${PORTSDIR}/graphics/aalib
+LIB_DEPENDS+=	libaa.so:graphics/aalib
 MAKE_ARGS+=	BUILD_AA=YES
 REF_TARGETS+=	softaa
 PLIST_SUB+=	AA=""
@@ -164,7 +164,7 @@ PLIST_SUB+=	CTF="@comment "
 
 .if ${PORT_OPTIONS:MRETEXTURE}
 MAKE_ARGS+=	BUILD_RETEXTURE=YES
-RUN_DEPENDS+=	${Q2DIR}/baseq2/pak10.pak:${PORTSDIR}/games/quake2-extras
+RUN_DEPENDS+=	${Q2DIR}/baseq2/pak10.pak:games/quake2-extras
 .endif
 
 .if ${PORT_OPTIONS:MJOYSTICK}
diff --git a/games/quake2max/Makefile b/games/quake2max/Makefile
index 8937bcdc6fc4..e28c1f516849 100644
--- a/games/quake2max/Makefile
+++ b/games/quake2max/Makefile
@@ -16,7 +16,7 @@ COMMENT=	OpenGL-only Quake II engine modification
 
 LICENSE=	GPLv2
 
-EXTRACT_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
+EXTRACT_DEPENDS=	unrar:archivers/unrar
 
 USES=		gmake tar:bzip2
 USE_XORG=	xxf86dga
@@ -42,7 +42,7 @@ SDLGL_DESC=	Build SDL OpenGL renderer
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL}
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 USES+=		jpeg
 USE_GL=		glu
 .endif
diff --git a/games/quake3-data/Makefile.include b/games/quake3-data/Makefile.include
index d8e5c757cf93..d60f46aa925d 100644
--- a/games/quake3-data/Makefile.include
+++ b/games/quake3-data/Makefile.include
@@ -13,5 +13,5 @@ PLIST_SUB+=	Q3DIR="${Q3DIR:S|${LOCALBASE}/||}"
 SUB_LIST+=	Q3DIR="${Q3DIR}"
 
 .if ${PORTNAME} != data
-RUN_DEPENDS+=	${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
+RUN_DEPENDS+=	${Q3DIR}/baseq3/pak1.pk3:games/quake3-data
 .endif
diff --git a/games/quake3/Makefile b/games/quake3/Makefile
index cc95ade64234..9a8128379b36 100644
--- a/games/quake3/Makefile
+++ b/games/quake3/Makefile
@@ -41,7 +41,7 @@ VM_ARCHS=	i386 powerpc
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 .for i in ${ARCH}
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 10b385f77699..b955276a8aef 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Cleaned up copy of the GPL'ed Quake 1 source code
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -62,7 +62,7 @@ PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} --with-vorbis=${LOCALBASE}
 PLIST_SUB+=	VORBIS=""
 .else
@@ -71,7 +71,7 @@ PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MXMMS}
-LIB_DEPENDS+=	libxmms.so:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=	libxmms.so:multimedia/xmms
 CONFIGURE_ARGS+=--with-xmms-prefix=${LOCALBASE}
 PLIST_SUB+=	XMMS=""
 .else
diff --git a/games/quantumminigolf/Makefile b/games/quantumminigolf/Makefile
index a9e608caca45..9e3e913f210c 100644
--- a/games/quantumminigolf/Makefile
+++ b/games/quantumminigolf/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Computer game visualizing quantum mechanics
 
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
+		libfftw3.so:math/fftw3
 
 USES=		gmake compiler:env
 USE_SDL=	sdl ttf
diff --git a/games/qudos/Makefile b/games/qudos/Makefile
index 54531244453f..e82561c74d42 100644
--- a/games/qudos/Makefile
+++ b/games/qudos/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+=	${mod}="@comment "
 .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL}
 USES+=		jpeg
 USE_GL=		glu
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 .endif
 
 .if ${PORT_OPTIONS:MSDL} || ${PORT_OPTIONS:MSDLGL}
@@ -73,7 +73,7 @@ USE_SDL=	sdl
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 MAKE_ENV+=	BUILD_QUAKE2=YES
 PLIST_SUB+=	CLIENT=""
 Q2BIN+=		${PORTNAME}
diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile
index 4ab7f8cff221..9f4ba659e708 100644
--- a/games/r1q2/Makefile
+++ b/games/r1q2/Makefile
@@ -61,7 +61,7 @@ PLIST_SUB+=	GAME="@comment "
 USES+=		jpeg
 USE_GL=		gl
 USE_SDL=	sdl
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 ALL_TARGET+=	ref_gl
 PLIST_SUB+=	REF_GL=""
 .else
diff --git a/games/railroad-rampage/Makefile b/games/railroad-rampage/Makefile
index cdc9d5d101d1..ad6e78850569 100644
--- a/games/railroad-rampage/Makefile
+++ b/games/railroad-rampage/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	RailroadRampage_${PORTVERSION}_Linux
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Tower Defence-like Arcade and Strategy combination
 
-BUILD_DEPENDS=	bgdc:${PORTSDIR}/devel/bennugd-core \
-		${LOCALBASE}/lib/bennugd/libmod_grproc.so:${PORTSDIR}/devel/bennugd-modules
-RUN_DEPENDS=	bgdi:${PORTSDIR}/devel/bennugd-core \
-		${LOCALBASE}/lib/bennugd/libmod_grproc.so:${PORTSDIR}/devel/bennugd-modules
+BUILD_DEPENDS=	bgdc:devel/bennugd-core \
+		${LOCALBASE}/lib/bennugd/libmod_grproc.so:devel/bennugd-modules
+RUN_DEPENDS=	bgdi:devel/bennugd-core \
+		${LOCALBASE}/lib/bennugd/libmod_grproc.so:devel/bennugd-modules
 
 USES=		zip
 
diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile
index eb7852bf2eb6..83cf24a1369c 100644
--- a/games/redeclipse/Makefile
+++ b/games/redeclipse/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Single-player and multi-player first-person ego-shooter
 LICENSE=	MIT ZLIB
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	redeclipse-data>=1.5.3:${PORTSDIR}/games/redeclipse-data
+RUN_DEPENDS=	redeclipse-data>=1.5.3:games/redeclipse-data
 
 BROKEN_sparc64=	does not build on sparc64
 
diff --git a/games/retroarch/Makefile b/games/retroarch/Makefile
index 70f0584516d0..74b7cd955438 100644
--- a/games/retroarch/Makefile
+++ b/games/retroarch/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Cross-platform entertainment system based on libretro API
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon \
-		libdrm.so:${PORTSDIR}/graphics/libdrm
+LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
+		libdrm.so:graphics/libdrm
 
 OPTIONS_DEFINE=	FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO
 OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO
@@ -23,14 +23,14 @@ NETPLAY_DESC=	Peer-to-peer netplay
 PYTHON_DESC=	Script support in shaders
 FBO_DESC=	OpenGL render-to-texture
 
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ENABLE=ffmpeg
 OSS_CONFIGURE_ENABLE=	oss
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 SDL_USE=		SDL=sdl2 image2
 SDL_CONFIGURE_ON=	--disable-sdl --enable-sdl2
@@ -42,10 +42,10 @@ OPENAL_CONFIGURE_ENABLE=al
 NETPLAY_CONFIGURE_ENABLE=	netplay
 PYTHON_CONFIGURE_ENABLE=python
 PYTHON_USES=		python:3
-V4L_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
-V4L_BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
+V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 V4L_CONFIGURE_ENABLE=	v4l2
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
 FBO_CONFIGURE_ENABLE=	fbo
 
diff --git a/games/rnd_jue/Makefile b/games/rnd_jue/Makefile
index 59491b340ba3..0ed7ede6e81b 100644
--- a/games/rnd_jue/Makefile
+++ b/games/rnd_jue/Makefile
@@ -22,8 +22,8 @@ COMMENT=	Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff jue
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
-EXTRACT_DEPENDS+=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS+=	libsmpeg.so:multimedia/smpeg
+EXTRACT_DEPENDS+=${UNZIP_CMD}:archivers/unzip
 
 USES=		gmake
 USE_SDL=	image mixer net sdl
diff --git a/games/robocalypto/Makefile b/games/robocalypto/Makefile
index 9ab0ae05d175..8261ff3050ec 100644
--- a/games/robocalypto/Makefile
+++ b/games/robocalypto/Makefile
@@ -19,7 +19,7 @@ COMMENT=	PYGGEL demo game
 
 LICENSE=	PD
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyggel>=0:${PORTSDIR}/graphics/py-pyggel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyggel>=0:graphics/py-pyggel
 
 WRKSRC=		${WRKDIR}/PYGGEL-V${DISTVERSION}${DISTVERSIONSUFFIX}/Robocalypto
 
diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index 0dc87f5adb3b..e6e36de81e3d 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Addictive rock-dodging greeblie-killing platform game
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:audio/libogg
 
 USES=		gmake
 USE_SDL=	mixer image sdl
diff --git a/games/rocksndiamonds-data/Makefile b/games/rocksndiamonds-data/Makefile
index cfbb5bae7f4d..fdc7c9780d2f 100644
--- a/games/rocksndiamonds-data/Makefile
+++ b/games/rocksndiamonds-data/Makefile
@@ -27,8 +27,8 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Additional Player Levels for Rocks'n'Diamonds and R'n'D jue
 
-EXTRACT_DEPENDS+=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
-		7z:${PORTSDIR}/archivers/p7zip
+EXTRACT_DEPENDS+=${UNZIP_CMD}:archivers/unzip \
+		7z:archivers/p7zip
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -64,13 +64,13 @@ PREFIX=		/usr/local
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRnD}
-RUN_DEPENDS+=	rocksndiamonds:${PORTSDIR}/games/rocksndiamonds
+RUN_DEPENDS+=	rocksndiamonds:games/rocksndiamonds
 DATADIR=	${PREFIX}/share/rocksndiamonds
 DATADIR1=	${PREFIX}/share/rnd_jue
 .endif
 
 .if ${PORT_OPTIONS:MRnD_jue}
-RUN_DEPENDS+=	rnd_jue:${PORTSDIR}/games/rnd_jue
+RUN_DEPENDS+=	rnd_jue:games/rnd_jue
 DATADIR=	${PREFIX}/share/rnd_jue
 DATADIR1=	${PREFIX}/share/rocksndiamonds
 .endif
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index e40dc4e7a921..6f0115408110 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -26,8 +26,8 @@ COMMENT=	Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
+EXTRACT_DEPENDS=${UNZIP_CMD}:archivers/unzip
 
 USES=		gmake iconv
 USE_SDL=	image mixer net sdl
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index 1f82ede64c7f..c98139b0fded 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Robot programming game for UNIX
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS=	gsed:textproc/gsed
 
 USES=		gettext gmake perl5 pkgconfig python tar:bzip2
 USE_GNOME=	gtk20
diff --git a/games/scare/Makefile b/games/scare/Makefile
index e056c47b5d7d..11199647e578 100644
--- a/games/scare/Makefile
+++ b/games/scare/Makefile
@@ -25,8 +25,8 @@ USES=		zip
 
 PLIST_FILES=	bin/scare
 
-XGLK_BUILD_DEPENDS=	${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
-XGLK_RUN_DEPENDS=	${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
+XGLK_BUILD_DEPENDS=	${LOCALBASE}/lib/libxglk.a:games/xglk
+XGLK_RUN_DEPENDS=	${LOCALBASE}/lib/libxglk.a:games/xglk
 XGLK_ALL_TARGET=	scare glkscare
 XGLK_PLIST_FILES=	bin/glkscare
 
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 070f1b84555f..3dd9ad73a43b 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -13,11 +13,11 @@ COMMENT=	3D version of the classic DOS game Scorched Earth
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libpng.so:graphics/png \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	MYSQL
 
diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index a931c0c8fc0b..248475e98ec7 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rogue-like game
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	${DATADIR}/config/scourge.cfg:${PORTSDIR}/games/scourge-data
+LIB_DEPENDS=	libfreetype.so:print/freetype2
+RUN_DEPENDS=	${DATADIR}/config/scourge.cfg:games/scourge-data
 
 USES=		autoreconf gettext gmake
 USE_GL=		gl
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index a4725418715f..2429f5f1c1ed 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Tools for use with the SCUMMVM game emulator
 LICENSE=	GPLv2
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-		flac:${PORTSDIR}/audio/flac \
-		oggenc:${PORTSDIR}/audio/vorbis-tools
+BUILD_DEPENDS=	lame:audio/lame \
+		flac:audio/flac \
+		oggenc:audio/vorbis-tools
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis
 
 USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 86f506129737..6003672af28e 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -32,25 +32,25 @@ OPTIONS_DEFINE=	VORBIS MP3 PNG FLAC FLUIDSYNTH MT32EMU DOCS
 MT32EMU_DESC=	MT-32 emulator
 OPTIONS_DEFAULT=	VORBIS MP3 PNG MT32EMU
 
-VORBIS_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-			libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
+			libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ON=	--with-ogg-prefix=${LOCALBASE} \
 			--with-vorbis-prefix=${LOCALBASE}
 VORBIS_CONFIGURE_OFF=	--disable-vorbis
 
-MP3_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MP3_LIB_DEPENDS=	libmad.so:audio/libmad
 MP3_CONFIGURE_ON=	--with-mad-prefix=${LOCALBASE}
 MP3_CONFIGURE_OFF=	--disable-mad
 
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ON=	--with-png-prefix=${LOCALBASE}
 PNG_CONFIGURE_OFF=	--disable-png
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ON=	--with-flac-prefix=${LOCALBASE}
 FLAC_CONFIGURE_OFF=	--disable-flac
 
-FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_ON=	--with-fluidsynth-prefix=${LOCALBASE}
 FLUIDSYNTH_CONFIGURE_OFF=	--disable-fluidsynth
 
diff --git a/games/sdb/Makefile b/games/sdb/Makefile
index 193fa751d9a3..3b97a33d0bf8 100644
--- a/games/sdb/Makefile
+++ b/games/sdb/Makefile
@@ -45,7 +45,7 @@ PLIST_SUB+=	MODEL_SUFFIX="md2"
 .else
 # big-endian requires different set of models
 DISTFILES+=	shotgun-debugger-1.0.mac-ppc.zip
-EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 PLIST_SUB+=	MODEL_SUFFIX="md2b"
 
 post-extract:
diff --git a/games/sdlquake2/Makefile b/games/sdlquake2/Makefile
index 188565d634c3..1b6ddc0c5831 100644
--- a/games/sdlquake2/Makefile
+++ b/games/sdlquake2/Makefile
@@ -28,7 +28,7 @@ PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 
-CLIENT_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+CLIENT_LIB_DEPENDS=	libpng.so:graphics/png
 CLIENT_USES=		jpeg
 CLIENT_USE=		GL=yes
 CLIENT_USE=		SDL=sdl
diff --git a/games/sea-defender/Makefile b/games/sea-defender/Makefile
index 710d1681d489..929c444a6571 100644
--- a/games/sea-defender/Makefile
+++ b/games/sea-defender/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Simple missile command clone
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libglfw.a:${PORTSDIR}/graphics/glfw2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libglfw.a:graphics/glfw2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	snoutmate
diff --git a/games/searchandrescue/Makefile b/games/searchandrescue/Makefile
index 8c8d3017dfde..0390caabb9f8 100644
--- a/games/searchandrescue/Makefile
+++ b/games/searchandrescue/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME:tl}/Program/
 MAINTAINER=	jessefrgsmith@yahoo.ca
 COMMENT=	Flight simulator in which the player rescues people
 
-RUN_DEPENDS=	${LOCALBASE}/share/searchandrescue/human.ini:${PORTSDIR}/games/searchandrescue-data
+RUN_DEPENDS=	${LOCALBASE}/share/searchandrescue/human.ini:games/searchandrescue-data
 
 USE_SDL=	mixer
 USE_XORG=	x11 xau xdmcp xext xmu xpm xxf86vm
diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile
index 3353f8eea192..38a36c03af6c 100644
--- a/games/shaaft/Makefile
+++ b/games/shaaft/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Shaaft-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL 3D falling block game similar to Blockout
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 CONFLICTS=	criticalmass-*
 
diff --git a/games/sjeng/Makefile b/games/sjeng/Makefile
index 1a19d0ce9e44..efe3d7fd989c 100644
--- a/games/sjeng/Makefile
+++ b/games/sjeng/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Sjeng-Free-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chess engine supporting chess variations
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/games/slade/Makefile b/games/slade/Makefile
index 19b353aad937..9c41cfe3986d 100644
--- a/games/slade/Makefile
+++ b/games/slade/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Modern editor for Doom-engine based games and source ports
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	libsfml-system.so:${PORTSDIR}/devel/sfml \
-		libftgl.so:${PORTSDIR}/graphics/ftgl \
-		libfreeimage.so:${PORTSDIR}/graphics/freeimage
+BUILD_DEPENDS=	zip:archivers/zip
+LIB_DEPENDS=	libsfml-system.so:devel/sfml \
+		libftgl.so:graphics/ftgl \
+		libfreeimage.so:graphics/freeimage
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sirjuddington
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/slade share/slade3/slade.pk3
 OPTIONS_DEFINE=	FLUIDSYNTH
 OPTIONS_DEFAULT=	FLUIDSYNTH
 
-FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_OFF=	-DNO_FLUIDSYNTH:BOOL=ON
 
 post-patch:
diff --git a/games/slune/Makefile b/games/slune/Makefile
index b87f8b51ceba..782f7ab54c30 100644
--- a/games/slune/Makefile
+++ b/games/slune/Makefile
@@ -13,11 +13,11 @@ COMMENT=	3D game. includes racing, car-crashing, and lots of action
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcal3d.so:${PORTSDIR}/graphics/cal3d
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openal>0:${PORTSDIR}/audio/py-openal \
-		${PYTHON_PKGNAMEPREFIX}vorbis>0:${PORTSDIR}/audio/py-vorbis \
-		${PYTHON_PKGNAMEPREFIX}soya3d>0:${PORTSDIR}/graphics/py-soya3d \
-		${PYTHON_PKGNAMEPREFIX}py2play>0:${PORTSDIR}/net-p2p/py-py2play
+LIB_DEPENDS=	libcal3d.so:graphics/cal3d
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal \
+		${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \
+		${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d \
+		${PYTHON_PKGNAMEPREFIX}py2play>0:net-p2p/py-py2play
 
 USES=		dos2unix gettext python tar:bzip2
 DOS2UNIX_GLOB=	*.po *.mo
diff --git a/games/sol/Makefile b/games/sol/Makefile
index 542728a8c427..0895691d455b 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Solitaire card game for X Window System
 
-LIB_DEPENDS=	libshhopt.so.1:${PORTSDIR}/devel/libshhopt \
-		libshhmsg.so.1:${PORTSDIR}/devel/libshhmsg \
-		libxalloc.so.1:${PORTSDIR}/devel/libxalloc \
-		libshhcards.so.1:${PORTSDIR}/games/libshhcards
+LIB_DEPENDS=	libshhopt.so.1:devel/libshhopt \
+		libshhmsg.so.1:devel/libshhmsg \
+		libxalloc.so.1:devel/libxalloc \
+		libshhcards.so.1:games/libshhcards
 
 CONFLICTS=	gnome-games-*
 
diff --git a/games/solarus-quest-editor/Makefile b/games/solarus-quest-editor/Makefile
index 9b55e084f868..bcf25c7efbb6 100644
--- a/games/solarus-quest-editor/Makefile
+++ b/games/solarus-quest-editor/Makefile
@@ -12,12 +12,12 @@ COMMENT=	GUI to create and modify quests for the Solarus engine
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/license_gpl.txt
 
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		liblua-5.1.so:${PORTSDIR}/lang/lua51 \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libsolarus.so:${PORTSDIR}/games/solarus
+LIB_DEPENDS=	libphysfs.so:devel/physfs \
+		libmodplug.so:audio/libmodplug \
+		liblua-5.1.so:lang/lua51 \
+		libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg \
+		libsolarus.so:games/solarus
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	christopho
diff --git a/games/solarus/Makefile b/games/solarus/Makefile
index 77d08354f3d0..f9b1659fc8d3 100644
--- a/games/solarus/Makefile
+++ b/games/solarus/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Zelda-like 2D game engine
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		liblua-5.1.so:${PORTSDIR}/lang/lua51 \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libphysfs.so:devel/physfs \
+		libmodplug.so:audio/libmodplug \
+		liblua-5.1.so:lang/lua51 \
+		libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg
 
 CMAKE_ARGS+=	-DSOLARUS_USE_LUAJIT=OFF
 
diff --git a/games/solarwolf/Makefile b/games/solarwolf/Makefile
index 45145de7f115..5e6ef9014242 100644
--- a/games/solarwolf/Makefile
+++ b/games/solarwolf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Action/arcade game originally based of SolarFox on the Atari 2600
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/lgpl.txt
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
 
 USES=		python:2
 
diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile
index 4b71838e03b2..f36913fb2d68 100644
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Word game to test your English vocabulary skills
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 CXXFLAGS+=	-fPIC
 USES=		gettext iconv qmake
diff --git a/games/spring/Makefile b/games/spring/Makefile
index be891c1d9583..d5c947b6ef92 100644
--- a/games/spring/Makefile
+++ b/games/spring/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Project aiming to create a new and versatile RTS Engine
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libIL.so:${PORTSDIR}/graphics/devil \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
-BUILD_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libboost_thread.so:devel/boost-libs \
+		libIL.so:graphics/devil \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
+BUILD_DEPENDS=	7z:archivers/p7zip
 
 # XXX: it should be possible to build it on i386, investigate
 # (currently link fails on undefined reference to __sync_fetch_and_add_8)
@@ -67,16 +67,16 @@ PR_DOWNLOADER_DESC=	Map and game downloader
 
 MANPAGES_CMAKE_ON=	-DCREATE_MAN_PAGES:BOOL=true -DMANDIR:STRING="man"
 MANPAGES_CMAKE_OFF=	-DCREATE_MAN_PAGES:BOOL=false
-MANPAGES_BUILD_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip \
-			asciidoc:${PORTSDIR}/textproc/asciidoc \
-			xsltproc:${PORTSDIR}/textproc/libxslt \
-			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-			bash:${PORTSDIR}/shells/bash
+MANPAGES_BUILD_DEPENDS=	7z:archivers/p7zip \
+			asciidoc:textproc/asciidoc \
+			xsltproc:textproc/libxslt \
+			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			bash:shells/bash
 MANPAGES_DOCS_ON=	-DUSERDOCS_PLAIN:BOOL=true
 MANPAGES_DOCS_OFF=	-DUSERDOCS_PLAIN:BOOL=false
 CXXFLAGS+=	-Wno-deprecated		# Too much noise
 
-PR_DOWNLOADER_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl
+PR_DOWNLOADER_LIB_DEPENDS=libcurl.so:ftp/curl
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile
index 653e2ead6c2a..ae011e93a48f 100644
--- a/games/springlobby/Makefile
+++ b/games/springlobby/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Cross-platform lobby client for the Spring RTS project
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	spring:${PORTSDIR}/games/spring
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+RUN_DEPENDS=	spring:games/spring
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libboost_thread.so:devel/boost-libs
 
 USES=		cmake compiler:c++11-lib pkgconfig tar:bzip2
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
@@ -38,11 +38,11 @@ NLS_USES=		gettext
 
 SOUND_CMAKE_ON=		-DOPTION_SOUND:BOOL=ON
 SOUND_CMAKE_OFF=	-DOPTION_SOUND:BOOL=OFF
-SOUND_LIB_DEPENDS=	libalure.so:${PORTSDIR}/audio/alure
+SOUND_LIB_DEPENDS=	libalure.so:audio/alure
 SOUND_USES=		openal:al
 
 NOTIFY_CMAKE_ON=	-DOPTION_NOTIFY=ON
 NOTIFY_CMAKE_OFF=	-DOPTION_NOTIFY=OFF
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 .include <bsd.port.mk>
diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile
index f518c774eae7..ad3c994dcc95 100644
--- a/games/stepmania-devel/Makefile
+++ b/games/stepmania-devel/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Rhythm game simulator
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/Docs/Licenses.txt
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libpng.so:graphics/png
 
 USE_GITHUB=	yes
 
@@ -34,23 +34,23 @@ OPTIONS_DEFINE=		ALSA DOCS FFMPEG GTK2 JACK MAD PULSEAUDIO VAAPI VORBIS
 OPTIONS_DEFAULT=	GTK2 MAD VORBIS
 OPTIONS_SUB=		yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_OFF=		-DWITH_ALSA:BOOL=OFF
-FFMEPG_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMEPG_BUILD_DEPENDS=	yasm:devel/yasm
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_ON=	-DWITH_SYSTEM_FFMPEG:BOOL=ON
 FFMPEG_CMAKE_OFF=	-DWITH_FFMPEG:BOOL=OFF
 GTK2_USE=		gnome=gtk20
 GTK2_CMAKE_ON=		-DWITH_GTK2:BOOL=ON
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	-DWITH_JACK:BOOL=OFF
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CMAKE_OFF=		-DWITH_MP3:BOOL=OFF
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE:BOOL=OFF
-VAAPI_LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CMAKE_OFF=	-DVA_FOUND:BOOL=OFF
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CMAKE_OFF=	-DWITH_OGG:BOOL=OFF
 
 pre-build:
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index ac864d1e3277..993b3cd26ccc 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -59,11 +59,11 @@ MAKE_ARGS+=	TILES=y \
 		GL_INCLUDE="-I ${LOCALBASE}/include/GL"
 PLIST_SUB+=	SDL=""
 PKGNAMESUFFIX=	-sdl
-BUILD_DEPENDS+=	fc-list:${PORTSDIR}/x11-fonts/fontconfig \
-		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS+=	fc-list:x11-fonts/fontconfig \
+		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 USE_SDL=	sdl2 image2
 USE_GL=		yes
 .else
@@ -73,7 +73,7 @@ PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSOUND}
-RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS+=	sox:audio/sox
 .endif
 
 .if empty(PORT_OPTIONS:MLUA_BINDINGS)
diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile
index 87bf1b964852..c23db15bfd85 100644
--- a/games/stormbaancoureur/Makefile
+++ b/games/stormbaancoureur/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.stolk.org/stormbaancoureur/download/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simulated obstacle course for automobiles
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
-		${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
+		${LOCALBASE}/lib/libode.a:devel/ode
 
 USE_GL=		glut
 
@@ -27,8 +27,8 @@ PORTDATA=	*
 OPTIONS_DEFINE=	ALSA DOCS
 OPTIONS_DEFAULT=ALSA
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_MAKE_ENV=		ALSA_LIBS="-lasound"
 ALSA_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-src-common-soundenginealsa.cxx \
 			${FILESDIR}/extra-patch-src-common-soundenginealsa.h
diff --git a/games/stransball2/Makefile b/games/stransball2/Makefile
index 7951f9129ecb..72f5f983afcf 100644
--- a/games/stransball2/Makefile
+++ b/games/stransball2/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION:C/\.//}-linux
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Sequel to Transball and Transball 2 THRUST-type games
 
-LIB_DEPENDS=	libSGE.so:${PORTSDIR}/devel/sdl_sge
+LIB_DEPENDS=	libSGE.so:devel/sdl_sge
 
 USES=		gmake dos2unix zip
 DOS2UNIX_FILES=	sources/main.cpp
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index bcda192bf344..6562a3e8b383 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Free cross-platform real-time strategy gaming engine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtolua++-${LUA_VER}.so:${PORTSDIR}/lang/tolua++
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtolua++-${LUA_VER}.so:lang/tolua++
 
 USE_GL=		gl glu
 USE_SDL=	sdl
@@ -30,20 +30,20 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH DOCS
 OPTIONS_DEFAULT=MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH
 
-MIKMOD_LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 MIKMOD_CMAKE_ON=	-DWITH_MIKMOD:BOOL=ON
 MIKMOD_CMAKE_OFF=	-DWITH_MIKMOD:BOOL=OFF
 
 MNG_DESC=		MNG image library support
-MNG_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
+MNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 MNG_CMAKE_ON=		-DWITH_MNG:BOOL=ON
 MNG_CMAKE_OFF=		-DWITH_MNG:BOOL=OFF
 
-THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CMAKE_ON=	-DWITH_THEORA:BOOL=ON
 THEORA_CMAKE_OFF=	-DWITH_THEORA:BOOL=OFF
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CMAKE_ON=	-DWITH_OGGVORBIS:BOOL=ON
 VORBIS_CMAKE_OFF=	-DWITH_OGGVORBIS:BOOL=OFF
 
@@ -52,7 +52,7 @@ X11_USE=		XORG=x11
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON
 X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF
 
-FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_ON=	-DWITH_FLUIDSYNTH:BOOL=ON
 FLUIDSYNTH_CMAKE_OFF=	-DWITH_FLUIDSYNTH:BOOL=OFF
 
diff --git a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile
index 2fecb094d4d9..49adfa494a61 100644
--- a/games/super_methane_brothers/Makefile
+++ b/games/super_methane_brothers/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Port of the Amiga platform game of the same name
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libclan23Core.so:${PORTSDIR}/devel/clanlib
+LIB_DEPENDS=	libclan23Core.so:devel/clanlib
 
 USES=		execinfo gmake pkgconfig tar:tgz
 USE_GCC=	yes
diff --git a/games/supertux2/Makefile b/games/supertux2/Makefile
index 341a3b10bd31..529b3900b5e9 100644
--- a/games/supertux2/Makefile
+++ b/games/supertux2/Makefile
@@ -9,10 +9,10 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Side-scroller game similar to Super Mario Brothers
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/smart_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/smart_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libphysfs.so:devel/physfs \
+		libcurl.so:ftp/curl \
+		libvorbis.so:audio/libvorbis
 
 BROKEN_FreeBSD_10=	does not build on 10.x
 
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 28890a234ccf..2f0f50d122de 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Free 3D kart racing game
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
+		libogg.so:audio/libogg \
+		libcurl.so:ftp/curl \
+		libpng.so:graphics/png
 
 USES=		alias cmake compiler:c++11-lib dos2unix gettext \
 		gmake jpeg openal:al pkgconfig tar:xz
@@ -41,7 +41,7 @@ OPTIONS_DEFAULT=FRIBIDI XRANDR
 FRIBIDI_DESC=		Support for right-to-left languages
 FRIBIDI_CMAKE_ON=	-DUSE_FRIBIDI=YES
 FRIBIDI_CMAKE_OFF=	-DUSE_FRIBIDI=NO
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 
 XRANDR_DESC=		Use xrandr instead of vidmode
 XRANDR_CMAKE_ON=	-DUSE_XRANDR=YES
diff --git a/games/swell-foop/Makefile b/games/swell-foop/Makefile
index 577e784d4672..496873d28918 100644
--- a/games/swell-foop/Makefile
+++ b/games/swell-foop/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome swell-foop
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+BUILD_DEPENDS=	vala:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libclutter-gtk-1.0.so:graphics/clutter-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/tali/Makefile b/games/tali/Makefile
index b1a8b86b7ded..26bc1fb876ec 100644
--- a/games/tali/Makefile
+++ b/games/tali/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome tali
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 4d2aba6deed4..96554513db26 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	3-D network tank game that uses OpenGL/Mesa
 
-BUILD_DEPENDS=	libaux>=1.0:${PORTSDIR}/graphics/libaux
+BUILD_DEPENDS=	libaux>=1.0:graphics/libaux
 
 USES=		gmake
 ALL_TARGET=	linux-mesa-elf
diff --git a/games/tanks-of-freedom/Makefile b/games/tanks-of-freedom/Makefile
index 95e0b3ba04ab..c09f73c4b538 100644
--- a/games/tanks-of-freedom/Makefile
+++ b/games/tanks-of-freedom/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Indie Turn Based Strategy in Isometric Pixel Art
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	godot:${PORTSDIR}/devel/godot
+RUN_DEPENDS=	godot:devel/godot
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	w84death
diff --git a/games/tbe/Makefile b/games/tbe/Makefile
index d95c48f60caf..9928bb3bbc8d 100644
--- a/games/tbe/Makefile
+++ b/games/tbe/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	games
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The Butterfly Effect
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	${LOCALBASE}/bin/unzip:archivers/unzip
 
 USES=		cmake compiler:c++11-lib execinfo gmake tar:tgz
 USE_QT4=	gui linguisttools_build moc_build qmake_build rcc_build \
diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile
index 5414fdb299a9..64463a4e9742 100644
--- a/games/tecnoballz/Makefile
+++ b/games/tecnoballz/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Brick breaker (Arkanoid-like game)
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libsmpeg.so:${PORTSDIR}/multimedia/smpeg \
-		libtinyxml.so:${PORTSDIR}/textproc/tinyxml
+LIB_DEPENDS=	libmikmod.so:audio/libmikmod \
+		libvorbisfile.so:audio/libvorbis \
+		libogg.so:audio/libogg \
+		libsmpeg.so:multimedia/smpeg \
+		libtinyxml.so:textproc/tinyxml
 
 USES=		autoreconf gmake tar:tgz
 USE_SDL=	sdl mixer image
diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index 9360b66e36e7..775191a0797f 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Platform game featuring buggers equipped with weapons
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 CPE_VERSION=	${PORTVERSION:C/^0\.//}
 
diff --git a/games/tenebrae/Makefile b/games/tenebrae/Makefile
index 3501c6b85bf6..d8f11ac6de18 100644
--- a/games/tenebrae/Makefile
+++ b/games/tenebrae/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	${PORTNAME}_src${EXTRACT_SUFX} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake engine with lighting similar to that in Doom III
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake dos2unix zip
 USE_GL=		glu
diff --git a/games/textmaze/Makefile b/games/textmaze/Makefile
index d57f626326cc..2db206506c21 100644
--- a/games/textmaze/Makefile
+++ b/games/textmaze/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_v${PORTVERSION}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Generates mazes on a text terminal and lets you traverse them
 
-RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses
 
 USES=		shebangfix perl5
 NO_BUILD=	yes
diff --git a/games/thegrind/Makefile b/games/thegrind/Makefile
index ae33f4a3b869..30e45bf28833 100644
--- a/games/thegrind/Makefile
+++ b/games/thegrind/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Simple game about escaping from work
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libradius-engine.a:${PORTSDIR}/graphics/radius-engine
-LIB_DEPENDS=	liblua-5.1.so:${PORTSDIR}/lang/lua51 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libphysfs.so.1:${PORTSDIR}/devel/physfs
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	${LOCALBASE}/lib/libradius-engine.a:graphics/radius-engine
+LIB_DEPENDS=	liblua-5.1.so:lang/lua51 \
+		libpng.so:graphics/png \
+		libphysfs.so.1:devel/physfs
+RUN_DEPENDS=	zip:archivers/zip
 
 USES=		pkgconfig
 USE_SDL=	sdl sound
diff --git a/games/thudboard/Makefile b/games/thudboard/Makefile
index 396003113454..327866c4e2c1 100644
--- a/games/thudboard/Makefile
+++ b/games/thudboard/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.million.nl/file/
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	The Discworld Boardgame Board
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 NO_WRKSUBDIR=	yes
 USES=		python
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index d7c194626edb..6f424f326b4f 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Version of the card game solitaire
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
 
 USES=		shebangfix tar:tgz
 SHEBANG_FILES=	pictures/generate_mini_pictures
diff --git a/games/tome4/Makefile b/games/tome4/Makefile
index 33a4d4464520..2ff53a9a5609 100644
--- a/games/tome4/Makefile
+++ b/games/tome4/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Epic tactical turn-based roguelike adventure
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	premake4:${PORTSDIR}/devel/premake4
-LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+BUILD_DEPENDS=	premake4:devel/premake4
+LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 
 DESKTOP_ENTRIES="ToME 4" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;RolePlaying;" ""
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index cc9809053486..db863a4bb919 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -14,10 +14,10 @@ LICENSE=	GPLv2
 
 MAKE_JOBS_UNSAFE=	yes
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe gmake openal:al,alut shebangfix tar:bzip2
 CPE_VENDOR=	bernhard_wymann
diff --git a/games/toycars/Makefile b/games/toycars/Makefile
index cd47ab52fbe8..3bc6137b76f9 100644
--- a/games/toycars/Makefile
+++ b/games/toycars/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Physics-based 2D racing game
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 USES=		gmake
 USE_SDL=	image sdl
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index eda0710f78ef..edac9a3c0b59 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -15,8 +15,8 @@ COMMENT=	SDL-based Marble Madness clone
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libguile.so:lang/guile
+RUN_DEPENDS=	bash:shells/bash
 
 USE_GL=		gl
 USE_SDL=	image mixer sdl ttf
diff --git a/games/traingame/Makefile b/games/traingame/Makefile
index 7005840391d8..9e449c523f0c 100644
--- a/games/traingame/Makefile
+++ b/games/traingame/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Game about Trains
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libxerces-c.so:textproc/xerces-c3 \
+		libboost_filesystem.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nickg
diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile
index ec0f4e79629f..4b2716c77d79 100644
--- a/games/tremulous/Makefile
+++ b/games/tremulous/Makefile
@@ -71,7 +71,7 @@ USE_XORG=	x11 xxf86dga
 .  endif
 # Vorbis
 .  if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 MAKE_ENV+=	USE_CODEC_VORBIS=1
 .  endif
 .endif
@@ -100,7 +100,7 @@ PLIST_SUB+=	GAMELIBS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMASTER_SERVER}
-LIB_DEPENDS+=	libtdb.so:${PORTSDIR}/databases/tdb
+LIB_DEPENDS+=	libtdb.so:databases/tdb
 MAKE_ENV+=	BUILD_MASTER_SERVER=1
 PLIST_SUB+=	MASTER_SERVER=""
 .else
diff --git a/games/trenchbroom/Makefile b/games/trenchbroom/Makefile
index 05cce61878a6..55b7249b9f36 100644
--- a/games/trenchbroom/Makefile
+++ b/games/trenchbroom/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Cross-platform level editor for Quake-engine based games
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfreeimage.so:${PORTSDIR}/graphics/freeimage
+LIB_DEPENDS=	libfreeimage.so:graphics/freeimage
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kduske
diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile
index 7b6e977e5eca..2a52154a69fc 100644
--- a/games/trigger-rally/Makefile
+++ b/games/trigger-rally/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/trigger-rally/trigger-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Rally car racing game
 
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
-RUN_DEPENDS=	${DATADIR}/trigger.config.defs:${PORTSDIR}/games/trigger-data
+BUILD_DEPENDS=	jam:devel/jam
+LIB_DEPENDS=	libphysfs.so:devel/physfs
+RUN_DEPENDS=	${DATADIR}/trigger.config.defs:games/trigger-data
 
 USES=		openal:al,alut tar:bzip2
 USE_SDL=	sdl image
diff --git a/games/trophy/Makefile b/games/trophy/Makefile
index 84021081c2d3..85d9baa52c2f 100644
--- a/games/trophy/Makefile
+++ b/games/trophy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Single player racing game
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libclanCore.so:${PORTSDIR}/devel/clanlib1
+LIB_DEPENDS=	libclanCore.so:devel/clanlib1
 
 USES=		pkgconfig
 
diff --git a/games/ttraffic/Makefile b/games/ttraffic/Makefile
index 20b06f044cff..fdd194d58c8c 100644
--- a/games/ttraffic/Makefile
+++ b/games/ttraffic/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://alpha.luc.ac.be/Research/Algebra/Members/Ttraffic/ \
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	TTraffic - A Tcl/Tk version of Rush Hour
 
-BUILD_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+BUILD_DEPENDS=	wish8.4:x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
 
 NO_BUILD=	yes
 USES=		shebangfix perl5
diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index 84ecbc24a995..ecd3e4e1937f 100644
--- a/games/tux-aqfh/Makefile
+++ b/games/tux-aqfh/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Tuxedo The Penguin: A Quest for Herring
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
 
 USES=		gmake
 USE_GL=		glut
diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index 008910151a8a..82b0d0f8a668 100644
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Racing game starring Tux
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
 
 USES=		gmake
 USE_GL=		gl
diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index 0a585c6e5709..7230ab5bfed1 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Graphical tool to change TuxPaint settings
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.txt
 
-LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
-RUN_DEPENDS=	tuxpaint:${PORTSDIR}/games/tuxpaint
+LIB_DEPENDS=	libpaper.so:print/libpaper \
+		libfltk.so:x11-toolkits/fltk
+RUN_DEPENDS=	tuxpaint:games/tuxpaint
 
 USES=		gettext gmake
 MAKE_ARGS=	PREFIX="${PREFIX}" \
diff --git a/games/tuxpaint-fonts/Makefile b/games/tuxpaint-fonts/Makefile
index 591f18051da8..820b3087f9f6 100644
--- a/games/tuxpaint-fonts/Makefile
+++ b/games/tuxpaint-fonts/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	#
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TuxPaint Localized Fonts
 
-RUN_DEPENDS=	tuxpaint>=0.9.21:${PORTSDIR}/games/tuxpaint
+RUN_DEPENDS=	tuxpaint>=0.9.21:games/tuxpaint
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/tuxpaint-stamps/Makefile b/games/tuxpaint-stamps/Makefile
index 943cdf04e24f..24a1c350338d 100644
--- a/games/tuxpaint-stamps/Makefile
+++ b/games/tuxpaint-stamps/Makefile
@@ -12,7 +12,7 @@ COMMENT=	TuxPaint Stamps
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.txt
 
-RUN_DEPENDS=	tuxpaint:${PORTSDIR}/games/tuxpaint
+RUN_DEPENDS=	tuxpaint:games/tuxpaint
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile
index c32ec6f578ad..8bead808b02c 100644
--- a/games/tuxpaint/Makefile
+++ b/games/tuxpaint/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Drawing program designed for young children
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.txt
 
-LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libpaper.so:${PORTSDIR}/print/libpaper
-RUN_DEPENDS=	anytopnm:${PORTSDIR}/graphics/netpbm \
-		bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libfribidi.so:converters/fribidi \
+		libpaper.so:print/libpaper
+RUN_DEPENDS=	anytopnm:graphics/netpbm \
+		bash:shells/bash
 
 USES=		gettext gmake gperf pkgconfig shebangfix
 SHEBANG_FILES=	src/tuxpaint-import.sh
diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index 4b45e6c34a4d..2dc64650cb73 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Shufflepuck Cafe Clone
 BROKEN=		unfetchable
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis \
+		libfreetype.so:print/freetype2
 
 USE_SDL=	sdl
 USES=		gmake jpeg
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index bda207cda0fd..d9370eaf8601 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -18,7 +18,7 @@ BROKEN=		unfetchable
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS=	gsed:textproc/gsed
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION}
 
diff --git a/games/ufoai-data/Makefile b/games/ufoai-data/Makefile
index 75f6acc16e7f..69ccba4c39a1 100644
--- a/games/ufoai-data/Makefile
+++ b/games/ufoai-data/Makefile
@@ -20,7 +20,7 @@ LICENSE_NAME_CCbySA3=	Creative Commons Attribution-ShareAlike 3.0 Unported
 LICENSE_TEXT_CCbySA3=	See http://creativecommons.org/licenses/by-sa/3.0/
 LICENSE_PERMS_CCbySA3=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 MANUAL_PACKAGE_BUILD=	huge (1GiB)
 
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index 584744aba4c9..20f604ac7856 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -12,14 +12,14 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Strategy game featuring tactical combat
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libxvidcore.so:${PORTSDIR}/multimedia/xvid \
-		libmxml.so:${PORTSDIR}/textproc/mxml
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/ufoai-data
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libpng.so:graphics/png \
+		libcurl.so:ftp/curl \
+		libtheora.so:multimedia/libtheora \
+		libxvidcore.so:multimedia/xvid \
+		libmxml.so:textproc/mxml
+BUILD_DEPENDS=	zip:archivers/zip
+RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/base/default.cfg:games/ufoai-data
 
 USE_GL=		yes
 USE_SDL=	sdl image mixer ttf
@@ -68,7 +68,7 @@ PLIST_SUB+=	UFO2MAP="@comment "
 .if ${PORT_OPTIONS:MUFORADIANT}
 CONFIGURE_ARGS+=--enable-uforadiant
 USE_GNOME+=	gtk20 glib20 gtksourceview2 libxml2
-LIB_DEPENDS+=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS+=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 RADIANT_FILES=	colours.xml game.xml input.xml mapdef.template menu.xml user.xml
 RADIANT_DIRS=	bitmaps i18n prefabs sourceviewer
 PLIST_SUB+=	UFORADIANT=""
diff --git a/games/uhexen/Makefile b/games/uhexen/Makefile
index 0cd8079a57ef..6871e3f4ad05 100644
--- a/games/uhexen/Makefile
+++ b/games/uhexen/Makefile
@@ -19,7 +19,7 @@ PLIST_FILES=	bin/uhexen
 OPTIONS_DEFINE=	MUSIC
 OPTIONS_DEFAULT=	MUSIC
 MUSIC_DESC=	In-game MIDI music support
-MUSIC_RUN_DEPENDS=	${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity
+MUSIC_RUN_DEPENDS=	${LOCALBASE}/lib/timidity/goemon.cfg:audio/timidity
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/uhexen2-extras/Makefile b/games/uhexen2-extras/Makefile
index 39a6eba92d0e..f2baabf0a660 100644
--- a/games/uhexen2-extras/Makefile
+++ b/games/uhexen2-extras/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hexen II source port extras (demos, mods, etc)
 
-RUN_DEPENDS=	uhexen2>0:${PORTSDIR}/games/uhexen2
+RUN_DEPENDS=	uhexen2>0:games/uhexen2
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/games/uhexen2/Makefile b/games/uhexen2/Makefile
index f0b98455ee64..138a851dcd16 100644
--- a/games/uhexen2/Makefile
+++ b/games/uhexen2/Makefile
@@ -39,31 +39,31 @@ OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT_i386=	ASM
 OPTIONS_SUB=		yes
 
-ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+ASM_BUILD_DEPENDS=	nasm:devel/nasm
 ASM_MAKE_ARGS_OFF=	USE_X86_ASM=no
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_MAKE_ARGS=		USE_CODEC_FLAC=yes
 HEXEN2_DESC=		Build Hexen II clients and servers
 HEXEN2_MAKE_ARGS=	BUILD_HEXEN2=yes
 HW_DESC=		Build HexenWorld clients and servers
 HW_DISTFILES=		hexenworld-pakfiles-0.15${EXTRACT_SUFX}:hw
 HW_MAKE_ARGS=		BUILD_HW=yes
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_MAKE_ARGS=		MP3LIB=mad
-MIKMOD_LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 MIDMOD_MAKE_ARGS=	USE_CODEC_MIKMOD=yes
 MP3LIB_DESC=		MP3 audio codec
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_MAKE_ARGS=	MP3LIB=mpg123
-OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_MAKE_ARGS_OFF=	USE_CODEC_OGG=no
-OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile
+OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile
 OPUS_MAKE_ARGS=		USE_CODEC_OPUS=yes
 OPUS_IMPLIES=		OGG
-TREMOR_LIB_DEPENDS=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
+TREMOR_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor
 TREMOR_MAKE_ARGS=	VORBISLIB=tremor
 TREMOR_IMPLIES=		OGG
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_MAKE_ARGS=	VORBISLIB=vorbis
 VORBIS_IMPLIES=		OGG
 VORBISLIB_DESC=		Vorbis audio codec
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index 6ed43cc30264..731e37e55abd 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Racing game with elaborate stunts
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 
 USES=		gettext openal:al,alut pkgconfig
 USE_GL=		gl glu
diff --git a/games/unknown-horizons/Makefile b/games/unknown-horizons/Makefile
index 90d9255de2e4..b7a30e088090 100644
--- a/games/unknown-horizons/Makefile
+++ b/games/unknown-horizons/Makefile
@@ -9,12 +9,12 @@ CATEGORIES=	games
 MAINTAINER=	fiziologus@gmail.com
 COMMENT=	Real time simulation game
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/fife/__init__.py:${PORTSDIR}/games/py-fife \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}gdbm>0:${PORTSDIR}/databases/py-gdbm
+BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+		${LOCALBASE}/bin/xsltproc:textproc/libxslt
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/fife/__init__.py:games/py-fife \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index 66331ca7ce0b..b2da80ea88e0 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Port of the original Star Control 2 for 3DO consoles
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libpth.so:${PORTSDIR}/devel/pth
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libmikmod.so:audio/libmikmod \
+		libpth.so:devel/pth
 
 USES=		gmake pkgconfig
 USE_SDL=	image sdl
diff --git a/games/valyriatear/Makefile b/games/valyriatear/Makefile
index 1fdc62831934..aed8deb70225 100644
--- a/games/valyriatear/Makefile
+++ b/games/valyriatear/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Open Source J-RPG based on the Hero of Allacrost engine
 # GPLv2, GPLv3 (with font exception), OFL-1.1, CC0, CC-BY-3, and CC-BY-SA-3.
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libvorbis.so:audio/libvorbis \
+		libpng.so:graphics/png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Bertram25
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index c6fc343e1d40..264f83ccccf5 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Automotive simulation framework
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
+		libpng.so:graphics/png
 
 USES=		libtool openal:al,alut pkgconfig
 USE_XORG=	sm ice x11 xi xext xmu
diff --git a/games/vavoom-extras/Makefile b/games/vavoom-extras/Makefile
index 1eea5c5405aa..2b5ddb5f8566 100644
--- a/games/vavoom-extras/Makefile
+++ b/games/vavoom-extras/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Doom, Doom II, Heretic, Hexen, and Strife source port (extras)
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	vavoom:${PORTSDIR}/games/vavoom
+RUN_DEPENDS=	vavoom:games/vavoom
 
 DATADIR=	${PREFIX}/share/vavoom
 
diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index ceedd9b77b5f..e491a34febe7 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Doom, Doom II, Heretic, Hexen, and Strife source port
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cmake dos2unix jpeg tar:bzip2
 DOS2UNIX_REGEX=	((.*\.(c|cpp|h|s|asm|inc|vc|ls|acs|cfg|txt|vs|mak|mgw"))$$|\/(makefile\..*|makefile|Makefile)$$)
@@ -33,7 +33,7 @@ CFLAGS:=	${CFLAGS:N-fno-strict-aliasing}
 CXXFLAGS:=	${CFLAGS:N-fno-strict-aliasing}
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:audio/flac
 CMAKE_ARGS+=	-DWITH_FLAC=Y
 .else
 CMAKE_ARGS+=	-DWITH_FLAC=N
@@ -51,14 +51,14 @@ PLIST_SUB+=	LAUNCHER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=	libmad.so:audio/libmad
 CMAKE_ARGS+=	-DWITH_LIBMAD=Y
 .else
 CMAKE_ARGS+=	-DWITH_LIBMAD=N
 .endif
 
 .if ${PORT_OPTIONS:MMIKMOD}
-LIB_DEPENDS+=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS+=	libmikmod.so:audio/libmikmod
 CMAKE_ARGS+=	-DWITH_MIKMOD=Y
 .else
 CMAKE_ARGS+=	-DWITH_MIKMOD=N
@@ -76,7 +76,7 @@ CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 CMAKE_ARGS+=	-DWITH_VORBIS=Y
 .else
 CMAKE_ARGS+=	-DWITH_VORBIS=N
diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile
index 4f09d7f151f4..38646b920844 100644
--- a/games/vegastrike/Makefile
+++ b/games/vegastrike/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Open source 3D space simulator
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${DATADIR}/vegastrike.ico:${PORTSDIR}/games/vegastrike-data
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg
+RUN_DEPENDS=	${DATADIR}/vegastrike.ico:games/vegastrike-data
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+		libexpat.so:textproc/expat2 \
+		libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg
 
 USES=		dos2unix gmake openal:al pkgconfig python tar:bzip2
 GNU_CONFIGURE=	yes
@@ -46,7 +46,7 @@ OPTIONS_DEFINE=	MESHER
 MESHER_DESC=	Enable mesher modelling tool
 
 MESHER_PLIST_FILES=	bin/mesher
-MESHER_LIB_DEPENDS=	libOgreMain.so:${PORTSDIR}/graphics/ogre3d
+MESHER_LIB_DEPENDS=	libOgreMain.so:graphics/ogre3d
 MESHER_CONFIGURE_ENABLE=	ogre
 
 post-patch:
diff --git a/games/violetland/Makefile b/games/violetland/Makefile
index 9859776ec047..a77a3675b3e3 100644
--- a/games/violetland/Makefile
+++ b/games/violetland/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	games
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Top-down survival shoot 'em up
 
-LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ooxi
diff --git a/games/vultures-eye/Makefile b/games/vultures-eye/Makefile
index 0a84f52e2100..a3182fd82088 100644
--- a/games/vultures-eye/Makefile
+++ b/games/vultures-eye/Makefile
@@ -21,7 +21,7 @@ LICENSE_NAME=	NETHACK GENERAL PUBLIC LICENSE
 LICENSE_FILE=	${WRKSRC}/dat/license
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/vulture-${PORTVERSION}/nethack
 CONFIGURE_WRKSRC=	${WRKSRC}/sys/unix
@@ -37,7 +37,7 @@ DESKTOP_ENTRIES="Vulture's Eye" "" "" "vulture-nethack" "" ""
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>0:textproc/flex
 MAKE_ENV+=	FLEX="${LOCALBASE}/bin/flex"
 .else
 MAKE_ENV+=	FLEX="${FLEX}"
diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index 9bdf0972ab26..c775503393b4 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	stratagus:${PORTSDIR}/games/stratagus \
-		ffmpeg2theora:${PORTSDIR}/multimedia/ffmpeg2theora \
-		cdparanoia:${PORTSDIR}/audio/cdparanoia
-BUILD_DEPENDS=	stratagus:${PORTSDIR}/games/stratagus
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	stratagus:games/stratagus \
+		ffmpeg2theora:multimedia/ffmpeg2theora \
+		cdparanoia:audio/cdparanoia
+BUILD_DEPENDS=	stratagus:games/stratagus
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cmake pkgconfig
 CMAKE_ARGS=	-DGAMEDIR:STRING="bin" \
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index ab69c7c6000e..1aeff3815044 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://download.gna.org/${PORTNAME}/ \
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Turn-based artillery game with free software mascots
 
-LIB_DEPENDS=	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libxml++-2.6.so:textproc/libxml++26 \
+		libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	cxx_present=yes
@@ -28,7 +28,7 @@ OPTIONS_SUB=	yes
 DEBUG_CONFIGURE_ENABLE=	debug logging
 
 FRIBIDI_DESC=	Enable bi-directional unicode support
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	fribidi
 
 NLS_USES=		gettext
diff --git a/games/warsow-data/Makefile b/games/warsow-data/Makefile
index 8af85838c07a..ed8764f48362 100644
--- a/games/warsow-data/Makefile
+++ b/games/warsow-data/Makefile
@@ -38,7 +38,7 @@ MAPPACK_DESC=		Install community map pack
 .if ${PORT_OPTIONS:MMAPPACK}
 MAPPACK_FILE=	warsow_comunity_map_pack_01.zip
 DISTFILES+=	${MAPPACK_FILE}:mappack
-EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 PORTDATA+=	previews
 
 post-extract:
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index 0205abb0ad15..3e788305caea 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Futuristic, fast-paced first person shooter
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${DATADIR}/basewsw/data1_15.pk3:${PORTSDIR}/games/warsow-data
+LIB_DEPENDS=	libcurl.so:ftp/curl
+RUN_DEPENDS=	${DATADIR}/basewsw/data1_15.pk3:games/warsow-data
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -58,11 +58,11 @@ DESKTOP_ENTRIES="Warsow" "${COMMENT}" \
 	"Game;Shooter;" false
 
 . if ${PORT_OPTIONS:MFTLIB} || ${PORT_OPTIONS:MREF_GL}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 . endif
 
 . if ${PORT_OPTIONS:MFTLIB}
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	libfreetype.so:print/freetype2
 ALL_TARGET+=	ftlib
 . endif
 
@@ -74,7 +74,7 @@ ALL_TARGET+=	ref_gl
 . endif
 
 . if ${PORT_OPTIONS:MQF} || ${PORT_OPTIONS:MOPENAL}
-LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisfile.so:audio/libvorbis
 . endif
 
 . if ${PORT_OPTIONS:MQF}
@@ -93,7 +93,7 @@ ALL_TARGET+=	irc
 
 . if ${PORT_OPTIONS:MCIN}
 ALL_TARGET+=	cin
-BUILD_DEPENDS+=	${LOCALBASE}/include/theora/theoradec.h:${PORTSDIR}/multimedia/libtheora
+BUILD_DEPENDS+=	${LOCALBASE}/include/theora/theoradec.h:multimedia/libtheora
 . endif
 
 . if ${PORT_OPTIONS:MXRANDR}
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index ad03b32d0d16..12e83babe41a 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -11,16 +11,16 @@ COMMENT=	Innovative 3D real-time strategy game
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
+BUILD_DEPENDS=	zip:archivers/zip \
+		unzip:archivers/unzip
+LIB_DEPENDS=	libphysfs.so:devel/physfs \
+		libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis \
+		libtheora.so:multimedia/libtheora \
+		libfribidi.so:converters/fribidi \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 
 USES=		bison compiler:c++11-lang gmake localbase openal:al pkgconfig tar:xz # actually, old gcc fails on unknown -W flag
 GNU_CONFIGURE=	yes
@@ -44,7 +44,7 @@ OPTIONS_SUB=	yes
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-MANPAGES_BUILD_DEPENDS=	a2x:${PORTSDIR}/textproc/asciidoc
+MANPAGES_BUILD_DEPENDS=	a2x:textproc/asciidoc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||g; s|-R$$found_dir||g' ${WRKSRC}/configure
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 8398ebff2a25..ae7237221863 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -15,10 +15,10 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
+		libboost_thread.so:devel/boost-libs \
+		libpng.so:graphics/png \
+		libfontconfig.so:x11-fonts/fontconfig
 
 LDFLAGS+=	-L${LOCALBASE}/lib -lboost_system
 
@@ -50,7 +50,7 @@ CAMPAIGN_DESC=	Campaign server
 CAMPAIGN_CMAKE_ON=-DENABLE_CAMPAIGN_SERVER=on
 DOCS_CMAKE_OFF=	-DDOCDIR=none
 FRIBIDI_DESC=	Bidirectional support
-FRIBIDI_LIB_DEPENDS=libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=libfribidi.so:converters/fribidi
 FRIBIDI_CMAKE_OFF=-DENABLE_FRIBIDI=off
 LOWMEM_DESC=	Reduce memory usage (disables animations)
 LOWMEM_CMAKE_ON=-DENABLE_LOW_MEM=on
@@ -58,7 +58,7 @@ NLS_USES=	gettext
 NLS_CMAKE_ON=	-DLOCALEDIR=${PREFIX}/share/locale
 NLS_CMAKE_OFF=	-DENABLE_NLS=off
 NOTIFY_DESC=	Desktop notifications
-NOTIFY_LIB_DEPENDS=libdbus-1.so:${PORTSDIR}/devel/dbus
+NOTIFY_LIB_DEPENDS=libdbus-1.so:devel/dbus
 NOTIFY_CMAKE_OFF=-DENABLE_NOTIFICATIONS=off
 OPENMP_DESC=	OpenMP support
 OPENMP_USES=	compiler:openmp
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index 459afae34807..6d4cb741ac61 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Realtime strategy game inspired by Settlers II
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libpng.so:graphics/png
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USES=		cmake:outsource compiler:c++11-lib execinfo gettext \
 		lua:51 tar:bzip2 python:build
diff --git a/games/wizznic/Makefile b/games/wizznic/Makefile
index 38f979439c75..cd3821a4b57b 100644
--- a/games/wizznic/Makefile
+++ b/games/wizznic/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Implementation of the arcade classic Puzznic
 
 LICENSE=	GPLv3+
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 
diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index ec95965037b8..915044541805 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -16,7 +16,7 @@ BROKEN=		unfetchable
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess
+RUN_DEPENDS=	${LOCALBASE}/bin/gnuchess:games/gnuchess
 
 USE_XORG=	xpm
 
diff --git a/games/wmqstat/Makefile b/games/wmqstat/Makefile
index 8ab10c750042..a7510a863cf1 100644
--- a/games/wmqstat/Makefile
+++ b/games/wmqstat/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Dockapp for monitoring of various Internet game servers
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
+RUN_DEPENDS=	qstat:games/qstat
 
 USE_XORG=	xpm x11 xext
 
diff --git a/games/wop/Makefile b/games/wop/Makefile
index f01d2916eb7a..4d97e5e4cea0 100644
--- a/games/wop/Makefile
+++ b/games/wop/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Free real-time Worms game
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
+BUILD_DEPENDS=	makedepend:devel/makedepend
 
 USES=		tar:bzip2 gmake
 USE_SDL=	sdl net mixer ttf image
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile
index 89b954a1d941..b20bdc5c87da 100644
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@@ -60,7 +60,7 @@ MAKE_ENV+=	HAVE_VM_COMPILED=true
 .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP_CLIENT}
 # cURL
 .  if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 MAKE_ENV+=	USE_CURL=1
 .    if ${PORT_OPTIONS:MCURL_DLOPEN}
 MAKE_ENV+=	USE_CURL_DLOPEN=1
@@ -79,7 +79,7 @@ USE_GL=		glu
 USE_SDL=	sdl
 # Vorbis
 .  if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 MAKE_ENV+=	USE_CODEC_VORBIS=1
 .  endif
 .endif
@@ -101,7 +101,7 @@ MAKE_ENV+=	BUILD_GAME_SO=1
 .endif
 
 .if ${PORT_OPTIONS:MMP3}
-LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=	libmad.so:audio/libmad
 MAKE_ENV+=	USE_CODEC_MP3=1
 .endif
 
diff --git a/games/wxlauncher/Makefile b/games/wxlauncher/Makefile
index eb7410704a6d..4b01fe4ccba9 100644
--- a/games/wxlauncher/Makefile
+++ b/games/wxlauncher/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Multi-platform launcher for the Freespace 2 Source Code Project
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GPLv2.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdown \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	scp-fs2open
diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile
index 5bfba9acc086..b8336f0a2e03 100644
--- a/games/wyrmgus/Makefile
+++ b/games/wyrmgus/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Modified Stratagus engine for Wyrmsun
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtolua++-${LUA_VER}.so:${PORTSDIR}/lang/tolua++
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtolua++-${LUA_VER}.so:lang/tolua++
 
 USE_GITHUB=     yes
 GH_ACCOUNT=     Andrettin
@@ -36,20 +36,20 @@ PLIST_FILES=	bin/${PORTNAME} \
 OPTIONS_DEFINE=	MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH PHYSFS DOCS
 OPTIONS_DEFAULT=VORBIS X11
 
-MIKMOD_LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 MIKMOD_CMAKE_ON=	-DWITH_MIKMOD:BOOL=ON
 MIKMOD_CMAKE_OFF=	-DWITH_MIKMOD:BOOL=OFF
 
 MNG_DESC=		MNG image library support
-MNG_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
+MNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 MNG_CMAKE_ON=		-DWITH_MNG:BOOL=ON
 MNG_CMAKE_OFF=		-DWITH_MNG:BOOL=OFF
 
-THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CMAKE_ON=	-DWITH_THEORA:BOOL=ON
 THEORA_CMAKE_OFF=	-DWITH_THEORA:BOOL=OFF
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CMAKE_ON=	-DWITH_OGGVORBIS:BOOL=ON
 VORBIS_CMAKE_OFF=	-DWITH_OGGVORBIS:BOOL=OFF
 
@@ -58,7 +58,7 @@ X11_USE=		XORG=x11
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON
 X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF
 
-FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_ON=	-DWITH_FLUIDSYNTH:BOOL=ON
 FLUIDSYNTH_CMAKE_OFF=	-DWITH_FLUIDSYNTH:BOOL=OFF
 
diff --git a/games/wyrmsun/Makefile b/games/wyrmsun/Makefile
index 82ad9e9cd598..558d392b3db2 100644
--- a/games/wyrmsun/Makefile
+++ b/games/wyrmsun/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Strategy game based on history, mythology and fiction
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-RUN_DEPENDS=	wyrmgus:${PORTSDIR}/games/wyrmgus
+RUN_DEPENDS=	wyrmgus:games/wyrmgus
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Andrettin
diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile
index a9cbe49e97c1..8eb4a5d0fc96 100644
--- a/games/xabacus/Makefile
+++ b/games/xabacus/Makefile
@@ -25,7 +25,7 @@ DESKTOP_ENTRIES="XAbacus" "" "abacus" "${PORTNAME}" "" ""
 OPTIONS_DEFINE=		ESOUND MOTIF
 OPTIONS_DEFAULT=	MOTIF
 
-ESOUND_LIB_DEPENDS_OFF=	librplay.so:${PORTSDIR}/audio/rplay
+ESOUND_LIB_DEPENDS_OFF=	librplay.so:audio/rplay
 ESOUND_USE=		gnome=esound
 ESOUND_CONFIGURE_ON=	--without-rplay --with-esound
 ESOUND_CONFIGURE_OFF=	--with-rplay --without-esound
diff --git a/games/xbattle/Makefile b/games/xbattle/Makefile
index 591982d98ef7..82de4ca0399b 100644
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@@ -18,7 +18,7 @@ LICENSE_NAME=	XBATTLE License
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	xdialog>0:${PORTSDIR}/x11/xdialog
+RUN_DEPENDS=	xdialog>0:x11/xdialog
 
 USES=		imake
 USE_XORG=	x11 xext
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index e9ef53ff0253..196af010c7ec 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	XCONTRIB/games
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11/Motif blackjack game
 
-LIB_DEPENDS=	libXm.so:${PORTSDIR}/x11-toolkits/lesstif
+LIB_DEPENDS=	libXm.so:x11-toolkits/lesstif
 
 USES=		imake tar:Z
 USE_XORG=	x11 xext xp xt xmu
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index bbc2f6c4b50c..a2d527dc6e73 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -46,7 +46,7 @@ NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 SDL_USE=		SDL=gfx,image,mixer,net,ttf,sdl
 SDL_CONFIGURE_ENABLE=	sdl
-SDL_RUN_DEPENDS=	${FONTSDIR}/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
+SDL_RUN_DEPENDS=	${FONTSDIR}/Vera.ttf:x11-fonts/bitstream-vera
 SMPF_DESC=		Support for 16 players
 SMPF_CONFIGURE_ENABLE=	SMPF
 SOUND_CONFIGURE_ENABLE=	sound
diff --git a/games/xboard-devel/Makefile b/games/xboard-devel/Makefile
index 0afb8ad2c16b..683cfd3326dd 100644
--- a/games/xboard-devel/Makefile
+++ b/games/xboard-devel/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	kalten@gmx.at
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS?=	libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango
+LIB_DEPENDS?=	libpangocairo-1.0.so:x11-toolkits/pango
 
 CONFLICTS=	xboard-[0-9]*
 
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 7527a04672d7..3a6b086f26a4 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -13,7 +13,7 @@ COMMENT?=	X frontend for Crafty, GNUChess, Chess Servers, or e-mail chess
 
 LICENSE?=	GPLv3
 
-LIB_DEPENDS?=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS?=	libcairo.so:graphics/cairo
 
 CONFLICTS?=	xboard-devel-[0-9]*
 
@@ -39,14 +39,14 @@ XAW3D_DESC=	Xaw3d GUI toolkit support (not fully supported)
 GTK2_DESC=	GTK+ 2 GUI toolkit support (experimental)
 SOUND_DESC=	Sound Output (optional)
 SOX_DESC=	SoX audio support
-CRAFTY_RUN_DEPENDS+=	crafty:${PORTSDIR}/games/crafty
-FAIRYMAX_RUN_DEPENDS+=	fairymax:${PORTSDIR}/games/fairymax
-GNUCHESS_RUN_DEPENDS+=	gnuchess:${PORTSDIR}/games/gnuchess
-KNIGHTCAP_RUN_DEPENDS+=	KnightCap:${PORTSDIR}/games/KnightCap
-PHALANX_RUN_DEPENDS+=	phalanx:${PORTSDIR}/games/phalanx
-XAW3D_DEPENDS+=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
-SOX_RUN_DEPENDS+=	play:${PORTSDIR}/audio/sox
-ALSA_RUN_DEPENDS+=	aplay:${PORTSDIR}/audio/alsa-utils
+CRAFTY_RUN_DEPENDS+=	crafty:games/crafty
+FAIRYMAX_RUN_DEPENDS+=	fairymax:games/fairymax
+GNUCHESS_RUN_DEPENDS+=	gnuchess:games/gnuchess
+KNIGHTCAP_RUN_DEPENDS+=	KnightCap:games/KnightCap
+PHALANX_RUN_DEPENDS+=	phalanx:games/phalanx
+XAW3D_DEPENDS+=	libXaw3d.so:x11-toolkits/Xaw3d
+SOX_RUN_DEPENDS+=	play:audio/sox
+ALSA_RUN_DEPENDS+=	aplay:audio/alsa-utils
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 ZIPPY_CONFIGURE_ENABLE=	zippy
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 480ab787082a..6475a461544a 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Puzzle Bobble clone for Unix/X11 platforms
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_XORG=	x11 xmu
 GNU_CONFIGURE=	yes
diff --git a/games/xcowsay/Makefile b/games/xcowsay/Makefile
index e2d95c1ac4ce..a1cb3741fa61 100644
--- a/games/xcowsay/Makefile
+++ b/games/xcowsay/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/xcowdream \
 
 OPTIONS_DEFINE=	DBUS
 
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 DBUS_CFLAGS=		-DWITH_DBUS
 DBUS_CONFIGURE_ENABLE=	dbus
 
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 0fc9dfcf3fec..935daace4329 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Multi-player networked Risk game for X11
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 NO_CDROM=	Possible trademark infringement
 
diff --git a/games/xglk/Makefile b/games/xglk/Makefile
index 9630fcd3d18b..da5ca877bd6e 100644
--- a/games/xglk/Makefile
+++ b/games/xglk/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X Windows Implementation of the Glk API
 
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile
index 5d9a82e843d1..a6ab25dbc578 100644
--- a/games/xgospel/Makefile
+++ b/games/xgospel/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://gailly.net/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 Go (weiqi, baduk) client for the Internet Go Server
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 GNU_CONFIGURE=	yes
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 3bc4a51ff6d4..b446afcee145 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tar.z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 dropping jewels game
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontdir:x11-fonts/mkfontdir
 
 USES=		fonts imake
 USE_XORG=	x11 xext
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index 29043f414d61..5eb7bb0b5019 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -12,7 +12,7 @@ COMMENT=	John Horton Conway's Game of Life
 LICENSE=	MIT GPLv2
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+RUN_DEPENDS=	gawk:lang/gawk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index 4cd21d5601a5..544cb095b7ee 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mastermind game for X Window System
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libforms.so:x11-toolkits/xforms
 
 USE_XORG=	x11 xpm
 MAKE_ENV=	GRAPHLIBS="${LDFLAGS}"
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index af4b0b6bf6ee..1de812b32a6b 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-Xaw
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	The `Athena' port of the xminesweeper game
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 USES=		imake
 USE_XORG=	x11 xaw xext xmu xt xpm sm ice
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 7ee48bd3e161..7efa7842d5f0 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Challenging 2D motocross platform game
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libxdg-basedir.so:${PORTSDIR}/x11/libxdg-basedir
-BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libcurl.so:ftp/curl \
+		libxdg-basedir.so:x11/libxdg-basedir
+BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:devel/ode
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -40,7 +40,7 @@ OPTIONS_SUB=	yes
 
 ASIAN_TTF_DESC=	Use asian TTF font
 
-ASIAN_TTF_RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/bkai00mp.ttf:${PORTSDIR}/chinese/arphicttf
+ASIAN_TTF_RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/bkai00mp.ttf:chinese/arphicttf
 ASIAN_TTF_CONFIGURE_ON=	--with-asian-ttf-file=${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf
 ASIAN_TTF_CONFIGURE_OFF=--without-asian-ttf-file
 
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 390feb3b06eb..7c8e90aba228 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://nl.dl.xonotic.org/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Fast-paced, chaotic, and intense multiplayer first person shooter
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpng.so:graphics/png
 
 MANUAL_PACKAGE_BUILD=	huge (930M)
 
@@ -37,10 +37,10 @@ OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED
 OPTIONS_DEFAULT=	CLIENT DEDICATED ENCRYPTION
 
 CLIENT_DESC=		Build client
-CLIENT_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug \
-			libtheora.so:${PORTSDIR}/multimedia/libtheora \
-			libvorbis.so:${PORTSDIR}/audio/libvorbis \
-			libogg.so:${PORTSDIR}/audio/libogg
+CLIENT_LIB_DEPENDS=	libmodplug.so:audio/libmodplug \
+			libtheora.so:multimedia/libtheora \
+			libvorbis.so:audio/libvorbis \
+			libogg.so:audio/libogg
 CLIENT_USE=		SDL=sdl
 CLIENT_ALL_TARGET=	sdl-release
 CLIENT_PLIST_FILES=	bin/${PORTNAME} share/pixmaps/${PORTNAME}.ico
@@ -56,7 +56,7 @@ DEDICATED_ALL_TARGET=	sv-release
 DEDICATED_PLIST_FILES=	bin/${PORTNAME}-dedicated
 
 ENCRYPTION_DESC=	Build encryption (required for stats submission)
-ENCRYPTION_LIB_DEPENDS=	libd0_rijndael.so:${PORTSDIR}/security/d0_blind_id
+ENCRYPTION_LIB_DEPENDS=	libd0_rijndael.so:security/d0_blind_id
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index 9bfa383a873e..d77c74441473 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Old action game
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/misc/9x18.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/misc/9x18.pcf.gz:x11-fonts/font-misc-misc
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-doublesize
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index c01bf0a0b934..cc1f3814a56a 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -14,7 +14,7 @@ COMMENT?=	Enhanced version of XPilot (server program)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 7a5e658b836b..28e842a69724 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	MIKMOD ROTATE_FIXED AIBREED
 ROTATE_FIXED_DESC=	Fix position of one blob during rotation
 AIBREED_DESC=	Allow AI breeding
 
-MIKMOD_LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 MIKMOD_CONFIGURE_ON=	--with-libmikmod-prefix=${LOCALBASE}
 
 ROTATE_FIXED_CONFIGURE_ENABLE=	rotate-fixed
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index a9c78286de26..ce379a3697a3 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Server browser for many popular 3D action games
 
-RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
+RUN_DEPENDS=	qstat:games/qstat
 
 USE_GNOME=	intlhack
 USES=		gettext gmake pkgconfig
@@ -31,7 +31,7 @@ GTK2_USE_OFF=		GNOME=gdkpixbuf
 GTK2_CONFIGURE_ENABLE=	gtk2
 
 GEOIP_CONFIGURE_ENABLE=	geoip
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 BZIP2_CONFIGURE_ENABLE=	bzip2
 
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index e135a5df9cdc..fdd392272699 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -24,7 +24,7 @@ DESKTOP_ENTRIES="XScavenger" "" "" "scavenger" "" ""
 OPTIONS_DEFINE=		ALSA
 OPTIONS_DEFAULT=	ALSA
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CFLAGS_OFF=	-DNO_ALSA
 
 post-patch-ALSA-off:
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 7cb4546e16bd..31fb7bbe1ae9 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -22,6 +22,6 @@ GNU_CONFIGURE=	yes
 
 MIKMOD_CONFIGURE_ON=	--with-libmikmod-prefix=${LOCALBASE}
 MIKMOD_CONFIGURE_OFF=	--disable-sound
-MMIKMOD_LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+MMIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 
 .include <bsd.port.mk>
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index aa1a1d4ff7a5..547ecc362cb6 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNU/gnushogi
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Japanese chess-like game for X Window System
 
-RUN_DEPENDS=	gnushogi:${PORTSDIR}/games/gnushogi
+RUN_DEPENDS=	gnushogi:games/gnushogi
 
 USE_XORG=	xt xaw x11
 GNU_CONFIGURE=	yes
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 0ffe4bc24bdb..b64799a3d244 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Cuddlesome teddy for the X desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		localbase pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/games/xvmahjongg/Makefile b/games/xvmahjongg/Makefile
index 4188a3111ca3..07ff89145aa2 100644
--- a/games/xvmahjongg/Makefile
+++ b/games/xvmahjongg/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mahjongg for XView with multicolored tiles
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile
index d81a478f3ebc..35f3b8a12bba 100644
--- a/games/xvmines/Makefile
+++ b/games/xvmines/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	XCONTRIB/../R5contrib
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple minesweeper game for X Window System
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/xye/Makefile b/games/xye/Makefile
index 0d56c8228bb2..48127c3c076a 100644
--- a/games/xye/Makefile
+++ b/games/xye/Makefile
@@ -25,7 +25,7 @@ COMMENT=	Puzzle games like sokoban or boulderdash
 
 LICENSE=	ZLIB
 
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=${UNZIP_CMD}:archivers/unzip
 
 USES=		gmake
 USE_SDL=	sdl image ttf
diff --git a/games/zaz/Makefile b/games/zaz/Makefile
index 04de9e361aad..68dae608cb55 100644
--- a/games/zaz/Makefile
+++ b/games/zaz/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Puzzle game where the player has to arrange balls in triplets
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libftgl.so:${PORTSDIR}/graphics/ftgl
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libtheora.so:multimedia/libtheora \
+		libvorbis.so:audio/libvorbis \
+		libftgl.so:graphics/ftgl
 
 USES=		desktop-file-utils pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/games/zephulor/Makefile b/games/zephulor/Makefile
index 80d903deb044..39fae5c6df4e 100644
--- a/games/zephulor/Makefile
+++ b/games/zephulor/Makefile
@@ -18,7 +18,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 RUN_DEPENDS=	${PYGAME} \
-		${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
+		${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
 
 WRKSRC=		${WRKDIR}/zephulor-source
 
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index efe36e6ea904..2b31b4bb4e28 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Z-Interpreter for X with full V6 support
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libt1.so:${PORTSDIR}/devel/t1lib \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libt1.so:devel/t1lib \
+		libpng.so:graphics/png
 
 USES=		gmake perl5
 GNU_CONFIGURE=	yes
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index 0e1aa6b6ff38..f67a3ab694d0 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	slaven@rezic.de
 COMMENT=	Route-finder for cyclists in Berlin and Brandenburg
 
-BUILD_DEPENDS=	p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C \
-		p5-CDB_File>=0:${PORTSDIR}/databases/p5-CDB_File
-RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C \
-		p5-CDB_File>=0:${PORTSDIR}/databases/p5-CDB_File
+BUILD_DEPENDS=	p5-Inline-C>=0:devel/p5-Inline-C \
+		p5-CDB_File>=0:databases/p5-CDB_File
+RUN_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk \
+		p5-Inline-C>=0:devel/p5-Inline-C \
+		p5-CDB_File>=0:databases/p5-CDB_File
 
 USES=		perl5 shebangfix
 perl_OLD_CMD=	/usr/perl5.8.0/bin/perl5.8.0 perl
diff --git a/german/bugzilla44/Makefile b/german/bugzilla44/Makefile
index d542b42b8cfc..ccff27304293 100644
--- a/german/bugzilla44/Makefile
+++ b/german/bugzilla44/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-de-${PORTVERSION}-1.utf-8
 MAINTAINER=	bz-ports@FreeBSD.org
 COMMENT=	German localization for Bugzilla
 
-RUN_DEPENDS=	bugzilla44>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla44
+RUN_DEPENDS=	bugzilla44>=${PORTVERSION}:devel/bugzilla44
 
 NO_WRKSUBDIR=	yes
 
diff --git a/german/dict/Makefile b/german/dict/Makefile
index 1e5d248e2bef..363671d7acf5 100644
--- a/german/dict/Makefile
+++ b/german/dict/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple English/German dictionary
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	agrep:${PORTSDIR}/textproc/agrep
+RUN_DEPENDS=	agrep:textproc/agrep
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/de-dict share/ger-eng.txt
diff --git a/german/ding/Makefile b/german/ding/Makefile
index 6fee711831b0..4e51a4dd992d 100644
--- a/german/ding/Makefile
+++ b/german/ding/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://ftp.tu-chemnitz.de/pub/Local/urz/ding/ \
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	A German-English dictionary program for X windows/Unix
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
-		agrep:${PORTSDIR}/textproc/agrep
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84 \
+		agrep:textproc/agrep
 
 USES=		perl5
 
diff --git a/german/geonext/Makefile b/german/geonext/Makefile
index 9167596dfbe0..8ffe5a5a7301 100644
--- a/german/geonext/Makefile
+++ b/german/geonext/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	german
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive (dynamic) elementary Geometry Software
 
-RUN_DEPENDS=	geonext>=0:${PORTSDIR}/math/geonext
+RUN_DEPENDS=	geonext>=0:math/geonext
 
 WITH_LANG=	de
 MASTERDIR=	${.CURDIR}/../../math/geonext
diff --git a/german/hunspell/Makefile b/german/hunspell/Makefile
index bd1d3dad3942..695d239a925c 100644
--- a/german/hunspell/Makefile
+++ b/german/hunspell/Makefile
@@ -14,8 +14,8 @@ COMMENT=	German hunspell dictionaries
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell \
-		hunspell:${PORTSDIR}/textproc/hunspell
+BUILD_DEPENDS=	aspell:textproc/aspell \
+		hunspell:textproc/hunspell
 
 USES=		gmake perl5 shebangfix tar:bzip2
 ALL_TARGET=	hunspell-all
diff --git a/german/mediathek/Makefile b/german/mediathek/Makefile
index 0b00c285ed94..086ec3f10f4f 100644
--- a/german/mediathek/Makefile
+++ b/german/mediathek/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	MediathekView_${PORTVERSION}
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Filme der oeff. rechtlichen Sender herunterladen und ansehen
 
-RUN_DEPENDS=	flvstreamer:${PORTSDIR}/multimedia/flvstreamer
+RUN_DEPENDS=	flvstreamer:multimedia/flvstreamer
 
 NO_BUILD=	yes
 USES=		zip:infozip
@@ -32,11 +32,11 @@ OPTIONS_DEFAULT=	VLC
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMPLAYER}
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
+RUN_DEPENDS+=	mplayer:multimedia/mplayer
 .endif
 
 .if ${PORT_OPTIONS:MVLC}
-RUN_DEPENDS+=	vlc:${PORTSDIR}/multimedia/vlc
+RUN_DEPENDS+=	vlc:multimedia/vlc
 .endif
 
 DESKTOP_ENTRIES="MediathekView" \
diff --git a/german/steak/Makefile b/german/steak/Makefile
index bec87c28386d..9524df3680e6 100644
--- a/german/steak/Makefile
+++ b/german/steak/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	Steak.${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	English <-> German dictionary under the GPL
 
-RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+RUN_DEPENDS=	ispell:textproc/aspell-ispell
 
 USES=		tar:bzip2
 MAKE_JOBS_UNSAFE=	yes
diff --git a/german/trytond28_account_de_skr03/Makefile b/german/trytond28_account_de_skr03/Makefile
index 5108ef75b7a4..caaef8521bba 100644
--- a/german/trytond28_account_de_skr03/Makefile
+++ b/german/trytond28_account_de_skr03/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (German Account Chart)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_account>=2.8.1:${PORTSDIR}/finance/trytond28_account
+RUN_DEPENDS=	trytond28_account>=2.8.1:finance/trytond28_account
 
 CONFLICTS=	trytond_account_de_skr03-2.[46].*
 
diff --git a/german/unix-connect/Makefile b/german/unix-connect/Makefile
index 55c239368340..8d17573c0696 100644
--- a/german/unix-connect/Makefile
+++ b/german/unix-connect/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.dinoex.org/pub/unix-connect/ \
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Unix-Connect - mail+news-gateway for Zconnect (tm)
 
-BUILD_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz
+BUILD_DEPENDS=	lrz:comms/lrzsz
 
 LICENSE_COMB=	multi
 LICENSE=	GPLv2 BSD3CLAUSE
diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index 91bfc4968fdb..9bb24f46758b 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	C++ 3D graphics library based on the Open Inventor 2.1 API
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsimage.so:${PORTSDIR}/graphics/simage
+LIB_DEPENDS=	libsimage.so:graphics/simage
 
 USE_GCC=	any
 USES=		openal:al libtool
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index ee6dd2472aa0..07d143a625f7 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	${DISTNAME}-demo.tgz ${DISTNAME}-doc.tgz ${DISTNAME}-src.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EZ Widget and Graphics Library
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png
 
 USE_XORG=	x11 xext
 USE_LDCONFIG=	yes
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 48c95e2ea96b..979ae8ebd886 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -12,12 +12,12 @@ MASTER_SITES=	SF \
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libjbig.so:graphics/jbigkit \
+		libjasper.so:graphics/jasper \
+		liblcms2.so:graphics/lcms2 \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	DOCS DPS FPX OPENMP Q8BIT SSE TEST WEBP WMF X11 XML
 OPTIONS_DEFAULT=OPENMP WEBP WMF X11 XML
@@ -42,10 +42,10 @@ WINDOWS_FONT_DIR?=	${LOCALBASE}/share/fonts/webfonts
 
 DPS_CONFIGURE_WITH=	dps
 DPS_IMPLIES=		X11
-DPS_LIB_DEPENDS=	libdps.so:${PORTSDIR}/x11/dgs
+DPS_LIB_DEPENDS=	libdps.so:x11/dgs
 DPS_USE=		XORG=xt
 FPX_CONFIGURE_WITH=	fpx
-FPX_LIB_DEPENDS=	libfpx.so:${PORTSDIR}/graphics/libfpx
+FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
 OPENMP_CONFIGURE_OFF=	--without-threads --disable-openmp
 OPENMP_CONFIGURE_ON=	--with-threads --enable-openmp --disable-openmp-slow
 OPENMP_USES=		compiler:openmp
@@ -53,10 +53,10 @@ Q8BIT_CONFIGURE_OFF=	--with-quantum-depth=16
 Q8BIT_CONFIGURE_ON=	--with-quantum-depth=8
 Q8BIT_PLIST_SUB=	Q=8
 Q8BIT_PLIST_SUB_OFF=	Q=16
-TEST_BUILD_DEPENDS=	webfonts>=0:${PORTSDIR}/x11-fonts/webfonts
-TEST_RUN_DEPENDS=	webfonts>=0:${PORTSDIR}/x11-fonts/webfonts
+TEST_BUILD_DEPENDS=	webfonts>=0:x11-fonts/webfonts
+TEST_RUN_DEPENDS=	webfonts>=0:x11-fonts/webfonts
 WEBP_CONFIGURE_WITH=	webp
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WMF_CONFIGURE_WITH=	wmf
 X11_CONFIGURE_WITH=	x
 X11_USE=		XORG=xext
@@ -79,9 +79,9 @@ CFLAGS+=	-msse3
 
 .if ${PORT_OPTIONS:MWMF}
 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf
+LIB_DEPENDS+=	libwmflite.so:graphics/libwmf
 .else
-LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf-nox11
+LIB_DEPENDS+=	libwmflite.so:graphics/libwmf-nox11
 .endif
 .endif
 
diff --git a/graphics/IPA/Makefile b/graphics/IPA/Makefile
index ad00b0f417bd..507fe3af6baa 100644
--- a/graphics/IPA/Makefile
+++ b/graphics/IPA/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.prima.eu.org/IPA/ CPAN/Prima/KARASIK
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image Processing Algorithms
 
-RUN_DEPENDS=	p5-Prima>1.24:${PORTSDIR}/x11-toolkits/p5-Prima
+RUN_DEPENDS=	p5-Prima>1.24:x11-toolkits/p5-Prima
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index f9252089a0ce..aeb62a6a90e5 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -35,7 +35,7 @@ COMMENT=	Image processing tools
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
 
@@ -175,7 +175,7 @@ PLIST_SUB+=		MODULES='@comment '
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
-LIB_DEPENDS+=		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=		libIlmImf.so:graphics/OpenEXR
 PLIST_SUB+=		OPENEXR=""
 . endif
 .else
@@ -187,7 +187,7 @@ PLIST_SUB+=		OPENEXR="@comment "
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . endif
-LIB_DEPENDS+=		libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
+LIB_DEPENDS+=		libdjvulibre.so:graphics/djvulibre
 PLIST_SUB+=		DJVU=""
 .else
 CONFIGURE_ARGS+=	--without-djvu
@@ -203,7 +203,7 @@ PLIST_SUB+=		JPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=		libpng.so:graphics/png
 PLIST_SUB+=		PNG=""
 .else
 CONFIGURE_ARGS+=	--without-png
@@ -211,7 +211,7 @@ PLIST_SUB+=		PNG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=		libtiff.so:graphics/tiff
 PLIST_SUB+=		TIFF=""
 .else
 CONFIGURE_ARGS+=	--without-tiff
@@ -231,14 +231,14 @@ CONFIGURE_ARGS+=	--without-gslib
 
 .if ${PORT_OPTIONS:MLQR}
 CONFIGURE_ARGS+=	--with-lqr
-LIB_DEPENDS+=		liblqr-1.so:${PORTSDIR}/graphics/liblqr-1
+LIB_DEPENDS+=		liblqr-1.so:graphics/liblqr-1
 .else
 CONFIGURE_ARGS+=	--without-lqr
 .endif
 
 .if ${PORT_OPTIONS:MFFTW}
 CONFIGURE_ARGS+=	--with-fftw
-LIB_DEPENDS+=		libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS+=		libfftw3.so:math/fftw3
 .else
 CONFIGURE_ARGS+=	--without-fftw
 .endif
@@ -250,7 +250,7 @@ CONFIGURE_ARGS+=	--without-bzlib
 
 # FPX (FlashPIX) images
 .if ${PORT_OPTIONS:MFPX}
-LIB_DEPENDS+=		libfpx.so:${PORTSDIR}/graphics/libfpx
+LIB_DEPENDS+=		libfpx.so:graphics/libfpx
 CONFIGURE_ARGS+=	--with-fpx
 PLIST_SUB+=		FPX=""
 .else
@@ -260,7 +260,7 @@ PLIST_SUB+=		FPX="@comment "
 
 # JBIG images (lossless compression for bi-level images)
 .if ${PORT_OPTIONS:MJBIG}
-LIB_DEPENDS+=		libjbig.so:${PORTSDIR}/graphics/jbigkit
+LIB_DEPENDS+=		libjbig.so:graphics/jbigkit
 PLIST_SUB+=		JBIG=""
 .else
 CONFIGURE_ARGS+=	--without-jbig
@@ -269,7 +269,7 @@ PLIST_SUB+=		JBIG="@comment "
 
 # JPEG2000 images (wavelet-based lossy compression)
 .if ${PORT_OPTIONS:MJPEG2000}
-LIB_DEPENDS+=		libopenjp2.so:${PORTSDIR}/graphics/openjpeg
+LIB_DEPENDS+=		libopenjp2.so:graphics/openjpeg
 PLIST_SUB+=		JPEG2000=""
 .else
 CONFIGURE_ARGS+=	--without-openjp2
@@ -278,7 +278,7 @@ PLIST_SUB+=		JPEG2000="@comment "
 
 # GraphViz dot graphs
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-LIB_DEPENDS+=		libgvc.so:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS+=		libgvc.so:graphics/graphviz
 CFLAGS+=		-I${LOCALBASE}/include/graphviz
 LDFLAGS+=		-L${LOCALBASE}/lib/graphviz
 .else
@@ -293,14 +293,14 @@ CONFIGURE_ARGS+=	--without-lzma
 
 # LCMS (Little CMS) color management version 2 and 1 (mutually exclusive)
 .if ${PORT_OPTIONS:MLCMS2}
-LIB_DEPENDS+=		liblcms2.so:${PORTSDIR}/graphics/lcms2
+LIB_DEPENDS+=		liblcms2.so:graphics/lcms2
 .else
 CONFIGURE_ARGS+=	--without-lcms
 .endif
 
 # Freetype (TrueType Font) support
 .if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=		libfreetype.so:print/freetype2
 CONFIGURE_ARGS+=	--with-freetype
 .else
 CONFIGURE_ARGS+=	--without-freetype
@@ -308,7 +308,7 @@ CONFIGURE_ARGS+=	--without-freetype
 
 # Webp support
 .if ${PORT_OPTIONS:MWEBP}
-LIB_DEPENDS+=		libwebp.so:${PORTSDIR}/graphics/webp
+LIB_DEPENDS+=		libwebp.so:graphics/webp
 CONFIGURE_ARGS+=	--with-webp
 PLIST_SUB+=		WEBP=""
 .else
@@ -318,7 +318,7 @@ PLIST_SUB+=		WEBP="@comment "
 
 # Fontconfig support
 .if ${PORT_OPTIONS:MFONTCONFIG}
-LIB_DEPENDS+=		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS+=		libfontconfig.so:x11-fonts/fontconfig
 CONFIGURE_ARGS+=	--with-fontconfig
 .else
 CONFIGURE_ARGS+=	--without-fontconfig
@@ -327,9 +327,9 @@ CONFIGURE_ARGS+=	--without-fontconfig
 # WMF (Windows Meta File) images
 .if ${PORT_OPTIONS:MWMF}
 . if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=		libwmf.so:${PORTSDIR}/graphics/libwmf
+LIB_DEPENDS+=		libwmf.so:graphics/libwmf
 . else
-LIB_DEPENDS+=		libwmf.so:${PORTSDIR}/graphics/libwmf-nox11
+LIB_DEPENDS+=		libwmf.so:graphics/libwmf-nox11
 . endif
 CONFIGURE_ARGS+=	--with-wmf=yes
 PLIST_SUB+=		WMF=""
@@ -340,7 +340,7 @@ PLIST_SUB+=		WMF="@comment "
 
 # SVG (Scalable Vector Graphics) requires both libxml2 and X11
 .if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=		librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+LIB_DEPENDS+=		librsvg-2.so:graphics/librsvg2
 CONFIGURE_ARGS+=	--with-rsvg
 .else
 CONFIGURE_ARGS+=	--without-rsvg
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index c9c323646a05..d8bc13a73ec3 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -40,7 +40,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 DATE=		20160225
 WRKSRC=		${WRKDIR}/${PORTNAME}-7.0.0-0
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
 
@@ -181,7 +181,7 @@ PLIST_SUB+=		MODULES='@comment '
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
-LIB_DEPENDS+=		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=		libIlmImf.so:graphics/OpenEXR
 PLIST_SUB+=		OPENEXR=""
 . endif
 .else
@@ -193,7 +193,7 @@ PLIST_SUB+=		OPENEXR="@comment "
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . endif
-LIB_DEPENDS+=		libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
+LIB_DEPENDS+=		libdjvulibre.so:graphics/djvulibre
 PLIST_SUB+=		DJVU=""
 .else
 CONFIGURE_ARGS+=	--without-djvu
@@ -209,7 +209,7 @@ PLIST_SUB+=		JPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=		libpng.so:graphics/png
 PLIST_SUB+=		PNG=""
 .else
 CONFIGURE_ARGS+=	--without-png
@@ -217,7 +217,7 @@ PLIST_SUB+=		PNG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=		libtiff.so:graphics/tiff
 PLIST_SUB+=		TIFF=""
 .else
 CONFIGURE_ARGS+=	--without-tiff
@@ -237,14 +237,14 @@ CONFIGURE_ARGS+=	--without-gslib
 
 .if ${PORT_OPTIONS:MLQR}
 CONFIGURE_ARGS+=	--with-lqr
-LIB_DEPENDS+=		liblqr-1.so:${PORTSDIR}/graphics/liblqr-1
+LIB_DEPENDS+=		liblqr-1.so:graphics/liblqr-1
 .else
 CONFIGURE_ARGS+=	--without-lqr
 .endif
 
 .if ${PORT_OPTIONS:MFFTW}
 CONFIGURE_ARGS+=	--with-fftw
-LIB_DEPENDS+=		libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS+=		libfftw3.so:math/fftw3
 .else
 CONFIGURE_ARGS+=	--without-fftw
 .endif
@@ -256,7 +256,7 @@ CONFIGURE_ARGS+=	--without-bzlib
 
 # FPX (FlashPIX) images
 .if ${PORT_OPTIONS:MFPX}
-LIB_DEPENDS+=		libfpx.so:${PORTSDIR}/graphics/libfpx
+LIB_DEPENDS+=		libfpx.so:graphics/libfpx
 CONFIGURE_ARGS+=	--with-fpx
 PLIST_SUB+=		FPX=""
 .else
@@ -266,7 +266,7 @@ PLIST_SUB+=		FPX="@comment "
 
 # JBIG images (lossless compression for bi-level images)
 .if ${PORT_OPTIONS:MJBIG}
-LIB_DEPENDS+=		libjbig.so:${PORTSDIR}/graphics/jbigkit
+LIB_DEPENDS+=		libjbig.so:graphics/jbigkit
 PLIST_SUB+=		JBIG=""
 .else
 CONFIGURE_ARGS+=	--without-jbig
@@ -275,7 +275,7 @@ PLIST_SUB+=		JBIG="@comment "
 
 # JPEG2000 images (wavelet-based lossy compression)
 .if ${PORT_OPTIONS:MJPEG2000}
-LIB_DEPENDS+=		libopenjp2.so:${PORTSDIR}/graphics/openjpeg
+LIB_DEPENDS+=		libopenjp2.so:graphics/openjpeg
 PLIST_SUB+=		JPEG2000=""
 .else
 CONFIGURE_ARGS+=	--without-openjp2
@@ -284,7 +284,7 @@ PLIST_SUB+=		JPEG2000="@comment "
 
 # GraphViz dot graphs
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-LIB_DEPENDS+=		libgvc.so:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS+=		libgvc.so:graphics/graphviz
 CFLAGS+=		-I${LOCALBASE}/include/graphviz
 LDFLAGS+=		-L${LOCALBASE}/lib/graphviz
 .else
@@ -299,14 +299,14 @@ CONFIGURE_ARGS+=	--without-lzma
 
 # LCMS (Little CMS) color management version 2 and 1 (mutually exclusive)
 .if ${PORT_OPTIONS:MLCMS2}
-LIB_DEPENDS+=		liblcms2.so:${PORTSDIR}/graphics/lcms2
+LIB_DEPENDS+=		liblcms2.so:graphics/lcms2
 .else
 CONFIGURE_ARGS+=	--without-lcms
 .endif
 
 # Freetype (TrueType Font) support
 .if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=		libfreetype.so:print/freetype2
 CONFIGURE_ARGS+=	--with-freetype
 .else
 CONFIGURE_ARGS+=	--without-freetype
@@ -314,7 +314,7 @@ CONFIGURE_ARGS+=	--without-freetype
 
 # Webp support
 .if ${PORT_OPTIONS:MWEBP}
-LIB_DEPENDS+=		libwebp.so:${PORTSDIR}/graphics/webp
+LIB_DEPENDS+=		libwebp.so:graphics/webp
 CONFIGURE_ARGS+=	--with-webp
 PLIST_SUB+=		WEBP=""
 .else
@@ -324,7 +324,7 @@ PLIST_SUB+=		WEBP="@comment "
 
 # Fontconfig support
 .if ${PORT_OPTIONS:MFONTCONFIG}
-LIB_DEPENDS+=		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS+=		libfontconfig.so:x11-fonts/fontconfig
 CONFIGURE_ARGS+=	--with-fontconfig
 .else
 CONFIGURE_ARGS+=	--without-fontconfig
@@ -333,9 +333,9 @@ CONFIGURE_ARGS+=	--without-fontconfig
 # WMF (Windows Meta File) images
 .if ${PORT_OPTIONS:MWMF}
 . if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=		libwmf.so:${PORTSDIR}/graphics/libwmf
+LIB_DEPENDS+=		libwmf.so:graphics/libwmf
 . else
-LIB_DEPENDS+=		libwmf.so:${PORTSDIR}/graphics/libwmf-nox11
+LIB_DEPENDS+=		libwmf.so:graphics/libwmf-nox11
 . endif
 CONFIGURE_ARGS+=	--with-wmf=yes
 PLIST_SUB+=		WMF=""
@@ -346,7 +346,7 @@ PLIST_SUB+=		WMF="@comment "
 
 # SVG (Scalable Vector Graphics) requires both libxml2 and X11
 .if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=		librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+LIB_DEPENDS+=		librsvg-2.so:graphics/librsvg2
 CONFIGURE_ARGS+=	--with-rsvg
 .else
 CONFIGURE_ARGS+=	--without-rsvg
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index f4dd72ee4981..a8b673829712 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -17,7 +17,7 @@ COMMENT=	High dynamic-range (HDR) image file format
 LICENSE=	BSD3CLAUSE
 
 # exact version required to avoid hard-to-debug issues
-LIB_DEPENDS=	libImath-2_2.so.12:${PORTSDIR}/graphics/ilmbase
+LIB_DEPENDS=	libImath-2_2.so.12:graphics/ilmbase
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/graphics/R-cran-DiagrammeR/Makefile b/graphics/R-cran-DiagrammeR/Makefile
index 300153cae5b2..60d12bbd8f06 100644
--- a/graphics/R-cran-DiagrammeR/Makefile
+++ b/graphics/R-cran-DiagrammeR/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Create Diagrams and Flowcharts Using R
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-htmlwidgets>=0.5:${PORTSDIR}/www/R-cran-htmlwidgets \
-		R-cran-rstudioapi>=0.3.1:${PORTSDIR}/devel/R-cran-rstudioapi \
-		R-cran-stringr>=1.0.0:${PORTSDIR}/textproc/R-cran-stringr \
-		R-cran-visNetwork>=0.1.2:${PORTSDIR}/graphics/R-cran-visNetwork \
-		R-cran-scales>=0.3.0:${PORTSDIR}/graphics/R-cran-scales
+RUN_DEPENDS=	R-cran-htmlwidgets>=0.5:www/R-cran-htmlwidgets \
+		R-cran-rstudioapi>=0.3.1:devel/R-cran-rstudioapi \
+		R-cran-stringr>=1.0.0:textproc/R-cran-stringr \
+		R-cran-visNetwork>=0.1.2:graphics/R-cran-visNetwork \
+		R-cran-scales>=0.3.0:graphics/R-cran-scales
 
 USES=	cran:auto-plist
 
diff --git a/graphics/R-cran-GDD/Makefile b/graphics/R-cran-GDD/Makefile
index a41b3877a69b..77b2c0f699eb 100644
--- a/graphics/R-cran-GDD/Makefile
+++ b/graphics/R-cran-GDD/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Graphics device for R for creating bitmap output
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	libgd>=2.0.35_8,1:${PORTSDIR}/graphics/gd
+BUILD_DEPENDS=	libgd>=2.0.35_8,1:graphics/gd
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/graphics/R-cran-diagram/Makefile b/graphics/R-cran-diagram/Makefile
index 8a475cc5bb2a..816d67d1c276 100644
--- a/graphics/R-cran-diagram/Makefile
+++ b/graphics/R-cran-diagram/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Functions for visualising simple graphs, plotting flow diagrams
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-shape>0:${PORTSDIR}/graphics/R-cran-shape
+RUN_DEPENDS=	R-cran-shape>0:graphics/R-cran-shape
 
 USES=	cran:auto-plist
 
diff --git a/graphics/R-cran-dygraphs/Makefile b/graphics/R-cran-dygraphs/Makefile
index c2894695fc86..3a71d7f69cad 100644
--- a/graphics/R-cran-dygraphs/Makefile
+++ b/graphics/R-cran-dygraphs/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Interface to Dygraphs Interactive Time Series Charting Library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-magrittr>0:${PORTSDIR}/devel/R-cran-magrittr \
-		R-cran-htmlwidgets>=0.3.2:${PORTSDIR}/www/R-cran-htmlwidgets \
-		R-cran-zoo>=1.7.10:${PORTSDIR}/math/R-cran-zoo \
-		R-cran-xts>=0.9.7:${PORTSDIR}/math/R-cran-xts
+RUN_DEPENDS=	R-cran-magrittr>0:devel/R-cran-magrittr \
+		R-cran-htmlwidgets>=0.3.2:www/R-cran-htmlwidgets \
+		R-cran-zoo>=1.7.10:math/R-cran-zoo \
+		R-cran-xts>=0.9.7:math/R-cran-xts
 
 USES=	cran:auto-plist
 
diff --git a/graphics/R-cran-ggplot2/Makefile b/graphics/R-cran-ggplot2/Makefile
index f8b27a291ef9..be69254bfa3f 100644
--- a/graphics/R-cran-ggplot2/Makefile
+++ b/graphics/R-cran-ggplot2/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Implementation of the Grammar of Graphics
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-digest>=0:${PORTSDIR}/security/R-cran-digest \
-		R-cran-gtable>=0.1.1:${PORTSDIR}/math/R-cran-gtable \
-		R-cran-plyr>=1.7.1:${PORTSDIR}/devel/R-cran-plyr \
-		R-cran-reshape2>=0:${PORTSDIR}/devel/R-cran-reshape2 \
-		R-cran-scales>=0.3.0:${PORTSDIR}/graphics/R-cran-scales
+RUN_DEPENDS=	R-cran-digest>=0:security/R-cran-digest \
+		R-cran-gtable>=0.1.1:math/R-cran-gtable \
+		R-cran-plyr>=1.7.1:devel/R-cran-plyr \
+		R-cran-reshape2>=0:devel/R-cran-reshape2 \
+		R-cran-scales>=0.3.0:graphics/R-cran-scales
 
 USES=	cran:auto-plist
 
diff --git a/graphics/R-cran-munsell/Makefile b/graphics/R-cran-munsell/Makefile
index 27099a3c57ea..241ea7f1da10 100644
--- a/graphics/R-cran-munsell/Makefile
+++ b/graphics/R-cran-munsell/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME_CW=	Charlotte Wickham COPYRIGHT
 LICENSE_FILE_CW=	${WRKSRC}/LICENSE
 LICENSE_PERMS_CW=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	R-cran-colorspace>0:${PORTSDIR}/graphics/R-cran-colorspace
+RUN_DEPENDS=	R-cran-colorspace>0:graphics/R-cran-colorspace
 
 USES=	cran:auto-plist
 
diff --git a/graphics/R-cran-png/Makefile b/graphics/R-cran-png/Makefile
index 4ec557d5f3d7..0f68994f0293 100644
--- a/graphics/R-cran-png/Makefile
+++ b/graphics/R-cran-png/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Read and write PNG images
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=	cran:auto-plist
 
diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile
index 8c7eccca5877..cc48499116e9 100644
--- a/graphics/R-cran-rgdal/Makefile
+++ b/graphics/R-cran-rgdal/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Bindings for the Geospatial Data Abstraction Library
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libproj.so:${PORTSDIR}/graphics/proj
-RUN_DEPENDS=	R-cran-sp>=1.1.0:${PORTSDIR}/math/R-cran-sp
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libproj.so:graphics/proj
+RUN_DEPENDS=	R-cran-sp>=1.1.0:math/R-cran-sp
 
 USES=	cran:auto-plist
 
diff --git a/graphics/R-cran-rtiff/Makefile b/graphics/R-cran-rtiff/Makefile
index 8b35a7895824..558afbcb97e1 100644
--- a/graphics/R-cran-rtiff/Makefile
+++ b/graphics/R-cran-rtiff/Makefile
@@ -11,8 +11,8 @@ COMMENT=	TIFF reader for R
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	R-cran-pixmap>0:${PORTSDIR}/graphics/R-cran-pixmap
+LIB_DEPENDS=	libtiff.so:graphics/tiff
+RUN_DEPENDS=	R-cran-pixmap>0:graphics/R-cran-pixmap
 
 USES=	cran:auto-plist
 
diff --git a/graphics/R-cran-scales/Makefile b/graphics/R-cran-scales/Makefile
index 272a62a64bba..da0838a61046 100644
--- a/graphics/R-cran-scales/Makefile
+++ b/graphics/R-cran-scales/Makefile
@@ -10,12 +10,12 @@ COMMENT=	Scale functions for graphics
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-RColorBrewer>0:${PORTSDIR}/graphics/R-cran-RColorBrewer \
-		R-cran-dichromat>0:${PORTSDIR}/graphics/R-cran-dichromat \
-		R-cran-plyr>0:${PORTSDIR}/devel/R-cran-plyr \
-		R-cran-munsell>=0.2:${PORTSDIR}/graphics/R-cran-munsell \
-		R-cran-labeling>0:${PORTSDIR}/math/R-cran-labeling \
-		R-cran-Rcpp>0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-RColorBrewer>0:graphics/R-cran-RColorBrewer \
+		R-cran-dichromat>0:graphics/R-cran-dichromat \
+		R-cran-plyr>0:devel/R-cran-plyr \
+		R-cran-munsell>=0.2:graphics/R-cran-munsell \
+		R-cran-labeling>0:math/R-cran-labeling \
+		R-cran-Rcpp>0:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/graphics/R-cran-visNetwork/Makefile b/graphics/R-cran-visNetwork/Makefile
index 8a4a5513a8ea..66896d4be931 100644
--- a/graphics/R-cran-visNetwork/Makefile
+++ b/graphics/R-cran-visNetwork/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Network Visualization using 'vis.js' Library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-htmlwidgets>0:${PORTSDIR}/www/R-cran-htmlwidgets \
-		R-cran-htmltools>0:${PORTSDIR}/textproc/R-cran-htmltools \
-		R-cran-jsonlite>0:${PORTSDIR}/converters/R-cran-jsonlite \
-		R-cran-magrittr>0:${PORTSDIR}/devel/R-cran-magrittr
+RUN_DEPENDS=	R-cran-htmlwidgets>0:www/R-cran-htmlwidgets \
+		R-cran-htmltools>0:textproc/R-cran-htmltools \
+		R-cran-jsonlite>0:converters/R-cran-jsonlite \
+		R-cran-magrittr>0:devel/R-cran-magrittr
 
 USES=	cran:auto-plist
 
diff --git a/graphics/a2png/Makefile b/graphics/a2png/Makefile
index f07bc15bd7b7..72390196fd6d 100644
--- a/graphics/a2png/Makefile
+++ b/graphics/a2png/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts plain ASCII text into PNG bitmap images
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=	tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile
index 86573d5c1ad9..ed3d952e347d 100644
--- a/graphics/aaphoto/Makefile
+++ b/graphics/aaphoto/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Auto Adjust Photo, automatic color correction of photos
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libjasper.so:graphics/jasper \
+		libpng.so:graphics/png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	log69
diff --git a/graphics/acidwarp/Makefile b/graphics/acidwarp/Makefile
index 0c8dec9b2faf..3ea7f7671417 100644
--- a/graphics/acidwarp/Makefile
+++ b/graphics/acidwarp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SUNSITE/apps/graphics/hacks/svgalib
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	SVGAlib demo which displays trippy mathematical images in cycling colors
 
-LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS=	libvga.so:graphics/svgalib
 
 ONLY_FOR_ARCHS=	i386
 ALL_TARGET=	${PORTNAME}
diff --git a/graphics/aeskulap/Makefile b/graphics/aeskulap/Makefile
index df5c532f7ecf..0e967a108f90 100644
--- a/graphics/aeskulap/Makefile
+++ b/graphics/aeskulap/Makefile
@@ -14,7 +14,7 @@ BROKEN=		unfetchable
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24
+LIB_DEPENDS=	libglademm-2.4.so:devel/libglademm24
 
 USES=		desktop-file-utils gettext libtool pkgconfig
 USE_GNOME=	gconfmm26 gtkmm24 intltool
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index 829537bc7246..16f43b55e784 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Color scheme builder for the GNOME desktop
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libglademm-2.4.so:devel/libglademm24
 
 USES=		gettext gmake pathfix pkgconfig tar:bzip2
 USE_GNOME=	gconfmm26 gnomedocutils gnomeprefix gtkmm24 intltool
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 2f7bffc90b2c..3840d8334250 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -15,7 +15,7 @@ COMMENT=	High Quality Rendering Engine for C++
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copying
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool pathfix pkgconfig
diff --git a/graphics/alembic/Makefile b/graphics/alembic/Makefile
index 432654f31e98..c29977024f06 100644
--- a/graphics/alembic/Makefile
+++ b/graphics/alembic/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Open framework for storing and sharing graphic scene data
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libImath-2_2.so:${PORTSDIR}/graphics/ilmbase \
-		libhdf5.so:${PORTSDIR}/science/hdf5
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libImath-2_2.so:graphics/ilmbase \
+		libhdf5.so:science/hdf5
 
 BROKEN_FreeBSD_9=	does not build (insufficient C++11 support)
 
diff --git a/graphics/alpng/Makefile b/graphics/alpng/Makefile
index 4d021b9a7ff1..c35c6b8a2f1e 100644
--- a/graphics/alpng/Makefile
+++ b/graphics/alpng/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}13
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Library for display PNG images in programs
 
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS=	liballeg.so:devel/allegro
 
 HAS_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index 413e76455b97..af65f0ae8158 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Medical Imaging Data Examiner
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
@@ -35,17 +35,17 @@ XMEDCON_DESC=	Use xmedcon
 
 OPTIONS_SUB=			yes
 DCMTK_CONFIGURE_ENABLE=		libdcmdata
-DCMTK_LIB_DEPENDS=		libdcmdata.so:${PORTSDIR}/devel/dcmtk
+DCMTK_LIB_DEPENDS=		libdcmdata.so:devel/dcmtk
 FAME_CONFIGURE_ENABLE=		libfame
-FAME_LIB_DEPENDS=		libfame.so:${PORTSDIR}/multimedia/libfame
+FAME_LIB_DEPENDS=		libfame.so:multimedia/libfame
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg
-FFMPEG_LIB_DEPENDS=		libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
+FFMPEG_LIB_DEPENDS=		libavcodec0.so:multimedia/ffmpeg0
 GSL_CONFIGURE_ENABLE=		libgsl
-GSL_LIB_DEPENDS=		libgsl.so:${PORTSDIR}/math/gsl
+GSL_LIB_DEPENDS=		libgsl.so:math/gsl
 VOLPACK_CONFIGURE_ENABLE=	libvolpack
-VOLPACK_BUILD_DEPENDS=		${LOCALBASE}/lib/libvolpack.a:${PORTSDIR}/graphics/volpack
+VOLPACK_BUILD_DEPENDS=		${LOCALBASE}/lib/libvolpack.a:graphics/volpack
 XMEDCON_CONFIGURE_ENABLE=	libmdc
-XMEDCON_LIB_DEPENDS=		libmdc.so:${PORTSDIR}/graphics/xmedcon
+XMEDCON_LIB_DEPENDS=		libmdc.so:graphics/xmedcon
 NLS_CONFIGURE_ENABLE=		nls
 
 post-patch:
diff --git a/graphics/ampasCTL/Makefile b/graphics/ampasCTL/Makefile
index 93b260196d5a..70ec189b4fdf 100644
--- a/graphics/ampasCTL/Makefile
+++ b/graphics/ampasCTL/Makefile
@@ -14,10 +14,10 @@ LICENSE_NAME=	AMPAS
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libImath.so:${PORTSDIR}/graphics/ilmbase \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libAcesContainer.so:${PORTSDIR}/graphics/ampasACES-container
+LIB_DEPENDS=	libImath.so:graphics/ilmbase \
+		libIlmImf.so:graphics/OpenEXR \
+		libtiff.so:graphics/tiff \
+		libAcesContainer.so:graphics/ampasACES-container
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ampas
diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index d55e849f2d04..a5c21b84dd26 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Open source Java written 3D modelling and rendering studio
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjogl.so:${PORTSDIR}/graphics/jogl
+LIB_DEPENDS=	libjogl.so:graphics/jogl
 
 USES=		dos2unix zip
 DOS2UNIX_FILES=	../AoI_Manual/*.html
diff --git a/graphics/apngasm/Makefile b/graphics/apngasm/Makefile
index f2a3789ff2da..dfeeb46021ca 100644
--- a/graphics/apngasm/Makefile
+++ b/graphics/apngasm/Makefile
@@ -24,12 +24,12 @@ LDFLAGS+=	-lz
 PORTDOCS=	readme.txt
 PLIST_FILES=	bin/${PORTNAME}
 
-STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
+STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:graphics/png
 STATIC_MAKE_ENV=	STATIC=1
-STATIC_LIB_DEPENDS_OFF=	libpng.so:${PORTSDIR}/graphics/png
+STATIC_LIB_DEPENDS_OFF=	libpng.so:graphics/png
 
 # libzopfli.a is N/A
-STATIC_LIB_DEPENDS_OFF+=libzopfli.so:${PORTSDIR}/archivers/zopfli
+STATIC_LIB_DEPENDS_OFF+=libzopfli.so:archivers/zopfli
 STATIC_CPPFLAGS_OFF+=	-I${LOCALBASE}/include/zopfli
 STATIC_LDFLAGS_OFF+=	-lzopfli
 
diff --git a/graphics/apngdis/Makefile b/graphics/apngdis/Makefile
index 704ff155eee0..341993ba669e 100644
--- a/graphics/apngdis/Makefile
+++ b/graphics/apngdis/Makefile
@@ -22,9 +22,9 @@ LDFLAGS+=	-lz
 PORTDOCS=	readme.txt
 PLIST_FILES=	bin/${PORTNAME}
 
-STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
+STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:graphics/png
 STATIC_MAKE_ENV=	STATIC=1
-STATIC_LIB_DEPENDS_OFF=	libpng.so:${PORTSDIR}/graphics/png
+STATIC_LIB_DEPENDS_OFF=	libpng.so:graphics/png
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile
index 49c0cdde9875..db64f4d054f1 100644
--- a/graphics/appleseed/Makefile
+++ b/graphics/appleseed/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Modern, physically-based production renderer
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libpng.so:graphics/png \
+		libIlmImf.so:graphics/OpenEXR \
+		libxerces-c.so:textproc/xerces-c3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}hq
@@ -51,11 +51,11 @@ DISNEY_DESC=	Disney material support
 EXAMPLES_CMAKE_OFF=	-DWITH_SAMPLES:BOOL=OFF
 
 OSL_CMAKE_ON=	-DWITH_OSL:BOOL=ON
-OSL_LIB_DEPENDS=	liboslexec.so:${PORTSDIR}/graphics/openshadinglanguage
+OSL_LIB_DEPENDS=	liboslexec.so:graphics/openshadinglanguage
 
 DISNEY_CMAKE_ON=	-DWITH_DISNEY_MATERIAL:BOOL=ON
-DISNEY_LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \
-			libSeExprEditor.so:${PORTSDIR}/graphics/seexpr
+DISNEY_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
+			libSeExprEditor.so:graphics/seexpr
 
 post-patch:
 	@${RMDIR} ${WRKSRC}/sandbox/docs/api
diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile
index 8fc046cb8d01..26777a8eaf6a 100644
--- a/graphics/apvlv/Makefile
+++ b/graphics/apvlv/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PDF/DJVU Viewer that behaves like Vim
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 
 USE_GNOME=	gtk20
 USES=		cmake pkgconfig
@@ -34,10 +34,10 @@ DJVU_DESC=	DjVu document support
 
 DJVU_CMAKE_ON=	-DAPVLV_WITH_DJVU=ON
 DJVU_CMAKE_OFF=	-DAPVLV_WITH_DJVU=OFF
-DJVU_LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
+DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 
 WEBKIT_CMAKE_ON=	-DAPVLV_WITH_HTML=ON
 WEBKIT_CMAKE_OFF=	-DAPVLV_WITH_HTML=OFF
-WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include <bsd.port.mk>
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index b751c3620fca..11c9ccef018e 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Photorealistic rendering system
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
-		xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bison:devel/bison \
+		xsltproc:textproc/libxslt
+LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
+		libboost_filesystem.so:devel/boost-libs \
+		libtiff.so:graphics/tiff
+RUN_DEPENDS=	bash:shells/bash
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/graphics/argyllcms/Makefile b/graphics/argyllcms/Makefile
index 5641cab5f1ae..fedeb3ee4cdf 100644
--- a/graphics/argyllcms/Makefile
+++ b/graphics/argyllcms/Makefile
@@ -13,8 +13,8 @@ COMMENT=	ICC compatible color management system
 
 LICENSE=	AGPLv3
 
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS=	jam:devel/jam
+LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 WRKSRC=		${WRKDIR}/Argyll_V${PORTVERSION}
 
diff --git a/graphics/asciio/Makefile b/graphics/asciio/Makefile
index 49dc048eefea..95a387d85d1a 100644
--- a/graphics/asciio/Makefile
+++ b/graphics/asciio/Makefile
@@ -14,29 +14,29 @@ COMMENT=	Perl/GTK application that lets you draw ASCII charts using a GUI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-Check-ISA>=0:${PORTSDIR}/devel/p5-Check-ISA \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-Data-TreeDumper-Renderer-GTK>=0:${PORTSDIR}/devel/p5-Data-TreeDumper-Renderer-GTK \
-		p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch \
-		p5-Eval-Context>=0:${PORTSDIR}/devel/p5-Eval-Context \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Hash-Slice>=0.03:${PORTSDIR}/devel/p5-Hash-Slice \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Util>=0:${PORTSDIR}/devel/p5-Module-Util \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Test-Block>=0:${PORTSDIR}/devel/p5-Test-Block \
-		p5-Test-Dependencies>=0:${PORTSDIR}/devel/p5-Test-Dependencies \
-		p5-Test-Distribution>=0:${PORTSDIR}/devel/p5-Test-Distribution \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Spelling>=0:${PORTSDIR}/devel/p5-Test-Spelling \
-		p5-Test-Strict>=0:${PORTSDIR}/devel/p5-Test-Strict \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Text-Diff>=1.41:${PORTSDIR}/textproc/p5-Text-Diff
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-Check-ISA>=0:devel/p5-Check-ISA \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-Data-TreeDumper-Renderer-GTK>=0:devel/p5-Data-TreeDumper-Renderer-GTK \
+		p5-Directory-Scratch>=0:devel/p5-Directory-Scratch \
+		p5-Eval-Context>=0:devel/p5-Eval-Context \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Hash-Slice>=0.03:devel/p5-Hash-Slice \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Util>=0:devel/p5-Module-Util \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Test-Block>=0:devel/p5-Test-Block \
+		p5-Test-Dependencies>=0:devel/p5-Test-Dependencies \
+		p5-Test-Distribution>=0:devel/p5-Test-Distribution \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Spelling>=0:devel/p5-Test-Spelling \
+		p5-Test-Strict>=0:devel/p5-Test-Strict \
+		p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Text-Diff>=1.41:textproc/p5-Text-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+		p5-Class-ISA>=0:devel/p5-Class-ISA
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile
index fdebc30740c9..4906fdb262db 100644
--- a/graphics/atril/Makefile
+++ b/graphics/atril/Makefile
@@ -11,10 +11,10 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	MATE multi-format document viewer
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
-		libspectre.so:${PORTSDIR}/print/libspectre
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib \
+		libspectre.so:print/libspectre
 
 PORTSCOUT=	limitw:1,even
 SLAVEPORT?=	no
@@ -58,15 +58,15 @@ OPTIONS_SUB=	yes
 
 CAJA_CONFIGURE_ENABLE=	caja
 CAJA_USE=		MATE=caja
-DJVU_LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
+DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 DJVU_CONFIGURE_ENABLE=	djvu
 COMICS_CONFIGURE_ENABLE=	comics
 KEYRING_CONFIGURE_WITH=	keyring
-KEYRING_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+KEYRING_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 XPS_CONFIGURE_ENABLE=	xps
-XPS_LIB_DEPENDS=	libgxps.so:${PORTSDIR}/graphics/libgxps
+XPS_LIB_DEPENDS=	libgxps.so:graphics/libgxps
 EPUB_CONFIGURE_ENABLE=	epub
-EPUB_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+EPUB_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include <bsd.port.options.mk>
 
@@ -74,7 +74,7 @@ EPUB_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
 CONFIGURE_ARGS+=--disable-dbus
 .else
 CONFIGURE_ARGS+=--enable-dbus
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	libdbus-glib-1.so:devel/dbus-glib
 .endif
 
 .if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
@@ -83,7 +83,7 @@ CONFIGURE_ARGS+=--enable-dvi
 PLIST_SUB+=	DVI=""
 
 . if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS+=	libt1.so:devel/t1lib
 CONFIGURE_ARGS+=--enable-t1lib
 .else
 CONFIGURE_ARGS+=--disable-t1lib
diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile
index 8b36b89aeb06..b8ab1373bea2 100644
--- a/graphics/autopano-sift-c/Makefile
+++ b/graphics/autopano-sift-c/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Automatic panorama control point generation tool, C port
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libpano13.so:${PORTSDIR}/graphics/libpano13
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libpano13.so:graphics/libpano13
 
 RESTRICTED=	May be covered by patents
 
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index de0d6d1d8da2..f1c8543c2456 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Convert bitmap to vector graphics
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cpe pathfix pkgconfig libtool
 CPE_VENDOR=	autotrace_project
@@ -28,14 +28,14 @@ OPTIONS_DEFAULT=IMAGEMAGICK PSTOEDIT
 MING_DESC=	Enable swf interface
 PSTOEDIT_DESC=	Convert postscript to other formats
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
 IMAGEMAGICK_CONFIGURE_OFF=	--without-magick
 
-MING_LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming
+MING_LIB_DEPENDS=	libming.so:graphics/ming
 MING_CPPFLAGS=		-I${LOCALBASE}/include -I${LOCALBASE}/include/ming
 MING_CONFIGURE_OFF=	ac_cv_header_ming_h=no
 
-PSTOEDIT_LIB_DEPENDS=	libpstoedit.so:${PORTSDIR}/graphics/pstoedit
+PSTOEDIT_LIB_DEPENDS=	libpstoedit.so:graphics/pstoedit
 PSTOEDIT_CONFIGURE_OFF=	--without-pstoedit
 
 post-patch:
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 59bc82e113b3..21b1c7249c4a 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/aa-project/${PORTNAME}/${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphics viewer for viewing netpbm format on console or X using aalib
 
-RUN_DEPENDS=	anytopnm:${PORTSDIR}/graphics/netpbm \
-		convert:${PORTSDIR}/graphics/ImageMagick
-LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+RUN_DEPENDS=	anytopnm:graphics/netpbm \
+		convert:graphics/ImageMagick
+LIB_DEPENDS=	libaa.so:graphics/aalib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile
index da1d5de98a0f..61f93200af0e 100644
--- a/graphics/ayam/Makefile
+++ b/graphics/ayam/Makefile
@@ -15,9 +15,9 @@ LICENSE_NAME=	Ayam License
 LICENSE_FILE=	${WRKSRC}/../License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libaqsis_util.so:${PORTSDIR}/graphics/aqsis \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libaqsis_util.so:graphics/aqsis \
+		libtiff.so:graphics/tiff
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
diff --git a/graphics/barbecue/Makefile b/graphics/barbecue/Makefile
index a5d99e53fcfc..7c5d6b864378 100644
--- a/graphics/barbecue/Makefile
+++ b/graphics/barbecue/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java barcode generator
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom
+RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -39,14 +39,14 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index a1f86cd604a6..3898c07647d8 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNU
 MAINTAINER=	jev@ecad.org
 COMMENT=	A barcode generation library along with a command line frontend
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+BUILD_DEPENDS=	gawk:lang/gawk
 
 GNU_CONFIGURE=	yes
 INFO=		barcode
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index a7ce176e17b5..91f1a5b4a143 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -14,8 +14,8 @@ COMMENT=	3D modeling/rendering/animation/gaming package
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USE_XORG=	x11 xext xmu
 USE_GL=		glew
@@ -42,7 +42,7 @@ OPTIONS_SUB=	yes
 
 MOD_BOOLEAN_CMAKE_ON=		-DWITH_MOD_BOOLEAN:BOOL=ON
 MOD_BOOLEAN_CMAKE_OFF=		-DWITH_MOD_BOOLEAN:BOOL=OFF
-MOD_BOOLEAN_LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+MOD_BOOLEAN_LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 MOD_FLUID_CMAKE_ON=		-DWITH_MOD_FLUID:BOOL=ON
 MOD_FLUID_CMAKE_OFF=		-DWITH_MOD_FLUID:BOOL=OFF
 MOD_REMESH_CMAKE_ON=		-DWITH_MOD_REMESH:BOOL=ON
@@ -59,20 +59,20 @@ CYCLES_CMAKE_ON=		-DWITH_CYCLES:BOOL=ON
 CYCLES_CMAKE_OFF=		-DWITH_CYCLES:BOOL=OFF
 CAMERATRACK_CMAKE_ON=		-DWITH_LIBMV:BOOL=ON
 CAMERATRACK_CMAKE_OFF=		-DWITH_LIBMV:BOOL=OFF
-CAMERATRACK_LIB_DEPENDS=	libunwind.so:${PORTSDIR}/devel/libunwind
+CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind
 COLLADA_CMAKE_ON=		-DWITH_OPENCOLLADA:BOOL=ON
 COLLADA_CMAKE_OFF=		-DWITH_OPENCOLLADA:BOOL=OFF
-COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:${PORTSDIR}/graphics/opencollada
+COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada
 COMPOSITOR_CMAKE_ON=		-DWITH_COMPOSITOR:BOOL=ON
 COMPOSITOR_CMAKE_OFF=		-DWITH_COMPOSITOR:BOOL=OFF
 DDS_CMAKE_ON=			-DWITH_IMAGE_DDS:BOOL=ON
 DDS_CMAKE_OFF=			-DWITH_IMAGE_DDS:BOOL=OFF
 FFMPEG_CMAKE_ON=		-DWITH_CODEC_FFMPEG:BOOL=ON
 FFMPEG_CMAKE_OFF=		-DWITH_CODEC_FFMPEG:BOOL=OFF
-FFMPEG_LIB_DEPENDS=		libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg
 FFTW3_CMAKE_ON=			-DWITH_FFTW3:BOOL=ON
 FFTW3_CMAKE_OFF=		-DWITH_FFTW3:BOOL=OFF
-FFTW3_LIB_DEPENDS=		libfftw3.so:${PORTSDIR}/math/fftw3
+FFTW3_LIB_DEPENDS=		libfftw3.so:math/fftw3
 FRAMESERVER_CMAKE_ON=		-DWITH_IMAGE_FRAMESERVER:BOOL=ON
 FRAMESERVER_CMAKE_OFF=		-DWITH_IMAGE_FRAMESERVER:BOOL=OFF
 FREESTYLE_CMAKE_ON=		-DWITH_FREESTYLE:BOOL=ON
@@ -87,7 +87,7 @@ INPUT_NDOF_CMAKE_ON=		-DWITH_INPUT_NDOF:BOOL=ON
 INPUT_NDOF_CMAKE_OFF=		-DWITH_INPUT_NDOF:BOOL=OFF
 JACK_CMAKE_ON=			-DWITH_JACK:BOOL=ON
 JACK_CMAKE_OFF=			-DWITH_JACK:BOOL=OFF
-JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=		libjack.so:audio/jack
 LZO_CMAKE_ON=			-DWITH_LZO:BOOL=ON
 LZO_CMAKE_OFF=			-DWITH_LZO:BOOL=OFF
 LZMA_CMAKE_ON=			-DWITH_LZMA:BOOL=ON
@@ -108,17 +108,17 @@ OPENAL_CMAKE_OFF=		-DWITH_OPENAL:BOOL=OFF
 OPENAL_USES=			openal:al,alut
 OPENCOLORIO_CMAKE_ON=		-DWITH_OPENCOLORIO:BOOL=ON
 OPENCOLORIO_CMAKE_OFF=		-DWITH_OPENCOLORIO:BOOL=OFF
-OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
+OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio
 OPENEXR_CMAKE_ON=		-DWITH_IMAGE_OPENEXR:BOOL=ON
 OPENEXR_CMAKE_OFF=		-DWITH_IMAGE_OPENEXR:BOOL=OFF
-OPENEXR_LIB_DEPENDS=		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+OPENEXR_LIB_DEPENDS=		libIlmImf.so:graphics/OpenEXR
 OPENIMAGEIO_CMAKE_ON=		-DWITH_OPENIMAGEIO:BOOL=ON
 OPENIMAGEIO_CMAKE_OFF=		-DWITH_OPENIMAGEIO:BOOL=OFF
-OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
+OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENJPEG_CMAKE_ON=		-DWITH_SYSTEM_OPENJPEG:BOOL=ON \
 				-DWITH_IMAGE_OPENJPEG:BOOL=ON
 OPENJPEG_CMAKE_OFF=		-DWITH_IMAGE_OPENJPEG:BOOL=OFF
-OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
 # Only works, if everything else is compiled with the same compiler
 # OPENMP_CMAKE_ON=		-DWITH_OPENMP:BOOL=ON
 # OPENMP_CMAKE_OFF=		-DWITH_OPENMP:BOOL=OFF
@@ -126,7 +126,7 @@ OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
 # OPENMP_USES_OFF=		compiler:features
 OPENSUBDIV_CMAKE_ON=		-DWITH_OPENSUBDIV:BOOL=ON
 OPENSUBDIV_CMAKE_OFF=		-DWITH_OPENSUBDIV:BOOL=OFF
-OPENSUBDIV_LIB_DEPENDS=		libosdCPU.so:${PORTSDIR}/graphics/opensubdiv
+OPENSUBDIV_LIB_DEPENDS=		libosdCPU.so:graphics/opensubdiv
 PLAYER_CMAKE_ON=		-DWITH_PLAYER:BOOL=ON
 PLAYER_CMAKE_OFF=		-DWITH_PLAYER:BOOL=OFF
 RAYOPTIMIZATION_CMAKE_ON=	-DWITH_RAYOPTIMIZATION:BOOL=ON
@@ -138,10 +138,10 @@ SDL_CMAKE_OFF=			-DWITH_SDL:BOOL=OFF
 SDL_USE=			SDL=sdl
 SNDFILE_CMAKE_ON=		-DWITH_CODEC_SNDFILE:BOOL=ON
 SNDFILE_CMAKE_OFF=		-DWITH_CODEC_SNDFILE:BOOL=OFF
-SNDFILE_LIB_DEPENDS=		libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
 TIFF_CMAKE_ON=			-DWITH_IMAGE_TIFF:BOOL=ON
 TIFF_CMAKE_OFF=			-DWITH_IMAGE_TIFF:BOOL=OFF
-TIFF_LIB_DEPENDS=		libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 XINPUT_CMAKE_ON=		-DWITH_X11_XINPUT:BOOL=ON
 XINPUT_CMAKE_OFF=		-DWITH_X11_XINPUT:BOOL=OFF
 XINPUT_USE=			XORG=xi
@@ -172,8 +172,8 @@ CMAKE_ARGS+=	-DWITH_CYCLES_OSL:BOOL=ON \
 		-DWITH_LLVM:BOOL=ON \
 		-DLLVM_VERSION:STRING="3.4" \
 		-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34"
-LIB_DEPENDS+=	liboslexec.so:${PORTSDIR}/graphics/openshadinglanguage
-BUILD_DEPENDS+=	llvm-config34:${PORTSDIR}/devel/llvm34
+LIB_DEPENDS+=	liboslexec.so:graphics/openshadinglanguage
+BUILD_DEPENDS+=	llvm-config34:devel/llvm34
 .else
 CMAKE_ARGS+=	-DWITH_CYCLES_OSL:BOOL=OFF
 .endif
diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile
index a96d26a53f93..37d9ca9c8c5f 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Convert PNG/JPEG/TIFF to PDF/EPS
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/bsdlic.txt
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/box/Makefile b/graphics/box/Makefile
index 26974926c67c..874e34c8c582 100644
--- a/graphics/box/Makefile
+++ b/graphics/box/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Compiler for box, the figure description language
 LICENSE=	GPLv2+ LGPL3+
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man
+LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/graphics/boxer/Makefile b/graphics/boxer/Makefile
index 47577bc89ba5..ee95d8058ebe 100644
--- a/graphics/boxer/Makefile
+++ b/graphics/boxer/Makefile
@@ -17,7 +17,7 @@ COMMENT=	GUI for Box the figure description language
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	box:${PORTSDIR}/graphics/box
+RUN_DEPENDS=	box:graphics/box
 
 USE_GNOME=	pygtk2
 USES=		python
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index bdc69fad429f..4075ce58f059 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Debugging library for OpenGL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		libtool pathfix perl5
 USE_GL=		gl
@@ -31,8 +31,8 @@ OPTIONS_DEFINE=		FFMPEG GTK2 READLINE THREADS
 OPTIONS_DEFAULT=	READLINE THREADS
 
 FFMPEG_CONFIGURE_WITH=	lavc
-FFMPEG_LIB_DEPENDS=	libavcodec.so.1:${PORTSDIR}/multimedia/ffmpeg
-GTK2_LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+FFMPEG_LIB_DEPENDS=	libavcodec.so.1:multimedia/ffmpeg
+GTK2_LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 GTK2_USE=		gnome=gtk20
 GTK2_CONFIGURE_WITH=	gtk gtkglext
 READLINE_USES=		readline
diff --git a/graphics/burplex/Makefile b/graphics/burplex/Makefile
index 47cba5e5fa73..369238ebfd3c 100644
--- a/graphics/burplex/Makefile
+++ b/graphics/burplex/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Preview and select images for batch processing
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${LOCALBASE}/bin/dcraw:${PORTSDIR}/graphics/dcraw
+RUN_DEPENDS=	${LOCALBASE}/bin/dcraw:graphics/dcraw
 
 USES=		qmake
 USE_QT4=	gui uic_build moc_build rcc_build \
diff --git a/graphics/cadubi/Makefile b/graphics/cadubi/Makefile
index f06d8be19a68..7098b69706b9 100644
--- a/graphics/cadubi/Makefile
+++ b/graphics/cadubi/Makefile
@@ -10,7 +10,7 @@ COMMENT=	ASCII drawing utility
 
 LICENSE=	ART10
 
-RUN_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 
 GH_ACCOUNT=	statico
 GH_PROJECT=	cadubi
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index ebfc55b3aa8a..300cf1dda8e4 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -17,9 +17,9 @@ USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png \
+		libfontconfig.so:x11-fonts/fontconfig
 
 PORTSCOUT=	skipv:5c-1.1,5c-1.2,5c-1.5
 
@@ -52,8 +52,8 @@ OPENGL_USE=	gl=gl,egl xorg=glproto:both,dri2proto:both
 OPENGL_CONFIGURE_ENABLE=gl egl
 GLIB_USE=	gnome=glib20
 GLIB_CONFIGURE_ENABLE=	gobject
-XCB_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
-XCB_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
+XCB_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
+XCB_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
 XCB_CONFIGURE_ENABLE=	xcb
 # this has another option --enable-xlib-xcb=auto but it is buggy.
 
@@ -62,7 +62,7 @@ PLIST_SUB+=	LIBVER=2.11400.6
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "mips"
-BUILD_DEPENDS+=	${LOCALBASE}/include/atomic_ops.h:${PORTSDIR}/devel/libatomic_ops
+BUILD_DEPENDS+=	${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	cairo_cv_atomic_primitives="libatomic-ops"
diff --git a/graphics/camera/Makefile b/graphics/camera/Makefile
index d65b20199563..2805e311f008 100644
--- a/graphics/camera/Makefile
+++ b/graphics/camera/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GNUstep application for digital still cameras
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/Documentation/COPYING
 
-LIB_DEPENDS=	libgphoto2_port.so:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libgphoto2_port.so:graphics/libgphoto2
 
 USES=		tar:bzip2 gnustep
 USE_GNUSTEP=	back build
diff --git a/graphics/camerakit/Makefile b/graphics/camerakit/Makefile
index 3ae63db80522..f82eb590affc 100644
--- a/graphics/camerakit/Makefile
+++ b/graphics/camerakit/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	CameraKit-20041011
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework that allows to access digital cameras
 
-LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 USES=		tar:bzip2 gnustep
 USE_GNUSTEP=	build back
diff --git a/graphics/cbview/Makefile b/graphics/cbview/Makefile
index 4711ac778b82..cf343cd5ba01 100644
--- a/graphics/cbview/Makefile
+++ b/graphics/cbview/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Viewer/converter for CBR/CBZ comic book archives
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
-		unzip:${PORTSDIR}/archivers/unzip \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
+RUN_DEPENDS=	unrar:archivers/unrar \
+		unzip:archivers/unzip \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/graphics/cbviewer/Makefile b/graphics/cbviewer/Makefile
index 5341d6b962e2..afe3851e66d1 100644
--- a/graphics/cbviewer/Makefile
+++ b/graphics/cbviewer/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Comic book viewer for comic book archives in cbz, cbr, zip, rar
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
+RUN_DEPENDS=	unrar:archivers/unrar
 
 USES=		dos2unix zip
 DOS2UNIX_GLOB=	CREDITS
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 5b800d484801..3edec2cc350c 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -34,60 +34,60 @@ OPTIONS_DEFAULT+=	OPENGL OPENGL3 OGRE
 
 OPTIONS_SUB=	yes
 
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CMAKE_ON=	-DCEGUI_HAS_FREETYPE=ON
 FREETYPE_CMAKE_OFF=	-DCEGUI_HAS_FREETYPE=OFF
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CMAKE_ON=		-DCEGUI_HAS_PCRE_REGEX=ON
 PCRE_CMAKE_OFF=		-DCEGUI_HAS_PCRE_REGEX=OFF
 LUA_USES=		lua:51
-LUA_LIB_DEPENDS=	libtolua++-${LUA_VER}.so:${PORTSDIR}/lang/tolua++
+LUA_LIB_DEPENDS=	libtolua++-${LUA_VER}.so:lang/tolua++
 LUA_CMAKE_ON=		-DCEGUI_BUILD_LUA_MODULE=ON -DCEGUI_BUILD_LUA_GENERATOR=ON
 LUA_CMAKE_OFF=		-DCEGUI_BUILD_LUA_MODULE=OFF -DCEGUI_BUILD_LUA_GENERATOR=OFF
 # this option is not currently used as it doesn't compile (see also CMAKE_ARGS below)
 PYTHON_USES=		python
-PYTHON_LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+PYTHON_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 PYTHON_CMAKE_ON=	-DCEGUI_BUILD_PYTHON_MODULES=ON
 PYTHON_CMAKE_OFF=	-DCEGUI_BUILD_PYTHON_MODULES=OFF
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CMAKE_ON=	-DCEGUI_USE_FRIBIDI=ON
 FRIBIDI_CMAKE_OFF=	-DCEGUI_USE_FRIBIDI=OFF
 
-EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 EXPAT_CMAKE_ON=		-DCEGUI_BUILD_XMLPARSER_EXPAT=ON
 EXPAT_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_EXPAT=OFF
-XERCES_LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3
+XERCES_LIB_DEPENDS=	libxerces-c.so.3:textproc/xerces-c3
 XERCES_CMAKE_ON=	-DCEGUI_BUILD_XMLPARSER_XERCES=ON
 XERCES_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_XERCES=OFF
 LIBXML2_USE=		GNOME=libxml2
 LIBXML2_CMAKE_ON=	-DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
 LIBXML2_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF
-RAPIDXML_BUILD_DEPENDS=	${LOCALBASE}/include/rapidxml.hpp:${PORTSDIR}/textproc/rapidxml
+RAPIDXML_BUILD_DEPENDS=	${LOCALBASE}/include/rapidxml.hpp:textproc/rapidxml
 RAPIDXML_DESC=		XML parser support via RapidXML
 RAPIDXML_CMAKE_ON=	-DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON
 RAPIDXML_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
-TINYXML_LIB_DEPENDS=	libtinyxml.so:${PORTSDIR}/textproc/tinyxml
+TINYXML_LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml
 TINYXML_CMAKE_ON=	-DCEGUI_BUILD_XMLPARSER_TINYXML=ON
 TINYXML_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
 
 DEVIL_DESC=		DevIL based ImageCodec module
-DEVIL_LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil
+DEVIL_LIB_DEPENDS=	libIL.so:graphics/devil
 DEVIL_CMAKE_ON=		-DCEGUI_BUILD_IMAGECODEC_DEVIL=ON
 DEVIL_CMAKE_OFF=	-DCEGUI_BUILD_IMAGECODEC_DEVIL=OFF
 FREEIMAGE_DESC=		FreeImage based ImageCodec module
-FREEIMAGE_LIB_DEPENDS=	libfreeimage.so:${PORTSDIR}/graphics/freeimage
+FREEIMAGE_LIB_DEPENDS=	libfreeimage.so:graphics/freeimage
 FREEIMAGE_CMAKE_ON=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
 FREEIMAGE_CMAKE_OFF=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
 
 OGRE_DESC=		Ogre3D support
-OGRE_LIB_DEPENDS=	libOgreMain.so:${PORTSDIR}/graphics/ogre3d
+OGRE_LIB_DEPENDS=	libOgreMain.so:graphics/ogre3d
 OGRE_CMAKE_ON=		-DCEGUI_BUILD_RENDERER_OGRE=ON
 OGRE_CMAKE_OFF=		-DCEGUI_BUILD_RENDERER_OGRE=OFF
 IRRLICHT_DESC=		Irrlicht support
-IRRLICHT_LIB_DEPENDS=	libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
+IRRLICHT_LIB_DEPENDS=	libIrrlicht.so:x11-toolkits/irrlicht
 IRRLICHT_CMAKE_ON=	-DCEGUI_BUILD_RENDERER_IRRLICHT=ON
 IRRLICHT_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
-OPENGL_BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
+OPENGL_BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 OPENGL_USE=		GL=gl,glew
 OPENGL_CMAKE_ON=	-DCEGUI_BUILD_RENDERER_OPENGL=ON
 OPENGL_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_OPENGL=OFF
diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile
index 3bae0261a5c9..fcd149cdd0e9 100644
--- a/graphics/cfdg/Makefile
+++ b/graphics/cfdg/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	ContextFreeSource${PORTVERSION}
 MAINTAINER=	anatoly.borodin@gmail.com
 COMMENT=	Context Free Design Grammar compiler
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index 45e3a4f29c4d..1d4a3f12aadd 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Change Background Picture with time period
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake gettext pathfix tar:tgz
 USE_GNOME=	gdkpixbuf
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 7890c7f463ad..4e3231844f89 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -47,17 +47,17 @@ USES+=		gmake pkgconfig:build
 
 .if ${PORT_OPTIONS:MDOCS}
 REINPLACE_ARGS=	-i ""
-LIB_DEPENDS+=	libboard.so:${PORTSDIR}/graphics/libboard
+LIB_DEPENDS+=	libboard.so:graphics/libboard
 
 . if !defined(WITH_DEBUG)
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png		\
-		libtiff.so:${PORTSDIR}/graphics/tiff		\
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR	\
-		libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app	\
-		libfftw3.so:${PORTSDIR}/math/fftw3		\
-		libopencv_legacy.so:${PORTSDIR}/graphics/opencv	\
-		libopencv_core.so:${PORTSDIR}/graphics/opencv-core\
-		libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick
+LIB_DEPENDS+=	libpng.so:graphics/png		\
+		libtiff.so:graphics/tiff		\
+		libIlmImf.so:graphics/OpenEXR	\
+		libgimp-2.0.so:graphics/gimp-app	\
+		libfftw3.so:math/fftw3		\
+		libopencv_legacy.so:graphics/opencv	\
+		libopencv_core.so:graphics/opencv-core\
+		libGraphicsMagick.so:graphics/GraphicsMagick
 USES+=		jpeg
 ALL_TARGET=	Mlinux
 . else
@@ -68,10 +68,10 @@ WITHOUT_LAPACK=	yes
 . endif
 
 . if !defined(WITHOUT_MEDCON)
-RUN_DEPENDS+=	medcon:${PORTSDIR}/graphics/xmedcon
+RUN_DEPENDS+=	medcon:graphics/xmedcon
 . endif
 . if !defined(WITHOUT_FFMPEG)
-LIB_DEPENDS+=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg
 . endif
 
 . if !defined(WITHOUT_LAPACK)
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 6ed29a19474e..0ac68c012a74 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Editing tool used for painting and retouching of movies
 LICENSE=	GPLv2 LGPL21 MIT
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libftgl.so:${PORTSDIR}/graphics/ftgl \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
+		libftgl.so:graphics/ftgl \
+		liblcms.so:graphics/lcms \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libfltk.so:x11-toolkits/fltk
 
 OPTIONS_DEFINE=	OYRANOS PRINT
 OYRANOS_DESC=	ICC profile support via Oyranos
@@ -40,13 +40,13 @@ PLIST_SUB=	VER="${DISTVERSION}"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOYRANOS}
-LIB_DEPENDS+=	liboyranos.so:${PORTSDIR}/graphics/oyranos
+LIB_DEPENDS+=	liboyranos.so:graphics/oyranos
 .else
 CONFIGURE_ENV+=	ac_cv_path_OY_CONFIG=no
 .endif
 
 .if ${PORT_OPTIONS:MPRINT}
-LIB_DEPENDS+=	libgutenprint.so:${PORTSDIR}/print/gutenprint-base
+LIB_DEPENDS+=	libgutenprint.so:print/gutenprint-base
 PLIST_SUB+=	PRINT=""
 .else
 CONFIGURE_ARGS+=	--disable-print
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index 5804e6c3c14b..241920ae2206 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GTK+ Integration library for Clutter
 
-LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter
 
 PORTSCOUT=	ignore:1
 
diff --git a/graphics/clutter-gtk3/Makefile b/graphics/clutter-gtk3/Makefile
index 8b658a2d0d35..25039154aa19 100644
--- a/graphics/clutter-gtk3/Makefile
+++ b/graphics/clutter-gtk3/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GTK+ Integration library for Clutter
 
-LIB_DEPENDS=	libclutter-1.0.so:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index d0bfa6e41c0f..99d8bc21290f 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -12,8 +12,8 @@ COMMENT=	OpenGL based interactive canvas library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		libcogl.so:${PORTSDIR}/graphics/cogl
+LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
+		libcogl.so:graphics/cogl
 
 PORTSCOUT=	limit:1,even
 
diff --git a/graphics/cluttermm/Makefile b/graphics/cluttermm/Makefile
index 3417f75982f6..1359468ae392 100644
--- a/graphics/cluttermm/Makefile
+++ b/graphics/cluttermm/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ interfaces for clutter
 
-LIB_DEPENDS=	libclutter-1.0.so:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter
 
 USES+=		gettext gmake libtool pathfix perl5 pkgconfig tar:xz
 USE_GNOME=	atkmm glib20 gtkmm30 libsigc++20 pangomm
diff --git a/graphics/code-eli/Makefile b/graphics/code-eli/Makefile
index a7795b9e99e7..580f0a340acf 100644
--- a/graphics/code-eli/Makefile
+++ b/graphics/code-eli/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library with functionalities for geometries
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	eigen>3:${PORTSDIR}/math/eigen3
+BUILD_DEPENDS=	eigen>3:math/eigen3
 
 USE_GITHUB=	yes
 GH_PROJECT=	Code-Eli
@@ -28,8 +28,8 @@ VSPPOD_DIR=	vsp_pod
 
 # Build options
 OPTIONS_DEFINE=		DOCS EXAMPLES
-EXAMPLES_LIB_DEPENDS=	libcpptest.so:${PORTSDIR}/devel/cpptest
-DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
+EXAMPLES_LIB_DEPENDS=	libcpptest.so:devel/cpptest
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
 DOCS_ALL_TARGET=	doc
 
 # The code uses std::cbrt(). Even if one passes some additional macros for
diff --git a/graphics/colord-gtk/Makefile b/graphics/colord-gtk/Makefile
index da8372fce2d1..4ae7e60972ab 100644
--- a/graphics/colord-gtk/Makefile
+++ b/graphics/colord-gtk/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES=	http://www.freedesktop.org/software/colord/releases/
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Manage color profiles to accurately color input/output devices
 
-BUILD_DEPENDS=	colord>=0.1.20:${PORTSDIR}/graphics/colord
-LIB_DEPENDS=	libcolord.so:${PORTSDIR}/graphics/colord \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2
+BUILD_DEPENDS=	colord>=0.1.20:graphics/colord
+LIB_DEPENDS=	libcolord.so:graphics/colord \
+		libpolkit-gobject-1.so:sysutils/polkit \
+		libdbus-1.so:devel/dbus \
+		liblcms2.so:graphics/lcms2
 
 USE_GNOME=	gtk30 intlhack introspection:build
 USES=		gettext gmake libtool pathfix pkgconfig sqlite tar:xz
@@ -28,8 +28,8 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
-MANPAGES_BUILD_DEPENDS=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
-			docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
+MANPAGES_BUILD_DEPENDS=	docbook2html:textproc/docbook-utils \
+			docbook-sgml>0:textproc/docbook-sgml
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 31fac25e1e96..c3aea6e2477f 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	http://www.freedesktop.org/software/colord/releases/
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Manage color profiles to accurately color input/output devices
 
-BUILD_DEPENDS=	spotread:${PORTSDIR}/graphics/argyllcms
-LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2
-RUN_DEPENDS=	spotread:${PORTSDIR}/graphics/argyllcms
+BUILD_DEPENDS=	spotread:graphics/argyllcms
+LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit \
+		libdbus-1.so:devel/dbus \
+		liblcms2.so:graphics/lcms2
+RUN_DEPENDS=	spotread:graphics/argyllcms
 
 USERS=		colord
 GROUPS=		colord
@@ -43,8 +43,8 @@ GLIB_SCHEMAS=	org.freedesktop.ColorHelper.gschema.xml
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	MANPAGES PPROFILES
 
-MANPAGES_BUILD_DEPENDS=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
-			docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
+MANPAGES_BUILD_DEPENDS=	docbook2html:textproc/docbook-utils \
+			docbook-sgml>0:textproc/docbook-sgml
 PPROFILES_DESC=		Build extra print profiles (long build time)
 PPROFILES_CONFIGURE_ENABLE=	print-profiles
 
diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index cd5bdcd1df1a..928871cdbd6b 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sequential image viewer
 
-LIB_DEPENDS=	libunrar.so:${PORTSDIR}/archivers/libunrar
+LIB_DEPENDS=	libunrar.so:archivers/libunrar
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/graphics/commons-utilities/Makefile b/graphics/commons-utilities/Makefile
index 6621fe8278b9..d3fb58d0d42c 100644
--- a/graphics/commons-utilities/Makefile
+++ b/graphics/commons-utilities/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Wikimedia Commons (MediaWiki) utilities for bulk image uploading
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-Text-CSV-Encoded>=0:${PORTSDIR}/textproc/p5-Text-CSV-Encoded \
-		${PYTHON_PKGNAMEPREFIX}mechanize>=0.2:${PORTSDIR}/www/py-mechanize \
-		exiv2:${PORTSDIR}/graphics/exiv2
+RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+		p5-Text-CSV-Encoded>=0:textproc/p5-Text-CSV-Encoded \
+		${PYTHON_PKGNAMEPREFIX}mechanize>=0.2:www/py-mechanize \
+		exiv2:graphics/exiv2
 
 USES=		jpeg perl5 python shebangfix
 SHEBANG_FILES=	commons-csv-creator
diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile
index b56a39a44dd8..484dc042e1dc 100644
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Easy to use graphics conversion utility
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick
 
 USES=		cmake tar:bzip2
 USE_QT4=	corelib network gui linguisttools_build moc_build qmake_build \
diff --git a/graphics/copperspice/Makefile b/graphics/copperspice/Makefile
index 6203332a0404..40a6d5d0a9cf 100644
--- a/graphics/copperspice/Makefile
+++ b/graphics/copperspice/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Modern cross-platform C++ GUI library (derived from Qt 4.8)
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	fc-cache:x11-fonts/fontconfig
+LIB_DEPENDS=	libaudio.so:audio/nas \
+		libfreetype.so:print/freetype2
 
 USES=		compiler:c++11-lib gmake iconv libtool pkgconfig tar:bz2
 USE_XORG=	ice sm x11 xcursor xext xi xinerama xrandr
diff --git a/graphics/cosmoplayer/Makefile b/graphics/cosmoplayer/Makefile
index 5121b4306b6d..b54386b6882d 100644
--- a/graphics/cosmoplayer/Makefile
+++ b/graphics/cosmoplayer/Makefile
@@ -19,7 +19,7 @@ LICENSE_NAME=	SGI
 LICENSE_FILE=	${WRKSRC}/License
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror auto-accept
 
-RUN_DEPENDS=	${JAVALIBDIR}/java40.jar:${PORTSDIR}/devel/netscape-java40
+RUN_DEPENDS=	${JAVALIBDIR}/java40.jar:devel/netscape-java40
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/graphics/crw/Makefile b/graphics/crw/Makefile
index 6bbca94eb485..63dfb6f7888c 100644
--- a/graphics/crw/Makefile
+++ b/graphics/crw/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://apollo.backplane.com/FreeBSDPorts/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to process Canon camera RAW (.crw) files
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		uidfix
 
diff --git a/graphics/cthumb/Makefile b/graphics/cthumb/Makefile
index 52bf5e893731..3e7cecd5548c 100644
--- a/graphics/cthumb/Makefile
+++ b/graphics/cthumb/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Themeable web picture album generator
 
-RUN_DEPENDS=	${LOCALBASE}/bin/pnmscale:${PORTSDIR}/graphics/netpbm \
-		${LOCALBASE}/bin/jhead:${PORTSDIR}/graphics/jhead \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	${LOCALBASE}/bin/pnmscale:graphics/netpbm \
+		${LOCALBASE}/bin/jhead:graphics/jhead \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-URI>=0:net/p5-URI
 
 USES=		jpeg:run perl5
 GNU_CONFIGURE=	yes
diff --git a/graphics/cuneiform/Makefile b/graphics/cuneiform/Makefile
index 4842b8f80e29..66a87bbc63e9 100644
--- a/graphics/cuneiform/Makefile
+++ b/graphics/cuneiform/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	IMAGEMAGICK
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.so:graphics/ImageMagick
 .endif
 
 post-patch:
diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile
index 2fb161234d30..6cb17f182d06 100644
--- a/graphics/curator/Makefile
+++ b/graphics/curator/Makefile
@@ -21,9 +21,9 @@ PLIST_FILES=	man/man1/curator.1.gz
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPIL}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imaging>=0:graphics/py-imaging
 .else
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	convert:graphics/ImageMagick
 .endif
 
 post-install:
diff --git a/graphics/cuttlefish/Makefile b/graphics/cuttlefish/Makefile
index 169ed06908c9..12f442ee0e4a 100644
--- a/graphics/cuttlefish/Makefile
+++ b/graphics/cuttlefish/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://www.caida.org/tools/visualization/cuttlefish/code/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plots diurnal and geographical patterns of supplied data
 
-RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		gifsicle:${PORTSDIR}/graphics/gifsicle
+RUN_DEPENDS+=	p5-GD>=0:graphics/p5-GD \
+		convert:graphics/ImageMagick \
+		gifsicle:graphics/gifsicle
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile
index eef79d168618..22188f02a839 100644
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Image Viewer for X Window System with thumbnail preview feature
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	IMAGEMAGICK
 OPTIONS_DEFAULT=IMAGEMAGICK
 
-IMAGEMAGICK_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick
 
 USES=		gettext
 USE_GNOME=	gtk12 gdkpixbuf
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 5a4cc3e900e8..e2982e24847f 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Virtual lighttable and darkroom for photographers
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		liblensfun.so:${PORTSDIR}/graphics/lensfun \
-		libpugixml.so:${PORTSDIR}/textproc/pugixml \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexiv2.so:graphics/exiv2 \
+		libjson-glib-1.0.so:devel/json-glib \
+		liblcms2.so:graphics/lcms2 \
+		liblensfun.so:graphics/lensfun \
+		libpugixml.so:textproc/pugixml \
+		libtiff.so:graphics/tiff
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	uses SSE instructions and 64-bit address space
@@ -53,26 +53,26 @@ CMAKE_ARGS+=	-DUSE_KWALLET:BOOL=ON
 
 # darktable 1.4+ can use colord but provides its own libcolord,
 # statically linked to libdarktable.so.
-COLORD_LIB_DEPENDS=	libcolord-gtk.so:${PORTSDIR}/graphics/colord-gtk
+COLORD_LIB_DEPENDS=	libcolord-gtk.so:graphics/colord-gtk
 COLORD_CMAKE_OFF=	-DUSE_COLORD:BOOL=OFF
 
-FLICKR_LIB_DEPENDS=	libflickcurl.so:${PORTSDIR}/www/flickcurl
+FLICKR_LIB_DEPENDS=	libflickcurl.so:www/flickcurl
 FLICKR_CMAKE_OFF=	-DUSE_FLICKR:BOOL=OFF
 
-GEO_LIB_DEPENDS=	libosmgpsmap-1.0.so:${PORTSDIR}/x11-toolkits/osm-gps-map \
-			libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+GEO_LIB_DEPENDS=	libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map \
+			libsoup-2.4.so:devel/libsoup
 GEO_CMAKE_OFF=		-DUSE_GEO:BOOL=OFF
 
-GNOMEKEYRING_LIB_DEPENDS=libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+GNOMEKEYRING_LIB_DEPENDS=libgnome-keyring.so:security/libgnome-keyring
 GNOMEKEYRING_CMAKE_OFF=	-DUSE_GNOME_KEYRING:BOOL=OFF
 
-GPHOTO_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 GPHOTO_CMAKE_OFF=	-DUSE_CAMERA_SUPPORT:BOOL=OFF
 
-GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick
+GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHMAGICK_CMAKE_OFF=	-DUSE_GRAPHICSMAGICK:BOOL=OFF
 
-LIBSECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 LIBSECRET_CMAKE_OFF=	-DUSE_LIBSECRET:BOOL=OFF
 
 LUA_USES=		lua:52
@@ -81,13 +81,13 @@ LUA_CMAKE_OFF=		-DUSE_LUA:BOOL=OFF
 NLS_USES=		gettext
 NLS_CMAKE_OFF=		-DUSE_NLS:BOOL=OFF
 
-OPENEXR_LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 OPENEXR_CMAKE_OFF=	-DUSE_OPENEXR:BOOL=OFF
 
-OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
 OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF
 
-PRINT_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+PRINT_LIB_DEPENDS=	libcups.so:print/cups
 PRINT_CMAKE_OFF=	-DBUILD_PRINT:BOOL=OFF
 
 RAWSPEED_CMAKE_OFF=	-DDONT_USE_RAWSPEED:BOOL=ON
@@ -95,18 +95,18 @@ RAWSPEED_CMAKE_OFF=	-DDONT_USE_RAWSPEED:BOOL=ON
 SLIDESHOW_USE=		GL=gl SDL=sdl
 SLIDESHOW_CMAKE_OFF=	-DBUILD_SLIDESHOW:BOOL=OFF
 
-SQUISH_BUILD_DEPENDS=	${LOCALBASE}/lib/libsquish.a:${PORTSDIR}/graphics/squish
+SQUISH_BUILD_DEPENDS=	${LOCALBASE}/lib/libsquish.a:graphics/squish
 SQUISH_CMAKE_OFF=	-DUSE_SQUISH:BOOL=OFF
 
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CMAKE_OFF=		-DUSE_WEBP:BOOL=OFF
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 && ${COMPILER_TYPE} == clang
 # Enable OpenMP support with Clang 3.7.
-BUILD_DEPENDS+=	clang37:${PORTSDIR}/devel/llvm37
-RUN_DEPENDS+=	clang37:${PORTSDIR}/devel/llvm37
+BUILD_DEPENDS+=	clang37:devel/llvm37
+RUN_DEPENDS+=	clang37:devel/llvm37
 
 CPP=		clang-cpp37
 CC=		clang37
diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile
index c60122455e7f..6d6b20c20c27 100644
--- a/graphics/dataplot/Makefile
+++ b/graphics/dataplot/Makefile
@@ -16,8 +16,8 @@ EXTRACT_ONLY=	dpsrc${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free software system for statistical visualization
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libpng.so:graphics/png
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DISTFILES=	dpsnapsh.pdf:doc
diff --git a/graphics/dcp2icc/Makefile b/graphics/dcp2icc/Makefile
index e347d2437d3b..260bac60ecdd 100644
--- a/graphics/dcp2icc/Makefile
+++ b/graphics/dcp2icc/Makefile
@@ -12,8 +12,8 @@ COMMENT=	DCP to ICC camera profile converter
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		liblcms.so:${PORTSDIR}/graphics/lcms
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		liblcms.so:graphics/lcms
 
 USES=		localbase scons tar:bzip2
 USE_GCC=	any	# segfaults on exit when built with Clang
diff --git a/graphics/dcraw-m/Makefile b/graphics/dcraw-m/Makefile
index 619327cd3fea..e5d16103df2b 100644
--- a/graphics/dcraw-m/Makefile
+++ b/graphics/dcraw-m/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Modified Decoder for RAW files from digital cameras
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libjasper.so:graphics/jasper \
+		liblcms2.so:graphics/lcms2 \
+		libMagickWand-6.so:graphics/ImageMagick
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	waitman
diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile
index d7e4c489597f..c160c6282907 100644
--- a/graphics/dcraw/Makefile
+++ b/graphics/dcraw/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/sunpoet
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Decoder for RAW files from digital cameras
 
-LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2
+LIB_DEPENDS=	libjasper.so:graphics/jasper \
+		liblcms2.so:graphics/lcms2
 
 CFLAGS+=	-I${LOCALBASE}/include/jasper
 LDFLAGS+=	-ljasper -ljpeg -llcms2 -lm
diff --git a/graphics/deegree-csw/Makefile b/graphics/deegree-csw/Makefile
index 0a64dd441431..77786429b02c 100644
--- a/graphics/deegree-csw/Makefile
+++ b/graphics/deegree-csw/Makefile
@@ -36,15 +36,15 @@ OPTIONS_DEFINE=	DOCS
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=	8180
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=	8080
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
diff --git a/graphics/deegree-igeoportal/Makefile b/graphics/deegree-igeoportal/Makefile
index 188cbafa0ab7..a1563fbe0c05 100644
--- a/graphics/deegree-igeoportal/Makefile
+++ b/graphics/deegree-igeoportal/Makefile
@@ -35,15 +35,15 @@ OPTIONS_DEFINE=	DOCS
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=	8180
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=	8080
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
diff --git a/graphics/deegree-wcs/Makefile b/graphics/deegree-wcs/Makefile
index 6eb81b72d260..e1efcd2d2354 100644
--- a/graphics/deegree-wcs/Makefile
+++ b/graphics/deegree-wcs/Makefile
@@ -35,15 +35,15 @@ OPTIONS_DEFINE=	DOCS
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=	8180
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=	8080
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
diff --git a/graphics/deegree-wfs/Makefile b/graphics/deegree-wfs/Makefile
index 3793fcceba45..a43ce55d6e87 100644
--- a/graphics/deegree-wfs/Makefile
+++ b/graphics/deegree-wfs/Makefile
@@ -35,15 +35,15 @@ OPTIONS_DEFINE=	DOCS
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=	8180
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=	8080
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
diff --git a/graphics/deegree-wms/Makefile b/graphics/deegree-wms/Makefile
index c71b675b6b10..8970dcf0bbb0 100644
--- a/graphics/deegree-wms/Makefile
+++ b/graphics/deegree-wms/Makefile
@@ -35,15 +35,15 @@ OPTIONS_DEFINE=	DOCS
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=	8180
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=	8080
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
diff --git a/graphics/deegree-wps/Makefile b/graphics/deegree-wps/Makefile
index 568df6a48028..8d0f02bee691 100644
--- a/graphics/deegree-wps/Makefile
+++ b/graphics/deegree-wps/Makefile
@@ -35,15 +35,15 @@ OPTIONS_DEFINE=	DOCS
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=	8180
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=	8080
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
diff --git a/graphics/deegree-wpvs/Makefile b/graphics/deegree-wpvs/Makefile
index 0e132ba7e92b..0934519c45fa 100644
--- a/graphics/deegree-wpvs/Makefile
+++ b/graphics/deegree-wpvs/Makefile
@@ -35,15 +35,15 @@ OPTIONS_DEFINE=	DOCS
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=	8180
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=	8080
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 454061966596..83aad919cc97 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -44,22 +44,22 @@ SIMD_DESC=	Enable SIMD autodetection (AltiVec, SSE3,...)
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg
-JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JASPER_CONFIGURE_ENABLE=jp2
-LCMS_LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms
+LCMS_LIB_DEPENDS=	liblcms.so:graphics/lcms
 LCMS_CONFIGURE_ENABLE=	lcms
-MNG_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
+MNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 MNG_CONFIGURE_ENABLE=	mng
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	png
 PNG_CONFIGURE_OFF=	libpng_app=no
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_ENABLE=	tiff
-EXR_LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+EXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 EXR_CONFIGURE_ENABLE=	exr
-#SQUISH_BUILD_DEPENDS=	${LOCALBASE}/lib/libsquish.a:${PORTSDIR}/graphics/squish
+#SQUISH_BUILD_DEPENDS=	${LOCALBASE}/lib/libsquish.a:graphics/squish
 #SQUISH_CONFIGURE_WITH=	libsquish
-NVTT_LIB_DEPENDS=	libnvtt.so:${PORTSDIR}/graphics/nvidia-texture-tools
+NVTT_LIB_DEPENDS=	libnvtt.so:graphics/nvidia-texture-tools
 NVTT_CONFIGURE_WITH=	nvtt
 X11_USE=		GL=glut
 X11_CONFIGURE_OFF=-	-disable-opengl --disable-x11 --disable-xpm --disable-shm
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 687bc5976a5f..a0a04140b777 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Diagram creation program, similar to Visio
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig tar:xz
@@ -28,11 +28,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-gnome
 INSTALL_TARGET=	install-strip
 
-DOCS_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 .include <bsd.port.options.mk>
 
 #.if ${ARCH} == "i386"
-#LIB_DEPENDS+=		libEMF.so:${PORTSDIR}/graphics/libemf
+#LIB_DEPENDS+=		libEMF.so:graphics/libemf
 #CONFIGURE_ARGS+=	--enable-libemf
 #PLIST_SUB+=		WMF=""
 #.else
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index c76a754eefa8..3b3fc5cbcf97 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -12,17 +12,17 @@ COMMENT=	KDE4 digital photo management application
 
 .include "${.CURDIR}/Makefile.common"
 
-BUILD_DEPENDS=	${LOCALBASE}/include/eigen3/Eigen/Eigen:${PORTSDIR}/math/eigen3
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		liblensfun.so:${PORTSDIR}/graphics/lensfun \
-		liblqr-1.so:${PORTSDIR}/graphics/liblqr-1 \
-		libkface.so:${PORTSDIR}/graphics/libkface \
-		libpgf.so:${PORTSDIR}/graphics/libpgf \
-		libkgeomap.so:${PORTSDIR}/astro/libkgeomap \
-		libboost_graph.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/eigen3/Eigen/Eigen:math/eigen3
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		liblcms.so:graphics/lcms \
+		libpng.so:graphics/png \
+		libjasper.so:graphics/jasper \
+		liblensfun.so:graphics/lensfun \
+		liblqr-1.so:graphics/liblqr-1 \
+		libkface.so:graphics/libkface \
+		libpgf.so:graphics/libpgf \
+		libkgeomap.so:astro/libkgeomap \
+		libboost_graph.so:devel/boost-libs
 
 USES+=		pkgconfig shebangfix
 USE_KDE4+=	libkdcraw libkexiv2 libkipi
@@ -38,12 +38,12 @@ OPTIONS_DEFAULT=	GPHOTO2 PIMLIBS
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=		yes # MYSQL
 
-DOCS_RUN_DEPENDS=	digikam-doc>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-doc
+DOCS_RUN_DEPENDS=	digikam-doc>=${DIGIKAM_VER}:graphics/digikam-kde4-doc
 
-NLS_RUN_DEPENDS=	digikam-l10n>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-l10n
+NLS_RUN_DEPENDS=	digikam-l10n>=${DIGIKAM_VER}:graphics/digikam-kde4-l10n
 
 GPHOTO2_DESC=		Gphoto2 camera support
-GPHOTO2_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 GPHOTO2_CMAKE_OFF=	-DWITH_Gphoto2:BOOL=OFF
 
 PIMLIBS_DESC=		Address book support
@@ -52,7 +52,7 @@ PIMLIBS_CMAKE_ON=	-DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON
 PIMLIBS_CMAKE_OFF=	-DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF
 
 MYSQL_USE=		MYSQL=server QT4=sql-mysql_run
-MYSQL_BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/${_MYSQL_SERVER}
+MYSQL_BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER}
 MYSQL_CMAKE_ON= 	-DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
 			-DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin
 MYSQL_CMAKE_OFF=	-DENABLE_INTERNALMYSQL:BOOL=OFF
diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common
index 8bcc9befe8ac..50db7bbddd5b 100644
--- a/graphics/digikam-kde4/Makefile.common
+++ b/graphics/digikam-kde4/Makefile.common
@@ -137,7 +137,7 @@ USES+=		pkgconfig
 
 .if ${KIPI_PLUGIN} != "libkipiplugins"
 EXTRA_PATCHES=	${.CURDIR}/../../graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt
-LIB_DEPENDS+=	libkipiplugins.so:${PORTSDIR}/graphics/libkipiplugins
+LIB_DEPENDS+=	libkipiplugins.so:graphics/libkipiplugins
 .endif
 
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions ${DISTNAME}/extra/kipi-plugins
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 54d79bbcf1cb..7ab67f3ce557 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Standalone Djvu viewer and plugin based on Qt toolkit
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2
-LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS=	rsvg-convert:graphics/librsvg2
+LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre \
+		libtiff.so:graphics/tiff
 
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index baa84b8bd04e..801e8fff237b 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -13,7 +13,7 @@ COMMENT=	DjVu base libraries and utilities
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
@@ -33,7 +33,7 @@ OPTIONS_DEFINE=		DOCS ANY2DJVU
 OPTIONS_SUB=		yes
 
 ANY2DJVU_DESC=		Install any2djvu script (requires curl)
-ANY2DJVU_RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+ANY2DJVU_RUN_DEPENDS=	curl:ftp/curl
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile
index d4b2b922bc46..04b1420cd1f6 100644
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/libdmtx/libdmtx/${PORTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Software for reading and writing Data Matrix barcodes
 
-LIB_DEPENDS=	libdmtx.so:${PORTSDIR}/graphics/libdmtx
+LIB_DEPENDS=	libdmtx.so:graphics/libdmtx
 
 USES=		tar:bzip2 pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 7f664ae51f97..0fcff137905e 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
-LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libdrm.so:graphics/libdrm \
+		libexpat.so:textproc/expat2
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto \
 		presentproto xvmc xshmfence
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index 537aac1d3363..bcd2b877adec 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	${PORTNAME}_${PORTVERSION}.orig.tar.gz
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Configuration program for DRI drivers
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
 
 USE_GL=		glut
 USE_PYTHON=	distutils
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
index 06a487e90abe..83920d591ab2 100644
--- a/graphics/edje_viewer/Makefile
+++ b/graphics/edje_viewer/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	LOCAL/gblach/e17/extra/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Simple viewer for .edj files
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libelementary.so:${PORTSDIR}/x11-toolkits/elementary
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libelementary.so:x11-toolkits/elementary
 
 USES=		pkgconfig tar:bzip2
 DIST_SUBDIR=	e17
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index 602deeffffae..e08a5d426322 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -22,16 +22,16 @@ OPTIONS_DEFINE=		DBUS NLS PDF PS
 OPTIONS_DEFAULT=	DBUS PDF
 OPTIONS_SUB=		yes
 
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 DBUS_CONFIGURE_OFF=	--disable-dbus
 
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
-PDF_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 PDF_CONFIGURE_OFF=	--disable-pdf
 
-PS_LIB_DEPENDS=		libspectre.so:${PORTSDIR}/print/libspectre
+PS_LIB_DEPENDS=		libspectre.so:print/libspectre
 PS_CONFIGURE_OFF=	--disable-ps
 
 post-install:
diff --git a/graphics/embree/Makefile b/graphics/embree/Makefile
index ded25101bf39..1537dbdc1a64 100644
--- a/graphics/embree/Makefile
+++ b/graphics/embree/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Collection of high-performance ray tracing kernels
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick \
+		libIlmImf.so:graphics/OpenEXR
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	heavy use of SSE instructions
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 22634b648ce0..9389fead5b2b 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -11,15 +11,15 @@ DISTNAME=	enblend-enfuse-${PORTVERSION}
 MAINTAINER=	grog@FreeBSD.org
 COMMENT=	Tool for image blending with multiresolution splines
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man \
-		${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo \
-		OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
-LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libvigraimpex.so:${PORTSDIR}/graphics/vigra \
-		libgsl.so:${PORTSDIR}/math/gsl
-RUN_DEPENDS=	OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
+BUILD_DEPENDS=	help2man:misc/help2man \
+		${LOCALBASE}/bin/makeinfo:print/texinfo \
+		OpenEXR>=1.0:graphics/OpenEXR
+LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
+		libtiff.so:graphics/tiff \
+		libboost_filesystem.so:devel/boost-libs \
+		libvigraimpex.so:graphics/vigra \
+		libgsl.so:math/gsl
+RUN_DEPENDS=	OpenEXR>=1.0:graphics/OpenEXR
 
 USE_AUTOTOOLS=	automake:env autoconf:env
 USES=		compiler:features gmake jpeg makeinfo
diff --git a/graphics/entangle/Makefile b/graphics/entangle/Makefile
index b5eb33652d03..eb50d2f7239d 100644
--- a/graphics/entangle/Makefile
+++ b/graphics/entangle/Makefile
@@ -11,16 +11,16 @@ COMMENT=	Digital camera tethered control and capture program
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/share/icons/mate/scalable/devices/camera-photo-symbolic.svg:${PORTSDIR}/x11-themes/mate-icon-theme \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \
-		libraw_r.so:${PORTSDIR}/graphics/libraw \
-		libpeas-1.0.so:${PORTSDIR}/devel/libpeas
+BUILD_DEPENDS=	${LOCALBASE}/share/icons/mate/scalable/devices/camera-photo-symbolic.svg:x11-themes/mate-icon-theme \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2 \
+		libdbus-glib-1.so:devel/dbus-glib \
+		liblcms2.so:graphics/lcms2 \
+		libgexiv2.so:graphics/gexiv2 \
+		libraw_r.so:graphics/libraw \
+		libpeas-1.0.so:devel/libpeas
 RUN_DEPENDS:=	${BUILD_DEPENDS:Nitstool*} \
-		${PYTHON_PKGNAMEPREFIX}libpeas>=0:${PORTSDIR}/devel/py3-libpeas
+		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
 
 USES=		gettext-tools gmake libtool pkgconfig python:3
 GNU_CONFIGURE=	yes
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index b32e7f9da642..44c8aedee2e8 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plug-ins for the Eye of GNOME image viewer application
 
-BUILD_DEPENDS=	eog:${PORTSDIR}/graphics/eog
-LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libpeas-1.0.so:${PORTSDIR}/devel/libpeas
-RUN_DEPENDS=	eog:${PORTSDIR}/graphics/eog
+BUILD_DEPENDS=	eog:graphics/eog
+LIB_DEPENDS=	libgdata.so:devel/libgdata \
+		libexif.so:graphics/libexif \
+		libpeas-1.0.so:devel/libpeas
+RUN_DEPENDS=	eog:graphics/eog
 
 PORTSCOUT=	limitw:1,even
 
@@ -35,7 +35,7 @@ CHAMPLAIN_DESC=	Champlain map plugin
 
 .if ${PORT_OPTIONS:MCHAMPLAIN}
 USE_GL=		gl
-LIB_DEPENDS+=	libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain
+LIB_DEPENDS+=	libchamplain-0.12.so:graphics/libchamplain
 PLIST_SUB+=	CHAMPLAIN=""
 .else
 PLIST_SUB+=	CHAMPLAIN="@comment "
@@ -43,7 +43,7 @@ PLIST_SUB+=	CHAMPLAIN="@comment "
 
 PLIST_SUB+=	PYVER=${PYTHON_VER:S|.||}
 .if ${PORT_OPTIONS:MPYTHON}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}libpeas>=0:${PORTSDIR}/devel/py3-libpeas
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
 CONFIGURE_ARGS+=--enable-python
 USES+=		python:3
 PLIST_SUB+=	PYTHON=""
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 4a2e2cc4317c..d8483284c4e6 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The Eye Of Gnome image viewer
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libpeas-gtk-1.0.so:${PORTSDIR}/devel/libpeas \
-		liblcms.so:${PORTSDIR}/graphics/lcms
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libpeas-gtk-1.0.so:devel/libpeas \
+		liblcms.so:graphics/lcms
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
@@ -44,7 +44,7 @@ _WITH_EXEMPI=	no
 
 .if ${PORT_OPTIONS:MEXIF}
 CONFIGURE_ARGS+=--with-libexif
-LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS+=	libexif.so:graphics/libexif
 PLIST_SUB+=	EXIF=""
 _WITH_EXIF=	yes
 .else
@@ -54,7 +54,7 @@ PLIST_SUB+=	EXIF="@comment "
 
 .if ${PORT_OPTIONS:MEXEMPI}
 CONFIGURE_ARGS+=--with-xmp
-LIB_DEPENDS+=	libexempi.so:${PORTSDIR}/textproc/exempi
+LIB_DEPENDS+=	libexempi.so:textproc/exempi
 _WITH_EXEMPI=	yes
 .else
 CONFIGURE_ARGS+=--without-xmp
diff --git a/graphics/eom/Makefile b/graphics/eom/Makefile
index 2997f116c00c..6ef4f0725d5f 100644
--- a/graphics/eom/Makefile
+++ b/graphics/eom/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Eye of MATE image viewer
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
@@ -46,7 +46,7 @@ _WITH_EXEMPI=	no
 
 .if ${PORT_OPTIONS:MEXIF}
 CONFIGURE_ARGS+=--with-libexif
-LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS+=	libexif.so:graphics/libexif
 PLIST_SUB+=	EXIF=""
 _WITH_EXIF=	yes
 .else
@@ -56,7 +56,7 @@ PLIST_SUB+=	EXIF="@comment "
 
 .if ${PORT_OPTIONS:MEXEMPI}
 CONFIGURE_ARGS+=--with-xmp
-LIB_DEPENDS+=	libexempi.so:${PORTSDIR}/textproc/exempi
+LIB_DEPENDS+=	libexempi.so:textproc/exempi
 _WITH_EXEMPI=	yes
 .else
 CONFIGURE_ARGS+=--without-xmp
diff --git a/graphics/eos-movrec/Makefile b/graphics/eos-movrec/Makefile
index 20e3b2c416f8..b08795166a7f 100644
--- a/graphics/eos-movrec/Makefile
+++ b/graphics/eos-movrec/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Capture short movies with Canon DSLR camera
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 USES=		cmake dos2unix pkgconfig tar:bzip2
 DOS2UNIX_GLOB=	*.pro *.cpp *.h
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index cccc98e685e0..1c12cb51cc7a 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Lightweight PDF document viewer
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+BUILD_DEPENDS=	cppunit-config:devel/cppunit
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	CUPS NLS
 OPTIONS_SUB=	yes
 
 CUPS_CONFIGURE_WITH=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 NLS_USES=	gettext
 NLS_CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile
index 8eb9e34b12cd..6f749a2640fe 100644
--- a/graphics/epix/Makefile
+++ b/graphics/epix/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Creates math plots and line figures using easy-to-learn syntax
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake makeinfo tar:bzip2
 USE_TEX=	latex dvipsk:build texmf:build
diff --git a/graphics/evas_generic_loaders-gst/Makefile b/graphics/evas_generic_loaders-gst/Makefile
index 44843edf1a8a..94270e1778b7 100644
--- a/graphics/evas_generic_loaders-gst/Makefile
+++ b/graphics/evas_generic_loaders-gst/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Additional loader for Evas (GStreamer)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl
+LIB_DEPENDS=	libefl.so:devel/efl
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/graphics/evas_generic_loaders-pdf/Makefile b/graphics/evas_generic_loaders-pdf/Makefile
index 2c82904047d1..e6a0bea2b039 100644
--- a/graphics/evas_generic_loaders-pdf/Makefile
+++ b/graphics/evas_generic_loaders-pdf/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Additional loader for Evas (pdf)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libpoppler.so:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libpoppler.so:graphics/poppler
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/graphics/evas_generic_loaders-ps/Makefile b/graphics/evas_generic_loaders-ps/Makefile
index 37a63613046e..d581c34adb60 100644
--- a/graphics/evas_generic_loaders-ps/Makefile
+++ b/graphics/evas_generic_loaders-ps/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Additional loader for Evas (ps)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libspectre.so:${PORTSDIR}/print/libspectre
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libspectre.so:print/libspectre
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/graphics/evas_generic_loaders-raw/Makefile b/graphics/evas_generic_loaders-raw/Makefile
index f171c3786db5..a557da1c4790 100644
--- a/graphics/evas_generic_loaders-raw/Makefile
+++ b/graphics/evas_generic_loaders-raw/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Additional loader for Evas (raw)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libraw.so:${PORTSDIR}/graphics/libraw
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libraw.so:graphics/libraw
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/graphics/evas_generic_loaders-svg/Makefile b/graphics/evas_generic_loaders-svg/Makefile
index 291ca9bb964e..90f7121242d5 100644
--- a/graphics/evas_generic_loaders-svg/Makefile
+++ b/graphics/evas_generic_loaders-svg/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Additional loader for Evas (svg)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl
+LIB_DEPENDS=	libefl.so:devel/efl
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/graphics/evas_generic_loaders-xcf/Makefile b/graphics/evas_generic_loaders-xcf/Makefile
index 7cc6670fd864..209589b7555f 100644
--- a/graphics/evas_generic_loaders-xcf/Makefile
+++ b/graphics/evas_generic_loaders-xcf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Additional loader for Evas (xcf)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl
+LIB_DEPENDS=	libefl.so:devel/efl
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/graphics/evas_generic_loaders/Makefile b/graphics/evas_generic_loaders/Makefile
index 072baedbe7b8..a80545cac5e4 100644
--- a/graphics/evas_generic_loaders/Makefile
+++ b/graphics/evas_generic_loaders/Makefile
@@ -15,7 +15,7 @@ OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 
 .for NODE in ${OPTIONS_DEFINE}
 ${NODE}_DESC=	Install ${NODE:tl} loader
-${NODE}_RUN_DEPENDS+=	${LOCALBASE}/lib/evas/utils/evas_image_loader.${NODE:tl}:${PORTSDIR}/graphics/evas_generic_loaders-${NODE:tl}
+${NODE}_RUN_DEPENDS+=	${LOCALBASE}/lib/evas/utils/evas_image_loader.${NODE:tl}:graphics/evas_generic_loaders-${NODE:tl}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index f3db2fb4f780..0fdfae3f0574 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -10,15 +10,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	GNOME 3 multi-format document viewer
 
-BUILD_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		itstool:${PORTSDIR}/textproc/itstool \
-		adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
-		libspectre.so:${PORTSDIR}/print/libspectre
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		itstool:textproc/itstool \
+		adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib \
+		libspectre.so:print/libspectre
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 SLAVEPORT?=	no
@@ -72,7 +72,7 @@ USE_TEX=	latex
 CONFIGURE_ARGS+=	--enable-dvi
 PLIST_SUB+=		DVI=""
 . if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS+=	libt1.so:devel/t1lib
 CONFIGURE_ARGS+=	--enable-t1lib
 . else
 CONFIGURE_ARGS+=	--disable-t1lib
@@ -83,7 +83,7 @@ PLIST_SUB+=		DVI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+=	libsecret-1.so:${PORTSDIR}/security/libsecret
+LIB_DEPENDS+=	libsecret-1.so:security/libsecret
 .else
 CONFIGURE_ARGS+=--without-keyring
 .endif
@@ -93,14 +93,14 @@ USE_GNOME+=		nautilus3
 CONFIGURE_ARGS+=	--enable-nautilus
 PLIST_SUB+=		NAUTILUS=""
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
-RUN_DEPENDS+=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS+=	${LOCALBASE}/share/icons/gnome/index.theme:misc/gnome-icon-theme
+RUN_DEPENDS+=	${LOCALBASE}/share/icons/gnome/index.theme:misc/gnome-icon-theme
 CONFIGURE_ARGS+=	--disable-nautilus
 PLIST_SUB+=		NAUTILUS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MXPS}
-LIB_DEPENDS+=		libgxps.so:${PORTSDIR}/graphics/libgxps
+LIB_DEPENDS+=		libgxps.so:graphics/libgxps
 CONFIGURE_ARGS+=	--enable-xps
 PLIST_SUB+=		XPS=""
 .else
@@ -109,7 +109,7 @@ PLIST_SUB+=		XPS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDJVU}
-LIB_DEPENDS+=		libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
+LIB_DEPENDS+=		libdjvulibre.so:graphics/djvulibre
 CONFIGURE_ARGS+=	--enable-djvu
 PLIST_SUB+=		DJVU=""
 .else
diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
index 9165a41c074d..4d897fe4b4aa 100644
--- a/graphics/evolvotron/Makefile
+++ b/graphics/evolvotron/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Generative software that evolves images/textures/patterns
 
 LICENSE=	GPLv3+ # LICENSE file is GPLv2 though
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile
index 95d534a2e34d..e40d32528a08 100644
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Fast image processing library
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libagg.so:${PORTSDIR}/graphics/agg \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	swig:devel/swig13
+LIB_DEPENDS=	libagg.so:graphics/agg \
+		libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libgif.so:graphics/giflib \
+		libjasper.so:graphics/jasper \
+		libIlmImf.so:graphics/OpenEXR \
+		liblcms.so:graphics/lcms \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2
 
 #hack to get custom exactcode configure script to enable tiff support with
 #broken headers on c++ in base system:
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index 5b794f6d6ef3..2c5d651a249c 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Command line utility to read and manipulate EXIF data
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libpopt.so:devel/popt
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/graphics/exiftran/Makefile b/graphics/exiftran/Makefile
index aa413f9822f5..0ac50dbe4f23 100644
--- a/graphics/exiftran/Makefile
+++ b/graphics/exiftran/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.kraxel.org/releases/fbida/
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Command line utility to transform jpeg files
 
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	libexif.so:graphics/libexif
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 72282351e065..20751cfd7754 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Exif, IPTC, and XMP metadata manipulation library and tools
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 USES=		cpe gettext gmake iconv libtool
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index e1f351a312d1..066764302ed7 100644
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Utilities for manipulating with HDR images in OpenEXR format
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
+		libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USES=		gmake jpeg pkgconfig
diff --git a/graphics/farbfeld/Makefile b/graphics/farbfeld/Makefile
index 222c908d4173..b60add97eb16 100644
--- a/graphics/farbfeld/Makefile
+++ b/graphics/farbfeld/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Lossless, uncompressed graphics format
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		jpeg
 
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index c3f4d4470d52..0c3b45d7ce97 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Image viewer that utilizes Imlib2
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libImlib2.so:graphics/imlib2
 
 USE_XORG=	x11 xt xinerama
 USES=		cpe desktop-file-utils gmake perl5 shebangfix tar:bzip2
diff --git a/graphics/figurine/Makefile b/graphics/figurine/Makefile
index ba5790b3e80c..e23fccf52485 100644
--- a/graphics/figurine/Makefile
+++ b/graphics/figurine/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	DOCS
 
-RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
+RUN_DEPENDS=	fig2dev:print/transfig
 
 GNU_CONFIGURE=	yes
 USE_XORG=	xpm
diff --git a/graphics/flam3/Makefile b/graphics/flam3/Makefile
index 64b04dfb7fc6..832dda6189bb 100644
--- a/graphics/flam3/Makefile
+++ b/graphics/flam3/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://flam3.com/ \
 MAINTAINER=	john.c.prather@gmail.com
 COMMENT=	Flame Renderer
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 USES=		gmake jpeg libtool pathfix pkgconfig
diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index f319fb2b4716..2c294d8ae535 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Basic image management and display program
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2 \
+		libfltk.so:x11-toolkits/fltk \
+		libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 79d298709ad9..d9047edd647d 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://fossies.org/unix/www/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple drawing language to generate GIFs on the fly
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/graphics/fortytwo/Makefile b/graphics/fortytwo/Makefile
index a74d5222840b..d5a49076d154 100644
--- a/graphics/fortytwo/Makefile
+++ b/graphics/fortytwo/Makefile
@@ -16,8 +16,8 @@ LICENSE=	LGPL21
 USES=		gnustep
 USE_GNUSTEP=	back build
 
-LIB_DEPENDS=	libEncore.so:${PORTSDIR}/devel/fortytwo-encore \
-		libBDB.so:${PORTSDIR}/databases/fortytwo-bdb
+LIB_DEPENDS=	libEncore.so:devel/fortytwo-encore \
+		libBDB.so:databases/fortytwo-bdb
 DEFAULT_LIBVERSION=	0.1
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_BDB=	43+
diff --git a/graphics/fotofix/Makefile b/graphics/fotofix/Makefile
index 96cd919a3a7c..866c3442a5f7 100644
--- a/graphics/fotofix/Makefile
+++ b/graphics/fotofix/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	graphics
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple image viewer
 
-RUN_DEPENDS=	IPA>=1.03:${PORTSDIR}/graphics/IPA \
-		p5-Prima>=1.22:${PORTSDIR}/x11-toolkits/p5-Prima
+RUN_DEPENDS=	IPA>=1.03:graphics/IPA \
+		p5-Prima>=1.22:x11-toolkits/p5-Prima
 
 NO_ARCH=	yes
 
diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index d0531abd5c49..456de93be2b1 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Application to organize and edit image collections
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
-		dcraw:${PORTSDIR}/graphics/dcraw \
-		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		ufraw-batch:${PORTSDIR}/graphics/ufraw
+RUN_DEPENDS=	xdg-open:devel/xdg-utils \
+		dcraw:graphics/dcraw \
+		exiftool:graphics/p5-Image-ExifTool \
+		ufraw-batch:graphics/ufraw
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile
index 824eec0cb6eb..c4d4ba741207 100644
--- a/graphics/fpc-cairo/Makefile
+++ b/graphics/fpc-cairo/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBCAIRO
 LIBCAIRO_DESC=	Install cairo vector graphics library
 OPTIONS_DEFAULT=	LIBCAIRO
 
-LIBCAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIBCAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-hermes/Makefile b/graphics/fpc-hermes/Makefile
index 1050ebb75d67..588cae17cefe 100644
--- a/graphics/fpc-hermes/Makefile
+++ b/graphics/fpc-hermes/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	HERMES
 HERMES_DESC=	Install hermes graphics library
 OPTIONS_DEFAULT=	HERMES
 
-HERMES_LIB_DEPENDS=	libHermes.so:${PORTSDIR}/graphics/Hermes
+HERMES_LIB_DEPENDS=	libHermes.so:graphics/Hermes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile
index 5a64ef6e1260..aa93b22f2511 100644
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	IMAGEMAGICK
 IMAGEMAGICK_DESC=	Install ImageMagick image proccesing tool
 OPTIONS_DEFAULT=	IMAGEMAGICK
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile
index d128a4bf3011..36ddc73b6107 100644
--- a/graphics/fpc-libgd/Makefile
+++ b/graphics/fpc-libgd/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBGD
 LIBGD_DESC=	Install gd graphic library
 OPTIONS_DEFAULT=	LIBGD
 
-LIBGD_LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIBGD_LIB_DEPENDS=	libgd.so:graphics/gd
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile
index 293a945bc8f4..90daf6ac5351 100644
--- a/graphics/fpc-libpng/Makefile
+++ b/graphics/fpc-libpng/Makefile
@@ -18,6 +18,6 @@ OPTIONS_DEFINE=	LIBPNG
 LIBPNG_DESC=	Install png library for manipulating PNG images
 OPTIONS_DEFAULT=	LIBPNG
 
-LIBPNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIBPNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-proj4/Makefile b/graphics/fpc-proj4/Makefile
index 53a04984f06c..d5c8986fefa7 100644
--- a/graphics/fpc-proj4/Makefile
+++ b/graphics/fpc-proj4/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	PROJ
 PROJ_DESC=	Install proj library
 OPTIONS_DEFAULT=	PROJ
 
-PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
+PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile
index a252569f8278..23341bff96c3 100644
--- a/graphics/fpc-rsvg/Makefile
+++ b/graphics/fpc-rsvg/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBRSVG2
 LIBRSVG2_DESC=	Install librsvg2 library
 OPTIONS_DEFAULT=	LIBRSVG2
 
-LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile
index ebd60c03d1a8..f06c13a3fe97 100644
--- a/graphics/fpc-svgalib/Makefile
+++ b/graphics/fpc-svgalib/Makefile
@@ -16,6 +16,6 @@ EXTRACTUNITDIR=	${WRKUNITDIR}
 OPTIONS_DEFINE=	SVGA
 SVGA_DESC=	Install svgalib low level console graphics library
 
-SVGA_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGA_LIB_DEPENDS=	libvga.so:graphics/svgalib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 703a3768e4cd..e0a22f2e7006 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Interactive tool for creating random fractal planets and terrain
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
+LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -44,7 +44,7 @@ OPTIONS_DEFINE=	DOXYGEN DOCS
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 .endif
 
 post-patch:
diff --git a/graphics/frei0r-plugins/Makefile b/graphics/frei0r-plugins/Makefile
index 56b75f76d4eb..7deec2cfaedc 100644
--- a/graphics/frei0r-plugins/Makefile
+++ b/graphics/frei0r-plugins/Makefile
@@ -8,7 +8,7 @@ EXTRACT_ONLY=	# empty
 
 COMMENT=	Frei0r meta-port
 
-RUN_DEPENDS=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+RUN_DEPENDS=	${LOCALBASE}/include/frei0r.h:graphics/frei0r
 
 MASTERDIR=	${.CURDIR}/../frei0r
 NO_BUILD=	yes
@@ -28,11 +28,11 @@ PATCHDIR=	${.CURDIR}/files
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGAVL}
-RUN_DEPENDS+=	${LOCALBASE}/lib/frei0r-1/rgbparade.so:${PORTSDIR}/graphics/frei0r-plugins-gavl
+RUN_DEPENDS+=	${LOCALBASE}/lib/frei0r-1/rgbparade.so:graphics/frei0r-plugins-gavl
 .endif
 
 .if ${PORT_OPTIONS:MOPENCV}
-RUN_DEPENDS+=	${LOCALBASE}/lib/frei0r-1/facedetect.so:${PORTSDIR}/graphics/frei0r-plugins-opencv
+RUN_DEPENDS+=	${LOCALBASE}/lib/frei0r-1/facedetect.so:graphics/frei0r-plugins-opencv
 .endif
 
 do-install:
diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index b5de51b85c55..c703c510cd47 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -30,13 +30,13 @@ IGNORE=		cannot build OpenCV and gavl plugins simultaneously
 PORTREVISION=	3
 COMMENT=	Frei0r OpenCV plugins
 PKGNAMESUFFIX=	-plugins-opencv
-LIB_DEPENDS+=	libopencv_legacy.so:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
 FREI0R_PLUGINS=	facebl0r facedetect
 .elif defined(BUILDING_FREI0R_GAVL)
 PORTREVISION=	2
 COMMENT=	Frei0r gavl plugins
 PKGNAMESUFFIX=	-plugins-gavl
-LIB_DEPENDS+=	libgavl.so:${PORTSDIR}/multimedia/gavl
+LIB_DEPENDS+=	libgavl.so:multimedia/gavl
 FREI0R_PLUGINS=	rgbparade scale0tilt vectorscope
 .else
 
@@ -50,7 +50,7 @@ MMX_DESC=	MMX CPU instructions
 .include <bsd.port.options.mk>
 
 . if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MAPIDOC}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 . endif
 
 .endif # !defined(BUILDING_FREI0R_OPENCV) && !defined(BUILDING_FREI0R_GAVL)
diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile
index f23ce3597128..80009e5cdc77 100644
--- a/graphics/ftgl/Makefile
+++ b/graphics/ftgl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	OpenGL FreeType fonts rendering library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gl-inc="${LOCALBASE}/include" \
diff --git a/graphics/fusefs-gphotofs/Makefile b/graphics/fusefs-gphotofs/Makefile
index 173d33e74767..597c46d68b79 100644
--- a/graphics/fusefs-gphotofs/Makefile
+++ b/graphics/fusefs-gphotofs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mount PTP camera as a file system
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 USES=		fuse pkgconfig tar:bzip2
 USE_GNOME=	glib20
diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile
index 261661669c95..ba909ecb3eb1 100644
--- a/graphics/fv/Makefile
+++ b/graphics/fv/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Viewer of hdr/pfm images
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake pkgconfig zip
 USE_GL=		glut
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index 18ccdd4aa365..7369a58748a3 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -22,11 +22,11 @@ OPTIONS_DEFINE=		OPTIMIZED_CFLAGS OPENEXR GNET DOCS
 OPTIONS_DEFAULT=	OPENEXR GNET
 
 OPENEXR_CONFIGURE_ENABLE=	openexr
-OPENEXR_LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 
 GNET_DESC=		Networking support via GNet
 GNET_CONFIGURE_ENABLE=	gnet
-GNET_LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
+GNET_LIB_DEPENDS=	libgnet-2.0.so:net/gnet2
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index 9c2e30b1e635..6fd1fdb58c3f 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SUNSITE/libs/graphics
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy to use, portable, and powerful 2D graphics library
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile
index 5968d1434b16..e896b4e9e05c 100644
--- a/graphics/gauche-gl/Makefile
+++ b/graphics/gauche-gl/Makefile
@@ -15,7 +15,7 @@ COMMENT=	OpenGL binding for Gauche
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
+BUILD_DEPENDS=	gosh:lang/gauche
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		makeinfo tar:tgz
diff --git a/graphics/gbm/Makefile b/graphics/gbm/Makefile
index 66e4f31ea171..fbfb16a0a8e0 100644
--- a/graphics/gbm/Makefile
+++ b/graphics/gbm/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	graphics
 
 COMMENT=	gbm library
 
-LIB_DEPENDS+=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libglapi.so:${PORTSDIR}/graphics/libglapi
+LIB_DEPENDS+=	libpthread-stubs.so:devel/libpthread-stubs \
+		libexpat.so:textproc/expat2 \
+		libdrm.so:graphics/libdrm \
+		libglapi.so:graphics/libglapi
 
 USE_XORG=	x11 xau xcb xdmcp
 
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index cafc0cf11eed..0ca04902f993 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -12,9 +12,9 @@ MASTER_SITES=	https://bitbucket.org/libgd/gd-libgd/downloads/ \
 MAINTAINER?=	dinoex@FreeBSD.org
 COMMENT?=	Graphics library for fast creation of images
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 CONFLICTS=	bazaar-1.*
 
@@ -26,11 +26,11 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	FONTCONFIG ICONV VPX XPM
 OPTIONS_DEFAULT=FONTCONFIG
 NO_OPTIONS_SORT=yes
-FONTCONFIG_LIB_DEPENDS+=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_OFF=	--with-fontconfig=no
 ICONV_USES=	iconv
 ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
-VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_OFF=	--without-vpx
 XPM_USE=	xorg=xpm,x11
 XPM_CONFIGURE_ON=	--with-x
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 2f9b4e630c2c..3708c62538e2 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Translator library for raster geospatial data formats
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
+		libgif.so:graphics/giflib \
+		libjson-c.so:devel/json-c \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \
 		KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL PROJ \
@@ -56,60 +56,60 @@ PORTDATA=	*
 SLAVEDIRS=	graphics/p5-Geo-GDAL graphics/php-gdal graphics/py-gdal graphics/ruby-gdal
 
 ARMADILLO_CONFIGURE_WITH=	armadillo
-ARMADILLO_LIB_DEPENDS=	libarmadillo.so:${PORTSDIR}/math/armadillo
+ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
 CFITSIO_CONFIGURE_WITH=	cfitsio
-CFITSIO_LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio
+CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CURL_CONFIGURE_OFF=	--with-curl=no
 CURL_CONFIGURE_ON=	--with-curl=${LOCALBASE}/bin/curl-config
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 ECW_CONFIGURE_WITH=	ecw
-ECW_LIB_DEPENDS=	libNCSEcw.so:${PORTSDIR}/graphics/libecwj2
+ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
 EXPAT_CONFIGURE_WITH=	expat
-EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 FREEXL_CONFIGURE_WITH=	freexl
-FREEXL_LIB_DEPENDS=	libfreexl.so:${PORTSDIR}/textproc/freexl
+FREEXL_LIB_DEPENDS=	libfreexl.so:textproc/freexl
 GEOS_CONFIGURE_OFF=	--with-geos=no
 GEOS_CONFIGURE_ON=	--with-geos=${LOCALBASE}/bin/geos-config
-GEOS_LIB_DEPENDS=	libgeos.so:${PORTSDIR}/graphics/geos
+GEOS_LIB_DEPENDS=	libgeos.so:graphics/geos
 GTA_CONFIGURE_WITH=	gta
-GTA_LIB_DEPENDS=	libgta.so:${PORTSDIR}/devel/libgta
+GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 HDF5_CONFIGURE_WITH=	hdf5
-HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
+HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_WITH=	jasper
-JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 KML_CONFIGURE_WITH=	libkml
-KML_LIB_DEPENDS=	libkmlbase.so:${PORTSDIR}/science/libkml
+KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
 LIBXML2_CONFIGURE_OFF=	--with-xml2=no
 LIBXML2_CONFIGURE_ON=	--with-xml2=${LOCALBASE}/bin/xml2-config
-LIBXML2_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 MYSQL_CONFIGURE_OFF=	--with-mysql=no
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
 MYSQL_USE=		MYSQL=yes
 NETCDF_CONFIGURE_WITH=	netcdf
-NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_CONFIGURE_WITH=	odbc
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 OPENJPEG_CONFIGURE_WITH=openjpeg
-OPENJPEG_LIB_DEPENDS=	libopenjp2.so:${PORTSDIR}/graphics/openjpeg
+OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 PCRE_CONFIGURE_WITH=	pcre
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PGSQL_CONFIGURE_OFF=	--with-pg=no
 PGSQL_CONFIGURE_ON=	--with-pg=${LOCALBASE}/bin/pg_config
 PGSQL_USES=		pgsql
 PODOFO_CONFIGURE_WITH=	podofo
-PODOFO_LIB_DEPENDS=	libpodofo.so:${PORTSDIR}/graphics/podofo
+PODOFO_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 POPPLER_CONFIGURE_WITH=	poppler
-POPPLER_LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler
+POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler
 PROJ_CONFIGURE_WITH=	static-proj4
-PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
+PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 SPATIALITE_CONFIGURE_WITH=	spatialite
-SPATIALITE_LIB_DEPENDS=	libspatialite.so:${PORTSDIR}/databases/spatialite
+SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
 SQLITE_CONFIGURE_WITH=	sqlite3
 SQLITE_USE=		SQLITE=yes
 WEBP_CONFIGURE_WITH=	webp
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 XERCES_CONFIGURE_WITH=	xerces
-XERCES_LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
+XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile
diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 7402f9d1ad40..04ecfce848d1 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION}dev
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy to use fast C API for creating charts and graphs
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libfreetype.so:print/freetype2
 
 USES=		jpeg uidfix
 MAKEFILE=	${FILESDIR}/Makefile
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 0cf4c719bcfe..572145c461e3 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Graphic library for GTK+
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 PORTSCOUT=	ignore:1
 
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 166241c29d8d..b43520dd8fb6 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -29,13 +29,13 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	JASPER JPEG PNG TIFF NLS
 OPTIONS_DEFAULT=JASPER JPEG PNG TIFF NLS
 JASPER_CONFIGURE_WITH=	libjasper
-JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JPEG_CONFIGURE_WITH=	libjpeg
 JPEG_USES=		jpeg
 PNG_CONFIGURE_WITH=	libpng
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 TIFF_CONFIGURE_WITH=	libtiff
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index d2389eb7ecd7..20e29be86cbd 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	TCL interface to the Thomas Boutell's Gd library
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=		tcl:84+ uidfix
 
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 8ed95c7c2ced..172aa17a0a56 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Lightweight image viewer forked from GQview
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gettext gmake pkgconfig desktop-file-utils
 USE_GNOME=	gtk20 intltool
@@ -34,16 +34,16 @@ LCMS_DESC=	Color adjusting
 LIRC_DESC=	Remote control
 GPS_DESC=	GPS map support via libchamplain (experimental!)
 
-EXIV2_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_ENABLE=	exiv2
 
-LCMS_LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms
+LCMS_LIB_DEPENDS=	liblcms.so:graphics/lcms
 LCMS_CONFIGURE_ENABLE=	lcms
 
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_ENABLE=	lirc
 
-GPS_LIB_DEPENDS=	libchamplain-0.8.so:${PORTSDIR}/graphics/libchamplain08
+GPS_LIB_DEPENDS=	libchamplain-0.8.so:graphics/libchamplain08
 GPS_CONFIGURE_ENABLE=	gps
 
 post-patch:
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index f2a8a152ea99..5f048fc946c7 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Graph based image processing framework
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-LIB_DEPENDS=	libbabl-0.1.so:${PORTSDIR}/x11/babl
+LIB_DEPENDS=	libbabl-0.1.so:x11/babl
 
 # ignore new versions until we can replace this version with gegl 3.x
 PORTSCOUT=	ignore:1
@@ -60,7 +60,7 @@ PLIST_SUB+=	GDK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	libcairo.so:graphics/cairo
 PLIST_SUB+=	CAIRO=""
 .else
 CONFIGURE_ARGS+=--without-cairo
@@ -83,11 +83,11 @@ PLIST_SUB+=	PANGOCAIRO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MENSCRIPT}
-BUILD_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-a4
+BUILD_DEPENDS+=	enscript:print/enscript-a4
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg
 PLIST_SUB+=	FFMPEG=""
 .else
 CONFIGURE_ARGS+=--without-libavformat
@@ -95,13 +95,13 @@ PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-LIB_DEPENDS+=	libcgraph.so:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS+=	libcgraph.so:graphics/graphviz
 .else
 CONFIGURE_ARGS+=--without-graphviz
 .endif
 
 .if ${PORT_OPTIONS:MJASPER}
-LIB_DEPENDS+=	libjasper.so:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+=	libjasper.so:graphics/jasper
 PLIST_SUB+=	JP2=""
 .else
 CONFIGURE_ARGS+=--without-jasper
@@ -123,7 +123,7 @@ CONFIGURE_ARGS+=--without-lua
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
-LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=	libIlmImf.so:graphics/OpenEXR
 PLIST_SUB+=	OPENEXR=""
 .else
 CONFIGURE_ARGS+=--without-openexr
@@ -131,7 +131,7 @@ PLIST_SUB+=	OPENEXR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENRAW}
-LIB_DEPENDS+=	libopenraw.so:${PORTSDIR}/graphics/libopenraw
+LIB_DEPENDS+=	libopenraw.so:graphics/libopenraw
 PLIST_SUB+=	OPENRAW=""
 .else
 CONFIGURE_ARGS+=--without-libopenraw
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+=--disable-mmx \
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 PLIST_SUB+=	PNG=""
 .else
 CONFIGURE_ARGS+=--without-libpng
@@ -152,7 +152,7 @@ PLIST_SUB+=	PNG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLIBRSVG2}
-LIB_DEPENDS+=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+LIB_DEPENDS+=	librsvg-2.so:graphics/librsvg2
 PLIST_SUB+=	RSVG=""
 .else
 CONFIGURE_ARGS+=--without-librsvg
@@ -168,13 +168,13 @@ PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSPIRO}
-LIB_DEPENDS+=	libspiro.so:${PORTSDIR}/graphics/libspiro
+LIB_DEPENDS+=	libspiro.so:graphics/libspiro
 .else
 CONFIGURE_ARGS+=--without-libspiro
 .endif
 
 .if ${PORT_OPTIONS:MV4L}
-BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
 PLIST_SUB+=	V4L=""
 .else
 CONFIGURE_ARGS+=--without-libv4l
@@ -183,7 +183,7 @@ PLIST_SUB+=	V4L="@comment "
 
 # umfpack library is broken
 #.if ${PORT_OPTIONS:MUMFPACK}
-#LIB_DEPENDS+=	umfpack:${PORTSDIR}/math/suitesparse
+#LIB_DEPENDS+=	umfpack:math/suitesparse
 #PLIST_SUB+=	UMFPACK=""
 #.else
 CONFIGURE_ARGS+=--without-umfpack
@@ -191,7 +191,7 @@ PLIST_SUB+=	UMFPACK="@comment "
 #.endif
 
 .if ${PORT_OPTIONS:MEXIV2}
-LIB_DEPENDS+=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS+=	libexiv2.so:graphics/exiv2
 PLIST_SUB+=	EXIV2=""
 .else
 CONFIGURE_ARGS+=--without-exiv2
@@ -199,9 +199,9 @@ PLIST_SUB+=	EXIV2="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	a2x:${PORTSDIR}/textproc/asciidoc \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		vimdot:${PORTSDIR}/graphics/graphviz
+BUILD_DEPENDS+=	a2x:textproc/asciidoc \
+		${LOCALBASE}/bin/bash:shells/bash \
+		vimdot:graphics/graphviz
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=yes
 .else
diff --git a/graphics/gegl3/Makefile b/graphics/gegl3/Makefile
index 206ff94dcce4..a0cca14533df 100644
--- a/graphics/gegl3/Makefile
+++ b/graphics/gegl3/Makefile
@@ -12,8 +12,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.a1//}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Graph based image processing framework
 
-LIB_DEPENDS=	libbabl-0.1.so:${PORTSDIR}/x11/babl \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+LIB_DEPENDS=	libbabl-0.1.so:x11/babl \
+		libjson-glib-1.0.so:devel/json-glib
 
 USES=		gettext gmake libtool pathfix pkgconfig shebangfix tar:bzip2
 USE_GNOME=	glib20 intltool introspection:build
@@ -58,33 +58,33 @@ CAIRO_CONFIGURE_WITH=	cairo
 PANGO_USE=	GNOME=pango
 PANGO_CONFIGURE_WITH=	pango
 
-MENSCRIPT_BUILD_DEPENDS=	enscript:${PORTSDIR}/print/enscript-a4
+MENSCRIPT_BUILD_DEPENDS=	enscript:print/enscript-a4
 
-FFMPEG_LIB_DEPENDS=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_WITH=	libavformat
 
-GRAPHVIZ_LIB_DEPENDS=	libcgraph.so:${PORTSDIR}/graphics/graphviz
+GRAPHVIZ_LIB_DEPENDS=	libcgraph.so:graphics/graphviz
 GRAPHVIZ_CONFIGURE_WITH=	graphviz
 
-JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JASPER_CONFIGURE_WITH=	jasper
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	libjpeg
 
-LCMS2_LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2
+LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS2_CONFIGURE_WITH=	lcms
 
 LUA_USES=		lua
 LUA_CONFIGURE_WITH=	lua
 
-OPENEXR_LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 OPENEXR_CONFIGURE_WITH=	openexr
 
-RAW_LIB_DEPENDS=	libraw.so:${PORTSDIR}/graphics/libraw
+RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
 RAW_CONFIGURE_WITH=	libraw
 
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	libpng
 
 LIBRSVG2_USE=		GNOME=librsvg2
@@ -93,29 +93,29 @@ LIBRSVG2_CONFIGURE_WITH=	librsvg
 SDL_USE=		SDL=sdl
 SDL_CONFIGURE_WITH=	sdl
 
-SPIRO_LIB_DEPENDS=	libspiro.so:${PORTSDIR}/graphics/libspiro
+SPIRO_LIB_DEPENDS=	libspiro.so:graphics/libspiro
 SPIRO_CONFIGURE_WITH=	libspiro
 
-V4L_BUILD_DEPENDS=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_WITH=	libv4l
 
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_WITH=	webp
 
 # UMFPACK has two "problems"
 # 1) it build with port gcc 2) needed libs aren't recorded in the libraries.
-#UMFPACK_LIB_DEPENDS=	libumfpack.so:${PORTSDIR}/math/suitesparse
+#UMFPACK_LIB_DEPENDS=	libumfpack.so:math/suitesparse
 #UMFPACK_CONFIGURE_WITH=	umfpack
 CONFIGURE_ARGS+=	--without-umfpack
 
-EXIV2_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_WITH=	exiv2
 
-GEXIV2_LIB_DEPENDS=	libgexiv2.so:${PORTSDIR}/graphics/gexiv2
+GEXIV2_LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2
 GEXIV2_CONFIGURE_WITH=	gexiv2
 
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_WITH=	libtiff
 
 .include <bsd.port.options.mk>
diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile
index 2348e2faa270..9cafba918b01 100644
--- a/graphics/geomorph/Makefile
+++ b/graphics/geomorph/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.60/
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Height field generator and editor
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libpng.so:graphics/png
 
 USES=		desktop-file-utils gmake pkgconfig shebangfix
 SHEBANG_FILES=	update-rc
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 6a074df36c93..c7d2eec1bd8e 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Interactive viewer for 3- and 4-D geometric objects
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		libtool makeinfo motif tar:bzip2
 USE_GL=		glu
diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
index fbb98c44d4f7..cdafe78b19c5 100644
--- a/graphics/geos/Makefile
+++ b/graphics/geos/Makefile
@@ -24,13 +24,13 @@ USES=		gmake libtool tar:bzip2
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-PHP_BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30
+PHP_BUILD_DEPENDS=	swig3.0:devel/swig30
 PHP_CONFIGURE_ENABLE=	php
 PHP_USE=		PHP=yes PHP_BUILD=yes
-PYTHON_BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30
+PYTHON_BUILD_DEPENDS=	swig3.0:devel/swig30
 PYTHON_CONFIGURE_ENABLE=python
 PYTHON_USES=		python:2
-RUBY_BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30
+RUBY_BUILD_DEPENDS=	swig3.0:devel/swig30
 RUBY_CONFIGURE_ENABLE=	ruby
 RUBY_CONFIGURE_ENV=	RUBY="${RUBY}"
 RUBY_USE=		RUBY=yes
diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile
index 7f22f5037159..0d5a0d56a290 100644
--- a/graphics/gexiv2/Makefile
+++ b/graphics/gexiv2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GObject-based wrapper around Exiv2 library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+BUILD_DEPENDS=	gm4:devel/m4
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 USES=		gmake libtool:build pkgconfig tar:xz
 USE_GNOME=	glib20 introspection:build
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index cd6629197289..5017161271f5 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Utility library that includes a wrapper for imlib2
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index 797b3f99d274..d312a2678076 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.catb.org/~esr/gif2png/
 MAINTAINER=	saper@saper.info
 COMMENT=	Converts GIF images to a PNG format
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		python:run
 GNU_CONFIGURE=	yes
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index f77959414179..cab6b26d6927 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -24,8 +24,8 @@ INSTALL_TARGET=	install-strip
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS+=	xmlto:textproc/xmlto \
+		docbook-xml>0:textproc/docbook-xml
 .else
 CONFIGURE_ENV+=	have_xmlto=no
 .endif
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index eed767c2d7e5..0e4102285d37 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Yet another GTK+ based image viewer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake jpeg libtool pkgconfig
 GNU_CONFIGURE=	yes
@@ -35,23 +35,23 @@ NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 LIBMNG_CONFIGURE_WITH=	libmng
-LIBMNG_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
+LIBMNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 
 LIBWMF_CONFIGURE_WITH=	libwmf
-LIBWMF_LIB_DEPENDS=	libwmf.so:${PORTSDIR}/graphics/libwmf
+LIBWMF_LIB_DEPENDS=	libwmf.so:graphics/libwmf
 
 LIBRSVG2_CONFIGURE_WITH=librsvg
-LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 
 LIBEXIF_CONFIGURE_ENABLE=exif
-LIBEXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_EXTRA_PATCHES=	${FILESDIR}/extra-patch-src-exit_view.c
 
 MPLAYER_CONFIGURE_ENABLE=mplayer
-MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 LIBXINE_CONFIGURE_WITH=	xine
-LIBXINE_LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
+LIBXINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 
 post-patch:
 	@${REINPLACE_CMD} '/^desktopdir =/s|=.*|= ${DESKTOPDIR}|' \
diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile
index 244d25c825e1..8e1a7805e77c 100644
--- a/graphics/gimmage/Makefile
+++ b/graphics/gimmage/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	BERLIOS
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple image viewer
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		desktop-file-utils gettext pkgconfig
 USE_GNOME=	gtkmm24
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index ba27dc5b5b47..44c2f2aaf6b3 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -15,13 +15,13 @@ COMMENT=	GNU Image Manipulation Program
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libgegl-0.2.so:${PORTSDIR}/graphics/gegl \
-		libbabl-0.1.so:${PORTSDIR}/x11/babl
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		liblcms2.so:graphics/lcms2 \
+		libgegl-0.2.so:graphics/gegl \
+		libbabl-0.1.so:x11/babl
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
 
 GNU_CONFIGURE=	yes
 USES+=		cpe desktop-file-utils execinfo gettext gmake jpeg libtool \
@@ -67,48 +67,48 @@ GIMP_LIBS=	`${PKG_CONFIG} --libs gimp-2.0`
 GIMP_THUMB_LIBS=`${PKG_CONFIG} --libs gimpthumb-2.0`
 GIMP_UI_LIBS=	`${PKG_CONFIG} --libs gimpui-2.0`
 
-LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS+=	libgimp-2.0.so:graphics/gimp-app
 
 .else
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
-AA_LIB_DEPENDS=		libaa.so:${PORTSDIR}/graphics/aalib
+AA_LIB_DEPENDS=		libaa.so:graphics/aalib
 AA_CONFIGURE_OFF=	--without-aa
 
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 DBUS_CONFIGURE_WITH=	dbus
 
 GHOSTSCRIPT_USES=		ghostscript
 GHOSTSCRIPT_CONFIGURE_WITH=	gs
 
 GVFS_USE=		GNOME=gvfs
-GVFS_LIB_DEPENDS_OFF=	libcurl.so:${PORTSDIR}/ftp/curl
+GVFS_LIB_DEPENDS_OFF=	libcurl.so:ftp/curl
 GVFS_CONFIGURE_OFF=	--without-gvfs
 
-HELPBROWSER_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+HELPBROWSER_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 HELPBROWSER_CONFIGURE_WITH=	webkit
 
-JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JASPER_CONFIGURE_WITH=	libjasper
 
-LIBEXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_CONFIGURE_OFF=	--without-libexif
 
-LIBMNG_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
+LIBMNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 LIBMNG_CONFIGURE_OFF=	--without-libmng
 
 LIBRSVG2_USE= 		GNOME=librsvg2
 LIBRSVG2_CONFIGURE_WITH=librsvg
 
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 POPPLER_CONFIGURE_OFF=	--without-poppler
 
 SIMD_CONFIGURE_OFF=	--disable-mmx \
 			--disable-sse \
 			--disable-altivec
 
-WMF_LIB_DEPENDS=	libwmf.so:${PORTSDIR}/graphics/libwmf
+WMF_LIB_DEPENDS=	libwmf.so:graphics/libwmf
 WMF_CONFIGURE_OFF=	--without-wmf
 
 .endif
diff --git a/graphics/gimp-beautify-plugin/Makefile b/graphics/gimp-beautify-plugin/Makefile
index 6c55fc0f2b8c..9238124ffa6a 100644
--- a/graphics/gimp-beautify-plugin/Makefile
+++ b/graphics/gimp-beautify-plugin/Makefile
@@ -13,12 +13,12 @@ COMMENT=	GIMP plug-ins to both quickly and easily beautify photo
 
 LICENSE=	GPLv3+
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig \
-		${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2 \
-		${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig \
-		${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2 \
-		${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \
+		${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \
+		${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \
+		${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \
+		${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hejiann
diff --git a/graphics/gimp-data-extras/Makefile b/graphics/gimp-data-extras/Makefile
index cc27eae46efd..0d627147067e 100644
--- a/graphics/gimp-data-extras/Makefile
+++ b/graphics/gimp-data-extras/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	gimp/extras/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of additional brushes and patterns files for GIMP
 
-LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
 
 USES=		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/graphics/gimp-elsamuko-script/Makefile b/graphics/gimp-elsamuko-script/Makefile
index 6bf0e0f1e6c0..8f3c3675f415 100644
--- a/graphics/gimp-elsamuko-script/Makefile
+++ b/graphics/gimp-elsamuko-script/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Gimp scripts by elsamuko
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gimp:${PORTSDIR}/graphics/gimp-app
+RUN_DEPENDS=	${LOCALBASE}/bin/gimp:graphics/gimp-app
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/graphics/gimp-ez-perspective-plugin/Makefile b/graphics/gimp-ez-perspective-plugin/Makefile
index 078d62237f1c..b6498cd74ab8 100644
--- a/graphics/gimp-ez-perspective-plugin/Makefile
+++ b/graphics/gimp-ez-perspective-plugin/Makefile
@@ -19,8 +19,8 @@ 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:${PORTSDIR}/graphics/gimp-app \
-		${LOCALBASE}/libexec/gimp/2.2/python/gimpfu.py:${PORTSDIR}/graphics/py-gimp
+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
 NO_BUILD=	yes
diff --git a/graphics/gimp-focusblur-plugin/Makefile b/graphics/gimp-focusblur-plugin/Makefile
index 724aa129e8d7..7dc3d85843a9 100644
--- a/graphics/gimp-focusblur-plugin/Makefile
+++ b/graphics/gimp-focusblur-plugin/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Gimp realistic focus blur plugin
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libgimp-2.0.so:graphics/gimp-app
 
 USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 7a7b523de2a8..736927d985a5 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -11,17 +11,17 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	GREYC's Magic Image Converter
 
-LIB_DEPENDS=	libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libopencv_legacy.so:${PORTSDIR}/graphics/opencv \
-		libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick \
+		libIlmImf.so:graphics/OpenEXR \
+		libopencv_legacy.so:graphics/opencv \
+		libMagick++-6.so:graphics/ImageMagick \
+		libavcodec.so:multimedia/ffmpeg \
+		libfftw3.so:math/fftw3 \
+		libgimp-2.0.so:graphics/gimp-app
 
 OPTIONS_DEFINE=	BASH
 OPTIONS_SUB=	yes
-BASH_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BASH_RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
diff --git a/graphics/gimp-help/Makefile b/graphics/gimp-help/Makefile
index 58e46577715b..96203922bb39 100644
--- a/graphics/gimp-help/Makefile
+++ b/graphics/gimp-help/Makefile
@@ -53,8 +53,8 @@ ${lang}_DETECT?=	${LOCALBASE}/share/gimp/help/${lang}/index.html
 ${lang}_PORT?=		misc/gimp-help-${lang}
 ${lang}_NAME?=		${lang}
 ${lang:tu}_DESC=		${${lang}_NAME}
-${lang:tu}_RUN_DEPENDS=	${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
-ALL_RUN_DEPENDS+=	${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
+${lang:tu}_RUN_DEPENDS=	${${lang}_DETECT}:${${lang}_PORT}
+ALL_RUN_DEPENDS+=	${${lang}_DETECT}:${${lang}_PORT}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-jagged-border-script/Makefile b/graphics/gimp-jagged-border-script/Makefile
index 5c7869d26bc8..29d0ec390847 100644
--- a/graphics/gimp-jagged-border-script/Makefile
+++ b/graphics/gimp-jagged-border-script/Makefile
@@ -17,7 +17,7 @@ COMMENT=	GIMP script to create a jagged border around an image
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gimp:${PORTSDIR}/graphics/gimp-app
+RUN_DEPENDS=	${LOCALBASE}/bin/gimp:graphics/gimp-app
 
 USES=		dos2unix
 NO_BUILD=	yes
diff --git a/graphics/gimp-lensfun-plugin/Makefile b/graphics/gimp-lensfun-plugin/Makefile
index 9fe1b6fcb3d0..466c3b1f7c7b 100644
--- a/graphics/gimp-lensfun-plugin/Makefile
+++ b/graphics/gimp-lensfun-plugin/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Gimp plugin to correct lens distortion using the lensfun library
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/exiv2.pc:${PORTSDIR}/graphics/exiv2 \
-		${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app \
-		${LOCALBASE}/libdata/pkgconfig/lensfun.pc:${PORTSDIR}/graphics/lensfun
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/exiv2.pc:graphics/exiv2 \
+		${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app \
+		${LOCALBASE}/libdata/pkgconfig/lensfun.pc:graphics/lensfun
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake pkgconfig
diff --git a/graphics/gimp-lqr-plugin/Makefile b/graphics/gimp-lqr-plugin/Makefile
index d500cbfd7aa7..a8717cd5e752 100644
--- a/graphics/gimp-lqr-plugin/Makefile
+++ b/graphics/gimp-lqr-plugin/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://liquidrescale.wdfiles.com/local--files/en:download-page-sou
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Liquid rescale GIMP plug-in
 
-LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \
-		liblqr-1.so:${PORTSDIR}/graphics/liblqr-1
+LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app \
+		liblqr-1.so:graphics/liblqr-1
 
 USES=		tar:bzip2 gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/graphics/gimp-refocus-plugin/Makefile b/graphics/gimp-refocus-plugin/Makefile
index 525709891124..5d908056d52e 100644
--- a/graphics/gimp-refocus-plugin/Makefile
+++ b/graphics/gimp-refocus-plugin/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GIMP plugin to "refocus" images through FIR Wiener filtering
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
 
 OPTIONS_DEFINE=	ATLAS DOCS OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
@@ -46,10 +46,10 @@ post-patch:
 # math/atlas library
 .if ${PORT_OPTIONS:MATLAS}
 BUILD_DEPENDS+=	\
-		${LOCALBASE}/include/f2c.h:${PORTSDIR}/lang/f2c \
-		${LOCALBASE}/include/clapack.h:${PORTSDIR}/math/atlas
+		${LOCALBASE}/include/f2c.h:lang/f2c \
+		${LOCALBASE}/include/clapack.h:math/atlas
 RUN_DEPENDS+=	\
-		${LOCALBASE}/include/clapack.h:${PORTSDIR}/math/atlas
+		${LOCALBASE}/include/clapack.h:math/atlas
 
 CONFIGURE_ARGS+=	--with-lapack-libs="-L${LOCALBASE}/lib -latlas -lblas -lcblas -llapack" \
 			--with-lapack-includes="-I${LOCALBASE}/include"
diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile
index 5f22388e0b17..834b8c9bcbd6 100644
--- a/graphics/gimp-resynthesizer/Makefile
+++ b/graphics/gimp-resynthesizer/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Gimp plug-in for texture synthesis
 
 LICENSE=	GPLv2+ # though COPYING has GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/libexec/gimp/2.2/python/gimpfu.py:${PORTSDIR}/graphics/py-gimp
-BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool
-LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+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
diff --git a/graphics/gimp-save-for-web/Makefile b/graphics/gimp-save-for-web/Makefile
index 9d9882dfb084..f0b79f88e2c4 100644
--- a/graphics/gimp-save-for-web/Makefile
+++ b/graphics/gimp-save-for-web/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://registry.gimp.org/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GIMP Save For Web plugin
 
-LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/gimp-wavelet-decompose-plugin/Makefile b/graphics/gimp-wavelet-decompose-plugin/Makefile
index 249bae448c4d..cdbfa47bc9f6 100644
--- a/graphics/gimp-wavelet-decompose-plugin/Makefile
+++ b/graphics/gimp-wavelet-decompose-plugin/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Gimp plugin to losslessly decompose images into wavelet scales layers
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
 
 USES=		gettext gmake pkgconfig
 
diff --git a/graphics/gimp-wavelet-denoise-plugin/Makefile b/graphics/gimp-wavelet-denoise-plugin/Makefile
index 85a4acc65da1..90ff073a5ff9 100644
--- a/graphics/gimp-wavelet-denoise-plugin/Makefile
+++ b/graphics/gimp-wavelet-denoise-plugin/Makefile
@@ -15,8 +15,8 @@ COMMENT=	GIMP plugin to reduce noise in each channel of an image separately
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
 
 USES=		gettext gmake pkgconfig
 
diff --git a/graphics/gimp-wavelet-sharpen-plugin/Makefile b/graphics/gimp-wavelet-sharpen-plugin/Makefile
index 0a7fda023221..6a3f7668b7e9 100644
--- a/graphics/gimp-wavelet-sharpen-plugin/Makefile
+++ b/graphics/gimp-wavelet-sharpen-plugin/Makefile
@@ -15,8 +15,8 @@ COMMENT=	GIMP plugin to sharpen by increasing contrast in high frequency space
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
 
 USES=		gettext gmake pkgconfig
 
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 16b7c9c42bbe..824efdd984d4 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	graphics gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The "meta-port" for The Gimp
 
-RUN_DEPENDS=	gimp-2.8:${PORTSDIR}/graphics/gimp-app
+RUN_DEPENDS=	gimp-2.8:graphics/gimp-app
 
 USES+=	metaport
 
@@ -20,9 +20,9 @@ PYTHON_DESC=	Python-fu support
 PRINT_DESC=	Gutenprint (gimp-print) plugin
 HELP_DESC=	Gimp-Help (50+MB distfile)
 
-HELP_RUN_DEPENDS+=	en-gimp-help-html>=0:${PORTSDIR}/misc/gimp-help-en
-PYTHON_RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/environ/pygimp.env:${PORTSDIR}/graphics/py-gimp
-PRINT_RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/plug-ins/gutenprint:${PORTSDIR}/print/gimp-gutenprint
-PRINT_RUN_DEPENDS+=	gutenprint>0:${PORTSDIR}/print/gutenprint
+HELP_RUN_DEPENDS+=	en-gimp-help-html>=0:misc/gimp-help-en
+PYTHON_RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/environ/pygimp.env:graphics/py-gimp
+PRINT_RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/plug-ins/gutenprint:print/gimp-gutenprint
+PRINT_RUN_DEPENDS+=	gutenprint>0:print/gutenprint
 
 .include <bsd.port.mk>
diff --git a/graphics/gimpfx-foundry/Makefile b/graphics/gimpfx-foundry/Makefile
index 397e0337de66..fbac1559503b 100644
--- a/graphics/gimpfx-foundry/Makefile
+++ b/graphics/gimpfx-foundry/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Collection of scripts for The Gimp 2.6
 
 # Maintainer has requested this use a specific version
 # as the plugins may not always be backwards-compatible
-RUN_DEPENDS=	gimp-2.8:${PORTSDIR}/graphics/gimp-app
+RUN_DEPENDS=	gimp-2.8:graphics/gimp-app
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 4f2f6462bfa2..7071cf419014 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -13,8 +13,8 @@ COMMENT=	POV-Ray oriented modeller
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	lib3ds.so:${PORTSDIR}/graphics/lib3ds
-BUILD_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
+LIB_DEPENDS=	lib3ds.so:graphics/lib3ds
+BUILD_DEPENDS=	povray:graphics/povray-meta
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gettext gmake libtool perl5 pkgconfig
diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile
index 6cf0dfb70b4a..269495256def 100644
--- a/graphics/gkrellkam2/Makefile
+++ b/graphics/gkrellkam2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GKrellM plugin that display thumbnails of periodically updated images
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	gkrellm2>0:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm2>0:sysutils/gkrellm2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile
index b307a6c721a6..715089ef1235 100644
--- a/graphics/gle-graphics/Makefile
+++ b/graphics/gle-graphics/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Graphics language that produces images from script files
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	qmake-qt4:${PORTSDIR}/devel/qmake4
+BUILD_DEPENDS=	qmake-qt4:devel/qmake4
 
 BITMAP_IMAGES_CONFIGURE_WITH=	jpeg=${LOCALBASE} tiff=${LOCALBASE} png=${LOCALBASE}
 BITMAP_IMAGES_DESC=	Support for including bitmap images
-BITMAP_IMAGES_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiffxx.so:${PORTSDIR}/graphics/tiff
+BITMAP_IMAGES_LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiffxx.so:graphics/tiff
 BITMAP_IMAGES_USES=	jpeg
 
 CONFIGURE_ARGS=	--with-extrafonts=yes
diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile
index bb4ade7670df..4970c194c50a 100644
--- a/graphics/glfw/Makefile
+++ b/graphics/glfw/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Portable framework for OpenGL development
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libXinerama.so:${PORTSDIR}/x11/libXinerama \
-		libXcursor.so:${PORTSDIR}/x11/libXcursor
+LIB_DEPENDS=	libXinerama.so:x11/libXinerama \
+		libXcursor.so:x11/libXcursor
 
 USES=		cmake zip
 USE_XORG=	xi xrandr
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index ffdb3c8cd7f0..29cdbce865c7 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Image viewer that uses Gdk-Pixbuf and OpenGL
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 USE_GNOME=	gnomeprefix gtk20
 USE_GL=		yes
diff --git a/graphics/glosm/Makefile b/graphics/glosm/Makefile
index 011ed9a82e70..3b4ba7ad650f 100644
--- a/graphics/glosm/Makefile
+++ b/graphics/glosm/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GHC http://mirror.amdmi3.ru/distfiles/
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D OpenGL renderer for OpenStreetMap
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libexpat.so:textproc/expat2
 
 USES=		tar:bzip2 cmake
 USE_GL=		gl
diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile
index 27df09d8d68f..134bcb76fcbe 100644
--- a/graphics/glpng/Makefile
+++ b/graphics/glpng/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Library to easily load PNG files as an OpenGL textures
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_GL=		gl
 USES=		dos2unix zip
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index c88522c63674..ace5eab8b186 100644
--- a/graphics/gltt/Makefile
+++ b/graphics/gltt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://gltt.sourceforge.net/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TrueType fonts rendering using OpenGL
 
-LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	libttf.so:print/freetype
 
 USES=		gmake libtool
 USE_GL=		gl glut
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index 4fa5445df226..fdfff3f904a8 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -25,8 +25,8 @@ LICENSE_COMB=	multi
 LICENSE_DISTFILES_GPLv2=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_LGPL3=	${GSHHG_DISTNAME}${EXTRACT_SUFX}
 
-LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libnetcdf.so:science/netcdf
+RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -52,12 +52,12 @@ DEBUG_CONFIGURE_ON=	--enable-debug --enable-devdebug
 EPS_DESC=		Set .eps as default output format, otherwise .ps
 EPS_CONFIGURE_ON=	--enable-eps
 GDAL_DESC=		Compile in experimental GDAL support
-GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 GDAL_CONFIGURE_ON=	--enable-gdal
 IMPERIAL_DESC=		Choose Imperial (inch) units over metric (cm)
 IMPERIAL_CONFIGURE_ON=	--enable-US
 OCTAVE_DESC=		Build GMT-octave interface
-OCTAVE_RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
+OCTAVE_RUN_DEPENDS=	octave:math/octave
 OCTAVE_CONFIGURE_ON=	--enable-octave --enable-mex
 OCTAVE_CONFIGURE_OFF=	--disable-mex
 SHARED_DESC=		Build shared (dynamic) libraries
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 09993afe7f1d..28560561345a 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	GNU/${PORTNAME}/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Flash movie player
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libnspr4.so:${PORTSDIR}/devel/nspr
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libltdl.so:devel/libltdl \
+		libcurl.so:ftp/curl \
+		libgif.so:graphics/giflib \
+		libspeex.so:audio/speex \
+		libnspr4.so:devel/nspr
 
 CONFLICTS=	gnash-devel-[0-9]*
 
@@ -98,8 +98,8 @@ WEBPLUGIN_FILES=	libgnashplugin.so
 WEBPLUGIN_DIR=${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME}
 PLIST_SUB+=	NPAPI=""
 CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGIN_DIR}"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/xulrunner:${PORTSDIR}/www/libxul
-RUN_DEPENDS+=	${LOCALBASE}/bin/xulrunner:${PORTSDIR}/www/libxul
+BUILD_DEPENDS+=	${LOCALBASE}/bin/xulrunner:www/libxul
+RUN_DEPENDS+=	${LOCALBASE}/bin/xulrunner:www/libxul
 .else
 PLIST_SUB+=	NPAPI="@comment "
 CONFIGURE_ARGS+=	--disable-npapi
@@ -143,7 +143,7 @@ CONFIGURE_ARGS+=--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
 GNASH_RENDERERS=
 
 .if ${PORT_OPTIONS:MAGG}
-LIB_DEPENDS+=		libagg.so:${PORTSDIR}/graphics/agg
+LIB_DEPENDS+=		libagg.so:graphics/agg
 GNASH_RENDERERS+=	agg
 .endif
 
@@ -151,7 +151,7 @@ GNASH_RENDERERS+=	agg
 USE_GL=			yes
 GNASH_RENDERERS+=	ogl
 .if ${PORT_OPTIONS:MGTK2}
-LIB_DEPENDS+=		libgdkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS+=		libgdkglext-x11-1.0.so:x11-toolkits/gtkglext
 .endif
 .endif
 
@@ -159,7 +159,7 @@ LIB_DEPENDS+=		libgdkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 .if ${PORT_OPTIONS:MKDE4}
 IGNORE=			doesn't support Cairo renderer with KDE4 gui. Please rerun 'make config' and select different renderer or disable KDE4 GUI
 .endif
-LIB_DEPENDS+=		libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=		libcairo.so:graphics/cairo
 GNASH_RENDERERS+=	cairo
 .endif
 
@@ -176,7 +176,7 @@ CONFIGURE_ARGS+=	--enable-renderer=`${ECHO} ${GNASH_RENDERERS} | ${TR} ' ' ,`
 .if empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MFFMPEG2)
 IGNORE=			VAAPI currently works only with FFMPEG. Please rerun 'make config' and enable FFMPEG
 .endif
-LIB_DEPENDS+=		libva.so:${PORTSDIR}/multimedia/libva
+LIB_DEPENDS+=		libva.so:multimedia/libva
 .else
 CONFIGURE_ARGS+=	--enable-hwaccel=none # XVideo
 .endif
@@ -185,7 +185,7 @@ CONFIGURE_ARGS+=	--enable-hwaccel=none # XVideo
 # Media handler options processing
 #
 .if ${PORT_OPTIONS:MFFMPEG2} && empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MGSTREAMER)
-LIB_DEPENDS+=		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=		libavcodec.so:multimedia/ffmpeg
 CONFIGURE_ARGS+=	--enable-media=ffmpeg \
 			--with-ffmpeg-incl=${LOCALBASE}/include/libavcodec \
 			--with-ffmpeg-lib=${LOCALBASE}/lib
@@ -193,7 +193,7 @@ USE_SDL+=		sdl
 MAKE_ARGS+=		INCLUDES="-I${LOCALBASE}/include/ffmpeg"
 .elif ${PORT_OPTIONS:MFFMPEG} && empty(PORT_OPTIONS:MFFMPEG2) && empty(PORT_OPTIONS:MGSTREAMER)
 EXTRA_PATCHES+=		${FILESDIR}/ffmpeg0.patch
-LIB_DEPENDS+=		libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
+LIB_DEPENDS+=		libavcodec0.so:multimedia/ffmpeg0
 CONFIGURE_ARGS+=	--enable-media=ffmpeg \
 			--with-ffmpeg-incl=${LOCALBASE}/include/ffmpeg0/libavcodec \
 			--with-ffmpeg-lib=${LOCALBASE}/lib/ffmpeg0
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index efd614463c0e..535aea795d29 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -14,7 +14,7 @@ BROKEN=		unfetchable
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		desktop-file-utils jpeg pathfix pkgconfig python shared-mime-info
 USE_GNOME=	gnomeprefix intlhack libgnomeui pygtk2
diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile
index d06e79beb390..682f1c5e7a59 100644
--- a/graphics/gnome-color-manager/Makefile
+++ b/graphics/gnome-color-manager/Makefile
@@ -11,14 +11,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session framework for the GNOME desktop to manage color profiles
 
-BUILD_DEPENDS=	docbook2man:${PORTSDIR}/textproc/docbook-utils \
-		itstool:${PORTSDIR}/textproc/itstool \
-		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
-LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libcolord.so:${PORTSDIR}/graphics/colord \
-		libcolord-gtk.so:${PORTSDIR}/graphics/colord-gtk \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libexif.so:${PORTSDIR}/graphics/libexif
+BUILD_DEPENDS=	docbook2man:textproc/docbook-utils \
+		itstool:textproc/itstool \
+		docbook-sgml>0:textproc/docbook-sgml
+LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
+		libcolord.so:graphics/colord \
+		libcolord-gtk.so:graphics/colord-gtk \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libexif.so:graphics/libexif
 
 PORTSCOUT=	limitw:1,even
 
@@ -40,7 +40,7 @@ RAW_DESC=	Enable RAW EXIF support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRAW}
-LIB_DEPENDS+=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS+=	libexiv2.so:graphics/exiv2
 CONFIGURE_ARGS+=--enable-exiv=yes
 PLIST_SUB+=	RAW=""
 .else
diff --git a/graphics/gnustep-slideshow/Makefile b/graphics/gnustep-slideshow/Makefile
index 27877c0d2722..909ee6234d9f 100644
--- a/graphics/gnustep-slideshow/Makefile
+++ b/graphics/gnustep-slideshow/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 USES=		tar:bzip2 gnustep
 USE_GNUSTEP=	back build
-LIB_DEPENDS=	libSlideShow.so:${PORTSDIR}/graphics/gnustep-slideshowkit
+LIB_DEPENDS=	libSlideShow.so:graphics/gnustep-slideshowkit
 
 OBJCFLAGS+=	-Dsel_eq=sel_isEqual
 
diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile
index cd7b41379e1f..5f99f5da6426 100644
--- a/graphics/gocr/Makefile
+++ b/graphics/gocr/Makefile
@@ -12,7 +12,7 @@ COMMENT=	OCR (Optical Character Recognition) program
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile
index fb8b5002452a..b8c7accfbcb3 100644
--- a/graphics/goocanvasmm/Makefile
+++ b/graphics/goocanvasmm/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	C++ bindings for the goocanvas widget for GTK
 
-LIB_DEPENDS=	libgoocanvas.so:${PORTSDIR}/graphics/goocanvas
+LIB_DEPENDS=	libgoocanvas.so:graphics/goocanvas
 
 PORTSCOUT=	ignore:1
 
diff --git a/graphics/goocanvasmm2/Makefile b/graphics/goocanvasmm2/Makefile
index 9e2a98446a77..bdc8465c2376 100644
--- a/graphics/goocanvasmm2/Makefile
+++ b/graphics/goocanvasmm2/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	C++ bindings for the goocanvas widget for GTK
 
-LIB_DEPENDS=	libgoocanvas-2.0.so:${PORTSDIR}/graphics/goocanvas2
+LIB_DEPENDS=	libgoocanvas-2.0.so:graphics/goocanvas2
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gtkmm30
diff --git a/graphics/goom/Makefile b/graphics/goom/Makefile
index eec14335da81..1996ecb5d4ba 100644
--- a/graphics/goom/Makefile
+++ b/graphics/goom/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .if exists(${X11R6}/bin/xmms) || defined(WITH_XMMS)
-LIB_DEPENDS+=	libxmms.so:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=	libxmms.so:multimedia/xmms
 PLIST_SUB+=	XMMS=""
 .else
 PLIST_SUB+=	XMMS="@comment "
diff --git a/graphics/gource/Makefile b/graphics/gource/Makefile
index 635fb8a6db00..8dffcf356a7f 100644
--- a/graphics/gource/Makefile
+++ b/graphics/gource/Makefile
@@ -12,12 +12,12 @@ COMMENT=	OpenGL-based 3D visualisation tool for source control repositories
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
-LIB_DEPENDS=	libSDL_image.so:${PORTSDIR}/graphics/sdl_image \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
+BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
+LIB_DEPENDS=	libSDL_image.so:graphics/sdl_image \
+		libfreetype.so:print/freetype2 \
+		libpcre.so:devel/pcre \
+		libboost_filesystem.so:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig compiler:c++0x
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 5f8e1d6ac329..72094b5a837b 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Command-line frontend to libgphoto2
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libgphoto2.so:graphics/libgphoto2
 
 USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	AALIB READLINE THREADS
 OPTIONS_SUB=		yes
 
 AALIB_DESC=		Text mode capture preview support
-AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_WITH=	aalib
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/graphics/gpsmanshp/Makefile b/graphics/gpsmanshp/Makefile
index d110abd44799..b7ab0e764685 100644
--- a/graphics/gpsmanshp/Makefile
+++ b/graphics/gpsmanshp/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Shapelib support for gpsman
 
 LICENSE=	GPLv3+
 
-LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
-RUN_DEPENDS=	gpsman:${PORTSDIR}/astro/gpsman
+LIB_DEPENDS=	libshp.so:devel/shapelib
+RUN_DEPENDS=	gpsman:astro/gpsman
 
 USES=		tar:tgz tcl
 MAKE_ENV=	TCLVERSION="${TCL_VER}"
diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile
index 906f968ae43e..66ab482861d8 100644
--- a/graphics/grads/Makefile
+++ b/graphics/grads/Makefile
@@ -16,10 +16,10 @@ EXTRACT_ONLY=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	The Grid Analysis and Display System
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libudunits2.a:${PORTSDIR}/science/udunits \
-		${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	${LOCALBASE}/lib/libudunits2.a:science/udunits \
+		${LOCALBASE}/lib/libsx.a:x11/libsx
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libpng.so:graphics/png
 
 USES=		jpeg ncurses
 GNU_CONFIGURE=		yes
@@ -49,13 +49,13 @@ PORTEXAMPLES=	*
 
 .if ${PORT_OPTIONS:MHDF}
 BROKEN=			Fails to package
-LIB_DEPENDS+=		libmfhdf.so:${PORTSDIR}/science/hdf
+LIB_DEPENDS+=		libmfhdf.so:science/hdf
 CONFIGURE_ARGS+=	--with-hdf
 PLIST_SUB+=		NETCDF="@comment " HDF=""
 .endif
 
 .if ${PORT_OPTIONS:MNETCDF}
-LIB_DEPENDS+=		libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS+=		libnetcdf.so:science/netcdf
 CONFIGURE_ARGS+=	--with-nc
 PLIST_SUB+=		NETCDF="" HDF="@comment "
 .endif
diff --git a/graphics/grafx2/Makefile b/graphics/grafx2/Makefile
index aae07a4903ca..75a0cd963b53 100644
--- a/graphics/grafx2/Makefile
+++ b/graphics/grafx2/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Pixelart-oriented bitmap painting program
 
-LIB_DEPENDS=	libX11.so:${PORTSDIR}/x11/libX11 \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libX11.so:x11/libX11 \
+		libpng.so:graphics/png
 
 USES=		gmake pkgconfig tar:tgz
 USE_SDL=	sdl image
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 42393530d72f..92762b6e3a0a 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libgd.so:${PORTSDIR}/${GD_PORT}
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libexpat.so:textproc/expat2 \
+		libgd.so:${GD_PORT}
 
 USES=		bison cpe gmake jpeg libtool:keepla pkgconfig pathfix shebangfix
 GNU_CONFIGURE=	yes
@@ -98,14 +98,14 @@ RUBY_USE=	RUBY=yes
 LUA_USES=	lua
 TCL_USES=	tcl:build
 TK_USES=	tk:build
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-ANN_LIB_DEPENDS=	libann.so:${PORTSDIR}/math/ann
-GTS_LIB_DEPENDS=	libgts.so:${PORTSDIR}/graphics/gts
-SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:${PORTSDIR}/x11-toolkits/gtkglarea2 \
-			libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
-MING_LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming
-DEVIL_LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil
-GUILE_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
+ANN_LIB_DEPENDS=	libann.so:math/ann
+GTS_LIB_DEPENDS=	libgts.so:graphics/gts
+SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \
+			libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
+MING_LIB_DEPENDS=	libming.so:graphics/ming
+DEVIL_LIB_DEPENDS=	libIL.so:graphics/devil
+GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 
 XPM_CONFIGURE_WITH=		x
 DIGCOLA_CONFIGURE_WITH=		digcola
@@ -174,7 +174,7 @@ BROKEN=	Ming incomplete, uses removed libgraph
 IGNORE=	option TCL is required for option TK
 .endif
 # USES=tk:build is BROKEN: Does not allow to set both tcl and tk depedencies
-BUILD_DEPENDS+=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${_TCLTK_WANTED_VERSION}
+BUILD_DEPENDS+=	tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION}
 .endif
 
 .if ${PORT_OPTIONS:MTCL}
@@ -237,8 +237,8 @@ IGNORE=		option WITH_DIGCOLA is required for option WITH_IPSEPCOLA
 .if ${PORT_OPTIONS:MPERL} || ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || \
     ${PORT_OPTIONS:MRUBY} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MTCL} || \
     ${PORT_OPTIONS:MGUILE}
-BUILD_DEPENDS+=		swig3.0:${PORTSDIR}/devel/swig30
-RUN_DEPENDS+=		swig3.0:${PORTSDIR}/devel/swig30
+BUILD_DEPENDS+=		swig3.0:devel/swig30
+RUN_DEPENDS+=		swig3.0:devel/swig30
 CONFIGURE_ARGS+=	--enable-swig
 CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig3.0"
 .else
diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile
index 090ca8358745..205e38d946ba 100644
--- a/graphics/grx/Makefile
+++ b/graphics/grx/Makefile
@@ -40,10 +40,10 @@ BMP_DESC=		BMP image format support
 BMP_CONFIGURE_ENABLE=	bmp
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	png
 PRINT_CONFIGURE_ENABLE=	print
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_ENABLE=	tiff
 ZLIB_CONFIGURE_ENABLE=	zlib
 
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index 1acff8d2175e..1fec3956e955 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -11,33 +11,33 @@ COMMENT=	Produce PDF from scanned documents
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-Config-General>=2.40:${PORTSDIR}/devel/p5-Config-General \
-		p5-Glib2>=1.210:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Goo-Canvas>0:${PORTSDIR}/devel/p5-Goo-Canvas \
-		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Readonly>0:${PORTSDIR}/devel/p5-Readonly \
-		ImageMagick>0:${PORTSDIR}/graphics/ImageMagick \
-		p5-Sane>=0.05:${PORTSDIR}/graphics/p5-Sane \
-		p5-Set-IntSpan>=1.10:${PORTSDIR}/math/p5-Set-IntSpan \
-		p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-		bash:${PORTSDIR}/shells/bash \
-		p5-PDF-API2>0.57:${PORTSDIR}/textproc/p5-PDF-API2 \
-		p5-Gtk2>=1.090:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Ex-Simple-List>0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-Simple-List \
-		p5-Gtk2-ImageView>0:${PORTSDIR}/x11-toolkits/p5-Gtk2-ImageView
-RUN_DEPENDS:=	p5-Archive-Tar>0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Proc-ProcessTable>0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		cjb2:${PORTSDIR}/graphics/djvulibre \
-		scanimage:${PORTSDIR}/graphics/sane-backends \
-		scanadf:${PORTSDIR}/graphics/sane-frontends \
-		unpaper:${PORTSDIR}/graphics/unpaper \
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Gtk2-Ex-PodViewer>0.17:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-PodViewer \
-		p5-Filesys-Df>0.92:${PORTSDIR}/sysutils/p5-Filesys-Df \
-		p5-Data-UUID>=1.220:${PORTSDIR}/devel/p5-Data-UUID \
+BUILD_DEPENDS=	p5-Config-General>=2.40:devel/p5-Config-General \
+		p5-Glib2>=1.210:devel/p5-Glib2 \
+		p5-Goo-Canvas>0:devel/p5-Goo-Canvas \
+		p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
+		p5-Log-Log4perl>0:devel/p5-Log-Log4perl \
+		p5-Readonly>0:devel/p5-Readonly \
+		ImageMagick>0:graphics/ImageMagick \
+		p5-Sane>=0.05:graphics/p5-Sane \
+		p5-Set-IntSpan>=1.10:math/p5-Set-IntSpan \
+		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+		p5-Try-Tiny>0:lang/p5-Try-Tiny \
+		bash:shells/bash \
+		p5-PDF-API2>0.57:textproc/p5-PDF-API2 \
+		p5-Gtk2>=1.090:x11-toolkits/p5-Gtk2 \
+		p5-Gtk2-Ex-Simple-List>0:x11-toolkits/p5-Gtk2-Ex-Simple-List \
+		p5-Gtk2-ImageView>0:x11-toolkits/p5-Gtk2-ImageView
+RUN_DEPENDS:=	p5-Archive-Tar>0:archivers/p5-Archive-Tar \
+		p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable \
+		xdg-open:devel/xdg-utils \
+		cjb2:graphics/djvulibre \
+		scanimage:graphics/sane-backends \
+		scanadf:graphics/sane-frontends \
+		unpaper:graphics/unpaper \
+		p5-HTML-Parser>0:www/p5-HTML-Parser \
+		p5-Gtk2-Ex-PodViewer>0.17:x11-toolkits/p5-Gtk2-Ex-PodViewer \
+		p5-Filesys-Df>0.92:sysutils/p5-Filesys-Df \
+		p5-Data-UUID>=1.220:devel/p5-Data-UUID \
 		${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -51,14 +51,14 @@ OPTIONS_MULTI_OCR=	CUNEIFORM GOCR OCROPUS TESSERACT
 OPTIONS_DEFAULT=	GOCR
 
 CUNEIFORM_DESC=		Multi-language OCR system
-CUNEIFORM_RUN_DEPENDS=	cuneiform:${PORTSDIR}/graphics/cuneiform
+CUNEIFORM_RUN_DEPENDS=	cuneiform:graphics/cuneiform
 GOCR_DESC=		OCR program developed under GPL
-GOCR_RUN_DEPENDS=	gocr:${PORTSDIR}/graphics/gocr
+GOCR_RUN_DEPENDS=	gocr:graphics/gocr
 OCR_DESC=		Optical Character Recognition
 OCROPUS_DESC=		Document analysis and OCR system
-OCROPUS_RUN_DEPENDS=	ocropus:${PORTSDIR}/graphics/ocropus
+OCROPUS_RUN_DEPENDS=	ocropus:graphics/ocropus
 TESSERACT_DESC=		OCR engine developed at Google
-TESSERACT_RUN_DEPENDS=	tesseract:${PORTSDIR}/graphics/tesseract
+TESSERACT_RUN_DEPENDS=	tesseract:graphics/tesseract
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index 355405a2bbf1..8c97f9937b26 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Opensource 3D modelling application
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>0:${PORTSDIR}/graphics/py-opengl \
-		${PYTHON_PKGNAMEPREFIX}gtkglext>0:${PORTSDIR}/x11-toolkits/py-gtkglext
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>0:graphics/py-opengl \
+		${PYTHON_PKGNAMEPREFIX}gtkglext>0:x11-toolkits/py-gtkglext
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S,-src,,}
 
diff --git a/graphics/gstreamer-plugins-gl/Makefile b/graphics/gstreamer-plugins-gl/Makefile
index a11cbb89167e..a1dc919cedb2 100644
--- a/graphics/gstreamer-plugins-gl/Makefile
+++ b/graphics/gstreamer-plugins-gl/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:S/gstreamer/gst/}-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	GStreamer OpenGL video plugin
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gettext gmake jpeg libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index e2fcbf902483..86e201f7d31c 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Image viewer and browser for the GNOME 3 environment
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		itstool:${PORTSDIR}/textproc/itstool
-RUN_DEPENDS=	gsettings-desktop-schemas>0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \
+		itstool:textproc/itstool
+RUN_DEPENDS=	gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas
 
 USES=		bison compiler:c++11-lib desktop-file-utils gettext gmake \
 		libtool pathfix pkgconfig tar:xz
@@ -68,31 +68,31 @@ OPTIONS_DEFAULT=	BRASERO CLUTTER EXIV2 GSTREAMER RAW SECRET \
 OPTIONS_SUB=		yes
 
 BRASERO_DESC=		Write galleries to CD/DVD (large dependency)
-BRASERO_LIB_DEPENDS=	libbrasero-media3.so:${PORTSDIR}/sysutils/brasero
+BRASERO_LIB_DEPENDS=	libbrasero-media3.so:sysutils/brasero
 BRASERO_CONFIGURE_ENABLE=	libbrasero
 CLUTTER_DESC=		Fancy slideshows
-CLUTTER_LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+CLUTTER_LIB_DEPENDS=	libclutter-gtk-1.0.so:graphics/clutter-gtk3
 CLUTTER_CONFIGURE_ENABLE=	clutter
-EXIV2_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_ENABLE=	exiv2
 GSTREAMER_USE=		gstreamer1=yes
 GSTREAMER_CONFIGURE_ENABLE=	gstreamer
 RAW_DESC=		Raw image support via libraw
-RAW_LIB_DEPENDS=	libraw.so:${PORTSDIR}/graphics/libraw
+RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
 RAW_CONFIGURE_ENABLE=	libraw
 SECRET_DESC=		Libsecret support for storing passwords
-SECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+SECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 SECRET_CONFIGURE_ENABLE=	libsecret
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=	libwebp
 WEBSERVICES_DESC=	Web services
 WEBSERVICES_LIB_DEPENDS=\
-			libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-			libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-			libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3
+			libjson-glib-1.0.so:devel/json-glib \
+			libsoup-gnome-2.4.so:devel/libsoup-gnome \
+			libwebkit2gtk-4.0.so:www/webkit2-gtk3
 WEBSERVICES_CONFIGURE_ENABLE=	libjson-glib libsoup webkit2
 YELP_DESC=		Viewer for built-in help system
-YELP_RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
+YELP_RUN_DEPENDS=	yelp:x11/yelp
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/graphics/gtimelapse/Makefile b/graphics/gtimelapse/Makefile
index 6fccde5831ea..4ece841b7d3d 100644
--- a/graphics/gtimelapse/Makefile
+++ b/graphics/gtimelapse/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Application for capturing images to generate timelapse videos
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index 295e9643166c..547c2a2b2af3 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Gtk-update-icon-cache utility from the Gtk+ toolkit
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info \
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS+=	update-mime-database:misc/shared-mime-info \
+		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 PORTSCOUT=	ignore:1
 
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 328325436d16..d385febef49c 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Download and view files from various digital cameras
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
-		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libexif-gtk.so:graphics/libexif-gtk \
+		libgphoto2.so:graphics/libgphoto2
 
 USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gtk20 intltool
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS GIMP GNOME
 OPTIONS_SUB=	yes
 
 GIMP_DESC=		GIMP plugin support
-GIMP_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
+GIMP_LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp
 GIMP_CONFIGURE_WITH=	gimp
 
 GNOME_USE=		GNOME=gnomeprefix,libgnomeui
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 051795fa6658..6720426324d4 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	gtkDPS-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk bindings for the Display GhostScript System
 
-LIB_DEPENDS=	libdpstk.so:${PORTSDIR}/x11/dgs
+LIB_DEPENDS=	libdpstk.so:x11/dgs
 
 USES=		libtool
 USE_GNOME=	gtk12
diff --git a/graphics/gts/Makefile b/graphics/gts/Makefile
index bc29f5ef4c9e..d8d6da83229f 100644
--- a/graphics/gts/Makefile
+++ b/graphics/gts/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	NETPBM
 OPTIONS_SUB=	yes
 
 NETPBM_DESC=		Build with libnetpbm support
-NETPBM_LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
+NETPBM_LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index 9170d4036635..d91ae4befafa 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -9,8 +9,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Image viewer and browser for KDE 4
 
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
+		libpng.so:graphics/png
 
 USE_KDE4=	kactivities kdelibs kdeprefix baloo kfilemetadata \
 		libkdcraw libkipi libkonq automoc4 soprano
diff --git a/graphics/gx/Makefile b/graphics/gx/Makefile
index de0886283f6a..d9e2bc0b8d22 100644
--- a/graphics/gx/Makefile
+++ b/graphics/gx/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lightweight image viewer
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm
+LIB_DEPENDS=	libgnomevfsmm-2.6.so:devel/gnome-vfsmm
 
 USES=		desktop-file-utils gettext pkgconfig
 USE_GNOME=	gconfmm26 gtkmm24
diff --git a/graphics/hdr_tools/Makefile b/graphics/hdr_tools/Makefile
index 42e3796341c8..02c2d13866c6 100644
--- a/graphics/hdr_tools/Makefile
+++ b/graphics/hdr_tools/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Command-line tools for creating and manipulating HDR images
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libtiff.so:graphics/tiff \
+		libIlmImf.so:graphics/OpenEXR \
+		libMagick++-6.so:graphics/ImageMagick
 
 USES=		compiler:features gmake pkgconfig tar:tgz
 NO_WRKSUBDIR=	yes
@@ -37,7 +37,7 @@ CXXFLAGS+=	-fopenmp
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034
-LIB_DEPENDS+=	libml.so:${PORTSDIR}/math/ldouble
+LIB_DEPENDS+=	libml.so:math/ldouble
 LDFLAGS+=	-lml
 .endif
 
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index b10a36b29881..4e1710f2abeb 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 USES=		pkgconfig
 USE_CABAL=	gtk2hs-buildtools mtl text>=1.0.0.0 utf8-string>=0.2
 
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:${PORTSDIR}/graphics/cairo
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:graphics/cairo
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index 5c03c981b213..ec33a200c174 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Wallpaper manipulation utility for X11
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index b7e671e61d43..a4ecd615e4d0 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -10,21 +10,21 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 MAINTAINER=	grog@FreeBSD.org
 COMMENT=	GUI for Panorama Tools, to stitch panoramic images
 
-LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libImath.so:${PORTSDIR}/graphics/ilmbase \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libpano13.so:${PORTSDIR}/graphics/libpano13 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libvigraimpex.so:${PORTSDIR}/graphics/vigra \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
+		libImath.so:graphics/ilmbase \
+		libboost_thread.so:devel/boost-libs \
+		liblcms2.so:graphics/lcms2 \
+		libexiv2.so:graphics/exiv2 \
+		libfftw3.so:math/fftw3 \
+		libpano13.so:graphics/libpano13 \
+		libsqlite3.so:databases/sqlite3 \
+		libvigraimpex.so:graphics/vigra \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 # gmake is really needed at _runtime_.   Do not remove it from this list.
-RUN_DEPENDS=	enblend>=4.1.4:${PORTSDIR}/graphics/enblend \
-		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		gmake:${PORTSDIR}/devel/gmake
+RUN_DEPENDS=	enblend>=4.1.4:graphics/enblend \
+		exiftool:graphics/p5-Image-ExifTool \
+		gmake:devel/gmake
 
 USES=		cmake compiler:c++11-lib desktop-file-utils \
 		gettext jpeg pkgconfig shared-mime-info tar:bzip2
@@ -38,14 +38,14 @@ OPTIONS_DEFAULT=	PANOMATIC AUTOPANOSIFTC PYTHON
 OPTIONS_SUB=		yes
 
 PANOMATIC_DESC=		Install graphics/panomatic
-PANOMATIC_RUN_DEPENDS=	panomatic:${PORTSDIR}/graphics/panomatic
+PANOMATIC_RUN_DEPENDS=	panomatic:graphics/panomatic
 
 AUTOPANOSIFTC_DESC=	Install graphics/autopano-sift-c
-AUTOPANOSIFTC_RUN_DEPENDS=	autopano:${PORTSDIR}/graphics/autopano-sift-c
+AUTOPANOSIFTC_RUN_DEPENDS=	autopano:graphics/autopano-sift-c
 
 PYTHON_DESC=		Python Scripting Interface
 PYTHON_USES=		python
-PYTHON_BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+PYTHON_BUILD_DEPENDS=	swig2.0:devel/swig20
 PYTHON_CMAKE_ON=	-DBUILD_HSI=ON
 PYTHON_CMAKE_OFF=	-DBUILD_HSI=OFF
 
diff --git a/graphics/icat/Makefile b/graphics/icat/Makefile
index 727b661838aa..e439e5538924 100644
--- a/graphics/icat/Makefile
+++ b/graphics/icat/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	graphics
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Displays images in 256-color capable terminals
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		gmake dos2unix
 USE_GITHUB=	yes
diff --git a/graphics/iccexamin/Makefile b/graphics/iccexamin/Makefile
index 1f7f48549711..7bf9d6ec88a6 100644
--- a/graphics/iccexamin/Makefile
+++ b/graphics/iccexamin/Makefile
@@ -12,12 +12,12 @@ COMMENT=	ICC profile viewer and colour visualisation
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libftgl.so:${PORTSDIR}/graphics/ftgl \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		liboyranos.so:${PORTSDIR}/graphics/oyranos
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+		libftgl.so:graphics/ftgl \
+		liblcms.so:graphics/lcms \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		liboyranos.so:graphics/oyranos
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		desktop-file-utils gettext iconv jpeg pkgconfig tar:bzip2
diff --git a/graphics/iccxml/Makefile b/graphics/iccxml/Makefile
index 423fa42d8011..acdf695dfd0f 100644
--- a/graphics/iccxml/Makefile
+++ b/graphics/iccxml/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	IccXML-${PORTVERSION}
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Tools for reading and writing the ICC profile contents as XML files
 
-LIB_DEPENDS=	libSampleICC.so:${PORTSDIR}/graphics/sampleicc
+LIB_DEPENDS=	libSampleICC.so:graphics/sampleicc
 
 USES=		gmake pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/graphics/icon-slicer/Makefile b/graphics/icon-slicer/Makefile
index 1d740b2de60b..914a42ee1dfc 100644
--- a/graphics/icon-slicer/Makefile
+++ b/graphics/icon-slicer/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utility for generating icon and cursor themes
 
 LICENSE=	MIT # in readme and sources; COPYING seem to be unrelated
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		localbase pkgconfig
 USE_GNOME=	gtk20
diff --git a/graphics/icontact/Makefile b/graphics/icontact/Makefile
index 32d20b77d52e..e1cd7a70cecb 100644
--- a/graphics/icontact/Makefile
+++ b/graphics/icontact/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.panix.com/~mbh/icontact/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Combines multiples images to create a single customisable image
 
-RUN_DEPENDS=	${LOCALBASE}/bin/ppmmake:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	${LOCALBASE}/bin/ppmmake:graphics/netpbm
 
 USES=		jpeg:run shebangfix
 SHEBANG_FILES=	icontact
diff --git a/graphics/icoutils/Makefile b/graphics/icoutils/Makefile
index 11cb4e8a47e8..5998170ad2ec 100644
--- a/graphics/icoutils/Makefile
+++ b/graphics/icoutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Convert/extract images in Microsoft Windows(R) icon/cursor files
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		shebangfix tar:bzip2
 SHEBANG_FILES=	extresso/*.in
@@ -31,7 +31,7 @@ RESSCRIPTS_DESC=	Additional resource scripts written in Perl
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRESSCRIPTS}
-RUN_DEPENDS+=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS+=	p5-libwww>=0:www/p5-libwww
 USES+=		perl5
 USE_PERL5=	run
 PLIST_FILES+=	bin/extresso bin/genresscript \
diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile
index d14f147cf79d..02e24fc8485c 100644
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Small and fast motif-based image viewer and editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	libexif.so:graphics/libexif
 
 USES=		compiler:c11 desktop-file-utils gmake iconv jpeg motif perl5
 USE_PERL5=	build
@@ -30,18 +30,18 @@ PLIST_FILES=	bin/exiftran bin/ida lib/X11/app-defaults/Ida \
 OPTIONS_DEFINE=		DOCS GIF PCD PNG SANE TIFF WEBP
 OPTIONS_DEFAULT=	GIF PNG TIFF
 
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_MAKE_ARGS_OFF=	HAVE_LIBGIF=no
 PCD_DESC=		PhotoCD support
-PCD_LIB_DEPENDS=	libpcd.so:${PORTSDIR}/graphics/libpcd
+PCD_LIB_DEPENDS=	libpcd.so:graphics/libpcd
 PCD_MAKE_ARGS_OFF=	HAVE_LIBPCD=no
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MAKE_ARGS_OFF=	HAVE_LIBPNG=no
-SANE_LIB_DEPENDS=	libsane.so:${PORTSDIR}/graphics/sane-backends
+SANE_LIB_DEPENDS=	libsane.so:graphics/sane-backends
 SANE_MAKE_ARGS_OFF=	HAVE_LIBSANE=no
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MAKE_ARGS=		HAVE_LIBTIFF=no
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_MAKE_ARGS_OFF=	HAVE_LIBWEBP=no
 
 post-install:
diff --git a/graphics/iec16022/Makefile b/graphics/iec16022/Makefile
index 8cbe5f23c60f..956748ff0d2a 100644
--- a/graphics/iec16022/Makefile
+++ b/graphics/iec16022/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Create 2D barcodes, also known as DataMatrix
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/iiview/Makefile b/graphics/iiview/Makefile
index 57aaf3f76543..c79ff2315427 100644
--- a/graphics/iiview/Makefile
+++ b/graphics/iiview/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Thumb viewer application
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png \
-		${LOCALBASE}/lib/libtiff.a:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:graphics/png \
+		${LOCALBASE}/lib/libtiff.a:graphics/tiff
 
 USES=		jpeg:build
 USE_XORG=	xpm x11
diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile
index 361bfc41ba80..b5f51e000913 100644
--- a/graphics/imageindex/Makefile
+++ b/graphics/imageindex/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://www.edwinh.org/imageindex/release/ \
 MAINTAINER=	johnjen@reynoldsnet.org
 COMMENT=	Digital photo gallery tool
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
+RUN_DEPENDS=	convert:graphics/ImageMagick \
+		mplayer:multimedia/mplayer \
+		p5-Image-Info>=0:graphics/p5-Image-Info
 
 USES=		jpeg perl5
 USE_PERL5=	run
diff --git a/graphics/imageworsener/Makefile b/graphics/imageworsener/Makefile
index 253ea0ff00a8..81ad68066de9 100644
--- a/graphics/imageworsener/Makefile
+++ b/graphics/imageworsener/Makefile
@@ -27,8 +27,8 @@ USES=		libtool
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
 PNG_CONFIGURE_WITH=	png
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 WEBP_CONFIGURE_WITH=	webp
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 .include <bsd.port.mk>
diff --git a/graphics/imc/Makefile b/graphics/imc/Makefile
index 635d9b43e4ce..08ee9a54d1ce 100644
--- a/graphics/imc/Makefile
+++ b/graphics/imc/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Image Compiler
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		p5-CGI>=0:www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake perl5
diff --git a/graphics/imgtops/Makefile b/graphics/imgtops/Makefile
index 4abb27b5a393..0f1e84b11bee 100644
--- a/graphics/imgtops/Makefile
+++ b/graphics/imgtops/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Create efficient Encapsulated Postscript files from images
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 USES=			ghostscript:run python
 USE_PYTHON=		distutils
diff --git a/graphics/imgv/Makefile b/graphics/imgv/Makefile
index f4ef715246c2..552b15d997b8 100644
--- a/graphics/imgv/Makefile
+++ b/graphics/imgv/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Unique and feature rich Image Viewer
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 00783feafc47..f41e5be66007 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	imlib2 license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -61,7 +61,7 @@ PLIST_SUB+=	JPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 PLIST_SUB+=	PNG=""
 .else
 CONFIGURE_ARGS+=	--without-png
@@ -69,7 +69,7 @@ PLIST_SUB+=	PNG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libtiff.so:graphics/tiff
 PLIST_SUB+=	TIFF=""
 .else
 CONFIGURE_ARGS+=	--without-tiff
@@ -77,7 +77,7 @@ PLIST_SUB+=	TIFF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGIF}
-LIB_DEPENDS+=	libgif.so:${PORTSDIR}/graphics/giflib
+LIB_DEPENDS+=	libgif.so:graphics/giflib
 PLIST_SUB+=	GIF=""
 .else
 CONFIGURE_ARGS+=	--without-gif
@@ -85,7 +85,7 @@ PLIST_SUB+=	GIF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MID3}
-LIB_DEPENDS+=	libid3tag.so:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS+=	libid3tag.so:audio/libid3tag
 PLIST_SUB+=	ID3=""
 .else
 CONFIGURE_ARGS+=	--without-id3
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 8ba327f10f31..ee1f87ce5873 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -17,7 +17,7 @@ LICENSE_NAME_imlib2=	imlib2 license
 LICENSE_FILE_imlib2=	${WRKSRC}/COPYING
 LICENSE_PERMS_imlib2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig tar:bzip2
@@ -33,7 +33,7 @@ MAKE_ENV+=	INSTALL_STRIP_FLAG="${STRIP}"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEET}
-LIB_DEPENDS+=	libefl.so:${PORTSDIR}/devel/efl
+LIB_DEPENDS+=	libefl.so:devel/efl
 PLIST_SUB+=	EET=""
 .else
 CONFIGURE_ARGS+=	--disable-eet
diff --git a/graphics/import-pictures/Makefile b/graphics/import-pictures/Makefile
index 235e1ac8cb73..d51511447801 100644
--- a/graphics/import-pictures/Makefile
+++ b/graphics/import-pictures/Makefile
@@ -15,9 +15,9 @@ BROKEN=		unfetchable
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Time-modules>=0:devel/p5-Time-modules
 
 USES=		gmake perl5 shebangfix tar:bzip2
 NO_ARCH=	yes
diff --git a/graphics/impressive/Makefile b/graphics/impressive/Makefile
index 9ef55b53d4dd..985babf17645 100644
--- a/graphics/impressive/Makefile
+++ b/graphics/impressive/Makefile
@@ -14,12 +14,12 @@ COMMENT=	The stylish way of giving presentations
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		xpdf:${PORTSDIR}/graphics/xpdf \
-		pdftk:${PORTSDIR}/print/pdftk \
-		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>=0:graphics/py-opengl \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		xpdf:graphics/xpdf \
+		pdftk:print/pdftk \
+		xdg-open:devel/xdg-utils \
+		mplayer:multimedia/mplayer \
 		${PYGAME}
 
 USES=		ghostscript:run python
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 84018ca6bfca..1d8c1edcb7b0 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -11,15 +11,15 @@ MASTER_SITES=	https://inkscape.global.ssl.fastly.net/media/resources/file/ \
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Full featured open source SVG editor
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libgc.so:${PORTSDIR}/devel/boehm-gc \
-		libgsl.so:${PORTSDIR}/math/gsl \
-		libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
-#RUN_DEPENDS=	p5-XML-XQL>=0:${PORTSDIR}/textproc/p5-XML-XQL
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:devel/boost-libs
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libgc.so:devel/boehm-gc \
+		libgsl.so:math/gsl \
+		libgtkspell.so:textproc/gtkspell \
+		liblcms.so:graphics/lcms \
+		libpng.so:graphics/png \
+		libMagick++-6.so:graphics/ImageMagick
+#RUN_DEPENDS=	p5-XML-XQL>=0:textproc/p5-XML-XQL
 
 USE_GNOME=	gtkmm24 intlhack libxslt
 USES=		compiler:c++0x cpe desktop-file-utils gettext gmake iconv \
@@ -40,27 +40,27 @@ OPTIONS_SUB=	yes
 
 CDR_DESC=		Support for CorelDRAW diagrams
 CDR_CONFIGURE_ENABLE=	cdr
-CDR_LIB_DEPENDS=	librevenge-stream-0.0.so:${PORTSDIR}/textproc/librevenge \
-			libcdr-0.1.so:${PORTSDIR}/graphics/libcdr01
+CDR_LIB_DEPENDS=	librevenge-stream-0.0.so:textproc/librevenge \
+			libcdr-0.1.so:graphics/libcdr01
 
 DBUS_CONFIGURE_ENABLE=	dbusapi
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 OPENMP_USES=		compiler:openmp
 OPENMP_USES_OFF=	compiler:features
 
 POPPLER_DESC=		PDF preview rendering
 POPPLER_CONFIGURE_ENABLE=	poppler-cairo
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 
 VISIO_DESC=		Support for Microsoft Visio diagrams
 VISIO_CONFIGURE_ENABLE=	visio
-VISIO_LIB_DEPENDS=	librevenge-stream-0.0.so:${PORTSDIR}/textproc/librevenge \
-			libvisio-0.1.so:${PORTSDIR}/textproc/libvisio01
+VISIO_LIB_DEPENDS=	librevenge-stream-0.0.so:textproc/librevenge \
+			libvisio-0.1.so:textproc/libvisio01
 
 WPG_DESC=		Support for WordPerfect graphics
 WPG_CONFIGURE_ENABLE=	wpg
-WPG_LIB_DEPENDS=	libwpg-0.3.so:${PORTSDIR}/graphics/libwpg03
+WPG_LIB_DEPENDS=	libwpg-0.3.so:graphics/libwpg03
 
 .include <bsd.port.pre.mk>
 
@@ -74,7 +74,7 @@ CPPFLAGS+=	-Wno-mismatched-tags -Wno-unknown-attributes
 # latter happened shortly before 10.1 was branched.
 .if ${ARCH} == i386 && ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000 && \
     ( ${COMPILER_TYPE} == clang || ${ALT_COMPILER_TYPE} == clang )
-BUILD_DEPENDS+=	clang34:${PORTSDIR}/lang/clang34
+BUILD_DEPENDS+=	clang34:lang/clang34
 CPP=    ${LOCALBASE}/bin/clang-cpp34
 CC=     ${LOCALBASE}/bin/clang34
 CXX=    ${LOCALBASE}/bin/clang++34
diff --git a/graphics/intel-backlight/Makefile b/graphics/intel-backlight/Makefile
index 9aec03ff04b4..b189e706f63e 100644
--- a/graphics/intel-backlight/Makefile
+++ b/graphics/intel-backlight/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=		graphics
 MAINTAINER=		freebsd@grem.de
 COMMENT=		Control backlight on various modern Intel(R) GPUs
 
-LIB_DEPENDS=		libdrm.so:${PORTSDIR}/graphics/libdrm \
-			libpciaccess.so:${PORTSDIR}/devel/libpciaccess
+LIB_DEPENDS=		libdrm.so:graphics/libdrm \
+			libpciaccess.so:devel/libpciaccess
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		grembo
diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile
index 3cb746ba13f4..a7e7cd195b6e 100644
--- a/graphics/inventor/Makefile
+++ b/graphics/inventor/Makefile
@@ -14,7 +14,7 @@ COMMENT=	SGI's Open Inventor (TM)
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 CONFLICTS=	Coin-[0-9]* SoXt-[0-9]*
 
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 2e2215bc339d..45776ba1416f 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -14,7 +14,7 @@ BROKEN=		unfetchable
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile
index 50bb81c3bf0c..bcc538f8513c 100644
--- a/graphics/iulib/Makefile
+++ b/graphics/iulib/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library of image understanding-related algorithms
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	SDL VIDIO
 SDL_DESC=	Enable SDL for graphical debugging
@@ -37,7 +37,7 @@ PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVIDIO}
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 .endif
 
 post-patch:
diff --git a/graphics/jbig2dec/Makefile b/graphics/jbig2dec/Makefile
index 2c939e64d824..9d462347fa28 100644
--- a/graphics/jbig2dec/Makefile
+++ b/graphics/jbig2dec/Makefile
@@ -28,7 +28,7 @@ python_CMD=	${PYTHON_CMD}
 
 PNG_CONFIGURE_OFF=	--without-libpng
 PNG_CONFIGURE_ON=	--with-libpng=${LOCALBASE}
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 TESTS_DISTFILES=	jb2streams${EXTRACT_SUFX}:tests
 TESTS_TEST_TARGET=	check-TESTS
 TESTS_USES=		python:build shebangfix
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile
index c4d10121bcba..0c2cc1f911be 100644
--- a/graphics/jdraw/Makefile
+++ b/graphics/jdraw/Makefile
@@ -35,7 +35,7 @@ do-install:
 
 .if ${PORT_OPTIONS:MPLASTIC3D}
 PLASTIC3D=	"-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
-RUN_DEPENDS+=	${JAVAJARDIR}/looks.jar:${PORTSDIR}/devel/looks
+RUN_DEPENDS+=	${JAVAJARDIR}/looks.jar:devel/looks
 .endif
 JAVA_VERSION=	1.6+
 
diff --git a/graphics/jogamp-jogl/Makefile b/graphics/jogamp-jogl/Makefile
index 2d4274747ce6..be21e9c3c5db 100644
--- a/graphics/jogamp-jogl/Makefile
+++ b/graphics/jogamp-jogl/Makefile
@@ -12,9 +12,9 @@ DISTFILES=	jogl-v${PORTVERSION}.tar.7z \
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Java bindings for OpenGL
 
-EXTRACT_DEPENDS=	${7Z_CMD}:${PORTSDIR}/archivers/p7zip
-BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
-RUN_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+EXTRACT_DEPENDS=	${7Z_CMD}:archivers/p7zip
+BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
+RUN_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile
index 40239aec6364..9e62a601ce24 100644
--- a/graphics/jogl/Makefile
+++ b/graphics/jogl/Makefile
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	-src.zip
 MAINTAINER=	peterj@FreeBSD.org
 COMMENT=	Java bindings for OpenGL
 
-LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm
-BUILD_DEPENDS=	${JAVALIBDIR}/antlr.jar:${PORTSDIR}/devel/antlr
+LIB_DEPENDS=	libdrm.so:graphics/libdrm
+BUILD_DEPENDS=	${JAVALIBDIR}/antlr.jar:devel/antlr
 
 NO_WRKSUBDIR=	yes
 
diff --git a/graphics/jp2a/Makefile b/graphics/jp2a/Makefile
index fa69c027e55f..2370f5d0678e 100644
--- a/graphics/jp2a/Makefile
+++ b/graphics/jp2a/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Converts JPG images to ASCII
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		jpeg tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile
index 536cbe895567..bd5dc8364c8d 100644
--- a/graphics/jpeg-turbo/Makefile
+++ b/graphics/jpeg-turbo/Makefile
@@ -34,7 +34,7 @@ EXAMPLES_MAKE_ARGS_OFF=	dist_example_DATA=""
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 .if ${SLAVE_PORT} == yes
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index c5b7dc18a71f..9a6994331d4b 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Digital camera manager for KDE 4
 
-LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource tar:xz
diff --git a/graphics/kdegraphics4-strigi-analyzer/Makefile b/graphics/kdegraphics4-strigi-analyzer/Makefile
index b833b89dbcec..d009da0027ae 100644
--- a/graphics/kdegraphics4-strigi-analyzer/Makefile
+++ b/graphics/kdegraphics4-strigi-analyzer/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi analyzers for various graphics file formats
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 USE_KDE4=	kdelibs kdeprefix automoc4 strigi
 USES=		cmake:outsource tar:xz
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 143bc3f55c51..ef779fe39312 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -26,39 +26,39 @@ OPTIONS_DEFINE=	GPHOTO \
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 GPHOTO_DESC=		Digital camera manager
-GPHOTO_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kio_kamera.so:${PORTSDIR}/graphics/kamera-kde4
+GPHOTO_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kio_kamera.so:graphics/kamera-kde4
 
 GWENVIEW_DESC=		Image viewer and browser
-GWENVIEW_RUN_DEPENDS=	${KDE4_PREFIX}/bin/gwenview:${PORTSDIR}/graphics/gwenview-kde4
+GWENVIEW_RUN_DEPENDS=	${KDE4_PREFIX}/bin/gwenview:graphics/gwenview-kde4
 
 KCOLORCHOOSER_DESC=	Utility for colors selection
-KCOLORCHOOSER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcolorchooser:${PORTSDIR}/graphics/kcolorchooser
+KCOLORCHOOSER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcolorchooser:graphics/kcolorchooser
 
 KGAMMA_DESC=		Monitor calibration tool
-KGAMMA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/xf86gammacfg:${PORTSDIR}/x11/kgamma
+KGAMMA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/xf86gammacfg:x11/kgamma
 
 KOLOURPAINT_DESC=	Paint application
-KOLOURPAINT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kolourpaint:${PORTSDIR}/graphics/kolourpaint
+KOLOURPAINT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kolourpaint:graphics/kolourpaint
 
 KRULER_DESC=		Screen ruler
-KRULER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kruler:${PORTSDIR}/deskutils/kruler
+KRULER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kruler:deskutils/kruler
 
 KSNAPSHOT_DESC=		Screen capture program
-KSNAPSHOT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ksnapshot:${PORTSDIR}/graphics/ksnapshot
+KSNAPSHOT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ksnapshot:graphics/ksnapshot
 
 MOBIPOCKET_DESC=	Mobipocket plugins for Strigi indexing and thumbnailers
-MOBIPOCKET_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/mobithumbnail.so:${PORTSDIR}/graphics/kdegraphics4-mobipocket \
+MOBIPOCKET_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/mobithumbnail.so:graphics/kdegraphics4-mobipocket \
 
 SANE_DESC=		Plugin for scanning on KDE
-SANE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/ksaneplugin.so:${PORTSDIR}/graphics/ksaneplugin
+SANE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/ksaneplugin.so:graphics/ksaneplugin
 
 STRIGI_DESC=		Strigi analyzers for graphics file formats
-STRIGI_RUN_DEPENDS=	${KDE4_PREFIX}/lib/strigi/strigiea_dvi.so:${PORTSDIR}/graphics/kdegraphics4-strigi-analyzer
+STRIGI_RUN_DEPENDS=	${KDE4_PREFIX}/lib/strigi/strigiea_dvi.so:graphics/kdegraphics4-strigi-analyzer
 
 SVG_DESC=		SVG KPart
-SVG_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/svgpart.so:${PORTSDIR}/graphics/kdegraphics4-svgpart
+SVG_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/svgpart.so:graphics/kdegraphics4-svgpart
 
 THUMBNAILER_DESC=	Thumbnail generator for graphics file formats
-THUMBNAILER_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/gsthumbnail.so:${PORTSDIR}/graphics/kdegraphics4-thumbnailers
+THUMBNAILER_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/gsthumbnail.so:graphics/kdegraphics4-thumbnailers
 
 .include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-debianscreenshots/Makefile b/graphics/kipi-plugin-debianscreenshots/Makefile
index 208bd70119a2..c1dd35552fe3 100644
--- a/graphics/kipi-plugin-debianscreenshots/Makefile
+++ b/graphics/kipi-plugin-debianscreenshots/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 KIPI_PLUGIN=	debianscreenshots
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-dngconverter/Makefile b/graphics/kipi-plugin-dngconverter/Makefile
index 5d4a98c3db14..646116cef090 100644
--- a/graphics/kipi-plugin-dngconverter/Makefile
+++ b/graphics/kipi-plugin-dngconverter/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 KIPI_PLUGIN=	dngconverter
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-dropbox/Makefile b/graphics/kipi-plugin-dropbox/Makefile
index bd222977c659..3bcef1954271 100644
--- a/graphics/kipi-plugin-dropbox/Makefile
+++ b/graphics/kipi-plugin-dropbox/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 KIPI_PLUGIN=	dropbox
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-facebook/Makefile b/graphics/kipi-plugin-facebook/Makefile
index 350b2ed9b01f..97c8d7cafde4 100644
--- a/graphics/kipi-plugin-facebook/Makefile
+++ b/graphics/kipi-plugin-facebook/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 KIPI_PLUGIN=	facebook
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-googledrive/Makefile b/graphics/kipi-plugin-googledrive/Makefile
index 34c87e29b090..31a101c3be75 100644
--- a/graphics/kipi-plugin-googledrive/Makefile
+++ b/graphics/kipi-plugin-googledrive/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 KIPI_PLUGIN=	googledrive
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-gpssync/Makefile b/graphics/kipi-plugin-gpssync/Makefile
index 57edc8b422f9..63b46b2bd1f1 100644
--- a/graphics/kipi-plugin-gpssync/Makefile
+++ b/graphics/kipi-plugin-gpssync/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libkgeomap.so:${PORTSDIR}/astro/libkgeomap
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs
+LIB_DEPENDS=	libkgeomap.so:astro/libkgeomap
 
 KIPI_PLUGIN=	gpssync
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-imgurexport/Makefile b/graphics/kipi-plugin-imgurexport/Makefile
index 13590ff074fa..9a0018fbe5d4 100644
--- a/graphics/kipi-plugin-imgurexport/Makefile
+++ b/graphics/kipi-plugin-imgurexport/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 KIPI_PLUGIN=	imgurexport
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-ipodexport/Makefile b/graphics/kipi-plugin-ipodexport/Makefile
index 3fa3e1d5e19b..9826a401eac2 100644
--- a/graphics/kipi-plugin-ipodexport/Makefile
+++ b/graphics/kipi-plugin-ipodexport/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libgpod.so:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS=	libgpod.so:audio/libgpod
 
 KIPI_PLUGIN=	ipodexport
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-mediawiki/Makefile b/graphics/kipi-plugin-mediawiki/Makefile
index aa24aa9313fa..1fca0b20c141 100644
--- a/graphics/kipi-plugin-mediawiki/Makefile
+++ b/graphics/kipi-plugin-mediawiki/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libmediawiki.so:${PORTSDIR}/net/libmediawiki
+LIB_DEPENDS=	libmediawiki.so:net/libmediawiki
 
 KIPI_PLUGIN=	mediawiki
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-removeredeyes/Makefile b/graphics/kipi-plugin-removeredeyes/Makefile
index 5780be4482e8..31e92847587f 100644
--- a/graphics/kipi-plugin-removeredeyes/Makefile
+++ b/graphics/kipi-plugin-removeredeyes/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libopencv_legacy.so:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
 
 KIPI_PLUGIN=	removeredeyes
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-shwup/Makefile b/graphics/kipi-plugin-shwup/Makefile
index 64419345d2d3..8e4e761de56c 100644
--- a/graphics/kipi-plugin-shwup/Makefile
+++ b/graphics/kipi-plugin-shwup/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	libqca.so:devel/qca
 
 KIPI_PLUGIN=	shwup
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-videoslideshow/Makefile b/graphics/kipi-plugin-videoslideshow/Makefile
index e7dcf0c52bed..a8db658be7f3 100644
--- a/graphics/kipi-plugin-videoslideshow/Makefile
+++ b/graphics/kipi-plugin-videoslideshow/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libQtGStreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer-qt4
+LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick \
+		libQtGStreamer-0.10.so:multimedia/gstreamer-qt4
 
 KIPI_PLUGIN=	videoslideshow
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-vkontakte/Makefile b/graphics/kipi-plugin-vkontakte/Makefile
index 32e1d0bc7645..85883d946370 100644
--- a/graphics/kipi-plugin-vkontakte/Makefile
+++ b/graphics/kipi-plugin-vkontakte/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libkvkontakte.so:${PORTSDIR}/net/libkvkontakte
+LIB_DEPENDS=	libkvkontakte.so:net/libkvkontakte
 
 KIPI_PLUGIN=	vkontakte
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugin-yandexfotki/Makefile b/graphics/kipi-plugin-yandexfotki/Makefile
index 3deaf6f38448..be089ace5c92 100644
--- a/graphics/kipi-plugin-yandexfotki/Makefile
+++ b/graphics/kipi-plugin-yandexfotki/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	libqca.so:devel/qca
 
 KIPI_PLUGIN=	yandexfotki
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 5233d07c6cec..00d37ff2df62 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -24,10 +24,10 @@ NO_OPTIONS_SORT=	yes
 .for plugin in ${KIPI_PLUGINS_ALL}
 OPTIONS_DEFINE+=	${plugin:tu}
 ${plugin:tu}_DESC=	${${plugin}_DESC}
-${plugin:tu}_RUN_DEPENDS=	kipi-plugin-${plugin}>=${DIGIKAM_VER}:${PORTSDIR}/graphics/kipi-plugin-${plugin}
+${plugin:tu}_RUN_DEPENDS=	kipi-plugin-${plugin}>=${DIGIKAM_VER}:graphics/kipi-plugin-${plugin}
 .endfor
 
-NLS_DEP=	digikam-l10n>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-l10n
-DOCS_DEP=	digikam-doc>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-doc
+NLS_DEP=	digikam-l10n>=${DIGIKAM_VER}:graphics/digikam-kde4-l10n
+DOCS_DEP=	digikam-doc>=${DIGIKAM_VER}:graphics/digikam-kde4-doc
 
 .include <bsd.port.mk>
diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
index e48ed02a11e8..bfb5563966a0 100644
--- a/graphics/klatexformula/Makefile
+++ b/graphics/klatexformula/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Convert LaTeX formula to image
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	help2man:misc/help2man
 
 USES=		cmake:outsource desktop-file-utils ghostscript:run \
 		shared-mime-info
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index 522cfd96cdf2..4f72675a15dd 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/source/2004-08-22
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple 3D editor
 
-LIB_DEPENDS=	lib3ds.so:${PORTSDIR}/graphics/lib3ds \
-		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	lib3ds.so:graphics/lib3ds \
+		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 USES=		gmake pkgconfig python
 USE_GL=		gl
diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index e6f8eb9555c7..a5810e8a6b39 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Image viewer and organizer for KDE
 
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 USES=		cmake:outsource jpeg pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	script/open-raw.pl script/kpa-backup.sh
diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile
index f733e48d415a..29f427b76f9a 100644
--- a/graphics/kpovmodeler/Makefile
+++ b/graphics/kpovmodeler/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	KDE/extragear
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE editor/frontend for Povray
 
-RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
+RUN_DEPENDS=	povray:graphics/povray-meta
 
 USE_GL=		glu
 USE_KDE4=	kdelibs kdeprefix automoc4
diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile
index 4ecad7622f4d..aa9695d6e8ba 100644
--- a/graphics/kudu/Makefile
+++ b/graphics/kudu/Makefile
@@ -12,7 +12,7 @@ COMMENT=	3D skeletal animation tool, powered by GTK+ and OpenGL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 USES=		tar:bzip2 pkgconfig python
 GNU_CONFIGURE=	yes
diff --git a/graphics/l2p/Makefile b/graphics/l2p/Makefile
index e565ee7e9f05..d8a1327c2d0d 100644
--- a/graphics/l2p/Makefile
+++ b/graphics/l2p/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://static.redsymbol.net/software/l2p/dist/ \
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Create PNG images from LaTeX math expressions
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 NO_BUILD=	yes
 
diff --git a/graphics/lcdtest/Makefile b/graphics/lcdtest/Makefile
index 1cda88f8ca3c..42b2d110b3fb 100644
--- a/graphics/lcdtest/Makefile
+++ b/graphics/lcdtest/Makefile
@@ -16,7 +16,7 @@ COMMENT=	LCD monitor test pattern generator
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	liberation-fonts-ttf>0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
+RUN_DEPENDS=	liberation-fonts-ttf>0:x11-fonts/liberation-fonts-ttf
 
 USE_SDL=	sdl image ttf
 
diff --git a/graphics/lcms-python/Makefile b/graphics/lcms-python/Makefile
index 1d61bfb3577d..03ff2cfde99b 100644
--- a/graphics/lcms-python/Makefile
+++ b/graphics/lcms-python/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Light Color Management System (python bindings)
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms
+LIB_DEPENDS=	liblcms.so:graphics/lcms
 
 BUILD_WRKSRC=	${WRKSRC}/python
 INSTALL_WRKSRC=	${WRKSRC}/python
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 1a53babaa910..55cef7c1f60a 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -32,7 +32,7 @@ PORTDOCS=	*
 JPEGICC_CONFIGURE_WITH=	jpeg
 JPEGICC_USES=		jpeg
 TIFFICC_CONFIGURE_WITH=	tiff
-TIFFICC_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFFICC_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| python samples||' ${WRKSRC}/Makefile.in
diff --git a/graphics/lcms2/Makefile b/graphics/lcms2/Makefile
index 0f43f2462cc4..86fc60341051 100644
--- a/graphics/lcms2/Makefile
+++ b/graphics/lcms2/Makefile
@@ -30,7 +30,7 @@ PORTDOCS=	*
 JPEGICC_CONFIGURE_WITH=	jpeg
 JPEGICC_USES=		jpeg
 TIFFICC_CONFIGURE_WITH=	tiff
-TIFFICC_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFFICC_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 post-install:
 	cd ${WRKSRC}/utils/ && ${INSTALL_MAN} linkicc/linkicc.1 psicc/psicc.1 transicc/transicc.1 ${STAGEDIR}${PREFIX}/man/man1/
diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 9602a2b4e5a4..fc167bb10deb 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for fixing lens geometry distortions
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cmake pathfix pkgconfig
 USE_GNOME=	glib20
diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile
index 986b0208b711..c2f2b33b72be 100644
--- a/graphics/leptonica/Makefile
+++ b/graphics/leptonica/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	http://www.leptonica.com/source/
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	C library for efficient image processing and image analysis operations
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libopenjp2.so:${PORTSDIR}/graphics/openjpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libwebp.so:${PORTSDIR}/graphics/webp
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libopenjp2.so:graphics/openjpeg \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libwebp.so:graphics/webp
 
 CONFLICTS=	leptonlib-[0-9]*
 
@@ -27,7 +27,7 @@ INSTALL_TARGET=	install-strip
 
 TESTS?=	generate compare
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot
+BUILD_DEPENDS+=	${LOCALBASE}/bin/gnuplot:math/gnuplot
 .endif
 #the display portion of the regression tests is interactive,
 #and requires the use of xv, xli or xzgv as an image viewer
diff --git a/graphics/libEGL/Makefile b/graphics/libEGL/Makefile
index 5a5ddece9d8b..3050b4660767 100644
--- a/graphics/libEGL/Makefile
+++ b/graphics/libEGL/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	graphics
 
 COMMENT=	OpenEGL library
 
-LIB_DEPENDS+=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libdevq.so:${PORTSDIR}/devel/libdevq \
-		libdrm.so:${PORTSDIR}/graphics/libdrm
+LIB_DEPENDS+=	libpthread-stubs.so:devel/libpthread-stubs \
+		libexpat.so:textproc/expat2 \
+		libdevq.so:devel/libdevq \
+		libdrm.so:graphics/libdrm
 
 USE_GL=		gbm
 USE_XORG=	x11 xau xcb xdmcp
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index 2e5c78570ee6..4874a0824daa 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	graphics
 
 COMMENT=	OpenGL library that renders using GLX or DRI
 
-LIB_DEPENDS+=	libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libglapi.so:${PORTSDIR}/graphics/libglapi \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
+		libglapi.so:graphics/libglapi \
+		libexpat.so:textproc/expat2
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \
 		presentproto xshmfence
diff --git a/graphics/libGL/Makefile.common b/graphics/libGL/Makefile.common
index 4dd642c7bd5b..106785d76e42 100644
--- a/graphics/libGL/Makefile.common
+++ b/graphics/libGL/Makefile.common
@@ -28,8 +28,8 @@ DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	x11@FreeBSD.org
 
-BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend
-LIB_DEPENDS+=	libdevq.so:${PORTSDIR}/devel/libdevq
+BUILD_DEPENDS+=	makedepend:devel/makedepend
+LIB_DEPENDS+=	libdevq.so:devel/libdevq
 
 USES+=		compiler:c++11-lib gettext-tools gmake libtool \
 		pathfix pkgconfig python:2,build shebangfix tar:xz
@@ -47,7 +47,7 @@ PORTSCOUT=	ignore:1
 .endif
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CONFIGURE_ENV+=	ac_cv_prog_LEX=${LOCALBASE}/bin/flex
 .endif
 
@@ -92,7 +92,7 @@ CONFIGURE_ARGS+=	--enable-gles2
 		${OSVERSION} >= 1002000 && ${ARCH} == i386))
 # Disabled on 10.1-R i386 because of compile issues with libclc.
 
-BUILD_DEPENDS+=	libclc>=0.0.r222830:${PORTSDIR}/devel/libclc
+BUILD_DEPENDS+=	libclc>=0.0.r222830:devel/libclc
 
 # We need the clang port too even if it is not used to compile because
 # Clover needs some of the clang includes to build.
@@ -117,9 +117,9 @@ CONFIGURE_ARGS+=	--disable-opencl
 CONFIGURE_ARGS+=	--enable-osmesa
 
 # gallium
-BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
+BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=0:devel/llvm${MESA_LLVM_VER}
 .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
-RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
+RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=0:devel/llvm${MESA_LLVM_VER}
 .endif
 
 CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
@@ -134,7 +134,7 @@ CONFIGURE_ARGS+=--enable-texture-float
 # only support on DragonFly. FreeBSD's drm doesn't support it.
 .if ${OPSYS} == DragonFly && ${COMPONENT:Mdri} != ""
 CONFIGURE_ARGS+=--enable-vdpau
-LIB_DEPENDS+=   libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+LIB_DEPENDS+=   libvdpau.so:multimedia/libvdpau
 PLIST_SUB+=     VDPAU=""
 .else
 CONFIGURE_ARGS+=--disable-vdpau
@@ -187,6 +187,6 @@ PLIST_SUB+=	${_gd}_GDRIVER="@comment "
 CONFIGURE_ARGS+=--with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
 
 .if ${OPSYS} == DragonFly
-LIB_DEPENDS+= libelf.so:${PORTSDIR}/devel/libelf
+LIB_DEPENDS+= libelf.so:devel/libelf
 .endif
 
diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index 4a8ca5cc864c..21c30f9a1432 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Generic imaging library originally designed for AfterStep
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libfreetype.so:print/freetype2
 
 USES=		jpeg pkgconfig tar:bzip2
 USE_XORG=	xext
diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile
index 727ce7c0686e..29d4a1e90427 100644
--- a/graphics/libboard/Makefile
+++ b/graphics/libboard/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Vector graphics C++ library
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS=	doxygen:devel/doxygen
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile
index 50f092a39218..9acf3dffbab2 100644
--- a/graphics/libbpg/Makefile
+++ b/graphics/libbpg/Makefile
@@ -13,7 +13,7 @@ COMMENT=	BPG (Better Portable Graphics) is a new image format
 LICENSE=	BSD2CLAUSE LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	SDL JCTVC X265
 OPTIONS_DEFAULT=SDL JCTVC
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 
 USE_LDCONFIG=	yes
 SDL_USE=	SDL=image
-X265_LIB_DEPENDS=	libx265.so:${PORTSDIR}/multimedia/x265
+X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 
 JCTVC_DESC=	Enable JCTVC (best quality but slow) for the encoder
 JCTVCHI_DESC=	Use bit depths > 12 with JCTVC (experimental)
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index daae561384d5..e30a68cfa479 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -33,15 +33,15 @@ FTGL_DESC=	Freetype font rendering in OpenGL
 
 X11_USE=	XORG=x11 GL=glut
 X11_CONFIGURE_OFF=	--disable-x11 --disable-gl
-IMLIB2_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_CONFIGURE_ENABLE=	imlib2
-SLANG_LIB_DEPENDS=	libslang.so.2:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS=	libslang.so.2:devel/libslang2
 SLANG_CONFIGURE_ENABLE=	slang=${LOCALBASE}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFTGL} && ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libftgl.so:${PORTSDIR}/graphics/ftgl
+LIB_DEPENDS+=	libftgl.so:graphics/ftgl
 .endif
 
 post-patch:
diff --git a/graphics/libcdr01/Makefile b/graphics/libcdr01/Makefile
index cc05aea12b25..cc4b20ac0d96 100644
--- a/graphics/libcdr01/Makefile
+++ b/graphics/libcdr01/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Library and tools for parsing Corel Draw file format
 LICENSE=	LGPL21 MPL GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu \
-		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs
+LIB_DEPENDS=	libicui18n.so:devel/icu \
+		librevenge-0.0.so:textproc/librevenge \
+		liblcms2.so:graphics/lcms2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tests --disable-werror --without-docs
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 74af1814028e..7f2fe71844d9 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C library aimed to provide a Gtk+ widget to display rasterized maps and markers
 
-LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
+LIB_DEPENDS=	libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome
 
 USES=		gmake gnome libtool pathfix pkgconfig sqlite tar:xz
 USE_GNOME=	gtk30 introspection:build
diff --git a/graphics/libchamplain08/Makefile b/graphics/libchamplain08/Makefile
index 041a37470f44..eabcf0929f36 100644
--- a/graphics/libchamplain08/Makefile
+++ b/graphics/libchamplain08/Makefile
@@ -11,8 +11,8 @@ PKGNAMESUFFIX=	08
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C library provides a Gtk+ widget to display rasterized maps/markers
 
-LIB_DEPENDS=	libclutter-gtk-0.10.so:${PORTSDIR}/graphics/clutter-gtk \
-		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
+LIB_DEPENDS=	libclutter-gtk-0.10.so:graphics/clutter-gtk \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome
 
 USES=		gmake libtool:keepla pathfix pkgconfig sqlite tar:bzip2
 USE_GNOME=	gnomeprefix gtk20 introspection:build,run
diff --git a/graphics/libdmtx/Makefile b/graphics/libdmtx/Makefile
index 80a00db8b8f2..9a1bc8c887b8 100644
--- a/graphics/libdmtx/Makefile
+++ b/graphics/libdmtx/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Library for reading and writing Data Matrix barcodes
 
-LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
 
 USES=		tar:bzip2 libtool
 GNU_CONFIGURE=	yes
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index e39ac9afc7ed..a5d6fe96e8f5 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Userspace interface to kernel Direct Rendering Module services
 
-LIB_DEPENDS=	libpciaccess.so:${PORTSDIR}/devel/libpciaccess \
-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
+LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess \
+		libpthread-stubs.so:devel/libpthread-stubs
 
 USES=		libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
@@ -38,7 +38,7 @@ PLIST_SUB+=	KMS="@comment " NOUVEAU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 USE_GNOME+=	libxslt:build
 PLIST_SUB+=	MAN=""
 .else
diff --git a/graphics/libetonyek01/Makefile b/graphics/libetonyek01/Makefile
index f97a53c26c52..95d085dc2617 100644
--- a/graphics/libetonyek01/Makefile
+++ b/graphics/libetonyek01/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Library to interpret and import Apple Keynote presentations
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	mdds>=0.12.1_1:${PORTSDIR}/devel/mdds \
-		${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
-LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	mdds>=0.12.1_1:devel/mdds \
+		${LOCALBASE}/include/glm/glm.hpp:math/glm
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
+		librevenge-0.0.so:textproc/librevenge \
+		libxml2.so:textproc/libxml2
 
 OPTIONS_DEFINE=	TEST
 
@@ -30,7 +30,7 @@ USES=		compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cppunit.pc:${PORTSDIR}/devel/cppunit
+TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit
 TEST_CONFIGURE_OFF=	--disable-tests
 
 .include <bsd.port.options.mk>
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 61bdbdcbee4b..9d239e644760 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GTK+ widgets to display/edit EXIF tags
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	libexif.so:graphics/libexif
 
 USES=		libtool pathfix pkgconfig
 USE_GNOME=	gtk20
diff --git a/graphics/libfreehand/Makefile b/graphics/libfreehand/Makefile
index c267e45753a9..412ba14542e4 100644
--- a/graphics/libfreehand/Makefile
+++ b/graphics/libfreehand/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Library providing ability to interpret and import Adobe/Macromedia draw
 LICENSE=	LGPL21 MPL GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	icu-config:${PORTSDIR}/devel/icu
-LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+BUILD_DEPENDS=	icu-config:devel/icu
+LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
+		librevenge-0.0.so:textproc/librevenge
 
 GNU_CONFIGURE=	yes
 USES=	compiler:c++11-lang gperf perl5 libtool pathfix pkgconfig tar:xz
diff --git a/graphics/libgaiagraphics/Makefile b/graphics/libgaiagraphics/Makefile
index 1d6fbf2b7fec..9fc7dee90070 100644
--- a/graphics/libgaiagraphics/Makefile
+++ b/graphics/libgaiagraphics/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 MAINTAINER=	coder@tuxfamily.org
 COMMENT=	Library supporting common-utility raster handling methods
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \
-		libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libgeotiff.so:graphics/libgeotiff \
+		libcairo.so:graphics/cairo
 
 USES=		gmake iconv jpeg pathfix pkgconfig libtool
 USE_LDCONFIG=	yes
diff --git a/graphics/libgeotiff/Makefile b/graphics/libgeotiff/Makefile
index fc40781a176d..efeafc4be386 100644
--- a/graphics/libgeotiff/Makefile
+++ b/graphics/libgeotiff/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Library for reading and writing GeoTIFF information tags
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libjbig.so:graphics/jbigkit \
+		libproj.so:graphics/proj \
+		libtiff.so:graphics/tiff
 
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--disable-doxygen-doc \
diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile
index 9daa1141c196..dac519a73ae0 100644
--- a/graphics/libgfx/Makefile
+++ b/graphics/libgfx/Makefile
@@ -12,10 +12,10 @@ COMMENT=	OpenGL/FLTK development
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libgzstream.so:${PORTSDIR}/devel/gzstream
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+		libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libgzstream.so:devel/gzstream
 
 BUILD_WRKSRC=	${WRKSRC}/src
 
diff --git a/graphics/libglapi/Makefile b/graphics/libglapi/Makefile
index a92ca5ad421a..57fc54a667d7 100644
--- a/graphics/libglapi/Makefile
+++ b/graphics/libglapi/Makefile
@@ -8,15 +8,15 @@ CATEGORIES=	graphics
 
 COMMENT=	Common GL api library used by Mesa based ports
 
-LIB_DEPENDS+=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
+LIB_DEPENDS+=	libpthread-stubs.so:devel/libpthread-stubs
 
 USE_XORG=	x11 xau xcb xdmcp xvmc
 
 # stuff not needed by libglapi but configure wants it
 USE_XORG+=	glproto dri2proto xext xdamage xfixes presentproto \
 		xshmfence
-LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libdrm.so:${PORTSDIR}/graphics/libdrm
+LIB_DEPENDS+=	libexpat.so:textproc/expat2 \
+		libdrm.so:graphics/libdrm
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR}/../../graphics/libGL/Makefile.common"
diff --git a/graphics/libglesv2/Makefile b/graphics/libglesv2/Makefile
index 71a6f23bd28c..26b047940442 100644
--- a/graphics/libglesv2/Makefile
+++ b/graphics/libglesv2/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	graphics
 
 COMMENT=	OpenGL ES v2 library
 
-LIB_DEPENDS+=	libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libglapi.so:${PORTSDIR}/graphics/libglapi \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
+		libglapi.so:graphics/libglapi \
+		libexpat.so:textproc/expat2
 
 # stuff not needed by libglesv2 but configure wants it
 USE_XORG+=	glproto dri2proto xext xdamage xfixes presentproto \
diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile
index 07c777b158f8..73856300d059 100644
--- a/graphics/libgltext/Makefile
+++ b/graphics/libgltext/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	gltext-${PORTVERSION}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Portable font rendering library for C++
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		gmake libtool
 USE_GL=		glu
diff --git a/graphics/libgltf/Makefile b/graphics/libgltf/Makefile
index e6a76883e03d..83311267c6d4 100644
--- a/graphics/libgltf/Makefile
+++ b/graphics/libgltf/Makefile
@@ -12,8 +12,8 @@ COMMENT=	C++ Library for rendering OpenGL models stored in glTF format
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/ptr_container/ptr_map.hpp:${PORTSDIR}/devel/boost-libs \
-		${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/ptr_container/ptr_map.hpp:devel/boost-libs \
+		${LOCALBASE}/include/glm/glm.hpp:math/glm
 
 USES=		compiler:c++0x libtool pathfix pkgconfig tar:bzip2
 USE_GL=		glew
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 6a5d701aaa71..2c1b47dd48b9 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for libgnomecanvas library
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	libgnomecanvas
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index b7af88c80339..36e623f35b19 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Universal digital camera control library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		gmake iconv libtool pkgconfig tar:bzip2
 USE_CSTD=	gnu89
@@ -34,11 +34,11 @@ OPTIONS_DEFINE=		DOCS GD JPEG LIBEXIF NLS XML
 OPTIONS_DEFAULT=	GD JPEG LIBEXIF XML
 OPTIONS_SUB=		yes
 
-GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
+GD_LIB_DEPENDS=		libgd.so:graphics/gd
 GD_CONFIGURE_OFF=	--with-gdlib=no
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
-LIBEXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_CONFIGURE_OFF=	--with-libexif=no
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/graphics/libgxps/Makefile b/graphics/libgxps/Makefile
index 886d70f66f83..f5811156d163 100644
--- a/graphics/libgxps/Makefile
+++ b/graphics/libgxps/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject based library for rendering XPS documents
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libtiff.so:graphics/tiff \
+		liblcms2.so:graphics/lcms2
 
 USES=		gettext gmake jpeg libtool libarchive pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index 49920603c4c8..e2ffbee14bff 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	tkimg${PORTVERSION}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Library of image format handlers for Tk4.1 and later
 
-BUILD_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS=	dtplite:devel/tcllib
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 PLIST_SUB+=	SHLIB_NAME="${SHLIB_NAME}" \
 		SHLIB_LINK="${SHLIB_LINK}"
diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile
index 8d8a467f4fcb..a38cffafb0d6 100644
--- a/graphics/libkdcraw-kde4/Makefile
+++ b/graphics/libkdcraw-kde4/Makefile
@@ -11,10 +11,10 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	LibRaw interface for KDE
 
-LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libraw.so:${PORTSDIR}/graphics/libraw
+LIB_DEPENDS=	libjasper.so:graphics/jasper \
+		liblcms.so:graphics/lcms \
+		libxml2.so:textproc/libxml2 \
+		libraw.so:graphics/libraw
 
 CMAKE_ARGS+=	-DWITH_OpenMP:BOOL=False \
 		-DENABLE_RAWSPEED=True
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index 38d30196edb6..b5c9cdf95cfd 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Exiv2 library interface for KDE
 
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 USE_KDE4=	automoc4 kdeprefix kdelibs
 USES=		cmake:outsource tar:xz
diff --git a/graphics/libkface/Makefile b/graphics/libkface/Makefile
index 1806d73246e1..49e2898c8bff 100644
--- a/graphics/libkface/Makefile
+++ b/graphics/libkface/Makefile
@@ -11,7 +11,7 @@ COMMENT=	KDE4 library for face recognition
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
 
 USES+=		pkgconfig
-LIB_DEPENDS=	libopencv_legacy.so:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
index 4466f5870807..50327c8a4368 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	SANE library interface for KDE
 
-LIB_DEPENDS=	libsane.so:${PORTSDIR}/graphics/sane-backends
+LIB_DEPENDS=	libsane.so:graphics/sane-backends
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource tar:xz
diff --git a/graphics/libkscreen/Makefile b/graphics/libkscreen/Makefile
index dfa7f69d38e0..c4dd9155328c 100644
--- a/graphics/libkscreen/Makefile
+++ b/graphics/libkscreen/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE screen management library
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson \
-		libxcb.so:${PORTSDIR}/x11/libxcb \
-		libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \
-		libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil
+LIB_DEPENDS=	libqjson.so:devel/qjson \
+		libxcb.so:x11/libxcb \
+		libxcb-image.so:x11/xcb-util-image \
+		libxcb-render-util.so:x11/xcb-util-renderutil
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource pkgconfig tar:xz
diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index f1e255353330..36cb33d7ff67 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -29,9 +29,9 @@ HTMLDOCS_DESC=	Build and install HTML documentation
 EXAMPLES_SUB_FILES=	pkg-message
 EXAMPLES_SUB_LIST=	PORTSDIR=${PORTSDIR}
 
-HTMLDOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-			${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-			docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+HTMLDOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+			${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
+			docbook-xml>0:textproc/docbook-xml
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^lqr_pkgconfigdir/ s|$$(libdir)|$${exec_prefix}/libdata|' \
diff --git a/graphics/liblug/Makefile b/graphics/liblug/Makefile
index 3378cf2ba601..2680c460185d 100644
--- a/graphics/liblug/Makefile
+++ b/graphics/liblug/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=		SUNSITE/libs/graphics
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Multi-format graphics manipulation library
 
-LIB_DEPENDS=		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=		libtiff.so:graphics/tiff
 
 PLIST_FILES=		lib/liblug.a
 USE_XORG=		x11
diff --git a/graphics/libmng/Makefile b/graphics/libmng/Makefile
index 8bf27c764d02..1155bd751fc1 100644
--- a/graphics/libmng/Makefile
+++ b/graphics/libmng/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION} \
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Multiple-image Network Graphics (MNG) reference library
 
-LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms
+LIB_DEPENDS=	liblcms.so:graphics/lcms
 
 OPTIONS_DEFINE=	MNG_OPTIMIZE
 MNG_OPTIMIZE_DESC=	Use vendor's new optimization flags
diff --git a/graphics/libnsbmp/Makefile b/graphics/libnsbmp/Makefile
index 9fe69da20319..95e5658aa039 100644
--- a/graphics/libnsbmp/Makefile
+++ b/graphics/libnsbmp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	NetSurf BMP decoder
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
 
 USES=	gmake
 USE_LDCONFIG=	yes
diff --git a/graphics/libnsgif/Makefile b/graphics/libnsgif/Makefile
index 720e42c8e169..5098cd4b553d 100644
--- a/graphics/libnsgif/Makefile
+++ b/graphics/libnsgif/Makefile
@@ -12,7 +12,7 @@ COMMENT=	NetSurf GIF Decoder
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
 
 USES=	gmake
 USE_LDCONFIG=	yes
diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile
index 0e751a72a24d..572c0c61eb48 100644
--- a/graphics/libopenraw/Makefile
+++ b/graphics/libopenraw/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library for camera RAW files decoding
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		compiler:c++11-lang jpeg libtool pkgconfig tar:bzip2
 USE_GNOME=	libxml2
diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile
index 80d0a00b09ba..7adda9cd59f5 100644
--- a/graphics/libosmesa/Makefile
+++ b/graphics/libosmesa/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	graphics
 
 COMMENT=	Off-Screen Mesa implementation of the OpenGL API
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libglapi.so:${PORTSDIR}/graphics/libglapi
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libglapi.so:graphics/libglapi
 
 USE_XORG=	x11 xau xcb xdmcp xvmc
 # libosmesa doesn't link agains libGL but osmesa.h needs GL/gl.h
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 410bd098e897..5fd1aeeb314d 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Cross-platform library behind Panorama Tools and other photo stitchers
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng16.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng16.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USE_GNOME=	gtk20 glib20 pango atk
 
diff --git a/graphics/libprojectm/Makefile b/graphics/libprojectm/Makefile
index 3aafc865d733..1436d146dbb2 100644
--- a/graphics/libprojectm/Makefile
+++ b/graphics/libprojectm/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Awesome music visualiser
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libftgl.so:${PORTSDIR}/graphics/ftgl \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libftgl.so:graphics/ftgl \
+		libfreetype.so:print/freetype2
 
 USES=		cmake localbase
 CMAKE_ARGS=	-DUSE_OPENMP=OFF # openmp breaks build on 11.x
diff --git a/graphics/libpuzzle/Makefile b/graphics/libpuzzle/Makefile
index 6396fe25a52c..0bfc5d5c0dcb 100644
--- a/graphics/libpuzzle/Makefile
+++ b/graphics/libpuzzle/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library to find similar pictures
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=		libtool tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/graphics/libqrencode/Makefile b/graphics/libqrencode/Makefile
index ed4373a1d374..56fbf3d215bb 100644
--- a/graphics/libqrencode/Makefile
+++ b/graphics/libqrencode/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C library for encoding data in a QR Code symbol
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		pathfix pkgconfig libtool
 USE_LDCONFIG=	yes
diff --git a/graphics/librasterlite/Makefile b/graphics/librasterlite/Makefile
index 03cf9d16483f..225eb394ac0d 100644
--- a/graphics/librasterlite/Makefile
+++ b/graphics/librasterlite/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Library that stores and retrieves raster coverages using a SpatiaLite
 LICENSE=	MPL GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libspatialite.so:${PORTSDIR}/databases/spatialite \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreexl.so:${PORTSDIR}/textproc/freexl
+LIB_DEPENDS=	libspatialite.so:databases/spatialite \
+		libsqlite3.so:databases/sqlite3 \
+		libgeotiff.so:graphics/libgeotiff \
+		libjbig.so:graphics/jbigkit \
+		libpng.so:graphics/png \
+		libgeos.so:graphics/geos \
+		libproj.so:graphics/proj \
+		libtiff.so:graphics/tiff \
+		libfreexl.so:textproc/freexl
 
 GNU_CONFIGURE=	yes
 USES=		gmake iconv jpeg libtool pathfix pkgconfig
diff --git a/graphics/librasterlite2/Makefile b/graphics/librasterlite2/Makefile
index 8076fe9a5562..10d65d5c6b7d 100644
--- a/graphics/librasterlite2/Makefile
+++ b/graphics/librasterlite2/Makefile
@@ -14,19 +14,19 @@ COMMENT=	Library that stores and retrieves raster coverages using a SpatiaLite
 LICENSE=	MPL GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libspatialite.so:${PORTSDIR}/databases/spatialite \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreexl.so:${PORTSDIR}/textproc/freexl \
-		libwebp.so:${PORTSDIR}/graphics/webp \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libspatialite.so:databases/spatialite \
+		libsqlite3.so:databases/sqlite3 \
+		libgeotiff.so:graphics/libgeotiff \
+		libjbig.so:graphics/jbigkit \
+		libpng.so:graphics/png \
+		libgif.so:graphics/giflib \
+		libgeos.so:graphics/geos \
+		libproj.so:graphics/proj \
+		libtiff.so:graphics/tiff \
+		libfreexl.so:textproc/freexl \
+		libwebp.so:graphics/webp \
+		libcairo.so:graphics/cairo \
+		libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		gmake iconv jpeg libtool pathfix pkgconfig
diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile
index e910c6bf1338..1df971eef79e 100644
--- a/graphics/libraw/Makefile
+++ b/graphics/libraw/Makefile
@@ -40,7 +40,7 @@ DEMOSAIC_PACK_GPL3_CONFIGURE_OFF=	--disable-demosaic-pack-gpl3
 DEMOSAIC_PACK_GPL3_CONFIGURE_ON=	--enable-demosaic-pack-gpl3=../LibRaw-demosaic-pack-GPL3-${PORTVERSION}
 DEMOSAIC_PACK_GPL3_DISTFILES=		LibRaw-demosaic-pack-GPL3-${PORTVERSION}.tar.gz
 LCMS2_CONFIGURE_ENABLE=			lcms
-LCMS2_LIB_DEPENDS=			liblcms2.so:${PORTSDIR}/graphics/lcms2
+LCMS2_LIB_DEPENDS=			liblcms2.so:graphics/lcms2
 OPENMP_CONFIGURE_ENABLE=		openmp
 OPENMP_USE=				GCC=yes
 
diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile
index 8caba0e98965..bb33edac29e7 100644
--- a/graphics/libreatlas/Makefile
+++ b/graphics/libreatlas/Makefile
@@ -12,23 +12,23 @@ COMMENT=	Open Source Geography Education application
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libmspack.so:${PORTSDIR}/archivers/libmspack \
-		libspatialite.so:${PORTSDIR}/databases/spatialite \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \
-		librasterlite.so:${PORTSDIR}/graphics/librasterlite \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfreexl.so:${PORTSDIR}/textproc/freexl \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libmspack.so:archivers/libmspack \
+		libspatialite.so:databases/spatialite \
+		libsqlite3.so:databases/sqlite3 \
+		libpthread-stubs.so:devel/libpthread-stubs \
+		libpcre.so:devel/pcre \
+		libcairo.so:graphics/cairo \
+		libgeos.so:graphics/geos \
+		libjbig.so:graphics/jbigkit \
+		libgeotiff.so:graphics/libgeotiff \
+		librasterlite.so:graphics/librasterlite \
+		libpng.so:graphics/png \
+		libproj.so:graphics/proj \
+		libtiff.so:graphics/tiff \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfreexl.so:textproc/freexl \
+		libfontconfig.so:x11-fonts/fontconfig
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake iconv jpeg pkgconfig
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 8533dc9d4150..3716ae8bed7f 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -11,9 +11,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for parsing and rendering SVG vector-graphic files
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png \
+		libcroco-0.6.so:textproc/libcroco
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix libgsf gdkpixbuf2 introspection:build libxml2 \
diff --git a/graphics/libsixel/Makefile b/graphics/libsixel/Makefile
index 38c5931186c4..464c8b417d04 100644
--- a/graphics/libsixel/Makefile
+++ b/graphics/libsixel/Makefile
@@ -28,10 +28,10 @@ PORTDOCS=	README.md
 OPTIONS_DEFINE=	CURL GD JPEG PIXBUF PNG
 OPTIONS_DEFAULT=
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl
 
-GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
+GD_LIB_DEPENDS=		libgd.so:graphics/gd
 GD_CONFIGURE_WITH=	gd
 
 JPEG_USES=		jpeg
@@ -39,10 +39,10 @@ JPEG_CONFIGURE_WITH=	jpeg
 JPEG_CPPFLAGS=		-I${LOCALBASE}/include
 JPEG_LDFLAGS=		-L${LOCALBASE}/lib
 
-PIXBUF_LIB_DEPENDS=	libgdk_pixbuf-2.0.so:${PORTSDIR}/graphics/gdk-pixbuf2
+PIXBUF_LIB_DEPENDS=	libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
 PIXBUF_CONFIGURE_WITH=	gdk-pixbuf2
 
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 
 post-install:
diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile
index 1f108b07f04f..a42a88e134d9 100644
--- a/graphics/libsvg-cairo/Makefile
+++ b/graphics/libsvg-cairo/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://cairographics.org/snapshots/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	SVG rendering library
 
-LIB_DEPENDS=	libsvg.so:${PORTSDIR}/graphics/libsvg \
-		libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS=	libsvg.so:graphics/libsvg \
+		libcairo.so:graphics/cairo
 
 GNU_CONFIGURE=	yes
 USES=		jpeg libtool pathfix pkgconfig
diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile
index 536f38a046aa..fad0cd5a5f4b 100644
--- a/graphics/libsvg/Makefile
+++ b/graphics/libsvg/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://cairographics.org/snapshots/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Parser for SVG content in files or buffers
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
diff --git a/graphics/libvisual04-plugins/Makefile b/graphics/libvisual04-plugins/Makefile
index eb55ed7373cf..a2708fecf271 100644
--- a/graphics/libvisual04-plugins/Makefile
+++ b/graphics/libvisual04-plugins/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PKGNAMESUFFIX:C/.*-//}-${PORTVERSION}
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Set of plugins for the libvisual framework
 
-LIB_DEPENDS=	libvisual-${MAJORMINOR}.so:${PORTSDIR}/graphics/libvisual04
+LIB_DEPENDS=	libvisual-${MAJORMINOR}.so:graphics/libvisual04
 
 USES=		libtool pkgconfig
 USE_GL=		yes
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 7f77870f2c4b..ad8fe79815ad 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tools and library for converting Microsoft WMF (windows metafile)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 CONFLICTS?=	libwmf-nox11-[0-9]*
 
diff --git a/graphics/libwpg03/Makefile b/graphics/libwpg03/Makefile
index 06774aa3c878..7219c0b1ed0b 100644
--- a/graphics/libwpg03/Makefile
+++ b/graphics/libwpg03/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library and tools to work with WordPerfect Graphics (WPG) files
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge \
-		libwpd-0.10.so:${PORTSDIR}/textproc/libwpd010
+LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge \
+		libwpd-0.10.so:textproc/libwpd010
 
 USES=		libtool pathfix perl5 pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/src/conv/svg/wpg2svgbatch.pl
diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile
index e8ef6feb8b8e..c5e8e671a647 100644
--- a/graphics/lightzone/Makefile
+++ b/graphics/lightzone/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Professional-level digital darkroom and photo editor
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	jhindexer:${PORTSDIR}/java/javahelp \
-		git:${PORTSDIR}/devel/git \
-		rsync:${PORTSDIR}/net/rsync \
-		tidy:${PORTSDIR}/www/tidy-lib \
-		autoconf:${PORTSDIR}/devel/autoconf
-LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	jhindexer:${PORTSDIR}/java/javahelp
+BUILD_DEPENDS=	jhindexer:java/javahelp \
+		git:devel/git \
+		rsync:net/rsync \
+		tidy:www/tidy-lib \
+		autoconf:devel/autoconf
+LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
+		libtiff.so:graphics/tiff
+RUN_DEPENDS=	jhindexer:java/javahelp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ktgw0316
diff --git a/graphics/linplasma/Makefile b/graphics/linplasma/Makefile
index 16d2005826eb..f25a87804658 100644
--- a/graphics/linplasma/Makefile
+++ b/graphics/linplasma/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SUNSITE/apps/graphics/hacks/svgalib
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sinus plasma, an SVGAlib demo
 
-LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS=	libvga.so:graphics/svgalib
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/graphics/linux-c6-glx-utils/Makefile b/graphics/linux-c6-glx-utils/Makefile
index 3c2eb7cbd717..d13e0a3c26fc 100644
--- a/graphics/linux-c6-glx-utils/Makefile
+++ b/graphics/linux-c6-glx-utils/Makefile
@@ -18,8 +18,8 @@ BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-			linux-c6-libGLU>0:${PORTSDIR}/graphics/linux-c6-libGLU
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver \
+			linux-c6-libGLU>0:graphics/linux-c6-libGLU
 NVIDIA_GL_USE_OFF=	linux_apps=dri
 
 .if defined(PACKAGE_BUILDING)
diff --git a/graphics/llpp/Makefile b/graphics/llpp/Makefile
index 76b5f71343b6..6f28fc457307 100644
--- a/graphics/llpp/Makefile
+++ b/graphics/llpp/Makefile
@@ -19,13 +19,13 @@ LICENSE_NAME_PUBLIC_DOMAIN=	Public Domain
 LICENSE_FILE_PUBLIC_DOMAIN=	${WRKSRC}/README
 LICENSE_PERMS_PUBLIC_DOMAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
-		${LOCALBASE}/lib/libmupdf.a:${PORTSDIR}/graphics/mupdf
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \
-		libopenjp2.so:${PORTSDIR}/graphics/openjpeg
-RUN_DEPENDS=	xsel:${PORTSDIR}/x11/xsel-conrad
+BUILD_DEPENDS=	gsed:textproc/gsed \
+		${LOCALBASE}/lib/libmupdf.a:graphics/mupdf
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libfreetype.so:print/freetype2 \
+		libjbig2dec.so:graphics/jbig2dec \
+		libopenjp2.so:graphics/openjpeg
+RUN_DEPENDS=	xsel:x11/xsel-conrad
 
 STRIP=	# Stripping renders the executable unusable, so don't do it for now
 USES=		desktop-file-utils gmake
diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile
index e124c4b7315b..0941d0f7971d 100644
--- a/graphics/lprof-devel/Makefile
+++ b/graphics/lprof-devel/Makefile
@@ -12,9 +12,9 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open source color profiler
 
-LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libvigraimpex.so:${PORTSDIR}/graphics/vigra
+LIB_DEPENDS=	liblcms.so:graphics/lcms \
+		libtiff.so:graphics/tiff \
+		libvigraimpex.so:graphics/vigra
 
 USES=		cmake desktop-file-utils jpeg tar:bzip2
 USE_XORG=	x11 xext sm ice xxf86vm
diff --git a/graphics/lua-gd/Makefile b/graphics/lua-gd/Makefile
index 6aa1230d86f2..fa00e35349a4 100644
--- a/graphics/lua-gd/Makefile
+++ b/graphics/lua-gd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GD bindings for the Lua programming language
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
index b1baa336edf2..92ca40e325f9 100644
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Complete open source solution for HDR photography
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgsl.so:${PORTSDIR}/math/gsl \
-		libraw_r.so:${PORTSDIR}/graphics/libraw \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
+		libexiv2.so:graphics/exiv2 \
+		libIlmImf.so:graphics/OpenEXR \
+		libtiff.so:graphics/tiff \
+		libgsl.so:math/gsl \
+		libraw_r.so:graphics/libraw \
+		libboost_system.so:devel/boost-libs
 
 USES=		cmake:outsource jpeg pkgconfig tar:bzip2
 USE_QT5=	concurrent declarative gui printsupport sql webkit xml \
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index 3747669560b9..59069f80e62a 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Complete open source solution for HDR photography
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgsl.so:${PORTSDIR}/math/gsl \
-		libraw_r.so:${PORTSDIR}/graphics/libraw \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
+		libexiv2.so:graphics/exiv2 \
+		libIlmImf.so:graphics/OpenEXR \
+		libtiff.so:graphics/tiff \
+		libgsl.so:math/gsl \
+		libraw_r.so:graphics/libraw \
+		libboost_system.so:devel/boost-libs
 
 USES=		cmake jpeg tar:bzip2
 USE_QT4=	gui sql webkit xml linguist_build moc_build qmake_build \
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index 0e8c647a0304..8b881ae9f0b1 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Physically based and unbiased rendering system
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfreeimage.so:${PORTSDIR}/graphics/freeimage \
-		libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+		libfftw3.so:math/fftw3 \
+		libfreeimage.so:graphics/freeimage \
+		libOpenImageIO.so:graphics/openimageio
 .if ${DISTVERSION} != 1.4
-LIB_DEPENDS+=	libembree.so:${PORTSDIR}/graphics/embree
+LIB_DEPENDS+=	libembree.so:graphics/embree
 .endif
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/graphics/mahotas/Makefile b/graphics/mahotas/Makefile
index f02caf2eb013..7afcb43cb727 100644
--- a/graphics/mahotas/Makefile
+++ b/graphics/mahotas/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	sawp@sawp.com.br
 COMMENT=	Computer vision and image processing library for Python
 
 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libfreeimage.so:${PORTSDIR}/graphics/freeimage
+LIB_DEPENDS=	libfreeimage.so:graphics/freeimage
 
 USE_GCC=	yes
 USES=		python
diff --git a/graphics/maim/Makefile b/graphics/maim/Makefile
index 8299639418ef..db6e56edbf10 100644
--- a/graphics/maim/Makefile
+++ b/graphics/maim/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Screenshot utility with performance improvements over scrot
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	naelstrof
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index c86b128b0a11..a5e2d39f8a61 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/MakeHuman%20Source/MakeHuman_091
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Application for parametrical modeling of 3D humanoid characters
 
-LIB_DEPENDS=	libanimorph.so:${PORTSDIR}/graphics/animorph \
-		libmhgui.so:${PORTSDIR}/graphics/mhgui
+LIB_DEPENDS=	libanimorph.so:graphics/animorph \
+		libmhgui.so:graphics/mhgui
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/graphics/mapcache/Makefile b/graphics/mapcache/Makefile
index 0b57236495cf..01ae0c359a11 100644
--- a/graphics/mapcache/Makefile
+++ b/graphics/mapcache/Makefile
@@ -12,10 +12,10 @@ COMMENT=		Server that implements tile caching to speed up access to WMS layers
 LICENSE=		MIT
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-LIB_DEPENDS=		libpng.so:${PORTSDIR}/graphics/png \
-			libapr-1.so:${PORTSDIR}/devel/apr1 \
-			libaprutil-1.so:${PORTSDIR}/devel/apr1 \
-			libpixman-1.so:${PORTSDIR}/x11/pixman
+LIB_DEPENDS=		libpng.so:graphics/png \
+			libapr-1.so:devel/apr1 \
+			libaprutil-1.so:devel/apr1 \
+			libpixman-1.so:x11/pixman
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		mapserver
@@ -34,12 +34,12 @@ APACHE_USE=		APACHE=22+
 APACHE_CMAKE_ON=	-DWITH_APACHE=1
 APACHE_CMAKE_OFF=	-DWITH_APACHE=0
 
-FASTCGI_LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
+FASTCGI_LIB_DEPENDS=	libfcgi.so:www/fcgi
 FASTCGI_CMAKE_ON=	-DWITH_FCGI=1
 FASTCGI_CMAKE_OFF=	-DWITH_FCGI=0
 
 SQLITE_DESC=		Use sqlite as a cache backend
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 SQLITE_CMAKE_ON=	-DWITH_SQLITE=1
 SQLITE_CMAKE_OFF=	-DWITH_SQLITE=0
 
@@ -48,31 +48,31 @@ MEMCACHE_CMAKE_ON=	-DWITH_MEMCACHE=1
 MEMCACHE_CMAKE_OFF=	-DWITH_MEMCACHE=0
 
 TIFF_DESC=		Use TIFFs as a cache backend
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_ON=		-DWITH_TIFF=1
 TIFF_CMAKE_OFF=		-DWITH_TIFF=0
 
 TIFF_WRITE_DESC=	Support for writable TIFF cache backends (implies TIFF)
-TIFF_WRITE_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_WRITE_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_WRITE_CMAKE_ON=	-DWITH_TIFF_WRITE_SUPPORT=1
 TIFF_WRITE_CMAKE_OFF=	-DWITH_TIFF_WRITE_SUPPORT=0
 TIFF_WRITE_IMPLIES=	TIFF
 
 GEOTIFF_DESC=		GeoTIFF metadata creation for TIFF cache backends
-GEOTIFF_LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff
+GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
 GEOTIFF_CMAKE_ON=	-DWITH_GEOTIFF=1
 GEOTIFF_CMAKE_OFF=	-DWITH_GEOTIFF=0
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CMAKE_ON=		-DWITH_PCRE=1
 PCRE_CMAKE_OFF=		-DWITH_PCRE=0
 
 GDAL_DESC=		GDAL library support
-GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 GDAL_CMAKE_ON=		-DWITH_GDAL=1 -DWITH_OGR=1
 GDAL_CMAKE_OFF=		-DWITH_GDAL=0 -DWITH_OGR=0
 
-GEOS_LIB_DEPENDS=	libgeos_c.so:${PORTSDIR}/graphics/geos
+GEOS_LIB_DEPENDS=	libgeos_c.so:graphics/geos
 GEOS_CMAKE_ON=		-DWITH_GEOS=1
 GEOS_CMAKE_OFF=		-DWITH_GEOS=0
 
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 17f7c4ab1b43..e94511e9ddbc 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Free Toolkit For Developing Mapping Applications
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz
+LIB_DEPENDS=	libicuuc.so:devel/icu \
+		libboost_system.so:devel/boost-libs \
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz
 
 BROKEN_powerpc=	does not install: runs out of virtual memory
 BROKEN_FreeBSD_9=	does not build: lack of c++11 support
@@ -51,29 +51,29 @@ PROJ_DESC=	proj4 support
 CAIRO_DESC=	Enable cairo rendering
 
 GDAL_VARS=		INPUT_PLUGINS+=gdal
-GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 OGR_VARS=		INPUT_PLUGINS+=ogr
-OGR_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+OGR_LIB_DEPENDS=	libgdal.so:graphics/gdal
 POSTGIS_VARS=		INPUT_PLUGINS+=postgis
 POSTGIS_USES=		pgsql
 PGRASTER_VARS=		INPUT_PLUGINS+=pgraster
 PGRASTER_USES=		pgsql
 SQLITE3_VARS=		INPUT_PLUGINS+=sqlite
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MAKE_ARGS_OFF=	PNG=False
 JPEG_USES=		jpeg
 JPEG_MAKE_ARGS_OFF=	JPEG=False
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MAKE_ARGS_OFF=	TIFF=False
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_MAKE_ARGS_OFF=	WEBP=False
-PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
+PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 PROJ_MAKE_ARGS_OFF=	PROJ=False
 
-CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
-CAIRO_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo
+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
+CAIRO_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo
 CAIRO_MAKE_ARGS_OFF=	CAIRO=False
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 51b25b9ea1d1..0e091f059e7c 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -12,11 +12,11 @@ COMMENT=		System for developing web-based GIS applications
 
 LICENSE=		MIT
 
-LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd \
-			libproj.so:${PORTSDIR}/graphics/proj \
-			libpng.so:${PORTSDIR}/graphics/png \
-			libgif.so:${PORTSDIR}/graphics/giflib \
-			libharfbuzz.so:${PORTSDIR}/print/harfbuzz
+LIB_DEPENDS=		libgd.so:graphics/gd \
+			libproj.so:graphics/proj \
+			libpng.so:graphics/png \
+			libgif.so:graphics/giflib \
+			libharfbuzz.so:print/harfbuzz
 
 USES=			cpe cmake:outsource jpeg
 CPE_VENDOR=		umn
@@ -43,7 +43,7 @@ WCS_DESC=		WCS Server support
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=			python:2
-BUILD_DEPENDS+=		swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS+=		swig2.0:devel/swig20
 CMAKE_ARGS+=		-DWITH_PYTHON=yes
 PLIST_SUB+=		PYTHON=""
 MAP_EGG=		MapScript-${PORTVERSION}-${PYTHON_VERSION:S/thon//}
@@ -53,24 +53,24 @@ PLIST_SUB+=		PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=		libcairo.so:${PORTSDIR}/graphics/cairo \
-			libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=		libcairo.so:graphics/cairo \
+			libexpat.so:textproc/expat2
 CMAKE_ARGS+=		-DWITH_CAIRO=1
 .else
 CMAKE_ARGS+=		-DWITH_CAIRO=0
 .endif
 
 .if ${PORT_OPTIONS:MFRIBIDI}
-LIB_DEPENDS+=		libfribidi.so:${PORTSDIR}/converters/fribidi
+LIB_DEPENDS+=		libfribidi.so:converters/fribidi
 CMAKE_ARGS+=		-DWITH_FRIBIDI=1
 .else
 CMAKE_ARGS+=		-DWITH_FRIBIDI=0
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO_SVG}
-LIB_DEPENDS+=		libcairo.so:${PORTSDIR}/graphics/cairo \
-			libsvg-cairo.so:${PORTSDIR}/graphics/libsvg-cairo \
-			libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=		libcairo.so:graphics/cairo \
+			libsvg-cairo.so:graphics/libsvg-cairo \
+			libexpat.so:textproc/expat2
 CMAKE_ARGS+=		-DWITH_SVGCAIRO=1 -DWITH_CAIRO=1
 USES+=			pkgconfig
 .else
@@ -78,7 +78,7 @@ CMAKE_ARGS+=		-DWITH_SVGCAIRO=0
 .endif
 
 .if ${PORT_OPTIONS:MKML}
-LIB_DEPENDS+=		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS+=		libxml2.so:textproc/libxml2
 CMAKE_ARGS+=		-DWITH_KML=1
 .else
 CMAKE_ARGS+=		-DWITH_KML=0
@@ -104,14 +104,14 @@ CMAKE_ARGS+=		-DWITH_WCS=0
 
 .if ${PORT_OPTIONS:MGDAL}
 USES+=			iconv
-LIB_DEPENDS+=		libgdal.so:${PORTSDIR}/graphics/gdal
+LIB_DEPENDS+=		libgdal.so:graphics/gdal
 CMAKE_ARGS+=		-DWITH_GDAL=1
 .else
 CMAKE_ARGS+=		-DWITH_GDAL=0
 .endif
 
 .if ${PORT_OPTIONS:MGEOS}
-LIB_DEPENDS+=		libgeos.so:${PORTSDIR}/graphics/geos
+LIB_DEPENDS+=		libgeos.so:graphics/geos
 CMAKE_ARGS+=		-DWITH_GEOS=1
 .else
 CMAKE_ARGS+=		-DWITH_GEOS=0
@@ -125,8 +125,8 @@ CMAKE_ARGS+=		-DWITH_POSTGIS=0
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php56
-RUN_BUILDS+=		${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php56
+BUILD_DEPENDS+=		${LOCALBASE}/bin/php-config:lang/php56
+RUN_BUILDS+=		${LOCALBASE}/bin/php-config:lang/php56
 PHP_EXTENSION_DIR!=	${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e "s,/usr/local/,,"
 CMAKE_ARGS+=		-DWITH_PHP=1
 PLIST_SUB+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
@@ -138,7 +138,7 @@ PLIST_SUB+=		PHP="@comment "
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
-BUILD_DEPENDS=	${LOCALBASE}/bin/swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS=	${LOCALBASE}/bin/swig2.0:devel/swig20
 CMAKE_ARGS+=	-DWITH_PERL=1
 PLIST_SUB+=	PERL=""
 .else
@@ -147,14 +147,14 @@ PLIST_SUB+=	PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=		libcurl.so:ftp/curl
 CMAKE_ARGS+=		-DWITH_CURL=1
 .else
 CMAKE_ARGS+=		-DWITH_CURL=0
 .endif
 
 .if ${PORT_OPTIONS:MFASTCGI}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/cgi-fcgi:${PORTSDIR}/www/fcgi
+BUILD_DEPENDS+=		${LOCALBASE}/bin/cgi-fcgi:www/fcgi
 CMAKE_ARGS+=		-DWITH_FCGI=1
 .else
 CMAKE_ARGS+=		-DWITH_FCGI=0
@@ -170,14 +170,14 @@ PROG_FILES=		legend scalebar shp2img shptree shptreetst shptreevis \
 			sortshp msencrypt tile4ms mapserv
 
 .if ${PORT_OPTIONS:MCLIENT_WMS}
-LIB_DEPENDS+=		libcurl.so:${PORTSDIR}/ftp/curl
-LIB_DEPENDS+=		libgdal.so:${PORTSDIR}/graphics/gdal
+LIB_DEPENDS+=		libcurl.so:ftp/curl
+LIB_DEPENDS+=		libgdal.so:graphics/gdal
 CMAKE_ARGS+=		-DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WMS=1
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT_WFS}
-LIB_DEPENDS+=		libcurl.so:${PORTSDIR}/ftp/curl
-LIB_DEPENDS+=		libgdal.so:${PORTSDIR}/graphics/gdal
+LIB_DEPENDS+=		libcurl.so:ftp/curl
+LIB_DEPENDS+=		libgdal.so:graphics/gdal
 CMAKE_ARGS+=		-DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WFS=1
 .endif
 
diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile
index f35f1091a9f7..1e47d3b59078 100644
--- a/graphics/megapov/Makefile
+++ b/graphics/megapov/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://megapov.inetart.net/packages/unix/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unofficial extensions of POV-Ray
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-#RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
+#RUN_DEPENDS=	povray:graphics/povray-meta
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALL_WRKSRC=	${WRKSRC}/unix
@@ -33,7 +33,7 @@ OPTIMIZED_CFLAGS_CFLAGS=\
 			-O3 -ffast-math -finline-functions \
 			-fomit-frame-pointer -funroll-loops \
 			-fexpensive-optimizations
-SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_WITH=	svga
 X11_USE=		xorg=x11,xpm
 X11_CONFIGURE_WITH=	x
diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile
index 504c776fd8ed..81b713f5f0ab 100644
--- a/graphics/metapixel/Makefile
+++ b/graphics/metapixel/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Photomosaic generator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png
 
 USES=		gmake jpeg shebangfix
 SHEBANG_FILES=	metapixel-prepare metapixel-sizesort
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index 8f272835dbb4..49ce045c93a0 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GUI widget library for MakeHuman
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libanimorph.so:${PORTSDIR}/graphics/animorph \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libanimorph.so:graphics/animorph \
+		libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig gmake libtool
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 8f8f70b7aa08..847db720dfed 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -15,9 +15,9 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE_GPL2
 LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libgif.so:graphics/giflib \
+		libpng.so:graphics/png
 
 CONFLICTS_INSTALL=	ja-ming-[0-9]*
 
diff --git a/graphics/mitsuba/Makefile b/graphics/mitsuba/Makefile
index 35e09411fac1..19a719da49a6 100644
--- a/graphics/mitsuba/Makefile
+++ b/graphics/mitsuba/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Research-oriented physically based rendering system
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
-		libfftw3.so:${PORTSDIR}/math/fftw3
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libpng.so:graphics/png \
+		libIlmImf.so:graphics/OpenEXR \
+		libxerces-c.so:textproc/xerces-c3 \
+		libfftw3.so:math/fftw3
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	uses SSE instructions
diff --git a/graphics/mozjpeg/Makefile b/graphics/mozjpeg/Makefile
index 0047c0bd7f77..3c16f6a40235 100644
--- a/graphics/mozjpeg/Makefile
+++ b/graphics/mozjpeg/Makefile
@@ -39,7 +39,7 @@ SIMD_DESC=	Include SIMD extensions
 TURBOJPEG_DESC=	Include the TurboJPEG wrapper library and associated tests
 
 SIMD_CONFIGURE_WITH=		simd
-SIMD_BUILD_DEPENDS=		yasm:${PORTSDIR}/devel/yasm
+SIMD_BUILD_DEPENDS=		yasm:devel/yasm
 TURBOJPEG_CONFIGURE_WITH=	turbojpeg
 
 post-patch:
diff --git a/graphics/mscgen/Makefile b/graphics/mscgen/Makefile
index 4bb0dba0142a..d1b96cb3f8a4 100644
--- a/graphics/mscgen/Makefile
+++ b/graphics/mscgen/Makefile
@@ -19,14 +19,14 @@ OPTIONS_DEFAULT=FREETYPE PNG
 
 .if ${PORT_OPTIONS:MFREETYPE}
 CONFIGURE_ARGS+=--with-freetype
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	libfreetype.so:print/freetype2
 .else
 CONFIGURE_ARGS+=--without-freetype
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
 CONFIGURE_ARGS+=--with-png
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	libgd.so:graphics/gd
 .else
 CONFIGURE_ARGS+=--without-png
 .endif
diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile
index 69a170a4bbf7..ef5021ff09c8 100644
--- a/graphics/mtpaint/Makefile
+++ b/graphics/mtpaint/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Simple painting program
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libgif.so:graphics/giflib \
+		libfreetype.so:print/freetype2
 
 USE_GNOME=	gtk20
 USES=		desktop-file-utils gmake iconv jpeg pkgconfig tar:bzip2
@@ -33,17 +33,17 @@ OPTIONS_SUB=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLCMS2}
-LIB_DEPENDS+=	liblcms2.so:${PORTSDIR}/graphics/lcms2
+LIB_DEPENDS+=	liblcms2.so:graphics/lcms2
 CONFIGURE_ARGS+=lcms2
 .else
 CONFIGURE_ARGS+=nolcms
 .endif
 
 .if ${PORT_OPTIONS:MOPENJPEG}
-LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+LIB_DEPENDS+=	libopenjpeg.so:graphics/openjpeg15
 CONFIGURE_ARGS+=jp2
 .else
-LIB_DEPENDS+=	libjasper.so:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+=	libjasper.so:graphics/jasper
 CONFIGURE_ARGS+=jasper
 .endif
 
diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index 6777423968c8..51c1b89fe458 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Lightweight PDF viewer and toolkit
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \
-		libopenjp2.so:${PORTSDIR}/graphics/openjpeg
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libfreetype.so:print/freetype2 \
+		libjbig2dec.so:graphics/jbig2dec \
+		libopenjp2.so:graphics/openjpeg
 
 CFLAGS+=	-I${WRKSRC}/include/mupdf
 LIBS+=		-L${LOCALBASE}/lib
@@ -37,7 +37,7 @@ SCROLL_DESC=	Build with scroll hacks
 JS_DESC=	JavaScript support (V8 engine)
 
 SCROLL_EXTRA_PATCHES=	${FILESDIR}/scroll_hack-platform__x11__pdfapp.c
-JS_LIB_DEPENDS=		libv8.so:${PORTSDIR}/lang/v8
+JS_LIB_DEPENDS=		libv8.so:lang/v8
 JS_MAKE_ARGS=		V8_PRESENT=1 V8LIBS=-lv8
 
 post-patch:
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 578228883edd..f8ea0fd4d9d6 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -12,13 +12,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast painting/scribbling program
 
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}cairo>0:${PORTSDIR}/graphics/py-cairo \
-		${PYTHON_PKGNAMEPREFIX}protobuf>0:${PORTSDIR}/devel/py-protobuf
-LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2
+		${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo \
+		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf
+LIB_DEPENDS=	libjson-c.so:devel/json-c \
+		liblcms2.so:graphics/lcms2
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		swig:${PORTSDIR}/devel/swig13 \
-		protoc:${PORTSDIR}/devel/protobuf
+		swig:devel/swig13 \
+		protoc:devel/protobuf
 
 USE_GNOME=	glib20 pygtk2
 MAKE_ARGS=	prefix="${PREFIX}"
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 0af82ef37fa9..2e7fe481ab63 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -11,11 +11,11 @@ MASTER_SITES=	SF/netpbm/super_stable/${PORTVERSION} \
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Toolkit for conversion of images between different formats
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libjbig.so:graphics/jbigkit \
+		libjasper.so:graphics/jasper \
+		libxml2.so:textproc/libxml2
 
 USES=		tar:tgz gmake perl5 shebangfix jpeg
 CFLAGS+=	-DPNG_DEPSTRUCT= -Iutil
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index fc92392439da..8e86182f2aa6 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Graphical user interface for VIPS
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
-LIB_DEPENDS=	libvips.so:${PORTSDIR}/graphics/vips
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	xdg-open:devel/xdg-utils
+LIB_DEPENDS=	libvips.so:graphics/vips
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		bison desktop-file-utils dos2unix gettext gmake pkgconfig \
 		shared-mime-info
@@ -28,19 +28,19 @@ SUB_FILES=	run-nip2.sh
 OPTIONS_DEFINE=		DOCS FFTW GOFFICE GRAPHVIZ GSF GSL
 OPTIONS_DEFAULT=	FFTW GOFFICE GRAPHVIZ GSF GSL
 
-FFTW_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 FFTW_CONFIGURE_WITH=	fftw3
 GOFFICE_DESC=		Use libgoffice to show plots
-GOFFICE_LIB_DEPENDS=	libgoffice-*.so:${PORTSDIR}/devel/goffice
+GOFFICE_LIB_DEPENDS=	libgoffice-*.so:devel/goffice
 GOFFICE_CONFIGURE_WITH=	libgoffice
 GRAPHVIZ_DESC=		Use libgvc to show workspace dependency graphs
-GRAPHVIZ_LIB_DEPENDS=	libgvc.so:${PORTSDIR}/graphics/graphviz
+GRAPHVIZ_LIB_DEPENDS=	libgvc.so:graphics/graphviz
 GRAPHVIZ_CONFIGURE_WITH=	libgvc
 GSF_DESC=		Use libgsf to save plots to files
 GSF_USE=		gnome=libgsf
 GSF_CONFIGURE_WITH=	libgsf
 GSL_DESC=		Use gsl for numeric functions
-GSL_LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 GSL_CONFIGURE_WITH=	gsl
 
 post-install:
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index 7265b3b90f15..809b49278e3a 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Small, fast, and free image viewer
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libsysinfo.so:${PORTSDIR}/devel/libsysinfo
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
+		libsysinfo.so:devel/libsysinfo
 
 USES=		cmake desktop-file-utils dos2unix pkgconfig tar:bzip2
 USE_QT4=	gui network linguist_build moc_build \
@@ -27,11 +27,11 @@ WRKSRC=		${WRKTOP}/${WRKSUBDIR}
 OPTIONS_DEFINE=	RAW TIFF
 OPTIONS_DEFAULT=	RAW TIFF
 
-RAW_LIB_DEPENDS=	libraw.so:${PORTSDIR}/graphics/libraw \
-			libopencv_core.so:${PORTSDIR}/graphics/opencv-core
+RAW_LIB_DEPENDS=	libraw.so:graphics/libraw \
+			libopencv_core.so:graphics/opencv-core
 RAW_CMAKE_OFF=		-DENABLE_RAW=0
 
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_OFF=		-DENABLE_TIFF=0
 
 post-patch:
diff --git a/graphics/npretty/Makefile b/graphics/npretty/Makefile
index f4c575c80b2f..784da1e9cd88 100644
--- a/graphics/npretty/Makefile
+++ b/graphics/npretty/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Simple web-gallery generator written in perl
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		p5-forks>=0:${PORTSDIR}/devel/p5-forks
-LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \
+		p5-forks>=0:devel/p5-forks
+LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gammy
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index 897d5cd40da0..b822771bac5a 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	GOOGLE_CODE \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Texture Tools with support for DirectX 10 texture formats
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libIlmImf.so:graphics/OpenEXR
 
 BROKEN_ia64=	does not build
 BROKEN_powerpc=	does not build
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index 5ea98030ba48..3b0b2f47214f 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -14,8 +14,8 @@ DIST_SUBDIR=	ocaml-images
 MAINTAINER=	michael.grunewald@laposte.net
 COMMENT=	Objective Caml image processing library
 
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ocaml.m4:${PORTSDIR}/lang/ocaml-autoconf
-BUILD_DEPENDS+=	omake:${PORTSDIR}/devel/omake
+BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ocaml.m4:lang/ocaml-autoconf
+BUILD_DEPENDS+=	omake:devel/omake
 
 USE_OCAML=		yes
 USE_OCAML_FINDLIB=	yes
@@ -40,28 +40,28 @@ OPTIONS_DEFAULT=PNG JPEG TIFF XPM GIF FREETYPE GHOSTSCRIPT
 OPTIONS_SUB=	yes
 
 PNG_CONFIGURE_WITH=	png
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
 
 TIFF_CONFIGURE_WITH=	tiff
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 XPM_CONFIGURE_WITH=	xpm
 
 GIF_CONFIGURE_WITH=	gif
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 
 FREETYPE_CONFIGURE_WITH=freetype
-FREETYPE_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
+FREETYPE_LIB_DEPENDS=	libttf.so:print/freetype
 
 GHOSTSCRIPT_CONFIGURE_WITH= gs
 GHOSTSCRIPT_USES=	ghostscript
 
 GTK2_CONFIGURE_WITH=	liblgtk2
-GTK2_BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-GTK2_RUN_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+GTK2_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
+GTK2_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index af0928e37e74..8ed15ef63fb0 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000024
-EXTRACT_DEPENDS=	lzip:${PORTSDIR}/archivers/lzip
+EXTRACT_DEPENDS=	lzip:archivers/lzip
 EXTRACT_CMD=		${LOCALBASE}/bin/lzip
 EXTRACT_BEFORE_ARGS=	-cd
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
diff --git a/graphics/ocre/Makefile b/graphics/ocre/Makefile
index 5c671276f17e..a995d10413a8 100644
--- a/graphics/ocre/Makefile
+++ b/graphics/ocre/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Simple optical character recognition solution
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS=	display:${PORTSDIR}/graphics/ImageMagick \
-		gnuplot:${PORTSDIR}/math/gnuplot \
-		ispell:${PORTSDIR}/textproc/aspell-ispell
+LIB_DEPENDS=	libaspell.so:textproc/aspell
+RUN_DEPENDS=	display:graphics/ImageMagick \
+		gnuplot:math/gnuplot \
+		ispell:textproc/aspell-ispell
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 
diff --git a/graphics/ocrfeeder/Makefile b/graphics/ocrfeeder/Makefile
index 53b085b1a02e..c1e3cbf24508 100644
--- a/graphics/ocrfeeder/Makefile
+++ b/graphics/ocrfeeder/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Document layout analysis and optical character recognition
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	goocanvas2>0:${PORTSDIR}/graphics/goocanvas2 \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}sane>0:${PORTSDIR}/graphics/py-sane \
-		${PYTHON_PKGNAMEPREFIX}reportlab2>0:${PORTSDIR}/print/py-reportlab2 \
-		${PYTHON_PKGNAMEPREFIX}enchant>0:${PORTSDIR}/textproc/py-enchant
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		unpaper:${PORTSDIR}/graphics/unpaper \
-		iso-codes>0:${PORTSDIR}/misc/iso-codes \
-		gtkspell3>0:${PORTSDIR}/textproc/gtkspell3 \
+BUILD_DEPENDS=	goocanvas2>0:graphics/goocanvas2 \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}sane>0:graphics/py-sane \
+		${PYTHON_PKGNAMEPREFIX}reportlab2>0:print/py-reportlab2 \
+		${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		unpaper:graphics/unpaper \
+		iso-codes>0:misc/iso-codes \
+		gtkspell3>0:textproc/gtkspell3 \
 		${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index fe0469ea6a6d..fd12343240ed 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	The OCRopus(tm) open source document analysis and OCR system
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libiulib.so:${PORTSDIR}/graphics/iulib \
-		libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libiulib.so:graphics/iulib \
+		libgsl.so:math/gsl
 
 WRKSRC=		${WRKDIR}/ocropus-0.4/ocropus
 
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--without-SDL
 .endif
 
 .if ${PORT_OPTIONS:MLEPTONICA}
-LIB_DEPENDS+=	liblept.so:${PORTSDIR}/graphics/leptonica
+LIB_DEPENDS+=	liblept.so:graphics/leptonica
 .else
 CONFIGURE_ARGS+=--without-leptonica
 .endif
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 9aaa8f2a812d..dcbd572a65a6 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Scene-oriented, flexible 3D engine written in C++
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libzzip.so:${PORTSDIR}/devel/zziplib \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfreeimage.so:${PORTSDIR}/graphics/freeimage
+LIB_DEPENDS=	libzzip.so:devel/zziplib \
+		libfreetype.so:print/freetype2 \
+		libfreeimage.so:graphics/freeimage
 
 BROKEN_powerpc=	does not install
 
@@ -29,8 +29,8 @@ WRKSRC=		${WRKDIR}/sinbad-ogre-dd30349ea667
 OPTIONS_DEFINE=	BOOST DOCS
 OPTIONS_SUB=	yes
 
-BOOST_BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-BOOST_RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BOOST_BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+BOOST_RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|include(FindPkgMacros)|return()|g' \
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index 81f1fac370a8..fcfdbe3faed1 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -10,16 +10,16 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 universal document viewer
 
-LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
-		libkscreen.so:${PORTSDIR}/graphics/libkscreen \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
-		libspectre.so:${PORTSDIR}/print/libspectre \
-		libchm.so:${PORTSDIR}/misc/chmlib \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libepub.so:${PORTSDIR}/textproc/ebook-tools \
-		libqmobipocket.so:${PORTSDIR}/graphics/kdegraphics4-mobipocket
+LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre \
+		libkscreen.so:graphics/libkscreen \
+		libqca.so:devel/qca \
+		libtiff.so:graphics/tiff \
+		libpoppler-qt4.so:graphics/poppler-qt4 \
+		libspectre.so:print/libspectre \
+		libchm.so:misc/chmlib \
+		libfreetype.so:print/freetype2 \
+		libepub.so:textproc/ebook-tools \
+		libqmobipocket.so:graphics/kdegraphics4-mobipocket
 
 USE_KDE4=	kdelibs kdeprefix automoc4 qimageblitz kactivities \
 		libkexiv2
diff --git a/graphics/opencollada/Makefile b/graphics/opencollada/Makefile
index 4a65ae283852..d33083e1b875 100644
--- a/graphics/opencollada/Makefile
+++ b/graphics/opencollada/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Library for reading and writing COLLADA files
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 3c5b737ffa6c..105880cd7599 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -38,8 +38,8 @@ SHEBANG_FILES=	share/sphinx/ExtractRstFromSourceCPP.py \
 .include <bsd.port.options.mk>
 
 .if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
-LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \
-		libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
+LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
+		libOpenColorIO.so:graphics/opencolorio
 CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=ON \
 		-DOCIO_BUILD_SHARED:BOOL=OFF \
 		-DOCIO_BUILD_PYGLUE:BOOL=OFF
@@ -48,7 +48,7 @@ PLIST=		${PKGDIR}/pkg-plist-tools
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-CMakeLists.txt \
 		${FILESDIR}/extra-tools-patch-src_core_CMakeLists.txt
 .elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
-LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
+LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 USES+=		python
 CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
 		-DOCIO_BUILD_SHARED:BOOL=OFF \
@@ -56,9 +56,9 @@ CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
 		-DPYTHON:STRING=${PYTHON_CMD}
 PLIST=		${PKGDIR}/pkg-plist-pyglue
 .else # master port
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2
-LIB_DEPENDS=	libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
-		libyaml-cpp03.so:${PORTSDIR}/devel/yaml-cpp03
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
+LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
+		libyaml-cpp03.so:devel/yaml-cpp03
 USES+=		python:2,build
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 31059e3bf5e8..c16f6f6d2483 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -65,14 +65,14 @@ TBB_DESC=		TBB support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDC1394}
-LIB_DEPENDS+=	libdc1394.so:${PORTSDIR}/multimedia/libdc1394
+LIB_DEPENDS+=	libdc1394.so:multimedia/libdc1394
 CMAKE_ARGS+=	-DWITH_1394:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_1394:BOOL=Off
 .endif
 
 .if ${PORT_OPTIONS:MEIGEN3}
-BUILD_DEPENDS+=	${LOCALBASE}/include/eigen3/Eigen/Eigen:${PORTSDIR}/math/eigen3
+BUILD_DEPENDS+=	${LOCALBASE}/include/eigen3/Eigen/Eigen:math/eigen3
 CMAKE_ARGS+=	-DWITH_EIGEN:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_EIGEN:BOOL=Off
@@ -87,7 +87,7 @@ CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=On \
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 CMAKE_ARGS+=	-DWITH_FFMPEG:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_FFMPEG:BOOL=Off
@@ -104,14 +104,14 @@ CMAKE_ARGS+=	-DWITH_GSTREAMER:BOOL=Off
 USE_GNOME+=	gtk20
 CMAKE_ARGS+=	-DWITH_GTK:BOOL=On
 . if ${PORT_OPTIONS:MOPENGL}
-LIB_DEPENDS+=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS+=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 . endif
 .else
 CMAKE_ARGS+=	-DWITH_GTK:BOOL=Off
 .endif
 
 .if ${PORT_OPTIONS:MJASPER}
-LIB_DEPENDS+=	libjasper.so:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+=	libjasper.so:graphics/jasper
 CMAKE_ARGS+=	-DWITH_JASPER:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_JASPER:BOOL=Off
@@ -131,7 +131,7 @@ CMAKE_ARGS+=	-DBUILD_opencv_nonfree:BOOL=Off
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
-LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=	libIlmImf.so:graphics/OpenEXR
 CMAKE_ARGS+=	-DWITH_OPENEXR:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_OPENEXR:BOOL=Off
@@ -144,7 +144,7 @@ CMAKE_ARGS+=	-DWITH_OPENGL:BOOL=Off
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 CMAKE_ARGS+=	-DWITH_PNG:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_PNG:BOOL=Off
@@ -190,7 +190,7 @@ CMAKE_ARGS+=	-DENABLE_SSE:BOOL=Off \
 .endif
 
 .if ${PORT_OPTIONS:MTBB}
-LIB_DEPENDS+=	libtbb.so:${PORTSDIR}/devel/tbb
+LIB_DEPENDS+=	libtbb.so:devel/tbb
 CMAKE_ARGS+=	-DWITH_TBB:BOOL=On \
 		-DTBB_INCLUDE_DIR:STRING="${LOCALBASE}/include"
 .else
@@ -198,15 +198,15 @@ CMAKE_ARGS+=	-DWITH_TBB:BOOL=Off
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libtiff.so:graphics/tiff
 CMAKE_ARGS+=	-DWITH_TIFF:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_TIFF:BOOL=Off
 .endif
 
 .if ${PORT_OPTIONS:MV4L}
-LIB_DEPENDS+=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
-BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS+=	libv4l2.so:multimedia/libv4l
+BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 CMAKE_ARGS+=	-DWITH_V4L:BOOL=On \
 		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
 .else
@@ -214,7 +214,7 @@ CMAKE_ARGS+=	-DWITH_V4L:BOOL=Off
 .endif
 
 .if ${PORT_OPTIONS:MXINE}
-LIB_DEPENDS+=	libxine.so:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+=	libxine.so:multimedia/libxine
 CMAKE_ARGS+=	-DWITH_XINE:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_XINE:BOOL=Off
@@ -225,7 +225,7 @@ CMAKE_ARGS+=	-DWITH_XINE:BOOL=Off
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
 .elif defined(OCV_PYTHON)
-LIB_DEPENDS+=	libopencv_legacy.so:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
 USES+=		python
@@ -235,8 +235,8 @@ CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
 INSTALL_WRKSRC=	${WRKSRC}/modules/python
 .elif defined(OCV_JAVA)
-BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	libopencv_legacy.so:${PORTSDIR}/graphics/opencv
+BUILD_DEPENDS+=	ant:devel/apache-ant
+LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
 USES+=		python:build
 USE_JAVA=	yes
 CMAKE_ARGS+=	-DBUILD_opencv_java:BOOL=On
@@ -246,7 +246,7 @@ CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 CONFIGURE_ENV+=	JAVA_HOME="${JAVA_HOME}"
 INSTALL_WRKSRC=	${WRKSRC}/modules/java
 .else
-LIB_DEPENDS+=	libopencv_core.so:${PORTSDIR}/graphics/opencv-core
+LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core
 . for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index fa10327c09df..caa84313ec09 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	dx-${PORTVERSION}
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	IBM's Open Visualization Data Explorer
 
-LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick	\
-		libtiff.so:${PORTSDIR}/graphics/tiff		\
-		libcdf.so:${PORTSDIR}/science/cdf
+LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick	\
+		libtiff.so:graphics/tiff		\
+		libcdf.so:science/cdf
 
 USE_XORG=	xinerama xext xpm xmu sm ice
 USES=		bison motif gmake libtool
@@ -34,13 +34,13 @@ IGNORE=	HDF and NETCDF are conflicting
 .endif
 
 .if defined(WITH_HDF)
-LIB_DEPENDS+=	libmfhdf.so:${PORTSDIR}/science/hdf
+LIB_DEPENDS+=	libmfhdf.so:science/hdf
 .else
 CONFIGURE_ARGS+=	--without-hdf
 .endif
 
 .if !defined(WITHOUT_NETCDF)
-LIB_DEPENDS+=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 .else
 CONFIGURE_ARGS+=	--without-netcdf
 .endif
@@ -48,8 +48,8 @@ CONFIGURE_ARGS+=	--without-netcdf
 .if defined(WITH_JAVA)
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-BUILD_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:${PORTSDIR}/graphics/cosmoplayer
-RUN_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:${PORTSDIR}/graphics/cosmoplayer
+BUILD_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
+RUN_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
 CONFIGURE_ARGS+=	--with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \
 			--with-java40jar-path=${JAVALIBDIR}/java40.jar \
 			--with-jni-path=${JAVA_HOME}/include:${JAVA_HOME}/include/freebsd
diff --git a/graphics/opengtl/Makefile b/graphics/opengtl/Makefile
index 2235bd7e98da..5def09e49b50 100644
--- a/graphics/opengtl/Makefile
+++ b/graphics/opengtl/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Graphics Transformation Languages
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libLLVM-3.3.so:${PORTSDIR}/devel/llvm33
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libLLVM-3.3.so:devel/llvm33
 
 USES=		cmake perl5 tar:bzip2
 USE_LDCONFIG=	yes
@@ -28,7 +28,7 @@ OPTIONS_DEFINE=	SHIVA
 OPTIONS_DEFAULT=SHIVA
 
 SHIVA_DESC=	Install filters and generators
-SHIVA_RUN_DEPENDS=${LOCALBASE}/share/OpenGTL/shiva/kernels/oilify.shiva:${PORTSDIR}/graphics/shiva-collections
+SHIVA_RUN_DEPENDS=${LOCALBASE}/share/OpenGTL/shiva/kernels/oilify.shiva:graphics/shiva-collections
 
 post-patch:
 	# Disable latex doc, it's not ready yet.
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index a52f57ae791b..476307ca44d4 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -42,15 +42,15 @@ DOCS_CMAKE_OFF=		-DINSTALL_DOCS:BOOL=OFF
 
 FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=ON
 FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
-FFMPEG_LIB_DEPENDS=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 FREETYPE_CMAKE_ON=	-DUSE_FREETYPE:BOOL=ON
 FREETYPE_CMAKE_OFF=	-DUSE_FREETYPE:BOOL=OFF
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 GIF_CMAKE_ON=		-DUSE_GIF:BOOL=ON
 GIF_CMAKE_OFF=		-DUSE_GIF:BOOL=OFF
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 
 IMAGEVIEWER_CMAKE_ON=	-DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
 IMAGEVIEWER_CMAKE_OFF=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
@@ -58,19 +58,19 @@ IMAGEVIEWER_USE=	GL=glew QT4=corelib,gui,opengl,qmake_build,moc_build,rcc_build,
 
 OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
 OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
-OCIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
+OCIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio
 
 OPENCV_CMAKE_ON=	-DUSE_OPENCV:BOOL=ON
 OPENCV_CMAKE_OFF=	-DUSE_OPENCV:BOOL=OFF
-OPENCV_LIB_DEPENDS=	libopencv_highgui.so:${PORTSDIR}/graphics/opencv
+OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv
 
 OPENJPEG_CMAKE_ON=	-DUSE_OPENJPEG:BOOL=ON
 OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF
-OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
 
 RAW_CMAKE_ON=		-DUSE_LIBRAW:BOOL=ON
 RAW_CMAKE_OFF=		-DUSE_LIBRAW:BOOL=OFF
-RAW_LIB_DEPENDS=	libraw_r.so:${PORTSDIR}/graphics/libraw
+RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
 
 TEST_CMAKE_ON=		-DOIIO_BUILD_TESTS:BOOL=ON
 TEST_CMAKE_OFF=		-DOIIO_BUILD_TESTS:BOOL=OFF
@@ -84,16 +84,16 @@ USE_GCC=	yes
 .endif
 
 .if ${SLAVE_PORT} == no
-LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libwebp.so:${PORTSDIR}/graphics/webp
+LIB_DEPENDS+=	libIlmImf.so:graphics/OpenEXR \
+		libboost_thread.so:devel/boost-libs \
+		libhdf5.so:science/hdf5 \
+		libwebp.so:graphics/webp
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \
 		-DOIIO_BUILD_TOOLS:BOOL=ON
 .else
-LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \
-		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
+		libboost_python.so:devel/boost-python-libs
 PLIST=		${PKGDIR}/pkg-plist-pybind
 #while oiio supports py3, ports doesn't have py3 support for boost-python yet
 USES+=		python:2
diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 6bdc115c6038..f4ebc6605419 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Open-source JPEG 2000 codec
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake>=3:${PORTSDIR}/devel/cmake
-LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS=	cmake>=3:devel/cmake
+LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USE_LDCONFIG=	yes
 USES=		cmake cpe pkgconfig
diff --git a/graphics/openjpeg15/Makefile b/graphics/openjpeg15/Makefile
index 519e50ff4a6a..26af8105c336 100644
--- a/graphics/openjpeg15/Makefile
+++ b/graphics/openjpeg15/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Open-source JPEG 2000 codec
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 512d3453a173..89c8a4aa253b 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Advanced shading language for production GI renderers
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	llvm-config34:${PORTSDIR}/devel/llvm34 \
-		clang34>=3.4_1:${PORTSDIR}/lang/clang34
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
-RUN_DEPENDS=	llvm-config34:${PORTSDIR}/devel/llvm34
+BUILD_DEPENDS=	llvm-config34:devel/llvm34 \
+		clang34>=3.4_1:lang/clang34
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libIlmImf.so:graphics/OpenEXR \
+		libOpenImageIO.so:graphics/openimageio
+RUN_DEPENDS=	llvm-config34:devel/llvm34
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	imageworks
@@ -34,7 +34,7 @@ USE_GCC=	yes
 .endif
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=2.5.37:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=2.5.37:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex
 CXXFLAGS+=	-I${LOCALBASE}/include/flex
 .endif
diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile
index 3998c76a72eb..2afa7834ad0c 100644
--- a/graphics/opensubdiv/Makefile
+++ b/graphics/opensubdiv/Makefile
@@ -11,7 +11,7 @@ COMMENT=	High performance subdivision surface libraries
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/include/GLFW/glfw3.h:${PORTSDIR}/graphics/glfw
+BUILD_DEPENDS=	${LOCALBASE}/include/GLFW/glfw3.h:graphics/glfw
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PixarAnimationStudios
@@ -41,9 +41,9 @@ PLIST_SUB+=	OPENMP="@comment "
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
-		python2:${PORTSDIR}/lang/python2 \
-		rst2html:${PORTSDIR}/textproc/py-docutils
+BUILD_DEPENDS+=	doxygen:devel/doxygen \
+		python2:lang/python2 \
+		rst2html:textproc/py-docutils
 .else
 CMAKE_ARGS+=	-DNO_DOC:BOOL=ON
 .endif
diff --git a/graphics/optar/Makefile b/graphics/optar/Makefile
index e7324587ab73..034e82ac58a3 100644
--- a/graphics/optar/Makefile
+++ b/graphics/optar/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tool for encoding data on paper
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libpng.so:graphics/png
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 WRKSRC=		${WRKDIR}/optar_dist
 
diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index 0fad2c165d89..736fb4667fa8 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	BUNDLED_LIBPNG BUNDLED_ZLIB
 BUNDLED_LIBPNG_DESC=		Use bundled libpng
 BUNDLED_LIBPNG_CONFIGURE_OFF=	--with-system-libpng
 BUNDLED_LIBPNG_CONFIGURE_ON=	--without-system-libpng
-BUNDLED_LIBPNG_LIB_DEPENDS_OFF=	libpng.so:${PORTSDIR}/graphics/png
+BUNDLED_LIBPNG_LIB_DEPENDS_OFF=	libpng.so:graphics/png
 BUNDLED_LIBPNG_CFLAGS_OFF=	-I${LOCALBASE}/include
 BUNDLED_LIBPNG_LDFLAGS_OFF=	-L${LOCALBASE}/lib
 
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index e8c7df577a75..d431cd497294 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -18,8 +18,8 @@ LICENSE_NAME=	OpenSceneGraph Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 CONFLICTS=	osg-[0-9]*
 
@@ -51,23 +51,23 @@ LUA_DESC=	Lua script engine support
 
 OPTIONS_SUB=	yes
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-LIBLAS_LIB_DEPENDS=	liblas.so:${PORTSDIR}/devel/liblas
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+LIBLAS_LIB_DEPENDS=	liblas.so:devel/liblas
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
+GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GSTREAMER_USE=		GNOME=glib20 GSTREAMER1=yes
-INVENTOR_LIB_DEPENDS=	libInventor.so:${PORTSDIR}/graphics/inventor
-JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
-XINE_LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
-GTA_LIB_DEPENDS=	libgta.so:${PORTSDIR}/devel/libgta
-VNC_LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver
-OPENEXR_LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-SVG_LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
-PDF_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+INVENTOR_LIB_DEPENDS=	libInventor.so:graphics/inventor
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
+XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
+GTA_LIB_DEPENDS=	libgta.so:devel/libgta
+VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
+OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
+PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 SDL_USE=		SDL=sdl
-NVTT_LIB_DEPENDS=	libnvtt.so:${PORTSDIR}/graphics/nvidia-texture-tools
+NVTT_LIB_DEPENDS=	libnvtt.so:graphics/nvidia-texture-tools
 XRANDR_CMAKE_ON=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
 XRANDR_CMAKE_OFF=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
 QT4_USE=		QT4=corelib,gui,opengl,qmake_build,moc_build,uic_build,rcc_build
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 27a0b89469f1..2d1f1e381033 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -17,8 +17,8 @@ LICENSE_NAME=	OpenSceneGraph Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 CONFLICTS=	osg-devel-[0-9]*
 
@@ -47,21 +47,21 @@ NVTT_DESC=	Use NVidia texture tools
 
 OPTIONS_SUB=	yes
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
-INVENTOR_LIB_DEPENDS=	libInventor.so:${PORTSDIR}/graphics/inventor
-JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
-XINE_LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
-GTA_LIB_DEPENDS=	libgta.so:${PORTSDIR}/devel/libgta
-VNC_LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver
-OPENEXR_LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-SVG_LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
-PDF_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
+GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
+INVENTOR_LIB_DEPENDS=	libInventor.so:graphics/inventor
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
+XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
+GTA_LIB_DEPENDS=	libgta.so:devel/libgta
+VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
+OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
+PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 SDL_USE=		SDL=sdl
-NVTT_LIB_DEPENDS=	libnvtt.so:${PORTSDIR}/graphics/nvidia-texture-tools
+NVTT_LIB_DEPENDS=	libnvtt.so:graphics/nvidia-texture-tools
 XRANDR_CMAKE_ON=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
 XRANDR_CMAKE_OFF=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
 QT4_USE=		QT4=corelib,gui,opengl,qmake_build,moc_build,uic_build,rcc_build
diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index 5cd9fda7b392..abca9ac3d615 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -12,10 +12,10 @@ COMMENT=	osgEarth is a C++ terrain rendering toolkit for OpenSceneGraph
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/minizip:${PORTSDIR}/archivers/minizip
-LIB_DEPENDS=	libosg.so:${PORTSDIR}/graphics/osg \
-		libgdal.so:${PORTSDIR}/graphics/gdal \
-		libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	${LOCALBASE}/bin/minizip:archivers/minizip
+LIB_DEPENDS=	libosg.so:graphics/osg \
+		libgdal.so:graphics/gdal \
+		libcurl.so:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gwaldron
diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
index 612edafc0fa0..90b8a476a9f9 100644
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@@ -9,20 +9,20 @@ MASTER_SITES=	SF/${PORTNAME}/Oyranos/Oyranos%20${PORTVERSION:C|(.*)\.[0-9]*$|\1|
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Colour Management System (CMS)
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
-RUN_DEPENDS=	${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:${PORTSDIR}/graphics/icc-profiles-openicc \
-		${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:${PORTSDIR}/graphics/icc-profiles-basiccolor
-LIB_DEPENDS=	libraw.so:${PORTSDIR}/graphics/libraw \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libyajl.so:${PORTSDIR}/devel/yajl \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libcups.so:${PORTSDIR}/print/cups \
-		libxdot.so:${PORTSDIR}/graphics/graphviz \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libXcm.so:${PORTSDIR}/x11/libXcm
+BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
+RUN_DEPENDS=	${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:graphics/icc-profiles-openicc \
+		${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor
+LIB_DEPENDS=	libraw.so:graphics/libraw \
+		libexiv2.so:graphics/exiv2 \
+		libpng.so:graphics/png \
+		libcairo.so:graphics/cairo \
+		libyajl.so:devel/yajl \
+		libfltk.so:x11-toolkits/fltk \
+		libcups.so:print/cups \
+		libxdot.so:graphics/graphviz \
+		liblcms.so:graphics/lcms \
+		liblcms2.so:graphics/lcms2 \
+		libXcm.so:x11/libXcm
 
 BROKEN_FreeBSD_9=	does not build
 
diff --git a/graphics/p5-Acme-Steganography-Image-Png/Makefile b/graphics/p5-Acme-Steganography-Image-Png/Makefile
index 80f8703339e7..4a84234ac57c 100644
--- a/graphics/p5-Acme-Steganography-Image-Png/Makefile
+++ b/graphics/p5-Acme-Steganography-Image-Png/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Hide data (badly) in Png images
 
-BUILD_DEPENDS=	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Imager>=0:graphics/p5-Imager \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Barcode-ZBar/Makefile b/graphics/p5-Barcode-ZBar/Makefile
index 775f5272d6b3..325beec2438a 100644
--- a/graphics/p5-Barcode-ZBar/Makefile
+++ b/graphics/p5-Barcode-ZBar/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to ZBar barcode reader
 
-LIB_DEPENDS=	libzbar.so:${PORTSDIR}/graphics/zbar
+LIB_DEPENDS=	libzbar.so:graphics/zbar
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-CAD-Drawing-Template/Makefile b/graphics/p5-CAD-Drawing-Template/Makefile
index c05880898230..fef7e2f36f09 100644
--- a/graphics/p5-CAD-Drawing-Template/Makefile
+++ b/graphics/p5-CAD-Drawing-Template/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Replace tags with text and geometry
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CAD-Calc>=0:${PORTSDIR}/math/p5-CAD-Calc \
-		p5-CAD-Drawing>=0:${PORTSDIR}/graphics/p5-CAD-Drawing
+BUILD_DEPENDS=	p5-CAD-Calc>=0:math/p5-CAD-Calc \
+		p5-CAD-Drawing>=0:graphics/p5-CAD-Drawing
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile
index 902495ea5717..e1b150cfb2e5 100644
--- a/graphics/p5-CAD-Drawing/Makefile
+++ b/graphics/p5-CAD-Drawing/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Methods to create, load, and save vector graphics
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CAD-Calc>=0:${PORTSDIR}/math/p5-CAD-Calc \
-		p5-Math-Geometry-Planar>=0:${PORTSDIR}/math/p5-Math-Geometry-Planar \
-		p5-Math-MatrixReal>=0:${PORTSDIR}/math/p5-Math-MatrixReal \
-		p5-Math-Vec>=0:${PORTSDIR}/math/p5-Math-Vec \
-		p5-Stream>=0:${PORTSDIR}/devel/p5-Stream \
-		convert:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS=	p5-CAD-Calc>=0:math/p5-CAD-Calc \
+		p5-Math-Geometry-Planar>=0:math/p5-Math-Geometry-Planar \
+		p5-Math-MatrixReal>=0:math/p5-Math-MatrixReal \
+		p5-Math-Vec>=0:math/p5-Math-Vec \
+		p5-Stream>=0:devel/p5-Stream \
+		convert:graphics/ImageMagick
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile
index 09bb195d483e..601afddea91b 100644
--- a/graphics/p5-Cairo/Makefile
+++ b/graphics/p5-Cairo/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl bindings to the cairo graphics library
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.200:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
-TEST_DEPENDS=	p5-Font-FreeType>=0:${PORTSDIR}/print/p5-Font-FreeType \
-		p5-Test-Number-Delta>=1:${PORTSDIR}/devel/p5-Test-Number-Delta
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.200:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig
+LIB_DEPENDS=	libcairo.so:graphics/cairo
+TEST_DEPENDS=	p5-Font-FreeType>=0:print/p5-Font-FreeType \
+		p5-Test-Number-Delta>=1:devel/p5-Test-Number-Delta
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile b/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile
index b5663878a00b..8bd1213356fb 100644
--- a/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile
+++ b/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gerard@seibercom.net
 COMMENT=	Perl implementation of the reCAPTCHA Mailhide API
 
-BUILD_DEPENDS=	p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-HTML-Tiny>=0.904:${PORTSDIR}/textproc/p5-HTML-Tiny
+BUILD_DEPENDS=	p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+		p5-HTML-Tiny>=0.904:textproc/p5-HTML-Tiny
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/graphics/p5-Captcha-reCAPTCHA/Makefile b/graphics/p5-Captcha-reCAPTCHA/Makefile
index 2bd99959debb..d2319f244114 100644
--- a/graphics/p5-Captcha-reCAPTCHA/Makefile
+++ b/graphics/p5-Captcha-reCAPTCHA/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl implementation of the reCAPTCHA API
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-HTML-Tiny>=0:${PORTSDIR}/textproc/p5-HTML-Tiny
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-HTML-Tiny>=0:textproc/p5-HTML-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Chart-Clicker/Makefile b/graphics/p5-Chart-Clicker/Makefile
index 35e2c6b904b2..8d3591d0c48a 100644
--- a/graphics/p5-Chart-Clicker/Makefile
+++ b/graphics/p5-Chart-Clicker/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Powerful, extensible charting
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Color-Scheme>=0:${PORTSDIR}/graphics/p5-Color-Scheme \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-Geometry-Primitive>=0:${PORTSDIR}/graphics/p5-Geometry-Primitive \
-		p5-Graphics-Color>=0:${PORTSDIR}/graphics/p5-Graphics-Color \
-		p5-Graphics-Primitive>=0:${PORTSDIR}/graphics/p5-Graphics-Primitive \
-		p5-Graphics-Primitive-Driver-Cairo>=0:${PORTSDIR}/graphics/p5-Graphics-Primitive-Driver-Cairo \
-		p5-Layout-Manager>=0:${PORTSDIR}/graphics/p5-Layout-Manager
+RUN_DEPENDS=	p5-Color-Scheme>=0:graphics/p5-Color-Scheme \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>=0:devel/p5-MooseX-AttributeHelpers \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-Geometry-Primitive>=0:graphics/p5-Geometry-Primitive \
+		p5-Graphics-Color>=0:graphics/p5-Graphics-Color \
+		p5-Graphics-Primitive>=0:graphics/p5-Graphics-Primitive \
+		p5-Graphics-Primitive-Driver-Cairo>=0:graphics/p5-Graphics-Primitive-Driver-Cairo \
+		p5-Layout-Manager>=0:graphics/p5-Layout-Manager
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Chart-Gnuplot/Makefile b/graphics/p5-Chart-Gnuplot/Makefile
index 0a079650613f..3ddde037c07e 100644
--- a/graphics/p5-Chart-Gnuplot/Makefile
+++ b/graphics/p5-Chart-Gnuplot/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl module to plot graphs using GNUPLOT on the fly
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS=	gnuplot:math/gnuplot
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile
index c0dbe1f88450..9cfa4c258116 100644
--- a/graphics/p5-Chart-Graph/Makefile
+++ b/graphics/p5-Chart-Graph/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl extension for a front-end to gnuplot, XRT, and Xmgrace
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
-		xmgrace:${PORTSDIR}/math/grace \
-		ppmtogif:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	gnuplot:math/gnuplot \
+		xmgrace:math/grace \
+		ppmtogif:graphics/netpbm
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile
index 60031283d83d..4c5996454964 100644
--- a/graphics/p5-Chart-PNGgraph/Makefile
+++ b/graphics/p5-Chart-PNGgraph/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl module for generating presentation graphics (i.e., charts)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile
index bd049620cddb..aa62f4e6d073 100644
--- a/graphics/p5-Chart/Makefile
+++ b/graphics/p5-Chart/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl5 interface to build chart graphics
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GD>=2:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS=	p5-GD>=2:graphics/p5-GD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Color-Calc/Makefile b/graphics/p5-Color-Calc/Makefile
index f1fa2668aa32..d1adef567390 100644
--- a/graphics/p5-Color-Calc/Makefile
+++ b/graphics/p5-Color-Calc/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Simple calculations with RGB colors
 
-BUILD_DEPENDS=	p5-Graphics-ColorNames-WWW>=1.13:${PORTSDIR}/graphics/p5-Graphics-ColorNames-WWW
+BUILD_DEPENDS=	p5-Graphics-ColorNames-WWW>=1.13:graphics/p5-Graphics-ColorNames-WWW
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Color-Library/Makefile b/graphics/p5-Color-Library/Makefile
index 90e181a1ffac..4d8a9cfbd408 100644
--- a/graphics/p5-Color-Library/Makefile
+++ b/graphics/p5-Color-Library/Makefile
@@ -13,11 +13,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy-to-use and comprehensive named-color library
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Color-Palette/Makefile b/graphics/p5-Color-Palette/Makefile
index c66b348c9fed..276c19661436 100644
--- a/graphics/p5-Color-Palette/Makefile
+++ b/graphics/p5-Color-Palette/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Handle sets of named colors in Perl
 
-BUILD_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Graphics-Color>=0.21:${PORTSDIR}/graphics/p5-Graphics-Color \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Graphics-Color>=0.21:graphics/p5-Graphics-Color \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Color-Scheme/Makefile b/graphics/p5-Color-Scheme/Makefile
index 5419205b4555..c6bae0034066 100644
--- a/graphics/p5-Color-Scheme/Makefile
+++ b/graphics/p5-Color-Scheme/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Generate pleasant color schemes
 
-BUILD_DEPENDS=	p5-Test-Differences>=0.47:${PORTSDIR}/devel/p5-Test-Differences
+BUILD_DEPENDS=	p5-Test-Differences>=0.47:devel/p5-Test-Differences
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Convert-Color/Makefile b/graphics/p5-Convert-Color/Makefile
index 15f8b8429ae9..861942264818 100644
--- a/graphics/p5-Convert-Color/Makefile
+++ b/graphics/p5-Convert-Color/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-List-UtilsBy>0:${PORTSDIR}/devel/p5-List-UtilsBy
+	p5-List-UtilsBy>0:devel/p5-List-UtilsBy
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Data-Google-Visualization-DataSource/Makefile b/graphics/p5-Data-Google-Visualization-DataSource/Makefile
index 7fd1b5a124ad..da73c982e855 100644
--- a/graphics/p5-Data-Google-Visualization-DataSource/Makefile
+++ b/graphics/p5-Data-Google-Visualization-DataSource/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Perl helper class for the Google Chart Tools Datasource Protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Data-Google-Visualization-DataTable>=0:${PORTSDIR}/graphics/p5-Data-Google-Visualization-DataTable \
-		p5-JSON-XS>=2.0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Clone>=0:devel/p5-Clone \
+		p5-Data-Google-Visualization-DataTable>=0:graphics/p5-Data-Google-Visualization-DataTable \
+		p5-JSON-XS>=2.0:converters/p5-JSON-XS \
+		p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Data-Google-Visualization-DataTable/Makefile b/graphics/p5-Data-Google-Visualization-DataTable/Makefile
index cc4c26ebc2a9..8c23fe178edd 100644
--- a/graphics/p5-Data-Google-Visualization-DataTable/Makefile
+++ b/graphics/p5-Data-Google-Visualization-DataTable/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Easily create Google DataTable objects for the Google Visulization API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-XS>=2.0:${PORTSDIR}/converters/p5-JSON-XS
-RUN_DEPENDS=	p5-JSON-XS>=2.0:${PORTSDIR}/converters/p5-JSON-XS
+BUILD_DEPENDS=	p5-JSON-XS>=2.0:converters/p5-JSON-XS
+RUN_DEPENDS=	p5-JSON-XS>=2.0:converters/p5-JSON-XS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-GD-Arrow/Makefile b/graphics/p5-GD-Arrow/Makefile
index 93e44e9fb9e0..10c97d7a5504 100644
--- a/graphics/p5-GD-Arrow/Makefile
+++ b/graphics/p5-GD-Arrow/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Draw arrows using GD
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-GD-Barcode/Makefile b/graphics/p5-GD-Barcode/Makefile
index ebda840f5900..e01f131907d6 100644
--- a/graphics/p5-GD-Barcode/Makefile
+++ b/graphics/p5-GD-Barcode/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GD::Barcode - Create barcode image with GD
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-GD-Graph-histogram/Makefile b/graphics/p5-GD-Graph-histogram/Makefile
index 69dc4e74f0f1..246aa25bd622 100644
--- a/graphics/p5-GD-Graph-histogram/Makefile
+++ b/graphics/p5-GD-Graph-histogram/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Histogram plotting module for perl5
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
+BUILD_DEPENDS=	p5-GD-Graph>=0:graphics/p5-GD-Graph
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-GD-Graph-ohlc/Makefile b/graphics/p5-GD-Graph-ohlc/Makefile
index 028932e6341d..caab72e5f04e 100644
--- a/graphics/p5-GD-Graph-ohlc/Makefile
+++ b/graphics/p5-GD-Graph-ohlc/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Create charts displaying the open, high, low, and close
 
-BUILD_DEPENDS=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-GD-Graph/Makefile b/graphics/p5-GD-Graph/Makefile
index 22846f657f1c..35e8c800f5a4 100644
--- a/graphics/p5-GD-Graph/Makefile
+++ b/graphics/p5-GD-Graph/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Graph plotting module for perl5
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.40:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.40:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile
index 9fc0ed83b720..f55373288671 100644
--- a/graphics/p5-GD-Graph3d/Makefile
+++ b/graphics/p5-GD-Graph3d/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Creates 3D charts with GD::Graph and GD
 
-BUILD_DEPENDS=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
+BUILD_DEPENDS=	p5-GD-Graph>=0:graphics/p5-GD-Graph
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 dos2unix
diff --git a/graphics/p5-GD-SVG/Makefile b/graphics/p5-GD-SVG/Makefile
index e23cccb3c11d..a3b5e3b1972c 100644
--- a/graphics/p5-GD-SVG/Makefile
+++ b/graphics/p5-GD-SVG/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Seamlessly enable SVG output from scripts written using GD
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-SVG>=0:${PORTSDIR}/textproc/p5-SVG
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		p5-SVG>=0:textproc/p5-SVG
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-GD-TextUtil/Makefile b/graphics/p5-GD-TextUtil/Makefile
index 04ac6c0e1401..984d189d3026 100644
--- a/graphics/p5-GD-TextUtil/Makefile
+++ b/graphics/p5-GD-TextUtil/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	GDTextUtil-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Text utilities for use with GD drawing package
 
-RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-GD-Thumbnail/Makefile b/graphics/p5-GD-Thumbnail/Makefile
index 665ba99bf46b..0e2c2bc4dc23 100644
--- a/graphics/p5-GD-Thumbnail/Makefile
+++ b/graphics/p5-GD-Thumbnail/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Thumbnail maker for GD
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index dfc781cfd188..a3684cae8638 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl5 interface to Gd Graphics Library version2
 LICENSE=	ART10 GPLv1 GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/graphics/p5-Geo-EOP/Makefile b/graphics/p5-Geo-EOP/Makefile
index 0f8f143bffaf..7d91837933c0 100644
--- a/graphics/p5-Geo-EOP/Makefile
+++ b/graphics/p5-Geo-EOP/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Perl Module to Process Earth Observation Products Meta-data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Geo-GML>=0.13:${PORTSDIR}/graphics/p5-Geo-GML \
-		p5-XML-Compile>=1.50:${PORTSDIR}/textproc/p5-XML-Compile \
-		p5-XML-Compile-Cache>=0.14:${PORTSDIR}/textproc/p5-XML-Compile-Cache
+BUILD_DEPENDS=	p5-Geo-GML>=0.13:graphics/p5-Geo-GML \
+		p5-XML-Compile>=1.50:textproc/p5-XML-Compile \
+		p5-XML-Compile-Cache>=0.14:textproc/p5-XML-Compile-Cache
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.26:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.26:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/graphics/p5-Geo-GDAL/Makefile b/graphics/p5-Geo-GDAL/Makefile
index 8ff4fd808c07..ef81f23895ae 100644
--- a/graphics/p5-Geo-GDAL/Makefile
+++ b/graphics/p5-Geo-GDAL/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Perl binding for GDAL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../../LICENSE.TXT
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 USES=		perl5 tar:xz
 
diff --git a/graphics/p5-Geo-GML/Makefile b/graphics/p5-Geo-GML/Makefile
index 3a1558ef5806..ba8dafcc9387 100644
--- a/graphics/p5-Geo-GML/Makefile
+++ b/graphics/p5-Geo-GML/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl Module to Process Geography Markup Language
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Log-Report>=0.18:${PORTSDIR}/devel/p5-Log-Report \
-		p5-Test-Pod>=1.26:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-XML-Compile>=0.96:${PORTSDIR}/textproc/p5-XML-Compile \
-		p5-XML-Compile-Cache>=0.14:${PORTSDIR}/textproc/p5-XML-Compile-Cache
+RUN_DEPENDS=	p5-Log-Report>=0.18:devel/p5-Log-Report \
+		p5-Test-Pod>=1.26:devel/p5-Test-Pod \
+		p5-XML-Compile>=0.96:textproc/p5-XML-Compile \
+		p5-XML-Compile-Cache>=0.14:textproc/p5-XML-Compile-Cache
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Geo-Gpx/Makefile b/graphics/p5-Geo-Gpx/Makefile
index 0ffa7d594a7d..7835d26e979c 100644
--- a/graphics/p5-Geo-Gpx/Makefile
+++ b/graphics/p5-Geo-Gpx/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl Module to Create and Parse GPX Files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-ExtUtils-MakeMaker-Coverage>=0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-Coverage \
-		p5-Time-Local>=0:${PORTSDIR}/devel/p5-Time-Local \
-		p5-XML-Descent>=0:${PORTSDIR}/textproc/p5-XML-Descent \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601
+BUILD_DEPENDS=	p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-ExtUtils-MakeMaker-Coverage>=0:devel/p5-ExtUtils-MakeMaker-Coverage \
+		p5-Time-Local>=0:devel/p5-Time-Local \
+		p5-XML-Descent>=0:textproc/p5-XML-Descent \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Geo-Point/Makefile b/graphics/p5-Geo-Point/Makefile
index 0bb0491c1f16..7b82fb65e77f 100644
--- a/graphics/p5-Geo-Point/Makefile
+++ b/graphics/p5-Geo-Point/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl Module Tries To Abstract Coordinate Systems
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Geo-Distance>=0.06:${PORTSDIR}/math/p5-Geo-Distance \
-		p5-Geo-Proj4>=1.00:${PORTSDIR}/graphics/p5-Geo-Proj4 \
-		p5-Math-Polygon>=1.00:${PORTSDIR}/math/p5-Math-Polygon
+RUN_DEPENDS=	p5-Geo-Distance>=0.06:math/p5-Geo-Distance \
+		p5-Geo-Proj4>=1.00:graphics/p5-Geo-Proj4 \
+		p5-Math-Polygon>=1.00:math/p5-Math-Polygon
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Geo-Proj4/Makefile b/graphics/p5-Geo-Proj4/Makefile
index 2714cb0ce1b3..8fab853862c1 100644
--- a/graphics/p5-Geo-Proj4/Makefile
+++ b/graphics/p5-Geo-Proj4/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl cartographic projections wrapper for Proj library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
+LIB_DEPENDS=	libproj.so:graphics/proj
 
 CONFIGURE_ENV=	GEOPROJ_FWTOOLS_DIR=${LOCALBASE}
 MAKE_ENV=	INC=-I${LOCALBASE}/include
diff --git a/graphics/p5-Geometry-Primitive/Makefile b/graphics/p5-Geometry-Primitive/Makefile
index d62e86281075..6a2570e1720f 100644
--- a/graphics/p5-Geometry-Primitive/Makefile
+++ b/graphics/p5-Geometry-Primitive/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Primitive Geometry Entities
 
-RUN_DEPENDS=	p5-Check-ISA>=0.04:${PORTSDIR}/devel/p5-Check-ISA \
-		p5-JSON-Any>=1.22:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-Moose>=0.92:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.04:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-MooseX-Storage>=0.17:${PORTSDIR}/devel/p5-MooseX-Storage
+RUN_DEPENDS=	p5-Check-ISA>=0.04:devel/p5-Check-ISA \
+		p5-JSON-Any>=1.22:converters/p5-JSON-Any \
+		p5-Moose>=0.92:devel/p5-Moose \
+		p5-MooseX-Clone>=0.04:devel/p5-MooseX-Clone \
+		p5-MooseX-Storage>=0.17:devel/p5-MooseX-Storage
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Gimp/Makefile b/graphics/p5-Gimp/Makefile
index 15b9f7deabd5..1a2b64be0129 100644
--- a/graphics/p5-Gimp/Makefile
+++ b/graphics/p5-Gimp/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Write GIMP extensions/plug-ins/load- and save-handlers in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Gtk2>=1.0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Ex-PodViewer>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-PodViewer \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Web-Scraper>=0:${PORTSDIR}/www/p5-Web-Scraper \
-		PDL>=2.007:${PORTSDIR}/math/PDL
-BUILD_DEPENDS:=	p5-ExtUtils-Depends>=0.200:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
+RUN_DEPENDS=	p5-Gtk2>=1.0:x11-toolkits/p5-Gtk2 \
+		p5-Gtk2-Ex-PodViewer>=0:x11-toolkits/p5-Gtk2-Ex-PodViewer \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Web-Scraper>=0:www/p5-Web-Scraper \
+		PDL>=2.007:math/PDL
+BUILD_DEPENDS:=	p5-ExtUtils-Depends>=0.200:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig \
 		${RUN_DEPENDS}
-LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Google-Chart/Makefile b/graphics/p5-Google-Chart/Makefile
index 7ddb7ef60c96..ee3c8cc5508c 100644
--- a/graphics/p5-Google-Chart/Makefile
+++ b/graphics/p5-Google-Chart/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Perl Interface to Google Charts API
 
-RUN_DEPENDS=	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-libwww>0:www/p5-libwww \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-URI>0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Graph-Easy/Makefile b/graphics/p5-Graph-Easy/Makefile
index 333b719457fa..3c2a106a9559 100644
--- a/graphics/p5-Graph-Easy/Makefile
+++ b/graphics/p5-Graph-Easy/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Render graphs as ASCII, HTML, SVG, or Graphviz
 
-BUILD_DEPENDS=	p5-Heap>0:${PORTSDIR}/devel/p5-Heap
+BUILD_DEPENDS=	p5-Heap>0:devel/p5-Heap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Graph-ReadWrite/Makefile b/graphics/p5-Graph-ReadWrite/Makefile
index 0cdd30706d0e..0667d829f9c1 100644
--- a/graphics/p5-Graph-ReadWrite/Makefile
+++ b/graphics/p5-Graph-ReadWrite/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Reading and Writing a variety of graph file formats
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Graph>=0.50:${PORTSDIR}/math/p5-Graph \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS=	p5-Graph>=0.50:math/p5-Graph \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/graphics/p5-Graph-SocialMap/Makefile b/graphics/p5-Graph-SocialMap/Makefile
index 7b39b0a6e631..1fd54fde693d 100644
--- a/graphics/p5-Graph-SocialMap/Makefile
+++ b/graphics/p5-Graph-SocialMap/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Easy tool to create social network maps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Graph>=0:${PORTSDIR}/math/p5-Graph \
-		p5-Graph-Writer-GraphViz>=0:${PORTSDIR}/graphics/p5-Graph-Writer-GraphViz \
-		p5-Quantum-Superpositions>=0:${PORTSDIR}/lang/p5-Quantum-Superpositions \
-		p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Graph>=0:math/p5-Graph \
+		p5-Graph-Writer-GraphViz>=0:graphics/p5-Graph-Writer-GraphViz \
+		p5-Quantum-Superpositions>=0:lang/p5-Quantum-Superpositions \
+		p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Graph-Writer-GraphViz/Makefile b/graphics/p5-Graph-Writer-GraphViz/Makefile
index b4480f3c82a9..9f02da5b510b 100644
--- a/graphics/p5-Graph-Writer-GraphViz/Makefile
+++ b/graphics/p5-Graph-Writer-GraphViz/Makefile
@@ -14,10 +14,10 @@ COMMENT=	GraphViz Writer for Graph object
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Graph>=0.54:${PORTSDIR}/math/p5-Graph \
-		p5-Graph-ReadWrite>=0:${PORTSDIR}/graphics/p5-Graph-ReadWrite \
-		p5-GraphViz>=2.02:${PORTSDIR}/graphics/p5-GraphViz \
-		p5-IO-All>=0.30:${PORTSDIR}/devel/p5-IO-All
+BUILD_DEPENDS=	p5-Graph>=0.54:math/p5-Graph \
+		p5-Graph-ReadWrite>=0:graphics/p5-Graph-ReadWrite \
+		p5-GraphViz>=2.02:graphics/p5-GraphViz \
+		p5-IO-All>=0.30:devel/p5-IO-All
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/graphics/p5-GraphViz-Data-Structure/Makefile b/graphics/p5-GraphViz-Data-Structure/Makefile
index cc7c8ed5fd67..6dd7dd702d40 100644
--- a/graphics/p5-GraphViz-Data-Structure/Makefile
+++ b/graphics/p5-GraphViz-Data-Structure/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Visualise data structures
 
-BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
+BUILD_DEPENDS=	dot:graphics/graphviz \
+		p5-GraphViz>=0:graphics/p5-GraphViz
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-GraphViz-Traverse/Makefile b/graphics/p5-GraphViz-Traverse/Makefile
index 5018728b6717..44d03604f25d 100644
--- a/graphics/p5-GraphViz-Traverse/Makefile
+++ b/graphics/p5-GraphViz-Traverse/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Build a GraphViz object via callback traversal
 
-BUILD_DEPENDS=	p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
+BUILD_DEPENDS=	p5-GraphViz>=0:graphics/p5-GraphViz
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile
index af6c83add7ba..25277da64411 100644
--- a/graphics/p5-GraphViz/Makefile
+++ b/graphics/p5-GraphViz/Makefile
@@ -13,13 +13,13 @@ COMMENT=	GraphViz - Perl interface to the GraphViz graphing tool
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-		p5-File-Which>=1.09:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-IPC-Run>=0.60:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Parse-RecDescent>=1.965.001:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-XML-Twig>=3.38:${PORTSDIR}/textproc/p5-XML-Twig
+BUILD_DEPENDS=	dot:graphics/graphviz \
+		p5-File-Which>=1.09:sysutils/p5-File-Which \
+		p5-IPC-Run>=0.60:devel/p5-IPC-Run \
+		p5-Parse-RecDescent>=1.965.001:devel/p5-Parse-RecDescent \
+		p5-XML-Twig>=3.38:textproc/p5-XML-Twig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-File-Which>=1.09:${PORTSDIR}/sysutils/p5-File-Which
+BUILD_DEPENDS+=	p5-File-Which>=1.09:sysutils/p5-File-Which
 
 NO_ARCH=	yes
 USES=		perl5 tar:tgz
@@ -28,7 +28,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/p5-GraphViz2/Makefile b/graphics/p5-GraphViz2/Makefile
index b070b378d806..aba8142db262 100644
--- a/graphics/p5-GraphViz2/Makefile
+++ b/graphics/p5-GraphViz2/Makefile
@@ -14,36 +14,36 @@ COMMENT=	Wrapper for AT&T Graphviz
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-		p5-Algorithm-Dependency>=1.110:${PORTSDIR}/devel/p5-Algorithm-Dependency \
-		p5-Capture-Tiny>=0.10:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Class-ISA>=0.36:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-Class-Load>=0.17:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Config-Tiny>=2.16:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-DBI>=1.616:${PORTSDIR}/databases/p5-DBI \
-		p5-DBIx-Admin-TableInfo>=3:${PORTSDIR}/databases/p5-DBIx-Admin-TableInfo \
-		p5-Data-Section-Simple>=0.02:${PORTSDIR}/devel/p5-Data-Section-Simple \
-		p5-Date-Simple>=3.03:${PORTSDIR}/devel/p5-Date-Simple \
-		p5-File-HomeDir>=0.99:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Slurp>=9999.19:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-File-Which>=1.09:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-HTML-Entities-Interpolate>=1.04:${PORTSDIR}/textproc/p5-HTML-Entities-Interpolate \
-		p5-HTML-Tree>=4.2:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTTP-Tiny>=0.012:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-IPC-Run3>=0.046:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Lingua-EN-PluralToSingular>=0.14:${PORTSDIR}/textproc/p5-Lingua-EN-PluralToSingular \
-		p5-Log-Handler>=0.71:${PORTSDIR}/devel/p5-Log-Handler \
-		p5-Moo>=1.002000:${PORTSDIR}/devel/p5-Moo \
-		p5-Parse-RecDescent>=1.965.001:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Set-Array>=0.23:${PORTSDIR}/devel/p5-Set-Array \
-		p5-Text-Xslate>=1.2000:${PORTSDIR}/textproc/p5-Text-Xslate \
-		p5-Tree-DAG_Node>=1.06:${PORTSDIR}/devel/p5-Tree-DAG_Node \
-		p5-Try-Tiny>=0.09:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-XML-Bare>=0:${PORTSDIR}/textproc/p5-XML-Bare \
-		p5-XML-Tiny>=2.06:${PORTSDIR}/textproc/p5-XML-Tiny
+BUILD_DEPENDS=	dot:graphics/graphviz \
+		p5-Algorithm-Dependency>=1.110:devel/p5-Algorithm-Dependency \
+		p5-Capture-Tiny>=0.10:devel/p5-Capture-Tiny \
+		p5-Class-ISA>=0.36:devel/p5-Class-ISA \
+		p5-Class-Load>=0.17:devel/p5-Class-Load \
+		p5-Config-Tiny>=2.16:devel/p5-Config-Tiny \
+		p5-DBI>=1.616:databases/p5-DBI \
+		p5-DBIx-Admin-TableInfo>=3:databases/p5-DBIx-Admin-TableInfo \
+		p5-Data-Section-Simple>=0.02:devel/p5-Data-Section-Simple \
+		p5-Date-Simple>=3.03:devel/p5-Date-Simple \
+		p5-File-HomeDir>=0.99:devel/p5-File-HomeDir \
+		p5-File-Slurp>=9999.19:devel/p5-File-Slurp \
+		p5-File-Which>=1.09:sysutils/p5-File-Which \
+		p5-HTML-Entities-Interpolate>=1.04:textproc/p5-HTML-Entities-Interpolate \
+		p5-HTML-Tree>=4.2:www/p5-HTML-Tree \
+		p5-HTTP-Tiny>=0.012:www/p5-HTTP-Tiny \
+		p5-IPC-Run3>=0.046:devel/p5-IPC-Run3 \
+		p5-Lingua-EN-PluralToSingular>=0.14:textproc/p5-Lingua-EN-PluralToSingular \
+		p5-Log-Handler>=0.71:devel/p5-Log-Handler \
+		p5-Moo>=1.002000:devel/p5-Moo \
+		p5-Parse-RecDescent>=1.965.001:devel/p5-Parse-RecDescent \
+		p5-Set-Array>=0.23:devel/p5-Set-Array \
+		p5-Text-Xslate>=1.2000:textproc/p5-Text-Xslate \
+		p5-Tree-DAG_Node>=1.06:devel/p5-Tree-DAG_Node \
+		p5-Try-Tiny>=0.09:lang/p5-Try-Tiny \
+		p5-XML-Bare>=0:textproc/p5-XML-Bare \
+		p5-XML-Tiny>=2.06:textproc/p5-XML-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.48:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Version>=0:${PORTSDIR}/devel/p5-Test-Version
+TEST_DEPENDS=	p5-Test-Pod>=1.48:devel/p5-Test-Pod \
+		p5-Test-Version>=0:devel/p5-Test-Version
 
 OPTIONS_DEFINE=	EXAMPLES
 
@@ -62,12 +62,12 @@ post-install-EXAMPLES-on:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-PathTools>=3.4000:${PORTSDIR}/devel/p5-PathTools
-RUN_DEPENDS+=	p5-PathTools>=3.4000:${PORTSDIR}/devel/p5-PathTools
+BUILD_DEPENDS+=	p5-PathTools>=3.4000:devel/p5-PathTools
+RUN_DEPENDS+=	p5-PathTools>=3.4000:devel/p5-PathTools
 .endif
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/p5-Graphics-Color/Makefile b/graphics/p5-Graphics-Color/Makefile
index ffa0e958ad0d..fb9c5817833d 100644
--- a/graphics/p5-Graphics-Color/Makefile
+++ b/graphics/p5-Graphics-Color/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Device and library agnostic color spaces
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Color-Library>=0.02:${PORTSDIR}/graphics/p5-Color-Library \
-		p5-Moose>=0.74:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Aliases>=0.03:${PORTSDIR}/devel/p5-MooseX-Aliases \
-		p5-MooseX-Clone>=0.03:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-MooseX-Storage>=0.23:${PORTSDIR}/devel/p5-MooseX-Storage \
-		p5-MooseX-Types>=0.19:${PORTSDIR}/devel/p5-MooseX-Types
+BUILD_DEPENDS=	p5-Color-Library>=0.02:graphics/p5-Color-Library \
+		p5-Moose>=0.74:devel/p5-Moose \
+		p5-MooseX-Aliases>=0.03:devel/p5-MooseX-Aliases \
+		p5-MooseX-Clone>=0.03:devel/p5-MooseX-Clone \
+		p5-MooseX-Storage>=0.23:devel/p5-MooseX-Storage \
+		p5-MooseX-Types>=0.19:devel/p5-MooseX-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Number-Delta>=0:${PORTSDIR}/devel/p5-Test-Number-Delta
+TEST_DEPENDS=	p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Graphics-ColorNames-WWW/Makefile b/graphics/p5-Graphics-ColorNames-WWW/Makefile
index 8a570e156516..74b3f7f5ae82 100644
--- a/graphics/p5-Graphics-ColorNames-WWW/Makefile
+++ b/graphics/p5-Graphics-ColorNames-WWW/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	WWW color names and equivalent RGB values
 
-RUN_DEPENDS=	p5-Graphics-ColorNames>=0.32:${PORTSDIR}/graphics/p5-Graphics-ColorNames
+RUN_DEPENDS=	p5-Graphics-ColorNames>=0.32:graphics/p5-Graphics-ColorNames
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/graphics/p5-Graphics-ColorNames/Makefile b/graphics/p5-Graphics-ColorNames/Makefile
index 945531f99a63..1d93869b4789 100644
--- a/graphics/p5-Graphics-ColorNames/Makefile
+++ b/graphics/p5-Graphics-ColorNames/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl class that defines RGB values for common color names
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
index e2bf5cbe2b4a..7e77aebeeb4e 100644
--- a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
+++ b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Cairo backend for Graphics::Primitive
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-Graphics-Primitive>=0:${PORTSDIR}/graphics/p5-Graphics-Primitive \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Text-Flow>=0:${PORTSDIR}/textproc/p5-Text-Flow
+BUILD_DEPENDS=	p5-Cairo>=0:graphics/p5-Cairo \
+		p5-Graphics-Primitive>=0:graphics/p5-Graphics-Primitive \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Text-Flow>=0:textproc/p5-Text-Flow
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Graphics-Color>=0:${PORTSDIR}/graphics/p5-Graphics-Color
+TEST_DEPENDS=	p5-Graphics-Color>=0:graphics/p5-Graphics-Color
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Graphics-Primitive/Makefile b/graphics/p5-Graphics-Primitive/Makefile
index df60595ede0b..e956819d8a13 100644
--- a/graphics/p5-Graphics-Primitive/Makefile
+++ b/graphics/p5-Graphics-Primitive/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Device and library agnostic graphic primitives
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Forest>=0.06:${PORTSDIR}/devel/p5-Forest \
-		p5-Geometry-Primitive>=0.16:${PORTSDIR}/graphics/p5-Geometry-Primitive \
-		p5-Graphics-Color>=0.20:${PORTSDIR}/graphics/p5-Graphics-Color \
-		p5-JSON-Any>=1.22:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.04:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-MooseX-Storage>=0.17:${PORTSDIR}/devel/p5-MooseX-Storage
+BUILD_DEPENDS=	p5-Forest>=0.06:devel/p5-Forest \
+		p5-Geometry-Primitive>=0.16:graphics/p5-Geometry-Primitive \
+		p5-Graphics-Color>=0.20:graphics/p5-Graphics-Color \
+		p5-JSON-Any>=1.22:converters/p5-JSON-Any \
+		p5-Moose>=0.90:devel/p5-Moose \
+		p5-MooseX-Clone>=0.04:devel/p5-MooseX-Clone \
+		p5-MooseX-Storage>=0.17:devel/p5-MooseX-Storage
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Image-Base-SVG/Makefile b/graphics/p5-Image-Base-SVG/Makefile
index f7c4a79f2490..8c7c131760f3 100644
--- a/graphics/p5-Image-Base-SVG/Makefile
+++ b/graphics/p5-Image-Base-SVG/Makefile
@@ -13,9 +13,9 @@ COMMENT=	SVG image file output
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-Image-Base>=0:${PORTSDIR}/graphics/p5-Image-Base \
-		p5-SVG>=2.38:${PORTSDIR}/textproc/p5-SVG \
-		p5-SVG-Parser>=0:${PORTSDIR}/textproc/p5-SVG-Parser
+BUILD_DEPENDS=	p5-Image-Base>=0:graphics/p5-Image-Base \
+		p5-SVG>=2.38:textproc/p5-SVG \
+		p5-SVG-Parser>=0:textproc/p5-SVG-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/graphics/p5-Image-Caa/Makefile b/graphics/p5-Image-Caa/Makefile
index 11c8edd959a0..239960099d85 100644
--- a/graphics/p5-Image-Caa/Makefile
+++ b/graphics/p5-Image-Caa/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Colored ASCII Art
 
-RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Image-Compare/Makefile b/graphics/p5-Image-Compare/Makefile
index 0233008dd725..322ea07ac573 100644
--- a/graphics/p5-Image-Compare/Makefile
+++ b/graphics/p5-Image-Compare/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Compare two images in a variety of ways
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Imager>=0:graphics/p5-Imager \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Image-Grab/Makefile b/graphics/p5-Image-Grab/Makefile
index 2dc6267e49cd..ced982762751 100644
--- a/graphics/p5-Image-Grab/Makefile
+++ b/graphics/p5-Image-Grab/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl extension for Grabbing images off the Internet
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Image-Heatmap/Makefile b/graphics/p5-Image-Heatmap/Makefile
index c603685d76cf..da6c85c8a31e 100644
--- a/graphics/p5-Image-Heatmap/Makefile
+++ b/graphics/p5-Image-Heatmap/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Convert geographic coordinates into a graphical heatmap
 LICENSE=	ART20 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 USES=		perl5
diff --git a/graphics/p5-Image-Imgur/Makefile b/graphics/p5-Image-Imgur/Makefile
index 36498fb7083c..405b05683ee3 100644
--- a/graphics/p5-Image-Imgur/Makefile
+++ b/graphics/p5-Image-Imgur/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl extension for uploading images to http://imgur.com
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index c38cee88b2a3..ec760a0158fc 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the Imlib2 image library
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/graphics/p5-Image-Info/Makefile b/graphics/p5-Image-Info/Makefile
index b3df8a2cc888..e989e46e64af 100644
--- a/graphics/p5-Image-Info/Makefile
+++ b/graphics/p5-Image-Info/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl module for getting image information
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Image-LibExif/Makefile b/graphics/p5-Image-LibExif/Makefile
index f81f86ca79ea..ffcec7a2af7b 100644
--- a/graphics/p5-Image-LibExif/Makefile
+++ b/graphics/p5-Image-LibExif/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Read EXIF module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	libexif>=0.6.18:${PORTSDIR}/graphics/libexif
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
-RUN_DEPENDS=	libexif>=0.6.18:${PORTSDIR}/graphics/libexif
+BUILD_DEPENDS=	libexif>=0.6.18:graphics/libexif
+LIB_DEPENDS=	libexif.so:graphics/libexif
+RUN_DEPENDS=	libexif>=0.6.18:graphics/libexif
 
 USE_PERL5=	configure
 USES=		perl5 pkgconfig
diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile
index 750d08b98f1d..963f960288b9 100644
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sequentially read Image::Magick object from a filehandle
 
-BUILD_DEPENDS=	ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \
-		p5-Image-PBMlib>=1.05:${PORTSDIR}/graphics/p5-Image-PBMlib
+BUILD_DEPENDS=	ImageMagick>=0:graphics/ImageMagick \
+		p5-Image-PBMlib>=1.05:graphics/p5-Image-PBMlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/graphics/p5-Image-Math-Constrain/Makefile b/graphics/p5-Image-Math-Constrain/Makefile
index 2ad65908838c..596ea99a43fb 100644
--- a/graphics/p5-Image-Math-Constrain/Makefile
+++ b/graphics/p5-Image-Math-Constrain/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	coryking@mozimedia.com
 COMMENT=	Scaling math used in image size constraining (such as thumbnails)
 
-BUILD_DEPENDS=	p5-PathTools>=3.25:${PORTSDIR}/devel/p5-PathTools
+BUILD_DEPENDS=	p5-PathTools>=3.25:devel/p5-PathTools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Image-ObjectDetect/Makefile b/graphics/p5-Image-ObjectDetect/Makefile
index d4264f63b197..13c777640c13 100644
--- a/graphics/p5-Image-ObjectDetect/Makefile
+++ b/graphics/p5-Image-ObjectDetect/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Detects objects from picture using opencv
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/opencv.pc:${PORTSDIR}/graphics/opencv
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/graphics/p5-Image-Scale/Makefile b/graphics/p5-Image-Scale/Makefile
index 0fad5f09586d..d93d6ac69f29 100644
--- a/graphics/p5-Image-Scale/Makefile
+++ b/graphics/p5-Image-Scale/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl module for fast, high-quality fixed-point image resizing
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+LIB_DEPENDS=	libpng.so:graphics/png
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		jpeg perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Image-Size-FillFullSelect/Makefile b/graphics/p5-Image-Size-FillFullSelect/Makefile
index 077bf1282a23..d07f330d1628 100644
--- a/graphics/p5-Image-Size-FillFullSelect/Makefile
+++ b/graphics/p5-Image-Size-FillFullSelect/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Pick whether an image fill setting for a image should be fill or full
 
-BUILD_DEPENDS=	p5-Image-Size>=3.230:${PORTSDIR}/graphics/p5-Image-Size
+BUILD_DEPENDS=	p5-Image-Size>=3.230:graphics/p5-Image-Size
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Imager-AverageGray/Makefile b/graphics/p5-Imager-AverageGray/Makefile
index 21dff4bd2a38..1fadafd78831 100644
--- a/graphics/p5-Imager-AverageGray/Makefile
+++ b/graphics/p5-Imager-AverageGray/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Finds the average gray for a Imager object or image
 
-RUN_DEPENDS=	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager
+RUN_DEPENDS=	p5-Imager>=0:graphics/p5-Imager
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Imager-Graph/Makefile b/graphics/p5-Imager-Graph/Makefile
index b256110dc906..90de199a8b29 100644
--- a/graphics/p5-Imager-Graph/Makefile
+++ b/graphics/p5-Imager-Graph/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Perl extension for producing Graphs using the Imager library
 
-BUILD_DEPENDS=	p5-Imager>=0.75:${PORTSDIR}/graphics/p5-Imager
-RUN_DEPENDS=	p5-Imager>=0.75:${PORTSDIR}/graphics/p5-Imager
+BUILD_DEPENDS=	p5-Imager>=0.75:graphics/p5-Imager
+RUN_DEPENDS=	p5-Imager>=0.75:graphics/p5-Imager
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Imager-Plot/Makefile b/graphics/p5-Imager-Plot/Makefile
index 61a3d6fa5b6b..ac7230cd9940 100644
--- a/graphics/p5-Imager-Plot/Makefile
+++ b/graphics/p5-Imager-Plot/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension for generating fancy graphic plots in color
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager
+BUILD_DEPENDS=	p5-Imager>=0:graphics/p5-Imager
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/graphics/p5-Imager-QRCode/Makefile b/graphics/p5-Imager-QRCode/Makefile
index 1f5fb2bce263..5dd861d81ab6 100644
--- a/graphics/p5-Imager-QRCode/Makefile
+++ b/graphics/p5-Imager-QRCode/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-0.034
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate QR Code with Imager using libqrencode
 
-BUILD_DEPENDS=	p5-Imager>=0.55:${PORTSDIR}/graphics/p5-Imager
+BUILD_DEPENDS=	p5-Imager>=0.55:graphics/p5-Imager
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile
index 905e10e27f08..84d6189a2218 100644
--- a/graphics/p5-Imager/Makefile
+++ b/graphics/p5-Imager/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Perl module for manipulating gray, color, and rgba format images
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckLib>=0:${PORTSDIR}/devel/p5-Devel-CheckLib
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libt1.so:${PORTSDIR}/devel/t1lib \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-TEST_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libt1.so:devel/t1lib \
+		libtiff.so:graphics/tiff
+TEST_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
+		p5-Inline-C>=0:devel/p5-Inline-C
 
 USES=		jpeg perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index 135310300310..c04652af998c 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl bindings for Imlib2
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Layout-Manager/Makefile b/graphics/p5-Layout-Manager/Makefile
index 83377679cda4..2f4848faea4b 100644
--- a/graphics/p5-Layout-Manager/Makefile
+++ b/graphics/p5-Layout-Manager/Makefile
@@ -15,9 +15,9 @@ COMMENT=	2D Layout Management
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Geometry-Primitive>=0.16:${PORTSDIR}/graphics/p5-Geometry-Primitive \
-		p5-Graphics-Primitive>=0.43:${PORTSDIR}/graphics/p5-Graphics-Primitive \
-		p5-Moose>=0.79:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Geometry-Primitive>=0.16:graphics/p5-Geometry-Primitive \
+		p5-Graphics-Primitive>=0.43:graphics/p5-Graphics-Primitive \
+		p5-Moose>=0.79:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 8b7e73444c87..9e0cb156ca81 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 extension which makes available the pgplot library
 
-BUILD_DEPENDS=	p5-ExtUtils-F77>=1.13:${PORTSDIR}/lang/p5-ExtUtils-F77
-LIB_DEPENDS=	libpgplot.so:${PORTSDIR}/graphics/pgplot
+BUILD_DEPENDS=	p5-ExtUtils-F77>=1.13:lang/p5-ExtUtils-F77
+LIB_DEPENDS=	libpgplot.so:graphics/pgplot
 
 INSTALL_TARGET=	pure_install
 SCRIPTS_ENV=	PERL=${PERL}
diff --git a/graphics/p5-SVG-Graph/Makefile b/graphics/p5-SVG-Graph/Makefile
index 4ad2f62ab567..d3907f261623 100644
--- a/graphics/p5-SVG-Graph/Makefile
+++ b/graphics/p5-SVG-Graph/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Visualize your data in Scalable Vector Graphics (SVG) format
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Math-Spline>=0:${PORTSDIR}/math/p5-Math-Spline \
-		p5-SVG>=0:${PORTSDIR}/textproc/p5-SVG \
-		p5-Statistics-Descriptive>=0:${PORTSDIR}/math/p5-Statistics-Descriptive \
-		p5-Tree-DAG_Node>=0:${PORTSDIR}/devel/p5-Tree-DAG_Node
+BUILD_DEPENDS=	p5-Math-Spline>=0:math/p5-Math-Spline \
+		p5-SVG>=0:textproc/p5-SVG \
+		p5-Statistics-Descriptive>=0:math/p5-Statistics-Descriptive \
+		p5-Tree-DAG_Node>=0:devel/p5-Tree-DAG_Node
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-SVG-Metadata/Makefile b/graphics/p5-SVG-Metadata/Makefile
index 74aeb6cbc62e..9ab5f9f00dd2 100644
--- a/graphics/p5-SVG-Metadata/Makefile
+++ b/graphics/p5-SVG-Metadata/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to capture metadata info about an SVG file
 
-BUILD_DEPENDS=	xml_grep:${PORTSDIR}/textproc/p5-XML-Twig
+BUILD_DEPENDS=	xml_grep:textproc/p5-XML-Twig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-SWF-Builder/Makefile b/graphics/p5-SWF-Builder/Makefile
index 86e875326aa4..4ebd6dbb709a 100644
--- a/graphics/p5-SWF-Builder/Makefile
+++ b/graphics/p5-SWF-Builder/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create SWF movie
 
-BUILD_DEPENDS=	p5-SWF-File>=0:${PORTSDIR}/graphics/p5-SWF-File \
-		p5-Math-Bezier-Convert>=0:${PORTSDIR}/math/p5-Math-Bezier-Convert \
-		p5-Font-TTF>=0:${PORTSDIR}/x11-fonts/p5-Font-TTF
+BUILD_DEPENDS=	p5-SWF-File>=0:graphics/p5-SWF-File \
+		p5-Math-Bezier-Convert>=0:math/p5-Math-Bezier-Convert \
+		p5-Font-TTF>=0:x11-fonts/p5-Font-TTF
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		dos2unix perl5 shebangfix
diff --git a/graphics/p5-SWF-File/Makefile b/graphics/p5-SWF-File/Makefile
index b751a79a034b..17e3f39349eb 100644
--- a/graphics/p5-SWF-File/Makefile
+++ b/graphics/p5-SWF-File/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Manipulating Flash movie (SWF) files
 
-BUILD_DEPENDS=	p5-Data-TemporaryBag>=0:${PORTSDIR}/devel/p5-Data-TemporaryBag
+BUILD_DEPENDS=	p5-Data-TemporaryBag>=0:devel/p5-Data-TemporaryBag
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 dos2unix
diff --git a/graphics/p5-Sane/Makefile b/graphics/p5-Sane/Makefile
index 147f78058ccc..7060e1d78520 100644
--- a/graphics/p5-Sane/Makefile
+++ b/graphics/p5-Sane/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for the SANE (Scanner Access Now Easy) Project
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		sane-config:${PORTSDIR}/graphics/sane-backends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		sane-config:graphics/sane-backends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile
index b0acb87cd9c7..7e247d29f111 100644
--- a/graphics/p5-SpringGraph/Makefile
+++ b/graphics/p5-SpringGraph/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Directed graph alternative to GraphViz
 
-BUILD_DEPENDS=	p5-GD>=1:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS=	p5-GD>=1:graphics/p5-GD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile
index 19bb7f25fef8..622c996de526 100644
--- a/graphics/p5-Tk-JPEG-Lite/Makefile
+++ b/graphics/p5-Tk-JPEG-Lite/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/00$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Very simplistic image viewer that loads JPEG images
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		jpeg perl5
diff --git a/graphics/p5-URI-GoogleChart/Makefile b/graphics/p5-URI-GoogleChart/Makefile
index 63a20fef409b..a3c109b6c7b7 100644
--- a/graphics/p5-URI-GoogleChart/Makefile
+++ b/graphics/p5-URI-GoogleChart/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Generate Google Chart URIs
 
-BUILD_DEPENDS=	p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-VCG/Makefile b/graphics/p5-VCG/Makefile
index dba57d1eb16e..3175545ae306 100644
--- a/graphics/p5-VCG/Makefile
+++ b/graphics/p5-VCG/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to the VCG graphing tool
 
-BUILD_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		xvcg:${PORTSDIR}/graphics/vcg
+		xvcg:graphics/vcg
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-Visio/Makefile b/graphics/p5-Visio/Makefile
index d43eafd38a09..b5cfd73f6693 100644
--- a/graphics/p5-Visio/Makefile
+++ b/graphics/p5-Visio/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension manipulating XML based Visio files
 
-BUILD_DEPENDS=	p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/graphics/p5-feedgnuplot/Makefile b/graphics/p5-feedgnuplot/Makefile
index f385c0b2184a..a074ec60c5c6 100644
--- a/graphics/p5-feedgnuplot/Makefile
+++ b/graphics/p5-feedgnuplot/Makefile
@@ -12,10 +12,10 @@ COMMENT=	General purpose pipe-oriented plotting tool
 LICENSE=	ART10 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-String-ShellQuote>=0.50:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-String-ShellQuote>=0.50:textproc/p5-String-ShellQuote \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		gnuplot:${PORTSDIR}/math/gnuplot
+		gnuplot:math/gnuplot
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index 762c77367c86..fe9fc760ee79 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -15,10 +15,10 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/../LICENSE_GPL2
 LICENSE_FILE_LGPL21=	${WRKSRC}/../LICENSE
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libming.so:${PORTSDIR}/graphics/ming \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libgif.so:graphics/giflib \
+		libming.so:graphics/ming \
+		libpng.so:graphics/png
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/graphics/panomatic/Makefile b/graphics/panomatic/Makefile
index a91156556be8..67d9aeffdd8d 100644
--- a/graphics/panomatic/Makefile
+++ b/graphics/panomatic/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ii@any.com.ru
 COMMENT=	Tool that automates the creation of control points
 
-BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
-		${LOCALBASE}/include/boost/format.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	bjam:devel/boost-jam \
+		${LOCALBASE}/include/boost/format.hpp:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE}/include
diff --git a/graphics/partio/Makefile b/graphics/partio/Makefile
index a97d139b8b69..a116ae14edeb 100644
--- a/graphics/partio/Makefile
+++ b/graphics/partio/Makefile
@@ -20,9 +20,9 @@ GH_TAGNAME=	1fd6747
 OPTIONS_DEFINE=		DOCS PYTHON
 OPTIONS_DEFAULT=	PYTHON
 
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 PYTHON_USES=		python:2.7+
-PYTHON_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+PYTHON_BUILD_DEPENDS=	swig:devel/swig13
 
 PORTDOCS=	*
 
diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile
index 9dd2635c7241..1605c7958899 100644
--- a/graphics/pdf2svg/Makefile
+++ b/graphics/pdf2svg/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Convert PDF to SVG
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	db9052
diff --git a/graphics/pdfpc/Makefile b/graphics/pdfpc/Makefile
index b579dbd025f1..81c037df26c4 100644
--- a/graphics/pdfpc/Makefile
+++ b/graphics/pdfpc/Makefile
@@ -8,9 +8,9 @@ DISTVERSIONPREFIX=	v
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Keynote-like multi-monitor presentation viewer
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
+		libpoppler-glib.so:graphics/poppler-glib
 
 USE_GITHUB=	yes
 
diff --git a/graphics/pear-Image_Barcode/Makefile b/graphics/pear-Image_Barcode/Makefile
index 2f1fdcf8a299..a54c480b0c4a 100644
--- a/graphics/pear-Image_Barcode/Makefile
+++ b/graphics/pear-Image_Barcode/Makefile
@@ -14,6 +14,6 @@ USES=	pear
 OPTIONS_DEFINE=		PEAR_PHP_COMPAT
 PEAR_PHP_COMPAT_DESC=	PEAR::PHP_Compat support
 
-PEAR_PHP_COMPAT_RUN_DEPENDS=	${PEARDIR}/PHP/Compat.php:${PORTSDIR}/devel/pear-PHP_Compat
+PEAR_PHP_COMPAT_RUN_DEPENDS=	${PEARDIR}/PHP/Compat.php:devel/pear-PHP_Compat
 
 .include <bsd.port.mk>
diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index 1fc5847f01fc..3ddf344c11c2 100644
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	graphics www pear
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	OO PEAR common interface to image drawing
 
-RUN_DEPENDS=	${PEARDIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color
+RUN_DEPENDS=	${PEARDIR}/Image/Color.php:graphics/pear-Image_Color
 
 USE_PHP=	gd
 USES=		dos2unix pear
diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile
index bcf82acf8fef..44bf47a6ade2 100644
--- a/graphics/pear-Image_Graph/Makefile
+++ b/graphics/pear-Image_Graph/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	graphics www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	OO PEAR graph rendering package
 
-RUN_DEPENDS=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \
-		${PEARDIR}/Image/Canvas.php:${PORTSDIR}/graphics/pear-Image_Canvas
+RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log \
+		${PEARDIR}/Image/Canvas.php:graphics/pear-Image_Canvas
 
 USE_PHP=	yes
 USES=		dos2unix pear
diff --git a/graphics/pear-Image_GraphViz/Makefile b/graphics/pear-Image_GraphViz/Makefile
index 7d7d22935166..848eae730663 100644
--- a/graphics/pear-Image_GraphViz/Makefile
+++ b/graphics/pear-Image_GraphViz/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	graphics www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Interface to AT&T's GraphViz tools
 
-RUN_DEPENDS=	${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	${LOCALBASE}/bin/dot:graphics/graphviz
 
 USES=	pear
 
diff --git a/graphics/pecl-gmagick/Makefile b/graphics/pecl-gmagick/Makefile
index 8188664c2082..d07c00dcd0cd 100644
--- a/graphics/pecl-gmagick/Makefile
+++ b/graphics/pecl-gmagick/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provides a wrapper to the GraphicsMagick library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick
+LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 
 USES=		tar:tgz
 
diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile
index 1e901cdf544c..b0346cc29411 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -15,8 +15,8 @@ LICENSE=	PHP301
 
 OPTIONS_DEFINE=	X11
 
-X11_LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
-X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11
+X11_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
+X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:graphics/ImageMagick-nox11
 
 USES=		pkgconfig tar:tgz localbase
 USE_PHP=	yes
diff --git a/graphics/pecl-imlib2/Makefile b/graphics/pecl-imlib2/Makefile
index 6e882d053500..84a4fc3a8295 100644
--- a/graphics/pecl-imlib2/Makefile
+++ b/graphics/pecl-imlib2/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension if imlib2
 
 LICENSE=	PHP202
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/graphics/pecl-qrencode/Makefile b/graphics/pecl-qrencode/Makefile
index 279a1d31cde4..e4e77e5592db 100644
--- a/graphics/pecl-qrencode/Makefile
+++ b/graphics/pecl-qrencode/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	PECL extension for generate qrcode
 
-LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 0665018b07f9..5cfdd5ede37d 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Pencil - a traditional 2D animation software
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libming.so:graphics/ming \
+		libpng.so:graphics/png
 
 USES=		qmake zip
 USE_QT4=	gui opengl xml moc_build rcc_build
diff --git a/graphics/pfscalibration/Makefile b/graphics/pfscalibration/Makefile
index 35e0e9ec73ee..3f86909491e7 100644
--- a/graphics/pfscalibration/Makefile
+++ b/graphics/pfscalibration/Makefile
@@ -23,6 +23,6 @@ USE_PERL5=	run
 SHEBANG_FILES=	src/dcraw2hdrgen src/jpeg2hdrgen src/pfsinhdrgen
 bash_CMD=	${SH}
 
-LIB_DEPENDS=	libpfs-1.2.so:${PORTSDIR}/graphics/pfstools
+LIB_DEPENDS=	libpfs-1.2.so:graphics/pfstools
 
 .include <bsd.port.mk>
diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile
index a867c4e73dbd..55fc70df9624 100644
--- a/graphics/pfstmo/Makefile
+++ b/graphics/pfstmo/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/pfstools/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ii@any.com.ru
 COMMENT=	Tone mapping operators
 
-LIB_DEPENDS=	libpfs-1.2.so:${PORTSDIR}/graphics/pfstools \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libpfs-1.2.so:graphics/pfstools \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libgsl.so:math/gsl
 
 PFS_CPPFLAGS=	-I${LOCALBASE}/include
 PFS_LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 208f279b5958..4364948a18bd 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tools for manipulating HDR images and video frames
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS+=	bash:shells/bash
 
 PFS_BUILD=	${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB+=	PFS_BASE=${PREFIX}
@@ -36,31 +36,31 @@ OPTIONS_DEFAULT=	TIFF
 OPTIONS_SUB=		yes
 
 NETPBM_CONFIGURE_ENABLE=	netpbm
-NETPBM_LIB_DEPENDS=		libnetpbm.so:${PORTSDIR}/graphics/netpbm
+NETPBM_LIB_DEPENDS=		libnetpbm.so:graphics/netpbm
 
 OPENEXR_CONFIGURE_ENABLE=	openexr
 OPENEXR_CONFIGURE_ON=		--with-exrdir=${LOCALBASE}/include/OpenEXR
-OPENEXR_LIB_DEPENDS=		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+OPENEXR_LIB_DEPENDS=		libIlmImf.so:graphics/OpenEXR
 
 TIFF_CONFIGURE_ENABLE=		tiff
-TIFF_LIB_DEPENDS=		libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 
 QT_CONFIGURE_ENABLE=		qt
 QT_USE=				QT4=moc_build,corelib,gui
 
 IMAGEMAGICK_CONFIGURE_ENABLE=	imagemagick
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick
 
 GDAL_CONFIGURE_ENABLE=		gdal
-GDAL_LIB_DEPENDS=		libgdal.so:${PORTSDIR}/graphics/gdal
+GDAL_LIB_DEPENDS=		libgdal.so:graphics/gdal
 
 OPENGL_CONFIGURE_ENABLE=	opengl
 OPENGL_USE=			GL=glut
 
 OCTAVE_CONFIGURE_ENABLE=	octave
-OCTAVE_PATCH_DEPENDS=		octave-config:${PORTSDIR}/math/octave
-OCTAVE_BUILD_DEPENDS=		mkoctfile:${PORTSDIR}/math/octave
-OCTAVE_RUN_DEPENDS=		octave:${PORTSDIR}/math/octave
+OCTAVE_PATCH_DEPENDS=		octave-config:math/octave
+OCTAVE_BUILD_DEPENDS=		mkoctfile:math/octave
+OCTAVE_RUN_DEPENDS=		octave:math/octave
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index b0737a161b3e..e064ec26ab14 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:R}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	C/FORTRAN library for drawing graphs on a variety of display devices
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/graphics/phototonic/Makefile b/graphics/phototonic/Makefile
index ca0680bfecb0..988561de9469 100644
--- a/graphics/phototonic/Makefile
+++ b/graphics/phototonic/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Image viewer and organizer
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	oferkv
diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile
index 8041f54defcd..df99c77abb1c 100644
--- a/graphics/php-facedetect/Makefile
+++ b/graphics/php-facedetect/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Face detection extension for PHP using OpenCV library
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libopencv_objdetect.so:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS=	libopencv_objdetect.so:graphics/opencv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	infusion
diff --git a/graphics/php-gdal/Makefile b/graphics/php-gdal/Makefile
index 5f4ffb4fdc84..60e616f0ccc6 100644
--- a/graphics/php-gdal/Makefile
+++ b/graphics/php-gdal/Makefile
@@ -15,8 +15,8 @@ COMMENT=	PHP binding for GDAL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../../LICENSE.TXT
 
-BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+BUILD_DEPENDS=	swig3.0:devel/swig30
+LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 ALL_TARGET=	php_gdal.so php_gdalconst.so php_ogr.so php_osr.so
 CFLAGS+=	-fPIC
diff --git a/graphics/php-libpuzzle/Makefile b/graphics/php-libpuzzle/Makefile
index 3dd78d104b12..5b8d2800e5e3 100644
--- a/graphics/php-libpuzzle/Makefile
+++ b/graphics/php-libpuzzle/Makefile
@@ -15,8 +15,8 @@ COMMENT=	PHP extension for Puzzle library to find similar pictures
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC:H:H}/COPYING
 
-LIB_DEPENDS=	libpuzzle.so:${PORTSDIR}/graphics/libpuzzle \
-		libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libpuzzle.so:graphics/libpuzzle \
+		libgd.so:graphics/gd
 
 USES=		tar:bzip2
 USE_PHP=	yes
diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile
index 16627b3266ce..e65e47587361 100644
--- a/graphics/php-magickwand/Makefile
+++ b/graphics/php-magickwand/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	MagickWandForPHP-${PORTVERSION}-2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP extension to manipulate images
 
-LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
 
 USES=		pkgconfig
 USE_PHP=	yes
diff --git a/graphics/php5-ffmpeg/Makefile b/graphics/php5-ffmpeg/Makefile
index 53d2b521645f..eb5630d86a07 100644
--- a/graphics/php5-ffmpeg/Makefile
+++ b/graphics/php5-ffmpeg/Makefile
@@ -14,8 +14,8 @@ COMMENT=	FFmpeg shared extension for php
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libavutil.so:multimedia/ffmpeg
 
 IGNORE_WITH_PHP=70
 USE_PHP=	yes
diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile
index 1fb0eb0b08fd..b970961f3083 100644
--- a/graphics/phplot/Makefile
+++ b/graphics/phplot/Makefile
@@ -15,7 +15,7 @@ COMMENT=	PHP class for creating scientific and business charts
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 NO_ARCH=	yes
 NO_BUILD=	yes
@@ -29,7 +29,7 @@ LIBRARIES=	phplot.php rgb.inc.php
 OPTIONS_DEFINE=		DOCS FONTS
 OPTIONS_DEFAULT=	FONTS
 FONTS_DESC=		install TrueType fonts
-FONTS_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FONTS_LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 do-install:
 	@${MKDIR} ${PHPLOT_DIR}
diff --git a/graphics/picpuz/Makefile b/graphics/picpuz/Makefile
index dbe19084ab25..3d9277fd8bf2 100644
--- a/graphics/picpuz/Makefile
+++ b/graphics/picpuz/Makefile
@@ -15,7 +15,7 @@ USES=		execinfo gmake pkgconfig
 USE_GNOME=	gtk20
 
 ALL_TARGET=	#
-#RUN_DEPENDS+=	xdg-desktop-menu:${PORTSDIR}/devel/xdg-utils
+#RUN_DEPENDS+=	xdg-desktop-menu:devel/xdg-utils
 DESKTOP_ENTRIES="Picpuz" \
 		"Jigsaw Puzzle" \
 		"${PREFIX}/share/pixmaps/picpuz.png" \
diff --git a/graphics/pinpoint/Makefile b/graphics/pinpoint/Makefile
index 17b499335395..9f6b9422336f 100644
--- a/graphics/pinpoint/Makefile
+++ b/graphics/pinpoint/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tool for making hackers do excellent presentations
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter
 
 USE_GL=		gl
 USE_GNOME=	librsvg2
@@ -26,7 +26,7 @@ GST_DESC=	Live videos as slide backgrounds
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGST}
-LIB_DEPENDS+=	libclutter-gst-1.0.so:${PORTSDIR}/multimedia/clutter-gst
+LIB_DEPENDS+=	libclutter-gst-1.0.so:multimedia/clutter-gst
 .else
 CONFIGURE_ARGS+=	--enable-cluttergst=no
 .endif
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 5ce0ca97d528..a51077890ea0 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Photorealistic renderer with Pixar's RenderMan-like interface
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfltk_gl.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
+		libtiff.so:graphics/tiff \
+		libfltk_gl.so:x11-toolkits/fltk
 
 USE_GL=		glu
 USES=		bison compiler:c++0x libtool pathfix tar:tgz
@@ -48,7 +48,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CONFIGURE_ENV+=	ac_cv_path_FLEX="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 31fd5dc17a1f..48dfb31045ac 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -15,8 +15,8 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # requires rgb.txt
-BUILD_DEPENDS=	showrgb:${PORTSDIR}/x11/rgb \
-		xrdb:${PORTSDIR}/x11/xrdb
+BUILD_DEPENDS=	showrgb:x11/rgb \
+		xrdb:x11/xrdb
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 29a7e685d43c..797617556a91 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	GNU
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Plotting library and toolkit
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake libtool	# parallel builds are broken with bmake(1)
 GNU_CONFIGURE=	yes
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index 72aa9f4b9218..62c630a9aa06 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Takes a PNG image and transforms it into HTML
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libgd.so:graphics/gd
 
 PLIST_FILES=	bin/png2html
 
diff --git a/graphics/png2ico/Makefile b/graphics/png2ico/Makefile
index ddf1b03266b6..095011cdaff9 100644
--- a/graphics/png2ico/Makefile
+++ b/graphics/png2ico/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Converts PNG files to Windows icon resource files
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index 45bf25aba5e3..6b7eb7707382 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-nolib
 MAINTAINER=	vsasjason@gmail.com
 COMMENT=	Optimizer for PNG files
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		tar:xz
 CFLAGS+=	-DPNGCRUSH_COUNT_COLORS -I${LOCALBASE}/include
diff --git a/graphics/pngnq/Makefile b/graphics/pngnq/Makefile
index 7af05b9d1e55..26110d0ebd39 100644
--- a/graphics/pngnq/Makefile
+++ b/graphics/pngnq/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool for quantizing PNG images in RGBA format
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/pngquant/Makefile b/graphics/pngquant/Makefile
index a49b68b2a3a8..f8750ecf9572 100644
--- a/graphics/pngquant/Makefile
+++ b/graphics/pngquant/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Converts 32-bit RGBA PNGs into 8-bit RGBA-palette PNGs
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/graphics/pngrewrite/Makefile b/graphics/pngrewrite/Makefile
index de2598da110d..7f0d7504a214 100644
--- a/graphics/pngrewrite/Makefile
+++ b/graphics/pngrewrite/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PNG palette optimizer
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		localbase zip
 
diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile
index fdbf71945bd4..761cf424ca93 100644
--- a/graphics/pngwriter/Makefile
+++ b/graphics/pngwriter/Makefile
@@ -11,8 +11,8 @@ COMMENT=	C++ library for creating PNG images
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		cmake:outsource
 USE_GITHUB=	yes
diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile
index 5b0f95c66a2a..79ed8395594d 100644
--- a/graphics/podofo/Makefile
+++ b/graphics/podofo/Makefile
@@ -13,9 +13,9 @@ COMMENT=	PDF manipulation library and tools
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		cmake dos2unix
 CMAKE_ARGS=	-DPODOFO_BUILD_SHARED:BOOL=TRUE \
@@ -38,10 +38,10 @@ JPEG_CMAKE_ON=		-DWANT_LIBJPEG:BOOL=TRUE
 JPEG_USES=		jpeg
 
 PNG_CMAKE_ON=		-DWANT_PNG:BOOL=TRUE
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 TIFF_CMAKE_ON=		-DWANT_TIFF:BOOL=TRUE
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 IMPOSE_USES=		lua:51
 
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index dfb81d18ee5d..cdcb461dfb02 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -13,12 +13,12 @@ COMMENT?=	PDF rendering library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libfontconfig.so:x11-fonts/fontconfig \
+		liblcms2.so:graphics/lcms2 \
+		libfreetype.so:print/freetype2
+RUN_DEPENDS=	poppler-data>0:graphics/poppler-data
 
 USES=		cpe gmake jpeg libtool pathfix pkgconfig tar:xz
 CPE_VENDOR=	freedesktop
@@ -48,7 +48,7 @@ USES+=		iconv
 
 .if defined(SLAVEPORT)
 PORTSCOUT=	ignore:1
-LIB_DEPENDS+=	libpoppler.so:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+=	libpoppler.so:graphics/poppler
 
 .if ${SLAVEPORT}==glib
 CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes
@@ -80,7 +80,7 @@ CONFIGURE_ARGS+=--disable-poppler-qt5
 .endif
 
 .if ${SLAVEPORT}==utils
-LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS+=	libpoppler-glib.so:graphics/poppler-glib
 CONFIGURE_ARGS+=--enable-utils
 BUILD_WRKSRC=	${WRKSRC}/utils
 INSTALL_WRKSRC=	${WRKSRC}/utils
@@ -95,7 +95,7 @@ CONFIGURE_ARGS+=--disable-poppler-glib \
 		--disable-utils
 
 .if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	libcairo.so:graphics/cairo
 PLIST_SUB+=	CAIRO=""
 .else
 CONFIGURE_ARGS+=--disable-cairo-output
@@ -103,7 +103,7 @@ PLIST_SUB+=	CAIRO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 CONFIGURE_ARGS+=--enable-libcurl
 PLIST_SUB+=	CURL=""
 .else
@@ -115,7 +115,7 @@ PLIST_SUB+=	CURL="@comment "
 # https://bugs.freedesktop.org/show_bug.cgi?id=58906 Comment #35
 .if ${PORT_OPTIONS:MOPENJPEG}
 CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg1
-LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+LIB_DEPENDS+=	libopenjpeg.so:graphics/openjpeg15
 .else
 CONFIGURE_ARGS+=--disable-libopenjpeg
 .endif
diff --git a/graphics/povray-meta/Makefile b/graphics/povray-meta/Makefile
index 40dfc782c2be..85f95e0aab46 100644
--- a/graphics/povray-meta/Makefile
+++ b/graphics/povray-meta/Makefile
@@ -44,7 +44,7 @@ PORT_OPTIONS+=	POVRAY${ver}
 POV_VERSION=	${ver}
 . endif
 . if ${PORT_OPTIONS:MPOVRAY${ver}}
-RUN_DEPENDS+=	${LOCALBASE}/bin/${POVRAY${ver}_BIN}:${PORTSDIR}/${POVRAY${ver}_PORT}
+RUN_DEPENDS+=	${LOCALBASE}/bin/${POVRAY${ver}_BIN}:${POVRAY${ver}_PORT}
 . endif
 .endfor
 
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 49c88e7ea120..519bd379d506 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -14,8 +14,8 @@ DIST_SUBDIR=	povray36
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Persistence of Vision Ray Tracer
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USE_XORG=	x11
 USES=		gmake jpeg tar:bzip2
@@ -30,7 +30,7 @@ DATADIR=	${PREFIX}/share/${PORTNAME}-3.6
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "i386" || ${ARCH} == "amd64")
-LIB_DEPENDS+=	libvgagl.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvgagl.so:graphics/svgalib
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 17dfefa34231..2a3d9b70238c 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Persistence of Vision Ray Tracer
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 OPTIONS_DEFINE=	X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS
 OPTIONS_DEFAULT=PNG JPEG EXAMPLES DOCS
@@ -56,9 +56,9 @@ CONFIGURE_ARGS+=--disable-io-restrictions
 
 .if ${PORT_OPTIONS:MPNG}
 .if ${PORT_OPTIONS:MSTATIC}
-BUILD_DEPENDS+=	png>=1.4:${PORTSDIR}/graphics/png
+BUILD_DEPENDS+=	png>=1.4:graphics/png
 .else
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 .endif
 .else
 CONFIGURE_ARGS+=--without-libpng
@@ -76,9 +76,9 @@ CONFIGURE_ARGS+=--without-libjpeg
 
 .if ${PORT_OPTIONS:MTIFF}
 .if ${PORT_OPTIONS:MSTATIC}
-BUILD_DEPENDS+=	tiff>=4:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS+=	tiff>=4:graphics/tiff
 .else
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libtiff.so:graphics/tiff
 .endif
 .else
 CONFIGURE_ARGS+=--without-libtiff
@@ -86,9 +86,9 @@ CONFIGURE_ARGS+=--without-libtiff
 
 .if ${PORT_OPTIONS:MOPENEXR}
 .if ${PORT_OPTIONS:MSTATIC}
-BUILD_DEPENDS+=	OpenEXR>=1.6:${PORTSDIR}/graphics/OpenEXR
+BUILD_DEPENDS+=	OpenEXR>=1.6:graphics/OpenEXR
 .else
-LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=	libIlmImf.so:graphics/OpenEXR
 CPPFLAGS+=	-I${LOCALBASE}/include/OpenEXR
 .endif
 .else
diff --git a/graphics/ppminfo/Makefile b/graphics/ppminfo/Makefile
index ac196ddb0603..0fcb14d0a1a0 100644
--- a/graphics/ppminfo/Makefile
+++ b/graphics/ppminfo/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shows details of a ppm file
 
-LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 
 PLIST_FILES=	bin/${PORTNAME}
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile
index b29bde08cb05..3345486c38f1 100644
--- a/graphics/pqiv/Makefile
+++ b/graphics/pqiv/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Pretty Quick Image Viewer
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	phillipberndt
diff --git a/graphics/prison/Makefile b/graphics/prison/Makefile
index 59abbba3dd1d..5aa357c98efe 100644
--- a/graphics/prison/Makefile
+++ b/graphics/prison/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Barcode library for KDE
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libdmtx.so:${PORTSDIR}/graphics/libdmtx \
-		libqrencode.so:${PORTSDIR}/graphics/libqrencode
+LIB_DEPENDS=	libdmtx.so:graphics/libdmtx \
+		libqrencode.so:graphics/libqrencode
 
 USE_QT4=	corelib gui qmake_build moc_build rcc_build uic_build
 USES=		cmake
diff --git a/graphics/processing/Makefile b/graphics/processing/Makefile
index 4f01c12a96ee..59c2b5552efc 100644
--- a/graphics/processing/Makefile
+++ b/graphics/processing/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Programming environment for images, animation, and interactions
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	jikes>=1.22:${PORTSDIR}/java/jikes \
-		${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:${PORTSDIR}/comms/rxtx
+RUN_DEPENDS=	jikes>=1.22:java/jikes \
+		${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:comms/rxtx
 
 USES=		tar:tgz
 USE_JAVA=	1.6+
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 5d8943eed278..1602dba2ce60 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	fmysh@iijmio-mail.jp
 COMMENT=	Cartographic Projections library
 
-EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 DATUM_GRID_FILES=	proj-datumgrid-1.6RC1.zip
 
diff --git a/graphics/projectm-libvisual/Makefile b/graphics/projectm-libvisual/Makefile
index 476fb1f6a1cf..7c13334154ae 100644
--- a/graphics/projectm-libvisual/Makefile
+++ b/graphics/projectm-libvisual/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Allows projectM to be used with libvisual
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libprojectM.so:${PORTSDIR}/graphics/libprojectm \
-		libvisual-${LIBVISUAL_VER}.so:${PORTSDIR}/graphics/libvisual${LIBVISUAL_VER:S/.//} \
-		libSDL.so:${PORTSDIR}/devel/sdl12
+LIB_DEPENDS=	libprojectM.so:graphics/libprojectm \
+		libvisual-${LIBVISUAL_VER}.so:graphics/libvisual${LIBVISUAL_VER:S/.//} \
+		libSDL.so:devel/sdl12
 
 USES=		cmake pkgconfig
 CMAKE_ARGS+=	-DLIBVISUAL_LIBRARIES=visual-${LIBVISUAL_VER}
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 05b813bd7f39..4261845503c4 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Convert PostScript to other vector graphic formats
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=		ghostscript libtool localbase pathfix pkgconfig
 GNU_CONFIGURE=	yes
@@ -29,18 +29,18 @@ OPTIONS_DEFAULT=	EMF MAGICK MING PLOTUTILS
 OPTIONS_SUB=		yes
 
 EMF_DESC=		WMF/EMF support via libEMF
-EMF_LIB_DEPENDS=	libEMF.so:${PORTSDIR}/graphics/libemf
+EMF_LIB_DEPENDS=	libEMF.so:graphics/libemf
 EMF_CONFIGURE_ON=	--with-libemf-include=${LOCALBASE}/include/libEMF
 EMF_CONFIGURE_OFF=	--without-emf
-MAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick
 MAGICK_CONFIGURE_ON=	--with-magick
 MAGICK_CONFIGURE_OFF=	--without-magick
 MING_DESC=		Flash support via Ming
-MING_LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming
+MING_LIB_DEPENDS=	libming.so:graphics/ming
 MING_CONFIGURE_ON=	--with-swf
 MING_CONFIGURE_OFF=	--without-swf
 PLOTUTILS_DESC=		Plotting support via Plotutils
-PLOTUTILS_LIB_DEPENDS=	libplotter.so:${PORTSDIR}/graphics/plotutils
+PLOTUTILS_LIB_DEPENDS=	libplotter.so:graphics/plotutils
 PLOTUTILS_CONFIGURE_ON=	--with-libplot
 PLOTUTILS_CONFIGURE_OFF=	--without-libplot
 
diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile
index 1d2f262c7cee..6cd549c908b1 100644
--- a/graphics/pstoepsi/Makefile
+++ b/graphics/pstoepsi/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Wiliam Chia-Wei Cheng's yet another PS to EPSI converter
 
-RUN_DEPENDS=	pbmtoepsi:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	pbmtoepsi:graphics/netpbm
 
 USES=		ghostscript:run
 NO_WRKSUBDIR=	yes
diff --git a/graphics/py-aafigure/Makefile b/graphics/py-aafigure/Makefile
index 837e777ce576..c84b9380555d 100644
--- a/graphics/py-aafigure/Makefile
+++ b/graphics/py-aafigure/Makefile
@@ -13,8 +13,8 @@ COMMENT=	ASCII art to image converter written in Python
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_SITELIBDIR}/reportlab/__init__.py:print/py-reportlab2
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index 038da04c09cd..00b58d92e376 100644
--- a/graphics/py-actdiag/Makefile
+++ b/graphics/py-actdiag/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Simple activity-diagram image generator
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
-		${PKGNAMEPREFIX}blockdiag>=1.4.1:${PORTSDIR}/graphics/py-blockdiag \
-		${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib
+RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \
+		${PKGNAMEPREFIX}blockdiag>=1.4.1:graphics/py-blockdiag \
+		${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib
 
 USES=	python
 USE_PYTHON=	autoplist distutils
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index 57186a2e2b2b..a81dd17258e5 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Simple block-diagram image generator
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
-		${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib \
-		${PKGNAMEPREFIX}webcolors>=0:${PORTSDIR}/graphics/py-webcolors
+RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \
+		${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \
+		${PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors
 
 USES=	python
 USE_PYTHON=	autoplist distutils
@@ -39,11 +39,11 @@ IGNORE=	does not support in ${PYTHON_VERSION}
 .endif
 
 .if ${PORT_OPTIONS:MPDF}
-RUN_DEPENDS+=	${PKGNAMEPREFIX}reportlab>0:${PORTSDIR}/print/py-reportlab
+RUN_DEPENDS+=	${PKGNAMEPREFIX}reportlab>0:print/py-reportlab
 .endif
 
 .if ${PORT_OPTIONS:MIPAFONT}
-RUN_DEPENDS+=	${LOCALBASE}/share/font-ipa/ipag.otf:${PORTSDIR}/japanese/font-ipa
+RUN_DEPENDS+=	${LOCALBASE}/share/font-ipa/ipag.otf:japanese/font-ipa
 .endif
 
 post-patch:
diff --git a/graphics/py-blockdiagcontrib-cisco/Makefile b/graphics/py-blockdiagcontrib-cisco/Makefile
index 3684f389e3c4..c8025776b613 100644
--- a/graphics/py-blockdiagcontrib-cisco/Makefile
+++ b/graphics/py-blockdiagcontrib-cisco/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Networking shapes for blockdiag designed by Cisco
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}blockdiag>=0.8.0:${PORTSDIR}/graphics/py-blockdiag
+RUN_DEPENDS=	${PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/graphics/py-django-easy-thumbnails/Makefile b/graphics/py-django-easy-thumbnails/Makefile
index 4b26c4ad9e55..4ce75eb72f5c 100644
--- a/graphics/py-django-easy-thumbnails/Makefile
+++ b/graphics/py-django-easy-thumbnails/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Easy thumbnails for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile
index c2408eb134af..4eb786058a3c 100644
--- a/graphics/py-exiv2/Makefile
+++ b/graphics/py-exiv2/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Python bindings for exiv2
 
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2\
-		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2\
+		libboost_python.so:devel/boost-python-libs
 
 USES=		python:2 scons tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/graphics/py-freeimagepy/Makefile b/graphics/py-freeimagepy/Makefile
index 9e0004564550..a78b2741bf1d 100644
--- a/graphics/py-freeimagepy/Makefile
+++ b/graphics/py-freeimagepy/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	FreeImagePy_w_dll-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FreeImage library python wrapper
 
-LIB_DEPENDS=	libfreeimage.so:${PORTSDIR}/graphics/freeimage
+LIB_DEPENDS=	libfreeimage.so:graphics/freeimage
 
 WRKSRC=		${WRKDIR}/FreeImagePy-${PORTVERSION}
 USES=		python tar:bzip2
diff --git a/graphics/py-gchartwrapper/Makefile b/graphics/py-gchartwrapper/Makefile
index 8f180afb4d81..5c76fa3b57a8 100644
--- a/graphics/py-gchartwrapper/Makefile
+++ b/graphics/py-gchartwrapper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python Google Chart Wrapper
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 PROJECTHOST=	google-chartwrapper
 
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index af56254639f4..8cdc87730133 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	gdmodule-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python interface to the GD library
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=		python
 USE_PYTHON=	distutils autoplist pythonprefix
diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile
index c29fc67aba2f..25ddc4692846 100644
--- a/graphics/py-gdal/Makefile
+++ b/graphics/py-gdal/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python binding for GDAL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../../LICENSE.TXT
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 OPTIONS_DEFINE=	NUMPY
 NUMPY_DESC=	Enable array support via NumPy
@@ -27,8 +27,8 @@ WRKSRC_SUBDIR=	swig/python
 
 SHEBANG_FILES=	scripts/*.py
 
-NUMPY_BUILD_DEPENDS=	${PKGNAMEPREFIX}numpy>=1.0.0:${PORTSDIR}/math/py-numpy
-NUMPY_RUN_DEPENDS=	${PKGNAMEPREFIX}numpy>=1.0.0:${PORTSDIR}/math/py-numpy
+NUMPY_BUILD_DEPENDS=	${PKGNAMEPREFIX}numpy>=1.0.0:math/py-numpy
+NUMPY_RUN_DEPENDS=	${PKGNAMEPREFIX}numpy>=1.0.0:math/py-numpy
 NUMPY_USES=		fortran
 
 post-install:
diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile
index 3fc4f4a3c816..742156cff27e 100644
--- a/graphics/py-glewpy/Makefile
+++ b/graphics/py-glewpy/Makefile
@@ -16,7 +16,7 @@ PATCHFILES=	glewpy-${PORTVERSION}-generatedsources.diff.bz2
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Advanced OpenGL extensions to Python
 
-BUILD_DEPENDS=	pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
+BUILD_DEPENDS=	pyrex>=0.9.6.2:devel/pyrex
 
 USES=		python
 USE_GL=		glew
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index 95d4dd4851af..dfb86f7ce969 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GooCanvas python bindings
 
-LIB_DEPENDS=	libgoocanvas.so:${PORTSDIR}/graphics/goocanvas
+LIB_DEPENDS=	libgoocanvas.so:graphics/goocanvas
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/goocanvasmodule.so \
 		libdata/pkgconfig/pygoocanvas.pc
diff --git a/graphics/py-gphoto2/Makefile b/graphics/py-gphoto2/Makefile
index 95b6bf93aa10..bc23cf527301 100644
--- a/graphics/py-gphoto2/Makefile
+++ b/graphics/py-gphoto2/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python bindings for libgphoto2
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 USES=		pkgconfig python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/graphics/py-graph-dot/Makefile b/graphics/py-graph-dot/Makefile
index 949a955e53c1..45ab1e5afe51 100644
--- a/graphics/py-graph-dot/Makefile
+++ b/graphics/py-graph-dot/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Library for working with graphs in Python, dot module
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydot>=0:${PORTSDIR}/graphics/py-pydot \
-		${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:${PORTSDIR}/graphics/py-graph-core
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot \
+		${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:graphics/py-graph-core
 
 PROJECTHOST=	python-graph
 USES=		python
diff --git a/graphics/py-graph/Makefile b/graphics/py-graph/Makefile
index 1ade745454ed..3c5d02e3e6e3 100644
--- a/graphics/py-graph/Makefile
+++ b/graphics/py-graph/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Library for working with graphs in Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:${PORTSDIR}/graphics/py-graph-core \
-		${PYTHON_PKGNAMEPREFIX}graph-dot>=${PORTVERSION}:${PORTSDIR}/graphics/py-graph-dot
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:graphics/py-graph-core \
+		${PYTHON_PKGNAMEPREFIX}graph-dot>=${PORTVERSION}:graphics/py-graph-dot
 
 USES=		metaport python
 
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 9f57448d3fec..e5b4b51faf2e 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	Imaging-${PORTVERSION}
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	The Python Imaging Library
 
-LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	liblcms.so:graphics/lcms \
+		libfreetype.so:print/freetype2
 
 DEPRECATED=	Unmaintained upstream; use graphics/py-pillow
 EXPIRATION_DATE=2016-03-11
@@ -34,8 +34,8 @@ TKINTER_DESC=	tkinter for X support
 
 OPTIONS_DEFAULT=	TKINTER
 
-TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/py-mcomix/Makefile b/graphics/py-mcomix/Makefile
index fda97556d04d..5b4d844526ca 100644
--- a/graphics/py-mcomix/Makefile
+++ b/graphics/py-mcomix/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GTK2 comic book viewer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python tar:bzip2
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index e1ae9282d58a..c014c34143b4 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -16,10 +16,10 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/../LICENSE_GPL2
 LICENSE_FILE_LGPL21=	${WRKSRC}/../LICENSE
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libming.so:${PORTSDIR}/graphics/ming \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libgif.so:graphics/giflib \
+		libming.so:graphics/ming \
+		libpng.so:graphics/png
 
 PORTSCOUT=	limit:^ming-
 
diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile
index 95ffafa7c37f..bb49ce3aed6a 100644
--- a/graphics/py-nwdiag/Makefile
+++ b/graphics/py-nwdiag/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Simple network-diagram image generator
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
-		${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib \
-		${PKGNAMEPREFIX}blockdiag>=1.4.1:${PORTSDIR}/graphics/py-blockdiag
+RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \
+		${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \
+		${PKGNAMEPREFIX}blockdiag>=1.4.1:graphics/py-blockdiag
 
 USES=	python
 USE_PYTHON=	autoplist distutils
diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile
index e627432da050..e60ad467993c 100644
--- a/graphics/py-openexr/Makefile
+++ b/graphics/py-openexr/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	OpenEXR-${PORTVERSION}
 MAINTAINER=	jamesb-bsd@excamera.com
 COMMENT=	Python module for ILM's OpenEXR image format and library
 
-LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/graphics/py-opengl-accelerate/Makefile b/graphics/py-opengl-accelerate/Makefile
index a9993a11f08b..6e07a817b630 100644
--- a/graphics/py-opengl-accelerate/Makefile
+++ b/graphics/py-opengl-accelerate/Makefile
@@ -13,7 +13,7 @@ COMMENT=	OpenGL acceleration code for PyOpenGL
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython:lang/cython
 
 USE_PYTHON=	autoplist distutils
 USES=		python
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 54c87f17f497..33eb4b3a2c83 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	python@FreeBSD.org
 COMMENT=	OpenGL (and related library) interface for Python
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	TKINTER
@@ -24,8 +24,8 @@ USES=		dos2unix python
 USE_GL=		glut
 USE_PYTHON=	distutils autoplist
 
-TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile
index d162776fba66..e21c201a6746 100644
--- a/graphics/py-paint/Makefile
+++ b/graphics/py-paint/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Simple and flexible painting adaptor to libart for Python
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libttf.so:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libttf.so:print/freetype
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile
index c75aaaa215c6..940c3edba2b3 100644
--- a/graphics/py-pillow/Makefile
+++ b/graphics/py-pillow/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFAULT=	FREETYPE JPEG PNG TKINTER WEBP
 LCMS_DESC=		Little Color Management System
 TKINTER_DESC=		Tkinter (Tcl/Tk) BitmapImage & PhotoImage support
 
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_VARS=		PYDISTUTILS_BUILDARGS+=--enable-freetype
 FREETYPE_VARS_OFF=	PYDISTUTILS_BUILDARGS+=--disable-freetype
 
@@ -29,24 +29,24 @@ JPEG_USES=		jpeg
 JPEG_VARS=		PYDISTUTILS_BUILDARGS+=--enable-jpeg
 JPEG_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-jpeg
 
-LCMS_LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2
+LCMS_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS_VARS=		PYDISTUTILS_BUILDARGS+=--enable-lcms
 LCMS_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-lcms
 
 PNG_VARS=		PYDISTUTILS_BUILDARGS+=--enable-zlib
 PNG_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-zlib
 
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_VARS=		PYDISTUTILS_BUILDARGS+=--enable-tiff
 TIFF_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-tiff
 
 TKINTER_USES=		tk
-TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 TKINTER_VARS=		PYDISTUTILS_BUILDARGS+="--enable-tcl --enable-tk --include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}"
 TKINTER_VARS_OFF=	PYDISTUTILS_BUILDARGS+="--disable-tcl --disable-tk"
 
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_VARS=		PYDISTUTILS_BUILDARGS+=--enable-webp
 WEBP_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-webp
 
diff --git a/graphics/py-pivy/Makefile b/graphics/py-pivy/Makefile
index bd6885b3df11..67822b49c9b5 100644
--- a/graphics/py-pivy/Makefile
+++ b/graphics/py-pivy/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python binding for Coin
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libSoQt.so:${PORTSDIR}/x11-toolkits/soqt
+BUILD_DEPENDS=	${LOCALBASE}/bin/swig:devel/swig13
+LIB_DEPENDS=	libSoQt.so:x11-toolkits/soqt
 
 USES=		zip python:2
 USE_PYTHON=	autoplist distutils
diff --git a/graphics/py-plotly/Makefile b/graphics/py-plotly/Makefile
index b5edbe863d78..7c47f0d6659f 100644
--- a/graphics/py-plotly/Makefile
+++ b/graphics/py-plotly/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Plotting library for collaborative, interactive, publication-quality gr
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 NO_ARCH=	yes
 USES=		python
diff --git a/graphics/py-poppler-qt4/Makefile b/graphics/py-poppler-qt4/Makefile
index 827d94a7137c..3013671b0397 100644
--- a/graphics/py-poppler-qt4/Makefile
+++ b/graphics/py-poppler-qt4/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Python bindings for the Poppler-Qt4 PDF rendering library
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	sip:${PORTSDIR}/devel/py-sip \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
-LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
+BUILD_DEPENDS=	sip:devel/py-sip \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:textproc/py-qt4-xml
+LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:textproc/py-qt4-xml
 
 USES=		pkgconfig python
 USE_PYTHON=	distutils autoplist
diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile
index 3b95367251a5..297f69879a0a 100644
--- a/graphics/py-poppler/Makefile
+++ b/graphics/py-poppler/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Python bindings for the Poppler PDF rendering library
 
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig python
diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile
index 8806743963b5..ddbf7ccad59a 100644
--- a/graphics/py-pycha/Makefile
+++ b/graphics/py-pycha/Makefile
@@ -18,6 +18,6 @@ USE_PYTHON=	distutils autoplist
 OPTIONS_DEFINE=		CAIRO
 OPTIONS_DEFAULT=	CAIRO
 
-CAIRO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:${PORTSDIR}/graphics/py-cairo
+CAIRO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pydot/Makefile b/graphics/py-pydot/Makefile
index a4ac70cd01c7..94e2df1ca968 100644
--- a/graphics/py-pydot/Makefile
+++ b/graphics/py-pydot/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python interface to the Graphviz Dot language
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:${PORTSDIR}/devel/py-pyparsing
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:${PORTSDIR}/devel/py-pyparsing \
-		dot:${PORTSDIR}/graphics/graphviz
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
+		dot:graphics/graphviz
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile
index 76b85a1bd3fb..6a719f2ef0f9 100644
--- a/graphics/py-pygal/Makefile
+++ b/graphics/py-pygal/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python svg graph plotting library
 
 LICENSE=	LGPL3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml
 
 NO_ARCH=	yes
 USES=		python
diff --git a/graphics/py-pyganim/Makefile b/graphics/py-pyganim/Makefile
index 6562dc88f689..87ddd79d3330 100644
--- a/graphics/py-pyganim/Makefile
+++ b/graphics/py-pyganim/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Sprite animation module for Pygame
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python zip
diff --git a/graphics/py-pyggel/Makefile b/graphics/py-pyggel/Makefile
index 3685193422c9..bd1f7f26a36a 100644
--- a/graphics/py-pyggel/Makefile
+++ b/graphics/py-pyggel/Makefile
@@ -19,8 +19,8 @@ LICENSE_COMB=	dual
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYGAME} \
-		${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow
+		${PYTHON_PKGNAMEPREFIX}opengl>=0:graphics/py-opengl \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
 
 USES=		dos2unix python:2 zip
 DOS2UNIX_GLOB=	*.mtl *.py *.txt
diff --git a/graphics/py-pyglet/Makefile b/graphics/py-pyglet/Makefile
index 9c04179ae202..f2eba530bb70 100644
--- a/graphics/py-pyglet/Makefile
+++ b/graphics/py-pyglet/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Cross-platform windowing and multimedia library for Python
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	${LOCALBASE}/lib/libavbin.so:${PORTSDIR}/multimedia/avbin
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
+RUN_DEPENDS=	${LOCALBASE}/lib/libavbin.so:multimedia/avbin
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/graphics/py-pygraphviz/Makefile b/graphics/py-pygraphviz/Makefile
index bbcd3c70afe8..5fca6347fb60 100644
--- a/graphics/py-pygraphviz/Makefile
+++ b/graphics/py-pygraphviz/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python interface to GraphViz agraph
 
 
-LIB_DEPENDS=	libcgraph.so:${PORTSDIR}/graphics/graphviz
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:${PORTSDIR}/devel/py-nose
+LIB_DEPENDS=	libcgraph.so:graphics/graphviz
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py-nose
 
 USES=		pkgconfig python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index d4f6b9cebfa5..027ddf5942e1 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtSvg API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile
index a644bf0bcfad..fd293a9d15af 100644
--- a/graphics/py-qt5-svg/Makefile
+++ b/graphics/py-qt5-svg/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtSvg API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/graphics/py-sane/Makefile b/graphics/py-sane/Makefile
index 3ec958e0bc82..f8513ee4af65 100644
--- a/graphics/py-sane/Makefile
+++ b/graphics/py-sane/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	Imaging-1.1.7
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Python bindings for Sane
 
-LIB_DEPENDS=	libsane.so:${PORTSDIR}/graphics/sane-backends
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+LIB_DEPENDS=	libsane.so:graphics/sane-backends
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 DIST_SUBDIR=	python
 USES=		python
diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index 8875d42a0067..a29b3784e601 100644
--- a/graphics/py-seqdiag/Makefile
+++ b/graphics/py-seqdiag/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Simple sequence-diagram image generator
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
-		${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib \
-		${PKGNAMEPREFIX}blockdiag>=1.4.1:${PORTSDIR}/graphics/py-blockdiag
+RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \
+		${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \
+		${PKGNAMEPREFIX}blockdiag>=1.4.1:graphics/py-blockdiag
 
 USES=	python
 USE_PYTHON=	autoplist distutils
diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile
index c6619e21dc5b..31d06e52e5af 100644
--- a/graphics/py-sorl-thumbnail/Makefile
+++ b/graphics/py-sorl-thumbnail/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Sorl-thumbnail provides an easy way to generate image thumbnails
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -30,15 +30,15 @@ OPTIONS_DEFAULT=	DJANGO
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDJANGO}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 .endif
 
 .if ${PORT_OPTIONS:MPDF}
-RUN_DEPENDS+=	${LOCALBASE}/bin/Magick-config:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	${LOCALBASE}/bin/Magick-config:graphics/ImageMagick
 .endif
 
 .if ${PORT_OPTIONS:MWORD}
-RUN_DEPENDS+=	wvVersion:${PORTSDIR}/textproc/wv
+RUN_DEPENDS+=	wvVersion:textproc/wv
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index ce2511094284..c498ae62be53 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -14,13 +14,13 @@ DIST_SUBDIR=	python
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Very high level 3D engine for Python
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
-LIB_DEPENDS=	libcal3d.so:${PORTSDIR}/graphics/cal3d \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-editobj \
-		${PYTHON_SITELIBDIR}/tofu/client.py:${PORTSDIR}/net/py-tofu \
-		${PYTHON_SITELIBDIR}/cerealizer/__init__.py:${PORTSDIR}/security/py-cerealizer
+BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:devel/ode \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
+LIB_DEPENDS=	libcal3d.so:graphics/cal3d \
+		libfreetype.so:print/freetype2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/editobj/editor.py:graphics/py-editobj \
+		${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu \
+		${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer
 
 USES=		gmake openal:al,alut python tar:bzip2
 USE_GL=		glew glu
diff --git a/graphics/py-stltools/Makefile b/graphics/py-stltools/Makefile
index 93bfd9008fd5..efd5efeccd37 100644
--- a/graphics/py-stltools/Makefile
+++ b/graphics/py-stltools/Makefile
@@ -27,7 +27,7 @@ PYCAIRO_DESC=		Use (py)Cairo to enable stl2pdf to function.
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYCAIRO}
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}cairo>1.8:${PORTSDIR}/graphics/py-cairo
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}cairo>1.8:graphics/py-cairo
 .endif
 
 post-install:
diff --git a/graphics/py-toyplot/Makefile b/graphics/py-toyplot/Makefile
index 3830421dc732..551435ae196d 100644
--- a/graphics/py-toyplot/Makefile
+++ b/graphics/py-toyplot/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Modern plotting toolkit supporting electronic publishing
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.7:${PORTSDIR}/math/py-numpy \
-		${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:${PORTSDIR}/math/py-colormath \
-		${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:${PORTSDIR}/devel/py-multipledispatch
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.7:math/py-numpy \
+		${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath \
+		${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile
index 7e56da9fb65b..375b454dc1a6 100644
--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@@ -12,7 +12,7 @@ COMMENT=	MagickWand Python binding
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
 
 USES=	python
 USE_PYTHON=	distutils autoplist
diff --git a/graphics/pygts/Makefile b/graphics/pygts/Makefile
index 68ea0fc80869..468882539529 100644
--- a/graphics/pygts/Makefile
+++ b/graphics/pygts/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libgts.so:${PORTSDIR}/graphics/gts
+LIB_DEPENDS=	libgts.so:graphics/gts
 
 USE_PYTHON=	distutils
 USES=		pkgconfig python
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index cafa233470e9..ba4dabb8f537 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Qt-based comic book archive viewer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
 
 USES=		cmake:outsource pkgconfig
 USE_QT4=	corelib gui linguisttools_build moc_build qmake_build rcc_build \
@@ -21,16 +21,16 @@ USE_QT4=	corelib gui linguisttools_build moc_build qmake_build rcc_build \
 OPTIONS_DEFINE=	7ZIP ACE RAR ZIP
 
 7ZIP_DESC=	7-Zip (.cb7) comic book archives support
-7ZIP_RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
+7ZIP_RUN_DEPENDS=	7z:archivers/p7zip
 
 ACE_DESC=	ACE (.cba) comic book archives support
-ACE_RUN_DEPENDS=	unace:${PORTSDIR}/archivers/unace
+ACE_RUN_DEPENDS=	unace:archivers/unace
 
 RAR_DESC=	Rar (.cbr) comic book archives support
-RAR_RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
+RAR_RUN_DEPENDS=	unrar:archivers/unrar
 
 ZIP_DESC=	Zip (.cbz) comic book archives support
-ZIP_RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+ZIP_RUN_DEPENDS=	unzip:archivers/unzip
 
 post-patch:
 # fix man install directory
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 80786a99462f..48c4b0d5f280 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -10,16 +10,16 @@ COMMENT=	Geographical Information System (GIS) data viewer
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	txt2tags:${PORTSDIR}/textproc/txt2tags
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libgsl.so:${PORTSDIR}/math/gsl \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libspatialindex.so:${PORTSDIR}/devel/spatialindex \
-		libspatialite.so:${PORTSDIR}/databases/spatialite
+BUILD_DEPENDS=	txt2tags:textproc/txt2tags
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libgeos.so:graphics/geos \
+		libgsl.so:math/gsl \
+		libproj.so:graphics/proj \
+		libqca.so:devel/qca \
+		libqscintilla2.so:devel/qscintilla2 \
+		libqwt.so:x11-toolkits/qwt5 \
+		libspatialindex.so:devel/spatialindex \
+		libspatialite.so:databases/spatialite
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tu}
@@ -49,7 +49,7 @@ CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=FALSE
 CMAKE_ARGS+=	-Wno-dev
 .endif
 
-ASTYLE_RUN_DEPENDS=	astyle:${PORTSDIR}/devel/astyle
+ASTYLE_RUN_DEPENDS=	astyle:devel/astyle
 ASTYLE_CMAKE_ON=	-DWITH_ASTYLE:BOOL=TRUE
 ASTYLE_CMAKE_OFF=	-DWITH_ASTYLE:BOOL=FALSE
 
@@ -59,50 +59,50 @@ CUSTOMWIDGETS_CMAKE_OFF=	-DWITH_CUSTOM_WIDGETS:BOOL=FALSE
 DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE=Debug
 DEBUG_CMAKE_OFF=	-DCMAKE_BUILD_TYPE=Release
 
-GRASS_BUILD_DEPENDS=	grass64:${PORTSDIR}/databases/grass
-GRASS_RUN_DEPENDS=	grass64:${PORTSDIR}/databases/grass
+GRASS_BUILD_DEPENDS=	grass64:databases/grass
+GRASS_RUN_DEPENDS=	grass64:databases/grass
 GRASS_CMAKE_ON=		-DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.5
 GRASS_CMAKE_OFF=	-DWITH_GRASS:BOOL=FALSE
 GRASS_FORCE_MAKE_JOBS=	NO
 
-POSTGIS_LIB_DEPENDS=	liblwgeom.so:${PORTSDIR}/databases/postgis21
+POSTGIS_LIB_DEPENDS=	liblwgeom.so:databases/postgis21
 POSTGIS_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=TRUE
 POSTGIS_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=FALSE
 
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:${PORTSDIR}/math/py-matplotlib \
-			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:${PORTSDIR}/devel/py-mock \
-			${PYTHON_PKGNAMEPREFIX}pip>=8.0.2:${PORTSDIR}/devel/py-pip \
-			${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
-			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
-			${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-			${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.11.3:${PORTSDIR}/databases/py-qt4-sql \
-			${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \
-			${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
-			${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:${PORTSDIR}/devel/py-sip \
-			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 \
-			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:${PORTSDIR}/devel/py-yaml
-PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:${PORTSDIR}/graphics/py-gdal \
-			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:${PORTSDIR}/math/py-matplotlib \
-			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:${PORTSDIR}/devel/py-mock \
-			${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:${PORTSDIR}/math/py-numpy \
-			${PYTHON_PKGNAMEPREFIX}pip>=8.0.2:${PORTSDIR}/devel/py-pip \
-			${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:${PORTSDIR}/databases/py-psycopg2 \
-			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite \
-			${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
-			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
-			${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-			${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.11.3:${PORTSDIR}/databases/py-qt4-sql \
-			${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \
-			${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.11.1:${PORTSDIR}/www/py-qt4-webkit \
-			${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
-			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 \
-			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:${PORTSDIR}/devel/py-yaml
+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib \
+			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
+			${PYTHON_PKGNAMEPREFIX}pip>=8.0.2:devel/py-pip \
+			${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:devel/py-qt4-core \
+			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui \
+			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:net/py-qt4-network \
+			${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:devel/py-qt4-qscintilla2 \
+			${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.11.3:databases/py-qt4-sql \
+			${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:graphics/py-qt4-svg \
+			${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:textproc/py-qt4-xml \
+			${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:devel/py-sip \
+			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:databases/py-sqlite3 \
+			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal \
+			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib \
+			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
+			${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:math/py-numpy \
+			${PYTHON_PKGNAMEPREFIX}pip>=8.0.2:devel/py-pip \
+			${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2 \
+			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \
+			${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:devel/py-qt4-core \
+			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui \
+			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:net/py-qt4-network \
+			${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:devel/py-qt4-qscintilla2 \
+			${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.11.3:databases/py-qt4-sql \
+			${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:graphics/py-qt4-svg \
+			${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.11.1:www/py-qt4-webkit \
+			${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:textproc/py-qt4-xml \
+			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:databases/py-sqlite3 \
+			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
 PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
 PYTHON_CMAKE_OFF=	-DWITH_BINDINGS:BOOL=FALSE
 
-SERVER_LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
+SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_ON=	-DWITH_SERVER:BOOL=TRUE
 SERVER_CMAKE_OFF=	-DWITH_SERVER:BOOL=FALSE
 
@@ -114,7 +114,7 @@ INSTALLS_ICONS=		yes
 USES+=		compiler:features
 .else
 USES+=		compiler:gcc-c++11-lib
-BUILD_DEPENDS+=	flex>=2.5.39:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=2.5.39:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex
 CXXFLAGS+=	-I${LOCALBASE}/include/flex
 .endif
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 08f1dbbf93c9..9219b355adba 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Small, fast GDK/Imlib2 image viewer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2 \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libexif.so:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
+		liblcms2.so:graphics/lcms2 \
+		libexif.so:graphics/libexif
 
 USES=		gmake pkgconfig tar:tgz
 USE_GNOME=	gtk20
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index cc084b99f568..efb78c7ddaeb 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -12,9 +12,9 @@ COMMENT=	SlimKit surface modeling tools
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgfx.so:${PORTSDIR}/graphics/libgfx
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libgfx.so:graphics/libgfx
 
 CONFIGURE_WRKSRC=	${WRKSRC}/mixkit
 BUILD_WRKSRC=		${WRKSRC}/mixkit/src
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index 8b11f24a06d1..73e05c5c5147 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -9,9 +9,9 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt plugins for several image formats
 
-LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libmng.so:graphics/libmng \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USES=		jpeg pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build corelib gui svg xml
diff --git a/graphics/qt5-imageformats/Makefile b/graphics/qt5-imageformats/Makefile
index 7656872e766f..cc70ac9bf153 100644
--- a/graphics/qt5-imageformats/Makefile
+++ b/graphics/qt5-imageformats/Makefile
@@ -9,10 +9,10 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt plugins for additional image formats
 
-LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper \
-		libmng.so:${PORTSDIR}/graphics/libmng \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libwebp.so:${PORTSDIR}/graphics/webp
+LIB_DEPENDS=	libjasper.so:graphics/jasper \
+		libmng.so:graphics/libmng \
+		libtiff.so:graphics/tiff \
+		libwebp.so:graphics/webp
 
 USE_QT5=	core gui buildtools_build
 QT_DIST=	${PORTNAME}
diff --git a/graphics/qtgtl/Makefile b/graphics/qtgtl/Makefile
index 6feaeb332fc5..b06b6ec88fab 100644
--- a/graphics/qtgtl/Makefile
+++ b/graphics/qtgtl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Qt bindings for the Graphics Transformation Languages
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libGTLCore.so:${PORTSDIR}/graphics/opengtl
+LIB_DEPENDS=	libGTLCore.so:graphics/opengtl
 
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
 USES=		cmake:outsource pkgconfig tar:bzip2
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index 2c35b3519c7b..e73e701cf3c3 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Three-dimensional fractal creator (X11 GUI)
 BROKEN=		unfetchable
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
 
diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile
index 9de1afd6261f..9b13bb022cb0 100644
--- a/graphics/quesoglc/Makefile
+++ b/graphics/quesoglc/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Free implementation of the OpenGL Character Renderer
 
-LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfribidi.so:converters/fribidi \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		tar:bzip2 pathfix gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/graphics/radius-engine/Makefile b/graphics/radius-engine/Makefile
index 42d220b687df..518a94b3953b 100644
--- a/graphics/radius-engine/Makefile
+++ b/graphics/radius-engine/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Lua script-based 2D engine built on top of OpenGL and SDL
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	liblua-5.1.so:${PORTSDIR}/lang/lua51 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libphysfs.so.1:${PORTSDIR}/devel/physfs
+LIB_DEPENDS=	liblua-5.1.so:lang/lua51 \
+		libpng.so:graphics/png \
+		libphysfs.so.1:devel/physfs
 
 USES=		pathfix pkgconfig
 USE_SDL=	sdl sound
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 7acb661c7629..892e66d73302 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Set of tools for generating raster images of proteins and molecules
 
 LICENSE=	ART20
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	IMAGEMAGICK DOCS EXAMPLES
 OPTIONS_DEFAULT=IMAGEMAGICK
@@ -29,7 +29,7 @@ MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-DLINUX -DNETWORKBYTEORDER -Dgfortran
 FFLAGS+=	-fno-range-check -ffixed-line-length-132
 
-IMAGEMAGICK_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick
 OPTIONS_SUB=		yes
 
 BROKEN_sparc64=	Does not compile with GCC 4.2: internal compiler error
diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index 002ada7c2859..409b1c1ef158 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Open-source program to read and manipulate RAW photo images
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		liblensfun.so:${PORTSDIR}/graphics/lensfun \
-		libflickcurl.so:${PORTSDIR}/www/flickcurl \
-		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libpng.so:graphics/png \
+		liblcms.so:graphics/lcms \
+		libexiv2.so:graphics/exiv2 \
+		libdbus-1.so:devel/dbus \
+		libfftw3f.so:math/fftw3-float \
+		liblensfun.so:graphics/lensfun \
+		libflickcurl.so:www/flickcurl \
+		libgphoto2.so:graphics/libgphoto2
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 
 USES=		desktop-file-utils gettext gmake jpeg libtool pathfix pkgconfig \
 		sqlite
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index a8b5d35f91ab..885f23b05234 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Powerful RAW image processing application
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		libiptcdata.so:${PORTSDIR}/graphics/libiptcdata \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24 \
+		libiptcdata.so:graphics/libiptcdata \
+		liblcms2.so:graphics/lcms2 \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libsigc-2.0.so:devel/libsigc++20 \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 USES=		cmake:outsource compiler:features desktop-file-utils dos2unix jpeg pkgconfig tar:xz
 DOS2UNIX_REGEX=	.*\.(cc|h)
@@ -63,7 +63,7 @@ USE_GCC=	yes
 LDFLAGS+=	-L/usr/local/lib/c++
 CXXFLAGS+=	-nostdinc++ -isystem /usr/local/include/c++/v1
 CFLAGS+=	-isystem /usr/local/include/c++/v1
-BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++
+BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
 .endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index c0fece6453b5..7a6c2cf2a93b 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -20,7 +20,7 @@ LICENSE_NAME=	Rayshade license
 LICENSE_FILE=	${WRKSRC}/Doc/Copyright
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
+BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:graphics/urt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION:R}
 
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 46c631ff3477..751bb1b1eb69 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	rss-glx_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL screensaver collection
 
-LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libGLC.so:${PORTSDIR}/graphics/quesoglc
+LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick \
+		libGLC.so:graphics/quesoglc
 
 USE_GL=		glut
 USES=		gmake pathfix pkgconfig tar:bzip2 libtool
diff --git a/graphics/recoverjpeg/Makefile b/graphics/recoverjpeg/Makefile
index f2cde2272096..ceaedf150566 100644
--- a/graphics/recoverjpeg/Makefile
+++ b/graphics/recoverjpeg/Makefile
@@ -23,8 +23,8 @@ SSCRIPTS_DESC=	Install sort-pictures script
 .include <bsd.port.options.mk>
 
 .if  ${PORT_OPTIONS:MSSCRIPTS}
-RUN_DEPENDS=	exif:${PORTSDIR}/graphics/exif \
-		identify:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	exif:graphics/exif \
+		identify:graphics/ImageMagick
 PLIST_FILES+=	bin/sort-pictures man/man1/sort-pictures.1.gz
 MANPAGE1+=	sort-pictures.1
 .endif
diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile
index 228133d5294d..faf1477efd7c 100644
--- a/graphics/renrot/Makefile
+++ b/graphics/renrot/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Program to rename and rotate image files according to EXIF tags
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool
+BUILD_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 jpeg:run
@@ -23,7 +23,7 @@ PORTDOCS=	AUTHORS README README.russian ChangeLog NEWS TODO
 OPTIONS_DEFINE=	IMAGEMAGICK DOCS
 IMAGEMAGICK_DESC=	Image::Magick Perl module support
 
-IMAGEMAGICK_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
diff --git a/graphics/repng2jpeg/Makefile b/graphics/repng2jpeg/Makefile
index 4ab2903377b5..3f03bb8649ea 100644
--- a/graphics/repng2jpeg/Makefile
+++ b/graphics/repng2jpeg/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Small tool to recompress JPEG, PNG, and GIF images
 
 LICENSE=	GPLv1
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=		tar:xz
 
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index fa31fd058ab3..ea1aad175c20 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Image viewer with Xfce integration
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libdbus-glib-1.so:devel/dbus-glib \
 
 USES=		pkgconfig gettext desktop-file-utils gmake xfce tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index 5dc76e399b7f..0ec133b7c1ab 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -15,8 +15,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Ruby extension library to use Thomas Boutell's gd library
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libgd.so:graphics/gd
 
 BROKEN_RUBY20=	yes
 
diff --git a/graphics/ruby-gdal/Makefile b/graphics/ruby-gdal/Makefile
index 0d29d708cfab..caf8efa1243b 100644
--- a/graphics/ruby-gdal/Makefile
+++ b/graphics/ruby-gdal/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Ruby binding for GDAL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../../LICENSE.TXT
 
-BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+BUILD_DEPENDS=	swig3.0:devel/swig30
+LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 IGNORE=		disabled by upstream (https://trac.osgeo.org/gdal/changeset/28756)
 
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index b3e6939a8054..6a5094a3796d 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Imlib2 bindings for Ruby
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/graphics/rubygem-cairo/Makefile b/graphics/rubygem-cairo/Makefile
index f4675da810f9..a5f12b4aabb2 100644
--- a/graphics/rubygem-cairo/Makefile
+++ b/graphics/rubygem-cairo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby binding for GLib2
 LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-pkg-config>=1.1.5:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS=	rubygem-pkg-config>=1.1.5:devel/rubygem-pkg-config
 
 USES=		pkgconfig
 USE_GNOME=	cairo
diff --git a/graphics/rubygem-captcha/Makefile b/graphics/rubygem-captcha/Makefile
index 5bf5b000db07..742bf042b79a 100644
--- a/graphics/rubygem-captcha/Makefile
+++ b/graphics/rubygem-captcha/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple CAPTCHA written in Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rmagick>=2.9.2:${PORTSDIR}/graphics/rubygem-rmagick
+RUN_DEPENDS=	rubygem-rmagick>=2.9.2:graphics/rubygem-rmagick
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/graphics/rubygem-clutter-gtk/Makefile b/graphics/rubygem-clutter-gtk/Makefile
index 06a2b86a038c..b6a63d220c7a 100644
--- a/graphics/rubygem-clutter-gtk/Makefile
+++ b/graphics/rubygem-clutter-gtk/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby/ClutterGTK is a Ruby binding of Clutter-GTK
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-clutter>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-clutter \
-		rubygem-gtk3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk3
+RUN_DEPENDS=	rubygem-clutter>=${PORTVERSION}:graphics/rubygem-clutter \
+		rubygem-gtk3>=${PORTVERSION}:x11-toolkits/rubygem-gtk3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/graphics/rubygem-clutter/Makefile b/graphics/rubygem-clutter/Makefile
index a2696ed75ed6..920ccc1726e3 100644
--- a/graphics/rubygem-clutter/Makefile
+++ b/graphics/rubygem-clutter/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Ruby binding for Clutter
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter
-RUN_DEPENDS=	rubygem-cairo-gobject>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-cairo-gobject \
-		rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection \
-		rubygem-pango>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-pango
+LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter
+RUN_DEPENDS=	rubygem-cairo-gobject>=${PORTVERSION}:devel/rubygem-cairo-gobject \
+		rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
+		rubygem-pango>=${PORTVERSION}:x11-toolkits/rubygem-pango
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/graphics/rubygem-dragonfly/Makefile b/graphics/rubygem-dragonfly/Makefile
index 7596c5998347..0696a1bf4003 100644
--- a/graphics/rubygem-dragonfly/Makefile
+++ b/graphics/rubygem-dragonfly/Makefile
@@ -13,9 +13,9 @@ COMMENT=	On-the-fly Rack-based image handling framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack16>=1.3.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-rack16>=1.3.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/graphics/rubygem-emoji/Makefile b/graphics/rubygem-emoji/Makefile
index 006a5f8d2ee7..c85f53963719 100644
--- a/graphics/rubygem-emoji/Makefile
+++ b/graphics/rubygem-emoji/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby gem for emoji
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-json>=0:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=0:devel/rubygem-json
 
 NO_ARCH=	yes
 
diff --git a/graphics/rubygem-ezprint/Makefile b/graphics/rubygem-ezprint/Makefile
index 4ba78b4ef140..0f693a89cc2a 100644
--- a/graphics/rubygem-ezprint/Makefile
+++ b/graphics/rubygem-ezprint/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Rails wrapper for the PDFKit library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-pdfkit>=0.5.0:${PORTSDIR}/graphics/rubygem-pdfkit
+RUN_DEPENDS=	rubygem-pdfkit>=0.5.0:graphics/rubygem-pdfkit
 
 NO_ARCH=	yes
 
diff --git a/graphics/rubygem-fastimage/Makefile b/graphics/rubygem-fastimage/Makefile
index 5324b3eb4900..9e509ec92d63 100644
--- a/graphics/rubygem-fastimage/Makefile
+++ b/graphics/rubygem-fastimage/Makefile
@@ -12,7 +12,7 @@ COMMENT=	FastImage finds the size or type of an image
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3.5:${PORTSDIR}/www/rubygem-addressable
+RUN_DEPENDS=	rubygem-addressable>=2.3.5:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/graphics/rubygem-flamegraph/Makefile b/graphics/rubygem-flamegraph/Makefile
index 90d3369c6735..ba25d62ed0e1 100644
--- a/graphics/rubygem-flamegraph/Makefile
+++ b/graphics/rubygem-flamegraph/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Flamegraph support for arbitrary ruby apps
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-fast_stack>=0:${PORTSDIR}/devel/rubygem-fast_stack
+RUN_DEPENDS=	rubygem-fast_stack>=0:devel/rubygem-fast_stack
 
 NO_ARCH=	yes
 
diff --git a/graphics/rubygem-gd2/Makefile b/graphics/rubygem-gd2/Makefile
index 56b7108799d4..779ba3df16eb 100644
--- a/graphics/rubygem-gd2/Makefile
+++ b/graphics/rubygem-gd2/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby interface to gd 2 library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 NO_ARCH=	yes
 
diff --git a/graphics/rubygem-gdk_pixbuf2/Makefile b/graphics/rubygem-gdk_pixbuf2/Makefile
index e9a64648b32a..038f2ba35436 100644
--- a/graphics/rubygem-gdk_pixbuf2/Makefile
+++ b/graphics/rubygem-gdk_pixbuf2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby binding for GdkPixbuf2
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2
+RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
 
 USE_GNOME=	gdkpixbuf2
 USE_RUBY=	yes
diff --git a/graphics/rubygem-gemojione/Makefile b/graphics/rubygem-gemojione/Makefile
index 67f499ac8600..5de26e1fd97b 100644
--- a/graphics/rubygem-gemojione/Makefile
+++ b/graphics/rubygem-gemojione/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Gem containing EmojiOne unicode/image assets
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-json>=0:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=0:devel/rubygem-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/graphics/rubygem-gitlab_emoji/Makefile b/graphics/rubygem-gitlab_emoji/Makefile
index a45b56497558..0fdbc5d44b73 100644
--- a/graphics/rubygem-gitlab_emoji/Makefile
+++ b/graphics/rubygem-gitlab_emoji/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Provides Gitlab Emoji assets
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-gemojione>=2.2.1:${PORTSDIR}/graphics/rubygem-gemojione
+RUN_DEPENDS=	rubygem-gemojione>=2.2.1:graphics/rubygem-gemojione
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/graphics/rubygem-goocanvas/Makefile b/graphics/rubygem-goocanvas/Makefile
index 357f8ea382b1..c679d238eb09 100644
--- a/graphics/rubygem-goocanvas/Makefile
+++ b/graphics/rubygem-goocanvas/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Ruby/GooCanvas is a Ruby binding of GooCanvas
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libgoocanvas-2.0.so:${PORTSDIR}/graphics/goocanvas2
-RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection \
-		rubygem-gtk3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk3
+LIB_DEPENDS=	libgoocanvas-2.0.so:graphics/goocanvas2
+RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
+		rubygem-gtk3>=${PORTVERSION}:x11-toolkits/rubygem-gtk3
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/graphics/rubygem-gruff/Makefile b/graphics/rubygem-gruff/Makefile
index e38698862a05..32c27b25e533 100644
--- a/graphics/rubygem-gruff/Makefile
+++ b/graphics/rubygem-gruff/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Beautiful graphing library for Ruby using RMagick
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-rmagick>=2.13.4:${PORTSDIR}/graphics/rubygem-rmagick
+RUN_DEPENDS=	rubygem-rmagick>=2.13.4:graphics/rubygem-rmagick
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/graphics/rubygem-image_science/Makefile b/graphics/rubygem-image_science/Makefile
index d4cc0d7a0618..a1b217dd24aa 100644
--- a/graphics/rubygem-image_science/Makefile
+++ b/graphics/rubygem-image_science/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby library that generates thumbnails
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rubyinline>=3.9:${PORTSDIR}/devel/rubygem-rubyinline
+RUN_DEPENDS=	rubygem-rubyinline>=3.9:devel/rubygem-rubyinline
 
 NO_ARCH=	yes
 
diff --git a/graphics/rubygem-mini_magick/Makefile b/graphics/rubygem-mini_magick/Makefile
index 5f95b3a3381a..82ecb8749dff 100644
--- a/graphics/rubygem-mini_magick/Makefile
+++ b/graphics/rubygem-mini_magick/Makefile
@@ -19,7 +19,7 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-X11_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
-X11_RUN_DEPENDS_OFF=	convert:${PORTSDIR}/graphics/ImageMagick-nox11
+X11_RUN_DEPENDS=	convert:graphics/ImageMagick
+X11_RUN_DEPENDS_OFF=	convert:graphics/ImageMagick-nox11
 
 .include <bsd.port.mk>
diff --git a/graphics/rubygem-objectdetect/Makefile b/graphics/rubygem-objectdetect/Makefile
index 53586cb290d6..f507cbc398cc 100644
--- a/graphics/rubygem-objectdetect/Makefile
+++ b/graphics/rubygem-objectdetect/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple library for detecting objects in pictures
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libopencv_legacy.so:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
 
 USES=		pkgconfig
 USE_RUBY=	yes
diff --git a/graphics/rubygem-pdfkit/Makefile b/graphics/rubygem-pdfkit/Makefile
index f2b96bac7820..2ad4861ac191 100644
--- a/graphics/rubygem-pdfkit/Makefile
+++ b/graphics/rubygem-pdfkit/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Uses wkhtmltopdf to create PDFs using HTML
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	wkhtmltopdf:${PORTSDIR}/converters/wkhtmltopdf
+RUN_DEPENDS=	wkhtmltopdf:converters/wkhtmltopdf
 
 NO_ARCH=	yes
 
diff --git a/graphics/rubygem-png/Makefile b/graphics/rubygem-png/Makefile
index d8388d0bb03a..c48bb53ba8b7 100644
--- a/graphics/rubygem-png/Makefile
+++ b/graphics/rubygem-png/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Almost-pure-ruby PNG library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rubyinline>=3.9:${PORTSDIR}/devel/rubygem-rubyinline
+RUN_DEPENDS=	rubygem-rubyinline>=3.9:devel/rubygem-rubyinline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/graphics/rubygem-rmagick/Makefile b/graphics/rubygem-rmagick/Makefile
index bdaf93321417..7ae970c11dde 100644
--- a/graphics/rubygem-rmagick/Makefile
+++ b/graphics/rubygem-rmagick/Makefile
@@ -18,7 +18,7 @@ USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 USES=		pkgconfig
 
-X11_LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
-X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11
+X11_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
+X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:graphics/ImageMagick-nox11
 
 .include <bsd.port.mk>
diff --git a/graphics/rubygem-rsvg2/Makefile b/graphics/rubygem-rsvg2/Makefile
index 8ee7a5fb7900..ee81f01c6ee1 100644
--- a/graphics/rubygem-rsvg2/Makefile
+++ b/graphics/rubygem-rsvg2/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby binding for librsvg2
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-cairo>=1.12.8:${PORTSDIR}/graphics/rubygem-cairo \
-		rubygem-gdk_pixbuf2>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-gdk_pixbuf2
+RUN_DEPENDS=	rubygem-cairo>=1.12.8:graphics/rubygem-cairo \
+		rubygem-gdk_pixbuf2>=${PORTVERSION}:graphics/rubygem-gdk_pixbuf2
 
 USE_GNOME=	librsvg2
 USE_RUBY=	yes
diff --git a/graphics/rubygem-ruby-graphviz/Makefile b/graphics/rubygem-ruby-graphviz/Makefile
index 9011e63edb9a..a836719c150e 100644
--- a/graphics/rubygem-ruby-graphviz/Makefile
+++ b/graphics/rubygem-ruby-graphviz/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby Interface to the GraphViz Graphing Tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gxl2dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	${LOCALBASE}/bin/gxl2dot:graphics/graphviz
 
 NO_ARCH=	yes
 
diff --git a/graphics/s2tc/Makefile b/graphics/s2tc/Makefile
index 6e8b5ca11dcb..9a3920244e91 100644
--- a/graphics/s2tc/Makefile
+++ b/graphics/s2tc/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Subset of a well-known texture compression scheme
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	libGL>=9.1.7:${PORTSDIR}/graphics/libGL
-TEST_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
-		nvcompress:${PORTSDIR}/graphics/nvidia-texture-tools \
-		wget:${PORTSDIR}/ftp/wget
+BUILD_DEPENDS=	libGL>=9.1.7:graphics/libGL
+TEST_DEPENDS=	convert:graphics/ImageMagick \
+		nvcompress:graphics/nvidia-texture-tools \
+		wget:ftp/wget
 
 USES=		autoreconf libtool pathfix
 USE_GITHUB=	yes
diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile
index 1594c0e3527b..6b8a404564f1 100644
--- a/graphics/sam2p/Makefile
+++ b/graphics/sam2p/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Converts raster (bitmap) image formats into PS or PDF files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		tif22pnm:${PORTSDIR}/graphics/tif22pnm
+RUN_DEPENDS=	zip:archivers/zip \
+		tif22pnm:graphics/tif22pnm
 
 USES=		ghostscript:run gmake jpeg:run perl5
 USE_PERL5=	build
diff --git a/graphics/sampleicc/Makefile b/graphics/sampleicc/Makefile
index 2181ca872285..a65397749c77 100644
--- a/graphics/sampleicc/Makefile
+++ b/graphics/sampleicc/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	The ICC Software License, Version 0.2
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 GNU_CONFIGURE=	yes
 USES=	libtool pathfix
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index fd7c06bb0e42..867c91fb83c7 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -12,7 +12,7 @@ COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 USES=		gmake libtool localbase pathfix pkgconfig
 GNU_CONFIGURE=	yes
@@ -36,22 +36,22 @@ OPTIONS_DEFINE=		AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
 OPTIONS_DEFAULT=	USB
 OPTIONS_SUB=		yes
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
-GPHOTO_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 GPHOTO_CONFIGURE_OFF=	--with-gphoto2=no
 IEEE1284_DESC=		Parallel port support via libieee1284
-IEEE1284_LIB_DEPENDS=	libieee1284.so:${PORTSDIR}/sysutils/libieee1284
+IEEE1284_LIB_DEPENDS=	libieee1284.so:sysutils/libieee1284
 IEEE1284_CONFIGURE_ENV_OFF=	sane_cv_use_libieee1284=no
 IPV6_CONFIGURE_ENABLE=	ipv6
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	translations
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=	snmp
 USB_DESC=		USB support
 USB_CONFIGURE_ON=	--enable-libusb_1_0
 USB_CONFIGURE_OFF=	--enable-libusb=no
-V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
+V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
 V4L_CONFIGURE_WITH=	v4l
 
 post-patch:
diff --git a/graphics/sane-epkowa/Makefile b/graphics/sane-epkowa/Makefile
index 680575863f2d..9d0562e452d2 100644
--- a/graphics/sane-epkowa/Makefile
+++ b/graphics/sane-epkowa/Makefile
@@ -56,11 +56,11 @@ COMMENT=	The sane-epkowa driver for FreeBSD
 WRKSRC=${WRKDIR}/iscan-${PORTVERSION}
 
 # We use LIB_DEPENDS, but the dependency is also at build time
-LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl
-LIB_DEPENDS+=	libgetline.so:${PORTSDIR}/devel/libgetline
-LIB_DEPENDS+=	libsane.so:${PORTSDIR}/graphics/sane-backends
+LIB_DEPENDS+=	libltdl.so:devel/libltdl
+LIB_DEPENDS+=	libgetline.so:devel/libgetline
+LIB_DEPENDS+=	libsane.so:graphics/sane-backends
 
-#BUILD_DEPENDS+=	${LOCALBASE}/lib/libltdl.so:${PORTSDIR}/devel/libltdl
+#BUILD_DEPENDS+=	${LOCALBASE}/lib/libltdl.so:devel/libltdl
 
 # gtk libraries are used by the frontend, which we do not build, however
 # the configure script relies on that and fails if not present, so as
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 9481a6c6420f..570918be29c9 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tools for access to scanners, digitals camera, frame grabbers etc
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libsane.so:${PORTSDIR}/graphics/sane-backends
+LIB_DEPENDS=	libsane.so:graphics/sane-backends
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--disable-gimp
 .else
 USE_GNOME+=	gtk20
 .if ${PORT_OPTIONS:MGIMP}
-LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS+=	libgimp-2.0.so:graphics/gimp-app
 CONFIGURE_ARGS+=	--enable-gimp
 .else
 CONFIGURE_ARGS+=	--disable-gimp
diff --git a/graphics/scale2x/Makefile b/graphics/scale2x/Makefile
index 8301446274fb..dd5d9ceed99d 100644
--- a/graphics/scale2x/Makefile
+++ b/graphics/scale2x/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Real-time graphics effect able to increase the size of small bitmaps
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile
index 6a673ed43dae..93778647a832 100644
--- a/graphics/scantailor/Makefile
+++ b/graphics/scantailor/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Interactive post-processing tool for scanned pages
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libpng.so:${PORTSDIR}/graphics/png
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libjbig.so:graphics/jbigkit \
+		libpng.so:graphics/png
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USES=		cmake gettext jpeg
 USE_GCC=	yes
@@ -43,7 +43,7 @@ PORTDOCS=	*
 .endif
 
 .if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 .endif
 
 post-patch:
diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile
index 7ce323a3b9d4..ae0ab3378c7c 100644
--- a/graphics/scr2png/Makefile
+++ b/graphics/scr2png/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/nik
 MAINTAINER=	eadler@FreeBSD.org
 COMMENT=	Converts the output of "vidcontrol -p" to PNG
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 NO_WRKSUBDIR=	yes
 USES=		uidfix
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index bfb43eb6ba54..41fea08a4ff4 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://linuxbrit.co.uk/downloads/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Screen capture utility that utilizes Imlib2
 
-LIB_DEPENDS=	libgiblib.so:${PORTSDIR}/graphics/giblib
+LIB_DEPENDS=	libgiblib.so:graphics/giblib
 
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/sdl2_image/Makefile b/graphics/sdl2_image/Makefile
index e60f02e1ecc5..963ac3ae43be 100644
--- a/graphics/sdl2_image/Makefile
+++ b/graphics/sdl2_image/Makefile
@@ -24,11 +24,11 @@ OPTIONS_DEFAULT=JPEG PNG TIFF WEBP
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpg
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	png
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_ENABLE=	tif
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=	webp
 
 .include <bsd.port.mk>
diff --git a/graphics/sdl2_ttf/Makefile b/graphics/sdl2_ttf/Makefile
index 7c1f11794fde..5d5bb1c213d8 100644
--- a/graphics/sdl2_ttf/Makefile
+++ b/graphics/sdl2_ttf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library to use TrueType fonts to render text in SDL applications
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		pkgconfig:build pathfix gmake libtool
 USE_SDL=	sdl2
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index 43fc51c267ae..d8513f3e075f 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -25,11 +25,11 @@ OPTIONS_DEFAULT=JPEG PNG TIFF WEBP
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpg
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	png
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_ENABLE=	tif
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=	webp
 
 post-install:
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 29443d7d48d5..de17be4db491 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library to use TrueType fonts to render text in SDL applications
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		gmake iconv libtool pathfix pkgconfig
 USE_SDL=	sdl
diff --git a/graphics/sdump/Makefile b/graphics/sdump/Makefile
index 212da4cf739a..78828335093d 100644
--- a/graphics/sdump/Makefile
+++ b/graphics/sdump/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Sixel image dumper
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libsixel.so:${PORTSDIR}/graphics/libsixel
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libsixel.so:graphics/libsixel
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uobikiemukot
diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile
index 627ba6386b12..fe510b98dcfd 100644
--- a/graphics/seejpeg/Makefile
+++ b/graphics/seejpeg/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SUNSITE/apps/graphics/viewers/svga
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console graphics viewer using the svga console graphics library
 
-LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS=	libvga.so:graphics/svgalib
 
 USES=		gmake jpeg tar:tgz
 ALL_TARGET=	seejpeg
diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile
index 038071035091..7394a3b18a09 100644
--- a/graphics/seexpr/Makefile
+++ b/graphics/seexpr/Makefile
@@ -31,7 +31,7 @@ CMAKE_ARGS+=	-DUSE_SSE41:BOOL=ON
 
 # base flex(1) v2.5.4 is not sufficient
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 .endif
 
 post-patch:
diff --git a/graphics/seom/Makefile b/graphics/seom/Makefile
index a7a732e079b2..4c4f5053594e 100644
--- a/graphics/seom/Makefile
+++ b/graphics/seom/Makefile
@@ -25,7 +25,7 @@ MAKE_ENV=	DATADIR="${DATADIR}"
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
-BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS+=	yasm:devel/yasm
 .endif
 
 post-patch:
@@ -41,7 +41,7 @@ post-install:
 # To roll snapshot: as bms: make BOOTSTRAP=defined fetch
 #
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 SVN_REV=	196		# svn tip at epoch 2009120801
 SVNROOT_URI=	https://devel.neopsis.com/svn/seom
 
diff --git a/graphics/separate/Makefile b/graphics/separate/Makefile
index bb725ecddd51..9a8f69b72546 100644
--- a/graphics/separate/Makefile
+++ b/graphics/separate/Makefile
@@ -15,9 +15,9 @@ COMMENT=	CMYK plugin for The GIMP
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep
-LIB_DEPENDS=	liblcms.so.1:${PORTSDIR}/graphics/lcms \
-		libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+BUILD_DEPENDS=	gccmakedep:devel/gccmakedep
+LIB_DEPENDS=	liblcms.so.1:graphics/lcms \
+		libgimp-2.0.so:graphics/gimp-app
 
 USES=		gettext-tools gmake pkgconfig zip
 
diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile
index c4047896274c..e898d2a79f83 100644
--- a/graphics/sharpconstruct/Makefile
+++ b/graphics/sharpconstruct/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/sharp3d/SharpConstruct/${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D modeller for organic shapes
 
-LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:${PORTSDIR}/x11-toolkits/gtkglextmm \
-		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24
+LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm \
+		libglademm-2.4.so:devel/libglademm24
 
 USES=		tar:bzip2 gmake pkgconfig
 USE_GL=		yes
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index f3d6aae8f80a..c44421500257 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Open source photo manager for GNOME
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vala>=0.20.1:${PORTSDIR}/lang/vala \
-		bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \
-		libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
-		libraw.so:${PORTSDIR}/graphics/libraw \
-		librest-0.7.so:${PORTSDIR}/devel/librest
+BUILD_DEPENDS=	vala>=0.20.1:lang/vala \
+		bash:shells/bash
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libgee-0.8.so:devel/libgee \
+		libjson-glib-1.0.so:devel/json-glib \
+		libsoup-2.4.so:devel/libsoup \
+		libgexiv2.so:graphics/gexiv2 \
+		libexif.so:graphics/libexif \
+		libgphoto2.so:graphics/libgphoto2 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libunique-1.0.so:x11-toolkits/unique \
+		libraw.so:graphics/libraw \
+		librest-0.7.so:devel/librest
 
 USES=		shebangfix gettext desktop-file-utils gmake pkgconfig sqlite \
 		tar:xz
diff --git a/graphics/silgraphite/Makefile b/graphics/silgraphite/Makefile
index ce90b8161f85..9ee5547fef9c 100644
--- a/graphics/silgraphite/Makefile
+++ b/graphics/silgraphite/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 USES=		libtool pathfix pkgconfig
 
 FREETYPE_CONFIGURE_WITH=freetype
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_USES=		iconv
 
 .include <bsd.port.mk>
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 83b0bc161717..619a7ab15c0e 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -16,11 +16,11 @@ LICENSE_NAME_unknown=	mpeg2enc
 LICENSE_TEXT_unknown=	${FILESDIR}/LICENSE.mpeg2enc
 LICENSE_PERMS_unknown=	no-dist-sell no-pkg-sell
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libvorbis.so:audio/libvorbis \
+		libjasper.so:graphics/jasper \
+		libgif.so:graphics/giflib \
+		libpng.so:graphics/png
 
 USES=		jpeg libtool pathfix
 GNU_CONFIGURE=	yes
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index fb01b3f0c2cb..52fe56904b69 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Small and simple OpenGL image viewer with transparency support
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libgif.so:graphics/giflib \
+		libImlib2.so:graphics/imlib2
 
 USES=		jpeg tar:bzip2
 USE_GL=		glut
diff --git a/graphics/sk1libs/Makefile b/graphics/sk1libs/Makefile
index 58b5c39365e5..deb4262c7c1a 100644
--- a/graphics/sk1libs/Makefile
+++ b/graphics/sk1libs/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	GOOGLE_CODE \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Set of python libraries for sK1 Project
 
-LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	liblcms.so:graphics/lcms \
+		libfreetype.so:print/freetype2
 
 PROJECTHOST=	uniconvertor
 
diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile
index b66f725615ec..d6e089ba3a68 100644
--- a/graphics/skanlite/Makefile
+++ b/graphics/skanlite/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/extragear
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Simple image scanning application for KDE
 
-LIB_DEPENDS=	libksane.so:${PORTSDIR}/graphics/libksane
+LIB_DEPENDS=	libksane.so:graphics/libksane
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
diff --git a/graphics/springgraph/Makefile b/graphics/springgraph/Makefile
index d4f80d9e87c2..cbee6ced8c22 100644
--- a/graphics/springgraph/Makefile
+++ b/graphics/springgraph/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.pl
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Render graph described in a .dot file
 
-RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD
 
 CONFLICTS_INSTALL=signing-party-[0-9]*
 
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index 56eee2a74e5a..29094baa8966 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library and script language tool to create Flash movies
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/graphics/svg2pdf/Makefile b/graphics/svg2pdf/Makefile
index a7775ef3942b..180f0c279ab0 100644
--- a/graphics/svg2pdf/Makefile
+++ b/graphics/svg2pdf/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://cairographics.org/snapshots/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Render an SVG image to a PDF file (using cairo)
 
-LIB_DEPENDS=	libsvg-cairo.so:${PORTSDIR}/graphics/libsvg-cairo
+LIB_DEPENDS=	libsvg-cairo.so:graphics/libsvg-cairo
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/graphics/svg2png/Makefile b/graphics/svg2png/Makefile
index 396e9d3a29d8..45557cbf8bb9 100644
--- a/graphics/svg2png/Makefile
+++ b/graphics/svg2png/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://cairographics.org/snapshots/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Render an SVG image to a PNG image (using cairo)
 
-LIB_DEPENDS=	libsvg-cairo.so:${PORTSDIR}/graphics/libsvg-cairo
+LIB_DEPENDS=	libsvg-cairo.so:graphics/libsvg-cairo
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index cb0bb164d965..ff6db386976b 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec/0.8/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flash Rendering Library
 
-LIB_DEPENDS=	liboil-0.3.so:${PORTSDIR}/devel/liboil \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	liboil-0.3.so:devel/liboil \
+		libsoup-2.4.so:devel/libsoup
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -31,7 +31,7 @@ PULSEAUDIO_DESC=Enable the PulseAudio sound module
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=		libpulse.so:audio/pulseaudio
 CONFIGURE_ARGS+=	--with-audio=pulse
 .else
 CONFIGURE_ARGS+=	--with-audio=oss
diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile
index 12fde2cc1cdc..ab1f3bd7f961 100644
--- a/graphics/swfmill/Makefile
+++ b/graphics/swfmill/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tool to generate or decompile Adobe Flash SWF files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		dos2unix iconv gmake pkgconfig libtool
 USE_GNOME=	libxml2 libxslt
diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile
index b881f99a0325..54d2bcb33856 100644
--- a/graphics/swftools/Makefile
+++ b/graphics/swftools/Makefile
@@ -13,11 +13,11 @@ COMMENT=	SWF manipulation and generation utilities
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libt1.so:${PORTSDIR}/devel/t1lib \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libt1.so:devel/t1lib \
+		libgif.so:graphics/giflib \
+		libfftw3.so:math/fftw3 \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		gmake pkgconfig jpeg
 USE_GL=		glut
@@ -37,8 +37,8 @@ BINFILES=	as3compile font2swf gif2swf jpeg2swf pdf2swf png2swf \
 
 OPTIONS_DEFINE=	LAME PDF
 OPTIONS_SUB=	yes
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
-PDF_LIB_DEPENDS=	libpdf.so:${PORTSDIR}/print/pdflib
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
+PDF_LIB_DEPENDS=	libpdf.so:print/pdflib
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile
index ffa93cb94a1f..d6150b9ae7ca 100644
--- a/graphics/sxiv/Makefile
+++ b/graphics/sxiv/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Lightweight image viewer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2 \
-		libexif.so:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
+		libexif.so:graphics/libexif
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	muennich
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 729486777c7f..3d2cfffc8798 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Vector-based 2D animation software package
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	etl>=0.04.19_1:${PORTSDIR}/devel/etl
-LIB_DEPENDS=	libsynfig.so:${PORTSDIR}/devel/synfig
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	etl>=0.04.19_1:devel/etl
+LIB_DEPENDS=	libsynfig.so:devel/synfig
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		desktop-file-utils gmake libtool pathfix pkgconfig shared-mime-info
 USE_GNOME=	gtkmm30 intltool
@@ -29,7 +29,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE=	DOCS JACK NLS
 OPTIONS_SUB=	yes
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack
 
 NLS_USES=		gettext
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 4d4d2606c346..b60cde7ef199 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tool to draw pictures on your root window
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libgcrypt.so:security/libgcrypt \
+		libImlib2.so:graphics/imlib2
 
 USES=		gmake
 
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 159f95b26356..a721cc186a19 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -15,7 +15,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	liblept.so:${PORTSDIR}/graphics/leptonica
+LIB_DEPENDS=	liblept.so:graphics/leptonica
 
 DIST_SUBDIR=	${PORTNAME}
 PROJECTHOST=	tesseract-ocr
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 9b597fda8a8b..cd502606b1b5 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -18,7 +18,7 @@ LICENSE_NAME=	Q PUBLIC LICENSE v1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE.QPL
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	giftopnm:graphics/netpbm
 
 OPTIONS_DEFINE=	NLS A4SIZE DOCS
 A4SIZE_DESC=	Set default paper size to A4
diff --git a/graphics/tif22pnm/Makefile b/graphics/tif22pnm/Makefile
index b313b14fc86d..275be7ea6737 100644
--- a/graphics/tif22pnm/Makefile
+++ b/graphics/tif22pnm/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Converts TIFF-sampled images to PNM image
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 PROJECTHOST=	sam2p
 USES=		pkgconfig
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 3001059a5601..16c8efb827a1 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tools and library routines for working with TIFF images
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libjbig.so:${PORTSDIR}/graphics/jbigkit
+LIB_DEPENDS=	libjbig.so:graphics/jbigkit
 
 USES=		cpe jpeg libtool
 CPE_PRODUCT=	libtiff
diff --git a/graphics/tiffgt/Makefile b/graphics/tiffgt/Makefile
index af958c478a6d..df856ba504ad 100644
--- a/graphics/tiffgt/Makefile
+++ b/graphics/tiffgt/Makefile
@@ -13,8 +13,8 @@ COMMENT=	X11 Tools for working with TIFF images
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libjbig.so:graphics/jbigkit \
+		libtiff.so:graphics/tiff
 
 USES=		cpe jpeg libtool
 CPE_PRODUCT=	libtiff
diff --git a/graphics/tilecache/Makefile b/graphics/tilecache/Makefile
index 71b0271d3054..1f157fe0a44e 100644
--- a/graphics/tilecache/Makefile
+++ b/graphics/tilecache/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://tilecache.org/
 MAINTAINER=	joris.dedieu@gmail.com
 COMMENT=	Python-based WMS-C/TMS server
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup \
-		${PYTHON_PKGNAMEPREFIX}Paste>0:${PORTSDIR}/www/py-paste
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup \
+		${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste
 
 LICENSE=	BSD3CLAUSE MIT
 LICENSE_COMB=	multi
diff --git a/graphics/tinyows/Makefile b/graphics/tinyows/Makefile
index c354bb7a7a94..dc3a8cac1d52 100644
--- a/graphics/tinyows/Makefile
+++ b/graphics/tinyows/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=		http://download.osgeo.org/mapserver/
 MAINTAINER=		joris.dedieu@gmail.com
 COMMENT=		High Performance WFS-T server
 
-LIB_DEPENDS=		libxml2.so:${PORTSDIR}/textproc/libxml2
-BUILD_DEPENDS=		${LOCALBASE}/lib/postgresql/postgis-2.1.so:${PORTSDIR}/databases/postgis21
+LIB_DEPENDS=		libxml2.so:textproc/libxml2
+BUILD_DEPENDS=		${LOCALBASE}/lib/postgresql/postgis-2.1.so:databases/postgis21
 
 USES=		tar:bzip2
 GNU_CONFIGURE=		YES
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=	FASTCGI
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFASTCGI}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/cgi-fcgi:${PORTSDIR}/www/fcgi
+BUILD_DEPENDS+=	${LOCALBASE}/bin/cgi-fcgi:www/fcgi
 CONFIGURE_ARGS+=	--with-fastcgi=${LOCALBASE}
 .endif
 
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index 77013e8de94c..1eb49ea227b6 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GNOME 3D modeler
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
diff --git a/graphics/ttygif/Makefile b/graphics/ttygif/Makefile
index 9c0f4609e8bb..6ebb28868594 100644
--- a/graphics/ttygif/Makefile
+++ b/graphics/ttygif/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Converts a ttyrec file into animated gif
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icholy
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 1ac7e0075bce..faf528fbcad5 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -12,10 +12,10 @@ COMMENT=	System dedicated to the visualization of huge graphs
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libquazip.so:${PORTSDIR}/archivers/quazip \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libOGDF.so:${PORTSDIR}/math/ogdf \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libquazip.so:archivers/quazip \
+		libpng.so:graphics/png \
+		libOGDF.so:math/ogdf \
+		libfreetype.so:print/freetype2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-
 
diff --git a/graphics/tumble/Makefile b/graphics/tumble/Makefile
index fa40c2a2d6cd..6ae5b33b9387 100644
--- a/graphics/tumble/Makefile
+++ b/graphics/tumble/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Creates a PDF file from image files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libnetpbm.so:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libnetpbm.so:graphics/netpbm
 
 USES=		bison gmake
 
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index 99258f86d906..92f37809deea 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Read and manipulate raw images from various digital cameras
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		liblcms2.so:graphics/lcms2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --enable-extras
@@ -43,25 +43,25 @@ CONFIGURE_ARGS+=	--enable-dst-correction
 .endif
 
 .if ${PORT_OPTIONS:MEXIV2}
-LIB_DEPENDS+=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS+=	libexiv2.so:graphics/exiv2
 .else
 PC_FALSE+=	exiv2
 .endif
 
 .if ${PORT_OPTIONS:MLENSFUN}
-LIB_DEPENDS+=	liblensfun.so:${PORTSDIR}/graphics/lensfun
+LIB_DEPENDS+=	liblensfun.so:graphics/lensfun
 .else
 PC_FALSE+=	lensfun
 .endif
 
 .if ${PORT_OPTIONS:MFITS}
-LIB_DEPENDS+=	libcfitsio.so:${PORTSDIR}/astro/cfitsio
+LIB_DEPENDS+=	libcfitsio.so:astro/cfitsio
 .else
 PC_FALSE+=	cfitsio
 .endif
 
 .if ${PORT_OPTIONS:MGIMP}
-LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS+=	libgimp-2.0.so:graphics/gimp-app
 PLIST_SUB+=	GIMP=""
 .else
 CONFIGURE_ARGS+=--without-gimp
@@ -70,7 +70,7 @@ PLIST_SUB+=	GIMP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
-LIB_DEPENDS+=	libgtkimageview.so:${PORTSDIR}/x11-toolkits/gtkimageview
+LIB_DEPENDS+=	libgtkimageview.so:x11-toolkits/gtkimageview
 PLIST_SUB+=	MGTK2=""
 .else
 PLIST_SUB+=	MGTK2="@comment "
diff --git a/graphics/uniconvertor/Makefile b/graphics/uniconvertor/Makefile
index 458db1aa6897..8d6624fc97c9 100644
--- a/graphics/uniconvertor/Makefile
+++ b/graphics/uniconvertor/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GOOGLE_CODE \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Universal vector graphics translator
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sk1libs/__init__.py:${PORTSDIR}/graphics/sk1libs
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/graphics/uniconvw/Makefile b/graphics/uniconvw/Makefile
index bda4562d5041..63e3480dd9ee 100644
--- a/graphics/uniconvw/Makefile
+++ b/graphics/uniconvw/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	GOOGLE_CODE \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Gtk+ frontend for UniConvertor
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sk1libs/__init__.py:${PORTSDIR}/graphics/sk1libs \
-		${PYTHON_SITELIBDIR}/uniconvertor/__init__.py:${PORTSDIR}/graphics/uniconvertor \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs \
+		${PYTHON_SITELIBDIR}/uniconvertor/__init__.py:graphics/uniconvertor \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
 
 PROJECTHOST=	uniconvertor
 
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index cdb0da361458..84f9608e3d45 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -16,7 +16,7 @@ PATCH_DIST_STRIP=-p1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit and library for raster image processing
 
-LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile
index e2e32146f489..05e811ae91f2 100644
--- a/graphics/variety/Makefile
+++ b/graphics/variety/Makefile
@@ -14,28 +14,28 @@ COMMENT=	Wallpaper changer
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:${PORTSDIR}/devel/py-python-distutils-extra  \
-		intltool-update:${PORTSDIR}/textproc/intltool
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:${PORTSDIR}/graphics/py-cairo \
-		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:${PORTSDIR}/ftp/py-pycurl \
-		${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:${PORTSDIR}/graphics/py-exiv2 \
-		${PYTHON_PKGNAMEPREFIX}gobject3>=3.14.0:${PORTSDIR}/devel/py-gobject3 \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:${PORTSDIR}/www/py-httplib2 \
-		${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six \
-		ImageMagick>=6.9.0.4,1:${PORTSDIR}/graphics/ImageMagick \
-		bash>=4.3.33:${PORTSDIR}/shells/bash \
-		ca_root_nss>=3.17.4:${PORTSDIR}/security/ca_root_nss \
-		coreutils>=8.23:${PORTSDIR}/sysutils/coreutils \
-		gsettings:${PORTSDIR}/devel/glib20 \
-		notify-send:${PORTSDIR}/devel/libnotify \
-		pango>=1.36.8:${PORTSDIR}/x11-toolkits/pango \
-		webkit-gtk3>=2.4.8:${PORTSDIR}/www/webkit-gtk3 \
-		yelp>=3.14.1:${PORTSDIR}/x11/yelp
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra  \
+		intltool-update:textproc/intltool
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo \
+		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:ftp/py-pycurl \
+		${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:graphics/py-exiv2 \
+		${PYTHON_PKGNAMEPREFIX}gobject3>=3.14.0:devel/py-gobject3 \
+		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2 \
+		${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \
+		ImageMagick>=6.9.0.4,1:graphics/ImageMagick \
+		bash>=4.3.33:shells/bash \
+		ca_root_nss>=3.17.4:security/ca_root_nss \
+		coreutils>=8.23:sysutils/coreutils \
+		gsettings:devel/glib20 \
+		notify-send:devel/libnotify \
+		pango>=1.36.8:x11-toolkits/pango \
+		webkit-gtk3>=2.4.8:www/webkit-gtk3 \
+		yelp>=3.14.1:x11/yelp
 
 SHEBANG_FILES=	bin/variety data/scripts/*
 
diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile
index e486631d637f..370ad8e26cde 100644
--- a/graphics/viewnior/Makefile
+++ b/graphics/viewnior/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Fast and simple image viewer
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xsisqox
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 0c0286fc32b1..b56201dfbae5 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -30,14 +30,14 @@ NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
 
 .if ${PORT_OPTIONS:MHDF5}
 CMAKE_ARGS+=	-DWITH_HDF5=1
-LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5
+LIB_DEPENDS+=	libhdf5.so:science/hdf5
 .else
 CMAKE_ARGS+=	-DWITH_HDF5=0
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
 CMAKE_ARGS+=	-DWITH_OPENEXR=1
-LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=	libIlmImf.so:graphics/OpenEXR
 .else
 CMAKE_ARGS+=	-DWITH_OPENEXR=0
 .endif
@@ -47,10 +47,10 @@ CMAKE_ARGS+=	-DWITH_OPENEXR=0
 #CONFLICTS_BUILD=	python3*
 CMAKE_ARGS+=	-DWITH_VIGRANUMPY=1
 USES+=		compiler:gcc-c++11-lib python:2
-BUILD_DEPENDS+=	nosetests:${PORTSDIR}/devel/py-nose
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
-#BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS+=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+BUILD_DEPENDS+=	nosetests:devel/py-nose
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy
+#BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
+LIB_DEPENDS+=	libboost_python.so:devel/boost-python-libs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 PLIST_SUB+=	PYTHON=""
 .else
@@ -70,7 +70,7 @@ PLIST_SUB+=	PYTHON="@comment "
 # do not have graphics/tiff installed and do not want TIFF support in Vigra.
 
 .if !defined(WITHOUT_VIGRA_TIFF)
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libtiff.so:graphics/tiff
 .endif
 
 .if !defined(WITHOUT_VIGRA_JPEG)
@@ -78,12 +78,12 @@ USES+=		jpeg
 .endif
 
 .if !defined(WITHOUT_VIGRA_PNG)
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 .endif
 
 .if !defined(WITHOUT_VIGRA_FFTW)
-LIB_DEPENDS+=	libfftw3.so:${PORTSDIR}/math/fftw3
-LIB_DEPENDS+=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
+LIB_DEPENDS+=	libfftw3.so:math/fftw3
+LIB_DEPENDS+=	libfftw3f.so:math/fftw3-float
 .endif
 
 pre-everything::
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index a4bc939245fe..55bfb386f1c3 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Free image processing system
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio \
-		liborc-0.4.so:${PORTSDIR}/devel/orc \
-		libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libexif.so:${PORTSDIR}/graphics/libexif	\
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libwebp.so:${PORTSDIR}/graphics/webp \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libmatio.so:${PORTSDIR}/math/matio \
-		libgirepository-1.0.so:${PORTSDIR}/devel/gobject-introspection
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
+		liborc-0.4.so:devel/orc \
+		libGraphicsMagick.so:graphics/GraphicsMagick \
+		libIlmImf.so:graphics/OpenEXR \
+		liblcms2.so:graphics/lcms2 \
+		libexif.so:graphics/libexif	\
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libwebp.so:graphics/webp \
+		libfftw3.so:math/fftw3 \
+		libmatio.so:math/matio \
+		libgirepository-1.0.so:devel/gobject-introspection
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe gettext gmake jpeg libtool pathfix pkgconfig shebangfix
 SHEBANG_FILES=	tools/vips-${PORTVERSION:R} tools/vipsprofile
diff --git a/graphics/visprint/Makefile b/graphics/visprint/Makefile
index 977d8dd44007..69c1ead60815 100644
--- a/graphics/visprint/Makefile
+++ b/graphics/visprint/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.tastyrabbit.net/visprint/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates fractal fingerprint images based on any data
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lpng
diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile
index c464647a7e65..48c1452b54bd 100644
--- a/graphics/webp/Makefile
+++ b/graphics/webp/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Google WebP image format conversion tool
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	X11
 OPTIONS_SUB=	yes
diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile
index 64e0c86e2a3b..3c4069a84d67 100644
--- a/graphics/white_dune/Makefile
+++ b/graphics/white_dune/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	devel@stasyan.com
 COMMENT=	Graphical VRML97 editor and animation tool
 
 BROKEN=		unfetchable
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 LICENSE=	GPLv2
 
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index a2eb4ba597fb..41e3ccdee68a 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -16,8 +16,8 @@ LICENSE_NAME=	Wings 3D License # similar to TclTk license
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		erlang-esdl>0:${PORTSDIR}/devel/erlang-esdl
+BUILD_DEPENDS=	erl:lang/erlang \
+		erlang-esdl>0:devel/erlang-esdl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_ENV=	ESDL_PATH=${LOCALBASE}/lib/erlang/lib/esdl
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index e31bd9d8478e..6dfa851a60fd 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -11,8 +11,8 @@ COMMENT=	C++ library to create, manipulate, and render SVG files
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libexpat.so:textproc/expat2
 
 USES=		compiler:c++11-lib gmake libtool pathfix pkgconfig tar:bzip2
 USE_WX=		3.0
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index 45ff6cca0e92..b3d561d7bb3a 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/XaoS/${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Real-time fractal browser
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libgsl.so:math/gsl
 
 USES=		gmake
 GNU_CONFIGURE=	yes
@@ -23,7 +23,7 @@ DRIVER_DESC=	User Interface
 OPTIONS_DEFAULT=	X11
 OPTIONS_SUB=	yes
 
-AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_WITH=	aa-driver
 AALIB_CONFIGURE_ON=	ac_cv_aalib_ver_ok=yes
 
diff --git a/graphics/xcftools/Makefile b/graphics/xcftools/Makefile
index 960921a5b56c..4ff156aba260 100644
--- a/graphics/xcftools/Makefile
+++ b/graphics/xcftools/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://freeheimdall.spdns.org/files/
 MAINTAINER=	kalten@gmx.at
 COMMENT=	Command-line tools for extracting from XCF format (graphics/gimp)
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 # xcftools is under a public domain licence
 
@@ -41,8 +41,8 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	DOCS TESTS
 TESTS_DESC=	Run self-tests (faulty) (pulls in graphics/netpbm shells/bash)
 
-TEST_BUILD_DEPENDS=	pngtopnm:${PORTSDIR}/graphics/netpbm \
-			bash:${PORTSDIR}/shells/bash
+TEST_BUILD_DEPENDS=	pngtopnm:graphics/netpbm \
+			bash:shells/bash
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index 2d0cd5ae5528..dc69a9602cdf 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -29,10 +29,10 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .if !defined(WITHOUT_IMAGEMAGICK)
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .endif
 .if !defined(WITHOUT_GIFSICLE)
-RUN_DEPENDS+=	gifsicle:${PORTSDIR}/graphics/gifsicle
+RUN_DEPENDS+=	gifsicle:graphics/gifsicle
 .endif
 
 MASTER_SITES_BACKUP=	http://pompo.net/ports/
diff --git a/graphics/xface.el/Makefile b/graphics/xface.el/Makefile
index 505a2873c8f5..5fc7973f3324 100644
--- a/graphics/xface.el/Makefile
+++ b/graphics/xface.el/Makefile
@@ -18,7 +18,7 @@ COMMENT=	X-Face encoder/decoder/viewer for Emacsen
 
 EMACS_PORT_NAME?=	emacs24
 
-RUN_DEPENDS=	compface:${PORTSDIR}/mail/faces
+RUN_DEPENDS=	compface:mail/faces
 
 USE_EMACS=	yes
 
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 3a93a9f553f7..3ea593295ed4 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}.full
 MAINTAINER=	mjl@luckie.org.nz
 COMMENT=	Drawing program for X11
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
-RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libXaw3d.so:x11-toolkits/Xaw3d
+RUN_DEPENDS=	fig2dev:print/transfig
 
 CONFLICTS=	xfig-[12].* xfig-3.1* xfig-3.2.[1234]*
 
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index a9936facbacb..2cc0b498dcfe 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical interface to POV-Ray
 
-LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
-RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
+LIB_DEPENDS=	libforms.so:x11-toolkits/xforms
+RUN_DEPENDS=	povray:graphics/povray-meta
 
 USES=		tar:tgz uidfix
 USE_XORG=	x11 xext xpm
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 91444c22dfef..01d97fc21a87 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	xli_${PORTVERSION}+${XLI_SNAPVER:C/-//g}.orig
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Utilities to display images in X11
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 CONFLICTS_INSTALL=	xloadimage-*
 
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index a48e5889cfac..c22ebbaec93a 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -67,7 +67,7 @@ INW_CONFIGURE_ENABLE=	inw
 GIF_CONFIGURE_OFF=	--disable-gif
 
 PNG_CONFIGURE_ENABLE=	png
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/xnview/Makefile b/graphics/xnview/Makefile
index 92004097f030..578bff09e181 100644
--- a/graphics/xnview/Makefile
+++ b/graphics/xnview/Makefile
@@ -19,7 +19,7 @@ INSTALL_SLIB=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS+=	libc.so.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS+=	libc.so.5:misc/compat5x
 DISTFILES+=	NConvert-x86-unknown-FreeBSD6.x.tgz
 WRKSRC_NC=	${WRKDIR}/NConvert
 
diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index 4b6e0e6ec1e4..171dd690b5e2 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Notetaking application that can annotate PDFs
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 
 USES=		pkgconfig desktop-file-utils shared-mime-info
 USE_GNOME=	libgnomecanvas
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 0c807ce72a39..7f0e186c0953 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Simple paint program
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libXaw3dxft.so:${PORTSDIR}/x11-toolkits/libxaw3dxft
-RUN_DEPENDS=	psselect:${PORTSDIR}/print/psutils \
-		bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libopenjpeg.so:graphics/openjpeg15 \
+		libtiff.so:graphics/tiff \
+		libfreetype.so:print/freetype2 \
+		libjbig.so:graphics/jbigkit \
+		libXaw3dxft.so:x11-toolkits/libxaw3dxft
+RUN_DEPENDS=	psselect:print/psutils \
+		bash:shells/bash
 
 USE_XORG=	xft xmu xpm
 GNU_CONFIGURE=	yes
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 871bc3d73e31..99be5fc77b7e 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Display PDF files and convert them to other formats
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USES=		gmake cpe
@@ -39,9 +39,9 @@ OPTIONS_SUB=		yes
 
 SUB_FILES=	xpdf-man.conf
 
-TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
+TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:print/gsfonts
 
-LIBPAPER_LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
 LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \
 		--with-libpaper-includes="${LOCALBASE}/include"
 LIBPAPER_CONFIGURE_OFF=--without-libpaper-library
diff --git a/graphics/xpeps/Makefile b/graphics/xpeps/Makefile
index 729428c72df2..bb8accf50f8e 100644
--- a/graphics/xpeps/Makefile
+++ b/graphics/xpeps/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Converts EPS images to anti-aliased bitmaps with X11 support
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	peps>=2.0_6:${PORTSDIR}/graphics/peps
+RUN_DEPENDS=	peps>=2.0_6:graphics/peps
 
 USES=		ghostscript:x11,run
 MAKE_ENV=	GSPATH="${LOCALBASE}/bin/gs" GZPATH="/usr/bin/gzip" \
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 746d9fe02623..cb615bed1f5a 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Gtk-based X11 frontend for SANE (Scanner Access Now Easy)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		liblcms.so:${PORTSDIR}/graphics/lcms
-BUILD_DEPENDS=	scanimage:${PORTSDIR}/graphics/sane-backends
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libfreetype.so:print/freetype2 \
+		liblcms.so:graphics/lcms
+BUILD_DEPENDS=	scanimage:graphics/sane-backends
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake jpeg pkgconfig
@@ -34,7 +34,7 @@ OPTIONS_DEFAULT=	GIMP
 
 OPTIONS_SUB=	yes
 
-GIMP_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+GIMP_LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
 GIMP_CONFIGURE_ENABLE=	gimp2 gimp
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
diff --git a/graphics/xsvg/Makefile b/graphics/xsvg/Makefile
index f0dd3d974536..2416239da799 100644
--- a/graphics/xsvg/Makefile
+++ b/graphics/xsvg/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://cairographics.org/snapshots/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	X11 SVG viewer
 
-LIB_DEPENDS=	libsvg-cairo.so:${PORTSDIR}/graphics/libsvg-cairo
+LIB_DEPENDS=	libsvg-cairo.so:graphics/libsvg-cairo
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 34edde51fffe..43aa592bc13d 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -18,9 +18,9 @@ PATCHFILES=	xv-3.10a-enhancements.20070520-20081216.diff
 MAINTAINER?=	dinoex@FreeBSD.org
 COMMENT?=	X11 program that displays images of various formats
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libjasper.so:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libjasper.so:graphics/jasper
 
 USES=		imake jpeg
 USE_XORG=	xext x11 xt
diff --git a/graphics/yagf/Makefile b/graphics/yagf/Makefile
index bab91dcf2b40..7a3979ecfca0 100644
--- a/graphics/yagf/Makefile
+++ b/graphics/yagf/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Graphical interface for an OCR program (cuneiform and tesseract)
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	libaspell.so:textproc/aspell
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 OPTIONS_MULTI=		OCRENGINE
 OPTIONS_MULTI_OCRENGINE=CUNEIFORM TESSERACT
 CUNEIFORM_DESC=		Cuneiform OCR engine
-CUNEIFORM_RUN_DEPENDS=	cuneiform:${PORTSDIR}/graphics/cuneiform
+CUNEIFORM_RUN_DEPENDS=	cuneiform:graphics/cuneiform
 TESSERACT_DESC=		Tesseract OCR engine
-TESSERACT_RUN_DEPENDS=	tesseract:${PORTSDIR}/graphics/tesseract
+TESSERACT_RUN_DEPENDS=	tesseract:graphics/tesseract
 
 OPTIONS_DEFAULT=	CUNEIFORM
 
diff --git a/graphics/yukon/Makefile b/graphics/yukon/Makefile
index 7dd0c8ff02c9..c1b8ca776199 100644
--- a/graphics/yukon/Makefile
+++ b/graphics/yukon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Real-time capture tool for OpenGL applications
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libseom.so:${PORTSDIR}/graphics/seom
+LIB_DEPENDS=	libseom.so:graphics/seom
 
 USES=		gmake tar:bzip2
 USE_XORG=	x11 xv
@@ -31,7 +31,7 @@ PLIST_SUB+=	LIBGL_MAJOR="${LIBGL_MAJOR}" LIBX11_MAJOR="${LIBX11_MAJOR}"
 # To roll snapshot: as bms: make BOOTSTRAP=defined fetch
 #
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 SVN_REV=	158		# svn tip at epoch 2009120801
 SVNROOT_URI=	https://devel.neopsis.com/svn/yukon
 
diff --git a/graphics/zathura-cb/Makefile b/graphics/zathura-cb/Makefile
index 1aa16eb4fea1..d38d98bccc93 100644
--- a/graphics/zathura-cb/Makefile
+++ b/graphics/zathura-cb/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Comic book plugin for Zathura PDF viewer
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
-RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
+BUILD_DEPENDS=	zathura:graphics/zathura
+RUN_DEPENDS=	zathura:graphics/zathura
 
 PLIST_FILES=	lib/zathura/cb.so share/applications/zathura-cb.desktop
 
diff --git a/graphics/zathura-djvu/Makefile b/graphics/zathura-djvu/Makefile
index d14a7492ad73..cf105c793c5a 100644
--- a/graphics/zathura-djvu/Makefile
+++ b/graphics/zathura-djvu/Makefile
@@ -12,9 +12,9 @@ COMMENT=	DjVu support for zathura
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
-BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
-RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
+LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
+BUILD_DEPENDS=	zathura:graphics/zathura
+RUN_DEPENDS=	zathura:graphics/zathura
 
 PLIST_FILES=	lib/zathura/djvu.so share/applications/zathura-djvu.desktop
 
diff --git a/graphics/zathura-pdf-mupdf/Makefile b/graphics/zathura-pdf-mupdf/Makefile
index 1dab3bc3bbf2..ec64bab12246 100644
--- a/graphics/zathura-pdf-mupdf/Makefile
+++ b/graphics/zathura-pdf-mupdf/Makefile
@@ -12,11 +12,11 @@ COMMENT=	MuPDF render PDF plugin for Zathura PDF viewer
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura \
-		mupdf>=1.8,1:${PORTSDIR}/graphics/mupdf
-RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
-LIB_DEPENDS=	libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \
-		libopenjp2.so:${PORTSDIR}/graphics/openjpeg
+BUILD_DEPENDS=	zathura:graphics/zathura \
+		mupdf>=1.8,1:graphics/mupdf
+RUN_DEPENDS=	zathura:graphics/zathura
+LIB_DEPENDS=	libjbig2dec.so:graphics/jbig2dec \
+		libopenjp2.so:graphics/openjpeg
 
 PLIST_FILES=	lib/zathura/pdf.so share/applications/zathura-pdf-mupdf.desktop
 
diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile
index e20b15b9e413..9b1bf0d7ca43 100644
--- a/graphics/zathura-pdf-poppler/Makefile
+++ b/graphics/zathura-pdf-poppler/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Poppler render PDF plugin for Zathura PDF viewer
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
-RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
+BUILD_DEPENDS=	zathura:graphics/zathura
+RUN_DEPENDS=	zathura:graphics/zathura
 
 USE_GNOME=	glib20 gtk30
 USES=		compiler:c11 desktop-file-utils gmake pkgconfig
diff --git a/graphics/zathura-ps/Makefile b/graphics/zathura-ps/Makefile
index 1d4b4563d602..c35a34adf450 100644
--- a/graphics/zathura-ps/Makefile
+++ b/graphics/zathura-ps/Makefile
@@ -11,9 +11,9 @@ COMMENT=	PostScript support for Zathura PDF viewer
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libspectre.so:${PORTSDIR}/print/libspectre
-BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
-RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
+LIB_DEPENDS=	libspectre.so:print/libspectre
+BUILD_DEPENDS=	zathura:graphics/zathura
+RUN_DEPENDS=	zathura:graphics/zathura
 
 USES=		compiler:c11 desktop-file-utils gmake pkgconfig
 USE_GNOME=	glib20 gtk30
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index 3c3b6caf2ee1..133032de4534 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Customizable lightweight pdf viewer
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libgirara-gtk3.so:${PORTSDIR}/x11-toolkits/girara
-BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libgirara-gtk3.so:x11-toolkits/girara
+BUILD_DEPENDS+=	rst2html:textproc/py-docutils
 
 USE_GNOME=	glib20 gtk30
 USES=		compiler:c11 gmake pkgconfig
@@ -26,7 +26,7 @@ MAKE_ENV=	SFLAGS="${STRIP}" \
 OPTIONS_DEFINE=	NLS SQLITE
 OPTIONS_SUB=	yes
 
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 SQLITE_MAKE_ENV=	WITH_SQLITE=1
 SQLITE_MAKE_ENV_OFF=	WITH_SQLITE=0
 NLS_USES=		gettext
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index 4f178c0b755a..a981df8aeb2c 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -28,11 +28,11 @@ X11_USE=	XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
 X11_CONFIGURE_ON=	--with-x=yes
 X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick
 IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick=yes
 IMAGEMAGICK_CONFIGURE_OFF=	--with-imagemagick=no
 
-V4L_BUILD_DEPENDS=	v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat
+V4L_BUILD_DEPENDS=	v4l_compat>=1.0.20101027:multimedia/v4l_compat
 V4L_CONFIGURE_ON=	--enable-video=yes
 V4L_CONFIGURE_OFF=	--enable-video=no
 
diff --git a/graphics/zgv/Makefile b/graphics/zgv/Makefile
index f4a2589c7636..1fa600dd26b4 100644
--- a/graphics/zgv/Makefile
+++ b/graphics/zgv/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Graphics viewer for SVGAlib
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	SDL DOCS
 
@@ -32,7 +32,7 @@ MAKE_ENV+=	BACKEND=SDL
 CPPFLAGS+=	$$(${SDL_CONFIG} --cflags)
 LDFLAGS+=	$$(${SDL_CONFIG} --libs)
 .else
-LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvga.so:graphics/svgalib
 MAKE_ENV+=	BACKEND=SVGALIB
 ONLY_FOR_ARGS=	i386 amd64
 .endif
diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile
index a6b83de2d479..c33431b940c1 100644
--- a/graphics/zimg/Makefile
+++ b/graphics/zimg/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image-generator that uses ASCII input files to create PNGs/EDFs
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-dynaload-cc="${CC}" \
diff --git a/graphics/zint/Makefile b/graphics/zint/Makefile
index ee8aa36bf38c..6b3990521ca8 100644
--- a/graphics/zint/Makefile
+++ b/graphics/zint/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Zint Barcode Generator
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cmake
 USE_LDCONFIG=	yes
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index 5c8db229cab0..cdbcb6d34a6b 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -14,11 +14,11 @@ OPTIONS_DEFINE=	ZIP
 OPTIONS_DEFAULT=	ZIP
 ZIP_DESC=	Enable zip support
 
-LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming \
-		libpopt.so:${PORTSDIR}/devel/popt \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libming.so:graphics/ming \
+		libpopt.so:devel/popt \
+		libImlib2.so:graphics/imlib2
 
-ZIP_RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+ZIP_RUN_DEPENDS=	zip:archivers/zip
 ZIP_CONFIGURE_OFF=	--disable-zip
 
 GNU_CONFIGURE=	yes