Remove ${PORTSDIR}/ from dependencies, categories d, e, f, and g.

With hat: portmgr Sponsored by: Absolight
author: Mathieu Arnold <mat@FreeBSD.org> 2016-04-01 14:00:51 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2016-04-01 14:00:51 +0000
commit: 4e1b79a0a61f4973df8b4b0864d22086c769e219 (patch)
tree: 78ceaf1b099c56a40c240ab46278cdf4ae9e7c01 /databases
parent: Remove ${PORTSDIR}/ from dependencies, Mk and categories a, b, and c. (diff)
581 files changed, 1992 insertions, 1992 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
author	Mathieu Arnold <mat@FreeBSD.org>	2016-04-01 14:00:51 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2016-04-01 14:00:51 +0000
commit	4e1b79a0a61f4973df8b4b0864d22086c769e219 (patch)
tree	78ceaf1b099c56a40c240ab46278cdf4ae9e7c01 /databases
parent	Remove ${PORTSDIR}/ from dependencies, Mk and categories a, b, and c. (diff)