114 files changed, 331 insertions, 331 deletions

diff --git a/dns/adns/Makefile b/dns/adns/Makefile
index 1e700a5ac2e9..fe543922c02d 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -19,7 +19,7 @@ PORTSCOUT=	skipv:1.5.0~rc0,1.5.0~rc1
 LIBVERSION=	1
 PLIST_SUB+=	LIBVERSION="${LIBVERSION}"
 
-BUILD_DEPENDS+=		gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS+=		gm4:devel/m4
 CFLAGS+=		-Ds6_addr16=__u6_addr.__u6_addr16
 CFLAGS+=		-Ds6_addr32=__u6_addr.__u6_addr32
 MAKE_FLAGS+=		M4=gm4
diff --git a/dns/adsuck/Makefile b/dns/adsuck/Makefile
index 741b3e766ec5..c7d31f764ae4 100644
--- a/dns/adsuck/Makefile
+++ b/dns/adsuck/Makefile
@@ -14,8 +14,8 @@ COMMENT=	DNS relay for ad blocking
 
 LICENSE=	ISCL
 
-LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libldns.so:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	libevent.so:devel/libevent2 \
+		libldns.so:dns/ldns
 
 CFLAGS+= 	-I${LOCALBASE}/include
 
diff --git a/dns/autotrust/Makefile b/dns/autotrust/Makefile
index fe9cd4ca6b30..3fde5b9dff3e 100644
--- a/dns/autotrust/Makefile
+++ b/dns/autotrust/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.nlnetlabs.nl/downloads/autotrust/
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool to automatically update DNSSEC trust anchors
 
-LIB_DEPENDS+=	libldns.so:${PORTSDIR}/dns/ldns \
-		libunbound.so:${PORTSDIR}/dns/unbound
+LIB_DEPENDS+=	libldns.so:dns/ldns \
+		libunbound.so:dns/unbound
 
 GNU_CONFIGURE=	yes
 CFLAGS=		-I${LOCALBASE}/include
diff --git a/dns/axfr2acl/Makefile b/dns/axfr2acl/Makefile
index c4704599cda6..bcb6ca1f6cf9 100644
--- a/dns/axfr2acl/Makefile
+++ b/dns/axfr2acl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Transfer A records from DNS zones and convert to BIND ACLs
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 04d877e6124f..7855829d4141 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -32,7 +32,7 @@ CPE_VERSION=	${ISCVERSION:C/-.*//}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--localstatedir=/var --disable-linux-caps \
@@ -111,7 +111,7 @@ NEWSTATS_CONFIGURE_ENABLE=	newstats
 
 IDN_USES=		iconv
 IDN_CONFIGURE_ON=	--with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
-IDN_LIB_DEPENDS=	libidnkit.so:${PORTSDIR}/dns/idnkit
+IDN_LIB_DEPENDS=	libidnkit.so:dns/idnkit
 IDN_CONFIGURE_OFF=	--without-idn
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
@@ -125,7 +125,7 @@ FILTER_AAAA_CONFIGURE_ENABLE=	filter-aaaa
 NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
 
 GEOIP_CONFIGURE_WITH=	geoip
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 GOST_CONFIGURE_ON=	--with-gost
 GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index f508e5686c62..fc2bc61a544a 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -41,7 +41,7 @@ CPE_VERSION=	${ISCVERSION:C/-.*//}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--localstatedir=/var --disable-linux-caps \
@@ -133,7 +133,7 @@ NEWSTATS_CONFIGURE_ENABLE=	newstats
 
 IDN_USES=		iconv
 IDN_CONFIGURE_ON=	--with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
-IDN_LIB_DEPENDS=	libidnkit.so:${PORTSDIR}/dns/idnkit
+IDN_LIB_DEPENDS=	libidnkit.so:dns/idnkit
 IDN_CONFIGURE_OFF=	--without-idn
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
@@ -147,7 +147,7 @@ FILTER_AAAA_CONFIGURE_ENABLE=	filter-aaaa
 NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
 
 GEOIP_CONFIGURE_WITH=	geoip
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 GOST_CONFIGURE_ON=	--with-gost
 GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index f00f89dd1cf4..4373bf8f267e 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -27,7 +27,7 @@ CPE_VERSION=	${ISCVERSION:C/-.*//}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -98,7 +98,7 @@ NEWSTATS_CONFIGURE_ENABLE=	newstats
 
 IDN_USES=		iconv
 IDN_CONFIGURE_ON=	--with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
-IDN_LIB_DEPENDS=	libidnkit.so:${PORTSDIR}/dns/idnkit
+IDN_LIB_DEPENDS=	libidnkit.so:dns/idnkit
 IDN_CONFIGURE_OFF=	--without-idn
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
diff --git a/dns/bindgraph/Makefile b/dns/bindgraph/Makefile
index aecbbfa5d2a0..6e2323e0aa19 100644
--- a/dns/bindgraph/Makefile
+++ b/dns/bindgraph/Makefile
@@ -12,8 +12,8 @@ COMMENT=	RRDtool frontend for BIND statistics
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool	\
-		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
+RUN_DEPENDS=	rrdtool>=0:databases/rrdtool	\
+		p5-File-Tail>=0:devel/p5-File-Tail
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix tar:tgz
diff --git a/dns/bundy/Makefile b/dns/bundy/Makefile
index e3da41447825..858ccf6d30d9 100644
--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@@ -16,16 +16,16 @@ LICENSE_NAME=	ISC License
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp:${PORTSDIR}/devel/boost-libs \
-		${LOCALBASE}/include/log4cplus/logger.h:${PORTSDIR}/devel/log4cplus \
-		sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/${PYTHON_PKGNAMEPREFIX}sqlite3
-LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110 \
-		liblog4cplus.so:${PORTSDIR}/devel/log4cplus \
-		libicuuc.so:${PORTSDIR}/devel/icu \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/${PYTHON_PKGNAMEPREFIX}sqlite3
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp:devel/boost-libs \
+		${LOCALBASE}/include/log4cplus/logger.h:devel/log4cplus \
+		sqlite3>=3.3.9:databases/sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
+LIB_DEPENDS=	libbotan-1.10.so:security/botan110 \
+		liblog4cplus.so:devel/log4cplus \
+		libicuuc.so:devel/icu \
+		libgmp.so:math/gmp \
+		libsqlite3.so:databases/sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bundy-dns
diff --git a/dns/cli53/Makefile b/dns/cli53/Makefile
index f5b5f1ad5a77..ce9918980a07 100644
--- a/dns/cli53/Makefile
+++ b/dns/cli53/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	dns
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Command line management of Route53 domains
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:${PORTSDIR}/devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/dns/curvedns/Makefile b/dns/curvedns/Makefile
index 715495f9fb94..e754d9a5f4d0 100644
--- a/dns/curvedns/Makefile
+++ b/dns/curvedns/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	dns
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Forwarder adding DNSCurve to an authoritative nameserver
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev \
-		libsodium.so:${PORTSDIR}/security/libsodium
-RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libev.so:devel/libev \
+		libsodium.so:security/libsodium
+RUN_DEPENDS=	setuidgid:sysutils/daemontools
+BUILD_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
diff --git a/dns/ddclient/Makefile b/dns/ddclient/Makefile
index 045da491dfa4..d18eb889681a 100644
--- a/dns/ddclient/Makefile
+++ b/dns/ddclient/Makefile
@@ -24,8 +24,8 @@ SUB_FILES=	pkg-message ddclient_force
 OPTIONS_DEFINE=	SSL
 OPTIONS_DEFAULT=SSL
 
-SSL_RUN_DEPENDS=ca_root_nss>0:${PORTSDIR}/security/ca_root_nss \
-		p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL
+SSL_RUN_DEPENDS=ca_root_nss>0:security/ca_root_nss \
+		p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL
 
 PORTDOCS=	COPYRIGHT Changelog README.cisco README.ssl README.md \
 		sample-etc_cron.d_ddclient sample-etc_dhclient-exit-hooks \
diff --git a/dns/dhisd/Makefile b/dns/dhisd/Makefile
index abda15d610ae..8eeae9799a20 100644
--- a/dns/dhisd/Makefile
+++ b/dns/dhisd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	DHIS server for dynamic updates on the server using specific engines
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 CFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index aba4bdaedb3a..9a56660bfa76 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -14,8 +14,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER?=	lx@FreeBSD.org
 COMMENT?=	Collection of secure and reliable DNS tools
 
-RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
-		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	setuidgid:sysutils/daemontools \
+		tcpserver:sysutils/ucspi-tcp
 
 CONFLICTS=	djbdns-tools-[0-9]*
 LEGAL_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
@@ -111,7 +111,7 @@ PATCHFILES+=	djbdns-dnscurve-20090602.patch:dnscurve
 PATCH_DIST_STRIP=	-p1
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LDFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-BUILD_DEPENDS+=	nacl-sha256:${PORTSDIR}/security/nacl
+BUILD_DEPENDS+=	nacl-sha256:security/nacl
 .endif
 
 DJBDNS_VER=	1.05
diff --git a/dns/dnscheckengine/Makefile b/dns/dnscheckengine/Makefile
index 5f6bc5cd28f5..679b74586587 100644
--- a/dns/dnscheckengine/Makefile
+++ b/dns/dnscheckengine/Makefile
@@ -14,23 +14,23 @@ COMMENT=	DNS checker from the folks that run the .SE top level domain
 LICENSE=	BSD2CLAUSE
 LICENSE_FILES=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random \
-		p5-Digest-BubbleBabble>=0:${PORTSDIR}/security/p5-Digest-BubbleBabble \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-IO-Socket-INET6>=2.51:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-Net-DNS>=0.65:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0.15:${PORTSDIR}/dns/p5-Net-DNS-SEC \
-		p5-Socket6>=0.19:${PORTSDIR}/net/p5-Socket6 \
-		p5-Sys-Syslog>=0:${PORTSDIR}/sysutils/p5-Sys-Syslog \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-Mail-RFC822-Address>=0:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-Random>=0:security/p5-Crypt-OpenSSL-Random \
+		p5-Digest-BubbleBabble>=0:security/p5-Digest-BubbleBabble \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
+		p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0.15:dns/p5-Net-DNS-SEC \
+		p5-Socket6>=0.19:net/p5-Socket6 \
+		p5-Sys-Syslog>=0:sysutils/p5-Sys-Syslog \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-Mail-RFC822-Address>=0:mail/p5-Mail-RFC822-Address \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile
index a97c044d7e1c..7d7927f858e1 100644
--- a/dns/dnscrypt-proxy/Makefile
+++ b/dns/dnscrypt-proxy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Boost privacy and security of DNS
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 GNU_CONFIGURE=	yes
 USES=		execinfo gmake
diff --git a/dns/dnscrypt-wrapper/Makefile b/dns/dnscrypt-wrapper/Makefile
index 1a488784947f..f3a8b513e8f3 100644
--- a/dns/dnscrypt-wrapper/Makefile
+++ b/dns/dnscrypt-wrapper/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Adds dnscrypt support to any name resolver
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libsodium.so:security/libsodium \
+		libevent.so:devel/libevent2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cofyc
diff --git a/dns/dnsdbck/Makefile b/dns/dnsdbck/Makefile
index 572c771d092c..ade5e2b5c9b8 100644
--- a/dns/dnsdbck/Makefile
+++ b/dns/dnsdbck/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Verify consistency of DNS information in an SQL database
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR \
+		p5-Net-DNS>0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
index 538d9f669405..8b001678e827 100644
--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@@ -16,9 +16,9 @@ LICENSE_NAME_UNLICENSE=	The Unlicense
 LICENSE_FILE_UNLICENSE=	${WRKSRC}/ext/incbin/UNLICENSE
 LICENSE_PERMS_UNLICENSE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops
-LIB_DEPENDS=	libboost_serialization.so:${PORTSDIR}/devel/boost-libs \
-		libsodium.so:${PORTSDIR}/security/libsodium
+BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
+LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
+		libsodium.so:security/libsodium
 
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 LDFLAGS+=	-L${LOCALBASE}/lib -latomic
diff --git a/dns/dnshistory/Makefile b/dns/dnshistory/Makefile
index 696c67b17a91..ac4183cbf6b3 100644
--- a/dns/dnshistory/Makefile
+++ b/dns/dnshistory/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Store DNS lookups to a DB
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_BDB=	yes
 GNU_CONFIGURE=	yes
diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index 6c886a47c4eb..b199a90e9e40 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -50,7 +50,7 @@ CFLAGS+=	-DNO_IPV6
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext gmake iconv pkgconfig
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 PLIST_SUB+=	NLS=""
 ALL_TARGET=	all-i18n
 _intllibs=	-lintl
@@ -60,13 +60,13 @@ PLIST_SUB+=	NLS="@comment "
 .if ${PORT_OPTIONS:MIDN}
 USES+=		iconv
 CFLAGS+=	-DHAVE_IDN
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 _intllibs+=	-lidn
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 USES+=		pkgconfig
 CPPFLAGS+=	`pkg-config --cflags dbus-1`
 CFLAGS+=	-DHAVE_DBUS
@@ -83,8 +83,8 @@ USES+=		lua
 .if ${PORT_OPTIONS:MDNSSEC}
 CFLAGS+=	-DHAVE_DNSSEC
 USES+=		pkgconfig
-LIB_DEPENDS+=	libnettle.so:${PORTSDIR}/security/nettle
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libnettle.so:security/nettle
+LIB_DEPENDS+=	libgmp.so:math/gmp
 .endif
 
 USE_RC_SUBR=	dnsmasq
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index a5af54da048d..f631a513302c 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -47,7 +47,7 @@ CFLAGS+=	-DNO_IPV6
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext gmake iconv pkgconfig
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 PLIST_SUB+=	NLS=""
 ALL_TARGET=	all-i18n
 _intllibs=	-lintl
@@ -57,13 +57,13 @@ PLIST_SUB+=	NLS="@comment "
 .if ${PORT_OPTIONS:MIDN}
 USES+=		iconv
 CFLAGS+=	-DHAVE_IDN
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 _intllibs+=	-lidn
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 USES+=		pkgconfig
 CPPFLAGS+=	`pkg-config --cflags dbus-1`
 CFLAGS+=	-DHAVE_DBUS
@@ -80,8 +80,8 @@ USES+=		lua
 .if ${PORT_OPTIONS:MDNSSEC}
 CFLAGS+=	-DHAVE_DNSSEC
 USES+=		pkgconfig
-LIB_DEPENDS+=	libnettle.so:${PORTSDIR}/security/nettle
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libnettle.so:security/nettle
+LIB_DEPENDS+=	libgmp.so:math/gmp
 .endif
 
 USE_RC_SUBR=	dnsmasq
diff --git a/dns/dnsmax-perl/Makefile b/dns/dnsmax-perl/Makefile
index fd50bbb9faa1..aedd3ac16e06 100644
--- a/dns/dnsmax-perl/Makefile
+++ b/dns/dnsmax-perl/Makefile
@@ -10,9 +10,9 @@ DISTNAME=	${PORTNAME:tl}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
 MAINTAINER=	dan@algenta.com
 COMMENT=	DNSMax-perl is a perl DNS update client for the REST DNSMax protocol
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 
 NO_BUILD=	yes
 USES=		perl5 zip shebangfix
diff --git a/dns/dnsperf/Makefile b/dns/dnsperf/Makefile
index 13f497d18c9c..16f6def39ca3 100644
--- a/dns/dnsperf/Makefile
+++ b/dns/dnsperf/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Accurate performance metrics of Domain Name Services
 
-BUILD_DEPENDS=	isc-config.sh:${PORTSDIR}/dns/bind910
+BUILD_DEPENDS=	isc-config.sh:dns/bind910
 
 USES=		iconv
 GNU_CONFIGURE=	yes
diff --git a/dns/dnsproxy/Makefile b/dns/dnsproxy/Makefile
index 61388a6f47bc..e536b7e11f74 100644
--- a/dns/dnsproxy/Makefile
+++ b/dns/dnsproxy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.wolfermann.org/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	proxy for DNS queries
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 GNU_CONFIGURE=	yes
 
diff --git a/dns/dnstable/Makefile b/dns/dnstable/Makefile
index bf09b24cda12..6f4531246dfe 100644
--- a/dns/dnstable/Makefile
+++ b/dns/dnstable/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Encoding format, library, and utilities for passive DNS data
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-BUILD_DEPENDS=	sie-nmsg>0:${PORTSDIR}/net/sie-nmsg
-LIB_DEPENDS=	libmtbl.so:${PORTSDIR}/devel/mtbl	\
-		libyajl.so:${PORTSDIR}/devel/yajl	\
-		libwdns.so:${PORTSDIR}/dns/wdns 	\
-		libnmsg.so:${PORTSDIR}/net/nmsg
-RUN_DEPENDS=	sie-nmsg>0:${PORTSDIR}/net/sie-nmsg
+BUILD_DEPENDS=	sie-nmsg>0:net/sie-nmsg
+LIB_DEPENDS=	libmtbl.so:devel/mtbl	\
+		libyajl.so:devel/yajl	\
+		libwdns.so:dns/wdns 	\
+		libnmsg.so:net/nmsg
+RUN_DEPENDS=	sie-nmsg>0:net/sie-nmsg
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/dns/dnsutl/Makefile b/dns/dnsutl/Makefile
index 2ab327cba3ce..31add42537fa 100644
--- a/dns/dnsutl/Makefile
+++ b/dns/dnsutl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Programs to make using DNS easier
 
-LIB_DEPENDS=	libexplain.so:${PORTSDIR}/devel/libexplain
+LIB_DEPENDS=	libexplain.so:devel/libexplain
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all sure
diff --git a/dns/dnsviz/Makefile b/dns/dnsviz/Makefile
index 8dc3a84c6f48..a82d0974d9ac 100644
--- a/dns/dnsviz/Makefile
+++ b/dns/dnsviz/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Analysis and visualization of DNS/DNSSEC behavior
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:${PORTSDIR}/graphics/py-pygraphviz \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
-		${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz \
+		${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \
+		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/dns/dnswalk/Makefile b/dns/dnswalk/Makefile
index a42016e5638b..a4f204574f35 100644
--- a/dns/dnswalk/Makefile
+++ b/dns/dnswalk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	DNS debugger - requests a zone transfer and analyzes the result
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 NO_WRKSUBDIR=	YES
 NO_BUILD=	YES
diff --git a/dns/doc/Makefile b/dns/doc/Makefile
index 73f823088e04..1ea174b0832a 100644
--- a/dns/doc/Makefile
+++ b/dns/doc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=   LOCAL/sanpei \
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	Diagnose unhealthy DNS domains
 
-RUN_DEPENDS=	dig:${PORTSDIR}/dns/bind-tools
+RUN_DEPENDS=	dig:dns/bind-tools
 
 USES=		tar:bzip2
 
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index 2cf3720db015..d7864931960a 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Programs to get DNS and domain ownership information from web logs
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
-RUN_DEPENDS=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
+LIB_DEPENDS=	libadns.so:dns/adns
+RUN_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 
 USES=		perl5 tar:bzip2
 USE_BDB=	yes
diff --git a/dns/firedns/Makefile b/dns/firedns/Makefile
index 210a982de699..69e37b4078b6 100644
--- a/dns/firedns/Makefile
+++ b/dns/firedns/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://BSDforge.com/projects/source/dns/firedns/ \
 MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	C library for handling asynchronous DNS queries
 
-BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring
+BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:misc/firestring
 
 USES=		tar:bzip2
 HAS_CONFIGURE=	yes
diff --git a/dns/fpdns/Makefile b/dns/fpdns/Makefile
index 6f85df6573c9..50a81ac7b3cc 100644
--- a/dns/fpdns/Makefile
+++ b/dns/fpdns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fingerprinting DNS servers
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/dns/gdnsd/Makefile b/dns/gdnsd/Makefile
index e4427b3f8831..67ef8b744f44 100644
--- a/dns/gdnsd/Makefile
+++ b/dns/gdnsd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Authoritative-only GeoIP-aware DNS server
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 FETCH_ARGS=	-Fpr
 
@@ -34,11 +34,11 @@ OPTIONS_DEFINE=	DOCS GEOIP URCU
 OPTIONS_DEFAULT=	GEOIP
 
 GEOIP_DESC=		Enable GeoIP Support
-GEOIP_RUN_DEPENDS=	GeoIP>=0:${PORTSDIR}/net/GeoIP
+GEOIP_RUN_DEPENDS=	GeoIP>=0:net/GeoIP
 
 URCU_DESC=		Read-Copy-Update Support (Faster Zone Parsing)
 URCU_CONFIGURE_WITH=	urcu
-URCU_LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
+URCU_LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libgdnsd.so
diff --git a/dns/gdnsd2/Makefile b/dns/gdnsd2/Makefile
index e85fbc6c8f8c..062bef947aa1 100644
--- a/dns/gdnsd2/Makefile
+++ b/dns/gdnsd2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Authoritative-only GeoIP-aware DNS server
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
-BUILD_DEPENDS=	ragel>0:${PORTSDIR}/devel/ragel
+LIB_DEPENDS=	libev.so:devel/libev
+BUILD_DEPENDS=	ragel>0:devel/ragel
 
 FETCH_ARGS=	-Fpr
 
@@ -37,11 +37,11 @@ OPTIONS_DEFINE=	DOCS GEOIP URCU
 OPTIONS_DEFAULT=GEOIP
 
 GEOIP_DESC=		Enable GeoIP Support
-GEOIP_RUN_DEPENDS=	GeoIP>=0:${PORTSDIR}/net/GeoIP
+GEOIP_RUN_DEPENDS=	GeoIP>=0:net/GeoIP
 
 URCU_DESC=		Read-Copy-Update Support (Faster Zone Parsing)
 URCU_CONFIGURE_WITH=	urcu
-URCU_LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
+URCU_LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${localstatedir}/lib/$${PACKAGE_NAME}|/var/db/${PORTNAME}|g' \
diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile
index 81a6df389708..03f7a7543a26 100644
--- a/dns/getdns/Makefile
+++ b/dns/getdns/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Modern asynchronous DNS API
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libldns.so:${PORTSDIR}/dns/ldns \
-		libunbound.so:${PORTSDIR}/dns/unbound
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libidn.so:dns/libidn \
+		libldns.so:dns/ldns \
+		libunbound.so:dns/unbound
 
 USES=		libtool
 USE_LDCONFIG=	yes
@@ -37,11 +37,11 @@ LIBEV_DESC=	Build with libev extension
 LIBUV_DESC=	Build with libuv extension
 LIBEVENT_DESC=	Build with libevent extension
 
-LIBEV_LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIBEV_LIB_DEPENDS=	libev.so:devel/libev
 LIBEV_CONFIGURE_WITH=	libev
-LIBUV_LIB_DEPENDS=	libuv.so:${PORTSDIR}/devel/libuv
+LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
 LIBUV_CONFIGURE_WITH=	libuv
-LIBEVENT_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIBEVENT_LIB_DEPENDS=	libevent.so:devel/libevent2
 LIBEVENT_CONFIGURE_WITH=libevent
 
 .include <bsd.port.options.mk>
diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index ed6192d65eef..9d4674774786 100644
--- a/dns/hesiod/Makefile
+++ b/dns/hesiod/Makefile
@@ -28,7 +28,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIDN}
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 .else
 CONFIGURE_ARGS+=--without-libidn
 .endif
diff --git a/dns/hs-gnuidn/Makefile b/dns/hs-gnuidn/Makefile
index 632d48a796fb..9e8bf9387547 100644
--- a/dns/hs-gnuidn/Makefile
+++ b/dns/hs-gnuidn/Makefile
@@ -14,7 +14,7 @@ USE_CABAL=	text
 USE_C2HS=	yes
 
 USES=		pkgconfig
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libidn.so:dns/libidn
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/dns/ironsides/Makefile b/dns/ironsides/Makefile
index efcbf7d9137b..353ce3309a99 100644
--- a/dns/ironsides/Makefile
+++ b/dns/ironsides/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	IRONSIDES - Free software, unlimited redistribution
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/spark2012/spark.ads:${PORTSDIR}/devel/libspark2012
+BUILD_DEPENDS=	${LOCALBASE}/include/spark2012/spark.ads:devel/libspark2012
 
 USES=		ada dos2unix zip
 DOS2UNIX_FILES=	dfcs.usafa.edu.zonefile ironsides.1
diff --git a/dns/knot1/Makefile b/dns/knot1/Makefile
index 707e40471d48..6649b5a9510c 100644
--- a/dns/knot1/Makefile
+++ b/dns/knot1/Makefile
@@ -13,8 +13,8 @@ COMMENT=	High performance authoritative-only DNS server
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	flex>=2.5.35_1:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
+BUILD_DEPENDS=	flex>=2.5.35_1:textproc/flex
+LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
 CONFLICTS=	knot-2.* knot2-.*
 
@@ -48,14 +48,14 @@ DNSTAP_DESC=		dnstap support (see dnstap.info)
 LMDB_DESC=		Enable LMDB backend
 
 DNSTAP_CONFIGURE_ENABLE=	dnstap
-DNSTAP_LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
-			libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+DNSTAP_LIB_DEPENDS=	libfstrm.so:devel/fstrm \
+			libprotobuf-c.so:devel/protobuf-c
 
 IDN_CONFIGURE_WITH=	libidn
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 
 LMDB_CONFIGURE_ENABLE=	lmdb
-LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
diff --git a/dns/knot2/Makefile b/dns/knot2/Makefile
index fb00b53169bf..f98faa2f3cad 100644
--- a/dns/knot2/Makefile
+++ b/dns/knot2/Makefile
@@ -14,12 +14,12 @@ COMMENT=	High performance authoritative-only DNS server
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libjansson.so:${PORTSDIR}/devel/jansson \
-		liblmdb.so:${PORTSDIR}/databases/lmdb \
-		libnettle.so:${PORTSDIR}/security/nettle \
-		liburcu.so:${PORTSDIR}/sysutils/liburcu
+LIB_DEPENDS=	libfstrm.so:devel/fstrm \
+		libgnutls.so:security/gnutls \
+		libjansson.so:devel/jansson \
+		liblmdb.so:databases/lmdb \
+		libnettle.so:security/nettle \
+		liburcu.so:sysutils/liburcu
 
 CONFLICTS=	knot-1.* knot1-[0-6].*
 
@@ -50,7 +50,7 @@ OPTIONS_DEFINE=			DNSTAP FASTPARSER IDN
 
 DNSTAP_DESC=			dnstap support (see dnstap.info)
 DNSTAP_CONFIGURE_ENABLE=	dnstap
-DNSTAP_LIB_DEPENDS=		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+DNSTAP_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 # XXX: because `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from
 # `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which
 # should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure
@@ -62,7 +62,7 @@ FASTPARSER_DESC=		Fast zone parser (demanding compilation)
 FASTPARSER_CONFIGURE_ENABLE=	fastparser
 
 IDN_CONFIGURE_WITH=		libidn
-IDN_LIB_DEPENDS=		libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=		libidn.so:dns/libidn
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
diff --git a/dns/ldapdns/Makefile b/dns/ldapdns/Makefile
index 7ec4e067c533..de2c3e96a548 100644
--- a/dns/ldapdns/Makefile
+++ b/dns/ldapdns/Makefile
@@ -13,8 +13,8 @@ COMMENT=	LDAP-backed DNS server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
-		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	setuidgid:sysutils/daemontools \
+		tcpserver:sysutils/ucspi-tcp
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index fad9af698113..1213868a6f6f 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -48,8 +48,8 @@ ALL_TARGET=	pyldns
 INSTALL_TARGET=	install-pyldns
 
 CONFIGURE_ARGS+=--with-pyldns
-LIB_DEPENDS+=	libldns.so:${PORTSDIR}/dns/ldns
-BUILD_DEPENDS+=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
+LIB_DEPENDS+=	libldns.so:dns/ldns
+BUILD_DEPENDS+=	${LOCALBASE}/bin/swig:devel/swig13
 
 post-patch:
 	@${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in
@@ -62,7 +62,7 @@ ALL_TARGET=	p5-dns-ldns
 INSTALL_TARGET=	install-p5-dns-ldns
 
 CONFIGURE_ARGS+=--with-p5-dns-ldns
-LIB_DEPENDS+=	libldns.so:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	libldns.so:dns/ldns
 
 post-patch:
 	@${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in
@@ -71,7 +71,7 @@ ALL_TARGET=	all
 INSTALL_TARGET=	install-lib install-h install-config
 
 .if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 ALL_TARGET+=	doc
 INSTALL_TARGET+=install-manpages
 .endif
@@ -80,7 +80,7 @@ INSTALL_TARGET+=install-manpages
 
 .if ${PORT_OPTIONS:MGOST}
 . if ${OSVERSION} < 1000015
-BUILD_DEPENDS+=	openssl>=1.0:${PORTSDIR}/security/openssl
+BUILD_DEPENDS+=	openssl>=1.0:security/openssl
 CONFLICTS+=	libressl-*
 . endif
 .else
diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile
index c385f702e6fc..2333b9b992dd 100644
--- a/dns/libpsl/Makefile
+++ b/dns/libpsl/Makefile
@@ -12,8 +12,8 @@ COMMENT=	C library to handle the Public Suffix List
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	public_suffix_list>=0:${PORTSDIR}/dns/public_suffix_list \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list \
+		xsltproc:textproc/libxslt
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SINGLE=	IDNA
@@ -36,14 +36,14 @@ GH_ACCOUNT=	rockdaboot
 USE_GITHUB=	yes
 
 ICU_CONFIGURE_ON=	--enable-builtin=libicu --enable-runtime=libicu
-ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 IDN_CONFIGURE_ON=	--enable-builtin=libidn --enable-runtime=libidn
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-			libunistring.so:${PORTSDIR}/devel/libunistring
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn \
+			libunistring.so:devel/libunistring
 IDN_USES=		iconv
 IDN2_CONFIGURE_ON=	--enable-builtin=libidn2 --enable-runtime=libidn2
-IDN2_LIB_DEPENDS=	libidn2.so:${PORTSDIR}/dns/libidn2 \
-			libunistring.so:${PORTSDIR}/devel/libunistring
+IDN2_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
+			libunistring.so:devel/libunistring
 IDN2_USES=		iconv
 NLS_CPPFLAGS=		-DENABLE_NLS=1
 NLS_USES=		gettext
diff --git a/dns/mDNSResponder_nss/Makefile b/dns/mDNSResponder_nss/Makefile
index 6964fe89bcef..125606295ba2 100644
--- a/dns/mDNSResponder_nss/Makefile
+++ b/dns/mDNSResponder_nss/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Apple mDNS responder - FreeBSD nsswitch module
 LICENSE=	APACHE20 BSD3CLAUSE
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 
 CONFLICTS_INSTALL=	nss_mdns-[0-9]*
 
diff --git a/dns/nsd/Makefile b/dns/nsd/Makefile
index d8a686ec6b04..d88d7425b361 100644
--- a/dns/nsd/Makefile
+++ b/dns/nsd/Makefile
@@ -69,7 +69,7 @@ RRL_DESC=		Response Rate Limiting
 ZONE_STATS_DESC=	Separate statistics for each zone
 MUNIN_PLUGIN_DESC=	Install Munin plugin (requires BIND8_STATS)
 
-LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS+=	libevent.so:devel/libevent2
 
 ROOT_SERVER_CONFIGURE_ENABLE=	root-server
 LARGEFILE_CONFIGURE_ENABLE=	largefile
diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile
index 21771195a4c4..8b76c2cce987 100644
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@@ -14,7 +14,7 @@ COMMENT=	NSS module implementing multicast DNS name resolution
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
 CONFLICTS_INSTALL=	mDNSResponder_nss-[0-9]*
 
diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index b84e3450f4de..3aae5fdfbebb 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Tool suite for maintaining DNSSEC
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/dns/ldns
-LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
+BUILD_DEPENDS=	ldns>=1.6.16:dns/ldns
+LIB_DEPENDS=	libldns.so:dns/ldns
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
@@ -56,7 +56,7 @@ SCRIPTDATA=	migrate_adapters_1.mysql migrate_keyshare_mysql.pl \
 .if ${PORT_OPTIONS:MSQLITE}
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-database-backend=sqlite3
-BUILD_DEPENDS+=	sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS+=	sqlite3>=3.3.9:databases/sqlite3
 SCRIPTDATA=	database_create.sqlite3 migrate_keyshare_sqlite3.pl \
 		migrate_adapters_1.sqlite3 migrate_to_ng_sqlite.pl \
 		migrate_1_4_8.sqlite3
@@ -64,7 +64,7 @@ SCRIPTDATA=	database_create.sqlite3 migrate_keyshare_sqlite3.pl \
 
 .if ${PORT_OPTIONS:MSOFTHSM}
 CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so
-RUN_DEPENDS+=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
+RUN_DEPENDS+=	softhsm>=1.2.0:security/softhsm
 .endif
 
 SCRIPTDATA+=	convert_database.pl
diff --git a/dns/opendnssec13/Makefile b/dns/opendnssec13/Makefile
index 68f746ac8711..0159b9669a32 100644
--- a/dns/opendnssec13/Makefile
+++ b/dns/opendnssec13/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tool suite for maintaining DNSSEC
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/dns/ldns
-LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
+BUILD_DEPENDS=	ldns>=1.6.16:dns/ldns
+LIB_DEPENDS=	libldns.so:dns/ldns
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
@@ -37,18 +37,18 @@ AUDITOR_DESC=		Build with Auditor
 OPTIONS_DEFAULT=	AUDITOR
 OPTIONS_SUB=		yes
 
-AUDITOR_BUILD_DEPENDS=	rubygem-soap4r>=0:${PORTSDIR}/devel/rubygem-soap4r \
-			rubygem-dnsruby>=1.53:${PORTSDIR}/dns/rubygem-dnsruby
+AUDITOR_BUILD_DEPENDS=	rubygem-soap4r>=0:devel/rubygem-soap4r \
+			rubygem-dnsruby>=1.53:dns/rubygem-dnsruby
 AUDITOR_CONFIGURE_ENABLE=	auditor
 AUDITOR_USE=		RUBY=yes
-MYSQL_BUILD_DEPENDS_OFF=sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
+MYSQL_BUILD_DEPENDS_OFF=sqlite3>=3.3.9:databases/sqlite3
 MYSQL_CONFIGURE_OFF=	--with-sqlite3=${LOCALBASE} --with-database-backend=sqlite3
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE} --with-database-backend=mysql
-MYSQL_LIB_DEPENDS_OFF=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+MYSQL_LIB_DEPENDS_OFF=	libsqlite3.so:databases/sqlite3
 MYSQL_USE=		MYSQL=compat
 MYSQL_USE_OFF=		SQLITE=yes
 SOFTHSM_CONFIGURE_ON=	--with-softhsm --with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so
-SOFTHSM_RUN_DEPENDS=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
+SOFTHSM_RUN_DEPENDS=	softhsm>=1.2.0:security/softhsm
 
 PKGMESSAGE=	${WRKSRC}/MIGRATION
 
diff --git a/dns/p5-AnyEvent-CacheDNS/Makefile b/dns/p5-AnyEvent-CacheDNS/Makefile
index 56aba6073628..95ab3529ad7f 100644
--- a/dns/p5-AnyEvent-CacheDNS/Makefile
+++ b/dns/p5-AnyEvent-CacheDNS/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple DNS resolver with caching
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-BIND-Config-Parser/Makefile b/dns/p5-BIND-Config-Parser/Makefile
index 9a5747e42a55..2867086561da 100644
--- a/dns/p5-BIND-Config-Parser/Makefile
+++ b/dns/p5-BIND-Config-Parser/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse BIND Config files
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-DNS-EasyDNS/Makefile b/dns/p5-DNS-EasyDNS/Makefile
index 300592c7c9cb..099237bda3a6 100644
--- a/dns/p5-DNS-EasyDNS/Makefile
+++ b/dns/p5-DNS-EasyDNS/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Update your EasyDNS dynamic DNS entries
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Data-Validate-Domain/Makefile b/dns/p5-Data-Validate-Domain/Makefile
index acfa2b65558f..69f22039b399 100644
--- a/dns/p5-Data-Validate-Domain/Makefile
+++ b/dns/p5-Data-Validate-Domain/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::Validate::Domain - domain validation methods
 
-BUILD_DEPENDS=	p5-Net-Domain-TLD>=0:${PORTSDIR}/dns/p5-Net-Domain-TLD
+BUILD_DEPENDS=	p5-Net-Domain-TLD>=0:dns/p5-Net-Domain-TLD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-IO-Async-Resolver-DNS/Makefile b/dns/p5-IO-Async-Resolver-DNS/Makefile
index ce1d3d7c5b46..d0f71754e8a7 100644
--- a/dns/p5-IO-Async-Resolver-DNS/Makefile
+++ b/dns/p5-IO-Async-Resolver-DNS/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Resolve DNS queries using IO::Async
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>=0:${PORTSDIR}/devel/p5-Future \
-		p5-IO-Async>=0.52:${PORTSDIR}/devel/p5-IO-Async \
-		p5-List-UtilsBy>=0.07:${PORTSDIR}/devel/p5-List-UtilsBy \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Future>=0:devel/p5-Future \
+		p5-IO-Async>=0.52:devel/p5-IO-Async \
+		p5-List-UtilsBy>=0.07:devel/p5-List-UtilsBy \
+		p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Mozilla-PublicSuffix/Makefile b/dns/p5-Mozilla-PublicSuffix/Makefile
index 084befa77d2b..10477badfee9 100644
--- a/dns/p5-Mozilla-PublicSuffix/Makefile
+++ b/dns/p5-Mozilla-PublicSuffix/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Get public suffix of domain name via Mozilla Public Suffix List
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
-PATCH_DEPENDS=	public_suffix_list>=0:${PORTSDIR}/dns/public_suffix_list
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
+PATCH_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-Amazon-Route53/Makefile b/dns/p5-Net-Amazon-Route53/Makefile
index e1fb0471cb9a..fbecf2737bfb 100644
--- a/dns/p5-Net-Amazon-Route53/Makefile
+++ b/dns/p5-Net-Amazon-Route53/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Manage your DNS entries on Amazon's Route53 service
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-XML-Bare>=0:${PORTSDIR}/textproc/p5-XML-Bare \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-XML-Bare>=0:textproc/p5-XML-Bare \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	py[23][0-9]-boto-devel-[0-9]*
diff --git a/dns/p5-Net-Bonjour/Makefile b/dns/p5-Net-Bonjour/Makefile
index 877f38ed9385..b5695cc9c954 100644
--- a/dns/p5-Net-Bonjour/Makefile
+++ b/dns/p5-Net-Bonjour/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Module for DNS service discovery
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.5:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0.5:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-DNS-Async/Makefile b/dns/p5-Net-DNS-Async/Makefile
index 027238f1c163..41801513cfed 100644
--- a/dns/p5-Net-DNS-Async/Makefile
+++ b/dns/p5-Net-DNS-Async/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Asynchronous DNS helper for high volume applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-DNS-Check/Makefile b/dns/p5-Net-DNS-Check/Makefile
index 341c0d8bfa3e..333a01ae2516 100644
--- a/dns/p5-Net-DNS-Check/Makefile
+++ b/dns/p5-Net-DNS-Check/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Module for easy domain name checking
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/p5-Net-DNS-Lite/Makefile b/dns/p5-Net-DNS-Lite/Makefile
index 1d203a451694..6f896851da10 100644
--- a/dns/p5-Net-DNS-Lite/Makefile
+++ b/dns/p5-Net-DNS-Lite/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Pure-Perl DNS resolver with support for timeout
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Cache-LRU>=0:${PORTSDIR}/devel/p5-Cache-LRU \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Cache-LRU>=0:devel/p5-Cache-LRU \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
index d3be14f46485..7f3b373d756d 100644
--- a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
+++ b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Orders SRV records by priority and weight for Net::DNS
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Sort-Naturally>=1.03:${PORTSDIR}/textproc/p5-Sort-Naturally
+BUILD_DEPENDS=	p5-Net-DNS>=0.68:dns/p5-Net-DNS \
+		p5-Sort-Naturally>=1.03:textproc/p5-Sort-Naturally
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-DNS-Resolver-Programmable/Makefile b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
index fa078d15acb4..54a6998ffec6 100644
--- a/dns/p5-Net-DNS-Resolver-Programmable/Makefile
+++ b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	gmc@sonologic.nl
 COMMENT=	Programmable DNS resolver for off-line testing
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-DNS-SEC/Makefile b/dns/p5-Net-DNS-SEC/Makefile
index 9d4a69bb22d6..db30ec7ba74a 100644
--- a/dns/p5-Net-DNS-SEC/Makefile
+++ b/dns/p5-Net-DNS-SEC/Makefile
@@ -12,14 +12,14 @@ COMMENT=	DNSSEC extensions to Net::DNS
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0.04:${PORTSDIR}/security/p5-Crypt-OpenSSL-Bignum \
-		p5-Crypt-OpenSSL-DSA>=0.14:${PORTSDIR}/security/p5-Crypt-OpenSSL-DSA \
-		p5-Crypt-OpenSSL-EC>=1.01:${PORTSDIR}/security/p5-Crypt-OpenSSL-EC \
-		p5-Crypt-OpenSSL-ECDSA>=0.6:${PORTSDIR}/security/p5-Crypt-OpenSSL-ECDSA \
-		p5-Crypt-OpenSSL-RSA>=0.27:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-Crypt-OpenSSL-Random>=0.06:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0.04:security/p5-Crypt-OpenSSL-Bignum \
+		p5-Crypt-OpenSSL-DSA>=0.14:security/p5-Crypt-OpenSSL-DSA \
+		p5-Crypt-OpenSSL-EC>=1.01:security/p5-Crypt-OpenSSL-EC \
+		p5-Crypt-OpenSSL-ECDSA>=0.6:security/p5-Crypt-OpenSSL-ECDSA \
+		p5-Crypt-OpenSSL-RSA>=0.27:security/p5-Crypt-OpenSSL-RSA \
+		p5-Crypt-OpenSSL-Random>=0.06:security/p5-Crypt-OpenSSL-Random
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Net-DNS>=1.01:${PORTSDIR}/dns/p5-Net-DNS
+TEST_DEPENDS=	p5-Net-DNS>=1.01:dns/p5-Net-DNS
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/dns/p5-Net-DNS-TestNS/Makefile b/dns/p5-Net-DNS-TestNS/Makefile
index 7f456183f0d6..80139f404680 100644
--- a/dns/p5-Net-DNS-TestNS/Makefile
+++ b/dns/p5-Net-DNS-TestNS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl extension for simulating simple Nameservers
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.64:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-XML-LibXML>=1.53:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Net-DNS>=0.64:dns/p5-Net-DNS \
+		p5-XML-LibXML>=1.53:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-DNS-ToolKit/Makefile b/dns/p5-Net-DNS-ToolKit/Makefile
index 30bc941d6913..530ef817a517 100644
--- a/dns/p5-Net-DNS-ToolKit/Makefile
+++ b/dns/p5-Net-DNS-ToolKit/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tools for working with DNS packets
 LICENSE=	ART10 GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS-Codes>=0.09:${PORTSDIR}/dns/p5-Net-DNS-Codes \
-		p5-NetAddr-IP>=1.30:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
+		p5-NetAddr-IP>=1.30:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/dns/p5-Net-DNS-Zone-Parser/Makefile b/dns/p5-Net-DNS-Zone-Parser/Makefile
index 201e0bf2edd0..c2c02d900b2d 100644
--- a/dns/p5-Net-DNS-Zone-Parser/Makefile
+++ b/dns/p5-Net-DNS-Zone-Parser/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jimmy@sigint.se
 COMMENT=	Perl5 preprocessor for normalising a zone file
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.64:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0.15:${PORTSDIR}/dns/p5-Net-DNS-SEC
-RUN_DEPENDS=	p5-Net-DNS>=0.64:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0.15:${PORTSDIR}/dns/p5-Net-DNS-SEC
+BUILD_DEPENDS=	p5-Net-DNS>=0.64:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0.15:dns/p5-Net-DNS-SEC
+RUN_DEPENDS=	p5-Net-DNS>=0.64:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0.15:dns/p5-Net-DNS-SEC
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
index ec9f95e5ee7c..a423c866af4d 100644
--- a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl module to parse BIND8/9 zone files
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.65:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0.15:${PORTSDIR}/dns/p5-Net-DNS-SEC
+BUILD_DEPENDS=	p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0.15:dns/p5-Net-DNS-SEC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index 337fc25beddc..aa4b9c137f61 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl5 interface to the DNS resolver, and dynamic updates
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=1.03:${PORTSDIR}/security/p5-Digest-HMAC
+BUILD_DEPENDS=	p5-Digest-HMAC>=1.03:security/p5-Digest-HMAC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Digest-BubbleBabble>=0:${PORTSDIR}/security/p5-Digest-BubbleBabble \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Digest-BubbleBabble>=0:security/p5-Digest-BubbleBabble \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 OPTIONS_DEFINE=	GOST IDN IPV6 SSHFP
 GOST_DESC=	GOST support
@@ -28,18 +28,18 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-GOST_BUILD_DEPENDS=	p5-Digest-GOST>=0.06:${PORTSDIR}/security/p5-Digest-GOST
-GOST_RUN_DEPENDS=	p5-Digest-GOST>=0.06:${PORTSDIR}/security/p5-Digest-GOST
-IDN_BUILD_DEPENDS=	p5-Net-LibIDN>=0.12:${PORTSDIR}/dns/p5-Net-LibIDN
-IDN_RUN_DEPENDS=	p5-Net-LibIDN>=0.12:${PORTSDIR}/dns/p5-Net-LibIDN
-SSHFP_BUILD_DEPENDS=	p5-Digest-BubbleBabble>=0.01:${PORTSDIR}/security/p5-Digest-BubbleBabble
-SSHFP_RUN_DEPENDS=	p5-Digest-BubbleBabble>=0.01:${PORTSDIR}/security/p5-Digest-BubbleBabble
+GOST_BUILD_DEPENDS=	p5-Digest-GOST>=0.06:security/p5-Digest-GOST
+GOST_RUN_DEPENDS=	p5-Digest-GOST>=0.06:security/p5-Digest-GOST
+IDN_BUILD_DEPENDS=	p5-Net-LibIDN>=0.12:dns/p5-Net-LibIDN
+IDN_RUN_DEPENDS=	p5-Net-LibIDN>=0.12:dns/p5-Net-LibIDN
+SSHFP_BUILD_DEPENDS=	p5-Digest-BubbleBabble>=0.01:security/p5-Digest-BubbleBabble
+SSHFP_RUN_DEPENDS=	p5-Digest-BubbleBabble>=0.01:security/p5-Digest-BubbleBabble
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MIPV6} && ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.32:${PORTSDIR}/net/p5-IO-Socket-IP
-RUN_DEPENDS+=	p5-IO-Socket-IP>=0.32:${PORTSDIR}/net/p5-IO-Socket-IP
+BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.32:net/p5-IO-Socket-IP
+RUN_DEPENDS+=	p5-IO-Socket-IP>=0.32:net/p5-IO-Socket-IP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/dns/p5-Net-DNSBL-MultiDaemon/Makefile b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
index e13323d42301..715324f7c671 100644
--- a/dns/p5-Net-DNSBL-MultiDaemon/Makefile
+++ b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
@@ -14,20 +14,20 @@ COMMENT=	Net::DNSBL::MultiDaemon - multi DNSBL prioritization
 LICENSE=	ART10 GPLv1 GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-SafeDO>=0.12:${PORTSDIR}/devel/p5-File-SafeDO \
-		p5-Geo-IP-PurePerl>=1.10:${PORTSDIR}/net/p5-Geo-IP-PurePerl \
-		p5-Net-DNS-Codes>=0.09:${PORTSDIR}/dns/p5-Net-DNS-Codes \
-		p5-Net-DNS-ToolKit>=0.47:${PORTSDIR}/dns/p5-Net-DNS-ToolKit \
-		p5-Net-NBsocket>=0.23:${PORTSDIR}/net/p5-Net-NBsocket \
-		p5-NetAddr-IP>=4.067:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		p5-Unix-Syslog>=0.97:${PORTSDIR}/sysutils/p5-Unix-Syslog
+BUILD_DEPENDS=	p5-File-SafeDO>=0.12:devel/p5-File-SafeDO \
+		p5-Geo-IP-PurePerl>=1.10:net/p5-Geo-IP-PurePerl \
+		p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
+		p5-Net-DNS-ToolKit>=0.47:dns/p5-Net-DNS-ToolKit \
+		p5-Net-NBsocket>=0.23:net/p5-Net-NBsocket \
+		p5-NetAddr-IP>=4.067:net-mgmt/p5-NetAddr-IP \
+		p5-Unix-Syslog>=0.97:sysutils/p5-Unix-Syslog
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	RHBL
 OPTIONS_DEFAULT=RHBL
 RHBL_DESC=	RHBL checking of URBL domains
-RHBL_BUILD_DEPENDS=	p5-URBL-Prepare>=0.08:${PORTSDIR}/dns/p5-URBL-Prepare
-RHBL_RUN_DEPENDS=	p5-URBL-Prepare>=0.08:${PORTSDIR}/dns/p5-URBL-Prepare
+RHBL_BUILD_DEPENDS=	p5-URBL-Prepare>=0.08:dns/p5-URBL-Prepare
+RHBL_RUN_DEPENDS=	p5-URBL-Prepare>=0.08:dns/p5-URBL-Prepare
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/dns/p5-Net-DNSBL-Statistics/Makefile b/dns/p5-Net-DNSBL-Statistics/Makefile
index a7b3a143388c..1ab45a8a82bd 100644
--- a/dns/p5-Net-DNSBL-Statistics/Makefile
+++ b/dns/p5-Net-DNSBL-Statistics/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Gather DNSBL Statistics
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS-Codes>=0.09:${PORTSDIR}/dns/p5-Net-DNS-Codes \
-		p5-Net-DNS-ToolKit>=0.41:${PORTSDIR}/dns/p5-Net-DNS-ToolKit \
-		p5-Net-DNSBL-MultiDaemon>=0.26:${PORTSDIR}/dns/p5-Net-DNSBL-MultiDaemon
+BUILD_DEPENDS=	p5-Net-DNS-Codes>=0.09:dns/p5-Net-DNS-Codes \
+		p5-Net-DNS-ToolKit>=0.41:dns/p5-Net-DNS-ToolKit \
+		p5-Net-DNSBL-MultiDaemon>=0.26:dns/p5-Net-DNSBL-MultiDaemon
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-DRI/Makefile b/dns/p5-Net-DRI/Makefile
index aed812f967f9..2d8b77e46585 100644
--- a/dns/p5-Net-DRI/Makefile
+++ b/dns/p5-Net-DRI/Makefile
@@ -15,23 +15,23 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-ISO8601>0.06:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-DateTime-Format-Strptime>0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime-TimeZone>0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Accessor-Chained>0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-Time-HiRes>0:${PORTSDIR}/devel/p5-Time-HiRes \
-		p5-Email-Valid>0:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-IO-Socket-SSL>0.90:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-XML-LibXML>1.61:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-SOAP-Lite>0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-SOAP-WSDL>0:${PORTSDIR}/devel/p5-SOAP-WSDL \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-Digest-MD5>0:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-MIME-Tools>0:${PORTSDIR}/mail/p5-MIME-Tools
+RUN_DEPENDS=	p5-DateTime>0:devel/p5-DateTime \
+		p5-DateTime-Format-ISO8601>0.06:devel/p5-DateTime-Format-ISO8601 \
+		p5-DateTime-Format-Strptime>0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime-TimeZone>0:devel/p5-DateTime-TimeZone \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Class-Accessor-Chained>0:devel/p5-Class-Accessor-Chained \
+		p5-Time-HiRes>0:devel/p5-Time-HiRes \
+		p5-Email-Valid>0:mail/p5-Email-Valid \
+		p5-IO-Socket-SSL>0.90:security/p5-IO-Socket-SSL \
+		p5-XML-LibXML>1.61:textproc/p5-XML-LibXML \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+		p5-SOAP-Lite>0:net/p5-SOAP-Lite \
+		p5-SOAP-WSDL>0:devel/p5-SOAP-WSDL \
+		p5-libwww>0:www/p5-libwww \
+		p5-Digest-MD5>0:security/p5-Digest-MD5 \
+		p5-Net-DNS>0:dns/p5-Net-DNS \
+		p5-MIME-Tools>0:mail/p5-MIME-Tools
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/dns/p5-Net-Domain-ExpireDate/Makefile b/dns/p5-Net-Domain-ExpireDate/Makefile
index f360daaeb33f..88972f6137fc 100644
--- a/dns/p5-Net-Domain-ExpireDate/Makefile
+++ b/dns/p5-Net-Domain-ExpireDate/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module obtain expiration date of domain names
 
-BUILD_DEPENDS=	p5-Net-Whois-Raw>=0:${PORTSDIR}/net/p5-Net-Whois-Raw
+BUILD_DEPENDS=	p5-Net-Whois-Raw>=0:net/p5-Net-Whois-Raw
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-Net-LibIDN/Makefile b/dns/p5-Net-LibIDN/Makefile
index ebe582c8a943..a677a360ad22 100644
--- a/dns/p5-Net-LibIDN/Makefile
+++ b/dns/p5-Net-LibIDN/Makefile
@@ -13,7 +13,7 @@ COMMENT=	This module provides access to the libidn library
 
 LICENSE=	ART10
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libidn.so:dns/libidn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/p5-Net-Nslookup/Makefile b/dns/p5-Net-Nslookup/Makefile
index 5aabd0dc218e..ac2a394e0cec 100644
--- a/dns/p5-Net-Nslookup/Makefile
+++ b/dns/p5-Net-Nslookup/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides the capabilities of the standard tool nslookup(1)
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Net-RBLClient/Makefile b/dns/p5-Net-RBLClient/Makefile
index 6e29dbba00c6..9121ac57e7a4 100644
--- a/dns/p5-Net-RBLClient/Makefile
+++ b/dns/p5-Net-RBLClient/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Queries multiple Realtime Blackhole Lists in parallel
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
index f4b2d0739680..694d1c275d68 100644
--- a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
+++ b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Recursive DNS client for POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-IP-Minimal>=0:${PORTSDIR}/net/p5-Net-IP-Minimal \
-		p5-POE>=1.004:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-IP-Minimal>=0:net/p5-Net-IP-Minimal \
+		p5-POE>=1.004:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index c2dc76899192..9c9ba620270f 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -15,10 +15,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.65:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-POE>=1.249:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+		p5-POE>=1.249:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/dns/p5-POE-Component-Client-DNSBL/Makefile b/dns/p5-POE-Component-Client-DNSBL/Makefile
index 4cbfd9112d86..12b0914ecbbe 100644
--- a/dns/p5-POE-Component-Client-DNSBL/Makefile
+++ b/dns/p5-POE-Component-Client-DNSBL/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl POE component that provides non-blocking DNSBL lookups
 
-BUILD_DEPENDS=	p5-POE>=1.004:${PORTSDIR}/devel/p5-POE \
-		p5-Net-IP-Minimal>=0:${PORTSDIR}/net/p5-Net-IP-Minimal \
-		p5-POE-Component-Client-DNS>=0:${PORTSDIR}/dns/p5-POE-Component-Client-DNS
+BUILD_DEPENDS=	p5-POE>=1.004:devel/p5-POE \
+		p5-Net-IP-Minimal>=0:net/p5-Net-IP-Minimal \
+		p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-POE-Component-Resolver/Makefile b/dns/p5-POE-Component-Resolver/Makefile
index c5ca6d3d266d..e10b7bbb538c 100644
--- a/dns/p5-POE-Component-Resolver/Makefile
+++ b/dns/p5-POE-Component-Resolver/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Non-blocking getaddrinfo() resolver
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
-		p5-Socket>=2.001:${PORTSDIR}/net/p5-Socket
+BUILD_DEPENDS=	p5-POE>=1.311:devel/p5-POE \
+		p5-Socket>=2.001:net/p5-Socket
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-POE-Component-Server-DNS/Makefile b/dns/p5-POE-Component-Server-DNS/Makefile
index a2716b2d2b61..1225e3109b83 100644
--- a/dns/p5-POE-Component-Server-DNS/Makefile
+++ b/dns/p5-POE-Component-Server-DNS/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.58:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-POE>=0.38:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Client-DNS>=1.051:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \
-		p5-POE-Component-Client-DNS-Recursive>=1.04:${PORTSDIR}/dns/p5-POE-Component-Client-DNS-Recursive \
-		p5-POE-Component-Generic>=0.09.10:${PORTSDIR}/net/p5-POE-Component-Generic \
-		p5-POE-Filter-DNS-TCP>=0.04:${PORTSDIR}/dns/p5-POE-Filter-DNS-TCP
+BUILD_DEPENDS=	p5-Net-DNS>=0.58:dns/p5-Net-DNS \
+		p5-POE>=0.38:devel/p5-POE \
+		p5-POE-Component-Client-DNS>=1.051:dns/p5-POE-Component-Client-DNS \
+		p5-POE-Component-Client-DNS-Recursive>=1.04:dns/p5-POE-Component-Client-DNS-Recursive \
+		p5-POE-Component-Generic>=0.09.10:net/p5-POE-Component-Generic \
+		p5-POE-Filter-DNS-TCP>=0.04:dns/p5-POE-Filter-DNS-TCP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/dns/p5-POE-Filter-DNS-TCP/Makefile b/dns/p5-POE-Filter-DNS-TCP/Makefile
index 6d4fdab62c0f..d709f1222536 100644
--- a/dns/p5-POE-Filter-DNS-TCP/Makefile
+++ b/dns/p5-POE-Filter-DNS-TCP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	POE Filter to handle DNS over TCP connections
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.66:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-POE>=1.311:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Net-DNS>=0.66:dns/p5-Net-DNS \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-POE>=1.311:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/dns/p5-Tie-DNS/Makefile b/dns/p5-Tie-DNS/Makefile
index 1bf4ff8248c5..010bbb3b3157 100644
--- a/dns/p5-Tie-DNS/Makefile
+++ b/dns/p5-Tie-DNS/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Tie interface to Net::DNS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Tie-Cache>=0:${PORTSDIR}/devel/p5-Tie-Cache
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Tie-Cache>=0:devel/p5-Tie-Cache
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-CheckManifest>=0:${PORTSDIR}/devel/p5-Test-CheckManifest \
-		p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic
+TEST_DEPENDS=	p5-Test-CheckManifest>=0:devel/p5-Test-CheckManifest \
+		p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/dns/p5-pgeodns/Makefile b/dns/p5-pgeodns/Makefile
index fdbd495d4d81..4a51db74b732 100644
--- a/dns/p5-pgeodns/Makefile
+++ b/dns/p5-pgeodns/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Geographic NameServer
 
-BUILD_DEPENDS=	p5-Geo-IP>=0:${PORTSDIR}/net/p5-Geo-IP \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Geo-IP>=0:net/p5-Geo-IP \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/pear-File_DNS/Makefile b/dns/pear-File_DNS/Makefile
index 087792898673..763772cd4245 100644
--- a/dns/pear-File_DNS/Makefile
+++ b/dns/pear-File_DNS/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	dns devel pear
 MAINTAINER=	chris@ctgameinfo.com
 COMMENT=	PEAR class to read and write RFC1033-style DNS Zonefiles
 
-BUILD_DEPENDS=	${PEARDIR}/File.php:${PORTSDIR}/sysutils/pear-File
-RUN_DEPENDS=	${PEARDIR}/File.php:${PORTSDIR}/sysutils/pear-File
+BUILD_DEPENDS=	${PEARDIR}/File.php:sysutils/pear-File
+RUN_DEPENDS=	${PEARDIR}/File.php:sysutils/pear-File
 
 USES=	pear
 
diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
index db633cfd18d2..b4367d51118a 100644
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Advanced DNS recursor
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
-		${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	bjam:devel/boost-jam \
+		${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USES=		cpe gmake tar:bzip2
 GNU_CONFIGURE=	YES
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 886387fc6d8c..7b1458398fb9 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Advanced DNS server with multiple backends including SQL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_serialization.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs
 
 USES=		cpe gmake libtool lua pkgconfig tar:bzip2
 USE_LDCONFIG=	YES
@@ -50,15 +50,15 @@ OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
 OPTIONS_SUB=		yes
 
 BOTAN110_CONFIGURE_ON=	--enable-botan1.10
-BOTAN110_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110
+BOTAN110_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
 
 GEO_VARS=		MODULES+=geo
 
-GEOIP_LIB_DEPENDS=	libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \
-			libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libyaml-cpp.so:devel/yaml-cpp \
+			libGeoIP.so:net/GeoIP
 GEOIP_VARS=		MODULES+=geoip
 
-LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_VARS=		MODULES+=lmdb
 
 LUA_VARS=		MODULES+=lua
@@ -72,7 +72,7 @@ MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_USE=		MYSQL=YES
 MYSQL_VARS=		MODULES+=gmysql
 
-OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx
+OPENDBX_LIB_DEPENDS=	libopendbx.so:databases/opendbx
 OPENDBX_VARS=		MODULES+=opendbx
 
 OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
@@ -85,7 +85,7 @@ PGSQL_USES=		pgsql
 PGSQL_VARS=		MODULES+=gpgsql
 
 POLARSSL_CONFIGURE_ARGS=	--without-system-polarssl
-POLARSSL_LIB_DEPENDS_OFF=	libmbedtls.so:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS_OFF=	libmbedtls.so:security/polarssl13
 
 REMOTE_VARS=		MODULES+=remote
 
@@ -93,11 +93,11 @@ SQLITE3_USE=		SQLITE=3
 SQLITE3_VARS=		MODULES+=gsqlite3
 
 TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
-TINYDNS_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
+TINYDNS_LIB_DEPENDS=	libcdb.so:databases/tinycdb
 TINYDNS_VARS=		MODULES+=tinydns
 
 ZEROMQ_CONFIGURE_ARGS=	--enable-remotebackend-zeromq
-ZEROMQ_LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq4
+ZEROMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 
 TOOLS_CONFIGURE_ENABLE=	tools
 
diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile
index 1bc965412f13..0b6654b977f0 100644
--- a/dns/py-adns/Makefile
+++ b/dns/py-adns/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	adns-python-${PORTVERSION}
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Python Interface to adns, the asynchronous DNS library
 
-LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
+LIB_DEPENDS=	libadns.so:dns/adns
 
 PROJECTHOST=	adns-python
 USES=		python
diff --git a/dns/py-bonjour/Makefile b/dns/py-bonjour/Makefile
index b0f7e33938fd..fc02f89e0aef 100644
--- a/dns/py-bonjour/Makefile
+++ b/dns/py-bonjour/Makefile
@@ -17,7 +17,7 @@ USE_PYTHON=	distutils autoplist
 OPTIONS_SINGLE=			ZEROCONF
 OPTIONS_SINGLE_ZEROCONF=	AVAHI MDNSRESPONDER
 OPTIONS_DEFAULT=		MDNSRESPONDER
-AVAHI_LIB_DEPENDS=		libdns_sd.so:${PORTSDIR}/net/avahi-libdns
-MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+AVAHI_LIB_DEPENDS=		libdns_sd.so:net/avahi-libdns
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 
 .include <bsd.port.mk>
diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile
index 31db8e86d08b..5cbf2fe01fd9 100644
--- a/dns/py-dnspython/Makefile
+++ b/dns/py-dnspython/Makefile
@@ -24,7 +24,7 @@ PORTEXAMPLES=	ddns.py e164.py mx.py name.py reverse.py reverse_name.py \
 		xfr.py zonediff.py
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
-PYCRYPTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+PYCRYPTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
 
 .include <bsd.port.pre.mk>
 
diff --git a/dns/py-easyzone/Makefile b/dns/py-easyzone/Makefile
index d5065db18d5b..99fc8eca2a20 100644
--- a/dns/py-easyzone/Makefile
+++ b/dns/py-easyzone/Makefile
@@ -13,7 +13,7 @@ COMMENT=	DNS Zone abstraction module for Python
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/dns/py-idnkit2/Makefile b/dns/py-idnkit2/Makefile
index 7372eb7bcafe..605dc9e7aee5 100644
--- a/dns/py-idnkit2/Makefile
+++ b/dns/py-idnkit2/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	fbsd@grid.einherjar.de
 COMMENT=	Python bindings for Internationalized Domain Name toolkit 2
 
-LIB_DEPENDS=	libidnkitlite.so:${PORTSDIR}/dns/idnkit2
+LIB_DEPENDS=	libidnkitlite.so:dns/idnkit2
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils autoplist
diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index 27a9aa241297..dd6f38b2f3d5 100644
--- a/dns/py-namebench/Makefile
+++ b/dns/py-namebench/Makefile
@@ -15,18 +15,18 @@ COMMENT=	Open Source DNS benchmark utility
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:${PORTSDIR}/devel/py-Jinja2 \
-	${PYTHON_PKGNAMEPREFIX}graphy>=1.0:${PORTSDIR}/graphics/py-graphy \
-	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython \
-	${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:${PORTSDIR}/www/py-httplib2 \
-	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:${PORTSDIR}/devel/py-simplejson
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:devel/py-Jinja2 \
+	${PYTHON_PKGNAMEPREFIX}graphy>=1.0:graphics/py-graphy \
+	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython \
+	${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:www/py-httplib2 \
+	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:devel/py-simplejson
 
 USES=	python tar:tgz
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:x11-toolkits/py-tkinter
 .endif
 
 MAKE_ENV+=	NO_THIRD_PARTY=yes
diff --git a/dns/py-py3dns/Makefile b/dns/py-py3dns/Makefile
index 9169bcebbe69..a426073fe497 100644
--- a/dns/py-py3dns/Makefile
+++ b/dns/py-py3dns/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	CNRI LICENSE AGREEMENT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/dns/py-pydnstable/Makefile b/dns/py-pydnstable/Makefile
index fa6e588b80dc..37e842249ed7 100644
--- a/dns/py-pydnstable/Makefile
+++ b/dns/py-pydnstable/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python wrapper for dns/dnstable
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libdnstable.so:${PORTSDIR}/dns/dnstable
+LIB_DEPENDS=	libdnstable.so:dns/dnstable
 
 USE_PYTHON=	autoplist distutils
 USES=		pkgconfig python
diff --git a/dns/py-pywdns/Makefile b/dns/py-pywdns/Makefile
index b51ea2bdd316..a270918c937a 100644
--- a/dns/py-pywdns/Makefile
+++ b/dns/py-pywdns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python wrapper for dns/wdns
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libwdns.so:${PORTSDIR}/dns/wdns
+LIB_DEPENDS=	libwdns.so:dns/wdns
 
 USE_PYTHON=	autoplist distutils
 USES=		pkgconfig python
diff --git a/dns/py-tldextract/Makefile b/dns/py-tldextract/Makefile
index c54bbf7d872e..4ca76d78d211 100644
--- a/dns/py-tldextract/Makefile
+++ b/dns/py-tldextract/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Separate the TLD from the registered domain and subdomains of a URL
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}idna>=2.0:${PORTSDIR}/dns/py-idna
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna
 
 USES=	python
 USE_PYTHON=	autoplist distutils
diff --git a/dns/rbllookup-ng/Makefile b/dns/rbllookup-ng/Makefile
index 193463a4b382..d4d57bd75b19 100644
--- a/dns/rbllookup-ng/Makefile
+++ b/dns/rbllookup-ng/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.mavetju.org/download/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Check given IP/Host presence in RBLs
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/dns/rbllookup/Makefile b/dns/rbllookup/Makefile
index 19bb5799583d..a04e5dc6997c 100644
--- a/dns/rbllookup/Makefile
+++ b/dns/rbllookup/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	drixter@e-utp.net
 COMMENT=	Check given IP/Host presence in 106 RBLs
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	rbl.pl
diff --git a/dns/renewck/Makefile b/dns/renewck/Makefile
index 768c1ce8cab0..29dfa1dd5bcf 100644
--- a/dns/renewck/Makefile
+++ b/dns/renewck/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Check for expiring domains and send email notifications
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Time-modules>0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-Mail-Tools>0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-GDBM>0:${PORTSDIR}/databases/p5-GDBM
+RUN_DEPENDS=	p5-Time-modules>0:devel/p5-Time-modules \
+		p5-Mail-Tools>0:mail/p5-Mail-Tools \
+		p5-GDBM>0:databases/p5-GDBM
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/rpsl2acl/Makefile b/dns/rpsl2acl/Makefile
index 0772a8903aaa..c7cd694e382a 100644
--- a/dns/rpsl2acl/Makefile
+++ b/dns/rpsl2acl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Query set of RPSL database objects and convert to BIND ACLs
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR
+RUN_DEPENDS=	p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/rubygem-public_suffix/Makefile b/dns/rubygem-public_suffix/Makefile
index fbbaddbb8960..4b3c3edfe5b4 100644
--- a/dns/rubygem-public_suffix/Makefile
+++ b/dns/rubygem-public_suffix/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Ruby domain name parser based on the Public Suffix List
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-PATCH_DEPENDS=	public_suffix_list>=0:${PORTSDIR}/dns/public_suffix_list
+PATCH_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/dns/rubygem-public_suffix_service/Makefile b/dns/rubygem-public_suffix_service/Makefile
index 1720672dc00b..6260e14854c8 100644
--- a/dns/rubygem-public_suffix_service/Makefile
+++ b/dns/rubygem-public_suffix_service/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Parse and decompose domain names into TLD, domain, and subdomains
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PATCH_DEPENDS=	public_suffix_list>=0:${PORTSDIR}/dns/public_suffix_list
+PATCH_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile
index 5acac16218b6..b096a8ad77dd 100644
--- a/dns/samba-nsupdate/Makefile
+++ b/dns/samba-nsupdate/Makefile
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--with-gssapi="${HEIMDAL_HOME}"
 .elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config)
 CONFIGURE_ARGS+=	--with-gssapi="/usr"
 .else
-LIB_DEPENDS+=		libkrb5.so:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=		libkrb5.so:security/heimdal
 CONFIGURE_ARGS+=	--with-gssapi="${LOCALBASE}"
 .endif
 
diff --git a/dns/scavenge/Makefile b/dns/scavenge/Makefile
index a4f55faadaa1..0674a9b14891 100644
--- a/dns/scavenge/Makefile
+++ b/dns/scavenge/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://mark.foster.cc/pub/scavenge/
 MAINTAINER=	mark@foster.cc
 COMMENT=	Discover/audit forward and reverse DNS records
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		nmap:${PORTSDIR}/security/nmap
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		nmap:security/nmap
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/dns/sleuth/Makefile b/dns/sleuth/Makefile
index 19676355d97c..6d99bf3dcb54 100644
--- a/dns/sleuth/Makefile
+++ b/dns/sleuth/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool for checking, and diagnosing DNS zones
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 USES=		shebangfix perl5
 SHEBANG_FILES=	sleuth
diff --git a/dns/sshfp/Makefile b/dns/sshfp/Makefile
index 3b4f149af2c4..342617ce066b 100644
--- a/dns/sshfp/Makefile
+++ b/dns/sshfp/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Generate SSHFP DNS records from knownhosts files or ssh-keyscan
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}argparse>=0.8.0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:${PORTSDIR}/net-mgmt/py-ipcalc \
-		${PYTHON_SITELIBDIR}/ldns.py:${PORTSDIR}/dns/py-ldns
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}argparse>=0.8.0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:net-mgmt/py-ipcalc \
+		${PYTHON_SITELIBDIR}/ldns.py:dns/py-ldns
 
 USES=		python shebangfix
 NO_BUILD=	yes
diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index 90759e3b05bc..9acbc8de4cb8 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -41,8 +41,8 @@ DNSTAP_DESC=	Enable dnstap logging support
 
 .include <bsd.port.options.mk>
 
-LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libldns.so:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	libexpat.so:textproc/expat2 \
+		libldns.so:dns/ldns
 
 STRIP_FILES=	.libs/libunbound.so unbound-checkconf unbound \
 		unbound-control .libs/unbound-host .libs/unbound-anchor
@@ -50,7 +50,7 @@ STRIP_FILES=	.libs/libunbound.so unbound-checkconf unbound \
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python:2
 CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes LDFLAGS="-L${LOCALBASE}/lib"
-BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS+=	swig:devel/swig13
 STRIP_FILES+=	.libs/_unbound.so
 .endif
 
@@ -71,8 +71,8 @@ CONFIGURE_ARGS+=--disable-ecdsa
 
 .if ${PORT_OPTIONS:MDNSTAP}
 CONFIGURE_ARGS+=--enable-dnstap
-LIB_DEPENDS+=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
-LIB_DEPENDS+=	libfstrm.so:${PORTSDIR}/devel/fstrm
+LIB_DEPENDS+=	libprotobuf-c.so:devel/protobuf-c
+LIB_DEPENDS+=	libfstrm.so:devel/fstrm
 .endif
 
 .if ${PORT_OPTIONS:MMUNIN_PLUGIN}
@@ -82,7 +82,7 @@ MUNIN_PLUGIN_ALL=	hits queue memory by_type by_class by_opcode by_rcode \
 .endif
 
 .if ${PORT_OPTIONS:MLIBEVENT}
-LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS+=	libevent.so:devel/libevent2
 USES+=		pkgconfig
 CONFIGURE_ARGS+=--with-libevent
 CPPFLAGS+=	$$(pkg-config libevent --cflags-only-I)
diff --git a/dns/validns/Makefile b/dns/validns/Makefile
index b87e42bfa302..7f5b500fefc9 100644
--- a/dns/validns/Makefile
+++ b/dns/validns/Makefile
@@ -11,7 +11,7 @@ COMMENT=	High performance DNS/DNSSEC zone validator
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libJudy.so:${PORTSDIR}/devel/judy
+LIB_DEPENDS=	libJudy.so:devel/judy
 
 USE_OPENSSL=	yes
 WITH_OPENSSL_PORT=yes
diff --git a/dns/vhostcname/Makefile b/dns/vhostcname/Makefile
index adac27934ddc..093dbcadc5ba 100644
--- a/dns/vhostcname/Makefile
+++ b/dns/vhostcname/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Synchronize DNS with server names and aliases from Apache vhost
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/walker/Makefile b/dns/walker/Makefile
index 94a4311e03e7..cdc0fadf6412 100644
--- a/dns/walker/Makefile
+++ b/dns/walker/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://josefsson.org/walker/releases/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Recover zone file information from servers that use DNSSEC
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-SEC>=0:${PORTSDIR}/dns/p5-Net-DNS-SEC
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-DNS-SEC>=0:dns/p5-Net-DNS-SEC
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	walker
diff --git a/dns/whoseip/Makefile b/dns/whoseip/Makefile
index 84c2a869344f..e0beeda6a3de 100644
--- a/dns/whoseip/Makefile
+++ b/dns/whoseip/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Get information about IP addresses: country code and network
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID
+RUN_DEPENDS=	p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR \
+		p5-Data-UUID>0:devel/p5-Data-UUID
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/dns/wrapsrv/Makefile b/dns/wrapsrv/Makefile
index 270201a9caff..5644a4949f3f 100644
--- a/dns/wrapsrv/Makefile
+++ b/dns/wrapsrv/Makefile
@@ -12,7 +12,7 @@ COMMENT=	DNS SRV record command line wrapper
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-BUILD_DEPENDS=	docbook2mdoc:${PORTSDIR}/textproc/docbook2mdoc
+BUILD_DEPENDS=	docbook2mdoc:textproc/docbook2mdoc
 
 PLIST_FILES=	bin/wrapsrv man/man1/wrapsrv.1.gz
 
diff --git a/dns/zkt/Makefile b/dns/zkt/Makefile
index a0b51b16a127..7784b0275a93 100644
--- a/dns/zkt/Makefile
+++ b/dns/zkt/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=		${WRKSRC}/LICENSE
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 1000055
-BUILD_DEPENDS=	dnssec-signzone:${PORTSDIR}/dns/bind99
+BUILD_DEPENDS=	dnssec-signzone:dns/bind99
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 .endif
 
diff --git a/dns/zonecheck/Makefile b/dns/zonecheck/Makefile
index 41e7698738eb..483b442cb61f 100644
--- a/dns/zonecheck/Makefile
+++ b/dns/zonecheck/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perform consistency checks on DNS zones
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/GPL
 
-RUN_DEPENDS=	rubygem-dnsruby>=1.47:${PORTSDIR}/dns/rubygem-dnsruby
+RUN_DEPENDS=	rubygem-dnsruby>=1.47:dns/rubygem-dnsruby
 
 USES=		gmake tar:tgz
 USE_RUBY=	yes