Remove ${PORTSDIR}/ from dependencies, categories m, n, o, and p.

With hat:	portmgr
Sponsored by:	Absolight

2612 files changed, 9991 insertions, 9991 deletions

diff --git a/mail/addresses-goodies/Makefile b/mail/addresses-goodies/Makefile
index 54dcdfe77082..593308e6d49d 100644
--- a/mail/addresses-goodies/Makefile
+++ b/mail/addresses-goodies/Makefile
@@ -16,8 +16,8 @@ LICENSE=	LGPL21
 USES=		gnustep
 USE_GNUSTEP=	back build
 
-LIB_DEPENDS=	libInspector.so:${PORTSDIR}/deskutils/gworkspace \
-		libAddresses.so:${PORTSDIR}/mail/addresses
+LIB_DEPENDS=	libInspector.so:deskutils/gworkspace \
+		libAddresses.so:mail/addresses
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Addresses-${PORTVERSION}/Goodies
diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 6450e6f4be6f..bbac38e5b244 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -85,12 +85,12 @@ IPV6_CONFIGURE_WITH=	ipv6
 .if ! ${PORT_OPTIONS:MNOSPELL}
 .if ! ${PORT_OPTIONS:MISPELL}
 CONFIGURE_ARGS+=--with-interactive-spellcheck=${LOCALBASE}/bin/aspell
-BUILD_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS+=	aspell:textproc/aspell
+RUN_DEPENDS+=	aspell:textproc/aspell
 .else
 CONFIGURE_ARGS+=	--with-interactive-spellcheck=${LOCALBASE}/bin/ispell
-BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
+BUILD_DEPENDS+=	ispell:textproc/aspell-ispell
+RUN_DEPENDS+=	ispell:textproc/aspell-ispell
 .endif
 .else
 CONFIGURE_ARGS+=--without-simple-spellcheck --without-interactive-spellcheck
@@ -98,7 +98,7 @@ CONFIGURE_ARGS+=--without-simple-spellcheck --without-interactive-spellcheck
 
 .if !defined(PICO_ALPINE_SLAVE)
 .if ${PORT_OPTIONS:MPICO}
-RUN_DEPENDS+=	pico:${PORTSDIR}/editors/pico-alpine
+RUN_DEPENDS+=	pico:editors/pico-alpine
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index d0b26b4b092d..cb56a01957a4 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -44,20 +44,20 @@ OPTIONS_EXCLUDE+=	PAM
 
 GDBM_DESC=		GDBM backend
 GDBM_IMPLIES=		GSASL
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_WITH=	gdbm
 
-GNUPG_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GNUPG_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GNUPG_CONFIGURE_WITH=	gpgme
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 
 GSASL_DESC=		GSASL support (required for databases)
-GSASL_LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
+GSASL_LIB_DEPENDS=	libgsasl.so:security/gsasl
 GSASL_CONFIGURE_WITH=	gsasl
 
-GUILE_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+GUILE_LIB_DEPENDS=	libguile.so:lang/guile
 GUILE_CONFIGURE_WITH=	guile
 GUILE_PORTEXAMPLES=	anubis.scm anubisrc.guile
 
@@ -74,7 +74,7 @@ NLS_CONFIGURE_ENABLE=	nls
 PAM_CONFIGURE_WITH=	pam
 PAM_PORTEXAMPLES=	pam
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_WITH=	pcre
 
 PGSQL_IMPLIES=		GSASL
diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile
index 19464a12f5ea..20f466b98630 100644
--- a/mail/archiveopteryx-devel/Makefile
+++ b/mail/archiveopteryx-devel/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
+BUILD_DEPENDS=	jam:devel/jam
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aox
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index 28cf5f407ccc..100b6d442485 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
+BUILD_DEPENDS=	jam:devel/jam
 
 USES=		perl5 tar:bzip2 pgsql:9.1+
 USE_OPENSSL=	yes
diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 27921606159e..68bf8182eb09 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME:tu}_${PORTVERSION}_Install
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Anti-Spam SMTP Proxy
 
-RUN_DEPENDS=	p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \
-		p5-HTML-Parser>=3.69:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS=	p5-Net-DNS>=0.68:dns/p5-Net-DNS \
+		p5-libwww>=6.04:www/p5-libwww \
+		p5-HTML-Parser>=3.69:www/p5-HTML-Parser
 
 USES=		perl5 zip:infozip shebangfix
 SHEBANG_FILES=	*.pl
@@ -63,63 +63,63 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_14158_install/${PORTNAM
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEMVALID}
-RUN_DEPENDS+=	p5-Email-Valid>=0.190:${PORTSDIR}/mail/p5-Email-Valid
+RUN_DEPENDS+=	p5-Email-Valid>=0.190:mail/p5-Email-Valid
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	p5-perl-ldap>=0.4400:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS+=	p5-perl-ldap>=0.4400:net/p5-perl-ldap
 .endif
 
 .if ${PORT_OPTIONS:MSPF}
-RUN_DEPENDS+=	p5-Mail-SPF>=2.007:${PORTSDIR}/mail/p5-Mail-SPF
+RUN_DEPENDS+=	p5-Mail-SPF>=2.007:mail/p5-Mail-SPF
 .endif
 
 .if ${PORT_OPTIONS:MSRS}
-RUN_DEPENDS+=	p5-Mail-SRS>=0.31:${PORTSDIR}/mail/p5-Mail-SRS
+RUN_DEPENDS+=	p5-Mail-SRS>=0.31:mail/p5-Mail-SRS
 .endif
 
 .if ${PORT_OPTIONS:MSEND}
-RUN_DEPENDS+=	p5-Email-Send>=2.198:${PORTSDIR}/mail/p5-Email-Send
+RUN_DEPENDS+=	p5-Email-Send>=2.198:mail/p5-Email-Send
 .endif
 
 .if ${PORT_OPTIONS:MFBACKW}
-RUN_DEPENDS+=	p5-File-ReadBackwards>=1.05:${PORTSDIR}/devel/p5-File-ReadBackwards
+RUN_DEPENDS+=	p5-File-ReadBackwards>=1.05:devel/p5-File-ReadBackwards
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
-RUN_DEPENDS+=	p5-File-Scan-ClamAV>=1.9.1:${PORTSDIR}/security/p5-File-Scan-ClamAV
+RUN_DEPENDS+=	p5-File-Scan-ClamAV>=1.9.1:security/p5-File-Scan-ClamAV
 PLIST_SUB+=	ASSP_CLAMAV=""
 .else
 PLIST_SUB+=	ASSP_CLAMAV="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDNSBL}
-RUN_DEPENDS+=	p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS+=	p5-Net-DNS>=0.68:dns/p5-Net-DNS
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	p5-Tie-DBI>=1.05:${PORTSDIR}/databases/p5-Tie-DBI
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-Tie-DBI>=1.05:databases/p5-Tie-DBI
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MMATCHRE}
-RUN_DEPENDS+=	p5-Net-IP-Match-Regexp>=1.01:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-Regexp
+RUN_DEPENDS+=	p5-Net-IP-Match-Regexp>=1.01:net-mgmt/p5-Net-IP-Match-Regexp
 .endif
 
 .if ${PORT_OPTIONS:MSENDERB}
-RUN_DEPENDS+=	p5-Net-SenderBase>=1.02:${PORTSDIR}/mail/p5-Net-SenderBase
+RUN_DEPENDS+=	p5-Net-SenderBase>=1.02:mail/p5-Net-SenderBase
 .endif
 
 .if ${PORT_OPTIONS:MMIMEMOD}
-RUN_DEPENDS+=	p5-Email-MIME>=1.910:${PORTSDIR}/mail/p5-Email-MIME
+RUN_DEPENDS+=	p5-Email-MIME>=1.910:mail/p5-Email-MIME
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
-RUN_DEPENDS+=	p5-IO-Socket-SSL>=1.74:${PORTSDIR}/security/p5-IO-Socket-SSL
+RUN_DEPENDS+=	p5-IO-Socket-SSL>=1.74:security/p5-IO-Socket-SSL
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
-RUN_DEPENDS+=	p5-IO-Socket-INET6>=2.69:${PORTSDIR}/net/p5-IO-Socket-INET6
+RUN_DEPENDS+=	p5-IO-Socket-INET6>=2.69:net/p5-IO-Socket-INET6
 .endif
 
 EXTRACT_AFTER_ARGS=	-d ${PORTNAME}-${PORTVERSION}
diff --git a/mail/automx/Makefile b/mail/automx/Makefile
index d90e984c4c7b..a6385dd3516a 100644
--- a/mail/automx/Makefile
+++ b/mail/automx/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Handles mail account profile requests from mail clients
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>=0:${PORTSDIR}/security/py-m2crypto \
-		wget:${PORTSDIR}/ftp/wget \
-		dig:${PORTSDIR}/dns/bind-tools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}m2crypto>=0:security/py-m2crypto \
+		wget:ftp/wget \
+		dig:dns/bind-tools
 
 GH_ACCOUNT=	sys4
 
@@ -32,7 +32,7 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS MEMCACHE
 MEMCACHE_DESC=	Add memcache support
-MEMCACHE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=0:${PORTSDIR}/databases/py-python-memcached
+MEMCACHE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index 0f66ddee170c..dbc124cf83d1 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--enable-ssl=${OPENSSLBASE} \
 OPTIONS_DEFINE=	SASL DOCS
 
 SASL_CONFIGURE_ON=	--enable-sasl
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index b2058ac3abfa..81e4367325ce 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -11,14 +11,14 @@ MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mail reader for the GNOME desktop
 
-BUILD_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnome-keyring \
-		itstool:${PORTSDIR}/textproc/itstool \
-		yelp-tools>=0:${PORTSDIR}/textproc/yelp-tools
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libesmtp.so:${PORTSDIR}/mail/libesmtp \
-		libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
-RUN_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnome-keyring
+BUILD_DEPENDS=	gnome-keyring:security/gnome-keyring \
+		itstool:textproc/itstool \
+		yelp-tools>=0:textproc/yelp-tools
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libesmtp.so:mail/libesmtp \
+		libgmime-2.6.so:mail/gmime26 \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3
+RUN_DEPENDS=	gnome-keyring:security/gnome-keyring
 
 # Depends on gtkhtml4 (which is being abandonend). When our webkitgtk3
 # in ports gets updated to > 1.10.x, balsa should depend on it.
@@ -45,14 +45,14 @@ GTKSPELL_DESC=	Spell checking support
 GTKSV_DESC=	GtkSourceview support
 GPG_DESC=	GnuPG support
 GPG_CONFIGURE_WITH=	gpgme
-GPG_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GPG_LIB_DEPENDS=	libgpgme.so:security/gpgme
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_WITH=	ldap
 GTKSPELL_CONFIGURE_WITH=	gtkspell
-GTKSPELL_LIB_DEPENDS=		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3
+GTKSPELL_LIB_DEPENDS=		libgtkspell3-3.so:textproc/gtkspell3
 GTKSV_USE=		GNOME=gtksourceview3
 GTKSV_CONFIGURE_WITH=	gtksourceview
 NOTIFY_CONFIGURE_WITH=	libnotify
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 .include <bsd.port.mk>
diff --git a/mail/batv-milter/Makefile b/mail/batv-milter/Makefile
index c545d4df5ab4..c3e9d308d49b 100644
--- a/mail/batv-milter/Makefile
+++ b/mail/batv-milter/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	umq@ueo.co.jp
 COMMENT=	Milter for BATV (Bounce Address Tag Validation)
 
 .if !exists( /usr/include/libmilter/mfapi.h )
-BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/libmilter
+BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:mail/libmilter
 .endif
 
 USES=		uidfix
diff --git a/mail/bayespam/Makefile b/mail/bayespam/Makefile
index f2770fca135a..950e1b60ecc2 100644
--- a/mail/bayespam/Makefile
+++ b/mail/bayespam/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Qmail spam filter written in Perl using Bayesian classification
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
+RUN_DEPENDS=	p5-MIME-Tools>=0:mail/p5-MIME-Tools
 
 USES=		shebangfix perl5
 NO_BUILD=	yes
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index c240dc1a732e..2f8d0c2baf69 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool intended for Blackbox that checks for new mail
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libbt.pc:${PORTSDIR}/x11-wm/blackbox
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libbt.pc:x11-wm/blackbox
 
 USES=		pkgconfig
 USE_XORG=	xext
diff --git a/mail/biabam/Makefile b/mail/biabam/Makefile
index a1d557c221ae..af662b159331 100644
--- a/mail/biabam/Makefile
+++ b/mail/biabam/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Command-line attachment mailer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/biabam
diff --git a/mail/bincimap/Makefile b/mail/bincimap/Makefile
index 30acea04d49f..3d59d4074d9c 100644
--- a/mail/bincimap/Makefile
+++ b/mail/bincimap/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Light-weight IMAP server for Maildir
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	checkpassword-pam:${PORTSDIR}/security/checkpassword-pam \
-		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	checkpassword-pam:security/checkpassword-pam \
+		tcpserver:sysutils/ucspi-tcp
 
 USE_RC_SUBR=	bincimapd
 GNU_CONFIGURE=	yes
diff --git a/mail/bogofilter-tc/Makefile b/mail/bogofilter-tc/Makefile
index c446a5205117..dc943be787ac 100644
--- a/mail/bogofilter-tc/Makefile
+++ b/mail/bogofilter-tc/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-tc
 MAINTAINER=	mandree@FreeBSD.org
 # Blanket approval for changes by Zach Thompson (address above)
 
-LIB_DEPENDS=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 CONFLICTS_INSTALL=	bogofilter-[0-9]* [a-z][a-z]-bogofilter-[1-9]* bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]*
 
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 7bd8cb36b7e9..90f21edc53ed 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -32,7 +32,7 @@ CPE_VENDOR=	bogofilter_project
 
 UNICODE_USES=	iconv
 UNICODE_CONFIGURE_ENABLE=	unicode
-GSL_LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 GSL_CONFIGURE_ARGS_OFF=	--with-included-gsl
 
 PORTDOCS=	*
diff --git a/mail/bsfilter/Makefile b/mail/bsfilter/Makefile
index bc8b9e753650..517d35859da3 100644
--- a/mail/bsfilter/Makefile
+++ b/mail/bsfilter/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bayesian spam filter written in Ruby
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${RUBY_PKGNAMEPREFIX}gdbm>=0:${PORTSDIR}/databases/ruby-gdbm
+RUN_DEPENDS=	${RUBY_PKGNAMEPREFIX}gdbm>=0:databases/ruby-gdbm
 
 NO_BUILD=	yes
 USE_RUBY=	yes
@@ -26,7 +26,7 @@ MECAB_DESC=	Part-of-Speech and Morphological Analyzer
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMECAB}
-RUN_DEPENDS+=	ja-${RUBY_PKGNAMEPREFIX}mecab>=0:${PORTSDIR}/japanese/ruby-mecab
+RUN_DEPENDS+=	ja-${RUBY_PKGNAMEPREFIX}mecab>=0:japanese/ruby-mecab
 .endif
 
 do-install:
diff --git a/mail/bsmtp/Makefile b/mail/bsmtp/Makefile
index f7f26eaab093..3a1fca54bc23 100644
--- a/mail/bsmtp/Makefile
+++ b/mail/bsmtp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Batch SMTP support for sendmail, incoming and outgoing
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/uux:${PORTSDIR}/net/freebsd-uucp
+RUN_DEPENDS=	${LOCALBASE}/bin/uux:net/freebsd-uucp
 
 CONFLICTS=	smail-3.*
 
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index 15cb97475714..67833d345b8e 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	Spam filtering plugin for Claws Mail
 
-RUN_DEPENDS=	bogofilter:${PORTSDIR}/mail/bogofilter
+RUN_DEPENDS=	bogofilter:mail/bogofilter
 
 CLAWS_PLUGINS_BUILD=	bogofilter
 
diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index 9a96253b0834..62d78c35d227 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	Spam filtering, bsfilter based plugin for Claws Mail
 
-RUN_DEPENDS=	bsfilter:${PORTSDIR}/mail/bsfilter
+RUN_DEPENDS=	bsfilter:mail/bsfilter
 
 CLAWS_PLUGINS_BUILD=	bsfilter
 
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index e8da65f81b3d..d29a2ef45fe0 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	ClamAV based antivirus plugin for Claws Mail
 
-RUN_DEPENDS=	clamd:${PORTSDIR}/security/clamav
+RUN_DEPENDS=	clamd:security/clamav
 
 CLAWS_PLUGINS_BUILD=	clamd
 
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index b88f92cf94ca..fa8ebc0aea90 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -6,8 +6,8 @@ PORTREVISION=	0
 
 COMMENT=	Webkit based HTML renderer plugin for Claws Mail
 
-LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libwebkitgtk-1.0.so:www/webkit-gtk2
 
 CLAWS_PLUGINS_BUILD=	fancy
 
diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
index b8b7606ca9f7..abb9cbc57402 100644
--- a/mail/claws-mail-gdata/Makefile
+++ b/mail/claws-mail-gdata/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	Plugin providing Google Contacts in the Tab-address completion
 
-LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata
+LIB_DEPENDS=	libgdata.so:devel/libgdata
 
 CLAWS_PLUGINS_BUILD=	gdata
 
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 42de5d8be1ce..fc5659a6ce80 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -6,8 +6,8 @@ PORTREVISION=	0
 
 COMMENT=	New mail notification plugin for Claws Mail
 
-LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
+		libnotify.so:devel/libnotify
 
 CLAWS_PLUGINS_BUILD=	notification
 
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 146c85bf9980..9ef2db4fc708 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	2
 
 COMMENT=	PDF and PostScript viewer plugin for Claws Mail
 
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 
 USES+=		ghostscript
 
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index 5a5ac73811b4..2daf94e1ff47 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	PGP plugins for Claws Mail
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+LIB_DEPENDS=	libgpgme.so:security/gpgme
 
 CLAWS_PLUGINS_BUILD=	pgpcore pgpinline pgpmime smime
 
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index 431adec835a7..1170d574a802 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	SpamAssassin plugin for Claws Mail
 
-RUN_DEPENDS=	spamd:${PORTSDIR}/mail/spamassassin
+RUN_DEPENDS=	spamd:mail/spamassassin
 
 CLAWS_PLUGINS_BUILD=	spamassassin
 
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 7dcaf3f95085..4629ad8dcd5a 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,10 +7,10 @@ CATEGORIES=	mail news ipv6
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
 
-LIB_DEPENDS=	libetpan.so:${PORTSDIR}/mail/libetpan \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	mime-support>0:${PORTSDIR}/misc/mime-support
+LIB_DEPENDS=	libetpan.so:mail/libetpan \
+		libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt
+RUN_DEPENDS=	mime-support>0:misc/mime-support
 
 USE_GNOME=	gtk20
 USES=		cpe desktop-file-utils execinfo pathfix shebangfix
@@ -24,20 +24,20 @@ OPTIONS_SUB=	yes
 
 COMPFACE_DESC=		X-Face support
 COMPFACE_CONFIGURE_ENABLE=	compface
-COMPFACE_LIB_DEPENDS=	libcompface.so:${PORTSDIR}/mail/faces
+COMPFACE_LIB_DEPENDS=	libcompface.so:mail/faces
 
 DEBUG_CONFIGURE_ON=	--enable-maintainer-mode
 
 ENCHANT_DESC=		Spell checking support
 ENCHANT_CONFIGURE_ENABLE=	enchant
-ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 JPILOT_DESC=		JPilot support
 JPILOT_CONFIGURE_ENABLE=	jpilot
-JPILOT_LIB_DEPENDS=	libpisock.so:${PORTSDIR}/palm/pilot-link
-JPILOT_RUN_DEPENDS=	jpilot:${PORTSDIR}/palm/jpilot
+JPILOT_LIB_DEPENDS=	libpisock.so:palm/pilot-link
+JPILOT_RUN_DEPENDS=	jpilot:palm/jpilot
 
 LDAP_CONFIGURE_ENABLE=	ldap
 LDAP_USE=		openldap=yes
@@ -45,17 +45,17 @@ LDAP_USE=		openldap=yes
 MANUAL_DESC=		User manual (many dependencies, including texlive)
 MANUAL_CONFIGURE_ON=	--enable-manual --with-manualdir=${DOCSDIR}/manual
 MANUAL_CONFIGURE_OFF=	--disable-manual
-MANUAL_BUILD_DEPENDS=	docbook-utils>0:${PORTSDIR}/textproc/docbook-utils
+MANUAL_BUILD_DEPENDS=	docbook-utils>0:textproc/docbook-utils
 
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext
 
 STARTUP_DESC=		Startup notification support
 STARTUP_CONFIGURE_ENABLE=	startup-notification
-STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
 THEMES_DESC=		Additional themes
-THEMES_RUN_DEPENDS=	claws-mail-themes>0:${PORTSDIR}/x11-themes/claws-mail-themes
+THEMES_RUN_DEPENDS=	claws-mail-themes>0:x11-themes/claws-mail-themes
 
 .include "Makefile.claws"
 
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index 512b22efaa0a..3931852dcfe9 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -51,8 +51,8 @@ CONFIGURE_ARGS+=	--disable-${p}-plugin
 DISTNAME=	claws-mail-${PORTVERSION}
 PKGNAMEPREFIX=	claws-mail-
 
-BUILD_DEPENDS+=	claws-mail>=${PORTVERSION}:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS+=	claws-mail>=${PORTVERSION}:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS+=	claws-mail>=${PORTVERSION}:mail/claws-mail
+RUN_DEPENDS+=	claws-mail>=${PORTVERSION}:mail/claws-mail
 
 MASTERDIR=	${.CURDIR}/../../mail/claws-mail
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index 4eead7bb5a00..c92cb0422dc9 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Applet to edit Claws Mail's hidden preferences
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext
 
 USES=		shebangfix perl5
 SHEBANG_FILES=	${PORTNAME}
diff --git a/mail/cleanup-maildir/Makefile b/mail/cleanup-maildir/Makefile
index 3d4526bd2c4b..22e88a94348a 100644
--- a/mail/cleanup-maildir/Makefile
+++ b/mail/cleanup-maildir/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/ehaupt
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Script for cleaning up mails in Maildir folders based on arival date
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:${PORTSDIR}/graphics/py-graph-core
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:graphics/py-graph-core
 
 USES=		python shebangfix
 NO_BUILD=	yes
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 217fd90050fb..829519b7266f 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Console based mail client with POP3/IMAP/SMAP support
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell \
-				libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
-BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+LIB_DEPENDS=	libaspell.so:textproc/aspell \
+				libcourier-unicode.so:devel/courier-unicode
+BUILD_DEPENDS=	gpgv:security/gnupg1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		fam gettext gmake iconv ncurses perl5 shebangfix tar:bzip2
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index fa094ecb700e..83e93cea9a10 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	SF/courier/imap/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 
-BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base \
-		${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool
-LIB_DEPENDS=	libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
+BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
+RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
+		${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
+LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode
 
 USES=		gmake perl5 tar:bzip2
 GNU_CONFIGURE=	yes
@@ -65,7 +65,7 @@ CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 
 .if ${PORT_OPTIONS:MGNUTLS}
 CONFIGURE_ARGS+=--with-gnutls
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 USES+=		pkgconfig
 .endif
 
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
 .if ${PORT_OPTIONS:MAUTH_USERDB}
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB}
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=--with-db=db  --with-userdb=${USERDB}
 .endif
diff --git a/mail/courier-pythonfilter/Makefile b/mail/courier-pythonfilter/Makefile
index 4acfd59cdd39..8cfd60633d55 100644
--- a/mail/courier-pythonfilter/Makefile
+++ b/mail/courier-pythonfilter/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://phantom.dragonsdawn.net/~gordon/courier-patches/courier-pyt
 MAINTAINER=	bsd@dino.sk
 COMMENT=	Framework for courier filter development in python
 
-BUILD_DEPENDS=	courier-config:${PORTSDIR}/mail/courier
+BUILD_DEPENDS=	courier-config:mail/courier
 
 USES=		python
 USE_PYTHON=	distutils
@@ -66,11 +66,11 @@ OPTIONS_DEFAULT=	DEBUG WHITELIST_RELAY WHITELIST_AUTH
 PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${PYSCRIPTSDIR}
 
 .if ${PORT_OPTIONS:MCLAMAV_CLAMD} && ! ${PORT_OPTIONS:MCLAMAV_LIB}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyclamd.py:${PORTSDIR}/security/py-pyclamd
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV_LIB} && ! ${PORT_OPTIONS:MCLAMAV_CLAMD}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyclamav.so:${PORTSDIR}/security/py-clamav
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyclamav.so:security/py-clamav
 .endif
 
 post-extract:
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 9cd0ccf5d8fd..217e80caf936 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES=	SF
 MAINTAINER=	bsd@dino.sk
 COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
 
-BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base \
-		${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
-		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
-		p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		ca_root_nss>=3.*:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
+LIB_DEPENDS=	libpcre.so:devel/pcre
+RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
+		${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool \
+		${LOCALBASE}/etc/mime.types:misc/mime-support \
+		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
+		ca_root_nss>=3.*:security/ca_root_nss
 
 CONFLICTS=	courier-imap-2.* couriermlm-0.* \
 		exim-4.* maildrop-1.* \
@@ -136,7 +136,7 @@ PERIODIC_DESC=	modify/create periodic.conf
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 WITH_AUTH_LDAP=	yes
-RUN_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthldap.so:${PORTSDIR}/net/courier-authlib-ldap
+RUN_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap
 CONFIGURE_ARGS+=--with-ldapaliasd
 PLIST_SUB+=	WITHLDAP=""
 SUB_LIST+=	WITHLDAP=""
@@ -167,31 +167,31 @@ SUB_LIST+=	WITHEMPTYALIASES="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGNUPG}
-BUILD_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS+=	gpg:security/gnupg
+RUN_DEPENDS+=	gpg:security/gnupg
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}
-BUILD_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS+=	aspell:textproc/aspell
+RUN_DEPENDS+=	aspell:textproc/aspell
 CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/aspell
 .elif ${PORT_OPTIONS:MISPELL}
-BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
+BUILD_DEPENDS+=	ispell:textproc/aspell-ispell
+RUN_DEPENDS+=	ispell:textproc/aspell-ispell
 CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/ispell
 .else
 CONFIGURE_ARGS+=--without-ispell
 .endif
 
 .if ${PORT_OPTIONS:MPROCMAIL}
-BUILD_DEPENDS+=	procmail:${PORTSDIR}/mail/procmail
-RUN_DEPENDS+=	procmail:${PORTSDIR}/mail/procmail
+BUILD_DEPENDS+=	procmail:mail/procmail
+RUN_DEPENDS+=	procmail:mail/procmail
 .endif
 
 .if ${PORT_OPTIONS:MSENDFAX}
 USES+=		ghostscript
-SENDFAX_DEPENDS=sendfax:${PORTSDIR}/comms/mgetty+sendfax \
-		pnmscale:${PORTSDIR}/graphics/netpbm
+SENDFAX_DEPENDS=sendfax:comms/mgetty+sendfax \
+		pnmscale:graphics/netpbm
 BUILD_DEPENDS+=	${SENDFAX_DEPENDS}
 RUN_DEPENDS+=	${SENDFAX_DEPENDS}
 WITH_TRANSPORT+=fax
@@ -204,8 +204,8 @@ SUB_LIST+=	WITHFAX="@comment "
 
 .if ${PORT_OPTIONS:MUUCP}
 .if !exists(/usr/bin/uux)
-BUILD_DEPENDS+=	uux:${PORTSDIR}/net/freebsd-uucp
-RUN_DEPENDS+=	uux:${PORTSDIR}/net/freebsd-uucp
+BUILD_DEPENDS+=	uux:net/freebsd-uucp
+RUN_DEPENDS+=	uux:net/freebsd-uucp
 .endif
 WITH_TRANSPORT+=uucp
 PLIST_SUB+=	WITHUUCP=""
diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile
index 81199f3d0fb3..6e2934d115ba 100644
--- a/mail/couriergraph/Makefile
+++ b/mail/couriergraph/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RRDtool frontend for Courier statistics
 
-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
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index e106d74a757c..302043bbc023 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Markov based SpamFilter
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtre.so:${PORTSDIR}/textproc/libtre
+LIB_DEPENDS=	libtre.so:textproc/libtre
 
 CRM114RELEASENAME=BlameMichelson
 
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 2992dfe1d4b9..1cb86eca06fd 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -13,8 +13,8 @@ COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
+		libpcre.so:devel/pcre
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^3].* cyrus-imapd2[^3]-2.[^3].*
 
@@ -53,7 +53,7 @@ BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
 DRAC_DESC=		Enable DRAC support
 DRAC_CONFIGURE_ON=	--with-drac=${LOCALBASE}
-DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:mail/drac
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_PTLOADER_DESC=	Enable LDAP ptloader
@@ -79,7 +79,7 @@ PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SNMP_5_DESC=		Enable SNMP support
-SNMP_5_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_5_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_5_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_5_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_DESC=		Enable SQLite backend (experimental)
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 144727e632f6..cf3970f7d219 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -14,8 +14,8 @@ COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
+		libpcre.so:devel/pcre
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].*
 
@@ -53,7 +53,7 @@ BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
 DRAC_DESC=		Enable DRAC support
 DRAC_CONFIGURE_ON=	--with-drac=${LOCALBASE}
-DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:mail/drac
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
@@ -75,7 +75,7 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_USE=		SQLITE=yes
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index be8fd9896d81..64db68a8fc88 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -14,8 +14,8 @@ COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
+		libpcre.so:devel/pcre
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^5].* cyrus-imapd2[^5]-2.[^5].*
 
@@ -54,14 +54,14 @@ BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
-CLAMAV_LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
+CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 DRAC_DESC=		Enable DRAC support
 DRAC_CONFIGURE_ON=	--with-drac=${LOCALBASE}
-DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:mail/drac
 HTTP_DESC=		Enable HTTP (beta quality)
 HTTP_CONFIGURE_ENABLE=	http
-HTTP_LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
-			libical.so:${PORTSDIR}/devel/libical
+HTTP_LIB_DEPENDS=	libjansson.so:devel/jansson \
+			libical.so:devel/libical
 HTTP_USES=		pkgconfig
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
@@ -85,7 +85,7 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 2e17bd75739d..f06bcb66a1ae 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -12,13 +12,13 @@ COMMENT=	SQL database-based mail system (POP3 and IMAP)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
-		libzdb.so:${PORTSDIR}/databases/libzdb \
-		libmhash.so:${PORTSDIR}/security/mhash \
-		libevent.so:${PORTSDIR}/devel/libevent2
-BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xmlto:${PORTSDIR}/textproc/xmlto \
-		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
+LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
+		libzdb.so:databases/libzdb \
+		libmhash.so:security/mhash \
+		libevent.so:devel/libevent2
+BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+		xmlto:textproc/xmlto \
+		docbook-sgml>0:textproc/docbook-sgml
 
 CONFLICTS=	dbmail22-[0-9]*
 
@@ -45,7 +45,7 @@ MAKE_ARGS+=	mandir=${MANPREFIX}/man
 DOCS=		AUTHORS BUGS INSTALL THANKS UPGRADING
 
 SIEVE_CONFIGURE_WITH=	sieve
-SIEVE_LIB_DEPENDS=	libsieve.so:${PORTSDIR}/mail/libsieve
+SIEVE_LIB_DEPENDS=	libsieve.so:mail/libsieve
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 8a697684fd44..2d35783c539b 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -13,7 +13,7 @@ COMMENT=	SQL database-based mail system (POP3 and IMAP)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgmime-2.0.so:${PORTSDIR}/mail/gmime2
+LIB_DEPENDS=	libgmime-2.0.so:mail/gmime2
 
 CONFLICTS=	dbmail-3.*
 
@@ -32,7 +32,7 @@ SQLITE_CONFIGURE_WITH=	sqlite
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 SIEVE_CONFIGURE_WITH=	sieve
-SIEVE_LIB_DEPENDS=	libsieve.so:${PORTSDIR}/mail/libsieve
+SIEVE_LIB_DEPENDS=	libsieve.so:mail/libsieve
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 INSTALL_TARGET=	install-strip
diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index d4b194a3e47f..9ca55f852bc0 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -62,7 +62,7 @@ CONFIGURE_ARGS=	--with-uid=${DCCUSER} \
 ALT_HOME_CONFIGURE_ON=	--libexecdir=${PREFIX}/dcc/libexec --with-cgibin=${PREFIX}/dcc/cgi-bin
 DCCM_CONFIGURE_ENABLE=	dccm
 DCCM_USE=	rc_subr=dccm
-PORTS_SENDMAIL_BUILD_DEPENDS=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/libmilter
+PORTS_SENDMAIL_BUILD_DEPENDS=	${LOCALBASE}/lib/libmilter.a:mail/libmilter
 PORTS_SENDMAIL_CONFIGURE_ON=	--with-sendmail=yes
 DCCIFD_CONFIGURE_ENABLE=	dccifd
 DCCIFD_USE=	rc_subr=dccifd
diff --git a/mail/deforaos-mailer/Makefile b/mail/deforaos-mailer/Makefile
index 52e8153e4c7d..d701b3c45113 100644
--- a/mail/deforaos-mailer/Makefile
+++ b/mail/deforaos-mailer/Makefile
@@ -14,8 +14,8 @@ COMMENT=	DeforaOS desktop mail client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop
 
 USE_GNOME=	gtk20
 USES=		desktop-file-utils pkgconfig
@@ -31,8 +31,8 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
-DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/delatt/Makefile b/mail/delatt/Makefile
index 4fb44680f359..3c748826e0cc 100644
--- a/mail/delatt/Makefile
+++ b/mail/delatt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Strip attachments from email
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64
 
 USES=		shebangfix perl5
 USE_PERL5=	run
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index de61ffca970a..b55dcec31373 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -25,9 +25,9 @@ WITH_SENDMAIL_BASE=	yes
 PKGMESSAGE=	pkg-message.postfix
 
 .if defined(WITH_POSTFIX_CURRENT)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
+RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:mail/postfix-current
 .else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
+RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:mail/postfix
 .endif
 .endif
 
diff --git a/mail/dkfilter/Makefile b/mail/dkfilter/Makefile
index edc209004352..5f624a371862 100644
--- a/mail/dkfilter/Makefile
+++ b/mail/dkfilter/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Domainkeys filter for Postfix
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-Server>=0:net/p5-Net-Server
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/mail/dkimproxy/Makefile b/mail/dkimproxy/Makefile
index cbbe9996b9f6..6c19143b0842 100644
--- a/mail/dkimproxy/Makefile
+++ b/mail/dkimproxy/Makefile
@@ -13,9 +13,9 @@ COMMENT=	DKIM filter for Postfix
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Mail-DKIM>=0:${PORTSDIR}/mail/p5-Mail-DKIM \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error
+BUILD_DEPENDS=	p5-Mail-DKIM>=0:mail/p5-Mail-DKIM \
+		p5-Net-Server>=0:net/p5-Net-Server \
+		p5-Error>=0:lang/p5-Error
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	IPV6 TEST
@@ -34,7 +34,7 @@ GROUPS=		${DKIMPROXYUSER}
 SUB_LIST+=	PERL=${PERL} \
 		DKIMPROXYUSER=${DKIMPROXYUSER}
 
-IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
+IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6
 
 IPV6_EXTRA_PATCHES=	${FILESDIR}/extra-patch-lib-MSDW-SMTP-Server.pm \
 			${FILESDIR}/extra-patch-scripts-dkimproxy.out \
@@ -42,6 +42,6 @@ IPV6_EXTRA_PATCHES=	${FILESDIR}/extra-patch-lib-MSDW-SMTP-Server.pm \
 			${FILESDIR}/extra-patch-scripts-dkimproxy_out.conf.example
 
 TEST_DESC=	Use dkim_responder.pl
-TEST_RUN_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
+TEST_RUN_DEPENDS=	p5-MIME-Tools>=0:mail/p5-MIME-Tools
 
 .include <bsd.port.mk>
diff --git a/mail/dovecot-antispam/Makefile b/mail/dovecot-antispam/Makefile
index 357dbd320b8f..029893094a49 100644
--- a/mail/dovecot-antispam/Makefile
+++ b/mail/dovecot-antispam/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Dovecot plugin to train dspam about spam or false positives
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/mail/dovecot:configure
-RUN_DEPENDS=	dovecot>=1.1.2:${PORTSDIR}/mail/dovecot
+BUILD_DEPENDS=	${NONEXISTENT}:mail/dovecot:configure
+RUN_DEPENDS=	dovecot>=1.1.2:mail/dovecot
 
 USES=		gmake tar:bzip2
 USE_LDCONFIG=	${PREFIX}/lib/dovecot/imap
diff --git a/mail/dovecot-managesieve/Makefile b/mail/dovecot-managesieve/Makefile
index 763b429b5f92..652e54ce695a 100644
--- a/mail/dovecot-managesieve/Makefile
+++ b/mail/dovecot-managesieve/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${DISTVERSION
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	Dovecot ManageSieve Server daemon
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/mail/dovecot:build \
-		${NONEXISTENT}:${PORTSDIR}/mail/dovecot-sieve:build
-RUN_DEPENDS=	dovecot>=${DOVECOTVERSION}.*:${PORTSDIR}/mail/dovecot \
-		dovecot-sieve>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot-sieve
+BUILD_DEPENDS=	${NONEXISTENT}:mail/dovecot:build \
+		${NONEXISTENT}:mail/dovecot-sieve:build
+RUN_DEPENDS=	dovecot>=${DOVECOTVERSION}.*:mail/dovecot \
+		dovecot-sieve>=${DOVECOTVERSION}:mail/dovecot-sieve
 
 DOVECOTVERSION=	1.2
 
diff --git a/mail/dovecot-sieve/Makefile b/mail/dovecot-sieve/Makefile
index 38cc0c8869ba..49699f345188 100644
--- a/mail/dovecot-sieve/Makefile
+++ b/mail/dovecot-sieve/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Sieve plugin for the Dovecot 'deliver' LDA
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/mail/dovecot:build
-RUN_DEPENDS=	dovecot>=${DOVECOTVERSION}.*:${PORTSDIR}/mail/dovecot
+BUILD_DEPENDS=	${NONEXISTENT}:mail/dovecot:build
+RUN_DEPENDS=	dovecot>=${DOVECOTVERSION}.*:mail/dovecot
 
 DOVECOTVERSION=	1.2
 
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index cebb75804edf..dc349fd9e495 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -80,7 +80,7 @@ SQLITE_CONFIGURE_WITH=	sqlite
 SQLITE_USE=		SQLITE=3
 SSL_CONFIGURE_OFF=	--without-ssl
 SSL_CONFIGURE_ON=	--with-ssl=openssl
-VPOPMAIL_BUILD_DEPENDS=	${LOCALBASE}/vpopmail/bin/vchkpw:${PORTSDIR}/mail/vpopmail
+VPOPMAIL_BUILD_DEPENDS=	${LOCALBASE}/vpopmail/bin/vchkpw:mail/vpopmail
 VPOPMAIL_CONFIGURE_WITH=vpopmail
 
 .include <bsd.port.options.mk>
diff --git a/mail/dovecot2-antispam-plugin/Makefile b/mail/dovecot2-antispam-plugin/Makefile
index a95b2b3ad89c..de4697eebe3e 100644
--- a/mail/dovecot2-antispam-plugin/Makefile
+++ b/mail/dovecot2-antispam-plugin/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Dovecot 2.x plugin for spam systems training
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	dovecot2>=2.2.0:${PORTSDIR}/mail/dovecot2 \
-		gawk:${PORTSDIR}/lang/gawk
-RUN_DEPENDS=	dovecot2>=2.2.0:${PORTSDIR}/mail/dovecot2
+BUILD_DEPENDS=	dovecot2>=2.2.0:mail/dovecot2 \
+		gawk:lang/gawk
+RUN_DEPENDS=	dovecot2>=2.2.0:mail/dovecot2
 
 CONFLICTS=	dovecot-antispam-1.*
 WRKSRC=		${WRKDIR}/dovecot-antispam-plugin-5ebc6aae4d7c
diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index ca4345bf9f05..c288bf7c4ed9 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Sieve plugin for the Dovecot 'deliver' LDA and LMTP
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS:=	dovecot2>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot2
-RUN_DEPENDS:=	dovecot2>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot2
+BUILD_DEPENDS:=	dovecot2>=${DOVECOTVERSION}:mail/dovecot2
+RUN_DEPENDS:=	dovecot2>=${DOVECOTVERSION}:mail/dovecot2
 
 DOVECOTVERSION=	2.2
 
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 5cf7f751c0fd..4ebc35375a8a 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -72,7 +72,7 @@ GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
 GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
 
 CDB_CONFIGURE_WITH=	cdb
-CDB_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
+CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
 
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 GSSAPI_BASE_USES=		gssapi
@@ -83,7 +83,7 @@ GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
 
 ICU_CONFIGURE_WITH=	icu
-ICU_LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS=	libicui18n.so:devel/icu
 ICU_USES=		pkgconfig
 
 KQUEUE_CONFIGURE_OFF=	--with-ioloop=poll --with-notify=none
@@ -95,9 +95,9 @@ LDAP_CONFIGURE_WITH=	ldap
 LIBWRAP_CONFIGURE_WITH=	libwrap
 
 LUCENE_CONFIGURE_WITH=	lucene
-LUCENE_LIB_DEPENDS=	libclucene-core.so:${PORTSDIR}/textproc/clucene
+LUCENE_LIB_DEPENDS=	libclucene-core.so:textproc/clucene
 
-LZ4_LIB_DEPENDS=	liblz4.so:${PORTSDIR}/archivers/liblz4
+LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_WITH=	mysql
@@ -106,8 +106,8 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 
 SOLR_CONFIGURE_WITH=	solr
-SOLR_BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-SOLR_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+SOLR_BUILD_DEPENDS=	curl:ftp/curl
+SOLR_LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 SQLITE_USE=		SQLITE=3
 SQLITE_CONFIGURE_WITH=	sqlite
@@ -115,9 +115,9 @@ SQLITE_CONFIGURE_WITH=	sqlite
 SSL_CONFIGURE_WITH=	ssl=openssl
 
 TEXTCAT_CONFIGURE_WITH=	textcat
-TEXTCAT_LIB_DEPENDS=	libtextcat.so:${PORTSDIR}/textproc/libtextcat
+TEXTCAT_LIB_DEPENDS=	libtextcat.so:textproc/libtextcat
 
-VPOPMAIL_BUILD_DEPENDS=	${LOCALBASE}/vpopmail/bin/vchkpw:${PORTSDIR}/mail/vpopmail
+VPOPMAIL_BUILD_DEPENDS=	${LOCALBASE}/vpopmail/bin/vchkpw:mail/vpopmail
 VPOPMAIL_CONFIGURE_WITH=vpopmail
 
 DOCS=		AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 8555e84381b9..ddd9edcc8923 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -33,13 +33,13 @@ DEFS=		-DWITH_TI_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
 
 .if ${PORT_OPTIONS:MPOSTFIX}
 DEFS+=		-DTERM_KD
-RUN_DEPENDS+=	postfix:${PORTSDIR}/mail/postfix
+RUN_DEPENDS+=	postfix:mail/postfix
 .if ${PORT_OPTIONS:MDB}
 USE_BDB=	41+
 .endif
 .elif ${PORT_OPTIONS:MEXIM}
 DEFS+=		-DTERM_KD -DREQ_HASH -DCIDR_KEY
-RUN_DEPENDS+=	exim:${PORTSDIR}/mail/exim
+RUN_DEPENDS+=	exim:mail/exim
 .endif
 
 NO_WRKSUBDIR=	yes
diff --git a/mail/dracmail/Makefile b/mail/dracmail/Makefile
index ef04cb9b5ebe..8f6b3bb18393 100644
--- a/mail/dracmail/Makefile
+++ b/mail/dracmail/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFAULT=APACHE
 
 PGSQL_USE=	PHP=pgsql
 APACHE_USE=	APACHE_RUN=22+
-LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
+LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 
 post-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/mail/dsbl-testers/Makefile b/mail/dsbl-testers/Makefile
index f6eede926d2c..168c81a8475c 100644
--- a/mail/dsbl-testers/Makefile
+++ b/mail/dsbl-testers/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Testing software for DSBL/DSBL-compliant services
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring \
-		${LOCALBASE}/include/firedns.h:${PORTSDIR}/dns/firedns
+BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:misc/firestring \
+		${LOCALBASE}/include/firedns.h:dns/firedns
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index fa724cbab131..e4c3801f15c5 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -185,7 +185,7 @@ _SED_SCRIPT+=	-e '/%%DAEMON%%/D'
 .if ${PORT_OPTIONS:MCLAMAV}
 CONFIGURE_ARGS+=	--enable-clamav
 .	if ${PORT_OPTIONS:MCLAMAV_LOCAL}
-RUN_DEPENDS+=	clamav>=0:${PORTSDIR}/security/clamav
+RUN_DEPENDS+=	clamav>=0:security/clamav
 SUB_LIST+=	CLAMD=clamd
 .	else
 SUB_LIST+=	CLAMD=
@@ -302,22 +302,22 @@ CONFIGURE_ARGS+=	--enable-domain-scale
 .endif
 
 .if ${PORT_OPTIONS:MCYRUS23}
-RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd23
+RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:mail/cyrus-imapd23
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
 .endif
 
 .if ${PORT_OPTIONS:MCYRUS24}
-RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd24
+RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:mail/cyrus-imapd24
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT1}
-RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/deliver:${PORTSDIR}/mail/dovecot
+RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/deliver:mail/dovecot
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/libexec/dovecot/deliver'
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT2}
-RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/dovecot-lda:${PORTSDIR}/mail/dovecot2
+RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/dovecot-lda:mail/dovecot2
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/libexec/dovecot/dovecot-lda'
 .endif
 
@@ -327,22 +327,22 @@ _EXIM_EXT=	-mysql
 .	elif ${PORT_OPTIONS:MPGSQL}
 _EXIM_EXT=	-postgresql
 .	endif
-RUN_DEPENDS+=	exim:${PORTSDIR}/mail/exim${_EXIM_EXT}
+RUN_DEPENDS+=	exim:mail/exim${_EXIM_EXT}
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/sbin/exim'
 .endif
 
 .if ${PORT_OPTIONS:MMAILDROP}
-RUN_DEPENDS+=	maildrop:${PORTSDIR}/mail/maildrop
+RUN_DEPENDS+=	maildrop:mail/maildrop
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/maildrop'
 .endif
 
 .if ${PORT_OPTIONS:MPROCMAIL}
-RUN_DEPENDS+=	procmail:${PORTSDIR}/mail/procmail
+RUN_DEPENDS+=	procmail:mail/procmail
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/procmail'
 .endif
 
 .if ${PORT_OPTIONS:MSAFECAT}
-RUN_DEPENDS+=	safecat:${PORTSDIR}/sysutils/safecat
+RUN_DEPENDS+=	safecat:sysutils/safecat
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/safecat tmp new'
 .endif
 
@@ -372,15 +372,15 @@ CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
 
 .if ${PORT_OPTIONS:MWEBUI}
 .	if ${PORT_OPTIONS:MLIGHTTPD}
-RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
+RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
 .	else
 USE_APACHE_RUN=	22+
 .	endif
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
-RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
-RUN_DEPENDS+=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
-RUN_DEPENDS+=	p5-GD-Graph3d>=0:${PORTSDIR}/graphics/p5-GD-Graph3d
-RUN_DEPENDS+=	p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
+LIB_DEPENDS+=	libgd.so:graphics/gd
+RUN_DEPENDS+=	p5-GD>=0:graphics/p5-GD
+RUN_DEPENDS+=	p5-GD-Graph>=0:graphics/p5-GD-Graph
+RUN_DEPENDS+=	p5-GD-Graph3d>=0:graphics/p5-GD-Graph3d
+RUN_DEPENDS+=	p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil
 CONFIGURE_ARGS+=--enable-logging
 CONFIGURE_ARGS+=--enable-user-logging
 PLIST_SUB+=	WebUI=""
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index b70199cf0f26..064275497093 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	Elm(tm) Mail System General Public License
 LICENSE_FILE=	${WRKSRC}/NOTICE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 
 CFLAGS+=	-D_SIZE_T
 
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index 83e2ebc33bcd..fab6cda098ea 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -40,7 +40,7 @@ PLIST_SUB+=	NLS="@comment "
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME)
-LIB_DEPENDS+=	libgpgme.so:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+=	libgpgme.so:security/gpgme
 .else
 pre-everything::
 	@${ECHO_CMD}
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 0077e8385d0f..f5100232a1e6 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -32,7 +32,7 @@ NLS_USES=	gettext
 OPTIONS_SUB=	yes
 
 .if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME)
-LIB_DEPENDS+=	libgpgme.so:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+=	libgpgme.so:security/gpgme
 .else
 pre-everything::
 	@${ECHO_CMD}
diff --git a/mail/emailrelay/Makefile b/mail/emailrelay/Makefile
index 6d0af861a64e..64e164616f4f 100644
--- a/mail/emailrelay/Makefile
+++ b/mail/emailrelay/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SUB=		yes
 
 DOXYGEN_CONFIGURE_WITH=	doxygen
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 GUI_CONFIGURE_ENABLE=	gui
 GUI_CONFIGURE_ENV=	e_qtmoc="${MOC}"
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index 6e843eb5c3ae..8172102b659d 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -35,9 +35,9 @@ OPTIONS_DEFINE=	DOCS
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
 CONF_SUB=	${REINPLACE_CMD} -e '/milter\.postfix/s/false/true/' ${WRKSRC}/enma/etc/enma.conf.sample
 . if defined(WITH_POSTFIX_CURRENT)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
+RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:mail/postfix-current
 . else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
+RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:mail/postfix
 . endif
 .endif
 
@@ -48,10 +48,10 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
 CONFIGURE_ARGS+=	--with-resolver=libbind \
 			--with-libbind-incdir=${LOCALBASE}/include/bind \
 			--with-libbind-libdir=${LOCALBASE}/lib
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libbind.a:${PORTSDIR}/dns/libbind
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libbind.a:dns/libbind
 .else
 CONFIGURE_ARGS+=	--with-resolver=ldns
-LIB_DEPENDS+=	libldns.so:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	libldns.so:dns/ldns
 .endif
 
 pre-configure:
diff --git a/mail/epstools/Makefile b/mail/epstools/Makefile
index d6e1051731af..c314fb58db5c 100644
--- a/mail/epstools/Makefile
+++ b/mail/epstools/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.inter7.com/eps/
 MAINTAINER=	ismail@EnderUNIX.org
 COMMENT=	EPS (Email Parsing System) sample tools
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libeps.a:${PORTSDIR}/mail/eps
+BUILD_DEPENDS=	${LOCALBASE}/lib/libeps.a:mail/eps
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTDOCS=	README
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index bb1ffefcf207..aec60ad21563 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Relay-only Mail Transfer Agent with sendmail compatible syntax
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libesmtp.so:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 
 USES=		tar:bzip2 bison
 USE_OPENSSL=	yes
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index ad83d821032a..7141155659c6 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution Microsoft Exchange plugin through Exchange Web Services
 
-BUILD_DEPENDS=	evolution>=3.0.0:${PORTSDIR}/mail/evolution
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libmspack.so:${PORTSDIR}/archivers/libmspack \
-		libical.so:${PORTSDIR}/devel/libical
-RUN_DEPENDS=	evolution>=3.0.0:${PORTSDIR}/mail/evolution
+BUILD_DEPENDS=	evolution>=3.0.0:mail/evolution
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libmspack.so:archivers/libmspack \
+		libical.so:devel/libical
+RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index a1f7756f56fe..c643887a5767 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution Microsoft Exchange plugin through OpenChange
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		evolution>=3.0.0:${PORTSDIR}/mail/evolution
-LIB_DEPENDS=	libmapi.so:${PORTSDIR}/mail/libmapi
-RUN_DEPENDS=	evolution>=3.0.0:${PORTSDIR}/mail/evolution
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		evolution>=3.0.0:mail/evolution
+LIB_DEPENDS=	libmapi.so:mail/libmapi
+RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b30d638ae91f..751d8550a3cb 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -10,18 +10,18 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated mail, calendar and address book distributed suite
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		highlight:${PORTSDIR}/textproc/highlight
-LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
-		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
-		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libcryptui.so:${PORTSDIR}/security/libcryptui \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	highlight:${PORTSDIR}/textproc/highlight \
-		gnome-keyring>=3.0.0:${PORTSDIR}/security/gnome-keyring
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		highlight:textproc/highlight
+LIB_DEPENDS=	libnss3.so:security/nss \
+		libgcr-3.so:security/gcr \
+		libgtkspell3-3.so:textproc/gtkspell3 \
+		libgeocode-glib.so:net/geocode-glib \
+		libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libcryptui.so:security/libcryptui \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libnotify.so:devel/libnotify
+RUN_DEPENDS=	highlight:textproc/highlight \
+		gnome-keyring>=3.0.0:security/gnome-keyring
 
 PORTSCOUT=	limitw:1,even
 
@@ -80,29 +80,29 @@ MAPS_DESC=	Contact maps
 LDAP_CONFIGURE_WITH=	openldap
 LDAP_USE=	OPENLDAP=yes
 
-WEATHER_LIB_DEPENDS=	libgweather-3.so:${PORTSDIR}/net/libgweather
+WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
 WEATHER_CONFIGURE_ENABLE=	weather
 
 SPAMASSASSIN_CONFIGURE_WITH=	spamassassin
-SPAMASSASSIN_BUILD_DEPENDS=	spamassassin:${PORTSDIR}/mail/spamassassin
-SPAMASSASSIN_RUN_DEPENDS=	spamassassin:${PORTSDIR}/mail/spamassassin
+SPAMASSASSIN_BUILD_DEPENDS=	spamassassin:mail/spamassassin
+SPAMASSASSIN_RUN_DEPENDS=	spamassassin:mail/spamassassin
 
 BOGOFILTER_CONFIGURE_WITH=	bogofilter
-BOGOFILTER_BUILD_DEPENDS=	bogofilter:${PORTSDIR}/mail/bogofilter
-BOGOFILTER_RUN_DEPENDS=	bogofilter:${PORTSDIR}/mail/bogofilter
+BOGOFILTER_BUILD_DEPENDS=	bogofilter:mail/bogofilter
+BOGOFILTER_RUN_DEPENDS=	bogofilter:mail/bogofilter
 
-CANBERRA_LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+CANBERRA_LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 CANBERRA_CONFIGURE_ENABLE=	canberra
 
 PST_CONFIGURE_ENABLE=	pst-import
-PST_BUILD_DEPENDS=	libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
-PST_RUN_DEPENDS=	libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
+PST_BUILD_DEPENDS=	libpst>=0.6.58_1:mail/libpst
+PST_RUN_DEPENDS=	libpst>=0.6.58_1:mail/libpst
 
 CONFIGURE_ARGS+=--disable-contact-maps
 #MAPS_CONFIGURE_ENABLE=	contact-maps
-#MAPS_LIB_DEPENDS=	libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain \
-#			libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
-#MAPS_BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+#MAPS_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
+#			libclutter-gtk-1.0.so:graphics/clutter-gtk3
+#MAPS_BUILD_DEPENDS=	geoclue>=0:net/geoclue
 
 .include <bsd.port.options.mk>
 
diff --git a/mail/exilog/Makefile b/mail/exilog/Makefile
index 0fe30d8f0c5f..a57f42093dc1 100644
--- a/mail/exilog/Makefile
+++ b/mail/exilog/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tool to centralize and visualize Exim logs with a web front end
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-#RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
+#RUN_DEPENDS=	p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask
 
 OPTIONS_DEFINE=	DOCS
 
@@ -28,11 +28,11 @@ WITH_SQL_BACKEND?=	mysql
 
 .if (${WITH_SQL_BACKEND} == "mysql")
 WITH_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 SERVER=		mysql
 .elif (${WITH_SQL_BACKEND} == "postgresql")
 WITH_POSTGRESQL=	yes
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 SERVER=		postgresql
 .else
 BROKEN=	You should specify sql backend using WITH_SQL_BACKEND
diff --git a/mail/exim-monitor/Makefile b/mail/exim-monitor/Makefile
index f182e079368c..56657d9a1e78 100644
--- a/mail/exim-monitor/Makefile
+++ b/mail/exim-monitor/Makefile
@@ -13,6 +13,6 @@ OPTIONS_SLAVE=	EXIMON
 # This dependency is disabled, because it prevents package users from
 # using the exim-monitor package with any of the exim slave packages.
 #
-#RUN_DEPENDS=	${LOCALBASE}/sbin/exim:${PORTSDIR}/mail/exim
+#RUN_DEPENDS=	${LOCALBASE}/sbin/exim:mail/exim
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index ae85ab4d561d..7f2e3378b45e 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -41,21 +41,21 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_SUB=	yes
 
-AUTH_SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+AUTH_SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 BDB_USE=	bdb=yes
-DMARC_LIB_DEPENDS=	libopendmarc.so:${PORTSDIR}/mail/opendmarc
+DMARC_LIB_DEPENDS=	libopendmarc.so:mail/opendmarc
 EMBEDDED_PERL_USE=	perl5=run,build
 EXIMON_USE=	xorg=x11,xaw,xt
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 ICONV_USES=	iconv:lib,build
-INTERNATIONAL_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+INTERNATIONAL_LIB_DEPENDS=	libidn.so:dns/libidn
 MYSQL_USE=	mysql=yes
 OPENLDAP_USE=	openldap=yes
 PGSQL_USES=	pgsql
-REDIS_LIB_DEPENDS=	libhiredis.so:${PORTSDIR}/databases/hiredis
-SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
-SA_EXIM_RUN_DEPENDS=	${LOCALBASE}/bin/spamc:${PORTSDIR}/mail/spamassassin
-SPF_LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
+REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
+SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd
+SA_EXIM_RUN_DEPENDS=	${LOCALBASE}/bin/spamc:mail/spamassassin
+SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
 SQLITE_USE=	sqlite=yes
 SQLITE_USES=	pkgconfig
 
@@ -185,7 +185,7 @@ WITH_DEFAULT_CHARSET?=	ISO-8859-1
 
 # You should not need to fiddle with anything below this point.
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 
 .if ! ${PORT_OPTIONS:MDKIM}
 SEDLIST+=	-e 's,^\# (DISABLE_DKIM=),\1,'
@@ -365,7 +365,7 @@ SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-lradius,' \
 		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1/etc/radius.conf,' \
 		-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADLIB,'
 .elif ${WITH_RADIUS_TYPE:tl} == radiusclient
-LIB_DEPENDS+=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+LIB_DEPENDS+=	libradiusclient-ng.so:net/radiusclient
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lradiusclient-ng,' \
 		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE:S/,/\\,/g}/etc/radiusclient-ng/radiusclient.conf,' \
 		-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENTNEW,'
@@ -461,7 +461,7 @@ SEDLIST+=	-e 's,XX_SPF_FLAGS_XX,,' \
 .endif
 
 .if ${PORT_OPTIONS:MSRS}
-LIB_DEPENDS+=	libsrs_alt.so:${PORTSDIR}/mail/libsrs_alt
+LIB_DEPENDS+=	libsrs_alt.so:mail/libsrs_alt
 SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS,' \
 		-e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs_alt,'
 .else
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index c3b1b660c5e2..26e0f37ac974 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -13,8 +13,8 @@ MAINTAINER?=	cy@FreeBSD.org
 COMMENT?=	X11/TK based mail reader front end to MH
 
 .if defined(JAPANESE_EXMH)
-RUN_DEPENDS=	wish8.0jp:${PORTSDIR}/japanese/tk80
-BUILD_DEPENDS=	tclsh8.0jp:${PORTSDIR}/japanese/tcl80
+RUN_DEPENDS=	wish8.0jp:japanese/tk80
+BUILD_DEPENDS=	tclsh8.0jp:japanese/tcl80
 WISH=		wish8.0jp
 TCLSH=		tclsh8.0jp
 .else
@@ -23,14 +23,14 @@ USES=		tk
 
 # exmh is pretty useless without this, but it's not needed to build it.
 .if defined(JAPANESE_EXMH)
-RUN_DEPENDS+=	repl:${PORTSDIR}/japanese/mh
+RUN_DEPENDS+=	repl:japanese/mh
 .else
-RUN_DEPENDS+=	repl:${PORTSDIR}/mail/nmh
+RUN_DEPENDS+=	repl:mail/nmh
 SCRIPTS_ENV+=	USE_NMH=YES
 .endif
 
 # full mime support needs mmencode/mmdecode from metamail
-RUN_DEPENDS+=	mmencode:${PORTSDIR}/mail/metamail
+RUN_DEPENDS+=	mmencode:mail/metamail
 
 # Additionally, exmh will use the following ports if present:
 # lang/expect
diff --git a/mail/ez-pine-gpg/Makefile b/mail/ez-pine-gpg/Makefile
index fa9137ddc56d..8155a800a84a 100644
--- a/mail/ez-pine-gpg/Makefile
+++ b/mail/ez-pine-gpg/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Set of scripts to use gpg with Pine
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg:security/gnupg
 
 USES=		tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 148c4a1bfdcc..0ce4cfb01fe0 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -38,13 +38,13 @@ X11_CONFIGURE_WITH=	x
 AUDIO_CONFIGURE_ENABLE=	audio
 
 NAS_CONFIGURE_ON=	--with-audio-cmd=${LOCALBASE}/bin/auplay
-NAS_RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
+NAS_RUN_DEPENDS=	auplay:audio/nas
 
 SOX_CONFIGURE_ON=	--with-audio-cmd=${LOCALBASE}/bin/play
-SOX_RUN_DEPENDS=	play:${PORTSDIR}/audio/sox
+SOX_RUN_DEPENDS=	play:audio/sox
 
 RPLAY_CONFIGURE_ON=	--with-audio-cmd=${LOCALBASE}/bin/rplay
-RPLAY_RUN_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
+RPLAY_RUN_DEPENDS=	rplay:audio/rplay
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index 19c7a5115849..43abace3b389 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Fetches and delivers mail
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libtdb.so:${PORTSDIR}/databases/tdb
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libtdb.so:databases/tdb
 
 PLIST_FILES=	bin/fdm man/man1/fdm.1.gz man/man5/fdm.conf.5.gz
 PORTDOCS=	CHANGES README MANUAL
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index de6e2c884700..cdeee23f1303 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 # Note USERS can only contain a single word as parts below rely on that.
 USERS=		${PORTNAME}
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+=	--enable-POP2
 
 .if ${PORT_OPTIONS:MX11}
 USES+=		python
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
 PLIST_SUB+=	NOX11="@comment "
 .else
 CONFIGURE_ARGS+=	PYTHON=:
diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile
index 113824a6b8c6..59e713566241 100644
--- a/mail/gbuffy/Makefile
+++ b/mail/gbuffy/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.fiction.net/blong/programs/gbuffy/gbuffy-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ multiple mailbox "biff" program
 
-LIB_DEPENDS=	libPropList.so:${PORTSDIR}/devel/libPropList \
-		libcompface.so:${PORTSDIR}/mail/faces
+LIB_DEPENDS=	libPropList.so:devel/libPropList \
+		libcompface.so:mail/faces
 
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index 2fea81c37504..9b02652843d9 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -11,14 +11,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mail client for GNOME 3
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala \
-		bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
-		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libgcr-3.so:${PORTSDIR}/security/gcr
+BUILD_DEPENDS=	vapigen:lang/vala \
+		bash:shells/bash
+LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
+		libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libnotify.so:devel/libnotify \
+		libgee-0.8.so:devel/libgee \
+		libgcr-3.so:security/gcr
 
 USES=		cmake desktop-file-utils gettext gmake \
 		libtool pkgconfig shebangfix tar:xz
diff --git a/mail/gkrellmmailwatch2/Makefile b/mail/gkrellmmailwatch2/Makefile
index 469377caaa78..a45f09ad87c6 100644
--- a/mail/gkrellmmailwatch2/Makefile
+++ b/mail/gkrellmmailwatch2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GKrellM mailwatch plugin
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 WRKSRC=		${WRKDIR}/gkrellm-mailwatch
 
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 0642d01e25e8..4e62e03685ec 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -30,7 +30,7 @@ LOCAL_DB_SERVER_DESC=	RUN_DEPEND also on selected DB server
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 USE_MYSQL=	yes
 .	if ${PORT_OPTIONS:MLOCAL_DB_SERVER}
-RUN_DEPENDS+=	mysql-server>=0:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
+RUN_DEPENDS+=	mysql-server>=0:databases/mysql${MYSQL_VER}-server
 SUB_LIST+=	MYSQL=mysql
 SUB_LIST+=	PGSQL=
 .	else
@@ -42,7 +42,7 @@ SUB_LIST+=	MYSQL=
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 USES+=		pgsql
 .	if ${PORT_OPTIONS:MLOCAL_DB_SERVER}
-RUN_DEPENDS+=	postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
+RUN_DEPENDS+=	postgresql-server>=0:databases/postgresql${PGSQL_VER}-server
 SUB_LIST+=	PGSQL=postgresql
 SUB_LIST+=	MYSQL=
 .	else
diff --git a/mail/gmime2-sharp/Makefile b/mail/gmime2-sharp/Makefile
index da1c10ad7ec9..9d9fbda31e84 100644
--- a/mail/gmime2-sharp/Makefile
+++ b/mail/gmime2-sharp/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Mono bindings for gmime
 
 IGNORE=		try to install weaked-named assembly into the GAC
 
-LIB_DEPENDS=	libgmime-2.0.so:${PORTSDIR}/mail/gmime2
+LIB_DEPENDS=	libgmime-2.0.so:mail/gmime2
 
 MASTERDIR=	${.CURDIR}/../gmime2
 BUILD_WRKSRC=	${WRKSRC}/mono
diff --git a/mail/gmime24-sharp/Makefile b/mail/gmime24-sharp/Makefile
index 94d8daa62c4f..fd9abe3e1f94 100644
--- a/mail/gmime24-sharp/Makefile
+++ b/mail/gmime24-sharp/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX=	24-sharp
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Mono bindings for gmime
 
-LIB_DEPENDS=	libgmime-2.4.so:${PORTSDIR}/mail/gmime24
+LIB_DEPENDS=	libgmime-2.4.so:mail/gmime24
 
 MASTERDIR=	${.CURDIR}/../gmime24
 BUILD_WRKSRC=	${WRKSRC}/mono
diff --git a/mail/gmime26-sharp/Makefile b/mail/gmime26-sharp/Makefile
index 19b3b0c685d4..af85c1cbec65 100644
--- a/mail/gmime26-sharp/Makefile
+++ b/mail/gmime26-sharp/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX=	26-sharp
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Mono bindings for gmime
 
-LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26
+LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26
 
 USES=		mono
 MASTERDIR=	${.CURDIR}/../gmime26
diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
index a469f5859433..ed44197655da 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.onyxbits.de/sites/default/files/download/15/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Email autoresponder that gets data from LDAP
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
-BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
+BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:textproc/gsed
 
 USES=		iconv gmake tar:tgz
 USE_OPENLDAP=	yes
diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile
index b2b4a7940376..ce22e88392f6 100644
--- a/mail/gnome-gmail-notifier/Makefile
+++ b/mail/gnome-gmail-notifier/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gmail Inbox Monitor for the GNOME2 desktop
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libsoup-2.4.so:devel/libsoup \
+		libgnome-keyring.so:security/libgnome-keyring
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pkgconfig tar:bzip2
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index b5ffa7d64945..84cc8d88f1d8 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mail notification program for Gnome
 
 OPTIONS_DEFINE=	NLS
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USE_GNOME=	intlhack libglade2 esound
 USES=		cpe fam gmake pathfix pkgconfig
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index b6cf3612029b..8d4324c76f0d 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -16,8 +16,8 @@ LICENSE=	GPLv2
 USES=		cpe gnustep
 CPE_VENDOR=	gnu
 USE_GNUSTEP=	back build
-LIB_DEPENDS=	libPantomime.so:${PORTSDIR}/mail/pantomime \
-		libAddresses.so:${PORTSDIR}/mail/addresses
+LIB_DEPENDS=	libPantomime.so:mail/pantomime \
+		libAddresses.so:mail/addresses
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 .include <bsd.port.mk>
diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index 62b20f9f6811..fea9a6961e87 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Script to fetch mail from a Hotmail or MSN mailbox
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Net>=0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	curl:ftp/curl \
+		p5-URI>=0:net/p5-URI \
+		p5-Net>=0:net/p5-Net
 
 USES=		perl5 shebangfix
 
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index 2ce727379e23..3d871b0b7e22 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Search mailboxes for a given regexp and display matching emails
 
-BUILD_DEPENDS=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Mail-Mbox-MessageParser>=0:${PORTSDIR}/mail/p5-Mail-Mbox-MessageParser
+BUILD_DEPENDS=	p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Mail-Mbox-MessageParser>=0:mail/p5-Mail-Mbox-MessageParser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/greylite/Makefile b/mail/greylite/Makefile
index bc5e5bf259ac..0316d56481cb 100644
--- a/mail/greylite/Makefile
+++ b/mail/greylite/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Modified greylisting for qmail and for any other MDA
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	tcpserver:sysutils/ucspi-tcp
 
 USES=		sqlite tar:bzip2
 PLIST_FILES=	bin/greylite \
@@ -31,12 +31,12 @@ UCSPI2SOCKET_DESC=	Module for using greylite as SMTP proxy
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MGEOIP}
-LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
 MAKE_ARGS+=	WITH_GEOIP=yep
 .endif
 
 .if ${PORT_OPTIONS:MDNSBLENV}
-LIB_DEPENDS+=	libcares.so:${PORTSDIR}/dns/c-ares
+LIB_DEPENDS+=	libcares.so:dns/c-ares
 MAKE_ARGS+=	WITH_DNSBLENV=yep
 PLIST_SUB+=	DNSBLENV=""
 .else
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 3052b9d03ea3..82eb8798c614 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -29,7 +29,7 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util
 
 # Optional but we want it
-RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve \
-		${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:net/pear-Net_Sieve \
+		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
 
 .include <bsd.port.mk>
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 74c840caf04f..b40c83b7eaee 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -18,7 +18,7 @@ COMMENT=	University of Washington IMAP4rev1/POP2/POP3 mail servers
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libc-client4.so.9:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	libc-client4.so.9:mail/cclient
 
 CONFLICTS_INSTALL=	panda-imap-20*
 
@@ -42,7 +42,7 @@ NETSCAPE_BRAIN_DAMAGE_DESC=	See Makefile for documentation
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDRAC}
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:mail/drac
 MAKE_ARGS+=	WITH_DRAC=yes
 .endif
 
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 7cee1a64c02c..5c6210c231bd 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -11,7 +11,7 @@ COMMENT=	IMAP mail filtering utility
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		lua
 USE_OPENSSL=	yes
diff --git a/mail/imapsync/Makefile b/mail/imapsync/Makefile
index 53e42691b591..b926db33b68c 100644
--- a/mail/imapsync/Makefile
+++ b/mail/imapsync/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	https://codeload.github.com/imapsync/imapsync/tar.gz/imapsync-${PO
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	IMAP synchronization, copy or migration tool
 
-RUN_DEPENDS=	p5-Mail-IMAPClient>0:${PORTSDIR}/mail/p5-Mail-IMAPClient \
-		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-IO-Tee>0:${PORTSDIR}/devel/p5-IO-Tee \
-		p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Unicode-String>0:${PORTSDIR}/converters/p5-Unicode-String \
-		p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive
+RUN_DEPENDS=	p5-Mail-IMAPClient>0:mail/p5-Mail-IMAPClient \
+		p5-Term-ReadKey>0:devel/p5-Term-ReadKey \
+		p5-IO-Tee>0:devel/p5-IO-Tee \
+		p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
+		p5-Unicode-String>0:converters/p5-Unicode-String \
+		p5-File-Copy-Recursive>0:devel/p5-File-Copy-Recursive
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
 
diff --git a/mail/imaputils/Makefile b/mail/imaputils/Makefile
index c1d4becd608b..923e935f909c 100644
--- a/mail/imaputils/Makefile
+++ b/mail/imaputils/Makefile
@@ -24,11 +24,11 @@ OPTIONS_DEFINE=	SSL UNICODE
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
-RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 .endif
 
 .if ${PORT_OPTIONS:MUNICODE}
-RUN_DEPENDS+=	p5-Unicode-IMAPUtf7>=0:${PORTSDIR}/converters/p5-Unicode-IMAPUtf7
+RUN_DEPENDS+=	p5-Unicode-IMAPUtf7>=0:converters/p5-Unicode-IMAPUtf7
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/isbg/Makefile b/mail/isbg/Makefile
index 1de4ff42ef73..0116f95259e8 100644
--- a/mail/isbg/Makefile
+++ b/mail/isbg/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Scan an IMAP inbox for spam using SpamAssassin
 # any OSI approved open source license
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	spamassassin:${PORTSDIR}/mail/spamassassin \
-		${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:${PORTSDIR}/devel/py-docopt
+RUN_DEPENDS=	spamassassin:mail/spamassassin \
+		${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt
 
 USE_GITHUB=	yes
 
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index ff0b582226e4..5b8cc093fc59 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Maintain local copies of remote IMAP folders w/synchronized flags
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 USES=		alias cpe
 CPE_VENDOR=	oswald_buddenhagen
diff --git a/mail/junkfilter/Makefile b/mail/junkfilter/Makefile
index eaf17417994b..f07d039c7c86 100644
--- a/mail/junkfilter/Makefile
+++ b/mail/junkfilter/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Spam filtering software for procmail
 
 PORTSCOUT=	limit:^20
 
-RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
+RUN_DEPENDS=	procmail:mail/procmail
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/mail/lbdb/Makefile b/mail/lbdb/Makefile
index 01f429d0f91a..c174beb863d9 100644
--- a/mail/lbdb/Makefile
+++ b/mail/lbdb/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Tools for use with mutt external mail address query feature
 
-RUN_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
+RUN_DEPENDS=	gsed:textproc/gsed
 
 OPTIONS_DEFINE=	ABOOK EVOLUTION GPG LDAP
 ABOOK_DESC=	abook address book support
@@ -32,24 +32,24 @@ WITH_GETENT=	yes
 .endif
 
 .if ${PORT_OPTIONS:MGPG}
-BUILD_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS+=	gpg:security/gnupg
+RUN_DEPENDS+=	gpg:security/gnupg
 PLIST_SUB+=	GPG=""
 .else
 PLIST_SUB+=	GPG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MABOOK}
-BUILD_DEPENDS+=	abook:${PORTSDIR}/mail/abook
-RUN_DEPENDS+=	abook:${PORTSDIR}/mail/abook
+BUILD_DEPENDS+=	abook:mail/abook
+RUN_DEPENDS+=	abook:mail/abook
 PLIST_SUB+=	ABOOK=""
 .else
 PLIST_SUB+=	ABOOK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MEVOLUTION}
-BUILD_DEPENDS+=	evolution:${PORTSDIR}/mail/evolution
-RUN_DEPENDS+=	evolution:${PORTSDIR}/mail/evolution
+BUILD_DEPENDS+=	evolution:mail/evolution
+RUN_DEPENDS+=	evolution:mail/evolution
 PLIST_SUB+=	EVOLUTION=""
 .else
 PLIST_SUB+=	EVOLUTION="@comment "
@@ -62,7 +62,7 @@ PLIST_SUB+=	GETENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS+=	p5-perl-ldap>=0:net/p5-perl-ldap
 .endif
 
 post-patch:
diff --git a/mail/libcmime/Makefile b/mail/libcmime/Makefile
index 3ee8c9154d13..a8c267ac57b9 100644
--- a/mail/libcmime/Makefile
+++ b/mail/libcmime/Makefile
@@ -26,7 +26,7 @@ PORTDOCS=	AUTHORS CHANGELOG INSTALL README
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=2.5.33:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=2.5.33:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
@@ -35,8 +35,8 @@ CMAKE_ARGS+=	-DENABLE_DEBUG=TRUE
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen>=1.8:${PORTSDIR}/devel/doxygen \
-		dot:${PORTSDIR}/graphics/graphviz
+BUILD_DEPENDS+=	doxygen>=1.8:devel/doxygen \
+		dot:graphics/graphviz
 CMAKE_ARGS+=	-DENABLE_DOC=TRUE
 .endif
 
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 2b77261920c4..93fc560f467c 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Mail framework for C language
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libsasl2.so:security/cyrus-sasl2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dinhviethoa
@@ -32,8 +32,8 @@ OPTIONS_SINGLE_CRYPTO=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	OPENSSL
 
 GNUTLS_CONFIGURE_ON=	--without-openssl --with-gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-			libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
+			libgcrypt.so:security/libgcrypt
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index ef3cbae6edac..b83b1d6f8526 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -11,15 +11,15 @@ MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Open Source implementation of Microsoft Exchange protocols
 
 BUILD_DEPENDS=	${SAMBA_DEP} \
-		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		p5-Parse-Pidl>=4.0.1:${PORTSDIR}/devel/p5-Parse-Pidl
-LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical \
-		libnanomsg.so:${PORTSDIR}/net/nanomsg \
-		libmemcached.so:${PORTSDIR}/databases/libmemcached \
-		libcheck.so:${PORTSDIR}/devel/libcheck \
-		libtdb.so:${PORTSDIR}/databases/tdb \
-		libtevent.so:${PORTSDIR}/devel/tevent \
-		libtalloc.so:${PORTSDIR}/devel/talloc
+		${LOCALBASE}/bin/flex:textproc/flex \
+		p5-Parse-Pidl>=4.0.1:devel/p5-Parse-Pidl
+LIB_DEPENDS=	libical.so:devel/libical \
+		libnanomsg.so:net/nanomsg \
+		libmemcached.so:databases/libmemcached \
+		libcheck.so:devel/libcheck \
+		libtdb.so:databases/tdb \
+		libtevent.so:devel/tevent \
+		libtalloc.so:devel/talloc
 RUN_DEPENDS=	${SAMBA_DEP}
 
 CODENAME=	VULCAN
@@ -49,10 +49,10 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	BOOST DOXYGEN
 # SAMBA43
 OPTIONS_DEFAULT=BOOST
-BOOST_LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+BOOST_LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 BOOST_CONFIGURE_ENV_OFF=	ov_cv_boost_thread=no
 BOOST_DESC=	libmapi C++ library (needs boost)
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_path_DOXYGEN=""
 SAMBA43_DESC=	Build agains samba 4.3 instead of 4.2
 
@@ -60,10 +60,10 @@ SAMBA43_DESC=	Build agains samba 4.3 instead of 4.2
 
 # no support for samba 4.3 yet
 .if ${PORT_OPTIONS:MSAMBA43}
-SAMBA_DEP=	samba43>=4.3.0:${PORTSDIR}/net/samba43
+SAMBA_DEP=	samba43>=4.3.0:net/samba43
 PLIST_SUB+=	SAMBA=samba43
 .else
-SAMBA_DEP=	samba42>=4.2.0:${PORTSDIR}/net/samba42
+SAMBA_DEP=	samba42>=4.2.0:net/samba42
 PLIST_SUB+=	SAMBA=samba42
 .endif
 
diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile
index 267fa103525a..37fa00e46150 100644
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tool for converting Outlook .pst files to mbox and other formats
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgsf-1.so:${PORTSDIR}/devel/libgsf
+LIB_DEPENDS=	libgsf-1.so:devel/libgsf
 
 OPTIONS_DEFINE=	DOCS PST2DII
 OPTIONS_SUB=	yes
@@ -28,11 +28,11 @@ USES=		gmake iconv libtool pathfix pkgconfig
 
 PORTDOCS=	*
 
-PST2DII_BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+PST2DII_BUILD_DEPENDS=	convert:graphics/ImageMagick
 PST2DII_CONFIGURE_OFF=	--enable-dii=no
 PST2DII_CONFIGURE_ON=	--enable-dii=yes
-PST2DII_LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
-PST2DII_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+PST2DII_LIB_DEPENDS=	libgd.so:graphics/gd
+PST2DII_RUN_DEPENDS=	convert:graphics/ImageMagick
 
 post-patch:
 	@${GREP} -lr malloc.h ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g'
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index cf462babd092..e9617980b9a7 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -12,8 +12,8 @@ COMMENT=	All-in-one Internet mail library
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgsasl.so:${PORTSDIR}/security/gsasl
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libgsasl.so:security/gsasl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kisli
diff --git a/mail/listadmin/Makefile b/mail/listadmin/Makefile
index 9efbd2622623..c792419d1f23 100644
--- a/mail/listadmin/Makefile
+++ b/mail/listadmin/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	http://heim.ifi.uio.no/kjetilho/hacks/
 MAINTAINER=	christer.edwards@gmail.com
 COMMENT=	Command-line alternative to Mailman Web interface
 
-RUN_DEPENDS=	p5-Text-Reform>=0:${PORTSDIR}/textproc/p5-Text-Reform \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Text-Reform>=0:textproc/p5-Text-Reform \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/mail/lmtp2nntp/Makefile b/mail/lmtp2nntp/Makefile
index f8648920e5e9..0fe96005a782 100644
--- a/mail/lmtp2nntp/Makefile
+++ b/mail/lmtp2nntp/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	OSSP/tool/${PORTNAME}
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	OSSP mail to news gateway
 
-LIB_DEPENDS=	libstr.so:${PORTSDIR}/devel/str \
-		libex.so:${PORTSDIR}/devel/ossp-ex \
-		libsa.so:${PORTSDIR}/net/ossp-sa \
-		libvar.so:${PORTSDIR}/devel/ossp-var
+LIB_DEPENDS=	libstr.so:devel/str \
+		libex.so:devel/ossp-ex \
+		libsa.so:net/ossp-sa \
+		libvar.so:devel/ossp-var
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ex=${LOCALBASE} --with-str=${LOCALBASE} \
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index c5ed51890e16..fed418c3b6db 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -39,8 +39,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS=	courier-0.65* libunicode-[0-9]*
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		libcourier-unicode.so:devel/courier-unicode
 
 MAILDROP_LOG_COLUMNS?=	72	# lenght of 'File:' line in log
 
@@ -73,9 +73,9 @@ MAILWRAPPER_DESC=	Let configure guess which sendmail binary to use
 OPTIONS_SUB=		yes
 GDBM_CONFIGURE_ON=	--with-db=gdbm
 GDBM_CONFIGURE_OFF=	--with-db=db
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 IDN_CONFIGURE_WITH=	libidn
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 MAILWRAPPER_CONFIGURE_OFF=	--enable-sendmail=/usr/sbin/sendmail
 DOVECOTAUTH_CONFIGURE_ENABLE=	dovecotauth
 
@@ -122,8 +122,8 @@ post-patch:
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
-BUILD_DEPENDS+=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-RUN_DEPENDS+=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
+BUILD_DEPENDS+=	courierauthconfig:security/courier-authlib-base
+RUN_DEPENDS+=	courierauthconfig:security/courier-authlib-base
 CONFIGURE_ARGS+=	--enable-authlib
 .else
 CONFIGURE_ARGS+=	--disable-authlib
diff --git a/mail/mailest/Makefile b/mail/mailest/Makefile
index 36be0b52bc61..e2a10e638d6a 100644
--- a/mail/mailest/Makefile
+++ b/mail/mailest/Makefile
@@ -15,10 +15,10 @@ LICENSE_COMB=	multi
 LICENSE_FILE_${L}=	${WRKSRC}/LICENSE.${L}
 .endfor
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libqdbm.so:${PORTSDIR}/databases/qdbm \
-		libestraier.so:${PORTSDIR}/textproc/hyperestraier
-RUN_DEPENDS=	mewl:${PORTSDIR}/mail/mew
+LIB_DEPENDS=	libevent.so:devel/libevent2 \
+		libqdbm.so:databases/qdbm \
+		libestraier.so:textproc/hyperestraier
+RUN_DEPENDS=	mewl:mail/mew
 
 USES=		iconv fakeroot
 USE_EMACS=	yes
diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index bc21c94ea47b..a071d8c17301 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Mail server network protocol front-ends
 
-LIB_DEPENDS=	libcvm-v2client.so:${PORTSDIR}/security/cvm
+LIB_DEPENDS=	libcvm-v2client.so:security/cvm
 
 OPTIONS_DEFINE=	LUA DOCS
 
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index cbef93b29e70..92a10d313280 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://mailgraph.schweikert.ch/pub/ \
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	RRDtool frontend for Postfix statistics
 
-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
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 3d2caed3cb02..d7350e06da23 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -95,8 +95,8 @@ MAIL_GID?=	mail
 .endif
 
 .if ${PORT_OPTIONS:MPOSTFIX}
-BUILD_DEPENDS+=	postfix:${PORTSDIR}/mail/postfix
-RUN_DEPENDS+=	postfix:${PORTSDIR}/mail/postfix
+BUILD_DEPENDS+=	postfix:mail/postfix
+RUN_DEPENDS+=	postfix:mail/postfix
 MAIL_GID?=	mailman
 EXTRA_PATCHES+=	${FILESDIR}/postfix-verp.diff
 .endif
@@ -117,7 +117,7 @@ PKGNAMESUFFIX+=	-with-htdig
 #X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1632.patch.xz
 #X upload the latter with mode 0644 or similar to freefall's public_distfiles/ directory
 PATCHFILES+=	msapiro-htdig-1632.patch.xz
-RUN_DEPENDS+=	htdig:${PORTSDIR}/textproc/htdig
+RUN_DEPENDS+=	htdig:textproc/htdig
 PLIST_SUB+=	SUB_HTDIG=""
 .else
 PLIST_SUB+=	SUB_HTDIG="@comment "
@@ -125,12 +125,12 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-LP1551075
 .endif
 
 .if ${PORT_OPTIONS:MNAMAZU2}
-RUN_DEPENDS+=	mknmz:${PORTSDIR}/databases/namazu2
+RUN_DEPENDS+=	mknmz:databases/namazu2
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Mailman-Cgi-private.py
 .endif
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython
 
 pre-everything::
 	@${ECHO} ""
diff --git a/mail/mailpile/Makefile b/mail/mailpile/Makefile
index e3e7c408d7de..42a315f2b2fe 100644
--- a/mail/mailpile/Makefile
+++ b/mail/mailpile/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Locally hosted web-browser based mail client
 
 LICENSE=	AGPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}pgpdump>=0:${PORTSDIR}/security/py-pgpdump \
-		${PYTHON_PKGNAMEPREFIX}dns>=0:${PORTSDIR}/dns/py-dns \
-		${PYTHON_PKGNAMEPREFIX}spambayes>=0:${PORTSDIR}/mail/py-spambayes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}pgpdump>=0:security/py-pgpdump \
+		${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns \
+		${PYTHON_PKGNAMEPREFIX}spambayes>=0:mail/py-spambayes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mailpile
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 36553b56960f..becb71528b3e 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -14,29 +14,29 @@ COMMENT=	Powerful virus/spam scanning framework for mail gateways
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	\
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-	p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
-	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-	p5-Convert-TNEF>=0:${PORTSDIR}/converters/p5-Convert-TNEF \
-	p5-Convert-BinHex>=0:${PORTSDIR}/converters/p5-Convert-BinHex \
-	p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-	p5-Net-Ident>=0:${PORTSDIR}/net/p5-Net-Ident \
-	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-	p5-Filesys-Df>=0:${PORTSDIR}/sysutils/p5-Filesys-Df \
-	p5-Sys-Hostname-Long>=0:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
-	p5-OLE-Storage_Lite>=0:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
-	p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-DBI>=0:databases/p5-DBI \
+	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+	p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
+	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+	p5-Convert-TNEF>=0:converters/p5-Convert-TNEF \
+	p5-Convert-BinHex>=0:converters/p5-Convert-BinHex \
+	p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
+	p5-Net-Ident>=0:net/p5-Net-Ident \
+	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+	p5-DBI>=0:databases/p5-DBI \
+	p5-TimeDate>=0:devel/p5-TimeDate \
+	p5-Filesys-Df>=0:sysutils/p5-Filesys-Df \
+	p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \
+	p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \
+	p5-Sys-SigAction>=0:devel/p5-Sys-SigAction
 
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		bash:${PORTSDIR}/shells/bash \
-		tnef:${PORTSDIR}/converters/tnef \
-		wget:${PORTSDIR}/ftp/wget
+		bash:shells/bash \
+		tnef:converters/tnef \
+		wget:ftp/wget
 
 CONFLICTS=	MailScanner-devel-[0-9]*
 
@@ -67,31 +67,31 @@ OPTIONS_DEFAULT=	SPAMASSASSIN CLAMAV
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSPAMASSASSIN}
-RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/spamassassin
+RUN_DEPENDS+=	spamassassin:mail/spamassassin
 PLIST_SUB+=	SPAMASSASSIN=""
 .else
 PLIST_SUB+=	SPAMASSASSIN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
-RUN_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
+RUN_DEPENDS+=	clamscan:security/clamav
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAVMODULE}
-RUN_DEPENDS+=	p5-Mail-ClamAV>=0:${PORTSDIR}/mail/p5-Mail-ClamAV
+RUN_DEPENDS+=	p5-Mail-ClamAV>=0:mail/p5-Mail-ClamAV
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV} || ${PORT_OPTIONS:MCLAMAVMODULE}
-RUN_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip \
-		unrar:${PORTSDIR}/archivers/unrar \
-		zoo:${PORTSDIR}/archivers/zoo \
-		unarj:${PORTSDIR}/archivers/unarj \
-		unace:${PORTSDIR}/archivers/unace \
-		lha:${PORTSDIR}/archivers/lha
+RUN_DEPENDS+=	unzip:archivers/unzip \
+		unrar:archivers/unrar \
+		zoo:archivers/zoo \
+		unarj:archivers/unarj \
+		unace:archivers/unace \
+		lha:archivers/lha
 .endif
 
 .if ${PORT_OPTIONS:MBDC}
-RUN_DEPENDS+=	bdc:${PORTSDIR}/security/bdc
+RUN_DEPENDS+=	bdc:security/bdc
 .endif
 
 # backwards compatibility
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index c54243645b56..2df5f50232cb 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mailsync is a way of keeping a collection of mailboxes synchronized
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libc-client4.so:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	libc-client4.so:mail/cclient
 
 USES=		gmake
 USE_OPENSSL=	yes
diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile
index 2fe44f11e7d9..8642b5672c7e 100644
--- a/mail/mb2md/Makefile
+++ b/mail/mb2md/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Converts mbox mailboxes to Maildir
 
-RUN_DEPENDS=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-TimeDate>=0:devel/p5-TimeDate
 
 EXTRACT_CMD=	${GZIP_CMD}
 EXTRACT_BEFORE_ARGS=	-dc
diff --git a/mail/mboxgrep/Makefile b/mail/mboxgrep/Makefile
index 459b0bea6589..b4259181bb61 100644
--- a/mail/mboxgrep/Makefile
+++ b/mail/mboxgrep/Makefile
@@ -21,7 +21,7 @@ DOCS=		ChangeLog NEWS README TODO
 
 OPTIONS_DEFINE=	DOCS PCRE
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,void \*tmpp,FILE \*tmpp,g' ${WRKSRC}/src/main.c
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index 989d20a95566..08d4dc415f6a 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MS Outlook Express .mbx to mbox file converter
 
-BUILD_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip
+BUILD_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index c28530e244ba..789dc912344d 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -57,11 +57,11 @@ SASL2AUTHD_DESC=	Enable plaintext authentication via SASL2
 PMILTER_CONFIGURE_ENABLE=	pmilter
 DKIM_CONFIGURE_ENABLE=	DKIM
 MSP_CONFIGURE_ENABLE=	msp
-SASL2_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL2_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL2_CONFIGURE_ENABLE=	SASL
 SASL2_CONFIGURE_ON=	--with-sasl-incdir=${LOCALBASE}/include \
 			--with-sasl-libdir=${LOCALBASE}/lib
-SASL2AUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
+SASL2AUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd
 TLS_CONFIGURE_ENABLE=	TLS
 
 .include <bsd.port.options.mk>
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index fd417da0818e..0ae231ce8b5c 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -22,10 +22,10 @@ OPTIONS_DEFINE=	X11
 OPTIONS_SUB=	yes
 
 X11_DESC=		X11 hebrew font support
-X11_BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-			mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-X11_RUN_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage \
-			mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+X11_BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+			mkfontscale:x11-fonts/mkfontscale
+X11_RUN_DEPENDS=	xloadimage:x11/xloadimage \
+			mkfontdir:x11-fonts/mkfontdir
 X11_USE=		XORG=x11
 
 post-patch-X11-off:
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 14d3ffc12757..b8004ba32f7a 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE=	${WRKSRC}/00copyright
 OPTIONS_DEFINE=	DATABASE DOCS STUNNEL
 OPTIONS_DEFAULT=STUNNEL
 DATABASE_DESC=	Support database feature (with Ruby & Sqlite3)
-DATABASE_RUN_DEPENDS=	rubygem-sqlite3>=0:${PORTSDIR}/databases/rubygem-sqlite3
+DATABASE_RUN_DEPENDS=	rubygem-sqlite3>=0:databases/rubygem-sqlite3
 STUNNEL_DESC=	Support SSL feature using stunnel
-STUNNEL_RUN_DEPENDS=	stunnel>=0:${PORTSDIR}/security/stunnel
+STUNNEL_RUN_DEPENDS=	stunnel>=0:security/stunnel
 
 # emacs port setup
 USE_EMACS=	yes
diff --git a/mail/milter-bogom/Makefile b/mail/milter-bogom/Makefile
index e54386172fb8..8679068cd347 100644
--- a/mail/milter-bogom/Makefile
+++ b/mail/milter-bogom/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	milter-
 MAINTAINER=	victor@bsdes.net
 COMMENT=	Simple sendmail milter to interface bogofilter
 
-RUN_DEPENDS=	bogofilter:${PORTSDIR}/mail/bogofilter
+RUN_DEPENDS=	bogofilter:mail/bogofilter
 
 .if !exists(/usr/lib/libmilter.so)
-LIB_DEPENDS=	libmilter.so:${PORTSDIR}/mail/libmilter
+LIB_DEPENDS=	libmilter.so:mail/libmilter
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 .endif
diff --git a/mail/milter-callback/Makefile b/mail/milter-callback/Makefile
index f6dcd82d1ea0..6db66bef99a8 100644
--- a/mail/milter-callback/Makefile
+++ b/mail/milter-callback/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Milter to perform a envelope-from sender verification on target MX
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS=	libspf2.so:mail/libspf2
 
 USES=		tar:xz
 USE_RC_SUBR=	milter-callback
diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile
index 83ad0b39d7e9..67adedf6ae20 100644
--- a/mail/milter-greylist-devel/Makefile
+++ b/mail/milter-greylist-devel/Makefile
@@ -31,11 +31,11 @@ CURL_DESC=	curl support
 P0F_DESC=	P0F support
 POSTFIX_DESC=	Use Postfix instead of Sendmail
 
-DKIM_BUILD_DEPENDS+=	opendkim>=0:${PORTSDIR}/mail/opendkim
-P0F_RUN_DEPENDS+=	p0f:${PORTSDIR}/net-mgmt/p0f
-SPF_BUILD_DEPENDS=	libspf2>=1.2.5:${PORTSDIR}/mail/libspf2
-CURL_BUILD_DEPENDS+=	curl>=7.18:${PORTSDIR}/ftp/curl
-GEOIP_BUILD_DEPENDS=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
+DKIM_BUILD_DEPENDS+=	opendkim>=0:mail/opendkim
+P0F_RUN_DEPENDS+=	p0f:net-mgmt/p0f
+SPF_BUILD_DEPENDS=	libspf2>=1.2.5:mail/libspf2
+CURL_BUILD_DEPENDS+=	curl>=7.18:ftp/curl
+GEOIP_BUILD_DEPENDS=	GeoIP>=1.4.4:net/GeoIP
 
 POSTFIX_CONFIGURE_ENABLE=	postfix
 P0F_CONFIGURE_ENABLE=		p0f306
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index e7b528ada9b6..d081e151922a 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -37,10 +37,10 @@ CURL_DESC=		curl support
 P0F_DESC=		P0F support
 POSTFIX_DESC=		Use Postfix instead of Sendmail
 
-P0F_RUN_DEPENDS=	p0f:${PORTSDIR}/net-mgmt/p0f
-SPF_LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+P0F_RUN_DEPENDS=	p0f:net-mgmt/p0f
+SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 POSTFIX_CONFIGURE_ENABLE=	postfix
 POSTFIX_LDFLAGS_OFF=		${SENDMAIL_LDFLAGS}
diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index a4f5add55a93..1420faec3c6c 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Super milter that can invoke several milters selectively
 LICENSE=	AGPLv3 GFDL GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	rubygem-glib2>0:${PORTSDIR}/devel/rubygem-glib2
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
-RUN_DEPENDS=	rubygem-glib2>0:${PORTSDIR}/devel/rubygem-glib2
+BUILD_DEPENDS=	rubygem-glib2>0:devel/rubygem-glib2
+LIB_DEPENDS=	libev.so:devel/libev
+RUN_DEPENDS=	rubygem-glib2>0:devel/rubygem-glib2
 
 USE_RC_SUBR=	milter-manager
 GNU_CONFIGURE=	yes
diff --git a/mail/milter-skem/Makefile b/mail/milter-skem/Makefile
index b09f6ee1dca3..2f9e3f70f0f1 100644
--- a/mail/milter-skem/Makefile
+++ b/mail/milter-skem/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Cache earlier sendmail's verdicts for the relays
 
 .if !exists( /usr/include/libmilter/mfapi.h )
-BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/libmilter
+BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:mail/libmilter
 CFLAGS+=	-I${LOCALBASE}/include
 .endif
 
diff --git a/mail/mime-construct/Makefile b/mail/mime-construct/Makefile
index 25cdfde2aa78..54f0e9962e54 100644
--- a/mail/mime-construct/Makefile
+++ b/mail/mime-construct/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.argon.org/~roderick/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Construct and optionally send MIME messages from command line
 
-BUILD_DEPENDS=	p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-Proc-WaitStat>=0:${PORTSDIR}/devel/p5-Proc-WaitStat
+BUILD_DEPENDS=	p5-MIME-Types>=0:mail/p5-MIME-Types \
+		p5-Proc-WaitStat>=0:devel/p5-Proc-WaitStat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/mime4j/Makefile b/mail/mime4j/Makefile
index fc3d4fa0b65f..488ef7d8bd6e 100644
--- a/mail/mime4j/Makefile
+++ b/mail/mime4j/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java parser for e-mail message streams
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index be68a30ec305..c06d80c7b8de 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Milter based anti-spam and anti-virus filtering program
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	\
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-MIME-Tools>=5.417:${PORTSDIR}/mail/p5-MIME-Tools \
-	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-	spamassassin>=3.0:${PORTSDIR}/mail/spamassassin
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-MIME-Tools>=5.417:mail/p5-MIME-Tools \
+	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+	spamassassin>=3.0:mail/spamassassin
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	CLAMAV EXAMPLES DOCS
@@ -56,7 +56,7 @@ CONFIG_FILES=	mimedefang-filter sa-mimedefang.cf mimedefang-ip-key
 .include <bsd.port.options.mk>
 
 .if !exists( /usr/include/libmilter/mfapi.h )
-BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/libmilter
+BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:mail/libmilter
 .endif
 
 .if exists( ${LOCALBASE}/include/libmilter/mfapi.h )
@@ -68,8 +68,8 @@ CONFIGURE_ARGS+=	--disable-antivirus \
 			--disable-clamav \
 			--disable-clamd
 .else
-BUILD_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
-RUN_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
+BUILD_DEPENDS+=	clamscan:security/clamav
+RUN_DEPENDS+=	clamscan:security/clamav
 .endif
 
 post-patch:
diff --git a/mail/mixmaster/Makefile b/mail/mixmaster/Makefile
index 9f0d7cd4f60a..f6e4e87249e0 100644
--- a/mail/mixmaster/Makefile
+++ b/mail/mixmaster/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Cryptographically secure anonymous remailer
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		perl5 ncurses
 
diff --git a/mail/mlmmj/Makefile b/mail/mlmmj/Makefile
index 123a176150bd..d75b3e488823 100644
--- a/mail/mlmmj/Makefile
+++ b/mail/mlmmj/Makefile
@@ -20,9 +20,9 @@ WANT_PHP_WEB=	yes
 .endif
 
 .if defined(WITH_PERL_WEBINTERFACE)
-RUN_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-CGI-FastTemplate>=0:${PORTSDIR}/www/p5-CGI-FastTemplate
+RUN_DEPENDS+=	p5-URI>=0:net/p5-URI \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-CGI-FastTemplate>=0:www/p5-CGI-FastTemplate
 .endif
 
 .if defined(WITH_PERL_WEBINTERFACE)
diff --git a/mail/msgconvert/Makefile b/mail/msgconvert/Makefile
index 0721fe33d13b..383fdd8eef10 100644
--- a/mail/msgconvert/Makefile
+++ b/mail/msgconvert/Makefile
@@ -12,9 +12,9 @@ EXTRACT_SUFX=	.bz2
 MAINTAINER=	klammer@webonaut.com
 COMMENT=	Convert .MSG files to multipart MIME messages (mbox)
 
-RUN_DEPENDS=	p5-OLE-Storage_Lite>=0:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-TimeDate>=0:devel/p5-TimeDate
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index f94e6517fd2e..91401d4d1d1a 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -29,17 +29,17 @@ LIBSECRET_DESC=	GNOME password management
 MSMTPQ_DESC=	Install offline messaging scripts
 
 GSASL_CONFIGURE_WITH=	libgsasl
-GSASL_LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
+GSASL_LIB_DEPENDS=	libgsasl.so:security/gsasl
 IDN_CONFIGURE_WITH=	libidn
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 LIBSECRET_CONFIGURE_WITH=	libsecret
-LIBSECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 MSMTPQ_PORTDOCS=	README.msmtpq
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 OPENSSL_VARS=		USE_OPENSSL=yes
 OPENSSL_CONFIGURE_ON=	--with-ssl=openssl
 OPENSSL_CONFIGURE_ENV=	libssl_CFLAGS="-I${OPENSSLINC}" \
@@ -49,7 +49,7 @@ CERTSFILE=		${LOCALBASE}/share/certs/ca-root-nss.crt
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL}
-RUN_DEPENDS+=	${CERTSFILE}:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS+=	${CERTSFILE}:security/ca_root_nss
 .else
 CONFIGURE_ARGS+=	--with-ssl=no
 .endif
diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index cbf3810e53e8..7fcf14f2ef0f 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Mail searching frontend for Xapian
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core \
-		libgmime-2.6.so:${PORTSDIR}/mail/gmime26
+LIB_DEPENDS=	libxapian.so:databases/xapian-core \
+		libgmime-2.6.so:mail/gmime26
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	djcb
@@ -29,7 +29,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE=		DOCS GUILE MU4E
 OPTIONS_SUB=		yes
 
-GUILE_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 GUILE_USE=		ldconfig=yes
 GUILE_CONFIGURE_ENABLE=	guile
 GUILE_INFO=		mu-guile
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 5c7ca71a7dee..3988e29c778c 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -108,14 +108,14 @@ OPTIONS_DEFAULT=	COMPRESSED_FOLDERS HTML ICONV IDN IFDEF_PATCH \
 		SASL SMTP TRASH_PATCH URLVIEW XML GSSAPI_NONE
 .endif
 
-RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 .if !defined (LITE)
-ASPELL_BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
-ASPELL_RUN_DEPENDS=		aspell:${PORTSDIR}/textproc/aspell
-ISPELL_BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
-ISPELL_RUN_DEPENDS=		ispell:${PORTSDIR}/textproc/aspell-ispell
-URLVIEW_RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
+ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
+ASPELL_RUN_DEPENDS=		aspell:textproc/aspell
+ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
+ISPELL_RUN_DEPENDS=		ispell:textproc/aspell-ispell
+URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
 .endif
 
 .if defined (LITE)
@@ -134,7 +134,7 @@ DEBUG_CONFIGURE_ON=	--enable-debug
 
 # Handle ncurses/ncurses-port/slang
 SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
-SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang
 
 NCURSES_USES=	ncurses
@@ -159,11 +159,11 @@ ASPELL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aspell
 ##PARENT_CHILD_MATCH_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-parent-child-match
 REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
 
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
 
-#MIXMASTER_BUILD_DEPENDS=	mixmaster:${PORTSDIR}/mail/mixmaster
-MIXMASTER_RUN_DEPENDS=	mixmaster:${PORTSDIR}/mail/mixmaster
+#MIXMASTER_BUILD_DEPENDS=	mixmaster:mail/mixmaster
+MIXMASTER_RUN_DEPENDS=	mixmaster:mail/mixmaster
 MIXMASTER_CONFIGURE_ON=	--with-mixmaster=${LOCALBASE}
 
 SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smime-outlook
@@ -174,11 +174,11 @@ FLOCK_CONFIGURE_OFF=	--disable-flock
 
 LOCALES_FIX_CONFIGURE_ON=	--enable-locales-fix
 
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_ON=	--with-idn
 IDN_CONFIGURE_OFF=	--without-idn
 
-GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GPGME_CONFIGURE_ON=	--enable-gpgme
 GPGME_CONFIGURE_OFF=	--disable-gpgme
 
@@ -315,7 +315,7 @@ pre-configure::
 .if ${PORT_OPTIONS:MIMAP_HEADER_CACHE} || ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
 .if ${PORT_OPTIONS:MTOKYOCABINET}
 CONFIGURE_ARGS+=	--enable-hcache --without-gdbm --without-bdb --with-tokyocabinet
-LIB_DEPENDS+=		libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=		libtokyocabinet.so:databases/tokyocabinet
 .else
 USE_BDB=		42+
 CONFIGURE_ARGS+=	--enable-hcache --without-gdbm --with-bdb
@@ -328,9 +328,9 @@ CONFIGURE_ARGS+=	--disable-hcache
 .endif
 
 .if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
-BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		lynx:${PORTSDIR}/www/lynx
+BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
+		lynx:www/lynx
 .else
 pre-build::
 	@${REINPLACE_CMD} -E -e 's|-xsltproc|@-true xsltproc|g' \
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index efaac01639e3..bb9a402d8835 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -51,12 +51,12 @@ PKGNAMESUFFIX=	14-lite
 
 .include <bsd.port.options.mk>
 
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 .if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
 WITH_SLANG=	yes
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell \
-		urlview:${PORTSDIR}/textproc/urlview
+BUILD_DEPENDS=	ispell:textproc/aspell-ispell
+RUN_DEPENDS+=	ispell:textproc/aspell-ispell \
+		urlview:textproc/urlview
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
@@ -70,7 +70,7 @@ USES+=	iconv
 .endif
 
 .if ${PORT_OPTIONS:MSLANG}
-LIB_DEPENDS+=	libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS+=	libslang.so:devel/libslang2
 .elif ${PORT_OPTIONS:MNCURSES}
 USES+=	ncurses:port
 .else
@@ -81,8 +81,8 @@ USES+=	ncurses
 IGNORE=	the SASL support for mutt has been withdrawn. Please use the mutt-devel port instead
 .endif
 .if ${PORT_OPTIONS:MMUTT_XFACE}
-PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/news/slrnface:extract
-RUN_DEPENDS+=	slrnface:${PORTSDIR}/news/slrnface
+PATCH_DEPENDS+=	${NONEXISTENT}:news/slrnface:extract
+RUN_DEPENDS+=	slrnface:news/slrnface
 PKGMESSAGE=	${PKGDIR}/pkg-message.xface
 .endif
 .endif
@@ -128,7 +128,7 @@ CFLAGS+=	-I${NCURSESINC}
 .endif
 .if ${PORT_OPTIONS:MGSSAPI}
 .if exists(${LOCALBASE}/bin/gss-client)
-LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=		libgssapi_krb5.so:security/krb5
 CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
 .elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-gss
diff --git a/mail/mutt_vc_query/Makefile b/mail/mutt_vc_query/Makefile
index 9236eb48272b..d6353ac6b9e1 100644
--- a/mail/mutt_vc_query/Makefile
+++ b/mail/mutt_vc_query/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/rolo/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	vCard query utility for mutt
 
-RUN_DEPENDS=	libvc>=003:${PORTSDIR}/devel/libvc
+RUN_DEPENDS=	libvc>=003:devel/libvc
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		tar:bzip2
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 7b2135befb55..df7a6099a637 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -25,7 +25,7 @@ OPTIONS_SINGLE_LOCKING=	DOT FCNTL FLOCK LOCKF
 
 SASL2_DESC=	SASL2 support
 SASL2_CONFIGURE_WITH=	cyrus-sasl
-SASL2_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL2_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL2_LDFLAGS=-L${LOCALBASE}/lib
 SASL2_CPPFLAGS=-I${LOCALBASE}/include
 
@@ -33,10 +33,10 @@ HASH_BKP_DESC=	Use hash as backup prefix (default is a comma)
 HASH_BKP_CONFIGURE_WITH=	hash-backup
 
 REPLYFILTER_DESC=	Install dependencies for contrib/replyfilter
-REPLYFILTER_RUN_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-				p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-				w3m>=0:${PORTSDIR}/www/w3m \
-				par>=0:${PORTSDIR}/textproc/par
+REPLYFILTER_RUN_DEPENDS=	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+				p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+				w3m>=0:www/w3m \
+				par>=0:textproc/par
 
 SMTP_DESC=	Use remote SMTP
 SMTP_CONFIGURE_ON=	--with-mts=smtp
diff --git a/mail/nmzmail/Makefile b/mail/nmzmail/Makefile
index a7f3f96dade7..1a3007e22716 100644
--- a/mail/nmzmail/Makefile
+++ b/mail/nmzmail/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.ecademix.com/JohannesHofmann/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast mail searching for mutt
 
-RUN_DEPENDS=	namazu:${PORTSDIR}/databases/namazu2
+RUN_DEPENDS=	namazu:databases/namazu2
 
 GNU_CONFIGURE=	yes
 USES=		gmake readline
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 4ceaffba1797..db9e657baec4 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Thread-based email index, search, and tagging application
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-		c++filt:${PORTSDIR}/devel/binutils
-LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
-		libxapian.so:${PORTSDIR}/databases/xapian-core \
-		libtalloc.so:${PORTSDIR}/devel/talloc
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
+		c++filt:devel/binutils
+LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
+		libxapian.so:databases/xapian-core \
+		libtalloc.so:devel/talloc
 
 OPTIONS_DEFINE=	BASH EMACS ZSH
 BASH_DESC=	Install bash completion (requires shells/bash-completion)
@@ -23,7 +23,7 @@ EMACS_DESC=	Install EMACS lisp files (requires emacs)
 ZSH_DESC=	Install zsh completion
 OPTIONS_SUB=	yes
 
-BASH_BUILD_DEPENDS=	bash-completion>=1.90:${PORTSDIR}/shells/bash-completion
+BASH_BUILD_DEPENDS=	bash-completion>=1.90:shells/bash-completion
 BASH_RUN_DEPENDS=	${BASH_BUILD_DEPENDS}
 BASH_CONFIGURE_OFF=	--without-bash-completion
 EMACS_CONFIGURE_OFF=	--without-emacs
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index c65c3705f52c..be3184e83064 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -43,7 +43,7 @@ OPTIONS_DEFINE=	GNUTLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lgnutls
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 2ef4a3a470e3..25b9eff1a335 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 ## later versions have sqlite3 backend, which is recommended for local storages
 ## with large amount of emails
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OfflineIMAP
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 353a14fafa11..285fecdf9ce9 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -44,31 +44,31 @@ STOCK_RESOLVER_DESC=	Use the stock resolver library
 
 UNBOUND_DESC=		Use unbound DNS library
 UNBOUND_CONFIGURE_WITH=	unbound
-UNBOUND_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound
+UNBOUND_LIB_DEPENDS=	libunbound.so:dns/unbound
 
 FILTER_DESC=		OpenDKIM filter, requires libmilter/Sendmail
 FILTER_USE=		RC_SUBR=milter-opendkim
 
 CURL_DESC=		Use cURL for web queries
 CURL_CONFIGURE_WITH=	libcurl
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNUTLS_DESC=		Use GnuTLS instead of OpenSSL
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_CONFIGURE_OFF=	--with-openssl=${OPENSSLBASE}
 
 JANSSON_DESC=		Statistics and other output as JSON data
 JANSSON_CONFIGURE_WITH=	libjansson
-JANSSON_LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson
+JANSSON_LIB_DEPENDS=	libjansson.so:devel/jansson
 
 LDNS_DESC=		Use LDNS library for DNS queries
 LDNS_CONFIGURE_WITH=	ldns
-LDNS_LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
+LDNS_LIB_DEPENDS=	libldns.so:dns/ldns
 
 LMDB_DESC=		Use Lightning Memory-Mapped DB key-value store
 LMDB_CONFIGURE_WITH=	lmdb
-LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 LUA_DESC=		Describe filter policy with lua
 LUA_CONFIGURE_WITH=	lua
@@ -76,13 +76,13 @@ LUA_USES=		lua
 
 MEMCACHED_DESC=		Use memcached as a data set
 MEMCACHED_CONFIGURE_WITH=	libmemcached
-MEMCACHED_LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
+MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 BDB_BASE_DESC=		Use Berkeley DB from base
 
 OPENDBX_DESC=		Store filter policies via OpenDBX
 OPENDBX_CONFIGURE_WITH=	odbx
-OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx
+OPENDBX_LIB_DEPENDS=	libopendbx.so:databases/opendbx
 
 OPENLDAP_DESC=		Store filter policies in LDAP
 OPENLDAP_CONFIGURE_WITH=openldap
diff --git a/mail/opendkim/Makefile.options b/mail/opendkim/Makefile.options
index df50d0e8a98a..66427a1f1ae1 100644
--- a/mail/opendkim/Makefile.options
+++ b/mail/opendkim/Makefile.options
@@ -47,7 +47,7 @@ DEFAULT_SENDER_CONFIGURE_ENABLE=default_sender
 
 DIFFHEADERS_DESC=		Compare signed and verified headers (experimental)
 DIFFHEADERS_CONFIGURE_ENABLE=	diffheaders
-DIFFHEADERS_LIB_DEPENDS=	libtre.so:${PORTSDIR}/textproc/libtre                                                      
+DIFFHEADERS_LIB_DEPENDS=	libtre.so:textproc/libtre                                                      
 DIFFHEADERS_CONFIGURE_WITH=	tre=${LOCALBASE}                                                                           
 DIFFHEADERS_CONFIGURE_OFF=	--without-tre                                                                              
 
@@ -75,7 +75,7 @@ REPLACE_RULES_CONFIGURE_ENABLE=	replace_rules
 
 REPRRD_DESC=			Support for collaborative reputation that uses rrdtool (experimental)
 REPRRD_CONFIGURE_ENABLE=	reprrd
-REPRRD_LIB_DEPENDS=		librrd.so:${PORTSDIR}/databases/rrdtool
+REPRRD_LIB_DEPENDS=		librrd.so:databases/rrdtool
 
 REPUTATION_DESC=		Reputation check (experimental)
 REPUTATION_CONFIGURE_ENABLE=	reputation
diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
index 590f0ecd3984..1868e0d191f9 100644
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@@ -14,9 +14,9 @@ COMMENT=	DMARC library and milter implementation
 LICENSE=		BSD3CLAUSE SENDMAIL
 LICENSE_COMB=		multi
 
-RUN_DEPENDS=	p5-Switch>=0:${PORTSDIR}/lang/p5-Switch \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-Switch>=0:lang/p5-Switch \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
 LICENSE_GROUPS_SENDMAIL=	FSF OSI
@@ -34,7 +34,7 @@ OPTIONS_DEFAULT=	SPF
 
 SPF_DESC=		Enable support for SPF record checking
 
-SPF_LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
+SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
 SPF_CONFIGURE_ON=	--with-spf \
 			--with-spf2-include=${LOCALBASE}/include/spf2 \
 			--with-spf2-lib=${LOCALBASE}/lib
diff --git a/mail/openemm2013/Makefile b/mail/openemm2013/Makefile
index 6213c30b07ae..d6aa2bc809aa 100644
--- a/mail/openemm2013/Makefile
+++ b/mail/openemm2013/Makefile
@@ -19,12 +19,12 @@ COMMENT=	OpenEMM a email marketing enterprise app
 LICENSE=	CPAL-1.0
 LICENSE_FILE=	${WRKSRC}/other/LICENSE.txt
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2 \
-		libsa.so:${PORTSDIR}/net/ossp-sa
-BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8 \
-		${ANT_CMD}:${PORTSDIR}/devel/apache-ant
-RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8 \
-		py27-MySQLdb>=1.2.3:${PORTSDIR}/databases/py-MySQLdb
+LIB_DEPENDS=	libslang.so:devel/libslang2 \
+		libsa.so:net/ossp-sa
+BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
+		${ANT_CMD}:devel/apache-ant
+RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
+		py27-MySQLdb>=1.2.3:databases/py-MySQLdb
 
 USE_RC_SUBR=	openemm2013
 USE_JAVA=	yes
diff --git a/mail/openemm2015/Makefile b/mail/openemm2015/Makefile
index 4ba5c74cf080..ac9fc5a2979d 100644
--- a/mail/openemm2015/Makefile
+++ b/mail/openemm2015/Makefile
@@ -18,12 +18,12 @@ COMMENT=	OpenEMM a email marketing enterprise app
 LICENSE=	CPAL-1.0
 LICENSE_FILE=	${WRKSRC}/other/LICENSE.txt
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2 \
-		libsa.so:${PORTSDIR}/net/ossp-sa
-BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8 \
-		${ANT_CMD}:${PORTSDIR}/devel/apache-ant
-RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8 \
-		py27-MySQLdb>=1.2.3:${PORTSDIR}/databases/py-MySQLdb
+LIB_DEPENDS=	libslang.so:devel/libslang2 \
+		libsa.so:net/ossp-sa
+BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
+		${ANT_CMD}:devel/apache-ant
+RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
+		py27-MySQLdb>=1.2.3:databases/py-MySQLdb
 
 USE_RC_SUBR=	openemm2015
 USE_JAVA=	yes
diff --git a/mail/opensmtpd-devel/Makefile b/mail/opensmtpd-devel/Makefile
index ca3739b92a45..dcc378e2c539 100644
--- a/mail/opensmtpd-devel/Makefile
+++ b/mail/opensmtpd-devel/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 OPTIONS_DEFINE=	CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT
 
@@ -51,11 +51,11 @@ PLIST_SUB+=	SMTPQ_GROUP=${GROUPS}
 
 OPTIONS_SUB=		yes
 
-LIBASR_LIB_DEPENDS_OFF=	libasr.so:${PORTSDIR}/dns/libasr-devel
-LIBASR_LIB_DEPENDS=	libasr.so:${PORTSDIR}/dns/libasr
+LIBASR_LIB_DEPENDS_OFF=	libasr.so:dns/libasr-devel
+LIBASR_LIB_DEPENDS=	libasr.so:dns/libasr
 
 CA_BUNDLE_CONFIGURE_WITH=	path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 PAM_CONFIGURE_WITH=	auth-pam=smtpd
 
diff --git a/mail/opensmtpd-extras/Makefile b/mail/opensmtpd-extras/Makefile
index 0f78a79e6884..f013fd43ae86 100644
--- a/mail/opensmtpd-extras/Makefile
+++ b/mail/opensmtpd-extras/Makefile
@@ -20,8 +20,8 @@ SMAP_DESC=	Socketmap protocol support
 
 OPTIONS_SUB=	yes
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
-RUN_DEPENDS=	${LOCALBASE}/sbin/smtpctl:${PORTSDIR}/mail/opensmtpd
+LIB_DEPENDS=	libevent.so:devel/libevent2
+RUN_DEPENDS=	${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
 
 USES=		autoreconf libtool pkgconfig
 USE_OPENSSL=	yes
@@ -52,7 +52,7 @@ PYTHON_VARS=		PLIST_FILES+=${INSTALL_DIR}/table-python
 
 REDIS_CONFIGURE_WITH=	table-redis
 REDIS_CONFIGURE_ENV=	REDIS_CONFIG=${LOCALBASE}/bin/pkgconf
-REDIS_LIB_DEPENDS=	libhiredis.so:${PORTSDIR}/databases/hiredis
+REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 REDIS_VARS=		CFLAGS+=-I${LOCALBASE}/include/hiredis \
 			PLIST_FILES+=${INSTALL_DIR}/table-redis \
 			PLIST_FILES+=man/man5/table-redis.5.gz
diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
index 3573ca2e6020..73d78b9a9a9c 100644
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM SSL_PORT TABLE_DB
 
@@ -47,10 +47,10 @@ GROUPS=		_smtpd
 OPTIONS_SUB=	yes
 
 CA_BUNDLE_CONFIGURE_WITH=	ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-LIBASRDEVEL_LIB_DEPENDS_OFF=	libasr.so:${PORTSDIR}/dns/libasr
-LIBASRDEVEL_LIB_DEPENDS=	libasr.so:${PORTSDIR}/dns/libasr-devel
+LIBASRDEVEL_LIB_DEPENDS_OFF=	libasr.so:dns/libasr
+LIBASRDEVEL_LIB_DEPENDS=	libasr.so:dns/libasr-devel
 LIBASRDEVEL_BROKEN=		incompatible with libasr-devel
 
 PAM_CONFIGURE_WITH=	pam pam-service=smtpd
diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile
index 762fcc7d092f..df914f269634 100644
--- a/mail/openwebmail/Makefile
+++ b/mail/openwebmail/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://openwebmail.acatysmoof.com/download/release/ \
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Webmail system designed to manage big mail folder files efficiently
 
-RUN_DEPENDS=	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
+RUN_DEPENDS=	p5-Text-Iconv>=0:converters/p5-Text-Iconv
 
 USES=		perl5
 USE_PERL5=	run build patch
@@ -35,37 +35,37 @@ OPTIONS_DEFINE=	ANTIWORD MAGICK ISPELL LEARNSPAM LSOF PAM POP3_OVER_SSL QUOTA \
 		WGET
 
 ANTIWORD_DESC=	AntiWord
-ANTIWORD_RUN_DEPENDS=	antiword:${PORTSDIR}/textproc/antiword
+ANTIWORD_RUN_DEPENDS=	antiword:textproc/antiword
 ISPELL_DESC=	ISpell
-ISPELL_RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 LEARNSPAM_DESC=	Learn HAM/SPAM
 LEARNSPAM_IMPLIES=	SPAMCHECK
 LSOF_DESC=	lsof
-LSOF_RUN_DEPENDS=	${LOCALBASE}/sbin/lsof:${PORTSDIR}/sysutils/lsof
-MAGICK_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+LSOF_RUN_DEPENDS=	${LOCALBASE}/sbin/lsof:sysutils/lsof
+MAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick
 PAM_DESC=	PAM
-PAM_RUN_DEPENDS=	p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM
+PAM_RUN_DEPENDS=	p5-Authen-PAM>=0:security/p5-Authen-PAM
 POP3_OVER_SSL_DESC=	POP3 Over SSL
-POP3_OVER_SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+POP3_OVER_SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 QUOTA_DESC=	Quota
-QUOTA_RUN_DEPENDS=	p5-Quota>=0:${PORTSDIR}/sysutils/p5-Quota
+QUOTA_RUN_DEPENDS=	p5-Quota>=0:sysutils/p5-Quota
 SPAMCHECK_DESC=	Spam check (Mail::SpamAssassin)
-SPAMCHECK_RUN_DEPENDS=	spamassassin>=0:${PORTSDIR}/mail/spamassassin
+SPAMCHECK_RUN_DEPENDS=	spamassassin>=0:mail/spamassassin
 SPAMCHECK_ALL_DESC=	Spam check for all (default: pop3)
 SPAMCHECK_ALL_IMPLIES=	SPAMCHECK
 SPEEDYCGI_DESC=	SpeedyCGI
-SPEEDYCGI_RUN_DEPENDS=	speedy_suidperl:${PORTSDIR}/www/p5-CGI-SpeedyCGI
+SPEEDYCGI_RUN_DEPENDS=	speedy_suidperl:www/p5-CGI-SpeedyCGI
 SPEEDYCGI_SUB_LIST=	WITHOUT_SPEEDYCGI="@comment "
 SPEEDYCGI_SUB_LIST_OFF=	WITHOUT_SPEEDYCGI=""
 SPEEDYCGI_EXTRA_PATCHES=	${PATCH_WRKSRC}/misc/patches/suidperl2speedy_suidperl.notmp.patch
 TNEF_DESC=	tnef
-TNEF_RUN_DEPENDS=	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
+TNEF_RUN_DEPENDS=	${LOCALBASE}/bin/tnef:converters/tnef
 VIRUSCHECK_DESC=	Virus check (Clam AntiVirus)
-VIRUSCHECK_RUN_DEPENDS=	clamdscan:${PORTSDIR}/security/clamav
+VIRUSCHECK_RUN_DEPENDS=	clamdscan:security/clamav
 VIRUSCHECK_ALL_DESC=	Virus check for all (default: pop3)
 VIRUSCHECK_ALL_IMPLIES=	VIRUSCHECK
 WGET_DESC=	wget
-WGET_RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
+WGET_RUN_DEPENDS=	${LOCALBASE}/bin/wget:ftp/wget
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile
index e2ec9a33f01a..250db9a0b9a6 100644
--- a/mail/ovs/Makefile
+++ b/mail/ovs/Makefile
@@ -14,8 +14,8 @@ COMMENT=	RRDtool frontend for mail 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
 NO_ARCH=	yes
diff --git a/mail/p5-Clamd/Makefile b/mail/p5-Clamd/Makefile
index 90889db1b414..0614b5b12ba9 100644
--- a/mail/p5-Clamd/Makefile
+++ b/mail/p5-Clamd/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Clamd - Connect to a local clamd service and send commands
 
-RUN_DEPENDS=	clamd:${PORTSDIR}/security/clamav
+RUN_DEPENDS=	clamd:security/clamav
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Dancer-Plugin-Email/Makefile b/mail/p5-Dancer-Plugin-Email/Makefile
index 491d66fb10dd..2b3fdc04ac3a 100644
--- a/mail/p5-Dancer-Plugin-Email/Makefile
+++ b/mail/p5-Dancer-Plugin-Email/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Simple email handling for Dancer applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer>=0:${PORTSDIR}/www/p5-Dancer \
-		p5-Email-Date-Format>=0:${PORTSDIR}/mail/p5-Email-Date-Format \
-		p5-Email-Sender>=0:${PORTSDIR}/mail/p5-Email-Sender \
-		p5-File-Type>=0:${PORTSDIR}/devel/p5-File-Type \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS=	p5-Dancer>=0:www/p5-Dancer \
+		p5-Email-Date-Format>=0:mail/p5-Email-Date-Format \
+		p5-Email-Sender>=0:mail/p5-Email-Sender \
+		p5-File-Type>=0:devel/p5-File-Type \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/mail/p5-Dancer2-Plugin-Email/Makefile b/mail/p5-Dancer2-Plugin-Email/Makefile
index 99ae76bd65a1..a7640641b9a6 100644
--- a/mail/p5-Dancer2-Plugin-Email/Makefile
+++ b/mail/p5-Dancer2-Plugin-Email/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Simple email handling for Dancer2 applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer2>=0:${PORTSDIR}/www/p5-Dancer2 \
-		p5-Email-Sender>=0:${PORTSDIR}/mail/p5-Email-Sender \
-		p5-File-Type>=0:${PORTSDIR}/devel/p5-File-Type \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS=	p5-Dancer2>=0:www/p5-Dancer2 \
+		p5-Email-Sender>=0:mail/p5-Email-Sender \
+		p5-File-Type>=0:devel/p5-File-Type \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-WWW-Mechanize-PSGI>=0.35:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-PSGI
+TEST_DEPENDS=	p5-Test-WWW-Mechanize-PSGI>=0.35:devel/p5-Test-WWW-Mechanize-PSGI
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Data-Validate-Email/Makefile b/mail/p5-Data-Validate-Email/Makefile
index 0a3f54547adc..44d99f004566 100644
--- a/mail/p5-Data-Validate-Email/Makefile
+++ b/mail/p5-Data-Validate-Email/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	Common email validation written in Perl
 
-RUN_DEPENDS=	p5-Data-Validate-Domain>=0:${PORTSDIR}/dns/p5-Data-Validate-Domain \
-		p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Net-Domain-TLD>=0:${PORTSDIR}/dns/p5-Net-Domain-TLD
+RUN_DEPENDS=	p5-Data-Validate-Domain>=0:dns/p5-Data-Validate-Domain \
+		p5-Email-Address>=0:mail/p5-Email-Address \
+		p5-Net-Domain-TLD>=0:dns/p5-Net-Domain-TLD
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-Abstract/Makefile b/mail/p5-Email-Abstract/Makefile
index 50c1ef59d460..c948b6171643 100644
--- a/mail/p5-Email-Abstract/Makefile
+++ b/mail/p5-Email-Abstract/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Unified interface to mail representations
 
-RUN_DEPENDS=	p5-Email-Simple>=1.998:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+RUN_DEPENDS=	p5-Email-Simple>=1.998:mail/p5-Email-Simple \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Address-List/Makefile b/mail/p5-Email-Address-List/Makefile
index ad2caa7c4e48..15b89907f001 100644
--- a/mail/p5-Email-Address-List/Makefile
+++ b/mail/p5-Email-Address-List/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	RFC-close address list parsing
 
-BUILD_DEPENDS=	p5-Email-Address>0:${PORTSDIR}/mail/p5-Email-Address
+BUILD_DEPENDS=	p5-Email-Address>0:mail/p5-Email-Address
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/mail/p5-Email-Address-Loose/Makefile b/mail/p5-Email-Address-Loose/Makefile
index 3879ceb85efe..e9369953d5e3 100644
--- a/mail/p5-Email-Address-Loose/Makefile
+++ b/mail/p5-Email-Address-Loose/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to make Email::Address->parse() loose
 
 RUN_DEPENDS=	\
-	p5-Email-Address>=1.88.9:${PORTSDIR}/mail/p5-Email-Address
+	p5-Email-Address>=1.88.9:mail/p5-Email-Address
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Date/Makefile b/mail/p5-Email-Date/Makefile
index 131b17efcae9..106d6b0773ec 100644
--- a/mail/p5-Email-Date/Makefile
+++ b/mail/p5-Email-Date/Makefile
@@ -12,11 +12,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9]+)$/\1/}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Find and Format Date Headers
 
-BUILD_DEPENDS=	p5-Email-Abstract>=2.10:${PORTSDIR}/mail/p5-Email-Abstract \
-		p5-Email-Date-Format>=1:${PORTSDIR}/mail/p5-Email-Date-Format \
-		p5-Email-Simple>=1.9:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Time-Piece>=1.08:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-TimeDate>=1.16:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-Email-Abstract>=2.10:mail/p5-Email-Abstract \
+		p5-Email-Date-Format>=1:mail/p5-Email-Date-Format \
+		p5-Email-Simple>=1.9:mail/p5-Email-Simple \
+		p5-Time-Piece>=1.08:devel/p5-Time-Piece \
+		p5-TimeDate>=1.16:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Delete/Makefile b/mail/p5-Email-Delete/Makefile
index 885a627813fd..69a90852393f 100644
--- a/mail/p5-Email-Delete/Makefile
+++ b/mail/p5-Email-Delete/Makefile
@@ -12,11 +12,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C|\.([0-9])$|\1|}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Delete Messages from Folders
 
-RUN_DEPENDS=	p5-Email-Folder>=0.84:${PORTSDIR}/mail/p5-Email-Folder \
-		p5-Email-FolderType>=0.7:${PORTSDIR}/mail/p5-Email-FolderType \
-		p5-Email-LocalDelivery>=0.21.3:${PORTSDIR}/mail/p5-Email-LocalDelivery \
-		p5-Email-Simple>=1.92:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-File-Find-Rule>=0.28:${PORTSDIR}/devel/p5-File-Find-Rule
+RUN_DEPENDS=	p5-Email-Folder>=0.84:mail/p5-Email-Folder \
+		p5-Email-FolderType>=0.7:mail/p5-Email-FolderType \
+		p5-Email-LocalDelivery>=0.21.3:mail/p5-Email-LocalDelivery \
+		p5-Email-Simple>=1.92:mail/p5-Email-Simple \
+		p5-File-Find-Rule>=0.28:devel/p5-File-Find-Rule
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Filter/Makefile b/mail/p5-Email-Filter/Makefile
index 5b0963f180bb..1ccf9ea14c9b 100644
--- a/mail/p5-Email-Filter/Makefile
+++ b/mail/p5-Email-Filter/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Library for creating easy email filters
 
-BUILD_DEPENDS=	p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Email-LocalDelivery>=0:${PORTSDIR}/mail/p5-Email-LocalDelivery \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Class-Trigger>=0:${PORTSDIR}/devel/p5-Class-Trigger
+BUILD_DEPENDS=	p5-Email-Simple>=0:mail/p5-Email-Simple \
+		p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
+		p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-Class-Trigger>=0:devel/p5-Class-Trigger
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 0a4d5d758902..2c7950fc78cd 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Find RFC 822 email addresses in plain text
 
-BUILD_DEPENDS=	p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid
+BUILD_DEPENDS=	p5-Email-Valid>=0:mail/p5-Email-Valid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Folder-IMAP/Makefile b/mail/p5-Email-Folder-IMAP/Makefile
index d6ed353b2b05..272ec38693fb 100644
--- a/mail/p5-Email-Folder-IMAP/Makefile
+++ b/mail/p5-Email-Folder-IMAP/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Email::Folder Access to IMAP Folders
 
-RUN_DEPENDS=	p5-Email-FolderType-Net>=0:${PORTSDIR}/mail/p5-Email-FolderType-Net \
-		p5-Email-Folder>=0:${PORTSDIR}/mail/p5-Email-Folder \
-		p5-Net-IMAP-Simple>=0.95:${PORTSDIR}/mail/p5-Net-IMAP-Simple \
-		p5-URI-imap>=0:${PORTSDIR}/mail/p5-URI-imap
+RUN_DEPENDS=	p5-Email-FolderType-Net>=0:mail/p5-Email-FolderType-Net \
+		p5-Email-Folder>=0:mail/p5-Email-Folder \
+		p5-Net-IMAP-Simple>=0.95:mail/p5-Net-IMAP-Simple \
+		p5-URI-imap>=0:mail/p5-URI-imap
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Folder-IMAPS/Makefile b/mail/p5-Email-Folder-IMAPS/Makefile
index b4274937cab9..00da3ec7c253 100644
--- a/mail/p5-Email-Folder-IMAPS/Makefile
+++ b/mail/p5-Email-Folder-IMAPS/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Email::Folder access to IMAP over SSL folders
 
-RUN_DEPENDS=	p5-Email-FolderType-Net>=0:${PORTSDIR}/mail/p5-Email-FolderType-Net \
-		p5-Email-Folder-IMAP>=1.10.2:${PORTSDIR}/mail/p5-Email-Folder-IMAP \
-		p5-Net-IMAP-Simple-SSL>=1.3:${PORTSDIR}/mail/p5-Net-IMAP-Simple-SSL \
-		p5-URI-imaps>=0:${PORTSDIR}/mail/p5-URI-imaps
+RUN_DEPENDS=	p5-Email-FolderType-Net>=0:mail/p5-Email-FolderType-Net \
+		p5-Email-Folder-IMAP>=1.10.2:mail/p5-Email-Folder-IMAP \
+		p5-Net-IMAP-Simple-SSL>=1.3:mail/p5-Net-IMAP-Simple-SSL \
+		p5-URI-imaps>=0:mail/p5-URI-imaps
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Folder-POP3/Makefile b/mail/p5-Email-Folder-POP3/Makefile
index f149290ab394..8b5bee870e74 100644
--- a/mail/p5-Email-Folder-POP3/Makefile
+++ b/mail/p5-Email-Folder-POP3/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Email::Folder access to POP3 folders
 
-RUN_DEPENDS=	p5-URI>=1.35:${PORTSDIR}/net/p5-URI \
-		p5-Email-FolderType-Net>=1.02:${PORTSDIR}/mail/p5-Email-FolderType-Net \
-		p5-Email-Folder>=0.84:${PORTSDIR}/mail/p5-Email-Folder \
-		p5-Net>=1.19:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-URI>=1.35:net/p5-URI \
+		p5-Email-FolderType-Net>=1.02:mail/p5-Email-FolderType-Net \
+		p5-Email-Folder>=0.84:mail/p5-Email-Folder \
+		p5-Net>=1.19:net/p5-Net
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Folder/Makefile b/mail/p5-Email-Folder/Makefile
index e0ac92cd4ca8..866f9fec27ba 100644
--- a/mail/p5-Email-Folder/Makefile
+++ b/mail/p5-Email-Folder/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Read all the messages from a folder as Email::Simple objects
 
-RUN_DEPENDS=	p5-Email-Simple>0:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Email-FolderType>=0.6:${PORTSDIR}/mail/p5-Email-FolderType
+RUN_DEPENDS=	p5-Email-Simple>0:mail/p5-Email-Simple \
+		p5-Email-FolderType>=0.6:mail/p5-Email-FolderType
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index 6dd18dbb645b..68ca38ac77f4 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Recognize folder types for network based message protocols
 
-RUN_DEPENDS=	p5-URI>=1.35:${PORTSDIR}/net/p5-URI \
-		p5-Email-FolderType>=0.8:${PORTSDIR}/mail/p5-Email-FolderType
+RUN_DEPENDS=	p5-URI>=1.35:net/p5-URI \
+		p5-Email-FolderType>=0.8:mail/p5-Email-FolderType
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-FolderType/Makefile b/mail/p5-Email-FolderType/Makefile
index 6edaedf383a6..df08317b97d3 100644
--- a/mail/p5-Email-FolderType/Makefile
+++ b/mail/p5-Email-FolderType/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Determine the type of a mail folder
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Capture-Tiny>0:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>0:devel/p5-Capture-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
@@ -23,8 +23,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502000
-BUILD_DEPENDS+=	p5-Module-Pluggable>0:${PORTSDIR}/devel/p5-Module-Pluggable
-RUN_DEPENDS+=	p5-Module-Pluggable>0:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS+=	p5-Module-Pluggable>0:devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>0:devel/p5-Module-Pluggable
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
index abed0fdcb5a6..7dd89036bb1e 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Deliver mail into ezmlm archives
 
-BUILD_DEPENDS=	p5-Email-LocalDelivery>=0:${PORTSDIR}/mail/p5-Email-LocalDelivery \
-		p5-Email-FolderType>=0:${PORTSDIR}/mail/p5-Email-FolderType
+BUILD_DEPENDS=	p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
+		p5-Email-FolderType>=0:mail/p5-Email-FolderType
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-LocalDelivery/Makefile b/mail/p5-Email-LocalDelivery/Makefile
index 1314d20feac5..af9e7de08eda 100644
--- a/mail/p5-Email-LocalDelivery/Makefile
+++ b/mail/p5-Email-LocalDelivery/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Deliver a piece of email - simply
 
-RUN_DEPENDS=	p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Email-FolderType>=0:${PORTSDIR}/mail/p5-Email-FolderType \
-		p5-File-Path-Expand>=0:${PORTSDIR}/devel/p5-File-Path-Expand
+RUN_DEPENDS=	p5-Email-Simple>=0:mail/p5-Email-Simple \
+		p5-Email-FolderType>=0:mail/p5-Email-FolderType \
+		p5-File-Path-Expand>=0:devel/p5-File-Path-Expand
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/Makefile b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
index 986b772a8430..753efdb72097 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/Makefile
+++ b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C|\.([0-9])$|\1|}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Strip the attachments from a mail
 
-RUN_DEPENDS=	p5-Email-MIME>=1.861:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-MIME-ContentType>=1.0:${PORTSDIR}/mail/p5-Email-MIME-ContentType
+RUN_DEPENDS=	p5-Email-MIME>=1.861:mail/p5-Email-MIME \
+		p5-Email-MIME-ContentType>=1.0:mail/p5-Email-MIME-ContentType
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-MIME-CreateHTML/Makefile b/mail/p5-Email-MIME-CreateHTML/Makefile
index 37e80c72d919..62d5c416f7fb 100644
--- a/mail/p5-Email-MIME-CreateHTML/Makefile
+++ b/mail/p5-Email-MIME-CreateHTML/Makefile
@@ -12,23 +12,23 @@ COMMENT=	Multipart HTML Email builder
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Data-Serializer>=0:${PORTSDIR}/devel/p5-Data-Serializer \
-		p5-Email-MIME>=0:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-File-Policy>=0:${PORTSDIR}/devel/p5-File-Policy \
-		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-HTML-TokeParser-Simple>=3.15:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
-		p5-Log-Trace>=0:${PORTSDIR}/devel/p5-Log-Trace \
-		p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Data-Serializer>=0:devel/p5-Data-Serializer \
+		p5-Email-MIME>=0:mail/p5-Email-MIME \
+		p5-File-Policy>=0:devel/p5-File-Policy \
+		p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
+		p5-HTML-TokeParser-Simple>=3.15:www/p5-HTML-TokeParser-Simple \
+		p5-Log-Trace>=0:devel/p5-Log-Trace \
+		p5-MIME-Types>=0:mail/p5-MIME-Types \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Email-Send>=0:${PORTSDIR}/mail/p5-Email-Send \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-HTML-TreeBuilder-XPath>=0:${PORTSDIR}/www/p5-HTML-TreeBuilder-XPath \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Test-Assertions>=0:${PORTSDIR}/devel/p5-Test-Assertions \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+TEST_DEPENDS=	p5-Email-Address>=0:mail/p5-Email-Address \
+		p5-Email-Send>=0:mail/p5-Email-Send \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-HTML-TreeBuilder-XPath>=0:www/p5-HTML-TreeBuilder-XPath \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-Test-Assertions>=0:devel/p5-Test-Assertions \
+		p5-common-sense>=0:devel/p5-common-sense
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
index 4ffcc8338f88..b75dcaf36a5e 100644
--- a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
+++ b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of Email::MIME mixin to create an iso-2022-jp mail
 
 RUN_DEPENDS=	\
-	p5-Email-MIME>=1.900:${PORTSDIR}/mail/p5-Email-MIME \
-	p5-Sub-Install>0:${PORTSDIR}/devel/p5-Sub-Install
+	p5-Email-MIME>=1.900:mail/p5-Email-MIME \
+	p5-Sub-Install>0:devel/p5-Sub-Install
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Classy>=0:${PORTSDIR}/devel/p5-Test-Classy \
-		p5-Test-UseAllModules>=0:${PORTSDIR}/devel/p5-Test-UseAllModules
+TEST_DEPENDS=	p5-Test-Classy>=0:devel/p5-Test-Classy \
+		p5-Test-UseAllModules>=0:devel/p5-Test-UseAllModules
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-MIME-Encodings/Makefile b/mail/p5-Email-MIME-Encodings/Makefile
index 75aaae917b0b..8a31605ba655 100644
--- a/mail/p5-Email-MIME-Encodings/Makefile
+++ b/mail/p5-Email-MIME-Encodings/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Unified interface to MIME encoding and decoding
 
-RUN_DEPENDS=	p5-MIME-Base64>3.05:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-MIME-Base64>3.05:converters/p5-MIME-Base64
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-MIME/Makefile b/mail/p5-Email-MIME/Makefile
index c1dfb3f726cb..40488509564f 100644
--- a/mail/p5-Email-MIME/Makefile
+++ b/mail/p5-Email-MIME/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Easy MIME message parsing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Simple>=2.206:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Email-MessageID>=0:${PORTSDIR}/mail/p5-Email-MessageID \
-		p5-Email-MIME-Encodings>=1.313:${PORTSDIR}/mail/p5-Email-MIME-Encodings \
-		p5-Email-MIME-ContentType>=1.01.6:${PORTSDIR}/mail/p5-Email-MIME-ContentType \
-		p5-MIME-Types>=1.13:${PORTSDIR}/mail/p5-MIME-Types
+BUILD_DEPENDS=	p5-Email-Simple>=2.206:mail/p5-Email-Simple \
+		p5-Email-MessageID>=0:mail/p5-Email-MessageID \
+		p5-Email-MIME-Encodings>=1.313:mail/p5-Email-MIME-Encodings \
+		p5-Email-MIME-ContentType>=1.01.6:mail/p5-Email-MIME-ContentType \
+		p5-MIME-Types>=1.13:mail/p5-MIME-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-MessageID/Makefile b/mail/p5-Email-MessageID/Makefile
index 91b84258f81e..028c8f4ba662 100644
--- a/mail/p5-Email-MessageID/Makefile
+++ b/mail/p5-Email-MessageID/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Generate world unique message-ids
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Address>=1.80:${PORTSDIR}/mail/p5-Email-Address
+BUILD_DEPENDS=	p5-Email-Address>=1.80:mail/p5-Email-Address
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/mail/p5-Email-Reply/Makefile b/mail/p5-Email-Reply/Makefile
index 222dd51cb179..4cbd00ea6c7e 100644
--- a/mail/p5-Email-Reply/Makefile
+++ b/mail/p5-Email-Reply/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Email::Reply - Reply to a Message
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Abstract>=2.01:${PORTSDIR}/mail/p5-Email-Abstract \
-		p5-Email-Address>=1.80:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Email-MIME>=1.82:${PORTSDIR}/mail/p5-Email-MIME
+BUILD_DEPENDS=	p5-Email-Abstract>=2.01:mail/p5-Email-Abstract \
+		p5-Email-Address>=1.80:mail/p5-Email-Address \
+		p5-Email-MIME>=1.82:mail/p5-Email-MIME
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index f25b35631dcd..fa640e8217f2 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Email::Send - Simply Sending Email
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.19:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Email-Address>=1.80:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Email-Simple>=1.92:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Return-Value>=1.28:${PORTSDIR}/devel/p5-Return-Value \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
+		p5-Email-Address>=1.80:mail/p5-Email-Address \
+		p5-Email-Simple>=1.92:mail/p5-Email-Simple \
+		p5-Return-Value>=1.28:devel/p5-Return-Value \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile b/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
index 53d1a031d3f6..a1d5cb9a3fd5 100644
--- a/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
+++ b/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Email::Sender with Net::SMTP::TLS (Eg. Gmail)
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Email-Sender>=0.091660:${PORTSDIR}/mail/p5-Email-Sender \
-		p5-Net-SMTP-TLS-ButMaintained>=0.2:${PORTSDIR}/mail/p5-Net-SMTP-TLS-ButMaintained
+RUN_DEPENDS=	p5-Email-Sender>=0.091660:mail/p5-Email-Sender \
+		p5-Net-SMTP-TLS-ButMaintained>=0.2:mail/p5-Net-SMTP-TLS-ButMaintained
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Sender-Transport-SMTPS/Makefile b/mail/p5-Email-Sender-Transport-SMTPS/Makefile
index b7bbfd928a7a..cbec5573b2ff 100644
--- a/mail/p5-Email-Sender-Transport-SMTPS/Makefile
+++ b/mail/p5-Email-Sender-Transport-SMTPS/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Email-Sender>=1.300006:${PORTSDIR}/mail/p5-Email-Sender \
-	p5-Net-SMTPS>=0.03:${PORTSDIR}/mail/p5-Net-SMTPS
+	p5-Email-Sender>=1.300006:mail/p5-Email-Sender \
+	p5-Net-SMTPS>=0.03:mail/p5-Net-SMTPS
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Sender-Transport-SQLite/Makefile b/mail/p5-Email-Sender-Transport-SQLite/Makefile
index 43dbe90f98af..2a90157212cb 100644
--- a/mail/p5-Email-Sender-Transport-SQLite/Makefile
+++ b/mail/p5-Email-Sender-Transport-SQLite/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bill.brinzer@gmail.com
 COMMENT=	Deliver mail to an SQLite db for testing
 
-RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Email-Sender>=0.091660:${PORTSDIR}/mail/p5-Email-Sender
+RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Email-Sender>=0.091660:mail/p5-Email-Sender
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-Sender/Makefile b/mail/p5-Email-Sender/Makefile
index dd6003c65c14..7d94d516c100 100644
--- a/mail/p5-Email-Sender/Makefile
+++ b/mail/p5-Email-Sender/Makefile
@@ -15,18 +15,18 @@ COMMENT=	Library for sending email
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Abstract>=3.006:${PORTSDIR}/mail/p5-Email-Abstract \
-		p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Email-Simple>=1.998:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moo>=1.000008:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-Types-MooseLike>=0.15:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Throwable>=0.200003:${PORTSDIR}/devel/p5-Throwable \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Email-Abstract>=3.006:mail/p5-Email-Abstract \
+		p5-Email-Address>=0:mail/p5-Email-Address \
+		p5-Email-Simple>=1.998:mail/p5-Email-Simple \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moo>=1.000008:devel/p5-Moo \
+		p5-MooX-Types-MooseLike>=0.15:devel/p5-MooX-Types-MooseLike \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Throwable>=0.200003:devel/p5-Throwable \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0.08:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0.08:devel/p5-Capture-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-Simple-FromHandle/Makefile b/mail/p5-Email-Simple-FromHandle/Makefile
index 2f874e5d288a..68ecb868a5e9 100644
--- a/mail/p5-Email-Simple-FromHandle/Makefile
+++ b/mail/p5-Email-Simple-FromHandle/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl library for making email objects from a filehandle
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+BUILD_DEPENDS=	p5-Email-Simple>=0:mail/p5-Email-Simple \
+		p5-IO-String>=0:devel/p5-IO-String
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
index 4d7a5b828426..053215b96a88 100644
--- a/mail/p5-Email-Simple/Makefile
+++ b/mail/p5-Email-Simple/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple parsing of RFC2822 message format and headers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Date-Format>=0:${PORTSDIR}/mail/p5-Email-Date-Format
+BUILD_DEPENDS=	p5-Email-Date-Format>=0:mail/p5-Email-Date-Format
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Stuffer/Makefile b/mail/p5-Email-Stuffer/Makefile
index dd7b5bd5fe87..dbd43b26796f 100644
--- a/mail/p5-Email-Stuffer/Makefile
+++ b/mail/p5-Email-Stuffer/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	More casual approach to creating and sending Email
 
-BUILD_DEPENDS=	p5-Params-Util>=0.23:${PORTSDIR}/devel/p5-Params-Util \
-		p5-File-Type>=0.22:${PORTSDIR}/devel/p5-File-Type \
-		p5-Email-MIME>=1.901:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Sender>=0:${PORTSDIR}/mail/p5-Email-Sender
+BUILD_DEPENDS=	p5-Params-Util>=0.23:devel/p5-Params-Util \
+		p5-File-Type>=0.22:devel/p5-File-Type \
+		p5-Email-MIME>=1.901:mail/p5-Email-MIME \
+		p5-Email-Sender>=0:mail/p5-Email-Sender
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index 9186f2e65165..3cec5a6fd2eb 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Variation of Email::Valid which allows dot before at mark
 
-BUILD_DEPENDS=	p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid
+BUILD_DEPENDS=	p5-Email-Valid>=0:mail/p5-Email-Valid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index 9d3864d727ee..16fa3ae4a3cf 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Check validity of Internet email addresses
 
-COMMON_DEPENDS=	p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Mail-Tools>0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Net-Domain-TLD>0:${PORTSDIR}/dns/p5-Net-Domain-TLD
+COMMON_DEPENDS=	p5-Net-DNS>0:dns/p5-Net-DNS \
+		p5-Mail-Tools>0:mail/p5-Mail-Tools \
+		p5-Net-Domain-TLD>0:dns/p5-Net-Domain-TLD
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index 0907bfb2934b..f29c8755e6e7 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -15,15 +15,15 @@ COMMENT=	Plugin for SpamAssassin which scans image attachments for spam
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm			\
-		gifsicle:${PORTSDIR}/graphics/gifsicle			\
-		gocr:${PORTSDIR}/graphics/gocr				\
-		ocrad:${PORTSDIR}/graphics/ocrad			\
-		giftext:${PORTSDIR}/graphics/giflib			\
-		spamassassin:${PORTSDIR}/mail/spamassassin	\
-		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM	\
-		p5-MLDBM-Sync>=0:${PORTSDIR}/databases/p5-MLDBM-Sync \
-		p5-String-Approx>=0:${PORTSDIR}/devel/p5-String-Approx
+RUN_DEPENDS=	giftopnm:graphics/netpbm			\
+		gifsicle:graphics/gifsicle			\
+		gocr:graphics/gocr				\
+		ocrad:graphics/ocrad			\
+		giftext:graphics/giflib			\
+		spamassassin:mail/spamassassin	\
+		p5-MLDBM>=0:databases/p5-MLDBM	\
+		p5-MLDBM-Sync>=0:databases/p5-MLDBM-Sync \
+		p5-String-Approx>=0:devel/p5-String-Approx
 
 USES=		perl5
 NO_BUILD=	yes
@@ -52,7 +52,7 @@ PLIST_FILES=	%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr.pm		\
 		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Scoring.pm
 
 #.if defined(WITH_OCRAD)
-#RUN_DEPENDS+=	ocrad:${PORTSDIR}/graphics/ocrad
+#RUN_DEPENDS+=	ocrad:graphics/ocrad
 #.endif
 
 pre-everything::
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
index 4e33e47173c1..7a5eca1c737d 100644
--- a/mail/p5-GMail-IMAPD/Makefile
+++ b/mail/p5-GMail-IMAPD/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mashtizadeh@gmail.com
 COMMENT=	Perl IMAP4 gateway to Google's webmail service
 
-BUILD_DEPENDS=	p5-Mail-Webmail-Gmail>=0:${PORTSDIR}/mail/p5-Mail-Webmail-Gmail
+BUILD_DEPENDS=	p5-Mail-Webmail-Gmail>=0:mail/p5-Mail-Webmail-Gmail
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-IMAP-Client/Makefile b/mail/p5-IMAP-Client/Makefile
index ee11092db66b..edfe40fe0b12 100644
--- a/mail/p5-IMAP-Client/Makefile
+++ b/mail/p5-IMAP-Client/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Advanced manipulation of IMAP services w/ referral support
 
-RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-URI-imap>=0:${PORTSDIR}/mail/p5-URI-imap
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-URI>=0:net/p5-URI \
+		p5-URI-imap>=0:mail/p5-URI-imap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-IMAP-Sieve/Makefile b/mail/p5-IMAP-Sieve/Makefile
index 6fb276e9d8df..1013f68a68ae 100644
--- a/mail/p5-IMAP-Sieve/Makefile
+++ b/mail/p5-IMAP-Sieve/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	websieve-063a
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module to edit Sieve scripts on an Cyrus IMAP server
 
-RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 
 WRKSRC=		${WRKDIR}/${PERLSIEVENAME}
 
diff --git a/mail/p5-LMAP-CID2SPF/Makefile b/mail/p5-LMAP-CID2SPF/Makefile
index c2e66713692d..16f2bc28094d 100644
--- a/mail/p5-LMAP-CID2SPF/Makefile
+++ b/mail/p5-LMAP-CID2SPF/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Module to convert between Microsoft's Caller-ID and SPF		#'
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/mail/p5-MIME-EncWords/Makefile b/mail/p5-MIME-EncWords/Makefile
index 8b2bfb4a5387..8d43be1fac73 100644
--- a/mail/p5-MIME-EncWords/Makefile
+++ b/mail/p5-MIME-EncWords/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Deal with RFC 2047 encoded words (improved)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MIME-Charset>=1.010.1:${PORTSDIR}/mail/p5-MIME-Charset
+BUILD_DEPENDS=	p5-MIME-Charset>=1.010.1:mail/p5-MIME-Charset
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile
index 81437a8addcb..dbd06931423d 100644
--- a/mail/p5-MIME-Fast/Makefile
+++ b/mail/p5-MIME-Fast/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create, edit, and parse MIME messages (via gmime2 C library)
 
-LIB_DEPENDS=	libgmime-2.0.so:${PORTSDIR}/mail/gmime2
+LIB_DEPENDS=	libgmime-2.0.so:mail/gmime2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-MIME-Lite-HTML/Makefile b/mail/p5-MIME-Lite-HTML/Makefile
index 66e93fccc7cb..c55f69b5c763 100644
--- a/mail/p5-MIME-Lite-HTML/Makefile
+++ b/mail/p5-MIME-Lite-HTML/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provide routine to transform a HTML page into a MIME mail
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-MIME-Lite>=1:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-MIME-Lite>=1:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-MIME-Lite>=1:mail/p5-MIME-Lite \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-MIME-Lite>=1:mail/p5-MIME-Lite \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-MIME-Lite-TT-HTML/Makefile b/mail/p5-MIME-Lite-TT-HTML/Makefile
index 3a1cdac920fd..00fa398f0823 100644
--- a/mail/p5-MIME-Lite-TT-HTML/Makefile
+++ b/mail/p5-MIME-Lite-TT-HTML/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	freebsd-ports@t-b-o-h.net
 COMMENT=	Create html mail with MIME::Lite and TT
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-HTML-FormatText-WithLinks>=0:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks
-RUN_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-HTML-FormatText-WithLinks>=0:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-HTML-FormatText-WithLinks>=0:textproc/p5-HTML-FormatText-WithLinks
+RUN_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-HTML-FormatText-WithLinks>=0:textproc/p5-HTML-FormatText-WithLinks
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/mail/p5-MIME-Lite-TT/Makefile b/mail/p5-MIME-Lite-TT/Makefile
index c18f619a3116..a164e5ccd598 100644
--- a/mail/p5-MIME-Lite-TT/Makefile
+++ b/mail/p5-MIME-Lite-TT/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	freebsd-ports@t-b-o-h.net
 COMMENT=	TT enabled MIME::Lite wrapper
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
index a3213adb9a8c..b2b3eff7d9ba 100644
--- a/mail/p5-MIME-Lite/Makefile
+++ b/mail/p5-MIME-Lite/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Simple interface for creating (not parsing!) MIME messages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Date-Format>=1.000:${PORTSDIR}/mail/p5-Email-Date-Format \
-		p5-MIME-Types>=1.28:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-Mail-Tools>=1.62:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	p5-Email-Date-Format>=1.000:mail/p5-Email-Date-Format \
+		p5-MIME-Types>=1.28:mail/p5-MIME-Types \
+		p5-Mail-Tools>=1.62:mail/p5-Mail-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 596523e3d9c0..597f6195750d 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Set of perl5 modules for MIME
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Convert-BinHex>=0:${PORTSDIR}/converters/p5-Convert-BinHex \
-		p5-Mail-Tools>=1.05:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	p5-Convert-BinHex>=0:converters/p5-Convert-BinHex \
+		p5-Mail-Tools>=1.05:mail/p5-Mail-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-MIME-Types/Makefile b/mail/p5-MIME-Types/Makefile
index f8505143f088..39a4dd3b6d95 100644
--- a/mail/p5-MIME-Types/Makefile
+++ b/mail/p5-MIME-Types/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for determining MIME types
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious
+TEST_DEPENDS=	p5-Mojolicious>=0:www/p5-Mojolicious
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Mail-Address-MobileJp/Makefile b/mail/p5-Mail-Address-MobileJp/Makefile
index 43f1b0b578eb..b5fd33598b54 100644
--- a/mail/p5-Mail-Address-MobileJp/Makefile
+++ b/mail/p5-Mail-Address-MobileJp/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Utility to detect an e-mail is mobile one or not
 
-BUILD_DEPENDS=	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Audit-Attach/Makefile b/mail/p5-Mail-Audit-Attach/Makefile
index a8e403b97515..7b3b7ba523b1 100644
--- a/mail/p5-Mail-Audit-Attach/Makefile
+++ b/mail/p5-Mail-Audit-Attach/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mail::Audit plugin for attachment handling
 
-RUN_DEPENDS=	p5-Mail-Audit>=2:${PORTSDIR}/mail/p5-Mail-Audit \
-		p5-Mail-Tools>=1:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS=	p5-Mail-Audit>=2:mail/p5-Mail-Audit \
+		p5-Mail-Tools>=1:mail/p5-Mail-Tools
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index 4b92ad98df72..3af18ba86476 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9]+)$/\1/}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for creating easy mail filters
 
-RUN_DEPENDS=	p5-File-HomeDir>=0.61:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Tempdir>=0:${PORTSDIR}/devel/p5-File-Tempdir \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS=	p5-File-HomeDir>=0.61:devel/p5-File-HomeDir \
+		p5-File-Tempdir>=0:devel/p5-File-Tempdir \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/mail/p5-Mail-Box-IMAP4-SSL/Makefile b/mail/p5-Mail-Box-IMAP4-SSL/Makefile
index d0c133426ee8..c23a288686b9 100644
--- a/mail/p5-Mail-Box-IMAP4-SSL/Makefile
+++ b/mail/p5-Mail-Box-IMAP4-SSL/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Missing part of Mail::Box::IMAP4
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Mail-Box>=0:${PORTSDIR}/mail/p5-Mail-Box \
-		p5-superclass>=0.003:${PORTSDIR}/devel/p5-superclass \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-Mail-Box>=0:mail/p5-Mail-Box \
+		p5-superclass>=0.003:devel/p5-superclass \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Probe-Perl>=0:${PORTSDIR}/sysutils/p5-Probe-Perl \
-		p5-Proc-Background>=1.08:${PORTSDIR}/devel/p5-Proc-Background
+TEST_DEPENDS=	p5-Probe-Perl>=0:sysutils/p5-Probe-Perl \
+		p5-Proc-Background>=1.08:devel/p5-Proc-Background
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Mail-Box-Parser-C/Makefile b/mail/p5-Mail-Box-Parser-C/Makefile
index 1125afdb3807..38009c2d08f3 100644
--- a/mail/p5-Mail-Box-Parser-C/Makefile
+++ b/mail/p5-Mail-Box-Parser-C/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parsing folders for Mail::Box with C routines
 
-BUILD_DEPENDS=	p5-Mail-Box>=0:${PORTSDIR}/mail/p5-Mail-Box
+BUILD_DEPENDS=	p5-Mail-Box>=0:mail/p5-Mail-Box
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 7a2439c4882f..e9d77305b0ef 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -13,24 +13,24 @@ MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl module implementing a modern mail folder management
 
 COMMON_DEPENDS=	\
-	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-	p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
-	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-	p5-Devel-GlobalDestruction>=0.09:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-	p5-File-Remove>=0.20:${PORTSDIR}/devel/p5-File-Remove \
-	p5-HTML-Format>=2.01:${PORTSDIR}/textproc/p5-HTML-Format \
-	p5-HTML-Tree>=3.13:${PORTSDIR}/www/p5-HTML-Tree \
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-Mail-IMAPClient>=2.2.8:${PORTSDIR}/mail/p5-Mail-IMAPClient \
-	p5-Mail-Transport-Dbx>=0.04:${PORTSDIR}/mail/p5-Mail-Transport-Dbx \
-	p5-Object-Realize-Later>=0.14:${PORTSDIR}/devel/p5-Object-Realize-Later \
-	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-	p5-URI>=1.23:${PORTSDIR}/net/p5-URI \
-	p5-User-Identity>=0.90:${PORTSDIR}/devel/p5-User-Identity
+	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+	p5-MIME-Types>=0:mail/p5-MIME-Types \
+	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+	p5-Devel-GlobalDestruction>=0.09:devel/p5-Devel-GlobalDestruction \
+	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+	p5-File-Remove>=0.20:devel/p5-File-Remove \
+	p5-HTML-Format>=2.01:textproc/p5-HTML-Format \
+	p5-HTML-Tree>=3.13:www/p5-HTML-Tree \
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-Mail-IMAPClient>=2.2.8:mail/p5-Mail-IMAPClient \
+	p5-Mail-Transport-Dbx>=0.04:mail/p5-Mail-Transport-Dbx \
+	p5-Object-Realize-Later>=0.14:devel/p5-Object-Realize-Later \
+	p5-TimeDate>=0:devel/p5-TimeDate \
+	p5-URI>=1.23:net/p5-URI \
+	p5-User-Identity>=0.90:devel/p5-User-Identity
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.00:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.00:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-Cache/Makefile b/mail/p5-Mail-Cache/Makefile
index 370a919a1de1..700a93420767 100644
--- a/mail/p5-Mail-Cache/Makefile
+++ b/mail/p5-Mail-Cache/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Caches mail information
 
-BUILD_DEPENDS=	p5-File-BaseDir>=0:${PORTSDIR}/devel/p5-File-BaseDir \
-		p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple
+BUILD_DEPENDS=	p5-File-BaseDir>=0:devel/p5-File-BaseDir \
+		p5-Email-Simple>=0:mail/p5-Email-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-CheckUser/Makefile b/mail/p5-Mail-CheckUser/Makefile
index 00220121ac44..a2ab14902ccf 100644
--- a/mail/p5-Mail-CheckUser/Makefile
+++ b/mail/p5-Mail-CheckUser/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Perl module to check email addresses for validity
 
-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/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index a2c1b29b8942..33bf075fe3e0 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl extension for the clamav virus scanner
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C \
-		clamscan:${PORTSDIR}/security/clamav
+BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
+		p5-Inline-C>=0:devel/p5-Inline-C \
+		clamscan:security/clamav
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index 78e4be008330..f4635c9a64a2 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl5 module to process and/or create DKIM email
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/mail/p5-Mail-DMARC/Makefile b/mail/p5-Mail-DMARC/Makefile
index 5c454c9c4015..ec7549fcf4ad 100644
--- a/mail/p5-Mail-DMARC/Makefile
+++ b/mail/p5-Mail-DMARC/Makefile
@@ -12,31 +12,31 @@ COMMENT=	Perl5 module to process and/or create DKIM email
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-File-ShareDir-Install>=0:${PORTSDIR}/devel/p5-File-ShareDir-Install \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
-		p5-Email-MIME>=0:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-HTTP-Tiny>=0:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Net-SMTPS>=0:${PORTSDIR}/mail/p5-Net-SMTPS \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBIx-Simple>=0:${PORTSDIR}/databases/p5-DBIx-Simple \
-		p5-Test-File-ShareDir>=0:${PORTSDIR}/devel/p5-Test-File-ShareDir \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
-		p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Mail-DKIM>=0:${PORTSDIR}/mail/p5-Mail-DKIM \
-		p5-Net-IMAP-Simple>=0:${PORTSDIR}/mail/p5-Net-IMAP-Simple \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		p5-Net-HTTP>=0:${PORTSDIR}/net/p5-Net-HTTP \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-IDN-Encode>=0:${PORTSDIR}/textproc/p5-Net-IDN-Encode
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-Socket6>=0:net/p5-Socket6 \
+		p5-Email-MIME>=0:mail/p5-Email-MIME \
+		p5-HTTP-Tiny>=0:www/p5-HTTP-Tiny \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Net-SMTPS>=0:mail/p5-Net-SMTPS \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBIx-Simple>=0:databases/p5-DBIx-Simple \
+		p5-Test-File-ShareDir>=0:devel/p5-Test-File-ShareDir \
+		p5-CGI>=0:www/p5-CGI \
+		p5-Email-Simple>=0:mail/p5-Email-Simple \
+		p5-Mail-DKIM>=0:mail/p5-Mail-DKIM \
+		p5-Net-IMAP-Simple>=0:mail/p5-Net-IMAP-Simple \
+		p5-Net-Server>=0:net/p5-Net-Server \
+		p5-Net-HTTP>=0:net/p5-Net-HTTP \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
index a08f3156190d..62d408b49833 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to analyze bounce messages
 
-RUN_DEPENDS=	p5-MIME-Tools>=5.418:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Mail-Tools>=2.04:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS=	p5-MIME-Tools>=5.418:mail/p5-MIME-Tools \
+		p5-Mail-Tools>=2.04:mail/p5-Mail-Tools
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-DomainKeys/Makefile b/mail/p5-Mail-DomainKeys/Makefile
index e4bec9eb7185..0e19f1c0f623 100644
--- a/mail/p5-Mail-DomainKeys/Makefile
+++ b/mail/p5-Mail-DomainKeys/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl implementation of DomainKeys
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 82dbbf376ec8..ab42aa652ece 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Perl module to allow object methods for ezmlm-idx mailing lists
 LICENSE=	BSD3CLAUSE GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx \
-		p5-Crypt-GPG>=0:${PORTSDIR}/security/p5-Crypt-GPG
+BUILD_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-idx:mail/ezmlm-idx \
+		p5-Crypt-GPG>=0:security/p5-Crypt-GPG
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/mail/p5-Mail-Field-Received/Makefile b/mail/p5-Mail-Field-Received/Makefile
index f5b6ebee0795..c32c6598385d 100644
--- a/mail/p5-Mail-Field-Received/Makefile
+++ b/mail/p5-Mail-Field-Received/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl5 modules for parsing of `Received' headers in e-mails
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mail-Tools>0:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	p5-Mail-Tools>0:mail/p5-Mail-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Differences>0:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Differences>0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index 4ef10e71b5c6..7006a66a0ce3 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that allows writing mail filter rules in XML
 
-BUILD_DEPENDS=	p5-Mail-Audit>=0:${PORTSDIR}/mail/p5-Mail-Audit \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-Mail-Audit>=0:mail/p5-Mail-Audit \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index db523e5acd99..9476ae4f67da 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	MailFolder-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for a folder-independant interface to email folders
 
-BUILD_DEPENDS=	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-File-Sync>=0:${PORTSDIR}/devel/p5-File-Sync \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-File-Sync>=0:devel/p5-File-Sync \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index 59e57b64aa5a..bf000a473ab1 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to parse daily newsletters from freshmeat.net
 
-BUILD_DEPENDS=	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-GnuPG/Makefile b/mail/p5-Mail-GnuPG/Makefile
index 0e8aef778d22..41884bc1cda4 100644
--- a/mail/p5-Mail-GnuPG/Makefile
+++ b/mail/p5-Mail-GnuPG/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to process and/or create PGP email
 
-BUILD_DEPENDS=	p5-GnuPG-Interface>=0:${PORTSDIR}/security/p5-GnuPG-Interface \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	p5-GnuPG-Interface>=0:security/p5-GnuPG-Interface \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Graph/Makefile b/mail/p5-Mail-Graph/Makefile
index 5894befaed26..cc9892006e3e 100644
--- a/mail/p5-Mail-Graph/Makefile
+++ b/mail/p5-Mail-Graph/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for drawing graphical stats for mails/spams
 
-RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil \
-		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \
+		p5-Date-Calc>=0:devel/p5-Date-Calc
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index 24df4dc5c4a5..ae8c34093f28 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl5 module to talk to a IMAP4rev1 (RFC2060) server
 
 LICENSE=	ARTPERL10
 
-RUN_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-Parse-RecDescent>=1.94:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
+RUN_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Authen-SASL>=0:security/p5-Authen-SASL
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/Makefile b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
index 695f0bd94ac2..a65843b8e816 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/Makefile
+++ b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Caches mail information for Mail::IMAPTalk using Mail::Cache
 
-BUILD_DEPENDS=	p5-Mail-Cache>=0:${PORTSDIR}/mail/p5-Mail-Cache \
-		p5-Mail-IMAPTalk>=0:${PORTSDIR}/mail/p5-Mail-IMAPTalk
+BUILD_DEPENDS=	p5-Mail-Cache>=0:mail/p5-Mail-Cache \
+		p5-Mail-IMAPTalk>=0:mail/p5-Mail-IMAPTalk
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
index dbf795de9931..7eeb701dc9bd 100644
--- a/mail/p5-Mail-ListDetector/Makefile
+++ b/mail/p5-Mail-ListDetector/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for detecting mailing list messages
 
-RUN_DEPENDS=	p5-Email-Abstract>=3.001:${PORTSDIR}/mail/p5-Email-Abstract \
-		p5-Email-Valid>=0.182:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-Mail-Tools>=2.04:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-URI>=1.1:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-Email-Abstract>=3.001:mail/p5-Email-Abstract \
+		p5-Email-Valid>=0.182:mail/p5-Email-Valid \
+		p5-Mail-Tools>=2.04:mail/p5-Mail-Tools \
+		p5-URI>=1.1:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index 2f35f5820da9..f6a6aad6529c 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to detect newer messages in procmail-generated mailboxes
 
-BUILD_DEPENDS=	p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig
+BUILD_DEPENDS=	p5-AppConfig>=0:devel/p5-AppConfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
index 8855b2560f17..65cafe4e2c2d 100644
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ b/mail/p5-Mail-Mbox-MessageParser/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Fast and simple mbox folder reader
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-FileHandle-Unget>=0:${PORTSDIR}/devel/p5-FileHandle-Unget \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	p5-FileHandle-Unget>=0:${PORTSDIR}/devel/p5-FileHandle-Unget
-TEST_DEPENDS=	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff
+BUILD_DEPENDS+=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-FileHandle-Unget>=0:devel/p5-FileHandle-Unget \
+		p5-URI>=0:net/p5-URI
+RUN_DEPENDS=	p5-FileHandle-Unget>=0:devel/p5-FileHandle-Unget
+TEST_DEPENDS=	p5-Text-Diff>=0:textproc/p5-Text-Diff
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-MboxParser/Makefile b/mail/p5-Mail-MboxParser/Makefile
index 75a06f9c5dd7..e506cdaab221 100644
--- a/mail/p5-Mail-MboxParser/Makefile
+++ b/mail/p5-Mail-MboxParser/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Module for working with UNIX-flavoured mailboxes
 
-BUILD_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Mail-Mbox-MessageParser>=0:${PORTSDIR}/mail/p5-Mail-Mbox-MessageParser
+BUILD_DEPENDS=	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-Mail-Mbox-MessageParser>=0:mail/p5-Mail-Mbox-MessageParser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-OpenDKIM/Makefile b/mail/p5-Mail-OpenDKIM/Makefile
index fcdd8e8fb611..7fc628c4cde2 100644
--- a/mail/p5-Mail-OpenDKIM/Makefile
+++ b/mail/p5-Mail-OpenDKIM/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl interface to OpenDKIM C library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	opendkim>=2.10.0:${PORTSDIR}/mail/opendkim
-LIB_DEPENDS=	libopendkim.so:${PORTSDIR}/mail/opendkim
-RUN_DEPENDS=	opendkim>=2.10.0:${PORTSDIR}/mail/opendkim \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error
+BUILD_DEPENDS=	opendkim>=2.10.0:mail/opendkim
+LIB_DEPENDS=	libopendkim.so:mail/opendkim
+RUN_DEPENDS=	opendkim>=2.10.0:mail/opendkim \
+		p5-Error>=0:lang/p5-Error
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-OpenRelay-Simple/Makefile b/mail/p5-Mail-OpenRelay-Simple/Makefile
index 88b824073661..2fe0165d0788 100644
--- a/mail/p5-Mail-OpenRelay-Simple/Makefile
+++ b/mail/p5-Mail-OpenRelay-Simple/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Check if a mail server runs as an open relay
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.25:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Net-Telnet>=3.03:${PORTSDIR}/net/p5-Net-Telnet
+BUILD_DEPENDS=	p5-Class-Accessor>=0.25:devel/p5-Class-Accessor \
+		p5-Net-Telnet>=3.03:net/p5-Net-Telnet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Procmail/Makefile b/mail/p5-Mail-Procmail/Makefile
index 8f7c13683574..021d024a7e9b 100644
--- a/mail/p5-Mail-Procmail/Makefile
+++ b/mail/p5-Mail-Procmail/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module provides procmail-like tools
 
-RUN_DEPENDS= 	p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS= 	p5-LockFile-Simple>=0:devel/p5-LockFile-Simple \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-RBL/Makefile b/mail/p5-Mail-RBL/Makefile
index ba5e30f5f1ef..2a7cab301bee 100644
--- a/mail/p5-Mail-RBL/Makefile
+++ b/mail/p5-Mail-RBL/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to access RBL-style host verification services
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-NetAddr-IP>0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-NetAddr-IP>0:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index b5c2717c0404..ce55c85d57ca 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Object-oriented implementation of Sender Policy Framework
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-Net-DNS>=0.62:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-Resolver-Programmable>=0.003:${PORTSDIR}/dns/p5-Net-DNS-Resolver-Programmable \
-		p5-NetAddr-IP>=4:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		p5-URI>=1.13:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error \
+		p5-Net-DNS>=0.62:dns/p5-Net-DNS \
+		p5-Net-DNS-Resolver-Programmable>=0.003:dns/p5-Net-DNS-Resolver-Programmable \
+		p5-NetAddr-IP>=4:net-mgmt/p5-NetAddr-IP \
+		p5-URI>=1.13:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 CONFLICTS_INSTALL=	p5-Mail-SPF-Query-[0-9]*
 
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
index cf79c4001078..3e8c76a36e97 100644
--- a/mail/p5-Mail-SRS/Makefile
+++ b/mail/p5-Mail-SRS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Sender Rewriting Scheme
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
+BUILD_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-MLDBM>=0:databases/p5-MLDBM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index ff56ff8bc7ca..333cae930131 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pure Perl implementation of mail spooling, unspooling, and sending
 
-BUILD_DEPENDS=	p5-File-NFSLock>=0:${PORTSDIR}/devel/p5-File-NFSLock \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-File-NFSLock>=0:devel/p5-File-NFSLock \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index bf6f02d06cc1..db5d10a176e4 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl5 modules for dealing with Internet e-mail messages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-TimeDate>=0:devel/p5-TimeDate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Transport-Dbx/Makefile b/mail/p5-Mail-Transport-Dbx/Makefile
index 47f0d2047f3d..f3bccc53ba9d 100644
--- a/mail/p5-Mail-Transport-Dbx/Makefile
+++ b/mail/p5-Mail-Transport-Dbx/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Mail::Transport::Dbx - Parse Outlook Express mailboxes
 
-#BUILD_DEPENDS=	p5-ExtUtils-Constant>0:${PORTSDIR}/devel/p5-ExtUtils-Constant
+#BUILD_DEPENDS=	p5-ExtUtils-Constant>0:devel/p5-ExtUtils-Constant
 #RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index ec39202e3833..e49cf3d5c174 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to verify email addresses
 
-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/mail/p5-Mail-Webmail-Gmail/Makefile b/mail/p5-Mail-Webmail-Gmail/Makefile
index 0a6475bbdd18..b1600dab9160 100644
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ b/mail/p5-Mail-Webmail-Gmail/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to Google webmail service
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Mojolicious-Plugin-Mail/Makefile b/mail/p5-Mojolicious-Plugin-Mail/Makefile
index 73e22e24c6bb..0f952a227828 100644
--- a/mail/p5-Mojolicious-Plugin-Mail/Makefile
+++ b/mail/p5-Mojolicious-Plugin-Mail/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-MIME-EncWords>=0:${PORTSDIR}/mail/p5-MIME-EncWords
+RUN_DEPENDS=	p5-Mojolicious>=0:www/p5-Mojolicious \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-MIME-EncWords>=0:mail/p5-MIME-EncWords
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Net-IMAP-Client/Makefile b/mail/p5-Net-IMAP-Client/Makefile
index 0b72b2a90af5..03c0d0402f07 100644
--- a/mail/p5-Net-IMAP-Client/Makefile
+++ b/mail/p5-Net-IMAP-Client/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Not so simple IMAP client library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Net-IMAP-Server/Makefile b/mail/p5-Net-IMAP-Server/Makefile
index 53a8cc6ff80b..a9f601e1677b 100644
--- a/mail/p5-Net-IMAP-Server/Makefile
+++ b/mail/p5-Net-IMAP-Server/Makefile
@@ -14,22 +14,22 @@ COMMENT=	Single-threaded multiplexing IMAP server implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Coro>0:${PORTSDIR}/devel/p5-Coro \
-		p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Mail>0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-DateTime-Format-Strptime>=1.3:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Email-Address>0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Email-MIME>=1.862:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Simple>=1.999:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Encode-IMAPUTF7>0:${PORTSDIR}/converters/p5-Encode-IMAPUTF7 \
-		p5-Net-SSLeay>0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Net-Server-Coro>=0.6:${PORTSDIR}/net/p5-Net-Server-Coro \
-		p5-Regexp-Common>0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-AnyEvent>0:devel/p5-AnyEvent \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Coro>0:devel/p5-Coro \
+		p5-DateTime>0:devel/p5-DateTime \
+		p5-DateTime-Format-Mail>0:devel/p5-DateTime-Format-Mail \
+		p5-DateTime-Format-Strptime>=1.3:devel/p5-DateTime-Format-Strptime \
+		p5-Email-Address>0:mail/p5-Email-Address \
+		p5-Email-MIME>=1.862:mail/p5-Email-MIME \
+		p5-Email-Simple>=1.999:mail/p5-Email-Simple \
+		p5-Encode-IMAPUTF7>0:converters/p5-Encode-IMAPUTF7 \
+		p5-Net-SSLeay>0:security/p5-Net-SSLeay \
+		p5-Net-Server-Coro>=0.6:net/p5-Net-Server-Coro \
+		p5-Regexp-Common>0:textproc/p5-Regexp-Common \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL
+TEST_DEPENDS=	p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Net-IMAP-Simple-SSL/Makefile b/mail/p5-Net-IMAP-Simple-SSL/Makefile
index 94f29a3726b7..706db7a03f25 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/Makefile
+++ b/mail/p5-Net-IMAP-Simple-SSL/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	SSL support for Net::IMAP::Simple
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-IMAP-Simple>=0:${PORTSDIR}/mail/p5-Net-IMAP-Simple
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Net-IMAP-Simple>=0:mail/p5-Net-IMAP-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Net-IMAP-Simple/Makefile b/mail/p5-Net-IMAP-Simple/Makefile
index 3cf1cf603e8e..e4ba9f54b725 100644
--- a/mail/p5-Net-IMAP-Simple/Makefile
+++ b/mail/p5-Net-IMAP-Simple/Makefile
@@ -14,23 +14,23 @@ COMMENT=	Perl extension for simple IMAP account handling
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Coro>=0:${PORTSDIR}/devel/p5-Coro \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Email-MIME-ContentType>=0:${PORTSDIR}/mail/p5-Email-MIME-ContentType \
-		p5-Email-MIME>=1.862:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Simple>=1.999:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Encode-IMAPUTF7>=0:${PORTSDIR}/converters/p5-Encode-IMAPUTF7 \
-		p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Net-Server-Coro>=0.3:${PORTSDIR}/net/p5-Net-Server-Coro \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Coro>=0:devel/p5-Coro \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Email-Address>=0:mail/p5-Email-Address \
+		p5-Email-MIME-ContentType>=0:mail/p5-Email-MIME-ContentType \
+		p5-Email-MIME>=1.862:mail/p5-Email-MIME \
+		p5-Email-Simple>=1.999:mail/p5-Email-Simple \
+		p5-Encode-IMAPUTF7>=0:converters/p5-Encode-IMAPUTF7 \
+		p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
+		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64 \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-Net-Server-Coro>=0.3:net/p5-Net-Server-Coro \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	SX
@@ -43,8 +43,8 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-SX_BUILD_DEPENDS=	p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+SX_BUILD_DEPENDS=	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 SX_CONFIGURE_ENV=	WITH_SX=true
-SX_RUN_DEPENDS=		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+SX_RUN_DEPENDS=		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Net-ManageSieve/Makefile b/mail/p5-Net-ManageSieve/Makefile
index c5ed2880b24c..656cb095b5cc 100644
--- a/mail/p5-Net-ManageSieve/Makefile
+++ b/mail/p5-Net-ManageSieve/Makefile
@@ -13,7 +13,7 @@ COMMENT=	ManageSieve Protocol Client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
+BUILD_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/mail/p5-Net-POP3-SSLWrapper/Makefile b/mail/p5-Net-POP3-SSLWrapper/Makefile
index 844fd3d06ac6..c55d35bb5069 100644
--- a/mail/p5-Net-POP3-SSLWrapper/Makefile
+++ b/mail/p5-Net-POP3-SSLWrapper/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	johnpupu@gmail.com
 COMMENT=	Perl extension for simple POP3S wrapper for Net::POP3
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.34:${PORTSDIR}/security/p5-IO-Socket-SSL
-RUN_DEPENDS=	p5-IO-Socket-SSL>=1.34:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.34:security/p5-IO-Socket-SSL
+RUN_DEPENDS=	p5-IO-Socket-SSL>=1.34:security/p5-IO-Socket-SSL
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Net-QMTP/Makefile b/mail/p5-Net-QMTP/Makefile
index 42782eca7718..96839b4075dc 100644
--- a/mail/p5-Net-QMTP/Makefile
+++ b/mail/p5-Net-QMTP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	james@now.ie
 COMMENT=	Perl module to provide a Quick Mail Transfer Protocol (QMTP) client
 
-BUILD_DEPENDS=	p5-Text-Netstring>=0:${PORTSDIR}/textproc/p5-Text-Netstring
-RUN_DEPENDS=	p5-Text-Netstring>=0:${PORTSDIR}/textproc/p5-Text-Netstring
+BUILD_DEPENDS=	p5-Text-Netstring>=0:textproc/p5-Text-Netstring
+RUN_DEPENDS=	p5-Text-Netstring>=0:textproc/p5-Text-Netstring
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Net-SMTP-SSL/Makefile b/mail/p5-Net-SMTP-SSL/Makefile
index b2a7f661caaa..9da6bdb427f5 100644
--- a/mail/p5-Net-SMTP-SSL/Makefile
+++ b/mail/p5-Net-SMTP-SSL/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SSL support for Net::SMTP
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index f6abc8c475f7..be255911cfc1 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Native Perl SMTP Server
 LICENSE=	GPLv2
 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}
 
 
diff --git a/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile b/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile
index 116b2eb7ec0a..33ca5810812a 100644
--- a/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile
+++ b/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	SMTP client supporting TLS and AUTH
 
-RUN_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+RUN_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 TEST_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile
index 1c5873a7c656..b90f9e7b6bbf 100644
--- a/mail/p5-Net-SMTP-TLS/Makefile
+++ b/mail/p5-Net-SMTP-TLS/Makefile
@@ -14,9 +14,9 @@ COMMENT=	SMTP client supporting TLS and AUTH
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/mail/p5-Net-SMTPS/Makefile b/mail/p5-Net-SMTPS/Makefile
index 0a0c3f825f41..d63b990f26e6 100644
--- a/mail/p5-Net-SMTPS/Makefile
+++ b/mail/p5-Net-SMTPS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ale@biancalanas.net
 COMMENT=	SSL/STARTTLS support for Net::SMTP
 
-RUN_DEPENDS=	p5-Authen-SASL>=2:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-IO-Socket-SSL>=1.9:${PORTSDIR}/security/p5-IO-Socket-SSL
+RUN_DEPENDS=	p5-Authen-SASL>=2:security/p5-Authen-SASL \
+		p5-IO-Socket-SSL>=1.9:security/p5-IO-Socket-SSL
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/mail/p5-Net-SMTP_auth/Makefile b/mail/p5-Net-SMTP_auth/Makefile
index 053fb9e7039a..3fb070d81fd6 100644
--- a/mail/p5-Net-SMTP_auth/Makefile
+++ b/mail/p5-Net-SMTP_auth/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple Mail Transfer Protocol Client with AUTHentication
 
-BUILD_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
+BUILD_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Net-SenderBase/Makefile b/mail/p5-Net-SenderBase/Makefile
index eee0c90847cd..0da569c74b3b 100644
--- a/mail/p5-Net-SenderBase/Makefile
+++ b/mail/p5-Net-SenderBase/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Query the SenderBase service
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index 283016b46acf..0030c1b18bfe 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implement a POP3 client POE component
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/mail/p5-POE-Component-Client-SMTP/Makefile b/mail/p5-POE-Component-Client-SMTP/Makefile
index 86ef8f4299f0..535fd4373d29 100644
--- a/mail/p5-POE-Component-Client-SMTP/Makefile
+++ b/mail/p5-POE-Component-Client-SMTP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	SMTP client POE component
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Filter-Transparent-SMTP>=0:${PORTSDIR}/mail/p5-POE-Filter-Transparent-SMTP
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-Filter-Transparent-SMTP>=0:mail/p5-POE-Filter-Transparent-SMTP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-POE-Component-SMTP/Makefile b/mail/p5-POE-Component-SMTP/Makefile
index fee8f355eaf7..fb8b2260d60c 100644
--- a/mail/p5-POE-Component-SMTP/Makefile
+++ b/mail/p5-POE-Component-SMTP/Makefile
@@ -14,9 +14,9 @@ COMMENT=	SMTP Protocol Implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Session-MultiDispatch>=0:${PORTSDIR}/devel/p5-POE-Session-MultiDispatch \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-Session-MultiDispatch>=0:devel/p5-POE-Session-MultiDispatch \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-POE-Filter-Transparent-SMTP/Makefile b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
index 7bda65ffbf60..096599e1596c 100644
--- a/mail/p5-POE-Filter-Transparent-SMTP/Makefile
+++ b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0+$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	SMTP transparency POE filter
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Parse-Syslog-Mail/Makefile b/mail/p5-Parse-Syslog-Mail/Makefile
index 0fa02fa1508c..785266d5ef13 100644
--- a/mail/p5-Parse-Syslog-Mail/Makefile
+++ b/mail/p5-Parse-Syslog-Mail/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Parse log messages generated by various MTAs
 
-BUILD_DEPENDS=	p5-Parse-Syslog>=0:${PORTSDIR}/textproc/p5-Parse-Syslog
+BUILD_DEPENDS=	p5-Parse-Syslog>=0:textproc/p5-Parse-Syslog
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-SES/Makefile b/mail/p5-SES/Makefile
index fd69d6040ed5..5d462f33e1b7 100644
--- a/mail/p5-SES/Makefile
+++ b/mail/p5-SES/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Perl module of Amazon Simple Email Services
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-libwww>=6:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-libwww>=6:www/p5-libwww
 
 USES=		perl5 shebangfix zip
 NO_BUILD=	yes
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
index 26a3b5b3e353..18173d30cc9b 100644
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perl5 interface to the Sendmail access.db list
 
-BUILD_DEPENDS=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
+BUILD_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-Test-Email/Makefile b/mail/p5-Test-Email/Makefile
index 898cdf1f3163..b57b3a8d7446 100644
--- a/mail/p5-Test-Email/Makefile
+++ b/mail/p5-Test-Email/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Test Email Contents
 
-BUILD_DEPENDS=	p5-Mail-POP3Client>=2:${PORTSDIR}/mail/p5-Mail-POP3Client \
-		p5-Mail-Sendmail>=0.79:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		p5-MIME-Tools>=5.4:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Test-Simple>=0.7:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Mail-POP3Client>=2:mail/p5-Mail-POP3Client \
+		p5-Mail-Sendmail>=0.79:mail/p5-Mail-Sendmail \
+		p5-MIME-Tools>=5.4:mail/p5-MIME-Tools \
+		p5-Test-Simple>=0.7:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/mail/p5-URI-imap/Makefile b/mail/p5-URI-imap/Makefile
index 159a79a6f5d3..b3399205b327 100644
--- a/mail/p5-URI-imap/Makefile
+++ b/mail/p5-URI-imap/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	URI::imap - Support IMAP URI
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-URI-imaps/Makefile b/mail/p5-URI-imaps/Makefile
index aeffae6a96d2..2d4e97e64382 100644
--- a/mail/p5-URI-imaps/Makefile
+++ b/mail/p5-URI-imaps/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Support IMAPS URI
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-WWW-GMail/Makefile b/mail/p5-WWW-GMail/Makefile
index b3d159e81a20..d04a21aec0e2 100644
--- a/mail/p5-WWW-GMail/Makefile
+++ b/mail/p5-WWW-GMail/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	This module simplifies access to gmail
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-WWW-Hotmail/Makefile b/mail/p5-WWW-Hotmail/Makefile
index 3dd017840427..fd8f6b50c72c 100644
--- a/mail/p5-WWW-Hotmail/Makefile
+++ b/mail/p5-WWW-Hotmail/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	This module simplifies access to hotmail
 
-BUILD_DEPENDS=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Mail-Audit>=0:${PORTSDIR}/mail/p5-Mail-Audit
+BUILD_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-Mail-Audit>=0:mail/p5-Mail-Audit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/p5-ZConf-Mail/Makefile b/mail/p5-ZConf-Mail/Makefile
index c8854faad011..92ec35d1f80b 100644
--- a/mail/p5-ZConf-Mail/Makefile
+++ b/mail/p5-ZConf-Mail/Makefile
@@ -12,20 +12,20 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Misc mail client functions backed by ZConf
 
-BUILD_DEPENDS=	p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Email-Date>=0:${PORTSDIR}/mail/p5-Email-Date \
-		p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-IO-MultiPipe>=0:${PORTSDIR}/devel/p5-IO-MultiPipe \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-Mail-Box>=0:${PORTSDIR}/mail/p5-Mail-Box \
-		p5-Mail-IMAPTalk>=0:${PORTSDIR}/mail/p5-Mail-IMAPTalk \
-		p5-Mail-POP3Client>=0:${PORTSDIR}/mail/p5-Mail-POP3Client \
-		p5-Net-SMTP-TLS>=0:${PORTSDIR}/mail/p5-Net-SMTP-TLS \
-		p5-Net-SMTP_auth>=0:${PORTSDIR}/mail/p5-Net-SMTP_auth \
-		p5-Text-Autoformat>=0:${PORTSDIR}/textproc/p5-Text-Autoformat \
-		p5-ZConf-GUI>=0:${PORTSDIR}/devel/p5-ZConf-GUI \
-		p5-ZConf>=0:${PORTSDIR}/net/p5-ZConf
+BUILD_DEPENDS=	p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-Email-Date>=0:mail/p5-Email-Date \
+		p5-Email-Simple>=0:mail/p5-Email-Simple \
+		p5-File-MimeInfo>=0:devel/p5-File-MimeInfo \
+		p5-IO-MultiPipe>=0:devel/p5-IO-MultiPipe \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-Mail-Box>=0:mail/p5-Mail-Box \
+		p5-Mail-IMAPTalk>=0:mail/p5-Mail-IMAPTalk \
+		p5-Mail-POP3Client>=0:mail/p5-Mail-POP3Client \
+		p5-Net-SMTP-TLS>=0:mail/p5-Net-SMTP-TLS \
+		p5-Net-SMTP_auth>=0:mail/p5-Net-SMTP_auth \
+		p5-Text-Autoformat>=0:textproc/p5-Text-Autoformat \
+		p5-ZConf-GUI>=0:devel/p5-ZConf-GUI \
+		p5-ZConf>=0:net/p5-ZConf
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index e5daf857436b..d91d103ae290 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	noc-ports@biglist.com
 COMMENT=	Flexible SMTP daemon written in Perl and featuring a plugin API
 
-BUILD_DEPENDS=	spamd:${PORTSDIR}/mail/spamassassin \
-		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
-		p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-Net-DNS>=0.39:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-Time-HiRes>0:${PORTSDIR}/devel/p5-Time-HiRes
+BUILD_DEPENDS=	spamd:mail/spamassassin \
+		p5-Data-Dumper>=0:devel/p5-Data-Dumper \
+		p5-File-Temp>=0:devel/p5-File-Temp \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64 \
+		p5-Net-DNS>=0.39:dns/p5-Net-DNS \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-Time-HiRes>0:devel/p5-Time-HiRes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	MODPERL DOCS EXAMPLES
@@ -32,7 +32,7 @@ GH_ACCOUNT=	smtpd
 
 .if ${PORT_OPTIONS:MMODPERL}
 USE_APACHE_RUN=	22+
-RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 .endif
 
 USES=		perl5
diff --git a/mail/panda-imap/Makefile b/mail/panda-imap/Makefile
index e8b14d2d4824..747656c9b56d 100644
--- a/mail/panda-imap/Makefile
+++ b/mail/panda-imap/Makefile
@@ -11,7 +11,7 @@ COMMENT=	IMAP4rev1/POP2/POP3 mail servers forked from imap-uw
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libc-client4.so.10:${PORTSDIR}/mail/panda-cclient
+LIB_DEPENDS=	libc-client4.so.10:mail/panda-cclient
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonabbey
@@ -39,7 +39,7 @@ NETSCAPE_BRAIN_DAMAGE_DESC=	See Makefile for documentation
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDRAC}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:mail/drac
 MAKE_ARGS+=	WITH_DRAC=yes
 .endif
 
diff --git a/mail/pear-Horde_Imap_Client/Makefile b/mail/pear-Horde_Imap_Client/Makefile
index 6f15b25e2b75..492724dcfa74 100644
--- a/mail/pear-Horde_Imap_Client/Makefile
+++ b/mail/pear-Horde_Imap_Client/Makefile
@@ -24,6 +24,6 @@ SASL_DESC=	Support SASL Authentication
 
 IMAP_USE=	PHP=imap
 MBSTRING_USE=	PHP=mbstring
-SASL_RUN_DEPENDS=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
+SASL_RUN_DEPENDS=	${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Horde_Mail/Makefile b/mail/pear-Horde_Mail/Makefile
index 25022791c68d..1c12f2b152d0 100644
--- a/mail/pear-Horde_Mail/Makefile
+++ b/mail/pear-Horde_Mail/Makefile
@@ -17,6 +17,6 @@ USE_HORDE_RUN=	Horde_Exception \
 #USE_HORDE_RUN+=	Horde_Mime
 
 # Optional but we want it
-RUN_DEPENDS+=	${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP
+RUN_DEPENDS+=	${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Horde_Mail_Autoconfig/Makefile b/mail/pear-Horde_Mail_Autoconfig/Makefile
index da70dc7767da..7099333cc197 100644
--- a/mail/pear-Horde_Mail_Autoconfig/Makefile
+++ b/mail/pear-Horde_Mail_Autoconfig/Makefile
@@ -14,6 +14,6 @@ USE_HORDE_RUN=	Horde_Exception \
 		Horde_Mail \
 		Horde_Smtp
 
-RUN_DEPENDS+=	${PEARDIR}/Net/DNS2.php:${PORTSDIR}/dns/pear-Net_DNS2
+RUN_DEPENDS+=	${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2
 
 .include <bsd.port.mk>
diff --git a/mail/pear-MIME_Type/Makefile b/mail/pear-MIME_Type/Makefile
index b38dbca5b70d..503dd5b577f6 100644
--- a/mail/pear-MIME_Type/Makefile
+++ b/mail/pear-MIME_Type/Makefile
@@ -16,6 +16,6 @@ PEAR_SYSTEM_COMMAND_DESC=	PEAR::System_Command support
 USES=		pear
 NO_ARCH=	yes
 
-PEAR_SYSTEM_COMMAND_RUN_DEPENDS=	${PEARDIR}/System/Command.php:${PORTSDIR}/devel/pear-System_Command
+PEAR_SYSTEM_COMMAND_RUN_DEPENDS=	${PEARDIR}/System/Command.php:devel/pear-System_Command
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 5aa4c2238fa6..4ded365ef713 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -14,6 +14,6 @@ PEAR_NET_SMTP_DESC=	PEAR::Net_SMTP support
 
 USES=	pear
 
-PEAR_NET_SMTP_RUN_DEPENDS=	${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP
+PEAR_NET_SMTP_RUN_DEPENDS=	${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Mail_Queue/Makefile b/mail/pear-Mail_Queue/Makefile
index 5cb86ae305b0..114d96e509d7 100644
--- a/mail/pear-Mail_Queue/Makefile
+++ b/mail/pear-Mail_Queue/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	mail www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class for put mails in queue and send them later in background
 
-BUILD_DEPENDS=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail \
-		${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
-RUN_DEPENDS=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail \
-		${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
+BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail \
+		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
+RUN_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail \
+		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
 
 USES=	pear
 
@@ -20,8 +20,8 @@ PEAR_DB_DESC=	PEAR::DB support
 PEAR_MDB_DESC=	PEAR::MDB support
 PEAR_MDB2_DESC=	PEAR::MDB2 support
 
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Mail_mimeDecode/Makefile b/mail/pear-Mail_mimeDecode/Makefile
index aa211d843d79..3827747fa920 100644
--- a/mail/pear-Mail_mimeDecode/Makefile
+++ b/mail/pear-Mail_mimeDecode/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Provides a class to decode mime messages
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
-RUN_DEPENDS=	${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
+BUILD_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
+RUN_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
 
 USES=		pear
 NO_ARCH=	yes
diff --git a/mail/pear-Net_Cyrus/Makefile b/mail/pear-Net_Cyrus/Makefile
index f6f144145788..e4805fac9b18 100644
--- a/mail/pear-Net_Cyrus/Makefile
+++ b/mail/pear-Net_Cyrus/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	mail net pear
 MAINTAINER=	bra@fsn.hu
 COMMENT=	PEAR class to administer Cyrus IMAP servers
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/Net/IMAP.php:${PORTSDIR}/mail/pear-Net_IMAP
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/Net/IMAP.php:${PORTSDIR}/mail/pear-Net_IMAP
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP
 
 USES=	pear
 
diff --git a/mail/pear-Net_IMAP/Makefile b/mail/pear-Net_IMAP/Makefile
index 2c3fceb9b083..3aa675fd670f 100644
--- a/mail/pear-Net_IMAP/Makefile
+++ b/mail/pear-Net_IMAP/Makefile
@@ -10,8 +10,8 @@ COMMENT=	PEAR class that provides an implementation of the IMAP protocol
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		pear
diff --git a/mail/pear-Net_LMTP/Makefile b/mail/pear-Net_LMTP/Makefile
index 8f458cbaee86..5ab36bc6a628 100644
--- a/mail/pear-Net_LMTP/Makefile
+++ b/mail/pear-Net_LMTP/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PEAR implementation of the RFC2033 LMTP protocol
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		pear
diff --git a/mail/pecl-esmtp/Makefile b/mail/pecl-esmtp/Makefile
index dbe593ede98b..d8ba6b0350fb 100644
--- a/mail/pecl-esmtp/Makefile
+++ b/mail/pecl-esmtp/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL ESMTP client extension
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libesmtp.so:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 
 USES=		tar:tgz
 USE_PHP=	yes
@@ -28,7 +28,7 @@ RE2C_DESC=	Use re2c to regenerate PHP parsers
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRE2C}
-BUILD_DEPENDS+=	re2c:${PORTSDIR}/devel/re2c
+BUILD_DEPENDS+=	re2c:devel/re2c
 .endif
 
 post-patch:
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 0c731da878e6..d75830915797 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	http://horms.net/projects/perdition/download/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POP3 & IMAP4 proxy that can map users to multiple backend servers
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libvanessa_logger.so:${PORTSDIR}/devel/libvanessa_logger \
-		libvanessa_socket.so:${PORTSDIR}/devel/libvanessa_socket \
-		libvanessa_adt.so:${PORTSDIR}/devel/libvanessa_adt
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libvanessa_logger.so:devel/libvanessa_logger \
+		libvanessa_socket.so:devel/libvanessa_socket \
+		libvanessa_adt.so:devel/libvanessa_adt
 
 USES=		gettext libtool pkgconfig shebangfix
 SHEBANG_FILES=	${WRKSRC}/perdition/db/ldap/perditiondb_ldap_makedb \
@@ -58,7 +58,7 @@ PLIST_SUB+=		POSIXREGEX="@comment "
 .if ${PORT_OPTIONS:MDAEMON_MAP}
 CONFIGURE_ARGS+=	--enable-daemon-map
 PLIST_SUB+=		DAEMONMAP=""
-LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=		libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=	--disable-daemon-map
 PLIST_SUB+=		DAEMONMAP="@comment "
@@ -84,7 +84,7 @@ PLIST_SUB+=		NIS="@comment "
 
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=	--enable-gdbm
-LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=		libgdbm.so:databases/gdbm
 PLIST_SUB+=		GDBM=""
 .else
 CONFIGURE_ARGS+=	--disable-gdbm
@@ -122,7 +122,7 @@ PLIST_SUB+=		LDAP="@comment "
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--enable-odbc
-LIB_DEPENDS+=		libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 PLIST_SUB+=		ODBC=""
 .else
 CONFIGURE_ARGS+=	--disable-odbc
diff --git a/mail/pflogstats/Makefile b/mail/pflogstats/Makefile
index 60c7c520e921..e96484790f72 100644
--- a/mail/pflogstats/Makefile
+++ b/mail/pflogstats/Makefile
@@ -15,11 +15,11 @@ BROKEN=		unfetchable
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-Number-Format>=0:${PORTSDIR}/textproc/p5-Number-Format \
-		p5-XML-Dumper>=0:${PORTSDIR}/textproc/p5-XML-Dumper
+RUN_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
+		p5-Number-Format>=0:textproc/p5-Number-Format \
+		p5-XML-Dumper>=0:textproc/p5-XML-Dumper
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/mail/pflogsumm/Makefile b/mail/pflogsumm/Makefile
index 11fb8bb20207..694439863ceb 100644
--- a/mail/pflogsumm/Makefile
+++ b/mail/pflogsumm/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://jimsun.LinxNet.com/downloads/ \
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	Postfix Log Entry Summarizer
 
-RUN_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc
 
 USES=		perl5 shebangfix
 NO_BUILD=	yes
diff --git a/mail/pgpsendmail/Makefile b/mail/pgpsendmail/Makefile
index c1e1e08dcb69..0bd04f6d462e 100644
--- a/mail/pgpsendmail/Makefile
+++ b/mail/pgpsendmail/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PGP sign/encrypt/decrypt messages automatically
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
+BUILD_DEPENDS=	pgp:security/pgp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/mail/phplist/Makefile b/mail/phplist/Makefile
index 0c6d1739ff69..734166c675a5 100644
--- a/mail/phplist/Makefile
+++ b/mail/phplist/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Full-featured open-source newsletter manager
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
 
 USES=		cpe tar:tgz
 USE_PHP=	hash iconv imap mysqli pcre session xml zlib
diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile
index 3dd40d4892a9..6feb345dfc1b 100644
--- a/mail/pine-pgp-filters/Makefile
+++ b/mail/pine-pgp-filters/Makefile
@@ -11,9 +11,9 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple /bin/sh-based filters to use GnuPG with Alpine
 
-BUILD_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
-RUN_DEPENDS+=	gpg2:${PORTSDIR}/security/gnupg
-RUN_DEPENDS=	alpine:${PORTSDIR}/mail/alpine
+BUILD_DEPENDS=	gpg2:security/gnupg
+RUN_DEPENDS+=	gpg2:security/gnupg
+RUN_DEPENDS=	alpine:mail/alpine
 
 PORTDOCS=	BUGS CHANGES INSTALL LICENSE README
 PLIST_FILES=	bin/ppf_mime bin/ppf_mime_decrypt \
diff --git a/mail/pm-lib/Makefile b/mail/pm-lib/Makefile
index 4c8da526006f..80376be4d936 100644
--- a/mail/pm-lib/Makefile
+++ b/mail/pm-lib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of procmail plug-in modules
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
+RUN_DEPENDS=	procmail:mail/procmail
 
 NO_BUILD=	yes
 PORTDOCS=	*
diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index 35359f7e2d8e..b87eda5c6908 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Policyd v2 is a multi-platform policy server for popular MTAs
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		gsed:${PORTSDIR}/textproc/gsed \
-		p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-Cache-FastMmap>=0:${PORTSDIR}/devel/p5-Cache-FastMmap
+RUN_DEPENDS=	p5-Net-Server>=0:net/p5-Net-Server \
+		gsed:textproc/gsed \
+		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
+		p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap
 
 USES=		perl5 shebangfix tar:xz
 NO_BUILD=	yes
@@ -39,9 +39,9 @@ PGSQL_DESC=	Add a dependency on DBD::Pg
 SQLITE_DESC=	Add a dependency on DBD:SQLite
 WEBUI_DESC=	Add a dependency on the corresponding PHP pdo driver
 
-MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
-PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
+SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
+PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 
 .include <bsd.port.options.mk>
 
diff --git a/mail/pop3vscan/Makefile b/mail/pop3vscan/Makefile
index 621bc4579edd..2a61382d91d4 100644
--- a/mail/pop3vscan/Makefile
+++ b/mail/pop3vscan/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Transparent POP3-Proxy with virus-scanning capabilities
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake
 USE_GCC=	yes
diff --git a/mail/popfile/Makefile b/mail/popfile/Makefile
index 01048974e575..d9387d10e00c 100644
--- a/mail/popfile/Makefile
+++ b/mail/popfile/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Automatic mail classification tool, acts as a POP3 proxy
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
+RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
+		p5-HTML-Template>=0:www/p5-HTML-Template
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
@@ -34,19 +34,19 @@ SUB_FILES=	popfile.sh
 OPTIONS_DEFINE=	SSL XMLRPC UPGRADE_FROM_0_20 KAKASI MECABU
 
 # POPFile works with IO::Socket::SSL version 1.07 (and not 0.97/0.99).
-SSL_RUN_DEPENDS=p5-IO-Socket-SSL>=1.07:${PORTSDIR}/security/p5-IO-Socket-SSL
+SSL_RUN_DEPENDS=p5-IO-Socket-SSL>=1.07:security/p5-IO-Socket-SSL
 
 XMLRPC_DESC=		POPFile as XMLRPC server
-XMLRPC_RUN_DEPENDS=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+XMLRPC_RUN_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 
 UPGRADE_FROM_0_20_DESC=		Upgrade old POPFile corpus
-UPGRADE_FROM_0_20_RUN_DEPENDS=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
+UPGRADE_FROM_0_20_RUN_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 
 KAKASI_DESC=		Handle Japanese text via Kakasi library
-KAKASI_RUN_DEPENDS=	p5-Text-Kakasi>=0:${PORTSDIR}/japanese/p5-Text-Kakasi
+KAKASI_RUN_DEPENDS=	p5-Text-Kakasi>=0:japanese/p5-Text-Kakasi
 
 MECABU_DESC=		Handle Japanese text via MeCab library
-MECABU_RUN_DEPENDS=	p5-MeCab>=0:${PORTSDIR}/japanese/p5-MeCab
+MECABU_RUN_DEPENDS=	p5-MeCab>=0:japanese/p5-MeCab
 
 #.if ${PORT_OPTIONS:MSOCKS}
 # XXX: IO::Socket::Socks should be listed here but no ports yet. For those
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index afec88cdecbb..b0869b299d47 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	https://www.jochentopf.com/software/popular/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Suite of programs for setting up large POP3 server systems
 
-BUILD_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
+BUILD_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM
 
 CONFLICTS=	pserv-[0-9]* synce-librapi2-[0-9]*
 
diff --git a/mail/postfix-policyd-spf-perl/Makefile b/mail/postfix-policyd-spf-perl/Makefile
index 3e7b20592b2d..1f78ce874c1e 100644
--- a/mail/postfix-policyd-spf-perl/Makefile
+++ b/mail/postfix-policyd-spf-perl/Makefile
@@ -12,9 +12,9 @@ COMMENT=	SPF policy service for Postfix written in Perl
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Mail-SPF>=2.006:${PORTSDIR}/mail/p5-Mail-SPF \
-		p5-NetAddr-IP>=4:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		p5-Sys-Hostname-Long>=0:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long
+RUN_DEPENDS=	p5-Mail-SPF>=2.006:mail/p5-Mail-SPF \
+		p5-NetAddr-IP>=4:net-mgmt/p5-NetAddr-IP \
+		p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/mail/postfix-policyd-spf-python/Makefile b/mail/postfix-policyd-spf-python/Makefile
index 03c2772ee9d0..dc687d250295 100644
--- a/mail/postfix-policyd-spf-python/Makefile
+++ b/mail/postfix-policyd-spf-python/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Pure Python Postfix policy daemon for SPF checking
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipaddr>0:${PORTSDIR}/devel/py-ipaddr \
-		${PYTHON_PKGNAMEPREFIX}pyspf>0:${PORTSDIR}/mail/py-pyspf \
-		${PYTHON_PKGNAMEPREFIX}authres>0:${PORTSDIR}/mail/py-authres
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr \
+		${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf \
+		${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/mail/postfix-policyd-weight/Makefile b/mail/postfix-policyd-weight/Makefile
index 4a7cae5dcd68..7f48602c7653 100644
--- a/mail/postfix-policyd-weight/Makefile
+++ b/mail/postfix-policyd-weight/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Weighted policy daemon for postfix
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Net-DNS>=0.72:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-IP>0:${PORTSDIR}/net-mgmt/p5-Net-IP
+RUN_DEPENDS=	p5-Net-DNS>=0.72:dns/p5-Net-DNS \
+		p5-Net-IP>0:net-mgmt/p5-Net-IP
 
 SUB_FILES=	pkg-message pkg-install
 PLIST_FILES=	bin/${PORTNAME} \
diff --git a/mail/postfix-postfwd/Makefile b/mail/postfix-postfwd/Makefile
index 9dab49819cd4..3a4d045348fe 100644
--- a/mail/postfix-postfwd/Makefile
+++ b/mail/postfix-postfwd/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Postfix firewall policy daemon
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-Server>=0:net/p5-Net-Server \
+		p5-Storable>=0:devel/p5-Storable \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes
 
 SUB_FILES=	pkg-message
 
diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index bfdbd43d352c..b5f686822920 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -12,12 +12,12 @@ COMMENT=	PHP web-based management tool for Postfix virtual domains and users
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GPL-LICENSE.TXT
 
-RUN_DEPENDS+=	p5-DBI>=1.634:${PORTSDIR}/databases/p5-DBI \
-		p5-Email-Valid>=0.12:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-Log-Dispatch>=1.79:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Log4perl>=0.26:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Mail-Sender>=0.7.04:${PORTSDIR}/mail/p5-Mail-Sender \
-		p5-MIME-EncWords>=0.040:${PORTSDIR}/mail/p5-MIME-EncWords
+RUN_DEPENDS+=	p5-DBI>=1.634:databases/p5-DBI \
+		p5-Email-Valid>=0.12:mail/p5-Email-Valid \
+		p5-Log-Dispatch>=1.79:devel/p5-Log-Dispatch \
+		p5-Log-Log4perl>=0.26:devel/p5-Log-Log4perl \
+		p5-Mail-Sender>=0.7.04:mail/p5-Mail-Sender \
+		p5-MIME-EncWords>=0.040:mail/p5-MIME-EncWords
 
 USES=		cpe perl5 shebangfix
 CPE_VENDOR=	postfix_admin_project
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index dfc52e31e7f3..5542292bc4ca 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Greylisting policy server for Postfix
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB \
-		p5-IO-Multiplex>=0:${PORTSDIR}/devel/p5-IO-Multiplex \
-		p5-Parse-Syslog>=0:${PORTSDIR}/textproc/p5-Parse-Syslog \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+RUN_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB \
+		p5-IO-Multiplex>=0:devel/p5-IO-Multiplex \
+		p5-Parse-Syslog>=0:textproc/p5-Parse-Syslog \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-Server>=0:net/p5-Net-Server \
+		p5-NetAddr-IP>=0:net-mgmt/p5-NetAddr-IP
 
 USE_PERL5=	run
 USE_RC_SUBR=	${PORTNAME}
diff --git a/mail/postsrsd/Makefile b/mail/postsrsd/Makefile
index 7c8e3181bf7c..971e3d15f2bb 100644
--- a/mail/postsrsd/Makefile
+++ b/mail/postsrsd/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Postfix Sender Rewriting Scheme daemon
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	help2man:${PORTSDIR}/misc/help2man \
-		base64:${PORTSDIR}/converters/base64
-RUN_DEPENDS+=	base64:${PORTSDIR}/converters/base64
+BUILD_DEPENDS+=	help2man:misc/help2man \
+		base64:converters/base64
+RUN_DEPENDS+=	base64:converters/base64
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	roehling
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index ecf85e884e6c..146d8715495b 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Prayer Webmail System
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libc-client4.so:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	libc-client4.so:mail/cclient
 
 USES=		iconv shebangfix gmake perl5 uidfix
 USE_PERL5=	build
@@ -36,7 +36,7 @@ GROUPS=		prayer
 SESSIONCACHE_USE=	BDB=5+
 LDAP_USE=		OPENLDAP=yes
 SSL_USE=		OPENSSL=yes
-TIDY_LIB_DEPENDS=	libtidy.so:${PORTSDIR}/www/tidy-lib
+TIDY_LIB_DEPENDS=	libtidy.so:www/tidy-lib
 
 GID!=		id -g
 DESTDIRNAME=	BROOT
diff --git a/mail/prom-wl/Makefile b/mail/prom-wl/Makefile
index 3d60eadf9a2c..a282b3772829 100644
--- a/mail/prom-wl/Makefile
+++ b/mail/prom-wl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Procmail reader for Wanderlust on GNU Emacs
 
 # This port requires Wanderlust. But we can't decide which Wanderlust to
 # depends, there is NO RUN_DEPENDS mail/wanderlust-*.
-#RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
+#RUN_DEPENDS=	procmail:mail/procmail
 
 NO_BUILD=	yes
 
diff --git a/mail/py-Products.MailHost/Makefile b/mail/py-Products.MailHost/Makefile
index fa59c7c83d14..3de17e61c457 100644
--- a/mail/py-Products.MailHost/Makefile
+++ b/mail/py-Products.MailHost/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Zope.sendmail integration for Zope 2
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>0:${PORTSDIR}/devel/py-DocumentTemplate \
-		${PYTHON_PKGNAMEPREFIX}Persistence>0:${PORTSDIR}/devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.sendmail>0:${PORTSDIR}/mail/py-zope.sendmail
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>0:devel/py-DocumentTemplate \
+		${PYTHON_PKGNAMEPREFIX}Persistence>0:devel/py-Persistence \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>0:devel/py-zope.deferredimport \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.sendmail>0:mail/py-zope.sendmail
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/mail/py-apolicy/Makefile b/mail/py-apolicy/Makefile
index 9f9345283a00..9aa850db4e8a 100644
--- a/mail/py-apolicy/Makefile
+++ b/mail/py-apolicy/Makefile
@@ -15,8 +15,8 @@ COMMENT=	ACL system for Postfix, as a policy daemon
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipy>=0:${PORTSDIR}/net-mgmt/py-ipy \
-		${PYTHON_PKGNAMEPREFIX}pyspf>=0:${PORTSDIR}/mail/py-pyspf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy \
+		${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf
 
 USES=		python twisted
 USE_PYTHON=	distutils
diff --git a/mail/py-dkimpy/Makefile b/mail/py-dkimpy/Makefile
index 184ac368ad81..48d6299984a0 100644
--- a/mail/py-dkimpy/Makefile
+++ b/mail/py-dkimpy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python library for DKIM email signing and verification
 
 LICENSE=	ZLIB
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dns>=0:${PORTSDIR}/dns/py-dns
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns
 
 NO_ARCH=	yes
 
diff --git a/mail/py-libgmail/Makefile b/mail/py-libgmail/Makefile
index e079888c1462..efcafd00d0dc 100644
--- a/mail/py-libgmail/Makefile
+++ b/mail/py-libgmail/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to provide access to Gmail via Python
 
-BUILD_DEPENDS=	py*-mechanize>=0:${PORTSDIR}/www/py-mechanize
+BUILD_DEPENDS=	py*-mechanize>=0:www/py-mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/mail/py-milter/Makefile b/mail/py-milter/Makefile
index e73930bb241a..5931acf01c41 100644
--- a/mail/py-milter/Makefile
+++ b/mail/py-milter/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 .if !exists(/usr/lib/libmilter.so)
-LIB_DEPENDS=	libmilter.so:${PORTSDIR}/mail/libmilter
+LIB_DEPENDS=	libmilter.so:mail/libmilter
 CFLAGS+=	-I${LOCALBASE}/include
 .endif
 
diff --git a/mail/py-notmuch/Makefile b/mail/py-notmuch/Makefile
index 1dc56dbd4f10..15be36c5dcf1 100644
--- a/mail/py-notmuch/Makefile
+++ b/mail/py-notmuch/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python binding of the notmuch mail search and indexing library
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/../../COPYING-GPL-3
 
-LIB_DEPENDS=	libnotmuch.so:${PORTSDIR}/mail/notmuch
+LIB_DEPENDS=	libnotmuch.so:mail/notmuch
 
 WRKSRC_SUBDIR=	bindings/python
 
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index 6af2dc9b24d3..0a48966d1a5f 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~vokac/activities/ppolicy/download/%SU
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PPolicy is tool for extending Postfix checking capabilities
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython
 
 USES=		python twisted
 USE_PYTHON=	distutils autoplist
@@ -26,9 +26,9 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=	GEOIP LDAP MYSQL DOCS
 OPTIONS_DEFAULT=	GEOIP LDAP
 
-GEOIP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
-LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:${PORTSDIR}/net/py-ldap
+GEOIP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb
+LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/ppolicy.conf ${STAGEDIR}${PREFIX}/etc
diff --git a/mail/py-pyspf/Makefile b/mail/py-pyspf/Makefile
index 6643667cd5d7..434b90163bae 100644
--- a/mail/py-pyspf/Makefile
+++ b/mail/py-pyspf/Makefile
@@ -14,8 +14,8 @@ COMMENT=	SPF (Sender Policy Framework) implemented in Python
 
 LICENSE=	PSFL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authres>=0:${PORTSDIR}/mail/py-authres
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
@@ -28,9 +28,9 @@ SHEBANG_FILES=	spf.py
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} >= 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}py3dns>=0:${PORTSDIR}/dns/py-py3dns
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}py3dns>=0:dns/py-py3dns
 .else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dns>=0:${PORTSDIR}/dns/py-dns
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns
 .endif
 
 # Make the tests run as a module
diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index f291eec87d28..a39c2d87ec42 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Bayesian anti-spam filter written in Python
 
 LICENSE=	PSFL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb \
-		${PYTHON_PKGNAMEPREFIX}dns>=2.0:${PORTSDIR}/dns/py-dns \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:${PORTSDIR}/devel/py-lockfile
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb \
+		${PYTHON_PKGNAMEPREFIX}dns>=2.0:dns/py-dns \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:devel/py-lockfile
 
 USES=		python:-2.7
 USE_PYTHON=	distutils autoplist
diff --git a/mail/py-turbomail/Makefile b/mail/py-turbomail/Makefile
index c5510b2e3f73..b9a908262316 100644
--- a/mail/py-turbomail/Makefile
+++ b/mail/py-turbomail/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Multi-threaded mail queue manager for TurboGears applications
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	tg-admin:${PORTSDIR}/www/py-turbogears
+BUILD_DEPENDS=	tg-admin:www/py-turbogears
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:2
diff --git a/mail/py-zope.sendmail/Makefile b/mail/py-zope.sendmail/Makefile
index 4d45b7c85a9c..c08f903cc46b 100644
--- a/mail/py-zope.sendmail/Makefile
+++ b/mail/py-zope.sendmail/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Zope sendmail
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/mail/pyzor/Makefile b/mail/pyzor/Makefile
index 2fa5b6c6a1ad..8aa2e4d035d7 100644
--- a/mail/pyzor/Makefile
+++ b/mail/pyzor/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT=	Collaborative, networked system to detect and block spam
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>=0:${PORTSDIR}/databases/py-gdbm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>=0:databases/py-gdbm
 
 USES=		python tar:bzip2
 USE_PYTHON=	distutils autoplist
diff --git a/mail/qmail-autoresponder/Makefile b/mail/qmail-autoresponder/Makefile
index 38b90a922443..8240541cb97b 100644
--- a/mail/qmail-autoresponder/Makefile
+++ b/mail/qmail-autoresponder/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://untroubled.org/${PORTNAME}/archive/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rate-limited autoresponder for qmail
 
-LIB_DEPENDS=	libbg-sysdeps.so:${PORTSDIR}/devel/bglibs
+LIB_DEPENDS=	libbg-sysdeps.so:devel/bglibs
 
 USE_MYSQL=	yes
 
diff --git a/mail/qmail-dk/Makefile b/mail/qmail-dk/Makefile
index 677d2925253b..3c66844d628d 100644
--- a/mail/qmail-dk/Makefile
+++ b/mail/qmail-dk/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	qmail
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DomainKeys implementation for qmail
 
-LIB_DEPENDS+=	libdomainkeys.so:${PORTSDIR}/mail/libdomainkeys
+LIB_DEPENDS+=	libdomainkeys.so:mail/libdomainkeys
 
 PATCH_SITES=	QMAIL
 PATCHFILES=	qmail-1.03-dk-0.54.patch
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index 8ecbfd789025..46a1d42c079a 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -9,8 +9,8 @@ PKGNAMESUFFIX=	-ldap
 
 COMMENT=	Secure, reliable, and fast MTA for UNIX systems with LDAP support
 
-RUN_DEPENDS=	${LOCALBASE}/bin/svscan:${PORTSDIR}/sysutils/daemontools \
-		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	${LOCALBASE}/bin/svscan:sysutils/daemontools \
+		${LOCALBASE}/bin/tcprules:sysutils/ucspi-tcp
 
 CONFLICTS=	emboss-[0-9]* digest-[0-9]* *qmail-[0-9]* *qmail-mysql-[0-9]* \
 		qmail-spamcontrol-[0-9]* *qmail-tls-[0-9]*
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
index e184c500122a..219c3b20ad93 100644
--- a/mail/qmail-qfilter/Makefile
+++ b/mail/qmail-qfilter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://untroubled.org/${PORTNAME}/
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Front-end for qmail-queue to run messages through filters
 
-LIB_DEPENDS=	libbg-sysdeps.so:${PORTSDIR}/devel/bglibs
+LIB_DEPENDS=	libbg-sysdeps.so:devel/bglibs
 
 BGLIBS_INC=	${LOCALBASE}/include/bglibs
 BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 761a7758df32..969030234fba 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -418,7 +418,7 @@ LDAPFLAGS+=	-D${param}
 . endfor
 
 . if ${PORT_OPTIONS:MSRS}
-BUILD_DEPENDS+=	srs:${PORTSDIR}/mail/libsrs2
+BUILD_DEPENDS+=	srs:mail/libsrs2
 MASTER_SITES+=	http://qmail-ldap-smtpauthuser.googlecode.com/svn/trunk/:srs_ldap
 SRS_LDAP_PATCH=		qmail-ldap-1.03-20060201-SRS.patch
 DISTFILES+=	${SRS_LDAP_PATCH}:srs_ldap
@@ -604,7 +604,7 @@ DISTFILES+=	${UCSPI_SSL_DIST}:ucspi_ssl
 UCSPISRC=	${WRKDIR}/host/superscript.com/net/ucspi-ssl-${UCSPI_SSL_VER}
 # XXX not yet, needs more cleanup
 #UCSPISRC!=	${MAKE} -C ${PORTSDIR}/sysutils/ucspi-ssl-tls -V WRKSRC
-#PATCH_DEPENDS+=	${UCSPISRC}/compile/ucspissl.a:${PORTSDIR}/sysutils/ucspi-ssl-tls:build
+#PATCH_DEPENDS+=	${UCSPISRC}/compile/ucspissl.a:sysutils/ucspi-ssl-tls:build
 .endif
 
 # Some default values, these can be modified by make command line
diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index 41f452098992..cb635d7ace5a 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -15,10 +15,10 @@ COMMENT=	CGI program for administering Qmail with vchkpw/vpopmail
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	autorespond:${PORTSDIR}/mail/autorespond \
-		${VPOPMAIL_DIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-RUN_DEPENDS=	autorespond:${PORTSDIR}/mail/autorespond \
-		${VPOPMAIL_DIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
+BUILD_DEPENDS=	autorespond:mail/autorespond \
+		${VPOPMAIL_DIR}/lib/libvpopmail.a:mail/vpopmail
+RUN_DEPENDS=	autorespond:mail/autorespond \
+		${VPOPMAIL_DIR}/lib/libvpopmail.a:mail/vpopmail
 
 USES=		autoreconf gmake qmail:vars
 
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+=	--enable-spam-command="${SPAM_COMMAND}"
 
 .if ${PORT_OPTIONS:MCRACKLIB}
 EXTRA_PATCHES+=		${FILESDIR}/cracklib.patch
-BUILD_DEPENDS+=		${LOCALBASE}/include/crack.h:${PORTSDIR}/security/cracklib
+BUILD_DEPENDS+=		${LOCALBASE}/include/crack.h:security/cracklib
 CONFIGURE_ARGS+=	--enable-cracklib=${LOCALBASE}/libdata/cracklib/pw_dict
 CFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lcrack
@@ -131,11 +131,11 @@ PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
 # End of user-configurable variables
 
 .if empty(PORT_OPTIONS:MIDX)
-BUILD_DEPENDS+=	ezmlm-send:${PORTSDIR}/mail/ezmlm
-RUN_DEPENDS+=	ezmlm-send:${PORTSDIR}/mail/ezmlm
+BUILD_DEPENDS+=	ezmlm-send:mail/ezmlm
+RUN_DEPENDS+=	ezmlm-send:mail/ezmlm
 .else
-BUILD_DEPENDS+=	ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx
-RUN_DEPENDS+=	ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx
+BUILD_DEPENDS+=	ezmlm-idx:mail/ezmlm-idx
+RUN_DEPENDS+=	ezmlm-idx:mail/ezmlm-idx
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/qmailmrtg7/Makefile b/mail/qmailmrtg7/Makefile
index add633013777..685754b58be4 100644
--- a/mail/qmailmrtg7/Makefile
+++ b/mail/qmailmrtg7/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Program to create mrtg graphs for qmail activity
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	mrtg:${PORTSDIR}/net-mgmt/mrtg
+RUN_DEPENDS=	mrtg:net-mgmt/mrtg
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index ea83d2362fd6..f213340965a2 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -83,7 +83,7 @@ OPTIONS_UNSET+=	DOCS
 # with Dynamic Relay Authorization Control support.
 .if ${PORT_OPTIONS:MDRAC}
 CONFIGURE_ARGS+=	--with-drac
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:mail/drac
 .endif
 
 # If WITH_FULL_POPD_DEBUG variable present in the environment, qpopper builds
diff --git a/mail/qsf/Makefile b/mail/qsf/Makefile
index ae0146f20d16..d2d403898d0b 100644
--- a/mail/qsf/Makefile
+++ b/mail/qsf/Makefile
@@ -25,7 +25,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=	--without-gdbm
 .endif
diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 377324b5216c..7a7c965c6243 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Qmail-queue replacement to filter mail traffic
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
+BUILD_DEPENDS=	${LOCALBASE}/bin/ripmime:mail/ripmime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		qmail
@@ -40,7 +40,7 @@ DISABLELOCAL_DESC=	Disable filters for local users
 BACKUP_DESC=		Logging of incoming/outgoing mail
 CUSTOMERROR_DESC=	Custom error patch
 
-CLAMAV_BUILD_DEPENDS=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
+CLAMAV_BUILD_DEPENDS=	${LOCALBASE}/bin/clamdscan:security/clamav
 CLAMAV_RUN_DEPENDS=	${CLAMAV_BUILD_DEPENDS}
 CLAMAV_CONFIGURE_ON=	--with-clamav --with-clamd-socket=/var/run/clamav/clamd
 
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile
index 73a8e43d9f37..f94c6ec4163d 100644
--- a/mail/qtools/Makefile
+++ b/mail/qtools/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.superscript.com/qtools/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools to use in .qmail files
 
-RUN_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm
+RUN_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-weed:mail/ezmlm
 
 USES=		qmail:vars
 
diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index 285112cdee04..743f21051ff4 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Distributed, collaborative, spam detection and filtering network
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix tar:bzip2
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index 243de12064f0..f9bdb77428ca 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Milter that performs rspamd, clamav, and other checks
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libopendkim.so:${PORTSDIR}/mail/opendkim
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libopendkim.so:mail/opendkim
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
diff --git a/mail/roundcube-air/Makefile b/mail/roundcube-air/Makefile
index 9f0ceea790ac..4f22e12fcc67 100644
--- a/mail/roundcube-air/Makefile
+++ b/mail/roundcube-air/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	roundcube-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Theme for RoundCube Web Mail
 
-RUN_DEPENDS=	roundcube>=0.3:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.3:mail/roundcube
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/mail/roundcube-automatic_addressbook/Makefile b/mail/roundcube-automatic_addressbook/Makefile
index bc4142b74349..82c16ca97a5a 100644
--- a/mail/roundcube-automatic_addressbook/Makefile
+++ b/mail/roundcube-automatic_addressbook/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Roundcube webmail automatic addressbook plugin
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	roundcube>=0.8:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.8:mail/roundcube
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/mail/roundcube-contextmenu/Makefile b/mail/roundcube-contextmenu/Makefile
index b478cb422104..2244f399c4ae 100644
--- a/mail/roundcube-contextmenu/Makefile
+++ b/mail/roundcube-contextmenu/Makefile
@@ -11,7 +11,7 @@ COMMENT=	RoundCube webmail contextmenu plugin
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	roundcube>=1.1:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=1.1:mail/roundcube
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/mail/roundcube-groupvice/Makefile b/mail/roundcube-groupvice/Makefile
index d92760d80ea5..098b072341f1 100644
--- a/mail/roundcube-groupvice/Makefile
+++ b/mail/roundcube-groupvice/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	roundcube-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Theme for RoundCube Web Mail
 
-RUN_DEPENDS=	roundcube>=0.2:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.2:mail/roundcube
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/mail/roundcube-html5_notifier/Makefile b/mail/roundcube-html5_notifier/Makefile
index df32b2d02922..7460faf30135 100644
--- a/mail/roundcube-html5_notifier/Makefile
+++ b/mail/roundcube-html5_notifier/Makefile
@@ -12,8 +12,8 @@ COMMENT=	HTML5 desktop notifier plugin for roundcube
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	roundcube>=1.0:${PORTSDIR}/mail/roundcube
-BUILD_DEPENDS=	roundcube>=1.0:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=1.0:mail/roundcube
+BUILD_DEPENDS=	roundcube>=1.0:mail/roundcube
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kitist
diff --git a/mail/roundcube-login_info/Makefile b/mail/roundcube-login_info/Makefile
index 76b5183273e1..5c2c6e1ece87 100644
--- a/mail/roundcube-login_info/Makefile
+++ b/mail/roundcube-login_info/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Roundcube login info plugin
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	roundcube>=0.5:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.5:mail/roundcube
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/mail/roundcube-mobilecube/Makefile b/mail/roundcube-mobilecube/Makefile
index b9802bd17235..fae983a6a0f6 100644
--- a/mail/roundcube-mobilecube/Makefile
+++ b/mail/roundcube-mobilecube/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	MobileCubeBeta%23${THEME_BUILD}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Theme for RoundCube Web Mail
 
-RUN_DEPENDS=	roundcube>=0.3:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.3:mail/roundcube
 
 THEME_VERSION?=	3.1.0
 THEME_BUILD?=	030110A
diff --git a/mail/roundcube-mvision2/Makefile b/mail/roundcube-mvision2/Makefile
index 7a9327abaf5a..fb47dc48100e 100644
--- a/mail/roundcube-mvision2/Makefile
+++ b/mail/roundcube-mvision2/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	roundcube-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Theme for RoundCube Web Mail
 
-RUN_DEPENDS=	roundcube>=0.2:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.2:mail/roundcube
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/mail/roundcube-sauserprefs/Makefile b/mail/roundcube-sauserprefs/Makefile
index 971f7823f169..fae9290b8361 100644
--- a/mail/roundcube-sauserprefs/Makefile
+++ b/mail/roundcube-sauserprefs/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Roundcube plugin to manage SpamAssassin prefs
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	roundcube>=0.8:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.8:mail/roundcube
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/mail/roundcube-sieverules/Makefile b/mail/roundcube-sieverules/Makefile
index 05ae28c32ccb..127daf7d534e 100644
--- a/mail/roundcube-sieverules/Makefile
+++ b/mail/roundcube-sieverules/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Roundcube webmail sieve plugin
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	roundcube>=1.0:${PORTSDIR}/mail/roundcube
-RUN_DEPENDS=	roundcube>=1.0:${PORTSDIR}/mail/roundcube
+BUILD_DEPENDS=	roundcube>=1.0:mail/roundcube
+RUN_DEPENDS=	roundcube>=1.0:mail/roundcube
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	JohnDoh
diff --git a/mail/roundcube-thunderbird_labels/Makefile b/mail/roundcube-thunderbird_labels/Makefile
index d3d132605603..8aec906a4e8e 100644
--- a/mail/roundcube-thunderbird_labels/Makefile
+++ b/mail/roundcube-thunderbird_labels/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Thunderbird Labels plugin for RoundCube webmail
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	roundcube>=0.5:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.5:mail/roundcube
 
 USES=		tar:bzip2
 NO_BUILD=	yes
diff --git a/mail/roundcube-umich/Makefile b/mail/roundcube-umich/Makefile
index a197355c4182..bb75177f652b 100644
--- a/mail/roundcube-umich/Makefile
+++ b/mail/roundcube-umich/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	roundcube-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Theme for RoundCube Web Mail
 
-RUN_DEPENDS=	roundcube>=0.2:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.2:mail/roundcube
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/mail/roundcube-veximaccountadmin/Makefile b/mail/roundcube-veximaccountadmin/Makefile
index d65aba0e0d8a..719e9e03db93 100644
--- a/mail/roundcube-veximaccountadmin/Makefile
+++ b/mail/roundcube-veximaccountadmin/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Roundcube vexim account admin plugin
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	roundcube>=0.9:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.9:mail/roundcube
 
 NO_BUILD=	yes
 
diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 09f54fdfb37f..9ab32aaf701a 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Fast spam filtering system dev version
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \
-		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libgmime-2.4.so:mail/gmime24 \
+		libevent.so:devel/libevent2 \
+		libluajit-5.1.so:lang/luajit
 
 CONFLICTS_INSTALL=	rspamd
 
@@ -59,12 +59,12 @@ WITH_DEBUG=	yes
 
 .if ${PORT_OPTIONS:MGPERF}
  CMAKE_ARGS+=	-DENABLE_GPERF_TOOLS=ON
- LIB_DEPENDS+=	libprofiler.so:${PORTSDIR}/devel/google-perftools
+ LIB_DEPENDS+=	libprofiler.so:devel/google-perftools
 .endif
 
 .if ${PORT_OPTIONS:MHYPERSCAN}
  CMAKE_ARGS+=	-DENABLE_HYPERSCAN=ON
- BUILD_DEPENDS+=	${LOCALBASE}/lib/libhs.a:${PORTSDIR}/devel/hyperscan
+ BUILD_DEPENDS+=	${LOCALBASE}/lib/libhs.a:devel/hyperscan
  ONLY_FOR_ARCHS=	amd64
 .endif
 
@@ -74,17 +74,17 @@ WITH_DEBUG=	yes
  PLIST_SUB+=	REDIRECTOR=""
  USE_RC_SUBR+=	rspamd_redirector
  RUN_DEPENDS+=	\
-	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-	p5-POE-Component-Client-DNS>=0:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \
-	p5-POE-Component-Client-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Client-HTTP \
-	p5-POE-Component-Server-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Server-HTTP \
-	p5-Cache-Memcached-Fast>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Fast \
-	p5-Proc-PidUtil>=0:${PORTSDIR}/sysutils/p5-Proc-PidUtil \
-	p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-	p5-SWF-File>=0:${PORTSDIR}/graphics/p5-SWF-File
+	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+	p5-IO-String>=0:devel/p5-IO-String \
+	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+	p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS \
+	p5-POE-Component-Client-HTTP>=0:www/p5-POE-Component-Client-HTTP \
+	p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
+	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
+	p5-Proc-PidUtil>=0:sysutils/p5-Proc-PidUtil \
+	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+	p5-SWF-File>=0:graphics/p5-SWF-File
 .else
  PLIST_SUB+=		REDIRECTOR="@comment "
 .endif
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 612b140be196..89039e6fbea1 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Fast spam filtering system
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \
-		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libgmime-2.4.so:mail/gmime24 \
+		libevent.so:devel/libevent2 \
+		libluajit-5.1.so:lang/luajit
 
 CONFLICTS_INSTALL=	rspamd
 
@@ -50,12 +50,12 @@ USE_OPENSSL=	yes
 
 .if ${PORT_OPTIONS:MGPERF}
  CMAKE_ARGS+=	-DENABLE_GPERF_TOOLS=ON
- LIB_DEPENDS+=	libprofiler.so:${PORTSDIR}/devel/google-perftools
+ LIB_DEPENDS+=	libprofiler.so:devel/google-perftools
 .endif
 
 .if ${PORT_OPTIONS:MHYPERSCAN}
  CMAKE_ARGS+=  -DENABLE_HYPERSCAN=ON
- BUILD_DEPENDS+=       ${LOCALBASE}/lib/libhs.a:${PORTSDIR}/devel/hyperscan
+ BUILD_DEPENDS+=       ${LOCALBASE}/lib/libhs.a:devel/hyperscan
  ONLY_FOR_ARCHS=       amd64
 .endif
 
@@ -65,17 +65,17 @@ USE_OPENSSL=	yes
  PLIST_SUB+=	REDIRECTOR=""
  USE_RC_SUBR+=	rspamd_redirector
  RUN_DEPENDS+=	\
-	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-	p5-POE-Component-Client-DNS>=0:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \
-	p5-POE-Component-Client-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Client-HTTP \
-	p5-POE-Component-Server-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Server-HTTP \
-	p5-Cache-Memcached-Fast>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Fast \
-	p5-Proc-PidUtil>=0:${PORTSDIR}/sysutils/p5-Proc-PidUtil \
-	p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-	p5-SWF-File>=0:${PORTSDIR}/graphics/p5-SWF-File
+	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+	p5-IO-String>=0:devel/p5-IO-String \
+	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+	p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS \
+	p5-POE-Component-Client-HTTP>=0:www/p5-POE-Component-Client-HTTP \
+	p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
+	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
+	p5-Proc-PidUtil>=0:sysutils/p5-Proc-PidUtil \
+	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+	p5-SWF-File>=0:graphics/p5-SWF-File
 .else
  PLIST_SUB+=		REDIRECTOR="@comment "
 .endif
diff --git a/mail/rss2email2/Makefile b/mail/rss2email2/Makefile
index 199f2db54b84..ee6012480c6d 100644
--- a/mail/rss2email2/Makefile
+++ b/mail/rss2email2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Emails posts from subscribed RSS/Atom newsfeeds
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:${PORTSDIR}/textproc/py-html2text
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text
 
 USES=		python:2 shebangfix
 SHEBANG_FILES=	rss2email.py
diff --git a/mail/rss2email3/Makefile b/mail/rss2email3/Makefile
index 9b647f67db38..55246947caf3 100644
--- a/mail/rss2email3/Makefile
+++ b/mail/rss2email3/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Emails posts from subscribed RSS/Atom newsfeeds
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:${PORTSDIR}/textproc/py-html2text
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wking
diff --git a/mail/ruby-rfilter/Makefile b/mail/ruby-rfilter/Makefile
index 9c9537e4d650..a5e95ecff21e 100644
--- a/mail/ruby-rfilter/Makefile
+++ b/mail/ruby-rfilter/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby library for filtering and delivering email to mailboxes
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/rmail/parser.rb:${PORTSDIR}/mail/ruby-rmail
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/rmail/parser.rb:mail/ruby-rmail
 
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
diff --git a/mail/rubygem-actionmailer/Makefile b/mail/rubygem-actionmailer/Makefile
index 89b0196395d9..457ad7d319ac 100644
--- a/mail/rubygem-actionmailer/Makefile
+++ b/mail/rubygem-actionmailer/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Easy email delivery and testing for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack>=${PORTVERSION}:${PORTSDIR}/www/rubygem-actionpack \
-		rubygem-mail25>=2.5.4:${PORTSDIR}/mail/rubygem-mail25
+RUN_DEPENDS=	rubygem-actionpack>=${PORTVERSION}:www/rubygem-actionpack \
+		rubygem-mail25>=2.5.4:mail/rubygem-mail25
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/rubygem-actionmailer4/Makefile b/mail/rubygem-actionmailer4/Makefile
index 707a2f81bb0c..d10c4a51ebc3 100644
--- a/mail/rubygem-actionmailer4/Makefile
+++ b/mail/rubygem-actionmailer4/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Easy email delivery and testing for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=${PORTVERSION}:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-actionview>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-actionview \
-		rubygem-activejob>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activejob \
-		rubygem-mail>=2.6.1:${PORTSDIR}/mail/rubygem-mail \
-		rubygem-rails-dom-testing>=1.0:${PORTSDIR}/textproc/rubygem-rails-dom-testing
+RUN_DEPENDS=	rubygem-actionpack4>=${PORTVERSION}:www/rubygem-actionpack4 \
+		rubygem-actionview>=${PORTVERSION}:devel/rubygem-actionview \
+		rubygem-activejob>=${PORTVERSION}:devel/rubygem-activejob \
+		rubygem-mail>=2.6.1:mail/rubygem-mail \
+		rubygem-rails-dom-testing>=1.0:textproc/rubygem-rails-dom-testing
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/rubygem-exception_notification/Makefile b/mail/rubygem-exception_notification/Makefile
index 4abd250c91cd..00c87b791d2f 100644
--- a/mail/rubygem-exception_notification/Makefile
+++ b/mail/rubygem-exception_notification/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Exception notification for Rails apps
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionmailer4>=4.0:${PORTSDIR}/mail/rubygem-actionmailer4 \
-		rubygem-activesupport4>=4.0:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-actionmailer4>=4.0:mail/rubygem-actionmailer4 \
+		rubygem-activesupport4>=4.0:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/rubygem-larch/Makefile b/mail/rubygem-larch/Makefile
index 7cef3038bd88..d931231614e3 100644
--- a/mail/rubygem-larch/Makefile
+++ b/mail/rubygem-larch/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Larch copies messages from one IMAP server to another
 
 LICENSE=	GPLv2
 
-#		rubygem-sequel3>=3.14:${PORTSDIR}/devel/rubygem-sequel3 \
-RUN_DEPENDS=	rubygem-highline>=1.5:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-sequel>=3.14:${PORTSDIR}/devel/rubygem-sequel \
-		rubygem-sqlite3>=1.3:${PORTSDIR}/databases/rubygem-sqlite3 \
-		rubygem-trollop>=1.13:${PORTSDIR}/devel/rubygem-trollop
+#		rubygem-sequel3>=3.14:devel/rubygem-sequel3 \
+RUN_DEPENDS=	rubygem-highline>=1.5:devel/rubygem-highline \
+		rubygem-sequel>=3.14:devel/rubygem-sequel \
+		rubygem-sqlite3>=1.3:databases/rubygem-sqlite3 \
+		rubygem-trollop>=1.13:devel/rubygem-trollop
 
 NO_ARCH=	yes
 
diff --git a/mail/rubygem-mail/Makefile b/mail/rubygem-mail/Makefile
index f6c6af3b209c..967cb901a499 100644
--- a/mail/rubygem-mail/Makefile
+++ b/mail/rubygem-mail/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Ruby email handler
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types
+RUN_DEPENDS=	rubygem-mime-types>=1.16:misc/rubygem-mime-types
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/rubygem-mail25/Makefile b/mail/rubygem-mail25/Makefile
index 2d585f28ebee..7a869f6e3cac 100644
--- a/mail/rubygem-mail25/Makefile
+++ b/mail/rubygem-mail25/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Ruby email handler
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-mime-types1>=1.16:${PORTSDIR}/misc/rubygem-mime-types1 \
-		rubygem-treetop>=1.4.8:${PORTSDIR}/devel/rubygem-treetop
+RUN_DEPENDS=	rubygem-mime-types1>=1.16:misc/rubygem-mime-types1 \
+		rubygem-treetop>=1.4.8:devel/rubygem-treetop
 
 NO_ARCH=	yes
 
diff --git a/mail/rubygem-mailboxer/Makefile b/mail/rubygem-mailboxer/Makefile
index 9fb7f3f08893..2925b5e00c9b 100644
--- a/mail/rubygem-mailboxer/Makefile
+++ b/mail/rubygem-mailboxer/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Send messages inside a web application
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-carrierwave>=0.5.8:${PORTSDIR}/www/rubygem-carrierwave \
-		rubygem-foreigner>=0.9.1:${PORTSDIR}/devel/rubygem-foreigner \
-		rubygem-rails4>=3.2.0:${PORTSDIR}/www/rubygem-rails4
+RUN_DEPENDS=	rubygem-carrierwave>=0.5.8:www/rubygem-carrierwave \
+		rubygem-foreigner>=0.9.1:devel/rubygem-foreigner \
+		rubygem-rails4>=3.2.0:www/rubygem-rails4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/rubygem-mailfactory/Makefile b/mail/rubygem-mailfactory/Makefile
index 892837f8bc4e..6a8344166547 100644
--- a/mail/rubygem-mailfactory/Makefile
+++ b/mail/rubygem-mailfactory/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple to use module for generating RGC compliant MIME mail
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-mime-types>=1.13.1:${PORTSDIR}/misc/rubygem-mime-types
+RUN_DEPENDS=	rubygem-mime-types>=1.13.1:misc/rubygem-mime-types
 
 NO_ARCH=	yes
 
diff --git a/mail/rubygem-pony/Makefile b/mail/rubygem-pony/Makefile
index 4ff51035f50f..c65a54bad5ca 100644
--- a/mail/rubygem-pony/Makefile
+++ b/mail/rubygem-pony/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Express way to send mail from Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-mail>=2.0:${PORTSDIR}/mail/rubygem-mail
+RUN_DEPENDS=	rubygem-mail>=2.0:mail/rubygem-mail
 
 NO_ARCH=	yes
 
diff --git a/mail/rubygem-roadie-rails/Makefile b/mail/rubygem-roadie-rails/Makefile
index 65cb60f03f34..59dea7b8cf61 100644
--- a/mail/rubygem-roadie-rails/Makefile
+++ b/mail/rubygem-roadie-rails/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Helper for generating HTML mails in Rails applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-railties4>=3.0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-roadie>=3.1:${PORTSDIR}/mail/rubygem-roadie
+RUN_DEPENDS=	rubygem-railties4>=3.0:www/rubygem-railties4 \
+		rubygem-roadie>=3.1:mail/rubygem-roadie
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/rubygem-roadie/Makefile b/mail/rubygem-roadie/Makefile
index c3a40ae1dfc3..c2b78ab6f56c 100644
--- a/mail/rubygem-roadie/Makefile
+++ b/mail/rubygem-roadie/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Helper for generating HTML mails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-css_parser>=1.3.4:${PORTSDIR}/textproc/rubygem-css_parser \
-		rubygem-nokogiri>=1.5.0:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-css_parser>=1.3.4:textproc/rubygem-css_parser \
+		rubygem-nokogiri>=1.5.0:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/rubygem-ruby-qmail/Makefile b/mail/rubygem-ruby-qmail/Makefile
index 266c4d77101a..4cc7a5bfc646 100644
--- a/mail/rubygem-ruby-qmail/Makefile
+++ b/mail/rubygem-ruby-qmail/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby qmail library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-rspec>=1.2.9:${PORTSDIR}/devel/rubygem-rspec
+RUN_DEPENDS=	rubygem-rspec>=1.2.9:devel/rubygem-rspec
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/rubygem-vmail/Makefile b/mail/rubygem-vmail/Makefile
index e70c0695f718..5812d6126d47 100644
--- a/mail/rubygem-vmail/Makefile
+++ b/mail/rubygem-vmail/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Vim interface to Gmail
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE.txt
 
-RUN_DEPENDS=	rubygem-highline>=1.6.1:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-mail>=2.2.12:${PORTSDIR}/mail/rubygem-mail \
-		rubygem-sequel>=3.24.1:${PORTSDIR}/devel/rubygem-sequel \
-		rubygem-sqlite3>=1.3.3:${PORTSDIR}/databases/rubygem-sqlite3 \
-		rubygem-versionomy>=0.4.4:${PORTSDIR}/devel/rubygem-versionomy \
-		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim-lite
+RUN_DEPENDS=	rubygem-highline>=1.6.1:devel/rubygem-highline \
+		rubygem-mail>=2.2.12:mail/rubygem-mail \
+		rubygem-sequel>=3.24.1:devel/rubygem-sequel \
+		rubygem-sqlite3>=1.3.3:databases/rubygem-sqlite3 \
+		rubygem-versionomy>=0.4.4:devel/rubygem-versionomy \
+		${LOCALBASE}/bin/vim:editors/vim-lite
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/sa-stats/Makefile b/mail/sa-stats/Makefile
index 3b09d4c34043..92668151385b 100644
--- a/mail/sa-stats/Makefile
+++ b/mail/sa-stats/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Generates top spam/ham rules fired for SpamAssassin installations
 
-RUN_DEPENDS=	p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long
+RUN_DEPENDS=	p5-Getopt-Long>=0:devel/p5-Getopt-Long
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	sa-stats-1.0.txt
diff --git a/mail/sa-utils/Makefile b/mail/sa-utils/Makefile
index 31326f7d4aed..2c751454dd61 100644
--- a/mail/sa-utils/Makefile
+++ b/mail/sa-utils/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	# none
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	SpamAssassin nightly periodic maintenance
 
-RUN_DEPENDS=	sa-update:${PORTSDIR}/mail/spamassassin
+RUN_DEPENDS=	sa-update:mail/spamassassin
 
 OPTIONS_DEFINE=	SACOMPILE
 SACOMPILE_DESC=	Enable sa-compile support
@@ -27,7 +27,7 @@ PLIST_FILES=	${PERIODIC_DAILY}/sa-utils
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSACOMPILE}
-RUN_DEPENDS+=	re2c>=0.12.0:${PORTSDIR}/devel/re2c
+RUN_DEPENDS+=	re2c>=0.12.0:devel/re2c
 SUB_LIST+=	SACOMPILE=YES
 .else
 SUB_LIST+=	SACOMPILE=NO
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index c65d2cd8f477..bdaed988d0d6 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -59,8 +59,8 @@ MILTER_DESC=		Enable milter support
 
 BDB_USE=	BDB=yes
 LDAP_USE=	OPENLDAP=yes
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd
 
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MSHMEM} && !defined(BUILDING_INDEX)
diff --git a/mail/sendmail/bsd.milter.mk b/mail/sendmail/bsd.milter.mk
index 5efd22c086e4..cb675672c981 100644
--- a/mail/sendmail/bsd.milter.mk
+++ b/mail/sendmail/bsd.milter.mk
@@ -54,9 +54,9 @@ WITH_SENDMAIL_BASE=yes
 .if defined(WITH_SENDMAIL_PORT)
 
 .if defined(WITH_SENDMAIL_STATIC_MILTER)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:mail/${SENDMAIL_MILTER_PORT}
 .else
-LIB_DEPENDS+=	libmilter.so.${MILTER_SOVER}:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT}
+LIB_DEPENDS+=	libmilter.so.${MILTER_SOVER}:mail/${SENDMAIL_MILTER_PORT}
 .endif
 
 SENDMAIL_MILTER_PORT?=	libmilter
diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile
index cfbcdbcc8835..0e175eb64d6a 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/smfilter/${PORTNAME}/Sentinel%20${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Sendmail milter API implementation
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index 75407a23facd..8a858e5346ae 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	http://cr.yp.to/software/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools for passing mail across serial links
 
-RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
-UCSPI_SSL_RUN_DEPENDS=	sslclient:${PORTSDIR}/sysutils/ucspi-ssl
+RUN_DEPENDS=	tcpserver:sysutils/ucspi-tcp
+UCSPI_SSL_RUN_DEPENDS=	sslclient:sysutils/ucspi-ssl
 
 USES=		qmail:run
 OPTIONS_SUB=	yes
diff --git a/mail/sieve-connect/Makefile b/mail/sieve-connect/Makefile
index 08152047ea4a..5474fac6f0aa 100644
--- a/mail/sieve-connect/Makefile
+++ b/mail/sieve-connect/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Command-line client for the MANAGESIEVE protocol
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-IO-Socket-SSL>=1.14:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Mozilla-PublicSuffix>=0:${PORTSDIR}/dns/p5-Mozilla-PublicSuffix \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-SSLeay>=1.37:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
+		p5-IO-Socket-SSL>=1.14:security/p5-IO-Socket-SSL \
+		p5-Mozilla-PublicSuffix>=0:dns/p5-Mozilla-PublicSuffix \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-SSLeay>=1.37:security/p5-Net-SSLeay \
+		p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 
 USES=		perl5 tar:bzip2 shebangfix
 SHEBANG_FILES=	sieve-connect.pl
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index ce5587e2d705..d250845a2004 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -47,12 +47,12 @@ CONFIGURE_ARGS=--enable-clamavdb-path=/var/db/clamav \
 		--enable-user=nobody
 
 CLAMAV_CONFIGURE_OFF=	--enable-clamav=n
-CLAMAV_BUILD_DEPENDS=	clamdscan:${PORTSDIR}/security/clamav
+CLAMAV_BUILD_DEPENDS=	clamdscan:security/clamav
 
 RIPMIME_CONFIGURE_OFF=	--disable-ripmime
-RIPMIME_BUILD_DEPENDS=	ripmime:${PORTSDIR}/mail/ripmime
+RIPMIME_BUILD_DEPENDS=	ripmime:mail/ripmime
 
-SPAMD_BUILD_DEPENDS=	spamassassin:${PORTSDIR}/mail/spamassassin
+SPAMD_BUILD_DEPENDS=	spamassassin:mail/spamassassin
 SPAMD_CONFIGURE_ON=	--enable-spam=y \
 			--enable-spamassassin-path=${LOCALBASE}/bin/spamassassin
 
@@ -70,7 +70,7 @@ HEADERS_CONFIGURE_ON=	--enable-received=y \
 			--enable-sigtool-path=${LOCALBASE}/bin/sigtool
 
 DSPAM_CONFIGURE_ON=	--enable-dspam=y
-DSPAM_BUILD_DEPENDS=	dspam:${PORTSDIR}/mail/dspam
+DSPAM_BUILD_DEPENDS=	dspam:mail/dspam
 
 .if defined(SPAM_HITS)
 CONFIGURE_ARGS+=--enable-spam-hits=${SPAM_HITS}
diff --git a/mail/slapd-cyrus/Makefile b/mail/slapd-cyrus/Makefile
index fdf24ba525fc..4929368c3d88 100644
--- a/mail/slapd-cyrus/Makefile
+++ b/mail/slapd-cyrus/Makefile
@@ -11,13 +11,13 @@ DISTNAME=	Slapd-Backend-Cyrus-${PORTVERSION}
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Slapd backend to translate DIT into Cyrus configuration
 
-BUILD_DEPENDS=	cyrus-imapd24>=0:${PORTSDIR}/mail/cyrus-imapd24 \
-		p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB \
-		p5-Class-Accessor-Lvalue>=0:${PORTSDIR}/devel/p5-Class-Accessor-Lvalue \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	cyrus-imapd24>=0:mail/cyrus-imapd24 \
+		p5-BerkeleyDB>=0:databases/p5-BerkeleyDB \
+		p5-Class-Accessor-Lvalue>=0:devel/p5-Class-Accessor-Lvalue \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/mail/smtp-cli/Makefile b/mail/smtp-cli/Makefile
index e141fbb5028d..661696f3594d 100644
--- a/mail/smtp-cli/Makefile
+++ b/mail/smtp-cli/Makefile
@@ -15,11 +15,11 @@ LICENSE=	GPLv3
 
 USES=		shebangfix
 
-RUN_DEPENDS=	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-File-LibMagic>0:${PORTSDIR}/devel/p5-File-LibMagic \
-		p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-MIME-Lite>0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-Digest-HMAC>0:security/p5-Digest-HMAC \
+		p5-File-LibMagic>0:devel/p5-File-LibMagic \
+		p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
+		p5-MIME-Lite>0:mail/p5-MIME-Lite \
+		p5-Term-ReadKey>0:devel/p5-Term-ReadKey
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
diff --git a/mail/smtp-gated/Makefile b/mail/smtp-gated/Makefile
index d5210cb1aa1a..b00cef14a534 100644
--- a/mail/smtp-gated/Makefile
+++ b/mail/smtp-gated/Makefile
@@ -32,6 +32,6 @@ NAT_CONFIGURE_ENABLE=	nat
 CHUNKING_CONFIGURE_ENABLE=	chunking
 ECONNRESET_CONFIGURE_ENABLE=	silent-econnreset
 PCRE_CONFIGURE_OFF=	--disable-pcre
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
 .include <bsd.port.mk>
diff --git a/mail/smtprc/Makefile b/mail/smtprc/Makefile
index 6bbd0dd3248c..5f86e8e73a30 100644
--- a/mail/smtprc/Makefile
+++ b/mail/smtprc/Makefile
@@ -15,7 +15,7 @@ OPTIONS_DEFINE=	DOCS GUI
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI}
-RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 PLIST_SUB+=	WITHGUI=""
 .else
 PLIST_SUB+=	WITHGUI="@comment "
diff --git a/mail/spamass-ixhash/Makefile b/mail/spamass-ixhash/Makefile
index 19a8e4d669e5..128f9f79960d 100644
--- a/mail/spamass-ixhash/Makefile
+++ b/mail/spamass-ixhash/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Plugin for SpamAssassin supporting iXhash
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	spamc:${PORTSDIR}/mail/spamassassin \
-		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	spamc:mail/spamassassin \
+		p5-Digest-MD5>=0:security/p5-Digest-MD5 \
+		p5-Net-DNS>=0.63:dns/p5-Net-DNS
 
 OPTIONS_DEFINE=	DOCS
 NO_BUILD=	yes
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index 355fcc6c51a6..849a0a2b0ce3 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SAVANNAH/spamass-milt
 MAINTAINER=	bmah@FreeBSD.org
 COMMENT=	Sendmail Milter (mail filter) plugin for SpamAssassin
 
-BUILD_DEPENDS=	spamc:${PORTSDIR}/mail/spamassassin
+BUILD_DEPENDS=	spamc:mail/spamassassin
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	GPLv2
diff --git a/mail/spamass-rules/Makefile b/mail/spamass-rules/Makefile
index ac69f4d5f9ca..fb542a2b5c61 100644
--- a/mail/spamass-rules/Makefile
+++ b/mail/spamass-rules/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.ranner.eu/stuff/
 MAINTAINER=	michael@ranner.eu
 COMMENT=	Custom rulesets for SpamAssassin
 
-RUN_DEPENDS=	spamc:${PORTSDIR}/mail/spamassassin
+RUN_DEPENDS=	spamc:mail/spamassassin
 
 USES=		tar:bzip2
 
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index d17dd375bb1a..6c8d98e9c3f3 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -13,14 +13,14 @@ COMMENT?=	Highly efficient mail filter for identifying spam
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
-		p5-HTML-Parser>=3.46:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP \
-		p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-NetAddr-IP>=4.010:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-Encode-Detect>=0:converters/p5-Encode-Detect \
+		p5-HTML-Parser>=3.46:www/p5-HTML-Parser \
+		p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP \
+		p5-Net-DNS>=0.63:dns/p5-Net-DNS \
+		p5-NetAddr-IP>=4.010:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		re2c>=.12.0:${PORTSDIR}/devel/re2c
+		re2c>=.12.0:devel/re2c
 
 .for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY SPF_QUERY SSL
 TEST_DEPENDS+=	${${dep}_RUN_DEPENDS}
@@ -79,21 +79,21 @@ SUB_LIST+=	SPAMD_OWN="${USERS}:${GROUPS}"
 PLIST_SUB+=	USER=${USERS} GROUP=${GROUPS}
 OPTIONS_SUB=	yes
 
-DCC_RUN_DEPENDS=	dcc-dccd>=1.3.111:${PORTSDIR}/mail/dcc-dccd
-DKIM_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-			p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM \
-			p5-Crypt-OpenSSL-RSA>=0.26_1:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
-GNUPG_RUN_DEPENDS=	gnupg1>=1.4.7:${PORTSDIR}/security/gnupg1
-GNUPG2_RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
-MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-PYZOR_RUN_DEPENDS=	pyzor:${PORTSDIR}/mail/pyzor
-RAZOR_RUN_DEPENDS=	razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
-RELAY_COUNTRY_RUN_DEPENDS=	p5-Geo-IP>=0:${PORTSDIR}/net/p5-Geo-IP
-SPF_QUERY_RUN_DEPENDS=	p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF
+DCC_RUN_DEPENDS=	dcc-dccd>=1.3.111:mail/dcc-dccd
+DKIM_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+			p5-Mail-DKIM>=0.37:mail/p5-Mail-DKIM \
+			p5-Crypt-OpenSSL-RSA>=0.26_1:security/p5-Crypt-OpenSSL-RSA
+GNUPG_RUN_DEPENDS=	gnupg1>=1.4.7:security/gnupg1
+GNUPG2_RUN_DEPENDS=	gpg2:security/gnupg
+MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
+PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
+PYZOR_RUN_DEPENDS=	pyzor:mail/pyzor
+RAZOR_RUN_DEPENDS=	razor-agents>=2.84:mail/razor-agents
+RELAY_COUNTRY_RUN_DEPENDS=	p5-Geo-IP>=0:net/p5-Geo-IP
+SPF_QUERY_RUN_DEPENDS=	p5-Mail-SPF>=0:mail/p5-Mail-SPF
 
 SSL_USE=		OPENSSL=yes
-SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 SSL_CONFIGURE_ON=	ENABLE_SSL=yes
 SSL_CONFIGURE_OFF=	ENABLE_SSL=no
 
diff --git a/mail/spambnc/Makefile b/mail/spambnc/Makefile
index 0c6da9cd1029..8ee42e301c26 100644
--- a/mail/spambnc/Makefile
+++ b/mail/spambnc/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Set of procmail recipes which handle known/suspected spam
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
+RUN_DEPENDS=	procmail:mail/procmail
 
 EXTRACT_DIR=	${WRKDIRPREFIX}${.CURDIR}/worktmp/${DISTNAME}
 EXTRACT_BEFORE_ARGS=	-C ${EXTRACT_DIR} -xf
diff --git a/mail/spamcup/Makefile b/mail/spamcup/Makefile
index 4418c781bf82..538f4465fd26 100644
--- a/mail/spamcup/Makefile
+++ b/mail/spamcup/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Tool for automatic spam reporting via Spamcop.net
 
 LICENSE=	GPLv1
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Getopt-ArgvFile>=0:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-HTML-Form>=0:${PORTSDIR}/www/p5-HTML-Form
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Getopt-ArgvFile>=0:devel/p5-Getopt-ArgvFile \
+		p5-HTML-Form>=0:www/p5-HTML-Form
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	spamcup.pl
diff --git a/mail/spamdb-curses/Makefile b/mail/spamdb-curses/Makefile
index a568280a742f..f6c60a5338c9 100644
--- a/mail/spamdb-curses/Makefile
+++ b/mail/spamdb-curses/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Curses interface for OpenBSD spamd spam database (spamdb)
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/spamdb:${PORTSDIR}/mail/spamd
+RUN_DEPENDS=	${LOCALBASE}/sbin/spamdb:mail/spamd
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index b8fe7f354a4f..ef6aa826d240 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Qmail filter for monitoring and intercepting SMTP connections
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:sysutils/ucspi-tcp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/spamdyke
 
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 7eb18da2f64e..e3969e9aef7d 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -38,7 +38,7 @@ LIBSPF_DESC=	build with libspf
 
 SMTP_AFTER_POP3_CONFIGURE_ON=	--with-popauth
 PAM_CONFIGURE_ON=	--with-pam
-LIBSPF_BUILD_DEPENDS=	${LOCALBASE}/lib/libspf.a:${PORTSDIR}/mail/libspf
+LIBSPF_BUILD_DEPENDS=	${LOCALBASE}/lib/libspf.a:mail/libspf
 LIBSPF_CONFIGURE_ON=	--with-libspf ${LOCALBASE}
 LIBSPF_CFLAGS=		-I${LOCALBASE}/include
 LIBSPF_LDFLAGS=		-L${LOCALBASE}/lib
diff --git a/mail/spamoracle/Makefile b/mail/spamoracle/Makefile
index d62caad41382..195cc41e233c 100644
--- a/mail/spamoracle/Makefile
+++ b/mail/spamoracle/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://cristal.inria.fr/~xleroy/software/
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	procmail spam filter written in ML using Bayesian classification
 
-BUILD_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
+BUILD_DEPENDS=	ocaml:lang/ocaml
 
 PLIST_FILES=	bin/spamoracle
 PLIST_FILES+=	man/man1/spamoracle.1.gz
diff --git a/mail/spampd/Makefile b/mail/spampd/Makefile
index f0de7d19ec31..0ee72d979605 100644
--- a/mail/spampd/Makefile
+++ b/mail/spampd/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Spamassassin SMTP Proxy
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	spamc:${PORTSDIR}/mail/spamassassin \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server
+RUN_DEPENDS=	spamc:mail/spamassassin \
+		p5-Net-Server>=0:net/p5-Net-Server
 
 NO_BUILD=	yes
 PLIST_FILES=	sbin/spampd
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index ffe6f63c18a2..09f0a087381d 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -26,7 +26,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # PBL support
-PBL_BUILD_DEPENDS=	${LOCALBASE}/lib/libpbl.a:${PORTSDIR}/databases/libpbl
+PBL_BUILD_DEPENDS=	${LOCALBASE}/lib/libpbl.a:databases/libpbl
 PBL_RUN_DEPENDS+=	${PBL_BUILD_DEPENDS}
 PBL_CONFIGURE_WITH=	pbl
 PBL_LDFLAGS=	-lpbl
@@ -38,11 +38,11 @@ BDB_CPPFLAGS=	-DUSE_DB=1
 
 # giflib support
 GIF_CONFIGURE_WITH=	gif
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 
 # PNG support
 PNG_CONFIGURE_WITH=	png
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 # JPEG support
 JPEG_CONFIGURE_WITH=jpeg
diff --git a/mail/spamstats/Makefile b/mail/spamstats/Makefile
index bba8d326e0f4..1a34556f21e2 100644
--- a/mail/spamstats/Makefile
+++ b/mail/spamstats/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	LOCAL/leeym
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Tool to generate statistics for spamd of Mail::SpamAssassin
 
-RUN_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Compress-Bzip2>=2.08:${PORTSDIR}/archivers/p5-Compress-Bzip2
+RUN_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Compress-Bzip2>=2.08:archivers/p5-Compress-Bzip2
 
 NO_BUILD=	yes
 PORTDOCS=	QUICK README copyright
diff --git a/mail/spmfilter-clamav/Makefile b/mail/spmfilter-clamav/Makefile
index c9e5e7f9784f..8479515b255a 100644
--- a/mail/spmfilter-clamav/Makefile
+++ b/mail/spmfilter-clamav/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.spmfilter.org/files/
 MAINTAINER=	ast@treibsand.com
 COMMENT=	ClamAV plugin for spmfilter
 
-BUILD_DEPENDS=	spmfilter>=0.6:${PORTSDIR}/mail/spmfilter
-RUN_DEPENDS=	spmfilter>=0.6:${PORTSDIR}/mail/spmfilter
+BUILD_DEPENDS=	spmfilter>=0.6:mail/spmfilter
+RUN_DEPENDS=	spmfilter>=0.6:mail/spmfilter
 
 USES=		cmake pkgconfig
 CMAKE_ARGS+=	--no-warn-unused-cli \
diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile
index 6e11141a74e9..5a3fcd6c1edc 100644
--- a/mail/spmfilter/Makefile
+++ b/mail/spmfilter/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Spmfilter is a high-performance mail filtering framework, written in C
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	libcmime>=0.1.10:${PORTSDIR}/mail/libcmime \
-		libesmtp>=1.0:${PORTSDIR}/mail/libesmtp
+BUILD_DEPENDS=	libcmime>=0.1.10:mail/libcmime \
+		libesmtp>=1.0:mail/libesmtp
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -64,13 +64,13 @@ CMAKE_ARGS+=	-DWITHOUT_LDAP=TRUE
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-LIB_DEPENDS+=	libzdb.so:${PORTSDIR}/databases/libzdb
+LIB_DEPENDS+=	libzdb.so:databases/libzdb
 USE_MYSQL=	yes
 _REQUIRE+=	mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-LIB_DEPENDS+=	libzdb.so:${PORTSDIR}/databases/libzdb
+LIB_DEPENDS+=	libzdb.so:databases/libzdb
 USES+=		pgsql
 _REQUIRE+=	postgresql
 .endif
diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index cc1fae9bafba..417d8d9ffd1b 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Greylisting policy server for Postfix using an SQL backend
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		p5-IO-Multiplex>=0:${PORTSDIR}/devel/p5-IO-Multiplex \
-		p5-Pod-Parser>=0:${PORTSDIR}/textproc/p5-Pod-Parser \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils
+RUN_DEPENDS=	p5-Net-Server>=0:net/p5-Net-Server \
+		p5-IO-Multiplex>=0:devel/p5-IO-Multiplex \
+		p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
+		${LOCALBASE}/bin/bash:shells/bash \
+		${LOCALBASE}/bin/gmd5sum:sysutils/coreutils
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${WRKSRC}/sqlgrey-logstats.pl ${WRKSRC}/update_sqlgrey_config ${WRKSRC}/sqlgrey
@@ -39,10 +39,10 @@ OPTIONS_DEFINE=	PGSQL MYSQL SQLITE STATS DOCS
 OPTIONS_DEFAULT=PGSQL
 STATS_DESC=	Depend on Date::Calc for logstats.pl script
 
-PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
-STATS_RUN_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
+MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
+SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
+STATS_RUN_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's!/etc/sqlgrey!${ETCDIR}!g' ${WRKSRC}/sqlgrey
diff --git a/mail/squirrelmail-change_sqlpass-plugin/Makefile b/mail/squirrelmail-change_sqlpass-plugin/Makefile
index 86d3c58b49ee..b3cb8ed043c3 100644
--- a/mail/squirrelmail-change_sqlpass-plugin/Makefile
+++ b/mail/squirrelmail-change_sqlpass-plugin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows users to change their passwords stored in a SQL database
 
 USE_SM_COMPAT=	yes
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile
index cef2103cb1a4..5cdd295836bb 100644
--- a/mail/squirrelmail-decode/Makefile
+++ b/mail/squirrelmail-decode/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Decoders to display extra character sets in SquirrelMail
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
+RUN_DEPENDS=	${SQUIRRELDIR}/index.php:mail/squirrelmail
 
 USES=		tar:bzip2
 NO_BUILD=	yes
diff --git a/mail/squirrelmail-plugins/Makefile b/mail/squirrelmail-plugins/Makefile
index 72fc6c0849de..e28701181687 100644
--- a/mail/squirrelmail-plugins/Makefile
+++ b/mail/squirrelmail-plugins/Makefile
@@ -16,70 +16,70 @@ OPTIONS_DEFINE=	BUTTONS CALENDAR LDAPPW LGAUTH LGNOTES MAILFT MLOGIN \
 	SQLPW TIMEOUT TMDA VLOGIN WEBSEARCH WETTER
 
 BUTTONS_DESC=	Custom (spam/ham/etc.) buttons
-BUTTONS_RUN_DEPENDS=	squirrelmail-spam-buttons-plugin>0:${PORTSDIR}/mail/squirrelmail-spam-buttons-plugin
+BUTTONS_RUN_DEPENDS=	squirrelmail-spam-buttons-plugin>0:mail/squirrelmail-spam-buttons-plugin
 
 CALENDAR_DESC=	Shared Calendars plugin
-CALENDAR_RUN_DEPENDS=	squirrelmail-shared_calendars-plugin>0:${PORTSDIR}/mail/squirrelmail-shared_calendars-plugin
+CALENDAR_RUN_DEPENDS=	squirrelmail-shared_calendars-plugin>0:mail/squirrelmail-shared_calendars-plugin
 
 LDAPPW_DESC=	Change LDAP passwords plugin
-LDAPPW_RUN_DEPENDS=	squirrelmail-change_ldappass-plugin>0:${PORTSDIR}/mail/squirrelmail-change_ldappass-plugin
+LDAPPW_RUN_DEPENDS=	squirrelmail-change_ldappass-plugin>0:mail/squirrelmail-change_ldappass-plugin
 
 LGAUTH_DESC=	HTTP-auth based login plugin
-LGAUTH_RUN_DEPENDS=	squirrelmail-login_auth-plugin>0:${PORTSDIR}/mail/squirrelmail-login_auth-plugin
+LGAUTH_RUN_DEPENDS=	squirrelmail-login_auth-plugin>0:mail/squirrelmail-login_auth-plugin
 
 LGNOTES_DESC=	Notes on login screen plugin
-LGNOTES_RUN_DEPENDS=	squirrelmail-login_notes-plugin>0:${PORTSDIR}/mail/squirrelmail-login_notes-plugin
+LGNOTES_RUN_DEPENDS=	squirrelmail-login_notes-plugin>0:mail/squirrelmail-login_notes-plugin
 
 MAILFT_DESC=	E-mail footer plugin
-MAILFT_RUN_DEPENDS=	squirrelmail-email_footer-plugin>0:${PORTSDIR}/mail/squirrelmail-email_footer-plugin
+MAILFT_RUN_DEPENDS=	squirrelmail-email_footer-plugin>0:mail/squirrelmail-email_footer-plugin
 
 MLOGIN_DESC=	Multilogin plugin
-MLOGIN_RUN_DEPENDS=	squirrelmail-multilogin-plugin>0:${PORTSDIR}/mail/squirrelmail-multilogin-plugin
+MLOGIN_RUN_DEPENDS=	squirrelmail-multilogin-plugin>0:mail/squirrelmail-multilogin-plugin
 
 NOTES_DESC=	Notes plugin
-NOTES_RUN_DEPENDS=	squirrelmail-notes-plugin>0:${PORTSDIR}/mail/squirrelmail-notes-plugin
+NOTES_RUN_DEPENDS=	squirrelmail-notes-plugin>0:mail/squirrelmail-notes-plugin
 
 NOTIFY_DESC=	New mail notify plugin
-NOTIFY_RUN_DEPENDS=	squirrelmail-notify-plugin>0:${PORTSDIR}/mail/squirrelmail-notify-plugin
+NOTIFY_RUN_DEPENDS=	squirrelmail-notify-plugin>0:mail/squirrelmail-notify-plugin
 
 PUPDATE_DESC=	Plugin update check plugin
-PUPDATE_RUN_DEPENDS=	squirrelmail-pupdate-plugin>0:${PORTSDIR}/mail/squirrelmail-pupdate-plugin
+PUPDATE_RUN_DEPENDS=	squirrelmail-pupdate-plugin>0:mail/squirrelmail-pupdate-plugin
 
 PW4GET_DESC=	Password forget plugin
-PW4GET_RUN_DEPENDS=	squirrelmail-password_forget-plugin>0:${PORTSDIR}/mail/squirrelmail-password_forget-plugin
+PW4GET_RUN_DEPENDS=	squirrelmail-password_forget-plugin>0:mail/squirrelmail-password_forget-plugin
 
 QMADMIN_DESC=	Qmailadmin login plugin
-QMADMIN_RUN_DEPENDS=	squirrelmail-qmailadmin_login-plugin>0:${PORTSDIR}/mail/squirrelmail-qmailadmin_login-plugin
+QMADMIN_RUN_DEPENDS=	squirrelmail-qmailadmin_login-plugin>0:mail/squirrelmail-qmailadmin_login-plugin
 
 QUOTA_DESC=	Quota usage plugin
-QUOTA_RUN_DEPENDS=	squirrelmail-quota_usage-plugin>0:${PORTSDIR}/mail/squirrelmail-quota_usage-plugin
+QUOTA_RUN_DEPENDS=	squirrelmail-quota_usage-plugin>0:mail/squirrelmail-quota_usage-plugin
 
 SASQL_DESC=	SpamAssassin SQL plugin
-SASQL_RUN_DEPENDS=	squirrelmail-sasql-plugin>0:${PORTSDIR}/mail/squirrelmail-sasql-plugin
+SASQL_RUN_DEPENDS=	squirrelmail-sasql-plugin>0:mail/squirrelmail-sasql-plugin
 
 SIEVE_DESC=	Sieve Mail Filters plugin
-SIEVE_RUN_DEPENDS=	squirrelmail-avelsieve-plugin>0:${PORTSDIR}/mail/squirrelmail-avelsieve-plugin
+SIEVE_RUN_DEPENDS=	squirrelmail-avelsieve-plugin>0:mail/squirrelmail-avelsieve-plugin
 
 SLOGIN_DESC=	SSL login plugin
-SLOGIN_RUN_DEPENDS=	squirrelmail-secure_login-plugin>0:${PORTSDIR}/mail/squirrelmail-secure_login-plugin
+SLOGIN_RUN_DEPENDS=	squirrelmail-secure_login-plugin>0:mail/squirrelmail-secure_login-plugin
 
 SQLPW_DESC=	Change *SQL passwords plugin
-SQLPW_RUN_DEPENDS=	squirrelmail-change-sqlpass-plugin>0:${PORTSDIR}/mail/squirrelmail-change_sqlpass-plugin
+SQLPW_RUN_DEPENDS=	squirrelmail-change-sqlpass-plugin>0:mail/squirrelmail-change_sqlpass-plugin
 
 TIMEOUT_DESC=	User session timeout plugin
-TIMEOUT_RUN_DEPENDS=	squirrelmail-timeout_user-plugin>0:${PORTSDIR}/mail/squirrelmail-timeout_user-plugin
+TIMEOUT_RUN_DEPENDS=	squirrelmail-timeout_user-plugin>0:mail/squirrelmail-timeout_user-plugin
 
 TMDA_DESC=	TMDA plugin
-TMDA_RUN_DEPENDS=	squirrelmail-tmda-plugin>0:${PORTSDIR}/mail/squirrelmail-tmda-plugin
+TMDA_RUN_DEPENDS=	squirrelmail-tmda-plugin>0:mail/squirrelmail-tmda-plugin
 
 VLOGIN_DESC=	Multi-site-hosting capabilities plugin
-VLOGIN_RUN_DEPENDS=	squirrelmail-vlogin-plugin>0:${PORTSDIR}/mail/squirrelmail-vlogin-plugin
+VLOGIN_RUN_DEPENDS=	squirrelmail-vlogin-plugin>0:mail/squirrelmail-vlogin-plugin
 
 WEBSEARCH_DESC=	Web search engines plugin
-WEBSEARCH_RUN_DEPENDS=	squirrelmail-web_search-plugin>0:${PORTSDIR}/mail/squirrelmail-websearch-plugin
+WEBSEARCH_RUN_DEPENDS=	squirrelmail-web_search-plugin>0:mail/squirrelmail-websearch-plugin
 
 WETTER_DESC=	Weather in Germany plugin
-WETTER_RUN_DEPENDS=	squirrelmail-wetteronline-plugin>0:${PORTSDIR}/mail/squirrelmail-wetteronline-plugin
+WETTER_RUN_DEPENDS=	squirrelmail-wetteronline-plugin>0:mail/squirrelmail-wetteronline-plugin
 
 USES=		metaport
 
diff --git a/mail/squirrelmail-qmailadmin_login-plugin/Makefile b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
index b5c7f0b148eb..5772287622d4 100644
--- a/mail/squirrelmail-qmailadmin_login-plugin/Makefile
+++ b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Using the QmailAdmin cgi interface from SquirrelMail
 
-RUN_DEPENDS=	${PREFIX}/www/cgi-bin.default/qmailadmin/qmailadmin:${PORTSDIR}/mail/qmailadmin
+RUN_DEPENDS=	${PREFIX}/www/cgi-bin.default/qmailadmin/qmailadmin:mail/qmailadmin
 
 USE_GENERIC_PKGMESSAGE=	yes
 
diff --git a/mail/squirrelmail-sasql-plugin/Makefile b/mail/squirrelmail-sasql-plugin/Makefile
index c3e8dfee23e2..9b5941330f76 100644
--- a/mail/squirrelmail-sasql-plugin/Makefile
+++ b/mail/squirrelmail-sasql-plugin/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	mail www
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Edit SpamAssassin settings stored in an SQL DB
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
 
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
diff --git a/mail/squirrelmail-shared_calendars-plugin/Makefile b/mail/squirrelmail-shared_calendars-plugin/Makefile
index 3612fe493f3e..a6897f0e1e4d 100644
--- a/mail/squirrelmail-shared_calendars-plugin/Makefile
+++ b/mail/squirrelmail-shared_calendars-plugin/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	iCal-compliant calendaring for SquirrelMail
 
-RUN_DEPENDS=	squirrelmail-calendar_file_backend-plugin>0:${PORTSDIR}/mail/squirrelmail-calendar_file_backend-plugin
+RUN_DEPENDS=	squirrelmail-calendar_file_backend-plugin>0:mail/squirrelmail-calendar_file_backend-plugin
 
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
diff --git a/mail/squirrelmail-tmda-plugin/Makefile b/mail/squirrelmail-tmda-plugin/Makefile
index 2689518b7a94..f79adc3c910a 100644
--- a/mail/squirrelmail-tmda-plugin/Makefile
+++ b/mail/squirrelmail-tmda-plugin/Makefile
@@ -12,8 +12,8 @@ DISTFILES=	tmdatools.1.0.2-1.4.2.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adds TMDA support to SquirrelMail
 
-RUN_DEPENDS=	tmda-filter:${PORTSDIR}/mail/tmda \
-		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
+RUN_DEPENDS=	tmda-filter:mail/tmda \
+		${SQUIRRELDIR}/index.php:mail/squirrelmail
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/mail/squirrelmail-translations/Makefile b/mail/squirrelmail-translations/Makefile
index ce623c416cad..37733492881b 100644
--- a/mail/squirrelmail-translations/Makefile
+++ b/mail/squirrelmail-translations/Makefile
@@ -13,7 +13,7 @@ COMMENT=	NLS translations for Squirrelmail (mail/squirrelmail)
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	squirrelmail>=${PORTVERSION}:${PORTSDIR}/mail/squirrelmail
+RUN_DEPENDS=	squirrelmail>=${PORTVERSION}:mail/squirrelmail
 
 USES=		tar:bzip2 gettext
 WRKSRC=		${WRKDIR}/squirrelmail.locales
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 5c1708055723..05fe9a5ea2f0 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -47,7 +47,7 @@ SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP}
 
 CONFLICTS=	squirreloutlook-[0-9]*
 
-DATABASE_RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+DATABASE_RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
 LDAP_USE=	PHP=ldap
 
 post-patch:
diff --git a/mail/squirrelmail/bsd.squirrelmail.mk b/mail/squirrelmail/bsd.squirrelmail.mk
index eb89abb8d1a9..4ec2ad175634 100644
--- a/mail/squirrelmail/bsd.squirrelmail.mk
+++ b/mail/squirrelmail/bsd.squirrelmail.mk
@@ -33,10 +33,10 @@ PKGNAMEPREFIX?=	squirrelmail-
 PKGNAMESUFFIX?=	-plugin
 DIST_SUBDIR?=	squirrelmail
 
-RUN_DEPENDS+=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
+RUN_DEPENDS+=	${SQUIRRELDIR}/index.php:mail/squirrelmail
 
 .ifdef USE_SM_COMPAT
-RUN_DEPENDS+=	squirrelmail-compatibility-plugin>0:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+RUN_DEPENDS+=	squirrelmail-compatibility-plugin>0:mail/squirrelmail-compatibility-plugin
 .endif
 
 .ifndef WITHOUT_ACTIVATE
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 499160a62a64..cd29a927fb02 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CGI Webmail client for Maildirs
 
-BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
+BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
+RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libcourier-unicode.so:devel/courier-unicode
 
 CFLAGS:=	-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}
 CXXFLAGS:=	-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}
@@ -116,15 +116,15 @@ CONFIGURE_ARGS+=	--without-gzip
 .endif
 
 .if ${PORT_OPTIONS:MISPELL}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/aspell-ispell
-RUN_DEPENDS+=		${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/aspell-ispell
+BUILD_DEPENDS+=		${LOCALBASE}/bin/ispell:textproc/aspell-ispell
+RUN_DEPENDS+=		${LOCALBASE}/bin/ispell:textproc/aspell-ispell
 CONFIGURE_ARGS+=	--with-ispell=${LOCALBASE}/bin/ispell
 .else
 CONFIGURE_ARGS+=	--without-ispell
 .endif
 
 .if ${PORT_OPTIONS:MMIMETYPES}
-RUN_DEPENDS+=		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS+=		${LOCALBASE}/etc/mime.types:misc/mime-support
 CONFIGURE_ARGS+=	--enable-mimetypes=${LOCALBASE}/etc
 .else
 CONFIGURE_ARGS+=	--disable-mimetypes
@@ -164,7 +164,7 @@ CONFIGURE_ARGS+=	--enable-maxpurge=${WITH_MAXPURGE}
 
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=--with-db=gdbm
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=--with-db=db
 .endif
diff --git a/mail/svnmailer/Makefile b/mail/svnmailer/Makefile
index 0026b6127567..4fcabfded319 100644
--- a/mail/svnmailer/Makefile
+++ b/mail/svnmailer/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to post subversion repository commit information
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>0:${PORTSDIR}/devel/py-subversion
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:2 tar:bzip2
diff --git a/mail/swaks/Makefile b/mail/swaks/Makefile
index bd0582b0f978..bd2174de5d37 100644
--- a/mail/swaks/Makefile
+++ b/mail/swaks/Makefile
@@ -23,9 +23,9 @@ SHEBANG_FILES=	${PORTNAME}
 USE_PERL5=	run
 NO_BUILD=	yes
 
-PERL_NET_DNS_RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
-PERL_NET_SSLEAY_RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
-PERL_AUTHEN_NTLM_RUN_DEPENDS=	p5-Authen-NTLM>=0:${PORTSDIR}/security/p5-Authen-NTLM
+PERL_NET_DNS_RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
+PERL_NET_SSLEAY_RUN_DEPENDS=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay
+PERL_AUTHEN_NTLM_RUN_DEPENDS=	p5-Authen-NTLM>=0:security/p5-Authen-NTLM
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 03c59758ff5e..e7317705750e 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Lightweight, featureful, and fast GTK+ based e-mail client
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 USES=		gettext iconv gmake pkgconfig tar:bzip2 desktop-file-utils \
 		libtool
@@ -46,31 +46,31 @@ ONIGURUMA_DESC=	Oniguruma support
 
 OPTIONS_DEFAULT=CA_BUNDLE CURL GTKSPELL GPGME SSL
 
-CA_BUNDLE_RUN_DEPENDS=		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_RUN_DEPENDS=		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 CA_BUNDLE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-libsylph_ssl.c
 
-COMPFACE_LIB_DEPENDS=		libcompface.so:${PORTSDIR}/mail/faces
+COMPFACE_LIB_DEPENDS=		libcompface.so:mail/faces
 COMPFACE_CONFIGURE_ENABLE=	compface
 
-CURL_RUN_DEPENDS=		curl:${PORTSDIR}/ftp/curl
+CURL_RUN_DEPENDS=		curl:ftp/curl
 
-GPGME_LIB_DEPENDS=		libgpgme.so:${PORTSDIR}/security/gpgme
-GPGME_RUN_DEPENDS=		gpg:${PORTSDIR}/security/gnupg
+GPGME_LIB_DEPENDS=		libgpgme.so:security/gpgme
+GPGME_RUN_DEPENDS=		gpg:security/gnupg
 GPGME_CONFIGURE_ENABLE=		gpgme
 
-GTKSPELL_LIB_DEPENDS=		libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=		libgtkspell.so:textproc/gtkspell
 GTKSPELL_CONFIGURE_ENABLE=	gtkspell
 
 HIDE_OSSIG_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_main.c
 
-JPILOT_LIB_DEPENDS=		libpisock.so:${PORTSDIR}/palm/pilot-link
-JPILOT_RUN_DEPENDS=		jpilot:${PORTSDIR}/palm/jpilot
+JPILOT_LIB_DEPENDS=		libpisock.so:palm/pilot-link
+JPILOT_RUN_DEPENDS=		jpilot:palm/jpilot
 JPILOT_CONFIGURE_ENABLE=	jpilot
 
 LDAP_CONFIGURE_ENABLE=		ldap
 LDAP_USE=			openldap=yes
 
-ONIGURUMA_BUILD_DEPENDS=	${LOCALBASE}/lib/libonig.a:${PORTSDIR}/devel/oniguruma5
+ONIGURUMA_BUILD_DEPENDS=	${LOCALBASE}/lib/libonig.a:devel/oniguruma5
 ONIGURUMA_CONFIGURE_ENABLE=	oniguruma
 
 SSL_CONFIGURE_ENABLE=		ssl
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index f6e839cf6791..bee24a683ca8 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -14,40 +14,40 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
-	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI	\
-	p5-Class-Singleton>=0:${PORTSDIR}/devel/p5-Class-Singleton	\
-	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive	\
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy	\
-	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl	\
-	p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar	\
-	p5-MIME-EncWords>=0:${PORTSDIR}/mail/p5-MIME-EncWords	\
-	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools	\
-	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools	\
-	p5-Msgcat>=0:${PORTSDIR}/misc/p5-Locale-Msgcat	\
-	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap	\
-	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask	\
-	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL	\
-	p5-Crypt-CipherSaber>=0:${PORTSDIR}/security/p5-Crypt-CipherSaber	\
-	p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format	\
-	p5-Unicode-LineBreak>=0:${PORTSDIR}/textproc/p5-Unicode-LineBreak	\
-	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML	\
-	p5-HTML-StripScripts-Parser>=0:${PORTSDIR}/www/p5-HTML-StripScripts-Parser	\
-	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree	\
-	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit	\
-	p5-MIME-Lite-HTML>=0:${PORTSDIR}/mail/p5-MIME-Lite-HTML	\
-	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS	\
-	p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail	\
-	p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone	\
-	p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple	\
-	p5-File-NFSLock>=0:${PORTSDIR}/devel/p5-File-NFSLock	\
-	p5-MIME-Charset>=0:${PORTSDIR}/mail/p5-MIME-Charset	\
-	p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR	\
-	p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable	\
-	p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes	\
-	p5-Crypt-SMIME>=0:${PORTSDIR}/security/p5-Crypt-SMIME	\
-	p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
-	p5-Data-Password>=0:${PORTSDIR}/security/p5-Data-Password
+	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+	p5-DBI>=0:databases/p5-DBI	\
+	p5-Class-Singleton>=0:devel/p5-Class-Singleton	\
+	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive	\
+	p5-IO-stringy>=0:devel/p5-IO-stringy	\
+	p5-Locale-libintl>=0:devel/p5-Locale-libintl	\
+	p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar	\
+	p5-MIME-EncWords>=0:mail/p5-MIME-EncWords	\
+	p5-MIME-Tools>=0:mail/p5-MIME-Tools	\
+	p5-Mail-Tools>=0:mail/p5-Mail-Tools	\
+	p5-Msgcat>=0:misc/p5-Locale-Msgcat	\
+	p5-perl-ldap>=0:net/p5-perl-ldap	\
+	p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask	\
+	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL	\
+	p5-Crypt-CipherSaber>=0:security/p5-Crypt-CipherSaber	\
+	p5-HTML-Format>=0:textproc/p5-HTML-Format	\
+	p5-Unicode-LineBreak>=0:textproc/p5-Unicode-LineBreak	\
+	p5-XML-LibXML>=0:textproc/p5-XML-LibXML	\
+	p5-HTML-StripScripts-Parser>=0:www/p5-HTML-StripScripts-Parser	\
+	p5-HTML-Tree>=0:www/p5-HTML-Tree	\
+	p5-Template-Toolkit>=0:www/p5-Template-Toolkit	\
+	p5-MIME-Lite-HTML>=0:mail/p5-MIME-Lite-HTML	\
+	p5-Net-DNS>=0:dns/p5-Net-DNS	\
+	p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail	\
+	p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone	\
+	p5-Email-Simple>=0:mail/p5-Email-Simple	\
+	p5-File-NFSLock>=0:devel/p5-File-NFSLock	\
+	p5-MIME-Charset>=0:mail/p5-MIME-Charset	\
+	p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR	\
+	p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable	\
+	p5-Time-HiRes>=0:devel/p5-Time-HiRes	\
+	p5-Crypt-SMIME>=0:security/p5-Crypt-SMIME	\
+	p5-CGI>=0:www/p5-CGI \
+	p5-Data-Password>=0:security/p5-Data-Password
 
 # Ignore alpha/beta versions
 PORTSCOUT=	limit:^[0-9]+(\.[0-9]+)*$$
@@ -109,22 +109,22 @@ OPTIONS_SET+=	${option}
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-FASTCGI_RUN_DEPENDS=	p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
+FASTCGI_RUN_DEPENDS=	p5-FCGI>=0:www/p5-FCGI
 APACHE_IMPLIES=	FASTCGI
 APACHE_USE=	APACHE_RUN=22+
-APACHE_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
+APACHE_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi
 
-ORACLE_RUN_DEPENDS=	p5-DBD-Oracle>=0:${PORTSDIR}/databases/p5-DBD-Oracle
+ORACLE_RUN_DEPENDS=	p5-DBD-Oracle>=0:databases/p5-DBD-Oracle
 ORACLE_VARS=	DB_TYPE=oracle
 PGSQL_SUB_LIST=	REQ_PGSQL=postgresql
 PGSQL_SUB_LIST_OFF=	REQ_PGSQL=""
-PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 PGSQL_VARS=	DB_TYPE=Pg
-SYBASE_RUN_DEPENDS=	p5-DBD-Sybase>=0:${PORTSDIR}/databases/p5-DBD-Sybase
+SYBASE_RUN_DEPENDS=	p5-DBD-Sybase>=0:databases/p5-DBD-Sybase
 SYBASE_VARS=	DB_TYPE=sybase
 MYSQL_SUB_LIST=	REQ_MYSQL=mysql
 MYSQL_SUB_LIST_OFF=	REQ_MYSQL=""
-MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 MYSQL_VARS=	DB_TYPE=mysql
 
 post-patch:
diff --git a/mail/t-prot/Makefile b/mail/t-prot/Makefile
index 486089e56bf5..3ac5693b7fcd 100644
--- a/mail/t-prot/Makefile
+++ b/mail/t-prot/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.escape.de/~tolot/mutt/t-prot/downloads/ \
 MAINTAINER=	torres.g.alex@gmail.com
 COMMENT=	TOFU Protection - Display Filter for RFC822 messages
 
-RUN_DEPENDS=	p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+RUN_DEPENDS=	p5-Getopt-Long>=0:devel/p5-Getopt-Long \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext
 
 USES=		perl5 shebangfix
 NO_BUILD=	yes
diff --git a/mail/textmail/Makefile b/mail/textmail/Makefile
index eade6a2d8666..43d3af124f45 100644
--- a/mail/textmail/Makefile
+++ b/mail/textmail/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	http://raf.org/textmail/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts e-mail attachments to plain-text
 
-RUN_DEPENDS=	antiword:${PORTSDIR}/textproc/antiword \
-		catdoc:${PORTSDIR}/textproc/catdoc \
-		xls2csv:${PORTSDIR}/textproc/catdoc \
-		lynx:${PORTSDIR}/www/lynx \
-		pdftotext:${PORTSDIR}/graphics/poppler-utils
+RUN_DEPENDS=	antiword:textproc/antiword \
+		catdoc:textproc/catdoc \
+		xls2csv:textproc/catdoc \
+		lynx:www/lynx \
+		pdftotext:graphics/poppler-utils
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${PORTNAME}
diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
index f4935a1a06d2..dd47fa8e5781 100644
--- a/mail/thunderbird-dictionaries/Makefile
+++ b/mail/thunderbird-dictionaries/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	thunderbird
 MAINTAINER=	mjl@luckie.org.nz
 COMMENT=	Dictionaries for Mozilla Thunderbird
 
-RUN_DEPENDS=	thunderbird>=6.0:${PORTSDIR}/mail/thunderbird
+RUN_DEPENDS=	thunderbird>=6.0:mail/thunderbird
 
 USES=		zip:infozip
 NO_BUILD=	yes
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile
index 27c8d5b82f6d..62f78728fbac 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -31,7 +31,7 @@ PLISTF?=	${WRKDIR}/plist_files
 .include <bsd.port.pre.mk>
 
 .ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
+RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:www/xpi-quick-locale-switcher
 .endif
 
 .include "${.CURDIR}/Makefile.lang"
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index fd8eb21dd252..4fcbe508a301 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -12,23 +12,23 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
-BUILD_DEPENDS=	nspr>=4.10.10:${PORTSDIR}/devel/nspr \
-		nss>=3.19.2.3:${PORTSDIR}/security/nss \
-		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
-		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
-		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
-		libvorbis>=1.3.5,3:${PORTSDIR}/audio/libvorbis \
-		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
-		sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
-		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
-		zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
-#		opus>=1.1:${PORTSDIR}/audio/opus \
-
-LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS=	nspr>=4.10.10:devel/nspr \
+		nss>=3.19.2.3:security/nss \
+		libevent2>=2.0.21_2:devel/libevent2 \
+		soundtouch>=1.8.0:audio/soundtouch \
+		harfbuzz>=0.9.34:print/harfbuzz \
+		graphite2>=1.2.4:graphics/graphite2 \
+		libvorbis>=1.3.5,3:audio/libvorbis \
+		libvpx>=1.3.0:multimedia/libvpx \
+		sqlite3>=3.8.9:databases/sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		v4l_compat>0:multimedia/v4l_compat \
+		autoconf-2.13:devel/autoconf213 \
+		zip:archivers/zip \
+		unzip:archivers/unzip
+#		opus>=1.1:audio/opus \
+
+LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 EM_VERSION=	1.9.1
 L_VERSION=	4.0.7.1
@@ -77,7 +77,7 @@ MOZ_OPTIONS:=	${MOZ_OPTIONS:S/${CONFIGURE_TARGET}//}
 .if ${PORT_OPTIONS:MENIGMAIL}
 MASTER_SITES+=	https://www.enigmail.net/download/source/:enigmail
 DISTFILES+=	${EM_DISTFILE}:enigmail
-RUN_DEPENDS+=	gpg2:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+=	gpg2:security/gnupg
 EM_DISTNAME=	enigmail-${EM_VERSION}
 EM_DISTFILE=	${EM_DISTNAME}.tar.gz
 EM_XPI_FILE=	${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}.xpi
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 703625237e57..409ac4c9bccf 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Mail user agent for X with a Tcl/Tk user interface
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lang/tcl84 \
-		libtk84.so:${PORTSDIR}/x11-toolkits/tk84 \
-		libc-client4.so:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	libtcl84.so:lang/tcl84 \
+		libtk84.so:x11-toolkits/tk84 \
+		libc-client4.so:mail/cclient
 
 USE_XORG=	x11 xt
 
diff --git a/mail/tlb/Makefile b/mail/tlb/Makefile
index ee56d6a175e6..624b5ce80850 100644
--- a/mail/tlb/Makefile
+++ b/mail/tlb/Makefile
@@ -12,9 +12,9 @@ MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/tlb/ \
 MAINTAINER=	ports@toco-domains.de
 COMMENT=	The List Batcher, a general purpose mail list delivery engine
 
-RUN_DEPENDS=	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Net>=0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Net>=0:net/p5-Net
 
 NO_BUILD=	yes
 
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index a8f6ef398770..f9eea5af62b0 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -27,7 +27,7 @@ SCRIPTS=	collectaddys def2html printcdb printdbm sendit.sh \
 		vpopmail-vdir.sh wrapfd3.sh
 
 OPTIONS_DEFINE=	CDB DOCS EXAMPLES
-CDB_RUN_DEPENDS=${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
+CDB_RUN_DEPENDS=${PYTHON_SITELIBDIR}/cdbmodule.so:databases/py-cdb
 
 do-build:
 	cd ${WRKSRC} && ${PYTHON_CMD} ./compileall
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index c47ed9d4a7d3..f28dd37915f3 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -39,9 +39,9 @@ GDBMAUTH_CONFIGURE_ENABLE=	auth-gdbm
 PASSWDAUTH_CONFIGURE_ENABLE=	auth-passwd
 MBOXINDICES_CONFIGURE_ENABLE=	mbox-bsd-save-indices
 
-DRAC_BUILD_DEPENDS=		${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+DRAC_BUILD_DEPENDS=		${LOCALBASE}/lib/libdrac.a:mail/drac
 GDBMAUTH_CPPFLAGS=		-I${LOCALBASE}/include
-GDBMAUTH_LIB_DEPENDS=		libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBMAUTH_LIB_DEPENDS=		libgdbm.so:databases/gdbm
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ON=	--enable-auth-mysql \
 			--with-mysql-lib-dir=${LOCALBASE}/lib/mysql \
diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
index 430629971b8e..f7b1b6444164 100644
--- a/mail/trojita/Makefile
+++ b/mail/trojita/Makefile
@@ -29,13 +29,13 @@ INSTALLS_ICONS=	yes
 
 .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
 CONFLICTS_INSTALL=	trojita-[0-9]*
-LIB_DEPENDS+=	libqtkeychain.so:${PORTSDIR}/security/qtkeychain-qt4
+LIB_DEPENDS+=	libqtkeychain.so:security/qtkeychain-qt4
 CMAKE_ARGS+=	-DWITH_QT5:STRING=OFF
 USE_QT4=	linguisttools_build moc_build qmake_build rcc_build uic_build \
 		corelib dbus gui network opengl sql sql-sqlite3 webkit
 .else
 CONFLICTS_INSTALL=	trojita-qt4-[0-9]*
-LIB_DEPENDS+=	libqt5keychain.so:${PORTSDIR}/security/qtkeychain-qt5
+LIB_DEPENDS+=	libqt5keychain.so:security/qtkeychain-qt5
 CMAKE_ARGS+=	-DWITH_QT5:STRING=ON
 USE_QT5=	buildtools_build linguisttools_build qmake_build \
 		core dbus gui network opengl printsupport \
diff --git a/mail/tumgreyspf/Makefile b/mail/tumgreyspf/Makefile
index 5d1aace39c94..f29307f25145 100644
--- a/mail/tumgreyspf/Makefile
+++ b/mail/tumgreyspf/Makefile
@@ -15,7 +15,7 @@ COMMENT=	External policy checker for the postfix mail server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyspf>=0:${PORTSDIR}/mail/py-pyspf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 82b51acf6cf8..de954ae39101 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -34,7 +34,7 @@ SBIN=		in.imapproxyd pimpstat
 
 .if ${PORT_OPTIONS:MDOVECOT}
 SUB_LIST+=	DOVECOT="dovecot"
-RUN_DEPENDS+=	dovecot:${PORTSDIR}/mail/dovecot2
+RUN_DEPENDS+=	dovecot:mail/dovecot2
 .else
 SUB_LIST+=	DOVECOT=""
 .endif
diff --git a/mail/vexim/Makefile b/mail/vexim/Makefile
index d6fd3050dee6..7f21f4c1adef 100644
--- a/mail/vexim/Makefile
+++ b/mail/vexim/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Web interface for managing virtual domains for exim
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
 
 VEXIMDIR=	www/${PORTNAME}
 WRKSRC=		${WRKDIR}/vexim-release
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 33d4cb986bdf..6b9a83999788 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Easy virtual domain and authentication package for use with qmail
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
-RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
+BUILD_DEPENDS=	${LOCALBASE}/bin/tcprules:sysutils/ucspi-tcp
+RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:sysutils/ucspi-tcp
 
 PATCH_STRIP=	-p1
 
@@ -163,14 +163,14 @@ MAILDROP_CONFIGURE_ON=		--enable-maildrop=y \
 				--enable-maildrop-prog=${LOCALBASE}/bin/maildrop
 MAILDROP_CONFIGURE_OFF=		--enable-maildrop=n
 
-MAILDROP_RUN_DEPENDS=		maildrop:${PORTSDIR}/${MAILDROP_PORT}
-MAILDROP_BUILD_DEPENDS=		maildrop:${PORTSDIR}/${MAILDROP_PORT}
+MAILDROP_RUN_DEPENDS=		maildrop:${MAILDROP_PORT}
+MAILDROP_BUILD_DEPENDS=		maildrop:${MAILDROP_PORT}
 
 SPAMASSASSIN_CONFIGURE_ON=	--enable-spamassassin \
 				--enable-spamc-prog=${LOCALBASE}/bin/spamc \
 				--enable-spam-threshold=${SPAM_THRESHOLD}
-SPAMASSASSIN_BUILD_DEPENDS=	spamc:${PORTSDIR}/mail/spamassassin
-SPAMASSASSIN_RUN_DEPENDS=	spamc:${PORTSDIR}/mail/spamassassin
+SPAMASSASSIN_BUILD_DEPENDS=	spamc:mail/spamassassin
+SPAMASSASSIN_RUN_DEPENDS=	spamc:mail/spamassassin
 SPAMFOLDER_CONFIGURE_ON=	--enable-spam-junkfolder
 
 INSTALL_TARGET=	install-strip
diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile
index 090f02d933be..1c00a7ef823a 100644
--- a/mail/vqadmin/Makefile
+++ b/mail/vqadmin/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CGI-based Virtual Qmail Domains Administrator
 
-BUILD_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-RUN_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
+BUILD_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:mail/vpopmail
+RUN_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:mail/vpopmail
 
 GNU_CONFIGURE=	YES
 
diff --git a/mail/vqregister/Makefile b/mail/vqregister/Makefile
index 9492460df035..0ff4ae7352be 100644
--- a/mail/vqregister/Makefile
+++ b/mail/vqregister/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Admin-configurable email user signup CGI
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	vpopmail>0:${PORTSDIR}/mail/vpopmail
-RUN_DEPENDS=	vpopmail>0:${PORTSDIR}/mail/vpopmail
+BUILD_DEPENDS=	vpopmail>0:mail/vpopmail
+RUN_DEPENDS=	vpopmail>0:mail/vpopmail
 
 USE_APACHE_RUN=	22+
 VPOPMAIL_DIR?=	${LOCALBASE}/vpopmail
diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile
index 75f2ffbf706b..6142a8cedbbd 100644
--- a/mail/wanderlust-devel/Makefile
+++ b/mail/wanderlust-devel/Makefile
@@ -32,19 +32,19 @@ MIMEUI_PRODUCT=	semi
 MIMEUI_VERSION=	1.14
 MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
 
-BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
+BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
+RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
 
 .if (${EMACS_NAME} == "emacs") && (${EMACS_MAJOR_VER} >= 22)
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:${PORTSDIR}/mail/x-face-e21
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:mail/x-face-e21
 .endif
 
 EMACS_W3M_PORT_NAME=	emacs-w3m
 EMACS_W3M_LISP_FILE=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
 
 .if exists(${EMACS_W3M_LISP_FILE})
-BUILD_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
-RUN_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
+BUILD_DEPENDS+=	${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
+RUN_DEPENDS+=	${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
 SHIMBUN=	""
 .else
 SHIMBUN=	"@comment "
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index a16723140d1f..af58e144ca88 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -31,16 +31,16 @@ MIMEUI_PRODUCT=	semi
 MIMEUI_VERSION=	1.14
 MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
 
-BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
+BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
+RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
 
 .if (${EMACS_NAME} == "emacs") && (${EMACS_MAJOR_VER} == 23)
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:${PORTSDIR}/mail/x-face-e21
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:mail/x-face-e21
 .endif
 
 .if exists(${EMACS_W3M_LISP_FILE})
-BUILD_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
-RUN_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
+BUILD_DEPENDS+=	${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
+RUN_DEPENDS+=	${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
 SHIMBUN=	""
 .else
 SHIMBUN=	"@comment "
diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index cd0769d2706d..428df77ce485 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -37,12 +37,12 @@ CYRUS_IMAPD_23_DESC=	Cyrus IMAPd version 2.3.x
 CYRUS_IMAPD_24_DESC=	Cyrus IMAPd version 2.4.x
 CYRUS_IMAPD_25_DESC=	Cyrus IMAPd version 2.5.x
 
-CYRUS_IMAPD_25_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:${PORTSDIR}/mail/cyrus-imapd25
-CYRUS_IMAPD_24_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:${PORTSDIR}/mail/cyrus-imapd24
-CYRUS_IMAPD_23_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:${PORTSDIR}/mail/cyrus-imapd23
+CYRUS_IMAPD_25_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd25
+CYRUS_IMAPD_24_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd24
+CYRUS_IMAPD_23_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd23
 
-PERL_RUN_DEPENDS=	p5-IMAP-Admin>=0:${PORTSDIR}/mail/p5-IMAP-Admin \
-			p5-IMAP-Sieve>=0:${PORTSDIR}/mail/p5-IMAP-Sieve
+PERL_RUN_DEPENDS=	p5-IMAP-Admin>=0:mail/p5-IMAP-Admin \
+			p5-IMAP-Sieve>=0:mail/p5-IMAP-Sieve
 
 .include <bsd.port.options.mk>
 
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 97b8f34c6b0a..c89f40d70884 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -27,8 +27,8 @@ PLIST_FILES=	bin/wmbiff \
 		%%DATADIR%%/skins/wmbiff-master-contrast.xpm \
 		%%DATADIR%%/skins/wmbiff-master-led.xpm
 
-GNUTLS_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-			libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+			libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-libgnutls-prefix=${LOCALBASE} \
 			--with-libgcrypt-prefix=${LOCALBASE}
 GNUTLS_CONFIGURE_OFF=	--disable-crypto
diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile
index 449de652e6a7..1c0230e59b61 100644
--- a/mail/x-face-e21/Makefile
+++ b/mail/x-face-e21/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	X-Face utilities for Emacs 21 (and possibly 22)
 
-RUN_DEPENDS=	uncompface:${PORTSDIR}/mail/faces
+RUN_DEPENDS=	uncompface:mail/faces
 
 USE_EMACS=	yes
 
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index b43d6d5290a5..5dfe790058a1 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -19,7 +19,7 @@ PATCH_DIST_STRIP=
 MAINTAINER=	faber@isi.edu
 COMMENT=	Display shaped icons for mail spool contents
 
-LIB_DEPENDS=	libcompface.so:${PORTSDIR}/mail/faces
+LIB_DEPENDS=	libcompface.so:mail/faces
 
 # GNU make properly processes some overridden rules in the makefile that
 # imake generates.  Specifically, installing the html docs.
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 0dfc79d18446..3c1895c12e58 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Mail notification applet for the Xfce panel
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/math/GiNaC/Makefile b/math/GiNaC/Makefile
index d83a63e83c8a..0d13a5880df0 100644
--- a/math/GiNaC/Makefile
+++ b/math/GiNaC/Makefile
@@ -14,7 +14,7 @@ COMMENT=	C++ library for symbolic mathematical calculations
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcln.so:${PORTSDIR}/math/cln
+LIB_DEPENDS=	libcln.so:math/cln
 
 USES=		gmake libtool makeinfo pathfix pkgconfig python:build tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index 8aaf0cb1220e..931e92a7cf0a 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Perl Data Language
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Astro-FITS-Header>=0:${PORTSDIR}/astro/p5-Astro-FITS-Header \
-		p5-Convert-UU>=0:${PORTSDIR}/converters/p5-Convert-UU \
-		p5-File-Map>=0.57:${PORTSDIR}/devel/p5-File-Map \
-		p5-Inline>=0.68:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.62:${PORTSDIR}/devel/p5-Inline-C \
-		p5-Module-Compile>=0.23:${PORTSDIR}/devel/p5-Module-Compile
+BUILD_DEPENDS=	p5-Astro-FITS-Header>=0:astro/p5-Astro-FITS-Header \
+		p5-Convert-UU>=0:converters/p5-Convert-UU \
+		p5-File-Map>=0.57:devel/p5-File-Map \
+		p5-Inline>=0.68:devel/p5-Inline \
+		p5-Inline-C>=0.62:devel/p5-Inline-C \
+		p5-Module-Compile>=0.23:devel/p5-Module-Compile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-Devel-CheckLib>=1.01:${PORTSDIR}/devel/p5-Devel-CheckLib
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS+=	p5-Devel-CheckLib>=1.01:devel/p5-Devel-CheckLib
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 PORTSCOUT=	limit:^[0-9]\.[0-9][0-9]+[0-9\.]*$$
 
@@ -55,22 +55,22 @@ F77_DESC=	Enable PDL::Minuit and PDL::Slatec
 READLINE_DESC=	Use GNU readline
 SINK_DESC=	Include PDL kitchen sink
 
-PGPLOT_BUILD_DEPENDS=	p5-PGPLOT>=0:${PORTSDIR}/graphics/p5-PGPLOT
-PLPLOT_LIB_DEPENDS=	libplplotd.so:${PORTSDIR}/math/plplot
-OPENGL_BUILD_DEPENDS=	p5-OpenGL>=0.65:${PORTSDIR}/graphics/p5-OpenGL
+PGPLOT_BUILD_DEPENDS=	p5-PGPLOT>=0:graphics/p5-PGPLOT
+PLPLOT_LIB_DEPENDS=	libplplotd.so:math/plplot
+OPENGL_BUILD_DEPENDS=	p5-OpenGL>=0.65:graphics/p5-OpenGL
 OPENGL_RUN_DEPENDS:=	${OPENGL_BUILD_DEPENDS}
 OPENGL_USE=		gl=yes
-GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
-F77_BUILD_DEPENDS=	p5-ExtUtils-F77>=0:${PORTSDIR}/lang/p5-ExtUtils-F77
-FFTW_LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw
-GSL_LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
-HDF_LIB_DEPENDS=	libdf.so:${PORTSDIR}/science/hdf
-PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
-READLINE_RUN_DEPENDS=	p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu
-READLINE_RUN_DEPENDS_OFF=	p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl
-SINK_RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm \
-			mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
-			saoimage:${PORTSDIR}/astro/saoimage
+GD_LIB_DEPENDS=		libgd.so:graphics/gd
+F77_BUILD_DEPENDS=	p5-ExtUtils-F77>=0:lang/p5-ExtUtils-F77
+FFTW_LIB_DEPENDS=	libfftw.so:math/fftw
+GSL_LIB_DEPENDS=	libgsl.so:math/gsl
+HDF_LIB_DEPENDS=	libdf.so:science/hdf
+PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
+READLINE_RUN_DEPENDS=	p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu
+READLINE_RUN_DEPENDS_OFF=	p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl
+SINK_RUN_DEPENDS=	ppmtogif:graphics/netpbm \
+			mpeg_encode:multimedia/mpeg_encode \
+			saoimage:astro/saoimage
 
 post-patch:
 	@${GREP} -lR '#!/.*bin/perl' ${WRKSRC}/ | ${XARGS} ${SED} -e 's|#!/.*bin/perl|#!${PERL}|' -i ''
diff --git a/math/R-cran-Amelia/Makefile b/math/R-cran-Amelia/Makefile
index f3514eaa967c..138c776f9a91 100644
--- a/math/R-cran-Amelia/Makefile
+++ b/math/R-cran-Amelia/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Program for Missing Data
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	R-cran-Rcpp>=0.11:${PORTSDIR}/devel/R-cran-Rcpp \
-		R-cran-RcppArmadillo>=0:${PORTSDIR}/math/R-cran-RcppArmadillo
-RUN_DEPENDS=	R-cran-Rcpp>=0.11:${PORTSDIR}/devel/R-cran-Rcpp \
-		R-cran-RcppArmadillo>=0:${PORTSDIR}/math/R-cran-RcppArmadillo
+BUILD_DEPENDS=	R-cran-Rcpp>=0.11:devel/R-cran-Rcpp \
+		R-cran-RcppArmadillo>=0:math/R-cran-RcppArmadillo
+RUN_DEPENDS=	R-cran-Rcpp>=0.11:devel/R-cran-Rcpp \
+		R-cran-RcppArmadillo>=0:math/R-cran-RcppArmadillo
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-ChangeAnomalyDetection/Makefile b/math/R-cran-ChangeAnomalyDetection/Makefile
index 2a4345b664ad..6aacb7467616 100644
--- a/math/R-cran-ChangeAnomalyDetection/Makefile
+++ b/math/R-cran-ChangeAnomalyDetection/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Change Anomaly Detection
 
 LICENSE=	BSD
 
-RUN_DEPENDS=	R-cran-TTR>0:${PORTSDIR}/finance/R-cran-TTR \
-		R-cran-forecast>0:${PORTSDIR}/math/R-cran-forecast
+RUN_DEPENDS=	R-cran-TTR>0:finance/R-cran-TTR \
+		R-cran-forecast>0:math/R-cran-forecast
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-MCMCpack/Makefile b/math/R-cran-MCMCpack/Makefile
index fe7b7f4bc38b..dc33fbf468ae 100644
--- a/math/R-cran-MCMCpack/Makefile
+++ b/math/R-cran-MCMCpack/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Markov chain Monte Carlo Package
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	R-cran-coda>0.11.3:${PORTSDIR}/math/R-cran-coda
+RUN_DEPENDS=	R-cran-coda>0.11.3:math/R-cran-coda
 
 # Actually required 4.0 or later.
 USE_GCC=	any
diff --git a/math/R-cran-NMF/Makefile b/math/R-cran-NMF/Makefile
index 8e50e759593e..a3dd6b76c485 100644
--- a/math/R-cran-NMF/Makefile
+++ b/math/R-cran-NMF/Makefile
@@ -12,18 +12,18 @@ COMMENT=	Algorithms and Framework for Nonnegative Matrix Factorization
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-pkgmaker>=0.20:${PORTSDIR}/devel/R-cran-pkgmaker \
-		R-cran-registry>0:${PORTSDIR}/devel/R-cran-registry \
-		R-cran-rngtools>=1.2.3:${PORTSDIR}/devel/R-cran-rngtools \
-		R-cran-stringr>=1.0.0:${PORTSDIR}/textproc/R-cran-stringr \
-		R-cran-digest>0:${PORTSDIR}/security/R-cran-digest \
-		R-cran-gridBase>0:${PORTSDIR}/graphics/R-cran-gridBase \
-		R-cran-colorspace>0:${PORTSDIR}/graphics/R-cran-colorspace \
-		R-cran-RColorBrewer>0:${PORTSDIR}/graphics/R-cran-RColorBrewer \
-		R-cran-foreach>0:${PORTSDIR}/devel/R-cran-foreach \
-		R-cran-doParallel>0:${PORTSDIR}/devel/R-cran-doParallel \
-		R-cran-ggplot2>0:${PORTSDIR}/graphics/R-cran-ggplot2 \
-		R-cran-reshape2>0:${PORTSDIR}/devel/R-cran-reshape2
+RUN_DEPENDS=	R-cran-pkgmaker>=0.20:devel/R-cran-pkgmaker \
+		R-cran-registry>0:devel/R-cran-registry \
+		R-cran-rngtools>=1.2.3:devel/R-cran-rngtools \
+		R-cran-stringr>=1.0.0:textproc/R-cran-stringr \
+		R-cran-digest>0:security/R-cran-digest \
+		R-cran-gridBase>0:graphics/R-cran-gridBase \
+		R-cran-colorspace>0:graphics/R-cran-colorspace \
+		R-cran-RColorBrewer>0:graphics/R-cran-RColorBrewer \
+		R-cran-foreach>0:devel/R-cran-foreach \
+		R-cran-doParallel>0:devel/R-cran-doParallel \
+		R-cran-ggplot2>0:graphics/R-cran-ggplot2 \
+		R-cran-reshape2>0:devel/R-cran-reshape2
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-RcppArmadillo/Makefile b/math/R-cran-RcppArmadillo/Makefile
index f570bd3c9829..806e1ed62bdc 100644
--- a/math/R-cran-RcppArmadillo/Makefile
+++ b/math/R-cran-RcppArmadillo/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Rcpp integration for Armadillo templated linear algebra library
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-RcppEigen/Makefile b/math/R-cran-RcppEigen/Makefile
index 6ab1587eef47..e08e197aea9f 100644
--- a/math/R-cran-RcppEigen/Makefile
+++ b/math/R-cran-RcppEigen/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Rcpp integration for the Eigen templated linear algebra library
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-Zelig/Makefile b/math/R-cran-Zelig/Makefile
index 7e56613781af..eebcebf1754c 100644
--- a/math/R-cran-Zelig/Makefile
+++ b/math/R-cran-Zelig/Makefile
@@ -12,32 +12,32 @@ COMMENT=	Everyone's Statistical Software
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	R-cran-AER>=0:${PORTSDIR}/finance/R-cran-AER \
-		R-cran-Amelia>=0:${PORTSDIR}/math/R-cran-Amelia \
-		R-cran-sandwich>=0:${PORTSDIR}/math/R-cran-sandwich \
-		R-cran-VGAM>=0:${PORTSDIR}/math/R-cran-VGAM \
-		R-cran-plyr>=0:${PORTSDIR}/devel/R-cran-plyr \
-		R-cran-quantreg>=0:${PORTSDIR}/math/R-cran-quantreg \
-		R-cran-MCMCpack>=0:${PORTSDIR}/math/R-cran-MCMCpack \
-		R-cran-maxLik>=0:${PORTSDIR}/math/R-cran-maxLik \
-		R-cran-jsonlite>=0:${PORTSDIR}/converters/R-cran-jsonlite \
-		R-cran-dplyr>=0:${PORTSDIR}/math/R-cran-dplyr \
-		R-cran-MatchIt>=0:${PORTSDIR}/math/R-cran-MatchIt \
-		R-cran-geepack>=0:${PORTSDIR}/math/R-cran-geepack \
-		R-cran-survey>=0:${PORTSDIR}/math/R-cran-survey
-RUN_DEPENDS=	R-cran-AER>=0:${PORTSDIR}/finance/R-cran-AER \
-		R-cran-Amelia>=0:${PORTSDIR}/math/R-cran-Amelia \
-		R-cran-sandwich>=0:${PORTSDIR}/math/R-cran-sandwich \
-		R-cran-VGAM>=0:${PORTSDIR}/math/R-cran-VGAM \
-		R-cran-plyr>=0:${PORTSDIR}/devel/R-cran-plyr \
-		R-cran-quantreg>=0:${PORTSDIR}/math/R-cran-quantreg \
-		R-cran-MCMCpack>=0:${PORTSDIR}/math/R-cran-MCMCpack \
-		R-cran-maxLik>=0:${PORTSDIR}/math/R-cran-maxLik \
-		R-cran-jsonlite>=0:${PORTSDIR}/converters/R-cran-jsonlite \
-		R-cran-dplyr>=0:${PORTSDIR}/math/R-cran-dplyr \
-		R-cran-MatchIt>=0:${PORTSDIR}/math/R-cran-MatchIt \
-		R-cran-geepack>=0:${PORTSDIR}/math/R-cran-geepack \
-		R-cran-survey>=0:${PORTSDIR}/math/R-cran-survey
+BUILD_DEPENDS=	R-cran-AER>=0:finance/R-cran-AER \
+		R-cran-Amelia>=0:math/R-cran-Amelia \
+		R-cran-sandwich>=0:math/R-cran-sandwich \
+		R-cran-VGAM>=0:math/R-cran-VGAM \
+		R-cran-plyr>=0:devel/R-cran-plyr \
+		R-cran-quantreg>=0:math/R-cran-quantreg \
+		R-cran-MCMCpack>=0:math/R-cran-MCMCpack \
+		R-cran-maxLik>=0:math/R-cran-maxLik \
+		R-cran-jsonlite>=0:converters/R-cran-jsonlite \
+		R-cran-dplyr>=0:math/R-cran-dplyr \
+		R-cran-MatchIt>=0:math/R-cran-MatchIt \
+		R-cran-geepack>=0:math/R-cran-geepack \
+		R-cran-survey>=0:math/R-cran-survey
+RUN_DEPENDS=	R-cran-AER>=0:finance/R-cran-AER \
+		R-cran-Amelia>=0:math/R-cran-Amelia \
+		R-cran-sandwich>=0:math/R-cran-sandwich \
+		R-cran-VGAM>=0:math/R-cran-VGAM \
+		R-cran-plyr>=0:devel/R-cran-plyr \
+		R-cran-quantreg>=0:math/R-cran-quantreg \
+		R-cran-MCMCpack>=0:math/R-cran-MCMCpack \
+		R-cran-maxLik>=0:math/R-cran-maxLik \
+		R-cran-jsonlite>=0:converters/R-cran-jsonlite \
+		R-cran-dplyr>=0:math/R-cran-dplyr \
+		R-cran-MatchIt>=0:math/R-cran-MatchIt \
+		R-cran-geepack>=0:math/R-cran-geepack \
+		R-cran-survey>=0:math/R-cran-survey
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-car/Makefile b/math/R-cran-car/Makefile
index 66745a67f032..55c471d1600f 100644
--- a/math/R-cran-car/Makefile
+++ b/math/R-cran-car/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Companion to Applied Regression for R
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-pbkrtest>=0.3.2:${PORTSDIR}/math/R-cran-pbkrtest \
-		R-cran-quantreg>0:${PORTSDIR}/math/R-cran-quantreg
-TEST_DEPENDS=	R-cran-lmtest>=0.9.26:${PORTSDIR}/finance/R-cran-lmtest \
-		R-cran-sandwich>0:${PORTSDIR}/math/R-cran-sandwich
+RUN_DEPENDS=	R-cran-pbkrtest>=0.3.2:math/R-cran-pbkrtest \
+		R-cran-quantreg>0:math/R-cran-quantreg
+TEST_DEPENDS=	R-cran-lmtest>=0.9.26:finance/R-cran-lmtest \
+		R-cran-sandwich>0:math/R-cran-sandwich
 
 USES=	cran
 
diff --git a/math/R-cran-dplyr/Makefile b/math/R-cran-dplyr/Makefile
index a98a974c755c..175805f07a15 100644
--- a/math/R-cran-dplyr/Makefile
+++ b/math/R-cran-dplyr/Makefile
@@ -11,20 +11,20 @@ COMMENT=	Grammar of Data Manipulation
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	R-cran-Rcpp>=0.11:${PORTSDIR}/devel/R-cran-Rcpp \
-		R-cran-BH>=1.58.0.1:${PORTSDIR}/devel/R-cran-BH \
-		R-cran-R6>=0:${PORTSDIR}/devel/R-cran-R6 \
-		R-cran-DBI>=0.3:${PORTSDIR}/databases/R-cran-DBI \
-		R-cran-magrittr>=0:${PORTSDIR}/devel/R-cran-magrittr \
-		R-cran-lazyeval>=0.1.10:${PORTSDIR}/math/R-cran-lazyeval \
-		R-cran-assertthat>=0:${PORTSDIR}/math/R-cran-assertthat
-RUN_DEPENDS=	R-cran-Rcpp>=0.11:${PORTSDIR}/devel/R-cran-Rcpp \
-		R-cran-BH>=1.58.0.1:${PORTSDIR}/devel/R-cran-BH \
-		R-cran-R6>=0:${PORTSDIR}/devel/R-cran-R6 \
-		R-cran-DBI>=0.3:${PORTSDIR}/databases/R-cran-DBI \
-		R-cran-magrittr>=0:${PORTSDIR}/devel/R-cran-magrittr \
-		R-cran-lazyeval>=0.1.10:${PORTSDIR}/math/R-cran-lazyeval \
-		R-cran-assertthat>=0:${PORTSDIR}/math/R-cran-assertthat
+BUILD_DEPENDS=	R-cran-Rcpp>=0.11:devel/R-cran-Rcpp \
+		R-cran-BH>=1.58.0.1:devel/R-cran-BH \
+		R-cran-R6>=0:devel/R-cran-R6 \
+		R-cran-DBI>=0.3:databases/R-cran-DBI \
+		R-cran-magrittr>=0:devel/R-cran-magrittr \
+		R-cran-lazyeval>=0.1.10:math/R-cran-lazyeval \
+		R-cran-assertthat>=0:math/R-cran-assertthat
+RUN_DEPENDS=	R-cran-Rcpp>=0.11:devel/R-cran-Rcpp \
+		R-cran-BH>=1.58.0.1:devel/R-cran-BH \
+		R-cran-R6>=0:devel/R-cran-R6 \
+		R-cran-DBI>=0.3:databases/R-cran-DBI \
+		R-cran-magrittr>=0:devel/R-cran-magrittr \
+		R-cran-lazyeval>=0.1.10:math/R-cran-lazyeval \
+		R-cran-assertthat>=0:math/R-cran-assertthat
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-forecast/Makefile b/math/R-cran-forecast/Makefile
index 066fddce7cfb..4a397ba8b585 100644
--- a/math/R-cran-forecast/Makefile
+++ b/math/R-cran-forecast/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Forecasting functions for time series and linear models
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-zoo>0:${PORTSDIR}/math/R-cran-zoo \
-		R-cran-timeDate>0:${PORTSDIR}/finance/R-cran-timeDate \
-		R-cran-tseries>0:${PORTSDIR}/finance/R-cran-tseries \
-		R-cran-fracdiff>0:${PORTSDIR}/math/R-cran-fracdiff \
-		R-cran-Rcpp>=0.11.0:${PORTSDIR}/devel/R-cran-Rcpp \
-		R-cran-colorspace>0:${PORTSDIR}/graphics/R-cran-colorspace \
-		R-cran-RcppArmadillo>=0.2.35:${PORTSDIR}/math/R-cran-RcppArmadillo
+RUN_DEPENDS=	R-cran-zoo>0:math/R-cran-zoo \
+		R-cran-timeDate>0:finance/R-cran-timeDate \
+		R-cran-tseries>0:finance/R-cran-tseries \
+		R-cran-fracdiff>0:math/R-cran-fracdiff \
+		R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp \
+		R-cran-colorspace>0:graphics/R-cran-colorspace \
+		R-cran-RcppArmadillo>=0.2.35:math/R-cran-RcppArmadillo
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-igraph/Makefile b/math/R-cran-igraph/Makefile
index 87dd026d768d..ca3e6b9bd55f 100644
--- a/math/R-cran-igraph/Makefile
+++ b/math/R-cran-igraph/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Network Analysis and Visualization
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
-RUN_DEPENDS=	R-cran-magrittr>0:${PORTSDIR}/devel/R-cran-magrittr \
-		R-cran-NMF>0:${PORTSDIR}/math/R-cran-NMF \
-		R-cran-irlba>0:${PORTSDIR}/math/R-cran-irlba
+LIB_DEPENDS=	libgmp.so:math/gmp
+RUN_DEPENDS=	R-cran-magrittr>0:devel/R-cran-magrittr \
+		R-cran-NMF>0:math/R-cran-NMF \
+		R-cran-irlba>0:math/R-cran-irlba
 
 USES=	cran:auto-plist
 USE_GNOME=	libxml2
diff --git a/math/R-cran-lme4/Makefile b/math/R-cran-lme4/Makefile
index 3aad82af586d..a7c382cc4e80 100644
--- a/math/R-cran-lme4/Makefile
+++ b/math/R-cran-lme4/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Linear mixed-effects models using Eigen and S4
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-Rcpp>=0.10.5:${PORTSDIR}/devel/R-cran-Rcpp \
-		R-cran-minqa>=1.1.15:${PORTSDIR}/math/R-cran-minqa \
-		R-cran-nloptr>=1.0.4:${PORTSDIR}/math/R-cran-nloptr \
-		R-cran-RcppEigen>0:${PORTSDIR}/math/R-cran-RcppEigen
+RUN_DEPENDS=	R-cran-Rcpp>=0.10.5:devel/R-cran-Rcpp \
+		R-cran-minqa>=1.1.15:math/R-cran-minqa \
+		R-cran-nloptr>=1.0.4:math/R-cran-nloptr \
+		R-cran-RcppEigen>0:math/R-cran-RcppEigen
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-maxLik/Makefile b/math/R-cran-maxLik/Makefile
index 50dd64c1100f..13193b6b2352 100644
--- a/math/R-cran-maxLik/Makefile
+++ b/math/R-cran-maxLik/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Maximum Likelihood Estimation and Related Tools
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	R-cran-miscTools>=0.6.8:${PORTSDIR}/math/R-cran-miscTools \
-		R-cran-sandwich>=0:${PORTSDIR}/math/R-cran-sandwich
-RUN_DEPENDS=	R-cran-miscTools>=0.6.8:${PORTSDIR}/math/R-cran-miscTools \
-		R-cran-sandwich>=0:${PORTSDIR}/math/R-cran-sandwich
+BUILD_DEPENDS=	R-cran-miscTools>=0.6.8:math/R-cran-miscTools \
+		R-cran-sandwich>=0:math/R-cran-sandwich
+RUN_DEPENDS=	R-cran-miscTools>=0.6.8:math/R-cran-miscTools \
+		R-cran-sandwich>=0:math/R-cran-sandwich
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-minqa/Makefile b/math/R-cran-minqa/Makefile
index 0b6a7bf5fcf0..eb4112be0efd 100644
--- a/math/R-cran-minqa/Makefile
+++ b/math/R-cran-minqa/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Derivative-free optimization algorithms by quadratic approximation
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-Rcpp>=0.9.10:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-Rcpp>=0.9.10:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-nloptr/Makefile b/math/R-cran-nloptr/Makefile
index 597f1fd8eb13..2cadcd93c681 100644
--- a/math/R-cran-nloptr/Makefile
+++ b/math/R-cran-nloptr/Makefile
@@ -11,7 +11,7 @@ COMMENT=	R interface to NLopt
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libnlopt.so:${PORTSDIR}/math/nlopt
+LIB_DEPENDS=	libnlopt.so:math/nlopt
 
 USES=	cran:auto-plist pkgconfig
 
diff --git a/math/R-cran-pbkrtest/Makefile b/math/R-cran-pbkrtest/Makefile
index 19ec46ab39c4..7e75b8f9261c 100644
--- a/math/R-cran-pbkrtest/Makefile
+++ b/math/R-cran-pbkrtest/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Parametric bootstrap and Kenward-Roger-based methods for mixed model co
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-lme4>=1.1.10:${PORTSDIR}/math/R-cran-lme4
+RUN_DEPENDS=	R-cran-lme4>=1.1.10:math/R-cran-lme4
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-quantreg/Makefile b/math/R-cran-quantreg/Makefile
index 355ebb89f529..0987cdb179d4 100644
--- a/math/R-cran-quantreg/Makefile
+++ b/math/R-cran-quantreg/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Quantile Regression
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-SparseM>0:${PORTSDIR}/math/R-cran-SparseM \
-		R-cran-MatrixModels>0:${PORTSDIR}/math/R-cran-MatrixModels
+RUN_DEPENDS=	R-cran-SparseM>0:math/R-cran-SparseM \
+		R-cran-MatrixModels>0:math/R-cran-MatrixModels
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-sandwich/Makefile b/math/R-cran-sandwich/Makefile
index 3f4ac8a2dbeb..ac343af63e0c 100644
--- a/math/R-cran-sandwich/Makefile
+++ b/math/R-cran-sandwich/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Robust Covariance Matrix Estimators
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-zoo>0:${PORTSDIR}/math/R-cran-zoo
+RUN_DEPENDS=	R-cran-zoo>0:math/R-cran-zoo
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-spdep/Makefile b/math/R-cran-spdep/Makefile
index b5a8cd30ca84..5f036d3563e4 100644
--- a/math/R-cran-spdep/Makefile
+++ b/math/R-cran-spdep/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Spatial dependence: weighting schemes, statistics, and models
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-sp>=1.0:${PORTSDIR}/math/R-cran-sp \
-		R-cran-LearnBayes>0:${PORTSDIR}/math/R-cran-LearnBayes \
-		R-cran-deldir>0:${PORTSDIR}/math/R-cran-deldir \
-		R-cran-coda>0:${PORTSDIR}/math/R-cran-coda
+RUN_DEPENDS=	R-cran-sp>=1.0:math/R-cran-sp \
+		R-cran-LearnBayes>0:math/R-cran-LearnBayes \
+		R-cran-deldir>0:math/R-cran-deldir \
+		R-cran-coda>0:math/R-cran-coda
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-sspir/Makefile b/math/R-cran-sspir/Makefile
index a95d1701e133..d7cf9edfc8d8 100644
--- a/math/R-cran-sspir/Makefile
+++ b/math/R-cran-sspir/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	glm-like formula to define dynamic generalized linear models
 
-RUN_DEPENDS=	R-cran-mvtnorm>=0.9.96_11:${PORTSDIR}/math/R-cran-mvtnorm \
-		R-cran-KFAS>=0.9.11_3:${PORTSDIR}/math/R-cran-KFAS
+RUN_DEPENDS=	R-cran-mvtnorm>=0.9.96_11:math/R-cran-mvtnorm \
+		R-cran-KFAS>=0.9.11_3:math/R-cran-KFAS
 
 USES=	cran:auto-plist
 
diff --git a/math/R-cran-xts/Makefile b/math/R-cran-xts/Makefile
index ec8ec86cd11a..629c5e77ae3e 100644
--- a/math/R-cran-xts/Makefile
+++ b/math/R-cran-xts/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extensible Time Series
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-zoo>=1.7.10:${PORTSDIR}/math/R-cran-zoo
+RUN_DEPENDS=	R-cran-zoo>=1.7.10:math/R-cran-zoo
 
 USES=	cran:auto-plist
 
diff --git a/math/R/Makefile b/math/R/Makefile
index b3fb12046aac..1d5cdcb07477 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -27,8 +27,8 @@ COMMENT?=	Language for statistical computing and graphics
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=		${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed \
-			texi2dvi:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS=		${LOCALBASE}/bin/gsed:textproc/gsed \
+			texi2dvi:print/texinfo
 
 CONFIGURE_ENV=		LIBR_LDFLAGS="${LDFLAGS}" OBJC="${CC}" \
 			SED="${LOCALBASE}/bin/gsed" \
@@ -65,7 +65,7 @@ PCRE_PORT_DESC=		Use devel/pcre instead of the bundled PCRE
 
 OPTIONS_DEFAULT+=	ICU PCRE_PORT THREADS
 .if !defined(LIBR_SLAVEPORT)
-RUN_DEPENDS+=		${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
+RUN_DEPENDS+=		${LOCALBASE}/bin/gsed:textproc/gsed
 USE_LDCONFIG=		${PREFIX}/lib/R/lib
 #now only used to build the R.1 manpage:
 USES+=			perl5
@@ -132,7 +132,7 @@ LDFLAGS+=	-fno-builtin-${_f}
 .for _f in acos asin atan cos cosh exp log pow sin sinh tan tanh
 CONFIGURE_ENV+=		ac_cv_have_decl_c${_f}=yes
 .endfor
-LIB_DEPENDS+=		libmissing.so:${PORTSDIR}/math/libmissing
+LIB_DEPENDS+=		libmissing.so:math/libmissing
 LIBM=			-L${LOCALBASE}/lib -lmissing -lm
 LIBMH=			"missing_math.h"
 .if defined(LIBRMATH_SLAVEPORT)
@@ -145,7 +145,7 @@ LIBMH=			<quadmath.h>
 
 .if !defined(LIBRMATH_SLAVEPORT)
 .if ${PORT_OPTIONS:MATLAS}
-LIB_DEPENDS+=		libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=		libatlas.so:math/atlas
 BLAS?=			${LIBM} -lf77blas
 LAPACK?=		${LIBM} -lalapack -lcblas
 .else
@@ -160,7 +160,7 @@ PLIST_SUB+=		LAPACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MICU}
-LIB_DEPENDS+=		libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=		libicui18n.so:devel/icu
 CONFIGURE_ARGS+=	--with-ICU
 .else
 CONFIGURE_ARGS+=	--without-ICU
@@ -175,7 +175,7 @@ PLIST_SUB+=		NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPCRE_PORT}
-LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:devel/pcre
 CONFIGURE_ARGS+=	--with-system-pcre
 .else
 CONFIGURE_ARGS+=	--without-system-pcre
@@ -226,7 +226,7 @@ PLIST_SUB+=		PANGOCAIRO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=		libpng.so:graphics/png
 CONFIGURE_ARGS+=	--with-libpng
 .else
 CONFIGURE_ARGS+=	--without-libpng
@@ -244,7 +244,7 @@ PLIST_SUB+=		TCLTK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=		libtiff.so:graphics/tiff
 CONFIGURE_ARGS+=	--with-libtiff
 .else
 CONFIGURE_ARGS+=	--without-libtiff
@@ -268,7 +268,7 @@ INFO=		R-FAQ R-admin R-data R-exts R-intro R-lang
 
 .if ${PORT_OPTIONS:MPDF_MANUALS} && ${PORT_OPTIONS:MDOCS}
 USE_TEX=		texlive dvipsk kpathsea pdftex
-#BUILD_DEPENDS +=	texi2dvi:${PORTSDIR}/print/texinfo
+#BUILD_DEPENDS +=	texi2dvi:print/texinfo
 ALL_TARGET+=		pdf
 CONFIGURE_ENV +=	INSTALL_INFO="${LOCALBASE}/bin/install-info" \
 			MAKEINFO="${LOCALBASE}/bin/makeinfo"
diff --git a/math/abacus/Makefile b/math/abacus/Makefile
index d0a9b617dee1..f2cc25fd105a 100644
--- a/math/abacus/Makefile
+++ b/math/abacus/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Branch-And-CUt System
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libClp.so:${PORTSDIR}/math/coinmp
+LIB_DEPENDS=	libClp.so:math/coinmp
 
 NO_WRKSUBDIR=	yes
 
diff --git a/math/abakus/Makefile b/math/abakus/Makefile
index eb017ad789c4..ffa8224d5989 100644
--- a/math/abakus/Makefile
+++ b/math/abakus/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple KDE Calculator
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
+LIB_DEPENDS=	libmpfr.so:math/mpfr
 
 USE_KDE4=	automoc4 kdelibs kdeprefix
 USE_QT4=	moc_build qmake_build rcc_build uic_build
diff --git a/math/algotutor/Makefile b/math/algotutor/Makefile
index fe5bea071777..fe744117b69d 100644
--- a/math/algotutor/Makefile
+++ b/math/algotutor/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.cyut.edu.tw/~ckhung/dl/
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Interactive tutorial for algorithms and data structures
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	build
diff --git a/math/alt-ergo-spark/Makefile b/math/alt-ergo-spark/Makefile
index 867e07b745fe..13ea4f5b02ab 100644
--- a/math/alt-ergo-spark/Makefile
+++ b/math/alt-ergo-spark/Makefile
@@ -15,9 +15,9 @@ LICENSE_NAME=	Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre] C license, version 1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	ocaml-zarith>1.2:${PORTSDIR}/math/ocaml-zarith \
-		ocaml-ocamlgraph>1.8:${PORTSDIR}/math/ocaml-ocamlgraph
-RUN_DEPENDS=	ocaml-ocamlgraph>1.8:${PORTSDIR}/math/ocaml-ocamlgraph
+BUILD_DEPENDS=	ocaml-zarith>1.2:math/ocaml-zarith \
+		ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph
+RUN_DEPENDS=	ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/math/alt-ergo/Makefile b/math/alt-ergo/Makefile
index c63dbec97df6..42d1afc88cc6 100644
--- a/math/alt-ergo/Makefile
+++ b/math/alt-ergo/Makefile
@@ -15,9 +15,9 @@ LICENSE_NAME=	Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre] C license, version 1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	ocaml-zarith>1.2:${PORTSDIR}/math/ocaml-zarith \
-		ocaml-ocamlgraph>1.8:${PORTSDIR}/math/ocaml-ocamlgraph
-RUN_DEPENDS=	ocaml-ocamlgraph>1.8:${PORTSDIR}/math/ocaml-ocamlgraph
+BUILD_DEPENDS=	ocaml-zarith>1.2:math/ocaml-zarith \
+		ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph
+RUN_DEPENDS=	ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph
 
 GNU_CONFIGURE=	yes
 USES=		gmake
@@ -32,8 +32,8 @@ OPTIONS_SUB=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI}
-BUILD_DEPENDS +=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-RUN_DEPENDS+=		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS +=	lablgtk2:x11-toolkits/ocaml-lablgtk2
+RUN_DEPENDS+=		lablgtk2:x11-toolkits/ocaml-lablgtk2
 ALL_TARGET+=		gui
 INSTALL_TARGET+=	install-gui
 .endif
diff --git a/math/apc/Makefile b/math/apc/Makefile
index fe0005840825..881251772a25 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Xforms based Auto Payment Calculator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libforms.so:x11-toolkits/xforms
 
 USE_XORG=	x11 xpm
 PLIST_FILES=	bin/apc man/man1/apc.1.gz
diff --git a/math/armadillo/Makefile b/math/armadillo/Makefile
index d1778ef03b02..93fb8206d99b 100644
--- a/math/armadillo/Makefile
+++ b/math/armadillo/Makefile
@@ -10,10 +10,10 @@ COMMENT=	C++ linear algebra library
 
 LICENSE=	MPL
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libarpack.so:${PORTSDIR}/math/arpack \
-		libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libsuperlu.so:${PORTSDIR}/math/superlu
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
+		libarpack.so:math/arpack \
+		libhdf5.so:science/hdf5 \
+		libsuperlu.so:math/superlu
 
 USES=		cmake blaslapack
 USE_LDCONFIG=	yes
diff --git a/math/arpack++/Makefile b/math/arpack++/Makefile
index d8a81047e3b4..f5dac228ba1c 100644
--- a/math/arpack++/Makefile
+++ b/math/arpack++/Makefile
@@ -17,20 +17,20 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	ARPACK++ is an object-oriented version of the ARPACK package
 
-LIB_DEPENDS=	libarpack.so:${PORTSDIR}/math/arpack \
-		libsuperlu.so:${PORTSDIR}/math/superlu \
-		libumfpack.so:${PORTSDIR}/math/suitesparse
+LIB_DEPENDS=	libarpack.so:math/arpack \
+		libsuperlu.so:math/superlu \
+		libumfpack.so:math/suitesparse
 
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
 .endif
 .if defined(WITH_ATLAS)
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lf77blas
 LAPACK=		-lalapack -lcblas
 .else
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	liblapack.so:math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
diff --git a/math/arpack-ng/Makefile b/math/arpack-ng/Makefile
index ef3070da8c9f..d1960efb0d07 100644
--- a/math/arpack-ng/Makefile
+++ b/math/arpack-ng/Makefile
@@ -31,7 +31,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 OPTIONS_DEFINE=	DOCS MPI
 OPTIONS_SUB=	yes
 MPI_CONFIGURE_ENABLE=	mpi
-MPI_LIB_DEPENDS=	libmpich.so.8:${PORTSDIR}/net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so.8:net/mpich2
 MPI_CONFLICTS_INSTALL+=		arpack-ng-3.*
 MPI_CONFLICTS_INSTALL_OFF+=	arpack-ng-mpich-3.*
 
@@ -46,16 +46,16 @@ WITH_BLAS?=	blas
 .if ${WITH_BLAS} == "gotoblas"
 BLAS=		-lgoto2p
 LAPACK=		-lgoto2p
-LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
+LIB_DEPENDS+=	libgoto2p.so:math/gotoblas
 .elif ${WITH_BLAS} == "atlas"
 BLAS=		-lptf77blas
 LAPACK=		-lalapack -lptcblas
-LIB_DEPENDS+=	libptf77blas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libptf77blas.so:math/atlas
 .elif ${WITH_BLAS} == "blas"
 BLAS=		-lblas
 LAPACK=		-llapack
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
-		liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas \
+		liblapack.so:math/lapack
 .else
 IGNORE=		unknown value of WITH_BLAS: ${WITH_BLAS}
 .endif
diff --git a/math/arpack/Makefile b/math/arpack/Makefile
index db4df42243ee..f36b5ed77327 100644
--- a/math/arpack/Makefile
+++ b/math/arpack/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	${PORTNAME}${PORTVERSION}.tar.gz
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Argand Library: large eigenvalue subroutines (serial version)
 
-BUILD_DEPENDS=	tradcpp:${PORTSDIR}/devel/tradcpp
+BUILD_DEPENDS=	tradcpp:devel/tradcpp
 
 CONFLICTS=	arpack-ng-[0-9]*
 CPP=		tradcpp
@@ -82,10 +82,10 @@ WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == atlas
-LIB_DEPENDS+=		libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=		libatlas.so:math/atlas
 BLAS?=			-lf77blas
 .else
-LIB_DEPENDS+=		libblas.so:${PORTSDIR}/math/blas
+LIB_DEPENDS+=		libblas.so:math/blas
 BLAS?=			-lblas
 .endif
 
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index ca9f982c846b..367e3989039c 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -18,7 +18,7 @@ LICENSE_NAME=	Risa/Asir Limited Use License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpari.so:${PORTSDIR}/math/pari
+LIB_DEPENDS=	libpari.so:math/pari
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		autoreconf readline tar:bz2
diff --git a/math/aspcud/Makefile b/math/aspcud/Makefile
index b78acdee75c8..e0f600760ec0 100644
--- a/math/aspcud/Makefile
+++ b/math/aspcud/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Advanced solver for package dependencies
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	re2c:${PORTSDIR}/devel/re2c
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	gringo:${PORTSDIR}/math/gringo \
-		clasp:${PORTSDIR}/math/clasp \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	re2c:devel/re2c
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
+RUN_DEPENDS=	gringo:math/gringo \
+		clasp:math/clasp \
+		bash:shells/bash
 
 USES=	compiler:c++11-lang cmake:outsource python:run
 
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index b81b3a5b67ac..598108c3e142 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Powerful script-based vector graphics language
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgc-threaded.so:${PORTSDIR}/devel/boehm-gc-threaded \
-		libsigsegv.so:${PORTSDIR}/devel/libsigsegv
-RUN_DEPENDS=	animate:${PORTSDIR}/graphics/ImageMagick \
-		gv:${PORTSDIR}/print/gv \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
+		libsigsegv.so:devel/libsigsegv
+RUN_DEPENDS=	animate:graphics/ImageMagick \
+		gv:print/gv \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 ALL_TARGET=	asy asy-keywords.el
 
@@ -42,22 +42,22 @@ USE_TEX=	dvipsk formats
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 # Options
-DOCS_BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo
+DOCS_BUILD_DEPENDS=	texi2dvi:print/texinfo
 DOCS_CONFIGURE_WITH=	docdir=${DOCSDIR}
 
 FFTW_CONFIGURE_ENABLE=	fftw
 FFTW_DESC=	Use FFTW to compute the Discrete Fourier Transform
-FFTW_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 GSL_CONFIGURE_ENABLE=	gsl
 GSL_DESC=	Enable GNU Scientific library
-GSL_LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
-MANPAGES_BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo
+MANPAGES_BUILD_DEPENDS=	texi2dvi:print/texinfo
 
 OFFSCREEN_CONFIGURE_ENABLE=	offscreen
 OFFSCREEN_DESC=	Enable offscreen rendering using OSMesa library
-OFFSCREEN_LIB_DEPENDS=	libOSMesa.so:${PORTSDIR}/graphics/libosmesa
+OFFSCREEN_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 OPTIONS_DEFAULT=	FFTW GSL MANPAGES READLINE
 OPTIONS_DEFINE=	DOCS EXAMPLES FFTW GSL MANPAGES OFFSCREEN READLINE
 
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index fd58671a95f8..fe45306955a1 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Automatically Tuned Linear Algebra Software (ATLAS)
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/math/lapack:checksum
+BUILD_DEPENDS=	${NONEXISTENT}:math/lapack:checksum
 
 USES=		fortran tar:bzip2
 USE_GCC=	yes
@@ -51,7 +51,7 @@ POINTER?=	32
 .endif
 
 .if defined(MAINTAINER_MODE)
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	libblas.so:math/blas
 .endif
 
 .if ${PORT_OPTIONS:MDATA}
diff --git a/math/bargraph/Makefile b/math/bargraph/Makefile
index 3d346c43ae4f..1988dc2f8c5a 100644
--- a/math/bargraph/Makefile
+++ b/math/bargraph/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Scriptable bar graph generator
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/fig2dev:${PORTSDIR}/print/transfig \
-		${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS=	${LOCALBASE}/bin/fig2dev:print/transfig \
+		${LOCALBASE}/bin/gnuplot:math/gnuplot
 
 USES=		perl5 shebangfix tar:tgz
 NO_WRKSUBDIR=	yes
diff --git a/math/biggles/Makefile b/math/biggles/Makefile
index f28b3ec9f25d..691fadbe169f 100644
--- a/math/biggles/Makefile
+++ b/math/biggles/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libplot.so:${PORTSDIR}/graphics/plotutils
+LIB_DEPENDS=	libplot.so:graphics/plotutils
 
 USES=		gmake python:2
 MAKE_ARGS=	CC="${CC}" \
diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index 04d3b8b6fa2e..05c81b2ba1f0 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -31,11 +31,11 @@ WITH_OPENMPI=	yes
 .endif
 
 .if defined(WITH_OPENMPI)
-BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
-RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 EXTRA_PATCHES+=	${FILESDIR}/Bmake.inc-openmpi.diff
 .else
-LIB_DEPENDS+=	libmpich.so:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	libmpich.so:net/mpich2
 EXTRA_PATCHES+=	${FILESDIR}/Bmake.inc-mpich.diff
 .endif
 
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 78291b160eea..915859375409 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	DOCS
 DOCS_USE=	TEX=dvipsk,formats
 DOCS_USES=	makeinfo
 DOCS_INFO=	blitz
-DOCS_BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo \
-			texi2html:${PORTSDIR}/textproc/texi2html
+DOCS_BUILD_DEPENDS=	texi2dvi:print/texinfo \
+			texi2html:textproc/texi2html
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=yes
 
 GNU_CONFIGURE=	yes
diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile
index 01c0482db398..f7fbc7775fc5 100644
--- a/math/blocksolve95/Makefile
+++ b/math/blocksolve95/Makefile
@@ -18,8 +18,8 @@ LICENSE_NAME=	AS-IS
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libf2c.so:${PORTSDIR}/lang/f2c	\
-		libmpich.so:${PORTSDIR}/net/mpich2
+LIB_DEPENDS=	libf2c.so:lang/f2c	\
+		libmpich.so:net/mpich2
 
 USES=		fortran gmake tar:Z
 
diff --git a/math/bsdnt/Makefile b/math/bsdnt/Makefile
index 46dc0beb662b..15888c929320 100644
--- a/math/bsdnt/Makefile
+++ b/math/bsdnt/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Bignum Library
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USES=		gmake shebangfix
 SHEBANG_FILES=	configure
diff --git a/math/calctool/Makefile b/math/calctool/Makefile
index fa0f5ed66a48..1e654b4a012f 100644
--- a/math/calctool/Makefile
+++ b/math/calctool/Makefile
@@ -34,7 +34,7 @@ BINARIES+=	tty_calctool
 
 .if ${PORT_OPTIONS:MXVIEW}
 BINARIES+=	xv_calctool
-LIB_DEPENDS+=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS+=	libxview.so:x11-toolkits/xview
 .endif
 
 .if ${ARCH} == "sparc64"
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 3e8186c28b5a..1ca81fbe07b9 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 frontend to mathematical software
 
-LIB_DEPENDS=	libspectre.so:${PORTSDIR}/print/libspectre \
-		libqalculate.so:${PORTSDIR}/math/libqalculate \
-		libanalitza.so:${PORTSDIR}/math/analitza
+LIB_DEPENDS=	libspectre.so:print/libspectre \
+		libqalculate.so:math/libqalculate \
+		libanalitza.so:math/analitza
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource pkgconfig python:2 tar:xz
@@ -24,27 +24,27 @@ OPTIONS_DEFINE=	LUAJIT MAXIMA OCTAVE R SAGE SCILAB
 OPTIONS_SUB=	yes # R LUAJIT
 
 LUAJIT_DESC=	Build LuaJIT backend and install LuaJIT
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_CMAKE_OFF=	-DWITH_LuaJIT:BOOL=FALSE
 
 MAXIMA_DESC=	Install Maxima
-MAXIMA_RUN_DEPENDS=	maxima:${PORTSDIR}/math/maxima
+MAXIMA_RUN_DEPENDS=	maxima:math/maxima
 
 OCTAVE_DESC=	Install Octave
-OCTAVE_RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
+OCTAVE_RUN_DEPENDS=	octave:math/octave
 
 R_DESC=		Build R backend and install R
-R_BUILD_DEPENDS=	R:${PORTSDIR}/math/R
-R_RUN_DEPENDS=		R:${PORTSDIR}/math/R
+R_BUILD_DEPENDS=	R:math/R
+R_RUN_DEPENDS=		R:math/R
 # Required to set CFLAGS for -lgfortran.
 R_USES=		fortran
 R_CMAKE_OFF=	-DWITH_R:BOOL=FALSE
 
 SAGE_DESC=	Install Sage
-SAGE_RUN_DEPENDS=	sage:${PORTSDIR}/math/sage
+SAGE_RUN_DEPENDS=	sage:math/sage
 
 SCILAB_DESC=	Install Scilab
-SCILAB_RUN_DEPENDS=	scilab:${PORTSDIR}/math/scilab
+SCILAB_RUN_DEPENDS=	scilab:math/scilab
 
 post-patch:
 	${REINPLACE_CMD} -e '/FIND_PROGRAM(_GFORTRAN_EXECUTABLE/s,gfortran,${FC},' \
diff --git a/math/carve/Makefile b/math/carve/Makefile
index a745c3313ff2..46fb2c9a1e08 100644
--- a/math/carve/Makefile
+++ b/math/carve/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fast, robust constructive solid geometry library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs
 
 OPTIONS_DEFINE=	DOCS GUI
 
@@ -29,7 +29,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI}
-LIB_DEPENDS+=	libglui.so:${PORTSDIR}/devel/glui
+LIB_DEPENDS+=	libglui.so:devel/glui
 PLIST_SUB+=	GUI=""
 CMAKE_ARGS+=	-DCARVE_WITH_GUI:BOOL=true
 .else
diff --git a/math/cblas/Makefile b/math/cblas/Makefile
index 30fdc9b65aa7..53cb75ff71df 100644
--- a/math/cblas/Makefile
+++ b/math/cblas/Makefile
@@ -103,7 +103,7 @@ post-build:
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
 BLAS?=			-L${LOCALBASE}/lib -lblas
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libblas.so:${PORTSDIR}/math/blas
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libblas.so:math/blas
 MAKE_ENV+=		BLLIB="${BLAS}"
 
 check regression-test test: ${TESTS}
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index b8cef342a96f..295228ef36cf 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Computational geometry library
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr \
-		libgmp.so:${PORTSDIR}/math/gmp
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
+LIB_DEPENDS=	libmpfr.so:math/mpfr \
+		libgmp.so:math/gmp
 
 USE_LDCONFIG=		yes
 USES=			cmake tar:bzip2 shebangfix
diff --git a/math/chryzodus/Makefile b/math/chryzodus/Makefile
index faeda800ea32..fe0592a95ea0 100644
--- a/math/chryzodus/Makefile
+++ b/math/chryzodus/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Chryzode (http//www.chryzode.org) explorer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS=	liballeg.so:devel/allegro
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKEFILE=	makefile.unx
diff --git a/math/clblas/Makefile b/math/clblas/Makefile
index ad15d6c7d17a..654f8cb6e5bd 100644
--- a/math/clblas/Makefile
+++ b/math/clblas/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Software library containing BLAS functions written in OpenCL
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
-LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd \
-		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
+BUILD_DEPENDS=	opencl>=0:devel/opencl
+LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd \
+		libboost_program_options.so:devel/boost-libs
+RUN_DEPENDS=	opencl>=0:devel/opencl
 
 BROKEN_FreeBSD_9=	clBLAS is only supported on FreeBSD 10.1 and newer
 
diff --git a/math/clfft/Makefile b/math/clfft/Makefile
index d3f119c3ad80..92aad31022af 100644
--- a/math/clfft/Makefile
+++ b/math/clfft/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Software library containing FFT functions written in OpenCL
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
-LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd
-RUN_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
+BUILD_DEPENDS=	opencl>=0:devel/opencl
+LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
+RUN_DEPENDS=	opencl>=0:devel/opencl
 
 BROKEN_FreeBSD_9=	clFFT is only supported on FreeBSD 10.1 and newer
 ONLY_FOR_ARCHS=	amd64
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 09ea89a18f42..e4a6c558d9f8 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.ginac.de/CLN/ \
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Class Library for Numbers
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE}
diff --git a/math/cloog/Makefile b/math/cloog/Makefile
index f015fee63768..ccf49fd33e96 100644
--- a/math/cloog/Makefile
+++ b/math/cloog/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Code generator in the polyhedral model
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libisl.so:${PORTSDIR}/devel/isl
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libisl.so:devel/isl
 
 USE_LDCONFIG=	yes
 USES=		libtool
diff --git a/math/clrng/Makefile b/math/clrng/Makefile
index 8621fced9847..610bcc8838cf 100644
--- a/math/clrng/Makefile
+++ b/math/clrng/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Library for uniform random number generation in OpenCL
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
-LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd
-RUN_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
+BUILD_DEPENDS=	opencl>=0:devel/opencl
+LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
+RUN_DEPENDS=	opencl>=0:devel/opencl
 
 BROKEN_FreeBSD_9=	clRNG is only supported on FreeBSD 10.1 and newer
 
diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile
index 67489f16d256..04d26a5948e0 100644
--- a/math/coinmp/Makefile
+++ b/math/coinmp/Makefile
@@ -34,7 +34,7 @@ PORTDOCS=	*
 .if ${PORT_OPTIONS:MGLPK}
 CONFIGURE_ARGS+=	--with-gmpl-incdir=${LOCALBASE}/include	\
 		--with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
-LIB_DEPENDS+=	libglpk.so:${PORTSDIR}/math/glpk
+LIB_DEPENDS+=	libglpk.so:math/glpk
 .else
 CONFIGURE_ARGS+=	--disable-glpk-libcheck
 .endif
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index 8dd94a21fdee..8b9e46a393a4 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Another unit converter
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
 
 USES=		python:3.3+
 
diff --git a/math/coq/Makefile b/math/coq/Makefile
index d09ab0820774..2beb5c86fad9 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${COQVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Theorem prover based on lambda-C
 
-BUILD_DEPENDS=	camlp5:${PORTSDIR}/devel/ocaml-camlp5 \
-		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
+BUILD_DEPENDS=	camlp5:devel/ocaml-camlp5 \
+		ocamlfind:devel/ocaml-findlib
 
 COQVERSION=	${PORTVERSION:R}pl${PORTVERSION:E}
 USES=		gmake
@@ -31,11 +31,11 @@ OPTIONS_DEFINE=		DOCS IDE
 OPTIONS_DEFAULT=	DOCS IDE
 OPTIONS_SUB=		yes
 IDE_DESC=		Include desktop environment (coqide)
-IDE_BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-IDE_RUN_DEPENDS:=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+IDE_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
+IDE_RUN_DEPENDS:=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 IDE_CONFIGURE_OFF=	--coqide no
 DOCS_USE=		TEX=latex:build,dvipsk:build,texmf:build
-DOCS_BUILD_DEPENDS=	hevea:${PORTSDIR}/textproc/hevea
+DOCS_BUILD_DEPENDS=	hevea:textproc/hevea
 DOCS_CONFIGURE_OFF=	--with-doc none
 PORTDOCS=		*
 
diff --git a/math/crlibm/Makefile b/math/crlibm/Makefile
index b9847f6eef6d..89919ed1093d 100644
--- a/math/crlibm/Makefile
+++ b/math/crlibm/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-sse2
 
 .if ${PORT_OPTIONS:MTEST}
 CONFIGURE_ARGS+=	--enable-mpfr
-LIB_DEPENDS+=		libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS+=		libmpfr.so:math/mpfr
 .else
 CONFIGURE_ARGS+=	--disable-mpfr
 .endif
diff --git a/math/cryptominisat/Makefile b/math/cryptominisat/Makefile
index acf43dc83cd0..2a4a38f1c2de 100644
--- a/math/cryptominisat/Makefile
+++ b/math/cryptominisat/Makefile
@@ -10,8 +10,8 @@ COMMENT=	General-purpose award-winning SAT solver
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE-LGPL
 
-BUILD_DEPENDS=	xxd:${PORTSDIR}/editors/vim-lite # for xxd tool
-LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	xxd:editors/vim-lite # for xxd tool
+LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	msoos
diff --git a/math/cvc3/Makefile b/math/cvc3/Makefile
index 894066a3f256..4c880d87b656 100644
--- a/math/cvc3/Makefile
+++ b/math/cvc3/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.cs.nyu.edu/acsys/cvc3/download/${PORTVERSION}/
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Automatic theorem prover for the SMT problem
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS=	--enable-dynamic \
 		--with-arith=gmp \
diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile
index fa8249b58ed6..5ef45bf62638 100644
--- a/math/dieharder/Makefile
+++ b/math/dieharder/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Random number generator testsuite
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libgsl.so:math/gsl
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 36bddf1f0378..09c8a1e04a98 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/ofset/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	GTK interactive geometry software
 
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libguile.so:lang/guile
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pkgconfig pathfix
diff --git a/math/dynare/Makefile b/math/dynare/Makefile
index 4b4ee0458c19..db0d566faf1c 100644
--- a/math/dynare/Makefile
+++ b/math/dynare/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://www.dynare.org/release/source/
 MAINTAINER=	fernando.apesteguia@gmail.com
 COMMENT=	Software platform for handling a wide class of economic models
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/unordered_set.hpp:${PORTSDIR}/devel/boost-libs \
-		ctangle:${PORTSDIR}/devel/cweb
-LIB_DEPENDS=	libumfpack.so:${PORTSDIR}/math/suitesparse \
-		libmatio.so:${PORTSDIR}/math/matio
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/unordered_set.hpp:devel/boost-libs \
+		ctangle:devel/cweb
+LIB_DEPENDS=	libumfpack.so:math/suitesparse \
+		libmatio.so:math/matio
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
@@ -28,7 +28,7 @@ OPTIONS_DEFAULT=	OCTAVE
 
 MATLAB_CONFIGURE_ENABLE=	matlab
 OCTAVE_CONFIGURE_ENABLE=	octave
-OCTAVE_BUILD_DEPENDS=		octave:${PORTSDIR}/math/octave
+OCTAVE_BUILD_DEPENDS=		octave:math/octave
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 939ea87055a1..41512383889b 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -13,7 +13,7 @@ COMMENT=	R support for Emacsen
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	R:${PORTSDIR}/math/R
+RUN_DEPENDS=	R:math/R
 
 NO_ARCH=	yes
 
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index a0ae03c29e4e..abb7a6977f74 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Euclidean geometry drawing language
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libreadline.so:${PORTSDIR}/devel/readline
-RUN_DEPENDS=	pstoedit:${PORTSDIR}/graphics/pstoedit \
-		getopt>=0:${PORTSDIR}/misc/getopt
+LIB_DEPENDS=	libreadline.so:devel/readline
+RUN_DEPENDS=	pstoedit:graphics/pstoedit \
+		getopt>=0:misc/getopt
 
 USE_TEX=	latex
 USES=		bison gettext iconv gmake tar:bzip2
diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile
index fd3ad51e2479..3ddcbae6b826 100644
--- a/math/fflas-ffpack/Makefile
+++ b/math/fflas-ffpack/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for dense linear algebra over word-size finite fields
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		shebangfix
 GNU_CONFIGURE=	yes
@@ -30,7 +30,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--with-givaro="${LOCALBASE}"
-LIB_DEPENDS+=		libgivaro.so:${PORTSDIR}/math/givaro
+LIB_DEPENDS+=		libgivaro.so:math/givaro
 .else
 CONFIGURE_ARGS+=	--with-givaro=no
 .endif
@@ -40,21 +40,21 @@ WITH_BLAS?=	gsl
 
 .if ${WITH_BLAS} == "gotoblas"
 CONFIGURE_ARGS+=	--with-gotoblas2="${LOCALBASE}" --with-lapack=blas
-LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
+LIB_DEPENDS+=	libgoto2p.so:math/gotoblas
 USES+=		fortran
 .elif ${WITH_BLAS} == "atlas"
 CONFIGURE_ARGS+=	--with-cblas="${LOCALBASE}" --with-lapack=blas
-LIB_DEPENDS+=	libcblas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libcblas.so:math/atlas
 USES+=		fortran
 .elif ${WITH_BLAS} == "gsl"
 CONFIGURE_ARGS+=	--with-gsl="${LOCALBASE}"
-LIB_DEPENDS+=	libgslcblas.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	libgslcblas.so:math/gsl
 .else
 IGNORE =	unknown value of WITH_BLAS: ${WITH_BLAS}
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=		doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=		doxygen:devel/doxygen
 CONFIGURE_ARGS+=	--enable-doc --with-docdir="${DOCSDIR}"
 PLIST_SUB+=	DOXYGEN=""
 .else
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 4cdca0b7d151..074b61a3ded7 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Free peak fitting software
 LICENSE=	GPLv2 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	boost-libs>=1.35:${PORTSDIR}/devel/boost-libs \
-		swig2.0:${PORTSDIR}/devel/swig20 \
-		gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+BUILD_DEPENDS=	boost-libs>=1.35:devel/boost-libs \
+		swig2.0:devel/swig20 \
+		gnuplot:math/gnuplot
+RUN_DEPENDS=	gnuplot:math/gnuplot
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wojdyr
@@ -44,7 +44,7 @@ OPTIONS_DEFINE=		DOCS PYTHON
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 PYTHON_USES=		python
 PYTHON_CONFIGURE_ENABLE=	python
 
diff --git a/math/fpc-fftw/Makefile b/math/fpc-fftw/Makefile
index e25a0d780158..878f7a4bb47b 100644
--- a/math/fpc-fftw/Makefile
+++ b/math/fpc-fftw/Makefile
@@ -18,6 +18,6 @@ OPTIONS_DEFINE=	FFTW3
 FFTW3_DESC=	Install FFTW3 library
 OPTIONS_DEFAULT=	FFTW3
 
-FFTW3_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+FFTW3_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 .include "${MASTERDIR}/Makefile"
diff --git a/math/fpc-gmp/Makefile b/math/fpc-gmp/Makefile
index 12fa2584e97d..53f941132fa6 100644
--- a/math/fpc-gmp/Makefile
+++ b/math/fpc-gmp/Makefile
@@ -18,6 +18,6 @@ OPTIONS_DEFINE=	GMP
 GMP_DESC=	Install gmp library
 OPTIONS_DEFAULT=	GMP
 
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 
 .include "${MASTERDIR}/Makefile"
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 10876b99764a..0b1e15d0cdcf 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Numerical computing environment
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/share/llvm33/cmake/LLVMConfig.cmake:${PORTSDIR}/devel/llvm33 \
-		${LOCALBASE}/llvm33/lib/libclang.a:${PORTSDIR}/lang/clang33
-LIB_DEPENDS=	libarpack.so:${PORTSDIR}/math/arpack			\
-		libboost_math_c99.so:${PORTSDIR}/devel/boost-libs	\
-		libffi.so:${PORTSDIR}/devel/libffi			\
-		libfftw3.so:${PORTSDIR}/math/fftw3			\
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float		\
-		libpcre.so:${PORTSDIR}/devel/pcre			\
-		libportaudio.so:${PORTSDIR}/audio/portaudio		\
-		libumfpack.so:${PORTSDIR}/math/suitesparse
+BUILD_DEPENDS=	${LOCALBASE}/share/llvm33/cmake/LLVMConfig.cmake:devel/llvm33 \
+		${LOCALBASE}/llvm33/lib/libclang.a:lang/clang33
+LIB_DEPENDS=	libarpack.so:math/arpack			\
+		libboost_math_c99.so:devel/boost-libs	\
+		libffi.so:devel/libffi			\
+		libfftw3.so:math/fftw3			\
+		libfftw3f.so:math/fftw3-float		\
+		libpcre.so:devel/pcre			\
+		libportaudio.so:audio/portaudio		\
+		libumfpack.so:math/suitesparse
 
 USES=		blaslapack cmake:outsource dos2unix fortran pkgconfig python:build
 USE_GL=		yes
diff --git a/math/fricas/Makefile b/math/fricas/Makefile
index 6f8e0ee46062..515e57326c99 100644
--- a/math/fricas/Makefile
+++ b/math/fricas/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Computer algebra system, forked from axiom
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license/LICENSE.AXIOM
 
-BUILD_DEPENDS=	noweb:${PORTSDIR}/devel/noweb \
-		sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS=	noweb:devel/noweb \
+		sbcl:lang/sbcl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/math/gap/Makefile b/math/gap/Makefile
index 3c5b0e5398a9..45e2180dc7a5 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${GAP_VERSION}p${PORTVERSION:R:E}_${GAP_DISTTIME}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GAP is a system for computational discrete algebra
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		gmake shebangfix tar:bzip2
 SHEBANG_FILES=	configure \
diff --git a/math/gdcalc/Makefile b/math/gdcalc/Makefile
index 3fa5419f4a5a..c01c6a1c7495 100644
--- a/math/gdcalc/Makefile
+++ b/math/gdcalc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Gnome-based scientific calculator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gunits:${PORTSDIR}/math/units
+RUN_DEPENDS=	${LOCALBASE}/bin/gunits:math/units
 
 USES=		pkgconfig
 USE_GNOME=	libgnomeui
diff --git a/math/geogebra/Makefile b/math/geogebra/Makefile
index f7c8f9fdc3c6..3baa80bb5879 100644
--- a/math/geogebra/Makefile
+++ b/math/geogebra/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	GeoGebra Non-Commercial License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USE_LINUX?=	c6
 
diff --git a/math/ggobi/Makefile b/math/ggobi/Makefile
index 0a18bc7dcfdd..a0ae6ef36dcf 100644
--- a/math/ggobi/Makefile
+++ b/math/ggobi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Data visualization system
 
 LICENSE=	EPL
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		pkgconfig tar:bzip2 libtool pathfix desktop-file-utils
 USE_GNOME=	gtk20 libxml2
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index 4b3234eb5cc1..ab0abd6ca556 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -18,14 +18,14 @@ BROKEN=		unfetchable
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libpari.so:${PORTSDIR}/math/pari \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libgsl.so:${PORTSDIR}/math/gsl \
-		liblapack.so:${PORTSDIR}/math/lapack
+BUILD_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/lib/libntl.a:math/ntl
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libpng.so:graphics/png \
+		libpari.so:math/pari \
+		libmpfr.so:math/mpfr \
+		libgsl.so:math/gsl \
+		liblapack.so:math/lapack
 
 NO_CDROM=	French documentation is for non-commercial use only
 
diff --git a/math/givaro/Makefile b/math/givaro/Makefile
index 726db178a9d1..c69ce58117e2 100644
--- a/math/givaro/Makefile
+++ b/math/givaro/Makefile
@@ -13,7 +13,7 @@ LICENSE_NAME=	Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre] B license, version 1
 LICENSE_FILE=	${WRKSRC}/Licence_CeCILL-B_V1-en.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libgmp.so.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so.10:math/gmp
 
 USES=		libtool
 GNU_CONFIGURE=	yes
@@ -26,8 +26,8 @@ OPTIONS_DEFINE=	DOXYGEN
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS +=	doxygen:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+BUILD_DEPENDS +=	doxygen:devel/doxygen \
+			dot:graphics/graphviz
 CONFIGURE_ARGS+=	--enable-doc --with-docdir=${DOCSDIR}
 PLIST_SUB+=	PORTDOCS=""
 .else
diff --git a/math/glgraph/Makefile b/math/glgraph/Makefile
index 9494fc64e042..4681fd982c8c 100644
--- a/math/glgraph/Makefile
+++ b/math/glgraph/Makefile
@@ -14,8 +14,8 @@ COMMENT=	OpenGL based function grapher
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-OpenGL>=0:${PORTSDIR}/graphics/p5-OpenGL \
-		import:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	p5-OpenGL>=0:graphics/p5-OpenGL \
+		import:graphics/ImageMagick
 
 USES=		perl5 shebangfix tar:bzip2
 USE_PERL5=	run
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 6b7df681e9b6..355e99c6ecf9 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GNU Linear Programming Kit
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 OPTIONS_DEFINE=	IODBC MYSQL DOCS
 IODBC_DESC=	MathProg iodbc support
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--disable-dl
 
 .if ${PORT_OPTIONS:MIODBC}
 CONFIGURE_ARGS+=	--enable-odbc
-LIB_DEPENDS+=		libiodbc.so:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=		libiodbc.so:databases/libiodbc
 .else
 CONFIGURE_ARGS+=	--disable-odbc
 .endif
diff --git a/math/gmp-ecm/Makefile b/math/gmp-ecm/Makefile
index 68db028022d5..230425b808c2 100644
--- a/math/gmp-ecm/Makefile
+++ b/math/gmp-ecm/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	ecm-${PORTVERSION}
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Elliptic Curve Method for Integer Factorization
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
diff --git a/math/gnome-calculator/Makefile b/math/gnome-calculator/Makefile
index 9a42647fc28c..5b7aca9c9f72 100644
--- a/math/gnome-calculator/Makefile
+++ b/math/gnome-calculator/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 calculator tool
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libmpfr.so:math/mpfr
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index d4d4aa5e09ad..5878076206d1 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -13,10 +13,10 @@ COMMENT=	GNOME spreadsheet program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	libgoffice-0.10.so:${PORTSDIR}/devel/goffice010 \
-		libpsiconv.so:${PORTSDIR}/converters/psiconv
-RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
+BUILD_DEPENDS=	rarian-sk-config:textproc/rarian
+LIB_DEPENDS=	libgoffice-0.10.so:devel/goffice010 \
+		libpsiconv.so:converters/psiconv
+RUN_DEPENDS=	rarian-sk-config:textproc/rarian
 
 USES=		cpe desktop-file-utils gettext gmake libtool pathfix pkgconfig \
 		python:2 shebangfix tar:xz
diff --git a/math/gnuplot-tex-extras/Makefile b/math/gnuplot-tex-extras/Makefile
index e69944991dcb..e0adef9053cc 100644
--- a/math/gnuplot-tex-extras/Makefile
+++ b/math/gnuplot-tex-extras/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-tex-extras
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Extra files for Gnuplot TeX support
 
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS=	gnuplot:math/gnuplot
 
 USE_TEX=	texmf
 NO_BUILD=	yes
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index f5c0611dd991..9d432deadb39 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -40,17 +40,17 @@ WX_DESC=		wxWidgets (formerly wxWindows) support
 OPTIONS_DEFAULT=CAIRO GD WX X11
 OPTIONS_SUB=	yes
 
-CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 CAIRO_USE=	GNOME=pango
 CAIRO_CONFIGURE_WITH=	cairo
 
-GD_LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+GD_LIB_DEPENDS=	libgd.so:graphics/gd
 GD_CONFIGURE_ON=	--with-gd=${LOCALBASE}
 GD_CONFIGURE_OFF+=	--without-gd
 
 GRIDBOX_CONFIGURE_OFF=	--disable-h3d-quadtree --enable-h3d-gridbox
 
-PDF_LIB_DEPENDS=	libpdf.so:${PORTSDIR}/print/pdflib
+PDF_LIB_DEPENDS=	libpdf.so:print/pdflib
 PDF_CONFIGURE_ON=	--with-pdf=${LOCALBASE}
 PDF_CONFIGURE_OFF=	--without-pdf
 
diff --git a/math/grace/Makefile b/math/grace/Makefile
index d51749057d41..083a83a885ad 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Powerful 2D plotting tool (successor of xmgr)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libt1.so:${PORTSDIR}/devel/t1lib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libXbae.so:${PORTSDIR}/x11-toolkits/xbae
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libt1.so:devel/t1lib \
+		libpng.so:graphics/png \
+		libXbae.so:x11-toolkits/xbae
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		gmake jpeg motif
 GNU_CONFIGURE=	yes
@@ -37,15 +37,15 @@ OPTIONS_DEFINE=		DOCS EXAMPLES FFTW NETCDF PDF XMHTML
 OPTIONS_DEFAULT=	FFTW NETCDF PDF XMHTML
 
 FFTW_CONFIGURE_WITH=	fftw
-FFTW_LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw
+FFTW_LIB_DEPENDS=	libfftw.so:math/fftw
 NETCDF_CONFIGURE_ENABLE=	netcdf
-NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PDF_DESC=		PDF output
 PDF_CONFIGURE_ENABLE=	pdfdrv
-PDF_LIB_DEPENDS=	libpdf.so:${PORTSDIR}/print/pdflib
+PDF_LIB_DEPENDS=	libpdf.so:print/pdflib
 XMHTML_DESC=		XmHTML based on-line help
 XMHTML_CONFIGURE_ENABLE=	xmhtml
-XMHTML_LIB_DEPENDS=	libXmHTML.so:${PORTSDIR}/x11-toolkits/xmhtml
+XMHTML_LIB_DEPENDS=	libXmHTML.so:x11-toolkits/xmhtml
 
 post-configure:
 	${REINPLACE_CMD} -e \
diff --git a/math/gracetmpl/Makefile b/math/gracetmpl/Makefile
index 9a7e2239a1ac..30d1db2f9ccc 100644
--- a/math/gracetmpl/Makefile
+++ b/math/gracetmpl/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provide an easy way to use existing grace-files as a template
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 0d9cdd3c4526..f8179c49a651 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GNU Regression, Econometrics, and Time-series Library
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libfftw3.so:math/fftw3
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -40,12 +40,12 @@ OPTIONS_DEFAULT=	GUI OPENMP UNZIP
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MATLAS}
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lf77blas
 LAPACK=		-lalapack -lcblas
 .else
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
-		liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas \
+		liblapack.so:math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
@@ -55,8 +55,8 @@ CONFIGURE_ARGS+=	--enable-gtk2=yes --enable-gui=yes
 INSTALLS_ICONS=		yes
 USE_GNOME=		gtksourceview2
 USES+=			desktop-file-utils shared-mime-info
-BUILD_DEPENDS+=		gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS+=		gnuplot:${PORTSDIR}/math/gnuplot
+BUILD_DEPENDS+=		gnuplot:math/gnuplot
+RUN_DEPENDS+=		gnuplot:math/gnuplot
 PLIST_SUB+=		GUI=""
 .else
 USE_GNOME=		glib20 libxml2
@@ -75,7 +75,7 @@ PLIST_SUB+=		NLS="@comment "
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--with-odbc
-LIB_DEPENDS+=		libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 PLIST_SUB+=		ODBC=""
 .else
 CONFIGURE_ARGS+=	--without-odbc
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+=	--enable-openmp
 
 .if ${PORT_OPTIONS:MR}
 CONFIGURE_ARGS+=	--with-libR
-LIB_DEPENDS+=		libR.so:${PORTSDIR}/math/R
+LIB_DEPENDS+=		libR.so:math/R
 .else
 CONFIGURE_ARGS+=	--without-libR
 .endif
diff --git a/math/gri/Makefile b/math/gri/Makefile
index c164866d8eba..f766171e79bf 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extensible plotting language for producing scientific graphs
 
-LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 USES=		gmake readline shebangfix makeinfo
 SHEBANG_FILES=	doc/examples/FEM.pl src/gri_merge src/gri_unpage
@@ -38,7 +38,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
-BUILD_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS+=	convert:graphics/ImageMagick
 .endif
 
 post-patch:
diff --git a/math/gringo/Makefile b/math/gringo/Makefile
index 576e13c9103d..94bbdc01b9db 100644
--- a/math/gringo/Makefile
+++ b/math/gringo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Grounding algorithm based on semi-naive database evaluation
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	re2c:${PORTSDIR}/devel/re2c
+BUILD_DEPENDS=	re2c:devel/re2c
 
 USES=		bison compiler:c++11-lib scons
 
diff --git a/math/hfst/Makefile b/math/hfst/Makefile
index 4ce1ab6b2bd8..84374993abfe 100644
--- a/math/hfst/Makefile
+++ b/math/hfst/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>2.5.33:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>2.5.33:textproc/flex
 CONFIGURE_ENV+=	LEX="${FLEX}"
 FLEX=		${LOCALBASE}/bin/flex
 .endif
diff --git a/math/igraph/Makefile b/math/igraph/Makefile
index 10e43843f549..2c4fb1bdeb67 100644
--- a/math/igraph/Makefile
+++ b/math/igraph/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Package For Manipulating Undirected And Directed Graphs
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool
diff --git a/math/jacal/Makefile b/math/jacal/Makefile
index 3a0ce7af212e..3bdd2e9cc0fa 100644
--- a/math/jacal/Makefile
+++ b/math/jacal/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Symbolic mathematics program written in Scheme
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	scm:${PORTSDIR}/lang/scm \
-		${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib
+RUN_DEPENDS=	scm:lang/scm \
+		${LOCALBASE}/share/slib/require.scm:lang/slib
 
 WRKSRC=		${WRKDIR}/jacal
 
diff --git a/math/jags/Makefile b/math/jags/Makefile
index e7d74de448b4..8767668c35c3 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -48,11 +48,11 @@ WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == "atlas"
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 CONFIGURE_ARGS=	--with-lapack="-lalapack -lptcblas" --with-blas="-lptf77blas"
 .elif ${WITH_BLAS} == "reference"
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas
+LIB_DEPENDS+=	liblapack.so:math/lapack
 CONFIGURE_ARGS=	--with-lapack="-llapack" --with-blas="-lblas"
 .else
 IGNORE=		invalid value for WITH_BLAS: ${WITH_BLAS}
@@ -84,7 +84,7 @@ post-install:
 .endif
 
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/R/library/coda/R/coda.rdb:${PORTSDIR}/math/R-cran-coda
+BUILD_DEPENDS+=	${LOCALBASE}/lib/R/library/coda/R/coda.rdb:math/R-cran-coda
 
 check test: install
 .for i in 1 2
diff --git a/math/jama/Makefile b/math/jama/Makefile
index 25d476fa9b1c..97edc6c6120e 100644
--- a/math/jama/Makefile
+++ b/math/jama/Makefile
@@ -13,8 +13,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Java-like Matrix C++ Templates
 
-BUILD_DEPENDS=	${LOCALBASE}/include/tnt/tnt.h:${PORTSDIR}/devel/tnt
-RUN_DEPENDS=	${LOCALBASE}/include/tnt/tnt.h:${PORTSDIR}/devel/tnt
+BUILD_DEPENDS=	${LOCALBASE}/include/tnt/tnt.h:devel/tnt
+RUN_DEPENDS=	${LOCALBASE}/include/tnt/tnt.h:devel/tnt
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/math/jlatexmath/Makefile b/math/jlatexmath/Makefile
index e9c5e9a3a5b7..6a2bee5c8443 100644
--- a/math/jlatexmath/Makefile
+++ b/math/jlatexmath/Makefile
@@ -25,14 +25,14 @@ OPTIONS_DEFAULT=	FOP
 OPTIONS_SUB=	yes
 
 FOP_DESC=		textproc/fop plugin (required for math/scilab)
-FOP_BUILD_DEPENDS=	fop:${PORTSDIR}/textproc/fop \
-			${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons
+FOP_BUILD_DEPENDS=	fop:textproc/fop \
+			${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
 FOP_RUN_DEPENDS:=	${FOP_BUILD_DEPENDS} \
-			${JAVASHAREDIR}/batik/batik.jar:${PORTSDIR}/graphics/batik \
-			${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \
-			${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
-			${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-			${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons
+			${JAVASHAREDIR}/batik/batik.jar:graphics/batik \
+			${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
+			${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \
+			${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
+			${JAVALIBDIR}/xml-apis-ext.jar:textproc/xml-commons
 FOP_ALL_TARGET=		fop
 
 post-patch:
diff --git a/math/jts/Makefile b/math/jts/Makefile
index 08d5013a18cf..efc172fd613a 100644
--- a/math/jts/Makefile
+++ b/math/jts/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	SF/${PORTNAME}-topo-suite/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JTS Topology Suite
 
-RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom		\
-	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit		\
-	${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
+RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom		\
+	${JAVALIBDIR}/junit.jar:java/junit		\
+	${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index 85b1a8f65131..22c673db04a4 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE graph calculator
 
-LIB_DEPENDS=	libanalitza.so:${PORTSDIR}/math/analitza
+LIB_DEPENDS=	libanalitza.so:math/analitza
 
 CMAKE_ARGS=	-DBUILD_mobile:BOOL=FALSE
 USE_GL=		glu
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index b1522abf098b..0db896d02db8 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -9,8 +9,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Scientific calculator for KDE
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr
 
 USE_KDE4=	kdeprefix automoc4 kdelibs
 USES=		cmake:outsource tar:xz
diff --git a/math/kig/Makefile b/math/kig/Makefile
index a354ae82f9d4..c9c3b53d0d17 100644
--- a/math/kig/Makefile
+++ b/math/kig/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 interactive geometry application
 
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource compiler:c++11-lib tar:xz
diff --git a/math/kktdirect/Makefile b/math/kktdirect/Makefile
index 963a15e8ac72..d7817b6b59d1 100644
--- a/math/kktdirect/Makefile
+++ b/math/kktdirect/Makefile
@@ -38,16 +38,16 @@ WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == reference
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas
+LIB_DEPENDS+=	liblapack.so:math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .elif ${WITH_BLAS} == gotoblas
-LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
+LIB_DEPENDS+=	libgoto2p.so:math/gotoblas
 BLAS=			-lgoto2p
 LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == atlas
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lptf77blas
 LAPACK=		-lalapack -lptcblas
 .endif
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 769871393865..b8d62393a526 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Data plotting and function analysis tool for KDE
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		cmake shared-mime-info tar:bzip2
 USE_XORG=	xft xpm
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 876416d4cfd0..e6a77cf31ed2 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -47,8 +47,8 @@ ALL_TARGET=		lapackelib
 LAPACKELIB=		liblapacke.a
 LAPACKETMGLIB=		liblapacke_tmg.a
 MAKE_ENV+=	LAPACKELIB="${LAPACKELIB}" LAPACKETMGLIB="${LAPACKETMGLIB}"
-LIB_DEPENDS+=		libblas.so:${PORTSDIR}/math/blas \
-			liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=		libblas.so:math/blas \
+			liblapack.so:math/lapack
 LIBS=			lapacke lapacke_tmg
 INCLS=			lapacke lapacke_utils lapacke_mangling
 PLIST_SUB+=		BLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE=""
@@ -56,7 +56,7 @@ SVERSION=		1
 .else
 ALL_TARGET=		lib
 BLASLIB?=		-L${LOCALBASE}/lib -lblas
-LIB_DEPENDS+=		libblas.so:${PORTSDIR}/math/blas
+LIB_DEPENDS+=		libblas.so:math/blas
 LIBS=			lapack tmglib
 SVERSION=		4
 TEST_TARGET=		lapack_testing
@@ -67,7 +67,7 @@ USES+=			python:build
 S=			\#
 .endif
 .if defined(XLAPACK_SLAVEPORT)
-LIB_DEPENDS+=		libxblas.so:${PORTSDIR}/math/xblas
+LIB_DEPENDS+=		libxblas.so:math/xblas
 MAKE_ENV+=		USEXBLAS=yes XBLASLIB="${XBLASLIB}"
 P=			x
 PLIST_SUB+=		BLAS="@comment " LAPACK="@comment " XLAPACK="" LAPACKE="@comment "
@@ -76,7 +76,7 @@ XBLASLIB?=		-L${LOCALBASE}/lib -lxblas
 PLIST_FILES+=		${MAN3L:S|^|man/man3/|:S|$|.gz|}
 PLIST_SUB+=		BLAS="@comment " LAPACK="" XLAPACK="@comment " LAPACKE="@comment "
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS +=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS +=	doxygen:devel/doxygen
 MAN_TARGET=		build-manpages
 .endif
 .endif
diff --git a/math/libflame/Makefile b/math/libflame/Makefile
index 122126da6d88..6645ef70deea 100644
--- a/math/libflame/Makefile
+++ b/math/libflame/Makefile
@@ -15,7 +15,7 @@ COMMENT=	FLAME dense linear algebra library
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 GNU_CONFIGURE=	yes
 USE_CSTD=	c99
@@ -124,19 +124,19 @@ WITH_BLAS?=	reference
 
 .if ! ${PORT_OPTIONS:MBUILTIN_BLAS}
 .if ${WITH_BLAS} == atlas
-RUN_DEPENDS +=	${LOCALBASE}/lib/libatlas.so:${PORTSDIR}/math/atlas
+RUN_DEPENDS +=	${LOCALBASE}/lib/libatlas.so:math/atlas
 BLAS=		-lptf77blas
 .elif ${WITH_BLAS} == atlas_c
-RUN_DEPENDS +=	${LOCALBASE}/lib/libatlas.so:${PORTSDIR}/math/atlas
+RUN_DEPENDS +=	${LOCALBASE}/lib/libatlas.so:math/atlas
 BLAS=		-lptcblas
 .elif ${WITH_BLAS} == gotoblas
-RUN_DEPENDS +=	${LOCALBASE}/lib/libgoto2p.so:${PORTSDIR}/math/gotoblas
+RUN_DEPENDS +=	${LOCALBASE}/lib/libgoto2p.so:math/gotoblas
 BLAS=			-lgoto2p
 .elif ${WITH_BLAS} == reference
-RUN_DEPENDS +=	${LOCALBASE}/lib/libblas.so:${PORTSDIR}/math/blas
+RUN_DEPENDS +=	${LOCALBASE}/lib/libblas.so:math/blas
 BLAS=		-lblas
 .elif ${WITH_BLAS} == reference_c
-RUN_DEPENDS +=	${LOCALBASE}/lib/libgslcblas.so:${PORTSDIR}/math/gsl
+RUN_DEPENDS +=	${LOCALBASE}/lib/libgslcblas.so:math/gsl
 BLAS=		-lgslcblas
 .endif #WITH_BLAS
 .endif #WITH_BUILTIN_BLAS
@@ -144,19 +144,19 @@ BLAS=		-lgslcblas
 .if ${PORT_OPTIONS:MEXTERNAL_LAPACK}
 .if !empty(WITH_BLAS:Matlas*)
 .if ${PORT_OPTIONS:MBUILTIN_BLAS}
-RUN_DEPENDS +=	${LOCALBASE}/lib/libatlas.so:${PORTSDIR}/math/atlas
+RUN_DEPENDS +=	${LOCALBASE}/lib/libatlas.so:math/atlas
 .endif
 LAPACK=		-lalapack -lptcblas -lptf77blas
 .elif ${WITH_BLAS} == gotoblas
 .if ${PORT_OPTIONS:MBUILTIN_BLAS}
-RUN_DEPENDS +=	${LOCALBASE}/lib/libgoto2p.so:${PORTSDIR}/math/gotoblas
+RUN_DEPENDS +=	${LOCALBASE}/lib/libgoto2p.so:math/gotoblas
 .endif
 LAPACK=		-lgoto2p
 .elif !empty(WITH_BLAS:Mreference*)
-RUN_DEPENDS +=	${LOCALBASE}/lib/liblapack.so:${PORTSDIR}/math/lapack
+RUN_DEPENDS +=	${LOCALBASE}/lib/liblapack.so:math/lapack
 LAPACK=		-llapack
 .if ${PORT_OPTIONS:MBUILTIN_BLAS} || ${PORT_OPTIONS:MCBLAS}
-RUN_DEPENDS +=	${LOCALBASE}/lib/libblas.so:${PORTSDIR}/math/blas
+RUN_DEPENDS +=	${LOCALBASE}/lib/libblas.so:math/blas
 LAPACK+=	-lblas
 .endif
 .endif #WITH_BLAS
diff --git a/math/libjbigi/Makefile b/math/libjbigi/Makefile
index 43fc347ec8a6..e6645778107e 100644
--- a/math/libjbigi/Makefile
+++ b/math/libjbigi/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	i2psource_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	i2p JNI to GNU MP Bignum library (libgmp)
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		tar:bzip2
 USE_JAVA=	yes
diff --git a/math/libmissing/Makefile b/math/libmissing/Makefile
index 96440010b557..377effe937a5 100644
--- a/math/libmissing/Makefile
+++ b/math/libmissing/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Standard math functions missing from the FreeBSD libm
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libmpc.so:${PORTSDIR}/math/mpc
+LIB_DEPENDS=	libmpc.so:math/mpc
 
 USE_LDCONFIG=	yes
 USES=		tar:xz uidfix
diff --git a/math/liborigin/Makefile b/math/liborigin/Makefile
index 20a1f54b3c2f..c6522496a1a8 100644
--- a/math/liborigin/Makefile
+++ b/math/liborigin/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2.0
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Library and utility for reading OriginLab project files
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs
 
 CONFLICTS_INSTALL=	labplot-2.*
 
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOXYGEN
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 post-patch-DOXYGEN-off:
 	${REINPLACE_CMD} -e '/find_package(Doxygen)/d' ${WRKSRC}/CMakeLists.txt
diff --git a/math/libproj4/Makefile b/math/libproj4/Makefile
index 0a916b4b9935..6746230f0b08 100644
--- a/math/libproj4/Makefile
+++ b/math/libproj4/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C language procedures related to cartographic processes
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		gmake tar:bzip2
 CFLAGS+=	-I${LOCALBASE}/include
@@ -30,7 +30,7 @@ EXTRACT_ONLY=	${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX}
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034
-LIB_DEPENDS+=	libmissing.so:${PORTSDIR}/math/libmissing
+LIB_DEPENDS+=	libmissing.so:math/libmissing
 LDFLAGS+=	-lmissing
 .endif
 
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index c34892df9659..ebca830260ff 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/qalculate/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Multi-purpose desktop calculator (backend library)
 
-LIB_DEPENDS=	libcln.so:${PORTSDIR}/math/cln
+LIB_DEPENDS=	libcln.so:math/cln
 
 USES=		pkgconfig pathfix gmake libtool gettext-tools
 USE_GNOME=	glib20 intltool libxml2
diff --git a/math/librsb/Makefile b/math/librsb/Makefile
index 128bfa0915c9..f5c8d1a7241e 100644
--- a/math/librsb/Makefile
+++ b/math/librsb/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Sparse matrix library
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	gsed:textproc/gsed \
+		bash:shells/bash
 
 USES=		fortran compiler:openmp gmake shebangfix
 GNU_CONFIGURE=	yes
diff --git a/math/libtsnnls/Makefile b/math/libtsnnls/Makefile
index 0f619227e01f..dc432a7f89e4 100644
--- a/math/libtsnnls/Makefile
+++ b/math/libtsnnls/Makefile
@@ -31,20 +31,20 @@ WITH_BLAS=atlas
 # FIXME compiling error when using dmalloc
 #.if ${PORT_OPTIONS:MDMALLOC}
 #CONFIGURE_ARGS+=--with-dmalloc
-#LIB_DEPENDS+=dmalloc.1:${PORTSDIR}/devel/dmalloc
+#LIB_DEPENDS+=dmalloc.1:devel/dmalloc
 #.endif
 
 .if ${WITH_BLAS} == reference
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas
+LIB_DEPENDS+=	liblapack.so:math/lapack
 BLAS=-lblas
 LAPACK=-llapack
 .elif ${WITH_BLAS} == gotoblas
-LIB_DEPENDS+=	libgoto2.so:${PORTSDIR}/math/gotoblas
+LIB_DEPENDS+=	libgoto2.so:math/gotoblas
 BLAS=-lgoto2p
 LAPACK=-lgoto2p
 .elif ${WITH_BLAS} == atlas
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=-lptf77blas
 LAPACK=-lalapack -lptcblas
 .endif
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index c6d046f1c588..52bd84c7d761 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	${SRCS}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Linear Algebra package
 
-LIB_DEPENDS=	libblas.so:${PORTSDIR}/math/blas
+LIB_DEPENDS=	libblas.so:math/blas
 
 MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
 MAKEFILE=	${FILESDIR}/Makefile.lib
diff --git a/math/lll_spect/Makefile b/math/lll_spect/Makefile
index b215a0d9cab6..d9182456a901 100644
--- a/math/lll_spect/Makefile
+++ b/math/lll_spect/Makefile
@@ -13,8 +13,8 @@ EXTRACT_ONLY=
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	LLL-spectral test of linear congruential random number generators
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
-RUN_DEPENDS=	${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
+BUILD_DEPENDS=	${LOCALBASE}/lib/libntl.a:math/ntl
+RUN_DEPENDS=	${LOCALBASE}/lib/libntl.a:math/ntl
 
 PLIST_FILES=	bin/lll_spect bin/lll_search
 PORTEXAMPLES=	examples.txt
diff --git a/math/ltl/Makefile b/math/ltl/Makefile
index b7f6c13c1f54..d60edda70a5d 100644
--- a/math/ltl/Makefile
+++ b/math/ltl/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.mpe.mpg.de/~drory/ltl/
 MAINTAINER=	rossiya@gmail.com
 COMMENT=	C++ class SSE library for scientific computing
 
-LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack \
-		libblas.so:${PORTSDIR}/math/blas
+LIB_DEPENDS=	liblapack.so:math/lapack \
+		libblas.so:math/blas
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/math/matio/Makefile b/math/matio/Makefile
index 4f1993cb4302..1f74bb555dad 100644
--- a/math/matio/Makefile
+++ b/math/matio/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	HDF5
 OPTIONS_DEFAULT=	HDF5
 
 HDF5_DESC=	Support for MAT file version 7.3
-HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
+HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CONFIGURE_ON=	--enable-mat73=yes \
 			--with-hdf5=${LOCALBASE}
 
diff --git a/math/matlab-installer/Makefile b/math/matlab-installer/Makefile
index 3bf3708e3d76..b2e567216e87 100644
--- a/math/matlab-installer/Makefile
+++ b/math/matlab-installer/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Easy installation of Linux Matlab(r) on FreeBSD
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	mount_cd9660_image:${PORTSDIR}/sysutils/diskimage-tools \
-		auto-ask:${PORTSDIR}/sysutils/auto-admin \
-		webbrowser:${PORTSDIR}/www/webbrowser \
+RUN_DEPENDS=	mount_cd9660_image:sysutils/diskimage-tools \
+		auto-ask:sysutils/auto-admin \
+		webbrowser:www/webbrowser \
 
 USES=		tar:xz
 USE_LINUX=	yes
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 28c2360ec640..600ca0d7f742 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Symbolic mathematics program
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/${LISPPORT}
-PATCH_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+PATCH_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 RUN_DEPENDS=	${LOCALBASE}/bin/${LISPPORT} \
-		${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot
+		${LOCALBASE}/bin/gnuplot:math/gnuplot
 
 USES=			gmake makeinfo perl5 python:build tk:84+
 USE_PERL5=		build
@@ -47,7 +47,7 @@ SBCL_DESC=	Build with Steel Bank Common Lisp
 # Lisp to build with. Define only ONE of these!
 .if ${PORT_OPTIONS:MCLISP}
 LISPSELECT=	--enable-clisp
-LISPPORT=	clisp:${PORTSDIR}/lang/clisp
+LISPPORT=	clisp:lang/clisp
 BINDIRECTORY=	binary-clisp
 LISPBINARY=	lisp.run
 PLIST_SUB+=	LISPBINARY=""
@@ -56,7 +56,7 @@ MAXIMABINARY=	maxima.mem
 
 .if ${PORT_OPTIONS:MCMUCL}
 LISPSELECT=	--enable-cmucl
-LISPPORT=	lisp:${PORTSDIR}/lang/cmucl
+LISPPORT=	lisp:lang/cmucl
 BINDIRECTORY=	binary-cmucl
 LISPBINARY=	lisp
 PLIST_SUB+=	LISPBINARY=""
@@ -66,7 +66,7 @@ STRIP=	#strip(1) chokes on LISPBINARY
 
 .if ${PORT_OPTIONS:MGCL}
 LISPSELECT=	--enable-gcl
-LISPPORT=	gcl:${PORTSDIR}/lang/gcl
+LISPPORT=	gcl:lang/gcl
 BINDIRECTORY=	binary-gcl
 #LISPBINARY is null so fudge this so deinstall works cleanly
 PLIST_SUB+=	LISPBINARY="@comment "
@@ -87,7 +87,7 @@ LISPSELECT=	--with-sbcl="sbcl ${MAXIMA_LISP_OPTIONS}"
 .  else
 LISPSELECT=	--enable-sbcl
 .  endif
-LISPPORT=	sbcl:${PORTSDIR}/lang/sbcl
+LISPPORT=	sbcl:lang/sbcl
 BINDIRECTORY=	binary-sbcl
 #LISPBINARY is null so fudge this so deinstall works cleanly
 PLIST_SUB+=	LISPBINARY="@comment "
diff --git a/math/mbasecalc/Makefile b/math/mbasecalc/Makefile
index f516aa0dcdbc..6f00495966fd 100644
--- a/math/mbasecalc/Makefile
+++ b/math/mbasecalc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple calculator program inspired by basecalc
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 MAKE_ARGS=	CC="${CC}" CXX="${CXX}" CFLAGS="${CPPFLAGS} ${CXXFLAGS}" \
 		LIBS="${LDFLAGS}"
diff --git a/math/mingw32-libgmp/Makefile b/math/mingw32-libgmp/Makefile
index 2bef2f0f47c6..cdec25a067b5 100644
--- a/math/mingw32-libgmp/Makefile
+++ b/math/mingw32-libgmp/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	gmp-${DISTVERSION}a
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Library for arbitrary precision arithmetic (MinGW32)
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		mingwm10.dll:${PORTSDIR}/devel/mingw32-bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 WRKSRC=		${WRKDIR}/gmp-${PORTVERSION}
 
diff --git a/math/mosesdecoder/Makefile b/math/mosesdecoder/Makefile
index 09b36c273b7e..aa6c1df720cc 100644
--- a/math/mosesdecoder/Makefile
+++ b/math/mosesdecoder/Makefile
@@ -10,12 +10,12 @@ CATEGORIES=	math
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A statistical machine translation system
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		bjam:${PORTSDIR}/devel/boost-jam
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libRandLM.so:${PORTSDIR}/textproc/randlm \
-		libirstlm.so:${PORTSDIR}/textproc/irstlm
-RUN_DEPENDS=	lmplz:${PORTSDIR}/textproc/kenlm
+BUILD_DEPENDS=	bash:shells/bash \
+		bjam:devel/boost-jam
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libRandLM.so:textproc/randlm \
+		libirstlm.so:textproc/irstlm
+RUN_DEPENDS=	lmplz:textproc/kenlm
 
 BROKEN_FreeBSD_9=	does not link
 
diff --git a/math/mpc/Makefile b/math/mpc/Makefile
index 856d5f6f3b19..f6d4b146fa56 100644
--- a/math/mpc/Makefile
+++ b/math/mpc/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.multiprecision.org/mpc/download/
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Library of complex numbers with arbitrarily high precision
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr
 
 PORTSCOUT=	site:http://www.multiprecision.org/index.php?prog=mpc&page=download
 
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
index d82597284778..a0a3942a8c54 100644
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Library for multiple-precision floating-point computations
 
 LICENSE=	LGPL3
 
-#PATCH_DEPENDS=	gpatch:${PORTSDIR}/devel/patch
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+#PATCH_DEPENDS=	gpatch:devel/patch
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 #PATCHLEVEL=	10
 #PATCHFILES!=	/usr/bin/jot -s " " -w patch%02d ${PATCHLEVEL} 1 ${PATCHLEVEL}
diff --git a/math/mpir/Makefile b/math/mpir/Makefile
index 76af062b66ff..b5e67ffb461e 100644
--- a/math/mpir/Makefile
+++ b/math/mpir/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Multiprecision integer library
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS=	yasm:devel/yasm
 
 USES=		libtool tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/math/msieve/Makefile b/math/msieve/Makefile
index 29aebb835116..344e427d31bd 100644
--- a/math/msieve/Makefile
+++ b/math/msieve/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Fast factorization of big integers using MPQS and GNFS
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libecm.a:${PORTSDIR}/math/gmp-ecm
+BUILD_DEPENDS=	${LOCALBASE}/lib/libecm.a:math/gmp-ecm
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		gmake
diff --git a/math/mumps/Makefile b/math/mumps/Makefile
index db6878ecde5b..5d05ec9a3db4 100644
--- a/math/mumps/Makefile
+++ b/math/mumps/Makefile
@@ -44,7 +44,7 @@ FFLAGS+=	-O3 -ffast-math
 .endif
 
 .ifdef WITH_METIS
-BUILD_DEPENDS+=	${LOCALBASE}/bin/oemetis:${PORTSDIR}/math/metis4
+BUILD_DEPENDS+=	${LOCALBASE}/bin/oemetis:math/metis4
 MAKE_ENV+=	ORDERINGSF=-Dmetis
 .endif
 
@@ -58,25 +58,25 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 WITH_ATLAS=	yes
 .endif
 .if defined(WITH_ATLAS)
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS_LIBS=	-lf77blas
 LAPACK_LIBS=	-lalapack -lcblas
 .else
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	libblas.so:math/blas
 BLAS_LIBS=	-lblas
 LAPACK_LIBS=	-llapack
 .endif
 
 .ifdef WITH_MPI
 PKGNAMESUFFIX+=		-mpich
-BUILD_DEPENDS+=	${LOCALBASE}/include/mpif.h:${PORTSDIR}/net/mpich2 \
-		${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
-		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
+BUILD_DEPENDS+=	${LOCALBASE}/include/mpif.h:net/mpich2 \
+		${LOCALBASE}/lib/libblacs.a:math/blacs \
+		${LOCALBASE}/lib/libscalapack.a:math/scalapack
+LIB_DEPENDS+=	liblapack.so:math/lapack
 # Note: -l?mumps still requires to be linked with -lblacs + -lscalapack
-RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2 \
-		${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
-		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
+RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:net/mpich2 \
+		${LOCALBASE}/lib/libblacs.a:math/blacs \
+		${LOCALBASE}/lib/libscalapack.a:math/scalapack
 CONFLICTS=	mumps-4*
 .else
 CONFLICTS=	mumps-mpich-4*
diff --git a/math/ndiff/Makefile b/math/ndiff/Makefile
index 5cd08b615d6a..88a14700c20f 100644
--- a/math/ndiff/Makefile
+++ b/math/ndiff/Makefile
@@ -23,7 +23,7 @@ PORTDOCS=	*.html *.pdf *.ps *.txt
 
 OPTIONS_DEFINE=	DOCS GMP
 
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 GMP_CFLAGS=	-I${LOCALBASE}/include
 GMP_LDFLAGS=	-L${LOCALBASE}/lib
 GMP_CONFIGURE_ON=	--with-gmp
diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile
index 0640008746f7..dd5afb88aef4 100644
--- a/math/nlopt/Makefile
+++ b/math/nlopt/Makefile
@@ -14,11 +14,11 @@ LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libguile-2.0.so:${PORTSDIR}/lang/guile2
-BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30 \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:${PORTSDIR}/math/py-numpy
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:${PORTSDIR}/math/py-numpy
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libguile-2.0.so:lang/guile2
+BUILD_DEPENDS=	swig3.0:devel/swig30 \
+		${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:math/py-numpy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:math/py-numpy
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
diff --git a/math/ntl/Makefile b/math/ntl/Makefile
index 93031c860969..f36c5f10feb9 100644
--- a/math/ntl/Makefile
+++ b/math/ntl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Victor Shoup's Number Theory Library
 
 # ntl is faster with libgmp4, but you can disable it
 .if !defined(WITHOUT_GMP)
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS=	NTL_GMP_LIP=on
 .endif
diff --git a/math/numdiff/Makefile b/math/numdiff/Makefile
index 11b1715b6904..bf221bb6f05a 100644
--- a/math/numdiff/Makefile
+++ b/math/numdiff/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=		DOCS GMP NLS
 OPTIONS_DEFAULT=	GMP
 OPTIONS_SUB=		yes
 
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 GMP_CONFIGURE_ENABLE=	gmp
 NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/math/ocaml-ocamlgraph/Makefile b/math/ocaml-ocamlgraph/Makefile
index 1e9d28577daf..5eb4eb6ad432 100644
--- a/math/ocaml-ocamlgraph/Makefile
+++ b/math/ocaml-ocamlgraph/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	GUI DOCS
 OPTIONS_DEFAULT=GUI
 OPTIONS_SUB=	yes
 GUI_DESC=		Include GUI user programs: viewer and editor
-GUI_BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-GUI_RUN_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+GUI_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
+GUI_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 GUI_CONFIGURE_OFF=	LABLGTK2=no
 
 USES=		gmake
diff --git a/math/ocaml-zarith/Makefile b/math/ocaml-zarith/Makefile
index 377536fe0e62..42b8507795a8 100644
--- a/math/ocaml-zarith/Makefile
+++ b/math/ocaml-zarith/Makefile
@@ -12,7 +12,7 @@ COMMENT=	OCaml arithmetic library for arbitrary precision integers
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=			gmake perl5 shebangfix tar:tgz
 USE_PERL5=		build
diff --git a/math/ocamlgsl/Makefile b/math/ocamlgsl/Makefile
index b1fb0d92a18c..3b12c6235680 100644
--- a/math/ocamlgsl/Makefile
+++ b/math/ocamlgsl/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Interface to GSL for the Objective Caml language
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
+LIB_DEPENDS=	libgsl.so:math/gsl
+BUILD_DEPENDS=	gawk:lang/gawk \
 		${OCAMLC_DEPEND}
-RUN_DEPENDS=	ocamlfind:${PORTSDIR}/devel/ocaml-findlib
+RUN_DEPENDS=	ocamlfind:devel/ocaml-findlib
 
 USES=			gmake
 USE_OCAML=		YES
diff --git a/math/octave-forge-base/Makefile b/math/octave-forge-base/Makefile
index ac7f34403a61..26fc3e92aad3 100644
--- a/math/octave-forge-base/Makefile
+++ b/math/octave-forge-base/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Octave-forge baseport for all packages
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	octave:${PORTSDIR}/math/octave \
-		gmake:${PORTSDIR}/devel/gmake \
-		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-IO-Zlib>=0:${PORTSDIR}/archivers/p5-IO-Zlib \
-		p5-File-Remove>=0:${PORTSDIR}/devel/p5-File-Remove
+RUN_DEPENDS=	octave:math/octave \
+		gmake:devel/gmake \
+		p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-IO-Zlib>=0:archivers/p5-IO-Zlib \
+		p5-File-Remove>=0:devel/p5-File-Remove
 
 USES=		perl5
 SUB_FILES=	load-octave-pkg
diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile
index f9758eff662a..22e96197749f 100644
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/fpl.tar.gz:${PORTSDIR}/math/octave-forge-fpl
-RUN_DEPENDS+=	${TARBALLS_DIR}/msh.tar.gz:${PORTSDIR}/math/octave-forge-msh
+RUN_DEPENDS+=	${TARBALLS_DIR}/fpl.tar.gz:math/octave-forge-fpl
+RUN_DEPENDS+=	${TARBALLS_DIR}/msh.tar.gz:math/octave-forge-msh
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile
index f2754772753e..aae000650e6b 100644
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 MAKE_ENV+=	MKOCTFILE=mkoctfile
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:${PORTSDIR}/math/octave-forge-signal
+RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:math/octave-forge-signal
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-data-smoothing/Makefile b/math/octave-forge-data-smoothing/Makefile
index a31bc2a6e405..5fbfed9372cf 100644
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/optim.tar.gz:${PORTSDIR}/math/octave-forge-optim
+RUN_DEPENDS+=	${TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim
 
 do-build:
 	@${DO_NADA}
diff --git a/math/octave-forge-dicom/Makefile b/math/octave-forge-dicom/Makefile
index d824a035cad2..f0ccf3b6e5ed 100644
--- a/math/octave-forge-dicom/Makefile
+++ b/math/octave-forge-dicom/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
 BROKEN=		does not build with octave-4.0.0
 
-LIB_DEPENDS+=	libgdcmCommon.so:${PORTSDIR}/devel/gdcm
+LIB_DEPENDS+=	libgdcmCommon.so:devel/gdcm
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
diff --git a/math/octave-forge-econometrics/Makefile b/math/octave-forge-econometrics/Makefile
index 720178d84f20..951c959976c2 100644
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@@ -18,7 +18,7 @@ OCTSRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/optim.tar.gz:${PORTSDIR}/math/octave-forge-optim
+RUN_DEPENDS+=	${TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-financial/Makefile b/math/octave-forge-financial/Makefile
index bb1e510e4b60..0c97e38100dc 100644
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${DISTNAME}
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/io.tar.gz:${PORTSDIR}/math/octave-forge-io
+RUN_DEPENDS+=	${TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile
index 6da1e12de35d..8a9dc4cd1699 100644
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@@ -18,7 +18,7 @@ OCTSRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=	${WRKDIR}/${OCTSRC}/src
 
-LIB_DEPENDS+=	libcfitsio.so:${PORTSDIR}/astro/cfitsio
+LIB_DEPENDS+=	libcfitsio.so:astro/cfitsio
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-fpl/Makefile b/math/octave-forge-fpl/Makefile
index 9be6e0143067..cf48f66fa7cc 100644
--- a/math/octave-forge-fpl/Makefile
+++ b/math/octave-forge-fpl/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}
 
-RUN_DEPENDS+=	dx:${PORTSDIR}/graphics/opendx
+RUN_DEPENDS+=	dx:graphics/opendx
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile
index e8acdde016a6..f9ee65bdcb1e 100644
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -17,7 +17,7 @@ OCTSRC=		${OCTAVE_PKGNAME}_tmp
 
 WRKSRC=		${WRKDIR}/${OCTSRC}
 
-RUN_DEPENDS+=	py*-lxml>=0:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS+=	py*-lxml>=0:devel/py-lxml
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile
index 01033f2f1652..5b5b4a996b6c 100644
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libgsl.so:math/gsl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	HOME=${WRKSRC}
diff --git a/math/octave-forge-interval/Makefile b/math/octave-forge-interval/Makefile
index 66ee2b8d2372..ad6d900e7775 100644
--- a/math/octave-forge-interval/Makefile
+++ b/math/octave-forge-interval/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	libmpfr.so:math/mpfr
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
diff --git a/math/octave-forge-ltfat/Makefile b/math/octave-forge-ltfat/Makefile
index cd25287577df..c2cc375d5f12 100644
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libcblas.so:${PORTSDIR}/math/cblas
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libportaudio.so:audio/portaudio \
+		libcblas.so:math/cblas
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile
index 004cf8d936a9..b4640885df44 100644
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:${PORTSDIR}/math/octave-forge-general
-RUN_DEPENDS+=	${TARBALLS_DIR}/geometry.tar.gz:${PORTSDIR}/math/octave-forge-geometry
-RUN_DEPENDS+=	${TARBALLS_DIR}/linear-algebra.tar.gz:${PORTSDIR}/math/octave-forge-linear-algebra
+RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:math/octave-forge-general
+RUN_DEPENDS+=	${TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry
+RUN_DEPENDS+=	${TARBALLS_DIR}/linear-algebra.tar.gz:math/octave-forge-linear-algebra
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile
index cdaf74e9a3e2..e0a1cf16b758 100644
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@@ -18,7 +18,7 @@ OCTSRC=		${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:${PORTSDIR}/math/octave-forge-general
+RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:math/octave-forge-general
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-msh/Makefile b/math/octave-forge-msh/Makefile
index fa4a958db57a..c8336fe53a05 100644
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@@ -19,8 +19,8 @@ OCTSRC=		${OCTAVE_PKGNAME}
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 GNU_CONFIGURE=	yes
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/splines.tar.gz:${PORTSDIR}/math/octave-forge-splines
-RUN_DEPENDS+=	gmsh:${PORTSDIR}/cad/gmsh
+RUN_DEPENDS+=	${TARBALLS_DIR}/splines.tar.gz:math/octave-forge-splines
+RUN_DEPENDS+=	gmsh:cad/gmsh
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-ncarray/Makefile b/math/octave-forge-ncarray/Makefile
index 119cd370f33f..649f935ae541 100644
--- a/math/octave-forge-ncarray/Makefile
+++ b/math/octave-forge-ncarray/Makefile
@@ -18,8 +18,8 @@ OCTSRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/netcdf.tar.gz:${PORTSDIR}/math/octave-forge-netcdf
-RUN_DEPENDS+=	${TARBALLS_DIR}/statistics.tar.gz:${PORTSDIR}/math/octave-forge-statistics
+RUN_DEPENDS+=	${TARBALLS_DIR}/netcdf.tar.gz:math/octave-forge-netcdf
+RUN_DEPENDS+=	${TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-netcdf/Makefile b/math/octave-forge-netcdf/Makefile
index c1edd4c2493c..fd57c22f9736 100644
--- a/math/octave-forge-netcdf/Makefile
+++ b/math/octave-forge-netcdf/Makefile
@@ -17,7 +17,7 @@ OCTSRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-LIB_DEPENDS+=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-ocs/Makefile b/math/octave-forge-ocs/Makefile
index 9ef7264a45e1..94f4d482aa7b 100644
--- a/math/octave-forge-ocs/Makefile
+++ b/math/octave-forge-ocs/Makefile
@@ -18,7 +18,7 @@ OCTSRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/odepkg.tar.gz:${PORTSDIR}/math/octave-forge-odepkg
+RUN_DEPENDS+=	${TARBALLS_DIR}/odepkg.tar.gz:math/octave-forge-odepkg
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-oct2mat/Makefile b/math/octave-forge-oct2mat/Makefile
index 4b183233065f..2f0f7fbda05e 100644
--- a/math/octave-forge-oct2mat/Makefile
+++ b/math/octave-forge-oct2mat/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/io.tar.gz:${PORTSDIR}/math/octave-forge-io
+RUN_DEPENDS+=	${TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 .include <bsd.port.mk>
diff --git a/math/octave-forge-octcdf/Makefile b/math/octave-forge-octcdf/Makefile
index 4c24e3f26433..da64b1613b39 100644
--- a/math/octave-forge-octcdf/Makefile
+++ b/math/octave-forge-octcdf/Makefile
@@ -18,7 +18,7 @@ OCTSRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-LIB_DEPENDS+=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile
index 27c70e5d1f47..43260feb761a 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -18,7 +18,7 @@ OCTSRC=		${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-LIB_DEPENDS+=	libproj.so:${PORTSDIR}/graphics/proj
+LIB_DEPENDS+=	libproj.so:graphics/proj
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile
index d86c7b14bf8e..425c1ed2ad98 100644
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -14,7 +14,7 @@ OCTSRC=		${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/struct.tar.gz:${PORTSDIR}/math/octave-forge-struct
+RUN_DEPENDS+=	${TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
 
 GNU_CONFIGURE=	yes
 
diff --git a/math/octave-forge-secs1d/Makefile b/math/octave-forge-secs1d/Makefile
index 8aeae49481b6..96abbbb07032 100644
--- a/math/octave-forge-secs1d/Makefile
+++ b/math/octave-forge-secs1d/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${DISTNAME}
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/bim.tar.gz:${PORTSDIR}/math/octave-forge-bim
+RUN_DEPENDS+=	${TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-secs3d/Makefile b/math/octave-forge-secs3d/Makefile
index 4f231231a8e6..b621261aef06 100644
--- a/math/octave-forge-secs3d/Makefile
+++ b/math/octave-forge-secs3d/Makefile
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${DISTNAME}
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/fpl.tar.gz:${PORTSDIR}/math/octave-forge-fpl
-RUN_DEPENDS+=	${TARBALLS_DIR}/bim.tar.gz:${PORTSDIR}/math/octave-forge-bim
+RUN_DEPENDS+=	${TARBALLS_DIR}/fpl.tar.gz:math/octave-forge-fpl
+RUN_DEPENDS+=	${TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-signal/Makefile b/math/octave-forge-signal/Makefile
index 37a27e77610a..df8f0ebc3309 100644
--- a/math/octave-forge-signal/Makefile
+++ b/math/octave-forge-signal/Makefile
@@ -18,7 +18,7 @@ OCTSRC=		${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/control.tar.gz:${PORTSDIR}/math/octave-forge-control
+RUN_DEPENDS+=	${TARBALLS_DIR}/control.tar.gz:math/octave-forge-control
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-sockets/Makefile b/math/octave-forge-sockets/Makefile
index ffc212fd8d50..7c51f835e3c9 100644
--- a/math/octave-forge-sockets/Makefile
+++ b/math/octave-forge-sockets/Makefile
@@ -18,7 +18,7 @@ OCTSRC=		octave-${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-BUILD_DEPENDS+=	gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS+=	gsed:textproc/gsed
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-sparsersb/Makefile b/math/octave-forge-sparsersb/Makefile
index fee9b0159eb0..707fea891e87 100644
--- a/math/octave-forge-sparsersb/Makefile
+++ b/math/octave-forge-sparsersb/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/librsb.a:${PORTSDIR}/math/librsb
+BUILD_DEPENDS=	${LOCALBASE}/lib/librsb.a:math/librsb
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
diff --git a/math/octave-forge-statistics/Makefile b/math/octave-forge-statistics/Makefile
index ffa3114e54ab..5d21bc1a3941 100644
--- a/math/octave-forge-statistics/Makefile
+++ b/math/octave-forge-statistics/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${DISTNAME}
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/io.tar.gz:${PORTSDIR}/math/octave-forge-io
+RUN_DEPENDS+=	${TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-symbolic/Makefile b/math/octave-forge-symbolic/Makefile
index 5d820523e04e..59681cc2bddb 100644
--- a/math/octave-forge-symbolic/Makefile
+++ b/math/octave-forge-symbolic/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
-BUILD_DEPENDS+=	isympy:${PORTSDIR}/math/py-sympy
-RUN_DEPENDS+=	isympy:${PORTSDIR}/math/py-sympy
+BUILD_DEPENDS+=	isympy:math/py-sympy
+RUN_DEPENDS+=	isympy:math/py-sympy
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
diff --git a/math/octave-forge-tisean/Makefile b/math/octave-forge-tisean/Makefile
index af458e95d348..2ed9482f0812 100644
--- a/math/octave-forge-tisean/Makefile
+++ b/math/octave-forge-tisean/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
-RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:${PORTSDIR}/math/octave-forge-signal
+RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:math/octave-forge-signal
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile
index e2368b4f1020..8f60826de129 100644
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@@ -21,7 +21,7 @@ OCTSRC=		${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-xraylib/Makefile b/math/octave-forge-xraylib/Makefile
index de7e75eb858e..0512c79f3413 100644
--- a/math/octave-forge-xraylib/Makefile
+++ b/math/octave-forge-xraylib/Makefile
@@ -16,7 +16,7 @@ BROKEN=		does not build with octave-4.0.0
 
 GNU_CONFIGURE=	yes
 
-BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS+=	bash:shells/bash
 
 post-patch:
 	@${REINPLACE_CMD} s+/bin/bash+${LOCALBASE}/bin/bash+g ${WRKSRC}/src/xraylib/src/*.sh
diff --git a/math/octave-forge-zenity/Makefile b/math/octave-forge-zenity/Makefile
index 02edf0d5b5e7..d0dbf392bb95 100644
--- a/math/octave-forge-zenity/Makefile
+++ b/math/octave-forge-zenity/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 
-RUN_DEPENDS+=	zenity:${PORTSDIR}/x11/zenity
+RUN_DEPENDS+=	zenity:x11/zenity
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 .include <bsd.port.mk>
diff --git a/math/octave-forge-zeromq/Makefile b/math/octave-forge-zeromq/Makefile
index 9f518706f31c..01adfd020199 100644
--- a/math/octave-forge-zeromq/Makefile
+++ b/math/octave-forge-zeromq/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
-LIB_DEPENDS+=	libzmq.so:${PORTSDIR}/net/libzmq4
+LIB_DEPENDS+=	libzmq.so:net/libzmq4
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index ee2c501ce22b..31bdef4c63cd 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -35,13 +35,13 @@ TARBALLS_DIR=		${LOCALBASE}/share/octave/tarballs
 .for OPT in ${OPTIONS_DEFINE}
 . if ${OPTIONS_DEFINE:MGENERATE_HTML} == ${OPT} || ${OPTIONS_DEFINE:MPT_BR} == ${OPT}
 ${OPT}_DESC=		Install package: ${OPT:tl}
-${OPT}_RUN_DEPENDS=	${TARBALLS_DIR}/${OPT:tl}.tar.gz:${PORTSDIR}/math/octave-forge-${OPT:tl}
+${OPT}_RUN_DEPENDS=	${TARBALLS_DIR}/${OPT:tl}.tar.gz:math/octave-forge-${OPT:tl}
 . else
 ${OPT}_DESC=		Install package: ${OPT:tl:S/_/-/g}
 .  if ${OPTIONS_DEFINE:MBENCHMARK} == ${OPT}
-${OPT}_RUN_DEPENDS=	${TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:${PORTSDIR}/benchmarks/octave-forge-${OPT:tl:S/_/-/g}
+${OPT}_RUN_DEPENDS=	${TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:benchmarks/octave-forge-${OPT:tl:S/_/-/g}
 .  else
-${OPT}_RUN_DEPENDS=	${TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:${PORTSDIR}/math/octave-forge-${OPT:tl:S/_/-/g}
+${OPT}_RUN_DEPENDS=	${TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:math/octave-forge-${OPT:tl:S/_/-/g}
 .  endif
 . endif
 .endfor
diff --git a/math/octave/Makefile b/math/octave/Makefile
index ece66f8f7c54..c490b7c9f070 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -12,28 +12,28 @@ COMMENT=	High-level interactive language for numerical computations
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
-		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		gsed:${PORTSDIR}/textproc/gsed \
-		${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
-		gsed:${PORTSDIR}/textproc/gsed \
-		${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
-LIB_DEPENDS=	libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick \
-		libarpack.so:${PORTSDIR}/math/arpack \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libftgl.so:${PORTSDIR}/graphics/ftgl \
-		libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libqhull.so.5:${PORTSDIR}/math/qhull5 \
-		libqrupdate.so:${PORTSDIR}/math/qrupdate \
-		libumfpack.so:${PORTSDIR}/math/suitesparse \
-		libglpk.so:${PORTSDIR}/math/glpk \
-		libgl2ps.so:${PORTSDIR}/print/gl2ps \
-		libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+BUILD_DEPENDS=	gnuplot:math/gnuplot \
+		${LOCALBASE}/bin/gperf:devel/gperf \
+		gsed:textproc/gsed \
+		${LOCALBASE}/bin/makeinfo:print/texinfo
+RUN_DEPENDS=	gnuplot:math/gnuplot \
+		gsed:textproc/gsed \
+		${LOCALBASE}/bin/makeinfo:print/texinfo
+LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick \
+		libarpack.so:math/arpack \
+		libcurl.so:ftp/curl \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libfltk.so:x11-toolkits/fltk \
+		libftgl.so:graphics/ftgl \
+		libhdf5.so:science/hdf5 \
+		libpcre.so:devel/pcre \
+		libqhull.so.5:math/qhull5 \
+		libqrupdate.so:math/qrupdate \
+		libumfpack.so:math/suitesparse \
+		libglpk.so:math/glpk \
+		libgl2ps.so:print/gl2ps \
+		libqscintilla2.so:devel/qscintilla2
 
 USES=		charsetfix fortran gmake libtool perl5 pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 0dc11cf132c5..f50a5d9f10f3 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -27,9 +27,9 @@ OPTIONS_DEFINE=	MOTIF NLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMOTIF}
-LIB_DEPENDS+=	libplot.so:${PORTSDIR}/graphics/plotutils \
-		libXbae.so:${PORTSDIR}/x11-toolkits/xbae \
-		libXmHTML.so:${PORTSDIR}/x11-toolkits/xmhtml
+LIB_DEPENDS+=	libplot.so:graphics/plotutils \
+		libXbae.so:x11-toolkits/xbae \
+		libXmHTML.so:x11-toolkits/xmhtml
 USES+=		motif
 CONFIGURE_ARGS+=	--with-motif
 .else
diff --git a/math/open-axiom/Makefile b/math/open-axiom/Makefile
index be2814546ae1..2ebebb2dfbf9 100644
--- a/math/open-axiom/Makefile
+++ b/math/open-axiom/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Computer algebra system
 
 BROKEN=		bootsys goes in an infinite loop during build
 
-BUILD_DEPENDS=	sbcl:${PORTSDIR}/lang/sbcl \
-		noweb:${PORTSDIR}/devel/noweb
+BUILD_DEPENDS=	sbcl:lang/sbcl \
+		noweb:devel/noweb
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lisp=sbcl
diff --git a/math/orpie/Makefile b/math/orpie/Makefile
index 299ae2e33887..52ff72b4a4a9 100644
--- a/math/orpie/Makefile
+++ b/math/orpie/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fullscreen RPN calculator for the console
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		gmake ncurses
 USE_OCAML=	yes
diff --git a/math/p5-AI-Perceptron/Makefile b/math/p5-AI-Perceptron/Makefile
index a25f9ba3b0d4..0241c4177b4b 100644
--- a/math/p5-AI-Perceptron/Makefile
+++ b/math/p5-AI-Perceptron/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for introducing to internal operations of neural networks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-accessors>=0:${PORTSDIR}/devel/p5-accessors
+BUILD_DEPENDS=	p5-accessors>=0:devel/p5-accessors
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Algorithm-CurveFit/Makefile b/math/p5-Algorithm-CurveFit/Makefile
index 0fb9d30cabf9..f3b67a5fc614 100644
--- a/math/p5-Algorithm-CurveFit/Makefile
+++ b/math/p5-Algorithm-CurveFit/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Nonlinear Least Squares Fitting
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-MatrixReal>=0:${PORTSDIR}/math/p5-Math-MatrixReal \
-		p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic
+BUILD_DEPENDS=	p5-Math-MatrixReal>=0:math/p5-Math-MatrixReal \
+		p5-Math-Symbolic>=0:math/p5-Math-Symbolic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Algorithm-KMeans/Makefile b/math/p5-Algorithm-KMeans/Makefile
index a21599d258b9..933d6d0ea51f 100644
--- a/math/p5-Algorithm-KMeans/Makefile
+++ b/math/p5-Algorithm-KMeans/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Clustering multi-dimensional data with a pure-Perl implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Graphics-GnuplotIF>=1.4:${PORTSDIR}/graphics/p5-Graphics-GnuplotIF \
-		p5-Math-GSL>=0.26:${PORTSDIR}/math/p5-Math-GSL \
-		p5-Math-Random>=0.71:${PORTSDIR}/math/p5-Math-Random
+BUILD_DEPENDS=	p5-Graphics-GnuplotIF>=1.4:graphics/p5-Graphics-GnuplotIF \
+		p5-Math-GSL>=0.26:math/p5-Math-GSL \
+		p5-Math-Random>=0.71:math/p5-Math-Random
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Bit-Vector/Makefile b/math/p5-Bit-Vector/Makefile
index 64131fabca21..7a3cc9dd39e9 100644
--- a/math/p5-Bit-Vector/Makefile
+++ b/math/p5-Bit-Vector/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library of advanced math functions that includes a Perl OO module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan
+BUILD_DEPENDS=	p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-CAD-Calc/Makefile b/math/p5-CAD-Calc/Makefile
index f5f13c18df13..1edcf0cdfe1a 100644
--- a/math/p5-CAD-Calc/Makefile
+++ b/math/p5-CAD-Calc/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Generic cad-related geometry calculations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Geometry-Planar-Offset>=0:${PORTSDIR}/math/p5-Math-Geometry-Planar-Offset \
-		p5-Math-Round-Var>=0:${PORTSDIR}/math/p5-Math-Round-Var \
-		p5-Math-Vec>=0:${PORTSDIR}/math/p5-Math-Vec
+BUILD_DEPENDS=	p5-Math-Geometry-Planar-Offset>=0:math/p5-Math-Geometry-Planar-Offset \
+		p5-Math-Round-Var>=0:math/p5-Math-Round-Var \
+		p5-Math-Vec>=0:math/p5-Math-Vec
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Chart-Math-Axis/Makefile b/math/p5-Chart-Math-Axis/Makefile
index 997a3549cde5..448465e0e500 100644
--- a/math/p5-Chart-Math-Axis/Makefile
+++ b/math/p5-Chart-Math-Axis/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implements an algorithm to find good values for chart axis
 
-BUILD_DEPENDS=	p5-Params-Util>=0.15:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Params-Util>=0.15:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-GIS-Distance-Fast/Makefile b/math/p5-GIS-Distance-Fast/Makefile
index 5e9203a23903..379e00c75c86 100644
--- a/math/p5-GIS-Distance-Fast/Makefile
+++ b/math/p5-GIS-Distance-Fast/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	C implementation of GIS::Distance formulas
 
-BUILD_DEPENDS=	p5-GIS-Distance>=0.07:${PORTSDIR}/math/p5-GIS-Distance
+BUILD_DEPENDS=	p5-GIS-Distance>=0.07:math/p5-GIS-Distance
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-GIS-Distance-Lite/Makefile b/math/p5-GIS-Distance-Lite/Makefile
index 900f53bba26c..2fb9a923360f 100644
--- a/math/p5-GIS-Distance-Lite/Makefile
+++ b/math/p5-GIS-Distance-Lite/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Calculate geographic distances in geodetic WGS84 format
 
-RUN_DEPENDS=	p5-Math-Complex>1.0.3:${PORTSDIR}/math/p5-Math-Complex
+RUN_DEPENDS=	p5-Math-Complex>1.0.3:math/p5-Math-Complex
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-GIS-Distance/Makefile b/math/p5-GIS-Distance/Makefile
index e12d2b0b6c75..0fff8b078d4e 100644
--- a/math/p5-GIS-Distance/Makefile
+++ b/math/p5-GIS-Distance/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Calculate geographic distances
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Measure>=0:${PORTSDIR}/devel/p5-Class-Measure \
-		p5-Moo>=1.006000:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>=1:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean \
-		p5-strictures>=1:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Class-Measure>=0:devel/p5-Class-Measure \
+		p5-Moo>=1.006000:devel/p5-Moo \
+		p5-Type-Tiny>=1:devel/p5-Type-Tiny \
+		p5-namespace-clean>=0:devel/p5-namespace-clean \
+		p5-strictures>=1:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/math/p5-Geo-Distance-XS/Makefile b/math/p5-Geo-Distance-XS/Makefile
index 94ca9b73a75e..dd8b696ba97b 100644
--- a/math/p5-Geo-Distance-XS/Makefile
+++ b/math/p5-Geo-Distance-XS/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Calculate Distances and Closest Locations faster
 
-BUILD_DEPENDS=	p5-Geo-Distance>=0.16:${PORTSDIR}/math/p5-Geo-Distance
+BUILD_DEPENDS=	p5-Geo-Distance>=0.16:math/p5-Geo-Distance
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.94:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.94:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Geo-Distance/Makefile b/math/p5-Geo-Distance/Makefile
index 0d0b0b55421e..f2cb1f0e88a4 100644
--- a/math/p5-Geo-Distance/Makefile
+++ b/math/p5-Geo-Distance/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Calculate Distances and Closest Locations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>=0.007:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0.007:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Graph/Makefile b/math/p5-Graph/Makefile
index a1ea9305eeeb..223ff7e577df 100644
--- a/math/p5-Graph/Makefile
+++ b/math/p5-Graph/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Graph, the Perl module for graph operations
 
-BUILD_DEPENDS=	p5-Heap>=0:${PORTSDIR}/devel/p5-Heap
+BUILD_DEPENDS=	p5-Heap>=0:devel/p5-Heap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-BaseCnv/Makefile b/math/p5-Math-BaseCnv/Makefile
index 12ba72ab69db..efd5ce48f9e5 100644
--- a/math/p5-Math-BaseCnv/Makefile
+++ b/math/p5-Math-BaseCnv/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Fast functions to convert between number Bases
 
 LICENSE=	GPLv3
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/math/p5-Math-BigInt-FastCalc/Makefile b/math/p5-Math-BigInt-FastCalc/Makefile
index 948dcbd4e6b1..e36c4b69f692 100644
--- a/math/p5-Math-BigInt-FastCalc/Makefile
+++ b/math/p5-Math-BigInt-FastCalc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Math::BigInt::Calc with some XS for more speed
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-BigInt>=1.999714:${PORTSDIR}/math/p5-Math-BigInt
+BUILD_DEPENDS=	p5-Math-BigInt>=1.999714:math/p5-Math-BigInt
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.251
diff --git a/math/p5-Math-BigInt-GMP/Makefile b/math/p5-Math-BigInt-GMP/Makefile
index 632cfc843a88..4436465eb12c 100644
--- a/math/p5-Math-BigInt-GMP/Makefile
+++ b/math/p5-Math-BigInt-GMP/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Math::BigInt::GMP - Use the GMP library for Math::BigInt routines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-BigInt>=1.999714:${PORTSDIR}/math/p5-Math-BigInt
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+BUILD_DEPENDS=	p5-Math-BigInt>=1.999714:math/p5-Math-BigInt
+LIB_DEPENDS=	libgmp.so:math/gmp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-BigInt-Pari/Makefile b/math/p5-Math-BigInt-Pari/Makefile
index de111a5a417d..00c9c3ed0adc 100644
--- a/math/p5-Math-BigInt-Pari/Makefile
+++ b/math/p5-Math-BigInt-Pari/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Use Math::Pari for Math::BigInt routines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-BigInt>=1.999714:${PORTSDIR}/math/p5-Math-BigInt \
-		p5-Math-Pari>=2.010709:${PORTSDIR}/math/p5-Math-Pari
+BUILD_DEPENDS=	p5-Math-BigInt>=1.999714:math/p5-Math-BigInt \
+		p5-Math-Pari>=2.010709:math/p5-Math-Pari
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/math/p5-Math-BigInt/Makefile b/math/p5-Math-BigInt/Makefile
index ebfed2e52d08..34307cfb5e0e 100644
--- a/math/p5-Math-BigInt/Makefile
+++ b/math/p5-Math-BigInt/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Arbitrary size integer math perl package
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Complex>=1.39:${PORTSDIR}/math/p5-Math-Complex
+BUILD_DEPENDS=	p5-Math-Complex>=1.39:math/p5-Math-Complex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Currency/Makefile b/math/p5-Math-Currency/Makefile
index 31003a2cf3af..cb7983c4ca46 100644
--- a/math/p5-Math-Currency/Makefile
+++ b/math/p5-Math-Currency/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for exact currency math with formatting and rounding
 
-BUILD_DEPENDS=	p5-Math-FixedPrecision>=0:${PORTSDIR}/math/p5-Math-FixedPrecision
+BUILD_DEPENDS=	p5-Math-FixedPrecision>=0:math/p5-Math-FixedPrecision
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-GMP/Makefile b/math/p5-Math-GMP/Makefile
index 48a081ea5d83..d234ff01aa29 100644
--- a/math/p5-Math-GMP/Makefile
+++ b/math/p5-Math-GMP/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl module that provides an interface to the GMP library
 LICENSE=	LGPL20 LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckLib>=0.9:${PORTSDIR}/devel/p5-Devel-CheckLib
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+BUILD_DEPENDS=	p5-Devel-CheckLib>=0.9:devel/p5-Devel-CheckLib
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS=	INC=-I${LOCALBASE}/include LIBS="-L${LOCALBASE}/lib -lgmp"
 USES=		perl5
diff --git a/math/p5-Math-GMPf/Makefile b/math/p5-Math-GMPf/Makefile
index 8a1f58e9d128..f94ef20f37ec 100644
--- a/math/p5-Math-GMPf/Makefile
+++ b/math/p5-Math-GMPf/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl interface to the GMP library floating point (mpf) functions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
-TEST_DEPENDS=	p5-Math-GMP>=0:${PORTSDIR}/math/p5-Math-GMP \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+LIB_DEPENDS=	libgmp.so:math/gmp
+TEST_DEPENDS=	p5-Math-GMP>=0:math/p5-Math-GMP \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		localbase perl5
diff --git a/math/p5-Math-GMPq/Makefile b/math/p5-Math-GMPq/Makefile
index e7aa52550f94..80ac7d2dfa2f 100644
--- a/math/p5-Math-GMPq/Makefile
+++ b/math/p5-Math-GMPq/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl interface to the GMP library rational (mpq) functions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
-TEST_DEPENDS=	p5-Math-GMP>=0:${PORTSDIR}/math/p5-Math-GMP \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+LIB_DEPENDS=	libgmp.so:math/gmp
+TEST_DEPENDS=	p5-Math-GMP>=0:math/p5-Math-GMP \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		localbase perl5
diff --git a/math/p5-Math-GMPz/Makefile b/math/p5-Math-GMPz/Makefile
index 8a14d5491632..0fff887bb7ab 100644
--- a/math/p5-Math-GMPz/Makefile
+++ b/math/p5-Math-GMPz/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl interface to the GMP library integer (mpz) functions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
-TEST_DEPENDS=	p5-Math-GMP>=0:${PORTSDIR}/math/p5-Math-GMP \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+LIB_DEPENDS=	libgmp.so:math/gmp
+TEST_DEPENDS=	p5-Math-GMP>=0:math/p5-Math-GMP \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		localbase perl5
diff --git a/math/p5-Math-GSL/Makefile b/math/p5-Math-GSL/Makefile
index 91cc7ff429b8..67e5830923e7 100644
--- a/math/p5-Math-GSL/Makefile
+++ b/math/p5-Math-GSL/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl interface to GNU Scientific Library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PkgConfig>=0.07720:${PORTSDIR}/devel/p5-PkgConfig
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
-TEST_DEPENDS=	p5-Test-Class>=0.12:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Most>=0.31:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-Taint>=1.06:${PORTSDIR}/devel/p5-Test-Taint
+BUILD_DEPENDS=	p5-PkgConfig>=0.07720:devel/p5-PkgConfig
+LIB_DEPENDS=	libgsl.so:math/gsl
+TEST_DEPENDS=	p5-Test-Class>=0.12:devel/p5-Test-Class \
+		p5-Test-Exception>=0.21:devel/p5-Test-Exception \
+		p5-Test-Most>=0.31:devel/p5-Test-Most \
+		p5-Test-Taint>=1.06:devel/p5-Test-Taint
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/math/p5-Math-Geometry-Planar-Offset/Makefile b/math/p5-Math-Geometry-Planar-Offset/Makefile
index a9578bfb9341..c01a43296787 100644
--- a/math/p5-Math-Geometry-Planar-Offset/Makefile
+++ b/math/p5-Math-Geometry-Planar-Offset/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Calculate offset polygons
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Geometry-Planar/Makefile b/math/p5-Math-Geometry-Planar/Makefile
index f368b9867a18..888950ab72c4 100644
--- a/math/p5-Math-Geometry-Planar/Makefile
+++ b/math/p5-Math-Geometry-Planar/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Collection of planar geometry functions
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Math-Geometry-Planar-GPC>=0:${PORTSDIR}/math/p5-Math-Geometry-Planar-GPC \
-		p5-Math-Geometry-Planar-Offset>=0:${PORTSDIR}/math/p5-Math-Geometry-Planar-Offset
+BUILD_DEPENDS=	p5-Math-Geometry-Planar-GPC>=0:math/p5-Math-Geometry-Planar-GPC \
+		p5-Math-Geometry-Planar-Offset>=0:math/p5-Math-Geometry-Planar-Offset
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Geometry-Voronoi/Makefile b/math/p5-Math-Geometry-Voronoi/Makefile
index 5b5478384ae3..48a23c13662e 100644
--- a/math/p5-Math-Geometry-Voronoi/Makefile
+++ b/math/p5-Math-Geometry-Voronoi/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl Module to compute Voronoi diagrams from sets of points
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.18:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Class-Accessor>=0.18:devel/p5-Class-Accessor \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Geometry/Makefile b/math/p5-Math-Geometry/Makefile
index 74c6b45135b2..697f82714076 100644
--- a/math/p5-Math-Geometry/Makefile
+++ b/math/p5-Math-Geometry/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Geometry related functions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Matrix>=0:${PORTSDIR}/math/p5-Math-Matrix
+BUILD_DEPENDS=	p5-Math-Matrix>=0:math/p5-Math-Matrix
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/math/p5-Math-Int128/Makefile b/math/p5-Math-Int128/Makefile
index 73d458bddfa6..ca6eaad39223 100644
--- a/math/p5-Math-Int128/Makefile
+++ b/math/p5-Math-Int128/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Manipulate 128 bits integers in Perl
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Math-Int64>=0.51:${PORTSDIR}/math/p5-Math-Int64
-RUN_DEPENDS=	p5-Math-Int64>=0.51:${PORTSDIR}/math/p5-Math-Int64
+BUILD_DEPENDS=	p5-Math-Int64>=0.51:math/p5-Math-Int64
+RUN_DEPENDS=	p5-Math-Int64>=0.51:math/p5-Math-Int64
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-MPC/Makefile b/math/p5-Math-MPC/Makefile
index 882d5661bae2..cb9799b79874 100644
--- a/math/p5-Math-MPC/Makefile
+++ b/math/p5-Math-MPC/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl interface to MPC Library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-MPFR>=3.23:${PORTSDIR}/math/p5-Math-MPFR
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpc.so:${PORTSDIR}/math/mpc \
-		libmpfr.so:${PORTSDIR}/math/mpfr
+BUILD_DEPENDS=	p5-Math-MPFR>=3.23:math/p5-Math-MPFR
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpc.so:math/mpc \
+		libmpfr.so:math/mpfr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_ENV=	INC="-I${LOCALBASE}/include"
diff --git a/math/p5-Math-MPFR/Makefile b/math/p5-Math-MPFR/Makefile
index ad7d707b0525..f6f1a60ab355 100644
--- a/math/p5-Math-MPFR/Makefile
+++ b/math/p5-Math-MPFR/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl interface to MPFR Library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr
-TEST_DEPENDS=	p5-Math-GMP>=0:${PORTSDIR}/math/p5-Math-GMP \
-		p5-Math-GMPf>=0:${PORTSDIR}/math/p5-Math-GMPf \
-		p5-Math-GMPq>=0:${PORTSDIR}/math/p5-Math-GMPq \
-		p5-Math-GMPz>=0:${PORTSDIR}/math/p5-Math-GMPz
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr
+TEST_DEPENDS=	p5-Math-GMP>=0:math/p5-Math-GMP \
+		p5-Math-GMPf>=0:math/p5-Math-GMPf \
+		p5-Math-GMPq>=0:math/p5-Math-GMPq \
+		p5-Math-GMPz>=0:math/p5-Math-GMPz
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-MatrixReal/Makefile b/math/p5-Math-MatrixReal/Makefile
index 5c6d623d0c01..3b2956fac0f6 100644
--- a/math/p5-Math-MatrixReal/Makefile
+++ b/math/p5-Math-MatrixReal/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module implementing a Matrix of Reals
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index 90db583a4c4c..fdbc0c2d22e1 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/00$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PARI - numerical/scientific/number-theoretic calculations
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/math/pari:configure
-LIB_DEPENDS=	libpari.so:${PORTSDIR}/math/pari
+BUILD_DEPENDS=	${NONEXISTENT}:math/pari:configure
+LIB_DEPENDS=	libpari.so:math/pari
 
 USES=		perl5 zip
 USE_PERL5=	configure
diff --git a/math/p5-Math-Polygon-Tree/Makefile b/math/p5-Math-Polygon-Tree/Makefile
index 6ebf51779e5d..b6a1e491ea66 100644
--- a/math/p5-Math-Polygon-Tree/Makefile
+++ b/math/p5-Math-Polygon-Tree/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Class for fast check if point is inside polygon
 
-BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Math-Geometry-Planar-GPC-PolygonXS>=0:${PORTSDIR}/math/p5-Math-Geometry-Planar-GPC-PolygonXS
+BUILD_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Math-Geometry-Planar-GPC-PolygonXS>=0:math/p5-Math-Geometry-Planar-GPC-PolygonXS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS:=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+TEST_DEPENDS:=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-Polygon/Makefile b/math/p5-Math-Polygon/Makefile
index 6e5df0106fc4..05bf3a2ec8ac 100644
--- a/math/p5-Math-Polygon/Makefile
+++ b/math/p5-Math-Polygon/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Class for Maintaining Polygon Data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-Polynomial-Solve/Makefile b/math/p5-Math-Polynomial-Solve/Makefile
index a81075d21301..fd2a3b318b09 100644
--- a/math/p5-Math-Polynomial-Solve/Makefile
+++ b/math/p5-Math-Polynomial-Solve/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Find the roots of polynomial equations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Utils>=1.06:${PORTSDIR}/math/p5-Math-Utils
+BUILD_DEPENDS=	p5-Math-Utils>=1.06:math/p5-Math-Utils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/math/p5-Math-Prime-XS/Makefile b/math/p5-Math-Prime-XS/Makefile
index 77988dc296dd..8b3ca1f54ffa 100644
--- a/math/p5-Math-Prime-XS/Makefile
+++ b/math/p5-Math-Prime-XS/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Detect and calculate prime numbers with deterministic tests
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-boolean>=0:${PORTSDIR}/devel/p5-boolean
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-boolean>=0:devel/p5-boolean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/math/p5-Math-RPN/Makefile b/math/p5-Math-RPN/Makefile
index efbccd8b3171..61c2faa483d6 100644
--- a/math/p5-Math-RPN/Makefile
+++ b/math/p5-Math-RPN/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Reverse polish math expression evaluation
 
-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/math/p5-Math-Random-ISAAC-XS/Makefile b/math/p5-Math-Random-ISAAC-XS/Makefile
index b5075ae74132..60580e339be7 100644
--- a/math/p5-Math-Random-ISAAC-XS/Makefile
+++ b/math/p5-Math-Random-ISAAC-XS/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	C implementation of the ISAAC PRNG Algorithm
 
-TEST_DEPENDS=	p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/math/p5-Math-Random-ISAAC/Makefile b/math/p5-Math-Random-ISAAC/Makefile
index bfdd381517a7..357ff01c3855 100644
--- a/math/p5-Math-Random-ISAAC/Makefile
+++ b/math/p5-Math-Random-ISAAC/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Perl interface to the ISAAC PRNG Algorithm
 
-BUILD_DEPENDS=	p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings
+BUILD_DEPENDS=	p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-Math-Random-ISAAC-XS>0:${PORTSDIR}/math/p5-Math-Random-ISAAC-XS
+		p5-Math-Random-ISAAC-XS>0:math/p5-Math-Random-ISAAC-XS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-Random-MT-Auto/Makefile b/math/p5-Math-Random-MT-Auto/Makefile
index 16606d86a2ae..608d2fec35f3 100644
--- a/math/p5-Math-Random-MT-Auto/Makefile
+++ b/math/p5-Math-Random-MT-Auto/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Auto-seeded Mersenne Twister PRNGs
 
-BUILD_DEPENDS=	p5-Exception-Class>=1.32:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Object-InsideOut>=3.88:${PORTSDIR}/devel/p5-Object-InsideOut
+BUILD_DEPENDS=	p5-Exception-Class>=1.32:devel/p5-Exception-Class \
+		p5-Object-InsideOut>=3.88:devel/p5-Object-InsideOut
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+TEST_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-Random-MT/Makefile b/math/p5-Math-Random-MT/Makefile
index 40cc95b790f0..0c1102eba3a3 100644
--- a/math/p5-Math-Random-MT/Makefile
+++ b/math/p5-Math-Random-MT/Makefile
@@ -12,7 +12,7 @@ COMMENT=	The Mersenne Twister PRNG
 
 LICENSE=	BSD3CLAUSE
 
-TEST_DEPENDS=	p5-Test-Number-Delta>=0:${PORTSDIR}/devel/p5-Test-Number-Delta
+TEST_DEPENDS=	p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-Random-OO/Makefile b/math/p5-Math-Random-OO/Makefile
index dc2edae07a2c..812fd7dd8335 100644
--- a/math/p5-Math-Random-OO/Makefile
+++ b/math/p5-Math-Random-OO/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Consistent object-oriented interface for generating random numbers
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Params-Validate>=0.76:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Params-Validate>=0.76:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockRandom>=0.95:${PORTSDIR}/devel/p5-Test-MockRandom \
-		p5-Test-Number-Delta>=0.14:${PORTSDIR}/devel/p5-Test-Number-Delta
+TEST_DEPENDS=	p5-Test-MockRandom>=0.95:devel/p5-Test-MockRandom \
+		p5-Test-Number-Delta>=0.14:devel/p5-Test-Number-Delta
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-Random-Secure/Makefile b/math/p5-Math-Random-Secure/Makefile
index 4f7fc04bc956..8f180d9bb6b9 100644
--- a/math/p5-Math-Random-Secure/Makefile
+++ b/math/p5-Math-Random-Secure/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Cryptographically-secure rand function
 
 LICENSE=	ART20
 
-TEST_DEPENDS=	p5-Test-Warn>0:${PORTSDIR}/devel/p5-Test-Warn
-BUILD_DEPENDS=	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils
-RUN_DEPENDS=	p5-Any-Moose>0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Math-Random-ISAAC>=1.0.1:${PORTSDIR}/math/p5-Math-Random-ISAAC \
-		p5-Crypt-Random-Source>=0.07:${PORTSDIR}/security/p5-Crypt-Random-Source
+TEST_DEPENDS=	p5-Test-Warn>0:devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-List-MoreUtils>0:lang/p5-List-MoreUtils
+RUN_DEPENDS=	p5-Any-Moose>0:devel/p5-Any-Moose \
+		p5-Math-Random-ISAAC>=1.0.1:math/p5-Math-Random-ISAAC \
+		p5-Crypt-Random-Source>=0.07:security/p5-Crypt-Random-Source
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-RandomOrg/Makefile b/math/p5-Math-RandomOrg/Makefile
index 325df7bbadd2..d62efbd8ee1b 100644
--- a/math/p5-Math-RandomOrg/Makefile
+++ b/math/p5-Math-RandomOrg/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Retrieve random numbers and data from random.org
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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/math/p5-Math-Sequence/Makefile b/math/p5-Math-Sequence/Makefile
index eb892908b9a3..ed8cf4c6f563 100644
--- a/math/p5-Math-Sequence/Makefile
+++ b/math/p5-Math-Sequence/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension dealing with mathematic sequences
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Series/Makefile b/math/p5-Math-Series/Makefile
index 3e986b885d8a..38bf354e2f55 100644
--- a/math/p5-Math-Series/Makefile
+++ b/math/p5-Math-Series/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl extension dealing with mathematic series
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Math-Sequence>=0:${PORTSDIR}/math/p5-Math-Sequence
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+		p5-Math-Sequence>=0:math/p5-Math-Sequence
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Spline/Makefile b/math/p5-Math-Spline/Makefile
index 029d24eec238..d094fe2998a7 100644
--- a/math/p5-Math-Spline/Makefile
+++ b/math/p5-Math-Spline/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Cubic Spline Interpolation of data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Derivative>=0:${PORTSDIR}/math/p5-Math-Derivative
+BUILD_DEPENDS=	p5-Math-Derivative>=0:math/p5-Math-Derivative
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Symbolic-Custom-CCompiler/Makefile b/math/p5-Math-Symbolic-Custom-CCompiler/Makefile
index 061d3b51bc67..be303ad2bcce 100644
--- a/math/p5-Math-Symbolic-Custom-CCompiler/Makefile
+++ b/math/p5-Math-Symbolic-Custom-CCompiler/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Compile Math::Symbolic trees to C
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0.509:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Inline>=0.44:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.44:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Math-Symbolic>=0.509:math/p5-Math-Symbolic \
+		p5-Inline>=0.44:devel/p5-Inline \
+		p5-Inline-C>=0.44:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Symbolic-Custom-Contains/Makefile b/math/p5-Math-Symbolic-Custom-Contains/Makefile
index b4348055a885..69bb160feced 100644
--- a/math/p5-Math-Symbolic-Custom-Contains/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Contains/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Find subtrees in Math::Symbolic expressions
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
index b4908025a53c..7fa1bdfd5f35 100644
--- a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
+++ b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Calculate Gaussian Error Propagation
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile b/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile
index 0de9494bc468..6e717ebc4fa6 100644
--- a/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile
+++ b/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Math::Symbolic LaTeX output
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0.201:${PORTSDIR}/math/p5-Math-Symbolic
+BUILD_DEPENDS=	p5-Math-Symbolic>=0.201:math/p5-Math-Symbolic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Symbolic-Custom-Pattern/Makefile b/math/p5-Math-Symbolic-Custom-Pattern/Makefile
index f420008f6abb..cb431b829d10 100644
--- a/math/p5-Math-Symbolic-Custom-Pattern/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Pattern/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pattern matching on Math::Symbolic trees
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0.510:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone
+BUILD_DEPENDS=	p5-Math-Symbolic>=0.510:math/p5-Math-Symbolic \
+		p5-Clone>=0:devel/p5-Clone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-Symbolic-Custom-Simplification/Makefile b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
index a6ea9cad1e12..f88bdcb01dcd 100644
--- a/math/p5-Math-Symbolic-Custom-Simplification/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
@@ -14,7 +14,7 @@ COMMENT=	User defined simplification routines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Symbolic-Custom-Transformation/Makefile b/math/p5-Math-Symbolic-Custom-Transformation/Makefile
index 5da95f8bc780..00c0e3910444 100644
--- a/math/p5-Math-Symbolic-Custom-Transformation/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Transformation/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Transform Math::Symbolic trees
 
-RUN_DEPENDS=	p5-Math-Symbolic>=0.507:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Math-Symbolic-Custom-Pattern>=1.20:${PORTSDIR}/math/p5-Math-Symbolic-Custom-Pattern
+RUN_DEPENDS=	p5-Math-Symbolic>=0.507:math/p5-Math-Symbolic \
+		p5-Math-Symbolic-Custom-Pattern>=1.20:math/p5-Math-Symbolic-Custom-Pattern
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Math-Symbolic/Makefile b/math/p5-Math-Symbolic/Makefile
index 6bedffe3f2a6..5907eb3d0263 100644
--- a/math/p5-Math-Symbolic/Makefile
+++ b/math/p5-Math-Symbolic/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Symbolic calculations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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 shebangfix
diff --git a/math/p5-Math-SymbolicX-BigNum/Makefile b/math/p5-Math-SymbolicX-BigNum/Makefile
index 92d69a22694b..8e5d59a6dc88 100644
--- a/math/p5-Math-SymbolicX-BigNum/Makefile
+++ b/math/p5-Math-SymbolicX-BigNum/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Big number support for the Math::Symbolic parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Math-SymbolicX-ParserExtensionFactory>=0:${PORTSDIR}/math/p5-Math-SymbolicX-ParserExtensionFactory
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+		p5-Math-SymbolicX-ParserExtensionFactory>=0:math/p5-Math-SymbolicX-ParserExtensionFactory
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-SymbolicX-Complex/Makefile b/math/p5-Math-SymbolicX-Complex/Makefile
index f21f801e0939..437b0fd0967e 100644
--- a/math/p5-Math-SymbolicX-Complex/Makefile
+++ b/math/p5-Math-SymbolicX-Complex/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Complex number support for the Math::Symbolic parser
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Math-SymbolicX-ParserExtensionFactory>=0:${PORTSDIR}/math/p5-Math-SymbolicX-ParserExtensionFactory
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+		p5-Math-SymbolicX-ParserExtensionFactory>=0:math/p5-Math-SymbolicX-ParserExtensionFactory
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-SymbolicX-Error/Makefile b/math/p5-Math-SymbolicX-Error/Makefile
index 18e9d0edaff0..a826335a93fd 100644
--- a/math/p5-Math-SymbolicX-Error/Makefile
+++ b/math/p5-Math-SymbolicX-Error/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parser extension for dealing with numeric errors
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Math-SymbolicX-ParserExtensionFactory>=0:${PORTSDIR}/math/p5-Math-SymbolicX-ParserExtensionFactory \
-		p5-Number-WithError>=0:${PORTSDIR}/math/p5-Number-WithError
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+		p5-Math-SymbolicX-ParserExtensionFactory>=0:math/p5-Math-SymbolicX-ParserExtensionFactory \
+		p5-Number-WithError>=0:math/p5-Number-WithError
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-SymbolicX-Inline/Makefile b/math/p5-Math-SymbolicX-Inline/Makefile
index e6923b5887d7..80b5195fd960 100644
--- a/math/p5-Math-SymbolicX-Inline/Makefile
+++ b/math/p5-Math-SymbolicX-Inline/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Inlined Math::Symbolic functions
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Math-Symbolic-Custom-Contains>=0:${PORTSDIR}/math/p5-Math-Symbolic-Custom-Contains
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+		p5-Math-Symbolic-Custom-Contains>=0:math/p5-Math-Symbolic-Custom-Contains
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-SymbolicX-NoSimplification/Makefile b/math/p5-Math-SymbolicX-NoSimplification/Makefile
index f59026ce4d03..715195f33f31 100644
--- a/math/p5-Math-SymbolicX-NoSimplification/Makefile
+++ b/math/p5-Math-SymbolicX-NoSimplification/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Turn off Math::Symbolic simplification
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
index b80c8d60c3ea..732a013f6220 100644
--- a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
+++ b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate parser extensions
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
index f68b8d4c7720..1cc8c7e8259b 100644
--- a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
+++ b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Statistical distributions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Symbolic>=0:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Math-SymbolicX-ParserExtensionFactory>=0:${PORTSDIR}/math/p5-Math-SymbolicX-ParserExtensionFactory
+BUILD_DEPENDS=	p5-Math-Symbolic>=0:math/p5-Math-Symbolic \
+		p5-Math-SymbolicX-ParserExtensionFactory>=0:math/p5-Math-SymbolicX-ParserExtensionFactory
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-LectroTest>=0:${PORTSDIR}/devel/p5-Test-LectroTest
+TEST_DEPENDS=	p5-Test-LectroTest>=0:devel/p5-Test-LectroTest
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-NetCDF/Makefile b/math/p5-NetCDF/Makefile
index 00f90a75b82b..82a48df7131e 100644
--- a/math/p5-NetCDF/Makefile
+++ b/math/p5-NetCDF/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	netcdf-perl-${PORTVERSION}
 MAINTAINER=	rand@meridian-enviro.com
 COMMENT=	Perl5 module to read and write netCDF files
 
-LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 USES=		perl5 fakeroot
 
diff --git a/math/p5-Number-WithError-LaTeX/Makefile b/math/p5-Number-WithError-LaTeX/Makefile
index c42f5f5b0df0..f0e5b10b0f6b 100644
--- a/math/p5-Number-WithError-LaTeX/Makefile
+++ b/math/p5-Number-WithError-LaTeX/Makefile
@@ -14,12 +14,12 @@ COMMENT=	LaTeX output for Number::WithError
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-prefork>=0:${PORTSDIR}/devel/p5-prefork \
-		p5-Number-WithError>=0:${PORTSDIR}/math/p5-Number-WithError \
-		p5-TeX-Encode>=0:${PORTSDIR}/textproc/p5-TeX-Encode
+BUILD_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-prefork>=0:devel/p5-prefork \
+		p5-Number-WithError>=0:math/p5-Number-WithError \
+		p5-TeX-Encode>=0:textproc/p5-TeX-Encode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-LectroTest>=0:${PORTSDIR}/devel/p5-Test-LectroTest
+TEST_DEPENDS=	p5-Test-LectroTest>=0:devel/p5-Test-LectroTest
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Number-WithError/Makefile b/math/p5-Number-WithError/Makefile
index 0af3555d289f..5e226b57a291 100644
--- a/math/p5-Number-WithError/Makefile
+++ b/math/p5-Number-WithError/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Numbers with error propagation and scientific rounding
 
-BUILD_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-prefork>=0:${PORTSDIR}/devel/p5-prefork
+BUILD_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-prefork>=0:devel/p5-prefork
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-LectroTest>=0:${PORTSDIR}/devel/p5-Test-LectroTest
+TEST_DEPENDS=	p5-Test-LectroTest>=0:devel/p5-Test-LectroTest
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Parse-Range/Makefile b/math/p5-Parse-Range/Makefile
index a145f6bd017c..99a15ffd29e1 100644
--- a/math/p5-Parse-Range/Makefile
+++ b/math/p5-Parse-Range/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Parses range definitions and returns an array
 LICENSE=	ART10 BSD3CLAUSE
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Set-IntSpan-Fast-XS/Makefile b/math/p5-Set-IntSpan-Fast-XS/Makefile
index f9b04167d503..08b775a9e036 100644
--- a/math/p5-Set-IntSpan-Fast-XS/Makefile
+++ b/math/p5-Set-IntSpan-Fast-XS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Faster Set::IntSpan::Fast
 
-BUILD_DEPENDS=	p5-Data-Swap>=0.07:${PORTSDIR}/devel/p5-Data-Swap \
-		p5-Set-IntSpan-Fast>=1.13:${PORTSDIR}/math/p5-Set-IntSpan-Fast
+BUILD_DEPENDS=	p5-Data-Swap>=0.07:devel/p5-Data-Swap \
+		p5-Set-IntSpan-Fast>=1.13:math/p5-Set-IntSpan-Fast
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Set-IntSpan-Fast/Makefile b/math/p5-Set-IntSpan-Fast/Makefile
index 14c0465dbcda..46fe4d558efb 100644
--- a/math/p5-Set-IntSpan-Fast/Makefile
+++ b/math/p5-Set-IntSpan-Fast/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Fast handling of sets containing integer spans
 
-BUILD_DEPENDS=	p5-Data-Types>=0:${PORTSDIR}/devel/p5-Data-Types
+BUILD_DEPENDS=	p5-Data-Types>=0:devel/p5-Data-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Statistics-Basic/Makefile b/math/p5-Statistics-Basic/Makefile
index 703980d65d26..125b38a25c59 100644
--- a/math/p5-Statistics-Basic/Makefile
+++ b/math/p5-Statistics-Basic/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Collection of basic statistics modules
 
-BUILD_DEPENDS=	p5-Number-Format>=1.61:${PORTSDIR}/textproc/p5-Number-Format
+BUILD_DEPENDS=	p5-Number-Format>=1.61:textproc/p5-Number-Format
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Statistics-Contingency/Makefile b/math/p5-Statistics-Contingency/Makefile
index d764ff6b7780..237b485d14df 100644
--- a/math/p5-Statistics-Contingency/Makefile
+++ b/math/p5-Statistics-Contingency/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Calculate precision, recall, F1, accuracy, etc
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Statistics-R/Makefile b/math/p5-Statistics-R/Makefile
index 51d8a984e198..0da15ab18b0a 100644
--- a/math/p5-Statistics-R/Makefile
+++ b/math/p5-Statistics-R/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Controls the R interpreter through Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	R:${PORTSDIR}/math/R
-RUN_DEPENDS=	R:${PORTSDIR}/math/R \
-		p5-IPC-Run>=0.10:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common
+BUILD_DEPENDS=	R:math/R
+RUN_DEPENDS=	R:math/R \
+		p5-IPC-Run>=0.10:devel/p5-IPC-Run \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/math/p5-Statistics-TTest/Makefile b/math/p5-Statistics-TTest/Makefile
index cd0e39c317fe..def02e6a2a4c 100644
--- a/math/p5-Statistics-TTest/Makefile
+++ b/math/p5-Statistics-TTest/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to perform T-test on 2 independent samples
 
-BUILD_DEPENDS=	p5-Statistics-Descriptive>=0:${PORTSDIR}/math/p5-Statistics-Descriptive \
-		p5-Statistics-Distributions>=0.07:${PORTSDIR}/math/p5-Statistics-Distributions
+BUILD_DEPENDS=	p5-Statistics-Descriptive>=0:math/p5-Statistics-Descriptive \
+		p5-Statistics-Distributions>=0.07:math/p5-Statistics-Distributions
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Task-Math-Symbolic/Makefile b/math/p5-Task-Math-Symbolic/Makefile
index fd1ac54f71e8..f3859d613e4c 100644
--- a/math/p5-Task-Math-Symbolic/Makefile
+++ b/math/p5-Task-Math-Symbolic/Makefile
@@ -12,19 +12,19 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Math::Symbolic with lots of plugins
 
-RUN_DEPENDS=	p5-Math-Symbolic>=0.163:${PORTSDIR}/math/p5-Math-Symbolic \
-		p5-Math-Symbolic-Custom-CCompiler>=0:${PORTSDIR}/math/p5-Math-Symbolic-Custom-CCompiler \
-		p5-Math-Symbolic-Custom-Contains>=0:${PORTSDIR}/math/p5-Math-Symbolic-Custom-Contains \
-		p5-Math-Symbolic-Custom-ErrorPropagation>=0:${PORTSDIR}/math/p5-Math-Symbolic-Custom-ErrorPropagation \
-		p5-Math-Symbolic-Custom-Pattern>=0:${PORTSDIR}/math/p5-Math-Symbolic-Custom-Pattern \
-		p5-Math-Symbolic-Custom-Simplification>=0:${PORTSDIR}/math/p5-Math-Symbolic-Custom-Simplification \
-		p5-Math-Symbolic-Custom-Transformation>=0:${PORTSDIR}/math/p5-Math-Symbolic-Custom-Transformation \
-		p5-Math-SymbolicX-BigNum>=0:${PORTSDIR}/math/p5-Math-SymbolicX-BigNum \
-		p5-Math-SymbolicX-Complex>=0:${PORTSDIR}/math/p5-Math-SymbolicX-Complex \
-		p5-Math-SymbolicX-Inline>=0:${PORTSDIR}/math/p5-Math-SymbolicX-Inline \
-		p5-Math-SymbolicX-NoSimplification>=0:${PORTSDIR}/math/p5-Math-SymbolicX-NoSimplification \
-		p5-Math-SymbolicX-ParserExtensionFactory>=0:${PORTSDIR}/math/p5-Math-SymbolicX-ParserExtensionFactory \
-		p5-Math-SymbolicX-Statistics-Distributions>=0:${PORTSDIR}/math/p5-Math-SymbolicX-Statistics-Distributions
+RUN_DEPENDS=	p5-Math-Symbolic>=0.163:math/p5-Math-Symbolic \
+		p5-Math-Symbolic-Custom-CCompiler>=0:math/p5-Math-Symbolic-Custom-CCompiler \
+		p5-Math-Symbolic-Custom-Contains>=0:math/p5-Math-Symbolic-Custom-Contains \
+		p5-Math-Symbolic-Custom-ErrorPropagation>=0:math/p5-Math-Symbolic-Custom-ErrorPropagation \
+		p5-Math-Symbolic-Custom-Pattern>=0:math/p5-Math-Symbolic-Custom-Pattern \
+		p5-Math-Symbolic-Custom-Simplification>=0:math/p5-Math-Symbolic-Custom-Simplification \
+		p5-Math-Symbolic-Custom-Transformation>=0:math/p5-Math-Symbolic-Custom-Transformation \
+		p5-Math-SymbolicX-BigNum>=0:math/p5-Math-SymbolicX-BigNum \
+		p5-Math-SymbolicX-Complex>=0:math/p5-Math-SymbolicX-Complex \
+		p5-Math-SymbolicX-Inline>=0:math/p5-Math-SymbolicX-Inline \
+		p5-Math-SymbolicX-NoSimplification>=0:math/p5-Math-SymbolicX-NoSimplification \
+		p5-Math-SymbolicX-ParserExtensionFactory>=0:math/p5-Math-SymbolicX-ParserExtensionFactory \
+		p5-Math-SymbolicX-Statistics-Distributions>=0:math/p5-Math-SymbolicX-Statistics-Distributions
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-bignum/Makefile b/math/p5-bignum/Makefile
index 22c46b257f89..ca98de113a97 100644
--- a/math/p5-bignum/Makefile
+++ b/math/p5-bignum/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Transparent BigNumber/BigRational support for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-BigInt>=1.999712:${PORTSDIR}/math/p5-Math-BigInt
+BUILD_DEPENDS=	p5-Math-BigInt>=1.999712:math/p5-Math-BigInt
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/math/pari/Makefile b/math/pari/Makefile
index 09e0e07c93d2..47dfc5b2cc10 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mathematics library and advanced calculator package
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index 785f56d89e95..95f229e9cacf 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -19,7 +19,7 @@ LICENSE_PERMS=	auto-accept
 
 # libc++.so is a linker script, not a symlink.
 # Ignore portlint, the linker needs the actual library specified
-LIB_DEPENDS=	libc++.so.1:${PORTSDIR}/devel/libc++
+LIB_DEPENDS=	libc++.so.1:devel/libc++
 
 OPTIONS_DEFINE=	OPENMPI DOCS
 OPENMPI_DESC=	Use openmpi instead of mpich2
@@ -36,12 +36,12 @@ PLIST_FILES=	include/parmetis/metis.h \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMPI}
-BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
-RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpicc:net/openmpi
+RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 MPICC=		${LOCALBASE}/mpi/openmpi/bin/mpicc
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
+BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:net/mpich2
+RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:net/mpich2
 MPICC=		${LOCALBASE}/bin/mpicc
 .endif
 
diff --git a/math/parmgridgen/Makefile b/math/parmgridgen/Makefile
index 836ba6c8832c..46427441065b 100644
--- a/math/parmgridgen/Makefile
+++ b/math/parmgridgen/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Library for obtaining a sequence of successive coarse grids
 
 ALL_TARGET=	parallel
 
-LIB_DEPENDS+=	libmpi.so:${PORTSDIR}/net/openmpi
+LIB_DEPENDS+=	libmpi.so:net/openmpi
 USES=		gmake
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/math/pdal/Makefile b/math/pdal/Makefile
index bca268f624c8..79b4c028a58c 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Library for translating and manipulating point cloud data
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libgeos.so:graphics/geos \
+		libboost_thread.so:devel/boost-libs
 
 USES=		cmake:outsource compiler:c++11-lib pathfix pkgconfig
 USE_LDCONFIG=	yes
@@ -58,7 +58,7 @@ ATTRIBUTE_CMAKE_ON=	-DBUILD_PLUGIN_ATTRIBUTE:BOOL=TRUE
 ATTRIBUTE_CMAKE_OFF=	-DBUILD_PLUGIN_ATTRIBUTE:BOOL=FALSE
 
 ICEBRIDGE_DESC=	Enable Icebridge plugin
-ICEBRIDGE_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
+ICEBRIDGE_LIB_DEPENDS=	libhdf5.so:science/hdf5
 ICEBRIDGE_CMAKE_ON=	-DBUILD_PLUGIN_ICEBRIDGE:BOOL=TRUE
 ICEBRIDGE_CMAKE_OFF=	-DBUILD_PLUGIN_ICEBRIDGE:BOOL=FALSE
 
@@ -68,18 +68,18 @@ APPS_CMAKE_OFF=	-DWITH_APPS:BOOL=FALSE
 
 BASH_DESC=	BASH completion
 BASH_CMAKE_ON=	-DWITH_BASH:BOOL=TRUE
-BASH_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BASH_RUN_DEPENDS=	bash:shells/bash
 BASH_CMAKE_OFF=	-DWITH_BASH:BOOL=FALSE
 
 LASZIP_DESC=	Enable LASZip support (Recommended)
-LASZIP_LIB_DEPENDS=	liblaszip.so:${PORTSDIR}/archivers/laszip
+LASZIP_LIB_DEPENDS=	liblaszip.so:archivers/laszip
 
 GEOTIFF_CMAKE_ON=	-DWITH_GEOTIFF:BOOL=TRUE
-GEOTIFF_LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff
+GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
 GEOTIFF_CMAKE_OFF=	-DWITH_GEOTIFF:BOOL=FALSE
 
 LIBXML2_CMAKE_ON=	-DWITH_LIBXML2:BOOL=TRUE
-LIBXML2_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 LIBXML2_CMAKE_OFF=	-DWITH_LIBXML2:BOOL=FALSE
 
 .include <bsd.port.mk>
diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index c8d77da0b5c0..2d9b8b193414 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	pl${PORTVERSION:S/.//}src
 MAINTAINER?=	linimon@FreeBSD.org
 COMMENT?=	Generates plots and graphs from data
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libming.so:${PORTSDIR}/graphics/ming \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libming.so:graphics/ming \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		jpeg
 BUILD_WRKSRC=	${WRKSRC}/src
diff --git a/math/plplot-ada/Makefile b/math/plplot-ada/Makefile
index 3c022a990102..86e83cc07318 100644
--- a/math/plplot-ada/Makefile
+++ b/math/plplot-ada/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ada bindings for PLplot
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libplplot.so:${PORTSDIR}/math/plplot
+LIB_DEPENDS=	libplplot.so:math/plplot
 
 USES=		ada
 
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 4f910f497d48..d09c9f22b2a8 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Scientific plotting package
 
 LICENSE=	LGPL21+
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
-LIB_DEPENDS=	libLASi.so:${PORTSDIR}/devel/lasi \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
+BUILD_DEPENDS=	bash:shells/bash \
+		${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf
+LIB_DEPENDS=	libLASi.so:devel/lasi \
+		libltdl.so:devel/libltdl \
+		libfreetype.so:print/freetype2
+RUN_DEPENDS=	bash:shells/bash \
+		${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf
 
 USE_GNOME=	pango
 USE_PERL5=	build
@@ -49,7 +49,7 @@ FORTRAN_CONFIGURE_ENV=	CMAKE_Fortran_COMPILER="${FC}"
 FORTRAN_CMAKE_ON=	-DENABLE_f95:BOOL=ON
 FORTRAN_CMAKE_OFF=	-DENABLE_f95:BOOL=OFF
 
-GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
+GD_LIB_DEPENDS=		libgd.so:graphics/gd
 GD_CMAKE_ON=		-DPLD_png:BOOL=ON
 
 LUA_USES=		lua:51
@@ -57,7 +57,7 @@ LUA_CMAKE_ON=		-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
 LUA_CMAKE_OFF=		-DENABLE_lua:BOOL=OFF
 
 PYTHON_USES=		python
-PYTHON_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13 \
+PYTHON_BUILD_DEPENDS=	swig:devel/swig13 \
 			${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 PYTHON_CONFIGURE_ENV=	PYTHON_VERSION="${PYTHON_VERSION}"
@@ -65,13 +65,13 @@ PYTHON_CMAKE_OFF=	-DENABLE_python:BOOL=OFF
 
 QHULL2003_DESC=		Legacy Qhull support
 QHULL2012_DESC=		Latest Qhull support
-QHULL2012_LIB_DEPENDS=	libqhull.so.6:${PORTSDIR}/math/qhull
-QHULL2003_LIB_DEPENDS=	libqhull.so.5:${PORTSDIR}/math/qhull5
+QHULL2012_LIB_DEPENDS=	libqhull.so.6:math/qhull
+QHULL2003_LIB_DEPENDS=	libqhull.so.5:math/qhull5
 QHULL2012_CMAKE_ON=	-DQHULL_INCLUDE_DIRS="${LOCALBASE}/include/libqhull"
 QHULL2012_2FIX=		lib/nn/delaunay.c src/plgridd.c
 
-TCLTK_LIB_DEPENDS=	libitk.so:${PORTSDIR}/x11-toolkits/itk
-TCLTK_RUN_DEPENDS=	iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
+TCLTK_LIB_DEPENDS=	libitk.so:x11-toolkits/itk
+TCLTK_RUN_DEPENDS=	iwidgets>0:x11-toolkits/iwidgets
 TCLTK_USES=		tk
 ITCL_VER=		3.4
 ITK_VER=		3.3
@@ -94,7 +94,7 @@ THREADS_CMAKE_OFF=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
 QT4_USE=		QT4=corelib,gui,svg,xml,moc_build,qmake_build,rcc_build,uic_build
 QT4_CMAKE_OFF=		-DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON
 
-WXGTK_LIB_DEPENDS=	libagg.so:${PORTSDIR}/graphics/agg
+WXGTK_LIB_DEPENDS=	libagg.so:graphics/agg
 WXGTK_USE=		WX=2.6+
 WXGTK_CMAKE_ON=		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
 WXGTK_CMAKE_OFF=	-DENABLE_wxwidgets:BOOL=OFF
diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index 03161df6d432..b21b88df7c44 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Generic interface for proof assistants
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 USE_EMACS=	yes
 INSTALLS_ICONS=	yes
@@ -48,7 +48,7 @@ INFO=		PG-adapting ProofGeneral
 
 .if ${PORT_OPTIONS:MDOCS}
 MAKE_ARGS+=	DOCSDIR=${DOCSDIR} INSTALLDOC=install-doc
-BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
+BUILD_DEPENDS+=	texi2html:textproc/texi2html
 .endif
 
 PORTDOCS=	AUTHORS BUGS CHANGES COMPATIBILITY COPYING INSTALL \
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 01947d5afcf3..b888038f5ca5 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Program for statistical analysis of sampled data
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	texinfo>0:${PORTSDIR}/print/texinfo
-LIB_DEPENDS=	libgslcblas.so:${PORTSDIR}/math/gsl
+BUILD_DEPENDS=	texinfo>0:print/texinfo
+LIB_DEPENDS=	libgslcblas.so:math/gsl
 
 USES=		charsetfix gmake iconv libtool perl5 pkgconfig readline
 USE_GNOME=	libxml2
@@ -35,8 +35,8 @@ INFO=		pspp pspp-dev
 OPTIONS_DEFINE=		DOCS GUI NLS PGSQL
 OPTIONS_SUB=		yes
 
-GUI_LIB_DEPENDS=	libgladeui-1.so:${PORTSDIR}/devel/glade3
-GUI_RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
+GUI_LIB_DEPENDS=	libgladeui-1.so:devel/glade3
+GUI_RUN_DEPENDS=	yelp:x11/yelp
 GUI_USES=		desktop-file-utils
 GUI_USE=		gnome=gtksourceview2,libglade2
 GUI_CONFIGURE_WITH=	cairo gui gui-tools
diff --git a/math/py-apgl/Makefile b/math/py-apgl/Makefile
index 920526f801e1..bb6b0fc17955 100644
--- a/math/py-apgl/Makefile
+++ b/math/py-apgl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fast python graph library with some machine learning features
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:${PORTSDIR}/science/py-scipy
+		${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
index b47acf329328..172ee9ff272c 100644
--- a/math/py-basemap/Makefile
+++ b/math/py-basemap/Makefile
@@ -14,8 +14,8 @@ LICENSE=	GPLv2 LGPL21 MIT
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
-LIB_DEPENDS=	libgeos.so:${PORTSDIR}/graphics/geos
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
+LIB_DEPENDS=	libgeos.so:graphics/geos
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/math/py-bitmath/Makefile b/math/py-bitmath/Makefile
index ca41d6faa657..77b8507a6cca 100644
--- a/math/py-bitmath/Makefile
+++ b/math/py-bitmath/Makefile
@@ -18,6 +18,6 @@ USE_PYTHON=	autoplist distutils
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-4
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}progressbar231>0:${PORTSDIR}/misc/py-progressbar231
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}progressbar231>0:misc/py-progressbar231
 
 .include <bsd.port.mk>
diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile
index 24b8c3a85956..447acdb3c2cd 100644
--- a/math/py-bottleneck/Makefile
+++ b/math/py-bottleneck/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Collection of fast NumPy array functions written in Cython
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		cython:${PORTSDIR}/lang/cython
+		cython:lang/cython
 RUN_DEPENDS=	${PYNUMPY}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/math/py-colormath/Makefile b/math/py-colormath/Makefile
index a972d3712d36..e770bb034f5b 100644
--- a/math/py-colormath/Makefile
+++ b/math/py-colormath/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module that spares the user from directly dealing with color math
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:${PORTSDIR}/math/py-numpy \
-		${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:${PORTSDIR}/math/py-networkx
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:math/py-numpy \
+		${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/math/py-cryptominisat/Makefile b/math/py-cryptominisat/Makefile
index 7c6bb2aa4e87..e3ed2b38094a 100644
--- a/math/py-cryptominisat/Makefile
+++ b/math/py-cryptominisat/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Bindings to CryptoMiniSat (a SAT solver)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcryptominisat4.so:${PORTSDIR}/math/cryptominisat
+LIB_DEPENDS=	libcryptominisat4.so:math/cryptominisat
 
 USES=		compiler:c++11-lang python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile
index fba98983c025..e90bed4c10e9 100644
--- a/math/py-fastcluster/Makefile
+++ b/math/py-fastcluster/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy
+		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
 
 PORTDOCS=	CITATION.txt \
 		INSTALL.txt \
diff --git a/math/py-fiat/Makefile b/math/py-fiat/Makefile
index 417b9749bc59..37fd5d2e70f7 100644
--- a/math/py-fiat/Makefile
+++ b/math/py-fiat/Makefile
@@ -14,7 +14,7 @@ COMMENT=	FInite element Automatic Tabulator
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scientific>=0:${PORTSDIR}/math/py-scientific
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:2
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index d4df1514fc0a..7cf67094fd2f 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python-based toolbox to visualise algorithms on graphs
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LGPL.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 NO_ARCH=	yes
 PORTEXAMPLES=	*
diff --git a/math/py-gmpy/Makefile b/math/py-gmpy/Makefile
index 1af249091418..a1408ffb5bf6 100644
--- a/math/py-gmpy/Makefile
+++ b/math/py-gmpy/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python Extension that Wraps the GMP Library
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index ad8e973e5c5b..15cde64b5bb0 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python interface to gnuplot plotting program
 
 BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
+RUN_DEPENDS=	gnuplot:math/gnuplot \
 		${PYNUMPY}
 
 USES=		python
diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index a68490a8df9f..a90761d719bd 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/math/py-igraph/Makefile b/math/py-igraph/Makefile
index e92903065b27..2d0ce1fbbac4 100644
--- a/math/py-igraph/Makefile
+++ b/math/py-igraph/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	High performance graph data structures and algorithms
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libigraph.so:${PORTSDIR}/math/igraph
+BUILD_DEPENDS=	${LOCALBASE}/lib/libigraph.so:math/igraph
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/math/py-mathdom/Makefile b/math/py-mathdom/Makefile
index 3daa7baf5a62..da6665b66193 100644
--- a/math/py-mathdom/Makefile
+++ b/math/py-mathdom/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Content MathML in Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index 0ae5f729bcb0..216c6e62fc71 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Plotting library uses a syntax familiar to MATLAB users
 LICENSE=	PSFL
 
 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libtcl86.so:${PORTSDIR}/lang/tcl86
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libtcl86.so:lang/tcl86
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}cycler>0:${PORTSDIR}/devel/py-cycler \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:${PORTSDIR}/devel/py-pyparsing \
-		${PYTHON_PKGNAMEPREFIX}tornado>0:${PORTSDIR}/www/py-tornado
+		${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
+		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
 
 USES=		compiler:c++11-lib gettext pkgconfig python shebangfix uniquefiles:dirs
 USE_PYTHON=	autoplist distutils
@@ -41,13 +41,13 @@ GTKAGGBACKEND_USE=	GNOME=gtk20,pygtk2,cairo,gdkpixbuf2
 GTKAGGBACKEND_VARS=	GTKAGG_BACKEND=True
 GTKAGGBACKEND_VARS_OFF=	GTKAGG_BACKEND=False
 QT4AGGBACKEND_DESC=	Qt4Agg backend support
-QT4AGGBACKEND_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui
-QT4AGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui
+QT4AGGBACKEND_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui
+QT4AGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui
 QT4AGGBACKEND_VARS=	QT4AGG_BACKEND=True
 QT4AGGBACKEND_VARS_OFF=	QT4AGG_BACKEND=False
 TKAGGBACKEND_DESC=	TKAgg backend support
-TKAGGBACKEND_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-TKAGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKAGGBACKEND_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+TKAGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 TKAGGBACKEND_USES=	tk:run
 TKAGGBACKEND_VARS=	TKAGG_BACKEND=True
 TKAGGBACKEND_VARS_OFF=	TKAGG_BACKEND=False
@@ -60,11 +60,11 @@ WXAGGBACKEND_VARS_OFF=	WXAGG_BACKEND=False
 PORTEXAMPLES=	*
 
 .if defined(PACKAGE_BUILDING)
-GTKBACKEND_BUILD_DEPENDS=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
-GTKAGGBACKEND_BUILD_DEPENDS=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
-QT4AGGBACKEND_BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
-TKAGGBACKEND_BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
-WXAGGBACKEND_BUILD_DEPENDS=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
+GTKBACKEND_BUILD_DEPENDS=	Xvfb:x11-servers/xorg-vfbserver
+GTKAGGBACKEND_BUILD_DEPENDS=	Xvfb:x11-servers/xorg-vfbserver
+QT4AGGBACKEND_BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver
+TKAGGBACKEND_BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver
+WXAGGBACKEND_BUILD_DEPENDS=	Xvfb:x11-servers/xorg-vfbserver
 .endif
 
 post-extract:
diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile
index da7753a05bb5..1bd76ccc1c40 100644
--- a/math/py-mpmath/Makefile
+++ b/math/py-mpmath/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python Library for Arbitrary-precision Floating-point Arithmetic
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gmpy.so:${PORTSDIR}/math/py-gmpy
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 9de25ecf720e..d7581678361c 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Tools for complex networks
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:${PORTSDIR}/devel/py-decorator
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator
 
-#		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:${PORTSDIR}/textproc/py-sphinx \
-#		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:${PORTSDIR}/textproc/py-docutils
+#		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx \
+#		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils
 
 NO_ARCH=	yes
 USES=		python shebangfix
@@ -32,20 +32,20 @@ OPTIONS_GROUP_RENDER=	MPL GRAPHVIZ
 OPTIONS_DEFAULT=	NUMPY SCIPY MPL GRAPHVIZ YAML
 
 NUMPY_DESC=	Matrix representation of graphs
-NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:${PORTSDIR}/math/py-numpy
+NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:math/py-numpy
 
 SCIPY_DESC=	Sparse matrix representation of graphs
-SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:${PORTSDIR}/science/py-scipy \
-			${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:${PORTSDIR}/science/py-scikit-sparse
+SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy \
+			${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse
 
 MPL_DESC=	Flexible graph rendering
-MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:${PORTSDIR}/math/py-matplotlib
+MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib
 
 GRAPHVIZ_DESC=	Additional graph layout and rendering algorithms
-GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:${PORTSDIR}/graphics/py-pygraphviz
+GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz
 
 YAML_DESC=	Reading and writing YAML files
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index c3520c8d8841..b62d9a7aca86 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -40,10 +40,10 @@ GCCLIBDIR_CMDS=	${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.
 
 ATLAS_USES=	blaslapack:atlas
 NETLIB_USES=	blaslapack:netlib
-NETLIB_LIB_DEPENDS=	libcblas.so:${PORTSDIR}/math/cblas
+NETLIB_LIB_DEPENDS=	libcblas.so:math/cblas
 OPENBLAS_USES=	blaslapack:openblas
-SUITESPARSE_LIB_DEPENDS=libumfpack.so:${PORTSDIR}/math/suitesparse
-TESTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose
+SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse
+TESTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile
index 516b79c6a6a2..e1f78c52b4f9 100644
--- a/math/py-pandas/Makefile
+++ b/math/py-pandas/Makefile
@@ -13,25 +13,25 @@ LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		nosetests-${PYTHON_VER}:${PORTSDIR}/devel/py-nose \
-		cython:${PORTSDIR}/lang/cython \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}boto>0:${PORTSDIR}/devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:${PORTSDIR}/devel/py-tables \
-		${PYTHON_PKGNAMEPREFIX}bottleneck>0:${PORTSDIR}/math/py-bottleneck \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}numexpr>=2.1.0:${PORTSDIR}/math/py-numexpr \
-		${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy \
-		${PYTHON_PKGNAMEPREFIX}openpyxl>=2.0.0:${PORTSDIR}/textproc/py-openpyxl \
-		${PYTHON_PKGNAMEPREFIX}xlrd>0:${PORTSDIR}/textproc/py-xlrd \
-		${PYTHON_PKGNAMEPREFIX}xlwt>0:${PORTSDIR}/textproc/py-xlwt \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib
+		nosetests-${PYTHON_VER}:devel/py-nose \
+		cython:lang/cython \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables \
+		${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
+		${PYTHON_PKGNAMEPREFIX}numexpr>=2.1.0:math/py-numexpr \
+		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \
+		${PYTHON_PKGNAMEPREFIX}openpyxl>=2.0.0:textproc/py-openpyxl \
+		${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd \
+		${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
 # Note: we cannot include math/py-statsmodels in TEST_DEPENDS because it
 # depends upon us for BUILD and RUN.
 
@@ -60,24 +60,24 @@ STORAGE_DESC=	Data Storage Add-ons
 HTML_DESC=	HTML Parsing Add-ons
 EXCEL_DESC=	MS Excel I/O Add-ons
 
-MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
-SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy
-BTLNCK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bottleneck>0:${PORTSDIR}/math/py-bottleneck
-NUMEXPR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numexpr>=2.1.0:${PORTSDIR}/math/py-numexpr
-BOTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:${PORTSDIR}/devel/py-boto
-TABLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:${PORTSDIR}/devel/py-tables
-SQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlalchemy
+MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
+SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
+BTLNCK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck
+NUMEXPR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numexpr>=2.1.0:math/py-numexpr
+BOTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto
+TABLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables
+SQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy
 
-LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
-HTML5LIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib
-OPENPYXL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openpyxl>=2.0.0:${PORTSDIR}/textproc/py-openpyxl
-XLRD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlrd>0:${PORTSDIR}/textproc/py-xlrd
-XLWT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlwt>0:${PORTSDIR}/textproc/py-xlwt
+LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
+HTML5LIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
+OPENPYXL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openpyxl>=2.0.0:textproc/py-openpyxl
+XLRD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd
+XLWT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLXML} || ${PORT_OPTIONS:MHTML5LIB}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:${PORTSDIR}/www/py-beautifulsoup
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup
 .endif
 
 SUB_FILES=	pkg-message
diff --git a/math/py-patsy/Makefile b/math/py-patsy/Makefile
index 261a26225eee..01670f3cc743 100644
--- a/math/py-patsy/Makefile
+++ b/math/py-patsy/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE PSFL
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile
index 305c0a8f68c8..bca443410abb 100644
--- a/math/py-plastex/Makefile
+++ b/math/py-plastex/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LaTeX Document Processing Framework
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tiarno
diff --git a/math/py-pybloom/Makefile b/math/py-pybloom/Makefile
index 10254ae2317b..1be5444c82ba 100644
--- a/math/py-pybloom/Makefile
+++ b/math/py-pybloom/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Probabilistic data structure
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bitarray>0:${PORTSDIR}/devel/py-bitarray
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bitarray>0:devel/py-bitarray
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/math/py-pycosat/Makefile b/math/py-pycosat/Makefile
index 2ff48342ed43..e1ff810d9e2f 100644
--- a/math/py-pycosat/Makefile
+++ b/math/py-pycosat/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bindings to PicoSAT (a SAT solver)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpicosat.so:${PORTSDIR}/math/picosat
+LIB_DEPENDS=	libpicosat.so:math/picosat
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/math/py-pyfst/Makefile b/math/py-pyfst/Makefile
index b02682079273..affafb830d42 100644
--- a/math/py-pyfst/Makefile
+++ b/math/py-pyfst/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python interface for the OpenFST library
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libfst.so:${PORTSDIR}/math/openfst
+LIB_DEPENDS=	libfst.so:math/openfst
 
 BROKEN=	does not build
 
diff --git a/math/py-pymc/Makefile b/math/py-pymc/Makefile
index 1984653458f9..81b7695e2ff2 100644
--- a/math/py-pymc/Makefile
+++ b/math/py-pymc/Makefile
@@ -17,13 +17,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy
-LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack \
-		libblas.so:${PORTSDIR}/math/blas
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
+		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
+LIB_DEPENDS=	liblapack.so:math/lapack \
+		libblas.so:math/blas
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
+		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index 1d7aeeb35a29..0af27e389350 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	fmysh@iijmio-mail.jp
 COMMENT=	Collection of Python modules for scientific computing
 
 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS=	libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python
diff --git a/math/py-statsmodels/Makefile b/math/py-statsmodels/Makefile
index 3330bd4e677d..46c895116735 100644
--- a/math/py-statsmodels/Makefile
+++ b/math/py-statsmodels/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Complement to SciPy for statistical computations
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		cython:${PORTSDIR}/lang/cython \
-		${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy \
-		${PYTHON_PKGNAMEPREFIX}pandas>0:${PORTSDIR}/math/py-pandas \
-		${PYTHON_PKGNAMEPREFIX}patsy>0:${PORTSDIR}/math/py-patsy
+		cython:lang/cython \
+		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \
+		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \
+		${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy \
-		${PYTHON_PKGNAMEPREFIX}pandas>0:${PORTSDIR}/math/py-pandas \
-		${PYTHON_PKGNAMEPREFIX}patsy>0:${PORTSDIR}/math/py-patsy
+		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \
+		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \
+		${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile
index b4def8e06176..2c2b422e92f8 100644
--- a/math/py-symeig/Makefile
+++ b/math/py-symeig/Makefile
@@ -24,9 +24,9 @@ LDFLAGS+=	-shared
 OPTIONS_DEFINE=	ATLAS
 ATLAS_DESC=	Use optimized blas library
 
-ATLAS_LIB_DEPENDS=	libatlas.so:${PORTSDIR}/math/atlas
-ATLAS_LIB_DEPENDS_OFF=	libblas.so:${PORTSDIR}/math/blas \
-			liblapack.so:${PORTSDIR}/math/lapack
+ATLAS_LIB_DEPENDS=	libatlas.so:math/atlas
+ATLAS_LIB_DEPENDS_OFF=	libblas.so:math/blas \
+			liblapack.so:math/lapack
 
 .include <bsd.port.options.mk>
 
diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile
index 5388a5b0bf64..04c5364c5e52 100644
--- a/math/py-sympy/Makefile
+++ b/math/py-sympy/Makefile
@@ -18,7 +18,7 @@ USE_PYTHON=	autoplist distutils
 OPTIONS_DEFINE=	PYGLET
 PYGLET_DESC=	Enable plotting support
 
-PYGLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:${PORTSDIR}/graphics/py-pyglet
+PYGLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet
 
 post-patch:
 	@${REINPLACE_CMD} -e "s#share/man/man1#man/man1#" ${WRKSRC}/setup.py
diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile
index 8a5c24d81e58..c09e6ee984b9 100644
--- a/math/py-theano/Makefile
+++ b/math/py-theano/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Optimizing compiler for evaluating math expressions on CPUs and GPUs
 
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:${PORTSDIR}/science/py-scipy
+		${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy
 
 USES=		compiler:openmp python
 USE_PYTHON=	concurrent distutils autoplist
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 4dda8dc7ae0c..659efdb34d42 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Multi-purpose desktop calculator (Gnome frontend)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libqalculate.so:${PORTSDIR}/math/libqalculate
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
-		wget:${PORTSDIR}/ftp/wget
+LIB_DEPENDS=	libqalculate.so:math/libqalculate
+RUN_DEPENDS=	gnuplot:math/gnuplot \
+		wget:ftp/wget
 
 USES=		gettext gmake
 USE_GNOME=	intltool libglade2 libgnome
diff --git a/math/qrupdate/Makefile b/math/qrupdate/Makefile
index b3adf6f36395..3b0de2dfad8c 100644
--- a/math/qrupdate/Makefile
+++ b/math/qrupdate/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SOURCEFORGE/qrupdate/qrupdate/1.2
 MAINTAINER=	robertjenssen@ozemail.com.au
 COMMENT=	Fortran library for fast updates of QR and Cholesky decomposition
 
-LIB_DEPENDS=	libblas.so:${PORTSDIR}/math/blas \
-		liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS=	libblas.so:math/blas \
+		liblapack.so:math/lapack
 
 USES=		fortran gmake
 
diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index 7d3989925beb..263613b0429e 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -10,10 +10,10 @@ PKGNAMESUFFIX=	-doc
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	The QtiPlot Handbook
 
-BUILD_DEPENDS=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/share/sgml/docbook/dsssl/modular/html/docbook.dsl:${PORTSDIR}/textproc/dsssl-docbook-modular
+BUILD_DEPENDS=	docbook2html:textproc/docbook-utils \
+		docbook-xml>0:textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:textproc/docbook-xsl \
+		${LOCALBASE}/share/sgml/docbook/dsssl/modular/html/docbook.dsl:textproc/dsssl-docbook-modular
 
 USES=		tar:bzip2
 DATADIR=	${PREFIX}/share/qtiplot/manual
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 2dd1e2f42691..004da44c8207 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Data analysis and scientific plotting
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl \
-		libmuparser.so:${PORTSDIR}/math/muparser \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libgsl.so:math/gsl \
+		libmuparser.so:math/muparser \
+		libpng.so:graphics/png
 # use bundled modified libraries
-# 		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
-# 		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4
+# 		qwt.5:x11-toolkits/qwt5 \
+# 		qwtplot3d-qt4:math/qwtplot3d-qt4
 
 USES=		dos2unix gmake qmake tar:bzip2
 USE_QT4=	gui opengl svg qt3support network assistantclient \
@@ -33,12 +33,12 @@ OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=	yes
 
 DOCS_DESC=	Install the QtiPlot Handbook
-DOCS_RUN_DEPENDS=	qtiplot-doc>=0:${PORTSDIR}/math/qtiplot-doc
+DOCS_RUN_DEPENDS=	qtiplot-doc>=0:math/qtiplot-doc
 DOCS_USE=	QT4=assistant-adp_run
 
 PYTHON_DESC=	Python scripting support
 PYTHON_USES=	python
-PYTHON_BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+PYTHON_BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui
 PYTHON_RUN_DEPENDS:=	${PYTHON_BUILD_DEPENDS}
 PYTHON_CONFIGURE_ENV=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
 			PYTHON_VERSION=${PYTHON_VERSION}
diff --git a/math/qtoctave/Makefile b/math/qtoctave/Makefile
index 8e892ee18c6e..2126755c22fb 100644
--- a/math/qtoctave/Makefile
+++ b/math/qtoctave/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://forja.rediris.es/frs/download.php/2054/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt 4 frontend for Octave
 
-RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
+RUN_DEPENDS=	octave:math/octave
 
 USE_QT4=	designer gui network script svg xml \
 		qmake_build moc_build rcc_build uic_build \
diff --git a/math/reduce/Makefile b/math/reduce/Makefile
index 081bbc92cd27..86c71c3ec27e 100644
--- a/math/reduce/Makefile
+++ b/math/reduce/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Portable general-purpose computer algebra system
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS=	gnuplot:math/gnuplot
 
 USES=		autoreconf:build gmake ncurses tar:bzip2
 TARGET_SDIR=	${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
@@ -39,8 +39,8 @@ OPTIONS_SUB=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCSL}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 USES+=		jpeg
 CPPFLAGS+=	`freetype-config --cflags`
 LDFLAGS+=	`freetype-config --libs`
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index ed8d40046720..6a554b203fdb 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -12,9 +12,9 @@ COMMENT=	IDE/GUI for the R-project
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
-RUN_DEPENDS=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R \
-		${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate
+BUILD_DEPENDS=	${LOCALBASE}/bin/R:math/R
+RUN_DEPENDS=	${LOCALBASE}/bin/R:math/R \
+		${KDE4_PREFIX}/lib/kde4/katepart.so:editors/kate
 
 CONFLICTS=	rkward-0.4.*
 
@@ -45,12 +45,12 @@ PLIST_SUB+=	NLS=${NLS}
 
 .if ${PORT_OPTIONS:MRECDEP}
 LR_MOD_DIR=	${LOCALBASE}/lib/R/library
-RUN_DEPENDS+=	${LR_MOD_DIR}/R2HTML/INDEX:${PORTSDIR}/textproc/R-cran-R2HTML	\
-		${LR_MOD_DIR}/XML/INDEX:${PORTSDIR}/textproc/R-cran-XML		\
-		${LR_MOD_DIR}/mvtnorm/INDEX:${PORTSDIR}/math/R-cran-mvtnorm	\
-		${LR_MOD_DIR}/outliers/INDEX:${PORTSDIR}/math/R-cran-outliers	\
-		${LR_MOD_DIR}/tseries/INDEX:${PORTSDIR}/finance/R-cran-tseries	\
-		${LR_MOD_DIR}/car/INDEX:${PORTSDIR}/math/R-cran-car
+RUN_DEPENDS+=	${LR_MOD_DIR}/R2HTML/INDEX:textproc/R-cran-R2HTML	\
+		${LR_MOD_DIR}/XML/INDEX:textproc/R-cran-XML		\
+		${LR_MOD_DIR}/mvtnorm/INDEX:math/R-cran-mvtnorm	\
+		${LR_MOD_DIR}/outliers/INDEX:math/R-cran-outliers	\
+		${LR_MOD_DIR}/tseries/INDEX:finance/R-cran-tseries	\
+		${LR_MOD_DIR}/car/INDEX:math/R-cran-car
 .endif
 
 pre-configure:
diff --git a/math/rocs/Makefile b/math/rocs/Makefile
index 4f986142f3de..0e9affa0b6b2 100644
--- a/math/rocs/Makefile
+++ b/math/rocs/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Graph theory IDE
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libgrantlee_gui.so:devel/grantlee
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource tar:xz
diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile
index 463e0bdc3c60..92f62687fc06 100644
--- a/math/rpcalc/Makefile
+++ b/math/rpcalc/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple RPN calculator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
 
 USES=		python:3.3+
 
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index dd254903a782..013a5b7eb6ff 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -14,9 +14,9 @@ LICENSE=	GPLv2 LGPL21 MPL
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		R:${PORTSDIR}/math/R
+		R:math/R
 RUN_DEPENDS=	${PYNUMPY} \
-		R:${PORTSDIR}/math/R
+		R:math/R
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index 84a73ef6b82e..29fe042d546f 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Python interface to the R Programming Language
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		R:${PORTSDIR}/math/R
+		R:math/R
 RUN_DEPENDS=	${PYNUMPY} \
-		R:${PORTSDIR}/math/R
+		R:math/R
 
 USES=		python readline
 USE_GCC=	yes
diff --git a/math/rubygem-fftw3/Makefile b/math/rubygem-fftw3/Makefile
index 0e2cf7a89779..c947eb8575b0 100644
--- a/math/rubygem-fftw3/Makefile
+++ b/math/rubygem-fftw3/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	RG
 MAINTAINER=	murashin@gfd-dennou.org
 COMMENT=	Ruby interface to the FFTW ver.3
 
-RUN_DEPENDS=	rubygem-narray>0:${PORTSDIR}/math/rubygem-narray
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+RUN_DEPENDS=	rubygem-narray>0:math/rubygem-narray
+LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 USE_RUBY=	yes
 USE_RAKE=	yes
diff --git a/math/rubygem-narray_miss/Makefile b/math/rubygem-narray_miss/Makefile
index 213620a1e1f6..2c42a0de96f8 100644
--- a/math/rubygem-narray_miss/Makefile
+++ b/math/rubygem-narray_miss/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	murashin@gfd-dennou.org
 COMMENT=	Additional class with processing of missing value to NArray
 
-RUN_DEPENDS=	rubygem-narray>0:${PORTSDIR}/math/rubygem-narray
+RUN_DEPENDS=	rubygem-narray>0:math/rubygem-narray
 
 USE_RUBY=	yes
 USE_RAKE=	yes
diff --git a/math/rubygem-numru-misc/Makefile b/math/rubygem-numru-misc/Makefile
index ac44e2c8a7f5..408bef80c44b 100644
--- a/math/rubygem-numru-misc/Makefile
+++ b/math/rubygem-numru-misc/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	RG
 MAINTAINER=	murashin@gfd-dennou.org
 COMMENT=	Miscellaneous functions and classes to help Ruby programming
 
-RUN_DEPENDS=	rubygem-narray>0:${PORTSDIR}/math/rubygem-narray \
-		rubygem-narray_miss>0:${PORTSDIR}/math/rubygem-narray_miss
+RUN_DEPENDS=	rubygem-narray>0:math/rubygem-narray \
+		rubygem-narray_miss>0:math/rubygem-narray_miss
 
 USE_RUBY=	yes
 USE_RAKE=	yes
diff --git a/math/rubygem-rb-gsl/Makefile b/math/rubygem-rb-gsl/Makefile
index 200a7146f23b..1d57b54f12bf 100644
--- a/math/rubygem-rb-gsl/Makefile
+++ b/math/rubygem-rb-gsl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby extension library for GSL (GNU Scientific Library)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
-RUN_DEPENDS=	rubygem-narray>=0.5.9:${PORTSDIR}/math/rubygem-narray
+LIB_DEPENDS=	libgsl.so:math/gsl
+RUN_DEPENDS=	rubygem-narray>=0.5.9:math/rubygem-narray
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/math/saga/Makefile b/math/saga/Makefile
index 10f23251362c..61c890f6c866 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -13,15 +13,15 @@ COMMENT=	System for Automated Geoscientific Analyses
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30
-LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
-		libgdal.so:${PORTSDIR}/graphics/gdal \
-		libhpdf.so:${PORTSDIR}/print/libharu \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libodbc.so:${PORTSDIR}/databases/unixODBC \
-		liblas.so:${PORTSDIR}/devel/liblas12 \
-		libopencv_ml.so:${PORTSDIR}/graphics/opencv
+BUILD_DEPENDS=	swig3.0:devel/swig30
+LIB_DEPENDS=	libproj.so:graphics/proj \
+		libgdal.so:graphics/gdal \
+		libhpdf.so:print/libharu \
+		libjasper.so:graphics/jasper \
+		libtiff.so:graphics/tiff \
+		libodbc.so:databases/unixODBC \
+		liblas.so:devel/liblas12 \
+		libopencv_ml.so:graphics/opencv
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
@@ -53,8 +53,8 @@ OPENMP_LDFLAGS=		-pthread
 PGSQL_CONFIGURE_OFF=	--with-postgresql=no
 PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config
 PGSQL_USES=		pgsql
-VIGRA_BUILD_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra
-VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra
+VIGRA_BUILD_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
+VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/sage/Makefile b/math/sage/Makefile
index fac16cd06f94..6fdcf06a5172 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -17,14 +17,14 @@ COMMENT=	Open source Mathematics software
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
-		automake:${PORTSDIR}/devel/automake \
-		autoconf:${PORTSDIR}/devel/autoconf
-LIB_DEPENDS=	libatlas.so:${PORTSDIR}/math/atlas \
-		liblapack.so:${PORTSDIR}/math/lapack
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash \
+		convert:graphics/ImageMagick \
+		ffmpeg:multimedia/ffmpeg \
+		automake:devel/automake \
+		autoconf:devel/autoconf
+LIB_DEPENDS=	libatlas.so:math/atlas \
+		liblapack.so:math/lapack
+RUN_DEPENDS=	bash:shells/bash
 
 pre-extract:
 	@${ECHO_MSG}
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index b6af492aad07..65758c3c931f 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -45,12 +45,12 @@ DISTFILES+=	scalapack_install.ps scalapackqref.ps  \
 WITH_ATLAS=		yes
 .endif
 .if defined(WITH_ATLAS)
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lf77blas
 LAPACK=		-lalapack -lcblas
 .else
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas
+LIB_DEPENDS+=	liblapack.so:math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
@@ -60,12 +60,12 @@ WITH_OPENMPI=	yes
 .endif
 
 .if defined(WITH_OPENMPI)
-BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
-RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 .else
-#LIB_DEPENDS+=	libmpich.so:${PORTSDIR}/net/mpich2
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
+#LIB_DEPENDS+=	libmpich.so:net/mpich2
+BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:net/mpich2
+RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:net/mpich2
 .endif
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "amd64"
diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index 3f23c6e16b1c..ccf9d65ab19e 100644
--- a/math/scilab-toolbox-sivp/Makefile
+++ b/math/scilab-toolbox-sivp/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	scilab-toolbox-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Scilab Image and Video Processing Toolbox
 
-BUILD_DEPENDS=	${SCILAB_CMD}:${PORTSDIR}/math/scilab
-LIB_DEPENDS=	libopencv_legacy.so:${PORTSDIR}/graphics/opencv
-RUN_DEPENDS=	${SCILAB_CMD}:${PORTSDIR}/math/scilab
+BUILD_DEPENDS=	${SCILAB_CMD}:math/scilab
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
+RUN_DEPENDS=	${SCILAB_CMD}:math/scilab
 
 USES=		dos2unix pkgconfig tar:xz
 DOS2UNIX_FILES=	etc/SIVP.start \
diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile
index 08bf519dded6..4b09c17dd09a 100644
--- a/math/scilab-toolbox-swt/Makefile
+++ b/math/scilab-toolbox-swt/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	${DISTNAME}-3-src${EXTRACT_SUFX}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Scilab 1-D and 2-D Wavelet Toolbox
 
-BUILD_DEPENDS=	${SCILAB_CMD}:${PORTSDIR}/math/scilab
+BUILD_DEPENDS=	${SCILAB_CMD}:math/scilab
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SCILAB_CMD=	${LOCALBASE}/bin/scilab-adv-cli
@@ -30,7 +30,7 @@ OPTIONS_SUB=	yes
 
 HELP_DESC=	Build help files (requires scilab with gui support)
 SIVP_DESC=	Enable Image and Video support
-SIVP_RUN_DEPENDS=	${LOCALBASE}/${CONTRIBDIR}/sivp/loader.sce:${PORTSDIR}/math/scilab-toolbox-sivp
+SIVP_RUN_DEPENDS=	${LOCALBASE}/${CONTRIBDIR}/sivp/loader.sce:math/scilab-toolbox-sivp
 
 WRKSRC=		${WRKDIR}/swt
 
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 7388afbc4cc4..b59abf3181d4 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Scientific software package for numerical computations
 
 # A partial dependencies list can be found at:
 # http://wiki.scilab.org/Dependencies_of_Scilab_5.X
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libarpack.so:${PORTSDIR}/math/arpack \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libmatio.so:${PORTSDIR}/math/matio \
-		libamd.so:${PORTSDIR}/math/suitesparse
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libpcre.so:devel/pcre \
+		libcurl.so:ftp/curl \
+		libhdf5.so:science/hdf5 \
+		libarpack.so:math/arpack \
+		libfftw3.so:math/fftw3 \
+		libmatio.so:math/matio \
+		libamd.so:math/suitesparse
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		cpe desktop-file-utils fortran gettext gmake iconv \
 		libtool pathfix pkgconfig shared-mime-info
@@ -52,39 +52,39 @@ GUI_DESC=	Java-based Graphical User Interface
 OCAML_DESC=	Scicos - dynamical system simulator (requires GUI)
 
 # Java dependencies:
-_GUI_DEPENDS+=	${JAVALIBDIR}/flexdock.jar:${PORTSDIR}/devel/flexdock \
-		${JAVALIBDIR}/jogl2.jar:${PORTSDIR}/graphics/jogamp-jogl \
-		foprep:${PORTSDIR}/math/jeuclid \
-		${JAVALIBDIR}/jhall.jar:${PORTSDIR}/java/javahelp \
-		${JAVALIBDIR}/jrosetta-api.jar:${PORTSDIR}/java/jrosetta \
-		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVALIBDIR}/jgraphx.jar:${PORTSDIR}/java/jgraphx \
-		${JAVALIBDIR}/jlatexmath.jar:${PORTSDIR}/math/jlatexmath \
-		${LOCALBASE}/share/java/ecj-4.5.jar:${PORTSDIR}/lang/gcc-ecj45
+_GUI_DEPENDS+=	${JAVALIBDIR}/flexdock.jar:devel/flexdock \
+		${JAVALIBDIR}/jogl2.jar:graphics/jogamp-jogl \
+		foprep:math/jeuclid \
+		${JAVALIBDIR}/jhall.jar:java/javahelp \
+		${JAVALIBDIR}/jrosetta-api.jar:java/jrosetta \
+		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
+		${JAVALIBDIR}/jgraphx.jar:java/jgraphx \
+		${JAVALIBDIR}/jlatexmath.jar:math/jlatexmath \
+		${LOCALBASE}/share/java/ecj-4.5.jar:lang/gcc-ecj45
 # Documentation, graphic export:
-_GUI_DEPENDS+=	${LOCALBASE}/share/java/fop/build/fop.jar:${PORTSDIR}/textproc/fop \
-		${JAVALIBDIR}/jlatexmath-fop.jar:${PORTSDIR}/math/jlatexmath \
-		${LOCALBASE}/share/java/batik/lib/batik-all.jar:${PORTSDIR}/graphics/batik \
-		${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \
-		${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
-		${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons
+_GUI_DEPENDS+=	${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop \
+		${JAVALIBDIR}/jlatexmath-fop.jar:math/jlatexmath \
+		${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \
+		${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
+		${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \
+		${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
 # Code quality:
-_GUI_DEPENDS+=	${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils \
-		${JAVALIBDIR}/antlr.jar:${PORTSDIR}/devel/antlr \
-		${JAVALIBDIR}/junit4.jar:${PORTSDIR}/java/junit \
-		${LOCALBASE}/bin/splint:${PORTSDIR}/devel/splint
+_GUI_DEPENDS+=	${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
+		${JAVALIBDIR}/antlr.jar:devel/antlr \
+		${JAVALIBDIR}/junit4.jar:java/junit \
+		${LOCALBASE}/bin/splint:devel/splint
 # Documentation building:
-_GUI_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		${JAVALIBDIR}/saxon9he.jar:${PORTSDIR}/textproc/saxon-he \
-		${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+_GUI_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:textproc/docbook-xsl \
+		${JAVALIBDIR}/saxon9he.jar:textproc/saxon-he \
+		${JAVALIBDIR}/xml-apis-ext.jar:textproc/xml-commons \
+		xsltproc:textproc/libxslt
 # Other gui deps:
-_GUI_DEPENDS+=	${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks \
-		${JAVALIBDIR}/skinlf.jar:${PORTSDIR}/x11-toolkits/skinlf
+_GUI_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/looks \
+		${JAVALIBDIR}/skinlf.jar:x11-toolkits/skinlf
 
 # Can't use USE_ANT because it overrides do-build target
 GUI_BUILD_DEPENDS=	${_GUI_DEPENDS} \
-			ant:${PORTSDIR}/devel/apache-ant
+			ant:devel/apache-ant
 GUI_RUN_DEPENDS=	${_GUI_DEPENDS}
 
 GUI_ALL_TARGET=	all doc
@@ -100,8 +100,8 @@ GUI_CONFIGURE_OFF=	--without-gui \
 
 OCAML_IMPLIES=		GUI
 OCAML_CONFIGURE_WITH=	modelica
-OCAML_BUILD_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
-OCAML_RUN_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
+OCAML_BUILD_DEPENDS=	ocaml:lang/ocaml
+OCAML_RUN_DEPENDS=	ocaml:lang/ocaml
 
 TK_CONFIGURE_OFF=	--without-tk
 TK_CONFIGURE_ON=	--with-tk-library=${LOCALBASE}/lib \
diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile
index 8ffae8d53b94..a025955524de 100644
--- a/math/sdpara/Makefile
+++ b/math/sdpara/Makefile
@@ -13,9 +13,9 @@ COMMENT=	SDPARA parallel version of SDPA (math/sdpa)
 
 LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	libblacs.so:${PORTSDIR}/math/blacs \
-		libscalapack.so:${PORTSDIR}/math/scalapack \
-		libmpich.so:${PORTSDIR}/net/mpich2
+LIB_DEPENDS=	libblacs.so:math/blacs \
+		libscalapack.so:math/scalapack \
+		libmpich.so:net/mpich2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
diff --git a/math/sfft/Makefile b/math/sfft/Makefile
index c60a0db11d36..5398706b1753 100644
--- a/math/sfft/Makefile
+++ b/math/sfft/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Optimized Sparse Fast Fourier Transform
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 USES=		uidfix zip
 USE_GCC=	yes
@@ -49,7 +49,7 @@ appropriately
 
 LIBM=	-lm
 .if ${OSVERSION} < 1000034
-LIB_DEPENDS+=	libmissing.so:${PORTSDIR}/math/libmissing
+LIB_DEPENDS+=	libmissing.so:math/libmissing
 LIBM+=		-lmissing
 .endif
 
diff --git a/math/slgrace/Makefile b/math/slgrace/Makefile
index 896ef0e9a122..eaad7433e0a2 100644
--- a/math/slgrace/Makefile
+++ b/math/slgrace/Makefile
@@ -13,8 +13,8 @@ COMMENT=	SLang module to plot graphs with grace
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
-RUN_DEPENDS=	grace:${PORTSDIR}/math/grace
+LIB_DEPENDS=	libslang.so:devel/libslang2
+RUN_DEPENDS=	grace:math/grace
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/math/snns/Makefile b/math/snns/Makefile
index 9acd7b7469f6..0ac9205e9a8d 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	SNNSv${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fully featured neural network simulator
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 USE_XORG=	x11 xext xt
 HAS_CONFIGURE=	yes
diff --git a/math/spooles/Makefile b/math/spooles/Makefile
index 14b32347ab23..755372729346 100644
--- a/math/spooles/Makefile
+++ b/math/spooles/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	maho@FreeBSD.org
 COMMENT=	SParse Object Oriented Linear Equations Solver
 
 .if defined(WITH_MPI)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmpich.a:${PORTSDIR}/net/mpich2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libmpich.a:net/mpich2
 .endif
 
 USES=		gmake tar:tgz
diff --git a/math/stp/Makefile b/math/stp/Makefile
index df578ff61dbf..335e7a9fa411 100644
--- a/math/stp/Makefile
+++ b/math/stp/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Decision Procedure for Bitvectors and Arrays
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
+		libboost_system.so:devel/boost-libs
 
 USES=		bison:build cmake perl5 tar:xz
 USE_PERL5=	build
@@ -22,7 +22,7 @@ CMAKE_ARGS=	-DFL_LIBRARY=/usr/lib/libfl.a
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} < 1000000)
-BUILD_DEPENDS+=flex>=2.5.38:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=flex>=2.5.38:textproc/flex
 CMAKE_ARGS+=	-DFL_LIBRARY=${LOCALBASE}/lib/libfl.a \
 		-DFLEX_INCLUDE_DIR=${LOCALBASE}/include/flex \
 		-DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex
diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile
index ab05bcda2e12..f3507a876f62 100644
--- a/math/suitesparse/Makefile
+++ b/math/suitesparse/Makefile
@@ -25,7 +25,7 @@ NETLIB_USES=	blaslapack:netlib
 ATLAS_USES=	blaslapack:atlas
 
 .if defined (WITH_METIS)
-LIB_DEPENDS=	libmetis.so:${PORTSDIR}/math/metis4
+LIB_DEPENDS=	libmetis.so:math/metis4
 
 RESTRICTED=	GPL and METIS licenses are contradictory
 .endif
diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile
index 6ac91cd15e4e..78b81faeb66c 100644
--- a/math/superlu_mt/Makefile
+++ b/math/superlu_mt/Makefile
@@ -30,14 +30,14 @@ WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == reference
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	libblas.so:math/blas
 BLAS=	-lblas
 .elif ${WITH_BLAS} == gotoblas
-LIB_DEPENDS+=	libgoto2.so:${PORTSDIR}/math/gotoblas
+LIB_DEPENDS+=	libgoto2.so:math/gotoblas
 BLAS=	-lgoto2p
 BROKEN=	Build stops while testing
 .elif ${WITH_BLAS} == atlas
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=	-lptf77blas
 .endif
 
diff --git a/math/surf/Makefile b/math/surf/Makefile
index 2cb6a24770e8..4482842ead21 100644
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Visualize some real algebraic geometry
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libgmp.so:math/gmp
 
 USES=		jpeg
 USE_XORG=	x11 xmu
diff --git a/math/tablix/Makefile b/math/tablix/Makefile
index 6dfd7d4421cf..1b9a6c91a95d 100644
--- a/math/tablix/Makefile
+++ b/math/tablix/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.tablix.org/releases/stable/ \
 MAINTAINER=	amir.husaini@gmail.com
 COMMENT=	Free software for solving timetabling problems
 
-BUILD_DEPENDS=	pvm:${PORTSDIR}/net/pvm
-RUN_DEPENDS=	pvm:${PORTSDIR}/net/pvm
+BUILD_DEPENDS=	pvm:net/pvm
+RUN_DEPENDS=	pvm:net/pvm
 
 PVM_ROOT=	${LOCALBASE}/lib/pvm
 
diff --git a/math/taucs/Makefile b/math/taucs/Makefile
index 2a64cd5a6f2a..5ad86ef1023e 100644
--- a/math/taucs/Makefile
+++ b/math/taucs/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	C library of sparse linear solvers
 
-LIB_DEPENDS=	libmetis.so:${PORTSDIR}/math/metis4
+LIB_DEPENDS=	libmetis.so:math/metis4
 
 HAS_CONFIGURE=	yes
 USES=		fortran tar:tgz
@@ -37,12 +37,12 @@ WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == atlas
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lf77blas
 LAPACK=		-lalapack -lcblas
 .elif ${WITH_BLAS} == reference
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	liblapack.so:math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
diff --git a/math/testu01/Makefile b/math/testu01/Makefile
index 209c5fe21ba1..107e70c62ea3 100644
--- a/math/testu01/Makefile
+++ b/math/testu01/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	${PORTNAME}${EXTRACT_SUFX}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Utilities for statistical testing of uniform random number generators
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		gmake zip libtool
 GNU_CONFIGURE=	yes
diff --git a/math/timbl/Makefile b/math/timbl/Makefile
index 83b78f29198c..c7b2d56d63b3 100644
--- a/math/timbl/Makefile
+++ b/math/timbl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://ilk.uvt.nl/downloads/pub/software/
 MAINTAINER=	yuri@tsoft.com
 COMMENT=	Tilburg Memory Based Learner
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/math/trlan/Makefile b/math/trlan/Makefile
index 68382285b015..39c02fabb601 100644
--- a/math/trlan/Makefile
+++ b/math/trlan/Makefile
@@ -71,8 +71,8 @@ do-install:
 
 .if defined(MAINTAINER_MODE)
 
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libblas.so.2:${PORTSDIR}/math/blas \
-			${LOCALBASE}/lib/liblapack.so.4:${PORTSDIR}/math/lapack
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libblas.so.2:math/blas \
+			${LOCALBASE}/lib/liblapack.so.4:math/lapack
 
 BLAS?=		-L${LOCALBASE}/lib -lblas
 LAPACK?=	-L${LOCALBASE}/lib -llapack
diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile
index 0486b3b1ad4c..79e388b6e79c 100644
--- a/math/tvmet/Makefile
+++ b/math/tvmet/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--with-cxx=${CXX}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCPPUNIT}
-LIB_DEPENDS+=	libcppunit.so:${PORTSDIR}/devel/cppunit
+LIB_DEPENDS+=	libcppunit.so:devel/cppunit
 CONFIGURE_ARGS+=	--with-cppunit-prefix=${LOCALBASE}
 .else
 CONFIGURE_ENV+=	ac_cv_path_CPPUNIT_CONFIG=no
diff --git a/math/ufc/Makefile b/math/ufc/Makefile
index 70be3c5b11c6..e19453f6e229 100644
--- a/math/ufc/Makefile
+++ b/math/ufc/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://launchpad.net/${PORTNAME}/${MMVERSION}.x/${PORTVERSION}/+do
 MAINTAINER=	bacon4000@gmail.com
 COMMENT=	Unified framework for finite element assembly
 
-BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
-LIB_DEPENDS=	libboost_math_c99.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	swig2.0:devel/swig20
+LIB_DEPENDS=	libboost_math_c99.so:devel/boost-libs
 
 # LICENSE=	public domain
 
diff --git a/math/unuran/Makefile b/math/unuran/Makefile
index 775858da23c9..2a81a3f17848 100644
--- a/math/unuran/Makefile
+++ b/math/unuran/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://statmath.wu-wien.ac.at/unuran/ \
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Universal Non-Uniform RANdom number generators
 
-LIB_DEPENDS=	librngstreams.so:${PORTSDIR}/math/rngstreams
+LIB_DEPENDS=	librngstreams.so:math/rngstreams
 
 LICENSE=	GPLv2
 USES=		gmake libtool
diff --git a/math/vowpal_wabbit/Makefile b/math/vowpal_wabbit/Makefile
index 401b060a0dda..10563e6f51d8 100644
--- a/math/vowpal_wabbit/Makefile
+++ b/math/vowpal_wabbit/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	math
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Fast out-of-core learning system
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 BROKEN_FreeBSD_9=	does not build
 
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index d9daa0d1eeef..bb86d483caf8 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -14,9 +14,9 @@ COMMENT=	The Visualization Toolkit
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 WRKSRC=		${WRKDIR}/VTK${PORTVERSION}
 
@@ -80,7 +80,7 @@ PLIST_SUB+=	SHARED="@comment " \
 .endif
 
 .if ${PORT_OPTIONS:MVTKMPEG2}
-LIB_DEPENDS+=	libvtkMPEG2Encode.so:${PORTSDIR}/multimedia/vtkmpeg2encode
+LIB_DEPENDS+=	libvtkMPEG2Encode.so:multimedia/vtkmpeg2encode
 PLIST_SUB+=	MPEG=""
 CMAKE_ARGS+=	-DVTK_USE_PATENTED:BOOL=ON \
 		-DVTK_USE_MPEG2_ENCODER:BOOL=ON \
@@ -91,8 +91,8 @@ PLIST_SUB+=	MPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTHEORA}
-LIB_DEPENDS+=	libogg.so:${PORTSDIR}/audio/libogg \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=	libogg.so:audio/libogg \
+		libtheora.so:multimedia/libtheora
 PLIST_SUB+=	THEORA=""
 CMAKE_ARGS+=	-DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON
 .else
@@ -101,7 +101,7 @@ CMAKE_ARGS+=	-DVTK_USE_OGGTHEORA_ENCODER:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MGL2PS}
-LIB_DEPENDS+=	libgl2ps.so:${PORTSDIR}/print/gl2ps
+LIB_DEPENDS+=	libgl2ps.so:print/gl2ps
 CMAKE_ARGS+=	-DVTK_USE_GL2PS:BOOL=ON
 PLIST_SUB+=	GL2PS=""
 .else
@@ -109,7 +109,7 @@ PLIST_SUB+=	GL2PS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOSMESA}
-LIB_DEPENDS+=	libOSMesa.so:${PORTSDIR}/graphics/libosmesa
+LIB_DEPENDS+=	libOSMesa.so:graphics/libosmesa
 CMAKE_ARGS+=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
 		-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 		-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile
index b88b7d59de5d..af06336ff382 100644
--- a/math/vtk6/Makefile
+++ b/math/vtk6/Makefile
@@ -14,10 +14,10 @@ COMMENT=	The Visualization Toolkit
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2
 
 #
 # TODO
@@ -99,7 +99,7 @@ CMAKE_ARGS+=	-DVTK_Group_${g}:BOOL=OFF
 .endfor
 
 .if ${PORT_OPTIONS:MOSMESA}
-LIB_DEPENDS+=	libOSMesa.so:${PORTSDIR}/graphics/libosmesa
+LIB_DEPENDS+=	libOSMesa.so:graphics/libosmesa
 CMAKE_ARGS+=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
 		-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 		-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
@@ -118,7 +118,7 @@ CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=ON
 .endif
 
 .if ${PORT_OPTIONS:MMPI}
-LIB_DEPENDS+=	libmpi.so:${PORTSDIR}/net/openmpi
+LIB_DEPENDS+=	libmpi.so:net/openmpi
 CMAKE_ARGS+=	-DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec
 PLIST_SUB+=	MPI=""
 .else
@@ -184,7 +184,7 @@ CMAKE_ARGS+=	-DVTK_WRAP_PYTHON:BOOL=ON \
 		-DModule_vtkRenderingMatplotlib:BOOL=ON \
 		-DModule_vtkPythonInterpreter:BOOL=ON
 PLIST_SUB+=	PYTHON=""
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/matplotlib/__init__.py:${PORTSDIR}/math/py-matplotlib
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib
 .else
 CMAKE_ARGS+=	-DVTK_WRAP_PYTHON:BOOL=OFF
 PLIST_SUB+=	PYTHON="@comment "
@@ -212,7 +212,7 @@ PLIST_SUB+=	WRAP="@comment "
 
 .if ${PORT_OPTIONS:MDOCS}
 CMAKE_ARGS+=	-DBUILD_DOCUMENTATION:BOOL=ON
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 .else
 CMAKE_ARGS+=	-DBUILD_DOCUMENTATION:BOOL=OFF
 .endif
diff --git a/math/wcalc/Makefile b/math/wcalc/Makefile
index ea570f29de1e..3077ec972417 100644
--- a/math/wcalc/Makefile
+++ b/math/wcalc/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Natural-expression command-line calculator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr
 
 USES=		localbase readline
 
diff --git a/math/why3-spark/Makefile b/math/why3-spark/Makefile
index 4b6b8ffe87fb..4a271a1b7771 100644
--- a/math/why3-spark/Makefile
+++ b/math/why3-spark/Makefile
@@ -17,13 +17,13 @@ LICENSE_COMB=	multi
 
 BROKEN=		broken by recent updated to an ocaml dependency
 
-BUILD_DEPENDS=	menhir:${PORTSDIR}/devel/menhir \
-		ocaml-zip>1:${PORTSDIR}/archivers/ocaml-zip \
-		ocaml-zarith>1.2:${PORTSDIR}/math/ocaml-zarith \
-		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
-		ocaml-sqlite3>2:${PORTSDIR}/databases/ocaml-sqlite3 \
-		ocaml-ocamlgraph>1.8:${PORTSDIR}/math/ocaml-ocamlgraph \
-		camlp5o:${PORTSDIR}/devel/ocaml-camlp5
+BUILD_DEPENDS=	menhir:devel/menhir \
+		ocaml-zip>1:archivers/ocaml-zip \
+		ocaml-zarith>1.2:math/ocaml-zarith \
+		lablgtk2:x11-toolkits/ocaml-lablgtk2 \
+		ocaml-sqlite3>2:databases/ocaml-sqlite3 \
+		ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph \
+		camlp5o:devel/ocaml-camlp5
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/math/why3/Makefile b/math/why3/Makefile
index 453515dbb17e..b3df4aada4cb 100644
--- a/math/why3/Makefile
+++ b/math/why3/Makefile
@@ -16,11 +16,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL= why3-gpl-*
 
-BUILD_DEPENDS=	ocaml-zarith>1.2:${PORTSDIR}/math/ocaml-zarith \
-		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
-		ocaml-sqlite3>2:${PORTSDIR}/databases/ocaml-sqlite3 \
-		ocaml-ocamlgraph>1.8:${PORTSDIR}/math/ocaml-ocamlgraph \
-		camlp5o:${PORTSDIR}/devel/ocaml-camlp5
+BUILD_DEPENDS=	ocaml-zarith>1.2:math/ocaml-zarith \
+		lablgtk2:x11-toolkits/ocaml-lablgtk2 \
+		ocaml-sqlite3>2:databases/ocaml-sqlite3 \
+		ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph \
+		camlp5o:devel/ocaml-camlp5
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-all
@@ -48,8 +48,8 @@ OPTIONS_DEFINE=	DOCS
 # also removed from ALL_TARGET
 #
 #DOCS_CONFIGURE_ENABLE=		doc
-#DOCS_BUILD_DEPENDS=		rubber:${PORTSDIR}/textproc/rubber \
-#				hevea:${PORTSDIR}/textproc/hevea
+#DOCS_BUILD_DEPENDS=		rubber:textproc/rubber \
+#				hevea:textproc/hevea
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 9c155dce8c2c..aaf03183a3e6 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -13,7 +13,7 @@ COMMENT=	WxWidgets GUI for the computer algebra system maxima
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	maxima:${PORTSDIR}/math/maxima
+RUN_DEPENDS=	maxima:math/maxima
 
 CONFIGURE_ARGS=	--program-prefix=
 
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 75a9037484a9..9323947c445a 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	-source.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XForms-based statistics package
 
-LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libforms.so:x11-toolkits/xforms
 
 WRKSRC=		${WRKDIR}/xldlas
 
diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index 7aa94f5f1b59..2d2e543e8076 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -29,7 +29,7 @@ PLIST_FILES=	bin/pxspread bin/xspread man/man1/pxspread.1.gz \
 OPTIONS_DEFINE=	X11 DOCS
 
 X11_USE=		XORG=x11,xau,xcb,xdmcp,xt
-X11_LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
+X11_LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs
 X11_USES=		localbase
 X11_CONFIGURE_ENV_OFF=	ac_cv_header_X11_X_h=no
 
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 1735947f49dc..41ae1330c852 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Yet Another Computer Algebra System
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-TEST_DEPENDS=	bash:${PORTSDIR}/shells/bash
+TEST_DEPENDS=	bash:shells/bash
 
 USES=		cmake:outsource compiler:c++11-lib
 USE_LDCONFIG=	yes
diff --git a/math/z3/Makefile b/math/z3/Makefile
index d0ea54b973da..273645320707 100644
--- a/math/z3/Makefile
+++ b/math/z3/Makefile
@@ -28,7 +28,7 @@ GMP_DESC=		Use GMP library for AP arithmetic
 GMP_CONFIGURE_ON=	--gmp
 GMP_CXXFLAGS=		-I${LOCALBASE}include
 GMP_LDFLAGS=		-L${LOCALBASE}/lib
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 
 HAS_CONFIGURE=		yes
 USE_LDCONFIG=		yes
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 0067e247c167..0a983ed9d977 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -12,8 +12,8 @@ PKGNAMESUFFIX?=	-server
 MAINTAINER=	fbsd@dylanleigh.net
 COMMENT?=	Advanced Maryland Automatic Network Disk Archiver (server)
 
-RUN_DEPENDS=	perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
-BUILD_DEPENDS=	perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
+RUN_DEPENDS=	perl-amanda:misc/amanda-perl-wrapper
+BUILD_DEPENDS=	perl-amanda:misc/amanda-perl-wrapper
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
@@ -77,8 +77,8 @@ S3_DESC=	Enable Amazon S3 device support
 .if ${PORT_OPTIONS:MGNUTAR}
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
 		--with-gnutar=${LOCALBASE}/bin/gtar
-BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+BUILD_DEPENDS+=	gtar:archivers/gtar
+RUN_DEPENDS+=	gtar:archivers/gtar
 .endif
 
 # amanda-server part
@@ -105,15 +105,15 @@ pre-fetch:
 
 CONFLICTS=	amanda-server-2.* amanda-server-3.2.* amanda2[56]-server-*
 
-BUILD_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
-RUN_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:misc/amanda-client
+RUN_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:misc/amanda-client \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 
 CONFIGURE_ARGS+=--without-client
 
 .if ${PORT_OPTIONS:MPLOT}
-BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
+BUILD_DEPENDS+=	gnuplot:math/gnuplot
+RUN_DEPENDS+=	gnuplot:math/gnuplot
 PLIST_SUB+=	PLOT=''
 CONFIGURE_ARGS+=	--with-gnuplot=${LOCALBASE}/bin/gnuplot
 .else
@@ -123,14 +123,14 @@ CONFIGURE_ARGS+=	--without-gnuplot
 
 .if ${PORT_OPTIONS:MSAMBA}
 SAMBA_PORT?=	samba36
-BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/${SAMBA_PORT}
-RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/${SAMBA_PORT}
+BUILD_DEPENDS+=	smbclient:net/${SAMBA_PORT}
+RUN_DEPENDS+=	smbclient:net/${SAMBA_PORT}
 CONFIGURE_ARGS+=	--with-smbclient=${LOCALBASE}/bin/smbclient
 .endif
 
 # If configure founds libcurl, automatically enabled it (with plist change).
 .if ${PORT_OPTIONS:MS3}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 CONFIGURE_ARGS+=	--enable-s3-device
 PLIST_SUB+=	S3DEVICE=''
 .else
diff --git a/misc/amfm/Makefile b/misc/amfm/Makefile
index 7d68bbbd08eb..0481f0e4ccd1 100644
--- a/misc/amfm/Makefile
+++ b/misc/amfm/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.c
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	THANKO USB AM/FM Radio controller
 
-LIB_DEPENDS=	libhid.so:${PORTSDIR}/devel/libhid
+LIB_DEPENDS=	libhid.so:devel/libhid
 
 NO_WRKSUBDIR=   yes
 
diff --git a/misc/ansiweather/Makefile b/misc/ansiweather/Makefile
index 5587ad65616b..607480190b04 100644
--- a/misc/ansiweather/Makefile
+++ b/misc/ansiweather/Makefile
@@ -9,10 +9,10 @@ COMMENT=	Shell script for displaying the current weather in your terminal
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	jq:${PORTSDIR}/textproc/jq \
-		curl:${PORTSDIR}/ftp/curl \
-		bash:${PORTSDIR}/shells/bash \
-		gprintf:${PORTSDIR}/sysutils/coreutils
+RUN_DEPENDS=	jq:textproc/jq \
+		curl:ftp/curl \
+		bash:shells/bash \
+		gprintf:sysutils/coreutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fcambus
diff --git a/misc/artikulate/Makefile b/misc/artikulate/Makefile
index ddfe8d6c5335..ea171e210805 100644
--- a/misc/artikulate/Makefile
+++ b/misc/artikulate/Makefile
@@ -9,9 +9,9 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Pronunciation trainer for KDE
 
-LIB_DEPENDS=	libQtGStreamer-1.0.so:${PORTSDIR}/multimedia/gstreamer1-qt4 \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:${PORTSDIR}/graphics/kqtquickcharts
+LIB_DEPENDS=	libQtGStreamer-1.0.so:multimedia/gstreamer1-qt4 \
+		libboost_thread.so:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts
 
 IGNORE=		not usable, links to both GStreamer 0.10.x and 1.x
 
diff --git a/misc/auto-multiple-choice/Makefile b/misc/auto-multiple-choice/Makefile
index 77405bd8e24e..502fa47f90cd 100644
--- a/misc/auto-multiple-choice/Makefile
+++ b/misc/auto-multiple-choice/Makefile
@@ -11,25 +11,25 @@ COMMENT=	Multiple-choice questionnaire management with automated marking
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libnetpbm.so:${PORTSDIR}/graphics/netpbm \
-		libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
-		libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango \
-		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Email-MIME>=0:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Sender>=0:${PORTSDIR}/mail/p5-Email-Sender \
-		p5-Glib-Object-Introspection>=0:${PORTSDIR}/devel/p5-Glib-Object-Introspection \
-		p5-Gtk2-Notify>=0:${PORTSDIR}/devel/p5-Gtk2-Notify \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-Net-CUPS>=0:${PORTSDIR}/print/p5-Net-CUPS \
-		p5-OpenOffice-OODoc>=0:${PORTSDIR}/textproc/p5-OpenOffice-OODoc \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
-		pdftoppm:${PORTSDIR}/graphics/poppler-utils
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libnetpbm.so:graphics/netpbm \
+		libopencv_highgui.so:graphics/opencv \
+		libpangocairo-1.0.so:x11-toolkits/pango \
+		libpoppler-glib.so:graphics/poppler-glib
+RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Email-MIME>=0:mail/p5-Email-MIME \
+		p5-Email-Sender>=0:mail/p5-Email-Sender \
+		p5-Glib-Object-Introspection>=0:devel/p5-Glib-Object-Introspection \
+		p5-Gtk2-Notify>=0:devel/p5-Gtk2-Notify \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
+		p5-Net-CUPS>=0:print/p5-Net-CUPS \
+		p5-OpenOffice-OODoc>=0:textproc/p5-OpenOffice-OODoc \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer \
+		pdftoppm:graphics/poppler-utils
 
 WRKSRC=		${WRKDIR}/auto-multiple-choice-${PORTVERSION}
 PORTDOCS=	html auto-multiple-choice.*
diff --git a/misc/bb/Makefile b/misc/bb/Makefile
index 34976dbc592c..f5bd3b66b423 100644
--- a/misc/bb/Makefile
+++ b/misc/bb/Makefile
@@ -13,8 +13,8 @@ COMMENT=	High quality audio-visual demonstration for text terminal
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS=	libaa.so:graphics/aalib \
+		libmikmod.so:audio/libmikmod
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/bb-1.3.0
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index 69c0e97699e1..a10820c0d90e 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Open source Bible study tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libclucene-core.so:${PORTSDIR}/textproc/clucene \
-		libsword.so:${PORTSDIR}/misc/sword
+LIB_DEPENDS=	libclucene-core.so:textproc/clucene \
+		libsword.so:misc/sword
 
 USES=		cmake:outsource tar:xz
 USE_OPENSSL=	yes
diff --git a/misc/biosfont-demos/Makefile b/misc/biosfont-demos/Makefile
index 6c3e34c6b84e..9222e9a48eb1 100644
--- a/misc/biosfont-demos/Makefile
+++ b/misc/biosfont-demos/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Demos for the biosfont kernel module
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/biosfont.h:${PORTSDIR}/sysutils/biosfont
-RUN_DEPENDS=	/boot/modules/biosfont.ko:${PORTSDIR}/sysutils/biosfont
+BUILD_DEPENDS=	${LOCALBASE}/include/biosfont.h:sysutils/biosfont
+RUN_DEPENDS=	/boot/modules/biosfont.ko:sysutils/biosfont
 
 PLIST_FILES=	bin/show_char bin/showdati
 
diff --git a/misc/cdcollect/Makefile b/misc/cdcollect/Makefile
index e207b5b081e7..0a73274082e0 100644
--- a/misc/cdcollect/Makefile
+++ b/misc/cdcollect/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}_source
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple CD catalog for GNOME
 
-BUILD_DEPENDS=	sqlite3>=3.0:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS=	sqlite3>=3.0:databases/sqlite3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/misc/chord2html/Makefile b/misc/chord2html/Makefile
index 6ebe82f8861d..e56d21baed8d 100644
--- a/misc/chord2html/Makefile
+++ b/misc/chord2html/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Convert CHORD input files to HTML
 
-RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD
 
 USES=		shebangfix perl5
 NO_BUILD=	yes
diff --git a/misc/cloc/Makefile b/misc/cloc/Makefile
index 3401ee2d5d1b..49f25bc84f00 100644
--- a/misc/cloc/Makefile
+++ b/misc/cloc/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.pl
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Counts lines of code
 
-RUN_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff
+RUN_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff
 
 USES=		perl5
 USE_PERL5=	run
diff --git a/misc/compat10x/pkg-descr b/misc/compat10x/pkg-descr
index 09ddb1464e27..5c50559158d2 100644
--- a/misc/compat10x/pkg-descr
+++ b/misc/compat10x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 1100000
-LIB_DEPENDS+=	libelf.so.1:${PORTSDIR}/misc/compat10x
+LIB_DEPENDS+=	libelf.so.1:misc/compat10x
 .endif
 --
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index 6a027e78e1be..717a28e29874 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	${COMPAT4X_ARCH}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convenience package to install the compat4x libraries
 
-RUN_DEPENDS=	${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
+RUN_DEPENDS=	${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:misc/localedata
 
 WRKSRC=		${WRKDIR}/usr/lib/compat
 
diff --git a/misc/compat4x/pkg-descr b/misc/compat4x/pkg-descr
index 348da64b5108..743e61c11adf 100644
--- a/misc/compat4x/pkg-descr
+++ b/misc/compat4x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500000
-LIB_DEPENDS+=	c.4:${PORTSDIR}/misc/compat4x
+LIB_DEPENDS+=	c.4:misc/compat4x
 .endif
 --
diff --git a/misc/compat5x/Makefile b/misc/compat5x/Makefile
index 8a18a279d953..1025bc78ba57 100644
--- a/misc/compat5x/Makefile
+++ b/misc/compat5x/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convenience package to install the compat5x libraries
 
-RUN_DEPENDS=	${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
+RUN_DEPENDS=	${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:misc/localedata
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/misc/compat5x/pkg-descr b/misc/compat5x/pkg-descr
index 50e19528a58a..095d0677d329 100644
--- a/misc/compat5x/pkg-descr
+++ b/misc/compat5x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 600000
-LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS+=	c.5:misc/compat5x
 .endif
 --
diff --git a/misc/compat6x/pkg-descr b/misc/compat6x/pkg-descr
index 63840d0b37a9..76d1a0cc175a 100644
--- a/misc/compat6x/pkg-descr
+++ b/misc/compat6x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 700043
-LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS+=	c.6:misc/compat6x
 .endif
 --
diff --git a/misc/compat7x/pkg-descr b/misc/compat7x/pkg-descr
index c618eca5c087..2c5e59869893 100644
--- a/misc/compat7x/pkg-descr
+++ b/misc/compat7x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 800105
-LIB_DEPENDS+=	alias.6:${PORTSDIR}/misc/compat7x
+LIB_DEPENDS+=	alias.6:misc/compat7x
 .endif
 --
diff --git a/misc/compat8x/Makefile b/misc/compat8x/Makefile
index f77a821dfe3a..5f1d5c8efa0d 100644
--- a/misc/compat8x/Makefile
+++ b/misc/compat8x/Makefile
@@ -25,7 +25,7 @@ IGNORE=		is for FreeBSD 8.x and newer
 .endif
 
 .if ${OSVERSION} >= 1000000
-RUN_DEPENDS=	compat9x-${ARCH}>=0:${PORTSDIR}/misc/compat9x
+RUN_DEPENDS=	compat9x-${ARCH}>=0:misc/compat9x
 .endif
 
 .if ${ARCH} == amd64
diff --git a/misc/compat8x/pkg-descr b/misc/compat8x/pkg-descr
index 9c6dc4c28471..563c48db132a 100644
--- a/misc/compat8x/pkg-descr
+++ b/misc/compat8x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 900042
-LIB_DEPENDS+=	ufs.5:${PORTSDIR}/misc/compat8x
+LIB_DEPENDS+=	ufs.5:misc/compat8x
 .endif
 --
diff --git a/misc/compat9x/Makefile b/misc/compat9x/Makefile
index 770596c56487..5c44db15ddec 100644
--- a/misc/compat9x/Makefile
+++ b/misc/compat9x/Makefile
@@ -25,7 +25,7 @@ IGNORE=		is for FreeBSD 9.x and newer
 .endif
 
 .if ${OSVERSION} >= 1100000
-RUN_DEPENDS=	compat10x-${ARCH}>=0:${PORTSDIR}/misc/compat10x
+RUN_DEPENDS=	compat10x-${ARCH}>=0:misc/compat10x
 .endif
 
 .if ${ARCH} == amd64
diff --git a/misc/compat9x/pkg-descr b/misc/compat9x/pkg-descr
index f8eabd6ee9c3..ccd9711d536f 100644
--- a/misc/compat9x/pkg-descr
+++ b/misc/compat9x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 1000009
-LIB_DEPENDS+=	archive.5:${PORTSDIR}/misc/compat9x
+LIB_DEPENDS+=	archive.5:misc/compat9x
 .endif
 --
diff --git a/misc/cs/Makefile b/misc/cs/Makefile
index a9c09ed04626..a5fc9e9ad898 100644
--- a/misc/cs/Makefile
+++ b/misc/cs/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Cross Stitch software
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 NO_BUILD=	yes
 
diff --git a/misc/cuecat/Makefile b/misc/cuecat/Makefile
index e3ad09ede8dc..83dca5fc62f5 100644
--- a/misc/cuecat/Makefile
+++ b/misc/cuecat/Makefile
@@ -23,8 +23,8 @@ OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 OPTIONS_SUB=	yes
 
-X11_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_PKGNAMEPREFIX}Pmw>0:${PORTSDIR}/x11-toolkits/py-Pmw
+X11_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+		${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw
 
 .include <bsd.port.options.mk>
 
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index 67dfc34c1a0a..568df9b39dc4 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}\
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Digium/Asterisk Hardware Device Interface
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/dahdi_cfg:${PORTSDIR}/misc/dahdi
+RUN_DEPENDS=	${LOCALBASE}/sbin/dahdi_cfg:misc/dahdi
 
 DAHDI_VERSION=		2.4.0-rc5
 DAHDI_TOOLS_VERSION=	2.4.0-rc1
diff --git a/misc/dahdi-kmod26/Makefile b/misc/dahdi-kmod26/Makefile
index 31036865b35a..25973aa0a17a 100644
--- a/misc/dahdi-kmod26/Makefile
+++ b/misc/dahdi-kmod26/Makefile
@@ -16,7 +16,7 @@ DISTFILES=	${DISTNAME}.tar.bz2\
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Digium/Asterisk Hardware Device Interface
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/dahdi_cfg:${PORTSDIR}/misc/dahdi
+RUN_DEPENDS=	${LOCALBASE}/sbin/dahdi_cfg:misc/dahdi
 
 DAHDI_VERSION=		2.6.1-r10747
 DAHDI_TOOLS_VERSION=	2.4.0-rc1
diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile
index c069feb2ff51..2a73c79eba36 100644
--- a/misc/dahdi/Makefile
+++ b/misc/dahdi/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	DAHDI userland utilities and libraries
 
-LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
+LIB_DEPENDS=	libnewt.so:devel/newt
 
 DAHDI_VERSION=		2.4.0-rc5
 DAHDI_TOOLS_VERSION=	2.4.0-rc1
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index 28b6411054da..c6a6f7b2b7ae 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Automated program/system tester
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexpect.so:${PORTSDIR}/lang/expect
+LIB_DEPENDS=	libexpect.so:lang/expect
 
 USES+=		gmake tcl
 GNU_CONFIGURE=	yes
diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index 6fa0709e930d..25e433dd6f13 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -18,8 +18,8 @@ EXPIRATION_DATE=	2016-04-15
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlobject>=0.7:${PORTSDIR}/databases/py-sqlobject \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlobject>=0.7:databases/py-sqlobject \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 
 USES=		gettext python
 USE_PYTHON=	distutils
diff --git a/misc/dphys-config/Makefile b/misc/dphys-config/Makefile
index f46f9bd50033..3c5fcf46b703 100644
--- a/misc/dphys-config/Makefile
+++ b/misc/dphys-config/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to distribute config files
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 NO_BUILD=	yes
 
diff --git a/misc/e2fsprogs-libblkid/Makefile b/misc/e2fsprogs-libblkid/Makefile
index 686568f5bf01..00a7e719617b 100644
--- a/misc/e2fsprogs-libblkid/Makefile
+++ b/misc/e2fsprogs-libblkid/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX=	-libblkid
 
 COMMENT=	Blkid library from e2fsprogs package
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 CONFIGURE_ARGS=	--enable-elf-shlibs
 
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 1108680792e3..6c9b963467a5 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -19,7 +19,7 @@ DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
 DEPPORT_SUFFIX=
 .endif
 
-RUN_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+RUN_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel${DEPPORT_SUFFIX}
 
 EMACS_NO_BUILD_DEPENDS=	YES
 NO_BUILD=	YES
diff --git a/misc/esniper/Makefile b/misc/esniper/Makefile
index 9beb3ed29ac5..c39fca086b0b 100644
--- a/misc/esniper/Makefile
+++ b/misc/esniper/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Lightweight console application for sniping ebay auctions
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		tar:tgz
 GNU_CONFIGURE=	yes
diff --git a/misc/exercism/Makefile b/misc/exercism/Makefile
index d04835743ad3..1410c411b1e4 100644
--- a/misc/exercism/Makefile
+++ b/misc/exercism/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	misc
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	CLI client for exercism.io
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	codegangsta:cg kardianos:osext golang:text,net davecgh:spew pmezard:diff stretchr:testify
diff --git a/misc/figlet-fonts/Makefile b/misc/figlet-fonts/Makefile
index 0933f11a275b..c7450924c490 100644
--- a/misc/figlet-fonts/Makefile
+++ b/misc/figlet-fonts/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	figlet
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Assorted fonts for the figlet(6) program
 
-RUN_DEPENDS=	figlet:${PORTSDIR}/misc/figlet
+RUN_DEPENDS=	figlet:misc/figlet
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 5ac8a144011c..18de45e3d0c9 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -9,25 +9,25 @@ CATEGORIES=	misc docs
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	Documentation from the FreeBSD Documentation Project
 
-RUN_DEPENDS+=	bn-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-bn		\
-		da-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-da		\
-		de-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-de		\
-		el-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-el		\
-		en-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-en		\
-		es-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-es		\
-		fr-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-fr		\
-		hu-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-hu		\
-		it-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-it		\
-		ja-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-ja		\
-		ko-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-ko		\
-		mn-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-mn		\
-		nl-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-nl		\
-		pl-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-pl		\
-		pt-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-pt		\
-		ru-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-ru		\
-		tr-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-tr		\
-		zh_cn-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-zh_cn	\
-		zh_tw-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-zh_tw
+RUN_DEPENDS+=	bn-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-bn		\
+		da-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-da		\
+		de-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-de		\
+		el-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-el		\
+		en-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-en		\
+		es-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-es		\
+		fr-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-fr		\
+		hu-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-hu		\
+		it-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-it		\
+		ja-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-ja		\
+		ko-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-ko		\
+		mn-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-mn		\
+		nl-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-nl		\
+		pl-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-pl		\
+		pt-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-pt		\
+		ru-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-ru		\
+		tr-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-tr		\
+		zh_cn-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-zh_cn	\
+		zh_tw-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-zh_tw
 
 USES=		metaport
 
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index eca558448fad..a4507e10bd1e 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX?=	en-
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT?=	Documentation from the FreeBSD Documentation Project
 
-BUILD_DEPENDS=	docproj>=2.0_6:${PORTSDIR}/textproc/docproj
+BUILD_DEPENDS=	docproj>=2.0_6:textproc/docproj
 
 USES=		uidfix
 WRKSRC=		${WRKDIR}/doc
@@ -66,14 +66,14 @@ PLIST_FORMATS+=	${O:tl:S,_,-,}
 .endfor
 
 .if ${PORT_OPTIONS:MPDF} || ${PORT_OPTIONS:MPS}
-BUILD_DEPENDS+=	fop:${PORTSDIR}/textproc/fop \
-		${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
-		${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
-		${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
-		${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu \
-		${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
-		${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa \
-		${LOCALBASE}/share/fonts/nanum-ttf/NanumBarunGothic.ttf:${PORTSDIR}/korean/nanumfonts-ttf
+BUILD_DEPENDS+=	fop:textproc/fop \
+		${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:x11-fonts/gentium-plus \
+		${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf \
+		${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:x11-fonts/lohit \
+		${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:x11-fonts/dejavu \
+		${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:chinese/arphicttf \
+		${LOCALBASE}/share/fonts/OTF/ipam.otf:japanese/font-ipa \
+		${LOCALBASE}/share/fonts/nanum-ttf/NanumBarunGothic.ttf:korean/nanumfonts-ttf
 .endif
 
 # when html or html-split is defined as the format, add HTML_COMMON.
diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index c319f94504ad..163e11954f53 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Interactive TV guide which will create personalized TV listings
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
-RUN_DEPENDS=	tv_cat:${PORTSDIR}/textproc/p5-xmltv
+RUN_DEPENDS=	tv_cat:textproc/p5-xmltv
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/misc/gcstar/Makefile b/misc/gcstar/Makefile
index 94a6ce5a029d..4ec255da86cc 100644
--- a/misc/gcstar/Makefile
+++ b/misc/gcstar/Makefile
@@ -14,26 +14,26 @@ COMMENT=	Open source application for managing your collections
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
-		p5-MP3-Tag>=0:${PORTSDIR}/audio/p5-MP3-Tag \
-		p5-Ogg-Vorbis-Header-PurePerl>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header-PurePerl \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-Gtk2-Spell>=0:${PORTSDIR}/devel/p5-Gtk2-Spell \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Switch>0:${PORTSDIR}/lang/p5-Switch \
-		p5-Gnome2-VFS>=0:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
-		p5-Net-FreeDB>=0:${PORTSDIR}/audio/p5-Net-FreeDB \
-		p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-libwww>=0:www/p5-libwww \
+		p5-MP3-Info>=0:audio/p5-MP3-Info \
+		p5-MP3-Tag>=0:audio/p5-MP3-Tag \
+		p5-Ogg-Vorbis-Header-PurePerl>=0:audio/p5-Ogg-Vorbis-Header-PurePerl \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Time-Piece>=0:devel/p5-Time-Piece \
+		p5-Gtk2-Spell>=0:devel/p5-Gtk2-Spell \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-Switch>0:lang/p5-Switch \
+		p5-Gnome2-VFS>=0:x11-toolkits/p5-Gnome2-VFS \
+		p5-Net-FreeDB>=0:audio/p5-Net-FreeDB \
+		p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally \
+		p5-GD>=0:graphics/p5-GD \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		perl5 desktop-file-utils shared-mime-info shebangfix
diff --git a/misc/gimp-help-en/Makefile b/misc/gimp-help-en/Makefile
index 5ded60244ad9..600c362efb7a 100644
--- a/misc/gimp-help-en/Makefile
+++ b/misc/gimp-help-en/Makefile
@@ -18,8 +18,8 @@ COMMENT?=	GIMP User Manual in English
 
 LICENSE=	GFDL
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2 \
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
 
 USES=		gettext-tools gmake perl5 pkgconfig python:2 shebangfix tar:bzip2
 USE_GNOME=	libxslt:build
diff --git a/misc/gkrellm-gamma/Makefile b/misc/gkrellm-gamma/Makefile
index 3acf4c883c98..feac65bddcb3 100644
--- a/misc/gkrellm-gamma/Makefile
+++ b/misc/gkrellm-gamma/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.sweb.cz/tripie/gkrellm/gamma/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XFree86 gamma correction plugin for GKrellM
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		pkgconfig
 USE_XORG=	x11 xxf86vm
diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile
index 7e2809897bf2..f315adc03a4c 100644
--- a/misc/gkrellm-helium/Makefile
+++ b/misc/gkrellm-helium/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	https://sites.google.com/site/makovick/projects/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GKrellM plugin reading data from helium thermometer at Strahov, Prague
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+LIB_DEPENDS=	libcurl.so:ftp/curl
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		pkgconfig tar:tgz
 
diff --git a/misc/gkrellm-xkb/Makefile b/misc/gkrellm-xkb/Makefile
index b00a46222313..ee1580ee9839 100644
--- a/misc/gkrellm-xkb/Makefile
+++ b/misc/gkrellm-xkb/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.sweb.cz/tripie/gkrellm/xkb/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X keyboard layout plugin for GKrellM
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		pkgconfig
 PLIST_FILES=	libexec/gkrellm2/plugins/xkb.so
diff --git a/misc/gkrellmbgchg2/Makefile b/misc/gkrellmbgchg2/Makefile
index 2ab510577031..358c8a811bbf 100644
--- a/misc/gkrellmbgchg2/Makefile
+++ b/misc/gkrellmbgchg2/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Plugin for GKrellM, which changes the desktop's background image
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		gmake pkgconfig
 USE_GNOME=	gtk20
diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile
index 6110f118e85b..c4ca01b3e9ca 100644
--- a/misc/gkrellmlaunch2/Makefile
+++ b/misc/gkrellmlaunch2/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Application launcher plugin for GKrellM2
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	gkrellm2>0:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm2>0:sysutils/gkrellm2
 
 USES=		pkgconfig
 ALL_TARGET=	gkrellmlaunch.so
diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile
index d87fa8f8724f..77db76919633 100644
--- a/misc/gkrellshoot2/Makefile
+++ b/misc/gkrellshoot2/Makefile
@@ -11,9 +11,9 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Screen locking and screen capture plugin for GKrellM 2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2 \
-		import:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2 \
+		import:graphics/ImageMagick
 
 USES=		pkgconfig
 
diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile
index 3711b603a361..af6101726f1d 100644
--- a/misc/gkrellweather2/Makefile
+++ b/misc/gkrellweather2/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Weather plugin for GKrellM
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		gettext gmake pkgconfig tar:tgz
 MAKE_ENV=	enable_nls=1
diff --git a/misc/gkx86info2/Makefile b/misc/gkx86info2/Makefile
index c960e89a19a3..4bc54653620d 100644
--- a/misc/gkx86info2/Makefile
+++ b/misc/gkx86info2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GKrellM2 plugin that simply prints the current clock speed
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		pkgconfig
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index cf4e621a123d..6f6d7aba5195 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Documents targeted for GNOME developers
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/misc/gnome-icon-theme-extras/Makefile b/misc/gnome-icon-theme-extras/Makefile
index 7516b56a44e9..875e2acbaac8 100644
--- a/misc/gnome-icon-theme-extras/Makefile
+++ b/misc/gnome-icon-theme-extras/Makefile
@@ -11,9 +11,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional collection of icons for the GNOME desktop
 
-BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 USES=		gmake pathfix pkgconfig tar:xz
 USE_GNOME=	intlhack gtk-update-icon-cache
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 0616ca3657b2..3eb09ffd82a1 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of icons for the GNOME desktop
 
-BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic
+BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic
 
 GNU_CONFIGURE=	yes
 USES=		gettext-tools gmake pathfix pkgconfig tar:xz
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 4c9daa1bed84..ff603b247a09 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 users guide
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile
index 79b448bdedf2..3ab253f61c73 100644
--- a/misc/gregexp/Makefile
+++ b/misc/gregexp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://dentrassi.de/download/gregexp/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical regular expression explorer
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		pkgconfig
 USE_GNOME=	gnomeprefix libgnomeui
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile
index 935565924207..8da3dec61113 100644
--- a/misc/gtkfind/Makefile
+++ b/misc/gtkfind/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GTK front-end to find(1)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	appres:${PORTSDIR}/x11/appres \
-		xterm:${PORTSDIR}/x11/xterm
+BUILD_DEPENDS=	appres:x11/appres \
+		xterm:x11/xterm
 
 USES=		gmake
 USE_GNOME=	gtk12
diff --git a/misc/help2man/Makefile b/misc/help2man/Makefile
index ee2558dba977..d544f37d557c 100644
--- a/misc/help2man/Makefile
+++ b/misc/help2man/Makefile
@@ -27,12 +27,12 @@ PLIST_FILES=	bin/${PORTNAME} \
 LANGS=		de el eo fi fr hr it pl pt_BR ru sr sv uk vi
 LANGS_MTREE=	ja	# languages that already exist in BSD.local.dist
 
-NLS_BUILD_DEPENDS=	p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+NLS_BUILD_DEPENDS=	p5-Locale-gettext>=0:devel/p5-Locale-gettext
 NLS_CONFIGURE_ENABLE=	nls
 # Add note of build failure caused by Perl infrastructure change in 20130612
 NLS_VARS=		CONFIGURE_FAIL_MESSAGE="Please read UPDATING entry 20130612 \(http://svnweb.freebsd.org/ports/head/UPDATING\?r1=320405\&r2=320679\) and PR/184276 \(http://www.freebsd.org/cgi/query-pr.cgi\?pr=ports/184276\) to fix your Perl installation if you got the error message \"configure: error: perl module Locale::gettext required\"."
 NLS_PLIST_FILES=	lib/bindtextdomain.so
-NLS_RUN_DEPENDS=	p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+NLS_RUN_DEPENDS=	p5-Locale-gettext>=0:devel/p5-Locale-gettext
 NLS_USES=		gettext
 
 .for lang in ${LANGS} ${LANGS_MTREE}
diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index 6a6b34924445..e7576cc88298 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Allows usage of special keys on internet/multimedia keyboards
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFIGURE_ARGS=	--with-db3-inc=${BDB_INCLUDE_DIR} \
@@ -29,7 +29,7 @@ USES=		gmake
 OPTIONS_DEFINE=	OSD
 OPTIONS_DEFAULT=	OSD
 
-OSD_LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+OSD_LIB_DEPENDS=	libxosd.so:misc/xosd
 OSD_CONFIGURE_WITH=	xosd
 
 post-extract:
diff --git a/misc/ipa_conv/Makefile b/misc/ipa_conv/Makefile
index a5e424f859e6..e39dba9d9db0 100644
--- a/misc/ipa_conv/Makefile
+++ b/misc/ipa_conv/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/ipa-system/modules/ipa_conv
 MAINTAINER=	misc/ipa_conv
 COMMENT=	IPA accounting/database module for converting statistics
 
-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/misc/iselect/Makefile b/misc/iselect/Makefile
index 16fbcecc3dff..19217780aa0d 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -28,7 +28,7 @@ PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	SLANG EXAMPLES
 SLANG_DESC=	Link with slang
-SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_CONFIGURE_ON=	--with-incdir=${LOCALBASE}/include \
 			--with-libdir=${LOCALBASE}/lib
 
diff --git a/misc/kde-thumbnailer-chm/Makefile b/misc/kde-thumbnailer-chm/Makefile
index 9dec8b4a2019..006b07e3c844 100644
--- a/misc/kde-thumbnailer-chm/Makefile
+++ b/misc/kde-thumbnailer-chm/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	153410-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDE thumbnail generator for CHM files
 
-LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
+LIB_DEPENDS=	libchm.so:misc/chmlib
 
 USES=		cmake
 USE_KDE4=	kdeprefix kdelibs automoc4
diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index 43a3d0638010..bcc2e9adb04a 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -50,7 +50,7 @@ ${lang}_NAME?=		${lang}
 ${lang}_OPT=		${lang:S/@/_/}
 LANG_OPT_ALL+=		${${lang}_OPT}
 ${${lang}_OPT}_DESC=	${${lang}_NAME} localization
-${${lang}_OPT}_RUN_DEPENDS=	${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
+${${lang}_OPT}_RUN_DEPENDS=	${${lang}_DETECT}:${${lang}_PORT}
 .endfor
 
 .for opt in ${LANG_OPT_ALL}
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index 7c6a7d5f70a7..5ca5cebf2dd8 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -66,5 +66,5 @@ OPTIONS_DEFINE+=	HUNSPELL
 HUNSPELL_DESC=		Install hunspell dictionary
 .endif
 
-ASPELL_RUN_DEPENDS+=	${${KDE4_L10N}_aspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}
-HUNSPELL_RUN_DEPENDS+=	${${KDE4_L10N}_hunspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_hunspell_PORT}
+ASPELL_RUN_DEPENDS+=	${${KDE4_L10N}_aspell_DETECT}:${${KDE4_L10N}_aspell_PORT}
+HUNSPELL_RUN_DEPENDS+=	${${KDE4_L10N}_hunspell_DETECT}:${${KDE4_L10N}_hunspell_PORT}
diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index c2c5c8c17a7e..b291d6b834db 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -17,69 +17,69 @@ OPTIONS_DEFINE=	ARTIKULATE BLINKEN CANTOR KALGEBRA KALZIUM KANAGRAM KBRUCH KGEOG
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NARTIKULATE}
 
 ARTIKULATE_DESC=	Pronunciation trainer
-ARTIKULATE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/artikulate:${PORTSDIR}/misc/artikulate
+ARTIKULATE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/artikulate:misc/artikulate
 
 BLINKEN_DESC=		Memory enhancement game
-BLINKEN_RUN_DEPENDS=	${KDE4_PREFIX}/bin/blinken:${PORTSDIR}/games/blinken
+BLINKEN_RUN_DEPENDS=	${KDE4_PREFIX}/bin/blinken:games/blinken
 
 CANTOR_DESC=		Frontend to mathematical software
-CANTOR_RUN_DEPENDS=	${KDE4_PREFIX}/bin/cantor:${PORTSDIR}/math/cantor
+CANTOR_RUN_DEPENDS=	${KDE4_PREFIX}/bin/cantor:math/cantor
 
 KALGEBRA_DESC=		Graph calculator
-KALGEBRA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kalgebra:${PORTSDIR}/math/kalgebra
+KALGEBRA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kalgebra:math/kalgebra
 
 KALZIUM_DESC=		Periodic table of elements
-KALZIUM_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kalzium:${PORTSDIR}/science/kalzium
+KALZIUM_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kalzium:science/kalzium
 
 KANAGRAM_DESC=		Letter order game
-KANAGRAM_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kanagram:${PORTSDIR}/games/kanagram
+KANAGRAM_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kanagram:games/kanagram
 
 KBRUCH_DESC=		Application to exercise fractions
-KBRUCH_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kbruch:${PORTSDIR}/math/kbruch
+KBRUCH_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kbruch:math/kbruch
 
 KGEOGRAPHY_DESC=	Geography trainer
-KGEOGRAPHY_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kgeography:${PORTSDIR}/misc/kgeography
+KGEOGRAPHY_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kgeography:misc/kgeography
 
 KHANGMAN_DESC=		Hangman game
-KHANGMAN_RUN_DEPENDS=	${KDE4_PREFIX}/bin/khangman:${PORTSDIR}/games/khangman
+KHANGMAN_RUN_DEPENDS=	${KDE4_PREFIX}/bin/khangman:games/khangman
 
 KIG_DESC=		Interactive geometry application
-KIG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kig:${PORTSDIR}/math/kig
+KIG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kig:math/kig
 
 KITEN_DESC=		Japanese reference/study tool
-KITEN_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kiten:${PORTSDIR}/japanese/kiten
+KITEN_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kiten:japanese/kiten
 
 KLETTRES_DESC=		Alphabet learning tool
-KLETTRES_RUN_DEPENDS=	${KDE4_PREFIX}/bin/klettres:${PORTSDIR}/misc/klettres
+KLETTRES_RUN_DEPENDS=	${KDE4_PREFIX}/bin/klettres:misc/klettres
 
 KMPLOT_DESC=		Mathematical function plotter
-KMPLOT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmplot:${PORTSDIR}/math/kmplot
+KMPLOT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmplot:math/kmplot
 
 KSTARS_DESC=		Desktop planetarium
-KSTARS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kstars:${PORTSDIR}/astro/kstars
+KSTARS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kstars:astro/kstars
 
 KTOUCH_DESC=		Touch typing tutor
-KTOUCH_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktouch:${PORTSDIR}/misc/ktouch
+KTOUCH_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktouch:misc/ktouch
 
 KTURTLE_DESC=		Educational programming environment
-KTURTLE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kturtle:${PORTSDIR}/lang/kturtle
+KTURTLE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kturtle:lang/kturtle
 
 KWORDQUIZ_DESC=		Flash card trainer
-KWORDQUIZ_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kwordquiz:${PORTSDIR}/misc/kwordquiz
+KWORDQUIZ_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kwordquiz:misc/kwordquiz
 
 MARBLE_DESC=		Virtual globe and world atlas
 MARBLE_USE=		KDE4=marble_run
 
 PAIRS_DESC=		Memory and pairs game
-PAIRS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/pairs:${PORTSDIR}/games/pairs
+PAIRS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/pairs:games/pairs
 
 PARLEY_DESC=		Vocabulary trainer
-PARLEY_RUN_DEPENDS=	${KDE4_PREFIX}/bin/parley:${PORTSDIR}/misc/parley
+PARLEY_RUN_DEPENDS=	${KDE4_PREFIX}/bin/parley:misc/parley
 
 ROCS_DESC=		Graph teory IDE
-ROCS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/rocs:${PORTSDIR}/math/rocs
+ROCS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/rocs:math/rocs
 
 STEP_DESC=		Interactive physics simulator
-STEP_RUN_DEPENDS=	${KDE4_PREFIX}/bin/step:${PORTSDIR}/science/step
+STEP_RUN_DEPENDS=	${KDE4_PREFIX}/bin/step:science/step
 
 .include <bsd.port.mk>
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 35b839849ca9..58a54329ccbc 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -17,42 +17,42 @@ OPTIONS_DEFINE=	ARK FILELIGHT KCALC KCHARSELECT KDF KFLOPPY KGPG \
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 ARK_DESC=		Archiving tool Ark
-ARK_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ark:${PORTSDIR}/archivers/ark
+ARK_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ark:archivers/ark
 
 FILELIGHT_DESC=		File system viewer Filelight
-FILELIGHT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4
+FILELIGHT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/filelight:sysutils/filelight-kde4
 
 KCALC_DESC=		Scientific calculator KCalc
-KCALC_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcalc:${PORTSDIR}/math/kcalc
+KCALC_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcalc:math/kcalc
 
 KCHARSELECT_DESC=	Character selector KCharSelect
-KCHARSELECT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcharselect:${PORTSDIR}/deskutils/kcharselect
+KCHARSELECT_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcharselect:deskutils/kcharselect
 
 KDF_DESC=		Disk usage tool KDiskFree
-KDF_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kdf:${PORTSDIR}/sysutils/kdf
+KDF_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kdf:sysutils/kdf
 
 KFLOPPY_DESC=		Floppy formatter KFloppy
-KFLOPPY_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kfloppy:${PORTSDIR}/sysutils/kfloppy
+KFLOPPY_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kfloppy:sysutils/kfloppy
 
 KGPG_DESC=		Encryption tool KGpg
-KGPG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kgpg:${PORTSDIR}/security/kgpg-kde4
+KGPG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kgpg:security/kgpg-kde4
 
 KREMOTECONTROL_DESC=	KRemoteControl
-KREMOTECONTROL_RUN_DEPENDS=	${KDE4_PREFIX}/bin/krcdnotifieritem:${PORTSDIR}/comms/kremotecontrol
+KREMOTECONTROL_RUN_DEPENDS=	${KDE4_PREFIX}/bin/krcdnotifieritem:comms/kremotecontrol
 
 KTIMER_DESC=		Countdown launcher KTimer
-KTIMER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktimer:${PORTSDIR}/x11-clocks/ktimer
+KTIMER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktimer:x11-clocks/ktimer
 
 KWALLET_DESC=		Password manager KWallet
-KWALLET_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kwalletmanager:${PORTSDIR}/security/kwalletmanager
+KWALLET_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kwalletmanager:security/kwalletmanager
 
 PRINTMANAGER_DESC=	Print manager
-PRINTMANAGER_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kcm_printer_manager.so:${PORTSDIR}/print/kde4-print-manager
+PRINTMANAGER_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kcm_printer_manager.so:print/kde4-print-manager
 
 SUPERKARAMBA_DESC=	Widget framework SuperKaramba
-SUPERKARAMBA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/superkaramba:${PORTSDIR}/deskutils/superkaramba
+SUPERKARAMBA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/superkaramba:deskutils/superkaramba
 
 SWEEPER_DESC=		System cleaner Sweeper
-SWEEPER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/sweeper:${PORTSDIR}/sysutils/sweeper
+SWEEPER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/sweeper:sysutils/sweeper
 
 .include <bsd.port.mk>
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 7c3b591536d9..43f4c9ca0783 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Touch typing tutor for KDE 4
 
-RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:${PORTSDIR}/graphics/kqtquickcharts
+RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource tar:xz
diff --git a/misc/latex-mk/Makefile b/misc/latex-mk/Makefile
index d27be390a040..061b26736e0c 100644
--- a/misc/latex-mk/Makefile
+++ b/misc/latex-mk/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of makefile and scripts for LaTeX documents
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS=	texi2dvi:print/texinfo
 
 USE_TEX=	latex
 USES=		gmake
diff --git a/misc/lesspipe/Makefile b/misc/lesspipe/Makefile
index fa23358b8bbc..a627803b0813 100644
--- a/misc/lesspipe/Makefile
+++ b/misc/lesspipe/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Preprocessor for less
 
 LICENSE=	GPLv2
 
-MY_DEPENDS=	bash:${PORTSDIR}/shells/bash
+MY_DEPENDS=	bash:shells/bash
 BUILD_DEPENDS=	${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS}
 
diff --git a/misc/libisocodes/Makefile b/misc/libisocodes/Makefile
index b34b1c337e63..be8fa2741d7c 100644
--- a/misc/libisocodes/Makefile
+++ b/misc/libisocodes/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Interaction library for iso-codes
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgee-0.8.so:${PORTSDIR}/devel/libgee
-RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libgee-0.8.so:devel/libgee
+RUN_DEPENDS=	iso-codes>=0:misc/iso-codes
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
diff --git a/misc/libmetalink/Makefile b/misc/libmetalink/Makefile
index 68c453e74efc..84e8deb798cd 100644
--- a/misc/libmetalink/Makefile
+++ b/misc/libmetalink/Makefile
@@ -28,11 +28,11 @@ PORTEXAMPLES=	LibO_3.5.4_Win_x86_install_multi.msi.meta4 \
 		ubuntu-12.04-server-amd64.metalink
 
 EXPAT_CONFIGURE_WITH=	libexpat
-EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 LIBXML2_CONFIGURE_WITH=	libxml2
 LIBXML2_CPPFLAGS=	-I${LOCALBASE}/include/libxml2
 LIBXML2_USE=		GNOME=libxml2
-TEST_BUILD_DEPENDS=	cunit>=2.1:${PORTSDIR}/devel/cunit
+TEST_BUILD_DEPENDS=	cunit>=2.1:devel/cunit
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
diff --git a/misc/libsupertone/Makefile b/misc/libsupertone/Makefile
index 8b0fe5b43222..de30190856fd 100644
--- a/misc/libsupertone/Makefile
+++ b/misc/libsupertone/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Library for supervisory tone generation and detection
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile \
-		libspandsp.so:${PORTSDIR}/comms/spandsp \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile \
+		libspandsp.so:comms/spandsp \
+		libtiff.so:graphics/tiff \
+		libxml2.so:textproc/libxml2
 
 USES=		tar:tgz libtool
 GNU_CONFIGURE=	yes
diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 8b6dc97b9c71..18b04fca05ee 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -30,8 +30,8 @@ DOCS_DESC=		Install documentation
 NLS_DESC=		Build with NLS support
 
 BUILDDOCS_CONFIGURE_WITH=	docs
-BUILDDOCS_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
-				dblatex:${PORTSDIR}/textproc/dblatex
+BUILDDOCS_BUILD_DEPENDS=	xmlto:textproc/xmlto \
+				dblatex:textproc/dblatex
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index e4ce83d76949..3639460c76dc 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -10,7 +10,7 @@ DISTFILES=	${PORTNAME}-ui-${PORTVERSION}.tar.gz:src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Language teaching program with sound
 
-LIB_DEPENDS=	liblingoteach.so:${PORTSDIR}/textproc/liblingoteach
+LIB_DEPENDS=	liblingoteach.so:textproc/liblingoteach
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-ui-${PORTVERSION}
 
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 37a70dca64ce..08439be3e4de 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -29,7 +29,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE=	SMB DOCS
 OPTIONS_SUB=	yes
 
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CONFIGURE_ENV_OFF=	ac_cv_lib_smbclient_smbc_new_context=no
 
 post-patch:
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index 14effcc9c224..9dcb75126e95 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -12,9 +12,9 @@ COMMENT=	X11-based presentation tool
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libmng.so:${PORTSDIR}/graphics/libmng
-RUN_DEPENDS+=	pnmscale:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libmng.so:graphics/libmng
+RUN_DEPENDS+=	pnmscale:graphics/netpbm
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -49,14 +49,14 @@ NO_OPTIONS_SORT=yes
 
 FREETYPE_PREVENTS=	XFT
 FREETYPE_CONFIGURE_ENABLE=	freetype
-FREETYPE_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
+FREETYPE_LIB_DEPENDS=	libttf.so:print/freetype
 XFT_PREVENTS=	FREETYPE
 XFT_USES=	iconv
 XFT_USE=	XORG=xft
 XFT_CONFIGURE_ENABLE=	xft2
 XFT_CONFIGURE_ON=	--enable-freetype-charset16
 GIF_CONFIGURE_ENABLE=	gif
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CPPFLAGS=		-I${LOCALBASE}/include
 
 post-patch:
diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile
index 826cd3bd5b4d..ea4ba988924b 100644
--- a/misc/mbuffer/Makefile
+++ b/misc/mbuffer/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=	MHASH
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMHASH}
-LIB_DEPENDS+=	libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS+=	libmhash.so:security/mhash
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .else
diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index 3b3dc9742d0f..80d380554130 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Lightweight Midnight Commander clone
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+RUN_DEPENDS=	gawk:lang/gawk
 
 CONFLICTS=	mc-4.7*
 
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 6d97c57f4dec..c4eb4db1fdb5 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -54,10 +54,10 @@ NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LDFLAGS=		-L${LOCALBASE}/lib
 
-SFTP_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SFTP_LIB_DEPENDS=	libssh2.so:security/libssh2
 SFTP_CONFIGURE_ENABLE=	vfs-sftp
 
-SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_CONFIGURE_ON=	--with-screen=slang --with-slang-includes=${LOCALBASE}/include
 
 SMB_CONFIGURE_ENABLE=	vfs-smb
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index f96a99d0b62b..a0dc42d5480c 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Metalink generation tool
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libglibmm-2.4.so:${PORTSDIR}/devel/glibmm \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libglibmm-2.4.so:devel/glibmm \
+		libgpg-error.so:security/libgpg-error \
+		libsigc-2.0.so:devel/libsigc++20
 
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
diff --git a/misc/najitool/Makefile b/misc/najitool/Makefile
index ec285ff78c00..b30bc2d1b063 100644
--- a/misc/najitool/Makefile
+++ b/misc/najitool/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates, converts, and filters files
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnaji.a:${PORTSDIR}/devel/libnaji
+BUILD_DEPENDS=	${LOCALBASE}/lib/libnaji.a:devel/libnaji
 
 PLIST_FILES=	bin/najitool
 
diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index 20500282f27b..30baff2a08e9 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -23,11 +23,11 @@ OPTIONS_DEFINE=	FLTK DOCS
 OPTIONS_SUB=	yes
 
 FLTK_DESC=		Install FLTK GUI
-FLTK_LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-			libfreetype.so:${PORTSDIR}/print/freetype2 \
-			libexpat.so:${PORTSDIR}/textproc/expat2 \
-			libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-			libfltk_images.so:${PORTSDIR}/x11-toolkits/fltk
+FLTK_LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+			libfreetype.so:print/freetype2 \
+			libexpat.so:textproc/expat2 \
+			libfontconfig.so:x11-fonts/fontconfig \
+			libfltk_images.so:x11-toolkits/fltk
 FLTK_USE=		XORG=x11,xau,xcb,xdmcp,xext,xft,xinerama,xpm,xrender
 FLTK_MAKE_ENV=		HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
 FLTK_MAKE_ENV_OFF=	HAVE_FLTK=0 FLTK_NUT=""
diff --git a/misc/openr2/Makefile b/misc/openr2/Makefile
index b2dc0ca32a80..de1af4e45826 100644
--- a/misc/openr2/Makefile
+++ b/misc/openr2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	MFC/R2 call setup library
 
-BUILD_DEPENDS=	${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
+BUILD_DEPENDS=	${LOCALBASE}/include/dahdi/user.h:misc/dahdi
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/misc/p5-Array-Compare/Makefile b/misc/p5-Array-Compare/Makefile
index 857b34c16d7d..1431b68c2b90 100644
--- a/misc/p5-Array-Compare/Makefile
+++ b/misc/p5-Array-Compare/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Perl extension for comparing arrays
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moo>0:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>0:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-Moo>0:devel/p5-Moo \
+		p5-Type-Tiny>0:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/misc/p5-Array-Diff/Makefile b/misc/p5-Array-Diff/Makefile
index 3e023cb77c82..8449929bb9c8 100644
--- a/misc/p5-Array-Diff/Makefile
+++ b/misc/p5-Array-Diff/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Diff two arrays
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=1.19:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Algorithm-Diff>=1.19:devel/p5-Algorithm-Diff \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/misc/p5-Asterisk-FastAGI/Makefile b/misc/p5-Asterisk-FastAGI/Makefile
index 8b076a2bf8ef..6590563d2b2b 100644
--- a/misc/p5-Asterisk-FastAGI/Makefile
+++ b/misc/p5-Asterisk-FastAGI/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl module for FastAGI handling
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Asterisk>=0:${PORTSDIR}/misc/p5-Asterisk \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		p5-File-Remove>=0:${PORTSDIR}/devel/p5-File-Remove
-RUN_DEPENDS=	p5-Asterisk>=0:${PORTSDIR}/misc/p5-Asterisk \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server
+BUILD_DEPENDS=	p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-Asterisk>=0:misc/p5-Asterisk \
+		p5-Net-Server>=0:net/p5-Net-Server \
+		p5-File-Remove>=0:devel/p5-File-Remove
+RUN_DEPENDS=	p5-Asterisk>=0:misc/p5-Asterisk \
+		p5-Net-Server>=0:net/p5-Net-Server
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/misc/p5-Bot-Training-MegaHAL/Makefile b/misc/p5-Bot-Training-MegaHAL/Makefile
index 98afcb106b1c..4ca936f6ea01 100644
--- a/misc/p5-Bot-Training-MegaHAL/Makefile
+++ b/misc/p5-Bot-Training-MegaHAL/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Provide megahal.trn via Bot::Training
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ShareDir-Install>=0:${PORTSDIR}/devel/p5-File-ShareDir-Install
-RUN_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-Bot-Training>=0:${PORTSDIR}/misc/p5-Bot-Training
+BUILD_DEPENDS=	p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install
+RUN_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+	p5-Bot-Training>=0:misc/p5-Bot-Training
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/misc/p5-Bot-Training-StarCraft/Makefile b/misc/p5-Bot-Training-StarCraft/Makefile
index b05912461497..c3bbd8232a89 100644
--- a/misc/p5-Bot-Training-StarCraft/Makefile
+++ b/misc/p5-Bot-Training-StarCraft/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Provide starcraft.trn via Bot::Training
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ShareDir-Install>=0.03:${PORTSDIR}/devel/p5-File-ShareDir-Install
-RUN_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Bot-Training>=0:${PORTSDIR}/misc/p5-Bot-Training
+BUILD_DEPENDS=	p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install
+RUN_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Bot-Training>=0:misc/p5-Bot-Training
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/misc/p5-Bot-Training/Makefile b/misc/p5-Bot-Training/Makefile
index 80a4a9013893..6c423ea0a508 100644
--- a/misc/p5-Bot-Training/Makefile
+++ b/misc/p5-Bot-Training/Makefile
@@ -15,15 +15,15 @@ COMMENT=	Plain text training material for bots like Hailo and MegaHAL
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Dir-Self>=0:${PORTSDIR}/devel/p5-Dir-Self \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Moose>=0.82:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-Getopt>=0:${PORTSDIR}/devel/p5-MouseX-Getopt \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Dir-Self>=0:devel/p5-Dir-Self \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Moose>=0.82:devel/p5-Moose \
+		p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-Getopt>=0:devel/p5-MouseX-Getopt \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/misc/p5-Business-EDI/Makefile b/misc/p5-Business-EDI/Makefile
index 6d779417a90d..93732485bba6 100644
--- a/misc/p5-Business-EDI/Makefile
+++ b/misc/p5-Business-EDI/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Class for generating EDI objects and subobjects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Easy>=0.14:${PORTSDIR}/devel/p5-Exporter-Easy \
-		p5-File-Find-Rule>=0.32:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-JSON-XS>=2.01:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-UNIVERSAL-require>=0.10:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Exporter-Easy>=0.14:devel/p5-Exporter-Easy \
+		p5-File-Find-Rule>=0.32:devel/p5-File-Find-Rule \
+		p5-JSON-XS>=2.01:converters/p5-JSON-XS \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+		p5-UNIVERSAL-require>=0.10:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/atz-${PORTNAME}-327e01f
diff --git a/misc/p5-Business-Hours/Makefile b/misc/p5-Business-Hours/Makefile
index 0a2f03b0c5e6..304fdf217dc4 100644
--- a/misc/p5-Business-Hours/Makefile
+++ b/misc/p5-Business-Hours/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Calculate business hours during a time period
 
-BUILD_DEPENDS=	p5-Set-IntSpan>1.12:${PORTSDIR}/math/p5-Set-IntSpan
+BUILD_DEPENDS=	p5-Set-IntSpan>1.12:math/p5-Set-IntSpan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>-1.0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>-1.0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>0:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 
diff --git a/misc/p5-Business-ISBN-Data/Makefile b/misc/p5-Business-ISBN-Data/Makefile
index f2ca85af8053..7520f419b05b 100644
--- a/misc/p5-Business-ISBN-Data/Makefile
+++ b/misc/p5-Business-ISBN-Data/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Data pack for Business::ISBN
 
-BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=6.65:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=6.65:devel/p5-ExtUtils-MakeMaker
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile
index c4b13b26041b..24ae74d92144 100644
--- a/misc/p5-Business-ISBN/Makefile
+++ b/misc/p5-Business-ISBN/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Work with International Standard Book Numbers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Business-ISBN-Data>=20140910.002:${PORTSDIR}/misc/p5-Business-ISBN-Data \
-		p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS=	p5-Business-ISBN-Data>=20140910.002:misc/p5-Business-ISBN-Data \
+		p5-Mojolicious>=0:www/p5-Mojolicious
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
+TEST_DEPENDS=	p5-GD-Barcode>=0:graphics/p5-GD-Barcode
 
 OPTIONS_DEFINE=	BARCODE XISBN
 BARCODE_DESC=	Barcode support
@@ -29,9 +29,9 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-BARCODE_BUILD_DEPENDS=	p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
-BARCODE_RUN_DEPENDS=	p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
-XISBN_BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-XISBN_RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BARCODE_BUILD_DEPENDS=	p5-GD-Barcode>=0:graphics/p5-GD-Barcode
+BARCODE_RUN_DEPENDS=	p5-GD-Barcode>=0:graphics/p5-GD-Barcode
+XISBN_BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+XISBN_RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 .include <bsd.port.mk>
diff --git a/misc/p5-Business-ISIN/Makefile b/misc/p5-Business-ISIN/Makefile
index e1683a69d104..d22ee01c9f23 100644
--- a/misc/p5-Business-ISIN/Makefile
+++ b/misc/p5-Business-ISIN/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Validate International Securities Identification Numbers
 
-BUILD_DEPENDS=	p5-Locale-Codes>=0:${PORTSDIR}/misc/p5-Locale-Codes
+BUILD_DEPENDS=	p5-Locale-Codes>=0:misc/p5-Locale-Codes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tar:tgz
diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile
index f355a3fc64bf..f223b4418194 100644
--- a/misc/p5-Business-UPS/Makefile
+++ b/misc/p5-Business-UPS/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	UPS Interface Module
 
-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/misc/p5-Geo-Cache/Makefile b/misc/p5-Geo-Cache/Makefile
index a35895d45f35..2379b8268810 100644
--- a/misc/p5-Geo-Cache/Makefile
+++ b/misc/p5-Geo-Cache/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Object interface for GPS waypoints
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-Time-modules>=0:devel/p5-Time-modules \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/misc/p5-Geo-Coder-Bing/Makefile b/misc/p5-Geo-Coder-Bing/Makefile
index bf8637ec6936..0bda5bce243a 100644
--- a/misc/p5-Geo-Coder-Bing/Makefile
+++ b/misc/p5-Geo-Coder-Bing/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Geocode addresses with the Bing Maps API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=6.02:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2:converters/p5-JSON \
+		p5-JSON-XS>=2:converters/p5-JSON-XS \
+		p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
+		p5-URI>=1.36:net/p5-URI \
+		p5-libwww>=6.02:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/misc/p5-Geo-Coder-Geocoder-US/Makefile b/misc/p5-Geo-Coder-Geocoder-US/Makefile
index d3c035620f1c..ff0c8b83a526 100644
--- a/misc/p5-Geo-Coder-Geocoder-US/Makefile
+++ b/misc/p5-Geo-Coder-Geocoder-US/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Geocode a location using http://geocoder.us/
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 DEPRECATED=	http://geocoder.us/ disappeared in late 2015
diff --git a/misc/p5-Geo-Coder-Google/Makefile b/misc/p5-Geo-Coder-Google/Makefile
index d06e9f83db14..2f326c40181f 100644
--- a/misc/p5-Geo-Coder-Google/Makefile
+++ b/misc/p5-Geo-Coder-Google/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Google Maps Geocoding API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-JSON>=2.27:${PORTSDIR}/converters/p5-JSON \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=5.5:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-JSON>=2.27:converters/p5-JSON \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=5.5:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Number-Delta>=0:${PORTSDIR}/devel/p5-Test-Number-Delta
+TEST_DEPENDS=	p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
diff --git a/misc/p5-Geo-Coder-Googlev3/Makefile b/misc/p5-Geo-Coder-Googlev3/Makefile
index e70712d5c529..04ef4c942dd1 100644
--- a/misc/p5-Geo-Coder-Googlev3/Makefile
+++ b/misc/p5-Geo-Coder-Googlev3/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Google Maps v3 Geocoding API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/misc/p5-Geo-Coder-Many/Makefile b/misc/p5-Geo-Coder-Many/Makefile
index e64de141ddd6..b6731868f1d8 100644
--- a/misc/p5-Geo-Coder-Many/Makefile
+++ b/misc/p5-Geo-Coder-Many/Makefile
@@ -15,24 +15,24 @@ COMMENT=	Module to tie together multiple Geo::Coder::* modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Geo-Coder-Bing>=0.10:${PORTSDIR}/misc/p5-Geo-Coder-Bing \
-		p5-Geo-Coder-Google>=0.06:${PORTSDIR}/misc/p5-Geo-Coder-Google \
-		p5-Geo-Coder-Googlev3>=0.07:${PORTSDIR}/misc/p5-Geo-Coder-Googlev3 \
-		p5-Geo-Coder-Mapquest>=0.05:${PORTSDIR}/misc/p5-Geo-Coder-Mapquest \
-		p5-Geo-Coder-Multimap>=0.01:${PORTSDIR}/misc/p5-Geo-Coder-Multimap \
-		p5-Geo-Coder-OSM>=0.01:${PORTSDIR}/misc/p5-Geo-Coder-OSM \
-		p5-Geo-Coder-OpenCage>=0:${PORTSDIR}/misc/p5-Geo-Coder-OpenCage \
-		p5-Geo-Coder-Ovi>=0.01:${PORTSDIR}/misc/p5-Geo-Coder-Ovi \
-		p5-Geo-Coder-PlaceFinder>=0.02:${PORTSDIR}/misc/p5-Geo-Coder-PlaceFinder \
-		p5-Geo-Distance-XS>=0.08:${PORTSDIR}/math/p5-Geo-Distance-XS \
-		p5-HTTP-Message>=5.827:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-List-Util-WeightedRoundRobin>=0.4:${PORTSDIR}/misc/p5-List-Util-WeightedRoundRobin \
-		p5-Sort-Versions>=1.5:${PORTSDIR}/devel/p5-Sort-Versions
+BUILD_DEPENDS=	p5-Geo-Coder-Bing>=0.10:misc/p5-Geo-Coder-Bing \
+		p5-Geo-Coder-Google>=0.06:misc/p5-Geo-Coder-Google \
+		p5-Geo-Coder-Googlev3>=0.07:misc/p5-Geo-Coder-Googlev3 \
+		p5-Geo-Coder-Mapquest>=0.05:misc/p5-Geo-Coder-Mapquest \
+		p5-Geo-Coder-Multimap>=0.01:misc/p5-Geo-Coder-Multimap \
+		p5-Geo-Coder-OSM>=0.01:misc/p5-Geo-Coder-OSM \
+		p5-Geo-Coder-OpenCage>=0:misc/p5-Geo-Coder-OpenCage \
+		p5-Geo-Coder-Ovi>=0.01:misc/p5-Geo-Coder-Ovi \
+		p5-Geo-Coder-PlaceFinder>=0.02:misc/p5-Geo-Coder-PlaceFinder \
+		p5-Geo-Distance-XS>=0.08:math/p5-Geo-Distance-XS \
+		p5-HTTP-Message>=5.827:www/p5-HTTP-Message \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+		p5-List-Util-WeightedRoundRobin>=0.4:misc/p5-List-Util-WeightedRoundRobin \
+		p5-Sort-Versions>=1.5:devel/p5-Sort-Versions
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/misc/p5-Geo-Coder-Mapquest/Makefile b/misc/p5-Geo-Coder-Mapquest/Makefile
index 086d8f6bec46..c962b862072e 100644
--- a/misc/p5-Geo-Coder-Mapquest/Makefile
+++ b/misc/p5-Geo-Coder-Mapquest/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Geocode addresses with Mapquest
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=6.02:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2:converters/p5-JSON \
+		p5-JSON-XS>=2:converters/p5-JSON-XS \
+		p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
+		p5-URI>=1.36:net/p5-URI \
+		p5-libwww>=6.02:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/misc/p5-Geo-Coder-Multimap/Makefile b/misc/p5-Geo-Coder-Multimap/Makefile
index 18ae7c02f2de..a77d745374f8 100644
--- a/misc/p5-Geo-Coder-Multimap/Makefile
+++ b/misc/p5-Geo-Coder-Multimap/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Geocode addresses with the Multimap Open API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2:converters/p5-JSON \
+		p5-JSON-XS>=2:converters/p5-JSON-XS \
+		p5-URI>=1.36:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/misc/p5-Geo-Coder-Multiple/Makefile b/misc/p5-Geo-Coder-Multiple/Makefile
index 7b9d9d316dc2..24349ba8d753 100644
--- a/misc/p5-Geo-Coder-Multiple/Makefile
+++ b/misc/p5-Geo-Coder-Multiple/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-0.6
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Perl module to tie together multiple Geo::Coder modules
 
-RUN_DEPENDS=	p5-List-Util-WeightedRoundRobin>=0:${PORTSDIR}/misc/p5-List-Util-WeightedRoundRobin
+RUN_DEPENDS=	p5-List-Util-WeightedRoundRobin>=0:misc/p5-List-Util-WeightedRoundRobin
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/misc/p5-Geo-Coder-Navteq/Makefile b/misc/p5-Geo-Coder-Navteq/Makefile
index 0a9dd1d06d4f..f5dd622bcc83 100644
--- a/misc/p5-Geo-Coder-Navteq/Makefile
+++ b/misc/p5-Geo-Coder-Navteq/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Geocode addresses with the Navteq MapTP AJAX API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>=1.36: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/misc/p5-Geo-Coder-OSM/Makefile b/misc/p5-Geo-Coder-OSM/Makefile
index 4d87d741dc79..5ad6bdb0a447 100644
--- a/misc/p5-Geo-Coder-OSM/Makefile
+++ b/misc/p5-Geo-Coder-OSM/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Geocode addresses with the OpenStreetMap Nominatim API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2:converters/p5-JSON \
+		p5-JSON-XS>=2:converters/p5-JSON-XS \
+		p5-URI>=1.36:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/misc/p5-Geo-Coder-OpenCage/Makefile b/misc/p5-Geo-Coder-OpenCage/Makefile
index 399da978f08f..d637ce8f58c0 100644
--- a/misc/p5-Geo-Coder-OpenCage/Makefile
+++ b/misc/p5-Geo-Coder-OpenCage/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Geocode addresses with the OpenCage Geocoder API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-		p5-List-MoreUtils>=0.33:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-URI>=1.60:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-JSON>=2.53:converters/p5-JSON \
+		p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
+		p5-URI>=1.60:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.32:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.32:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -27,10 +27,10 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-HTTP-Tiny>=0.028:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-Pod-Perldoc>=3.21:${PORTSDIR}/textproc/p5-Pod-Perldoc
-RUN_DEPENDS+=	p5-HTTP-Tiny>=0.028:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-Pod-Perldoc>=3.21:${PORTSDIR}/textproc/p5-Pod-Perldoc
+BUILD_DEPENDS+=	p5-HTTP-Tiny>=0.028:www/p5-HTTP-Tiny \
+		p5-Pod-Perldoc>=3.21:textproc/p5-Pod-Perldoc
+RUN_DEPENDS+=	p5-HTTP-Tiny>=0.028:www/p5-HTTP-Tiny \
+		p5-Pod-Perldoc>=3.21:textproc/p5-Pod-Perldoc
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/misc/p5-Geo-Coder-Ovi/Makefile b/misc/p5-Geo-Coder-Ovi/Makefile
index e36c9f8374ca..3edf59d93667 100644
--- a/misc/p5-Geo-Coder-Ovi/Makefile
+++ b/misc/p5-Geo-Coder-Ovi/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Geocode addresses with the Ovi Maps API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2:converters/p5-JSON \
+		p5-JSON-XS>=2:converters/p5-JSON-XS \
+		p5-URI>=1.36:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/misc/p5-Geo-Coder-PlaceFinder/Makefile b/misc/p5-Geo-Coder-PlaceFinder/Makefile
index 7a79da425fce..94eb10a5aa27 100644
--- a/misc/p5-Geo-Coder-PlaceFinder/Makefile
+++ b/misc/p5-Geo-Coder-PlaceFinder/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Geocode addresses with Yahoo PlaceFinder
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2:converters/p5-JSON \
+		p5-JSON-XS>=2:converters/p5-JSON-XS \
+		p5-URI>=1.36:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/misc/p5-Geo-Coder-TomTom/Makefile b/misc/p5-Geo-Coder-TomTom/Makefile
index dc2e8cbadef1..56d86b5d514c 100644
--- a/misc/p5-Geo-Coder-TomTom/Makefile
+++ b/misc/p5-Geo-Coder-TomTom/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Geocode addresses with the TomTom route planner
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2:converters/p5-JSON \
+		p5-JSON-XS>=2:converters/p5-JSON-XS \
+		p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
+		p5-URI>=1.36:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/misc/p5-Geo-GeoNames/Makefile b/misc/p5-Geo-GeoNames/Makefile
index 72e844e26a5e..e2b6036265b7 100644
--- a/misc/p5-Geo-GeoNames/Makefile
+++ b/misc/p5-Geo-GeoNames/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perform geographical queries using GeoNames Web Services
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-JSON>=1.14:${PORTSDIR}/converters/p5-JSON \
-		p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious \
-		p5-XML-Simple>=2.13:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-JSON>=1.14:converters/p5-JSON \
+		p5-Mojolicious>=0:www/p5-Mojolicious \
+		p5-XML-Simple>=2.13:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/misc/p5-Geo-Postcodes-DK/Makefile b/misc/p5-Geo-Postcodes-DK/Makefile
index 4e6b7595014b..77da2ce0c78c 100644
--- a/misc/p5-Geo-Postcodes-DK/Makefile
+++ b/misc/p5-Geo-Postcodes-DK/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Danish postcodes with associated information
 
-BUILD_DEPENDS=	p5-Geo-Postcodes>=0.31:${PORTSDIR}/misc/p5-Geo-Postcodes
-RUN_DEPENDS=	p5-Geo-Postcodes>=0.31:${PORTSDIR}/misc/p5-Geo-Postcodes
+BUILD_DEPENDS=	p5-Geo-Postcodes>=0.31:misc/p5-Geo-Postcodes
+RUN_DEPENDS=	p5-Geo-Postcodes>=0.31:misc/p5-Geo-Postcodes
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/misc/p5-Geo-Postcodes-NO/Makefile b/misc/p5-Geo-Postcodes-NO/Makefile
index 3afbcb2e0349..f61cc5e8b2f1 100644
--- a/misc/p5-Geo-Postcodes-NO/Makefile
+++ b/misc/p5-Geo-Postcodes-NO/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Norwegian postcodes with associated information
 
-BUILD_DEPENDS=	p5-Geo-Postcodes>=0.31:${PORTSDIR}/misc/p5-Geo-Postcodes
-RUN_DEPENDS=	p5-Geo-Postcodes>=0.31:${PORTSDIR}/misc/p5-Geo-Postcodes
+BUILD_DEPENDS=	p5-Geo-Postcodes>=0.31:misc/p5-Geo-Postcodes
+RUN_DEPENDS=	p5-Geo-Postcodes>=0.31:misc/p5-Geo-Postcodes
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/misc/p5-Geo-Weather/Makefile b/misc/p5-Geo-Weather/Makefile
index eaf59af77ffa..9462e7bae9e8 100644
--- a/misc/p5-Geo-Weather/Makefile
+++ b/misc/p5-Geo-Weather/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to retrieve weather information from weather.com
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/misc/p5-I18N-Charset/Makefile b/misc/p5-I18N-Charset/Makefile
index deed84f8bc9c..d9216cee124a 100644
--- a/misc/p5-I18N-Charset/Makefile
+++ b/misc/p5-I18N-Charset/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Module which maps CharSet names to the names registered with IANA
 
-BUILD_DEPENDS=	p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture
-RUN_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Unicode-MapUTF8>=0:${PORTSDIR}/converters/p5-Unicode-MapUTF8
+BUILD_DEPENDS=	p5-IO-Capture>=0:devel/p5-IO-Capture
+RUN_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String \
+		p5-Unicode-MapUTF8>=0:converters/p5-Unicode-MapUTF8
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/misc/p5-Locale-Geocode/Makefile b/misc/p5-Locale-Geocode/Makefile
index 160517f21897..ddcb3aeb91dd 100644
--- a/misc/p5-Locale-Geocode/Makefile
+++ b/misc/p5-Locale-Geocode/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Find codes and information on geographical location
 
-RUN_DEPENDS=	p5-XML-SAX-Expat>=0.39:${PORTSDIR}/textproc/p5-XML-SAX-Expat \
-		p5-XML-Simple>=2.16:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-XML-SAX-Expat>=0.39:textproc/p5-XML-SAX-Expat \
+		p5-XML-Simple>=2.16:textproc/p5-XML-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/misc/p5-Locale-US/Makefile b/misc/p5-Locale-US/Makefile
index b0d58896d800..f8c442a9c1d7 100644
--- a/misc/p5-Locale-US/Makefile
+++ b/misc/p5-Locale-US/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Two letter codes for state identification in the United States
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Section-Simple>=0:${PORTSDIR}/devel/p5-Data-Section-Simple
+BUILD_DEPENDS=	p5-Data-Section-Simple>=0:devel/p5-Data-Section-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/misc/p5-OSSP-uuid/Makefile b/misc/p5-OSSP-uuid/Makefile
index 0c4556e4c43b..bf45d570336f 100644
--- a/misc/p5-OSSP-uuid/Makefile
+++ b/misc/p5-OSSP-uuid/Makefile
@@ -3,7 +3,7 @@
 
 COMMENT=	Perl bindings for ossp-uuid
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libossp-uuid.a:${PORTSDIR}/misc/ossp-uuid
+BUILD_DEPENDS=	${LOCALBASE}/lib/libossp-uuid.a:misc/ossp-uuid
 
 SLAVEPORT=	perl
 USES=		perl5
diff --git a/misc/p5-Software-License-CCpack/Makefile b/misc/p5-Software-License-CCpack/Makefile
index 635fbcedceef..35dd9ecbab23 100644
--- a/misc/p5-Software-License-CCpack/Makefile
+++ b/misc/p5-Software-License-CCpack/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Software::License pack for Creative Commons licenses
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	p5-Software-License>=0:${PORTSDIR}/misc/p5-Software-License
+BUILD_DEPENDS=	p5-Software-License>=0:misc/p5-Software-License
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:${PORTSDIR}/devel/p5-Test-CheckDeps
+TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/misc/p5-Software-License/Makefile b/misc/p5-Software-License/Makefile
index cb8a0cef5275..40831558aef5 100644
--- a/misc/p5-Software-License/Makefile
+++ b/misc/p5-Software-License/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Packages that provide templated software licenses
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Section>=0:${PORTSDIR}/devel/p5-Data-Section \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template
+BUILD_DEPENDS=	p5-Data-Section>=0:devel/p5-Data-Section \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Text-Template>=0:textproc/p5-Text-Template
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/misc/p5-Text-FIGlet/Makefile b/misc/p5-Text-FIGlet/Makefile
index 11a17d0bc99e..4b50d1503605 100644
--- a/misc/p5-Text-FIGlet/Makefile
+++ b/misc/p5-Text-FIGlet/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl module to provide FIGlet abilities, akin to banner
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	figlet:${PORTSDIR}/misc/figlet
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+RUN_DEPENDS=	figlet:misc/figlet
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 REINPLACE_ARGS=	-i ''
diff --git a/misc/pastebinit/Makefile b/misc/pastebinit/Makefile
index ef27e64be2c9..6e8f40431f29 100644
--- a/misc/pastebinit/Makefile
+++ b/misc/pastebinit/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Command line utility for pastebing
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:${PORTSDIR}/devel/py-configobj
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:devel/py-configobj
 
 USES=		python:run shebangfix tar:bzip2
 SHEBANG_FILES=	pastebinit
diff --git a/misc/patchutils/Makefile b/misc/patchutils/Makefile
index 0f3077be13ad..7bc615d5ccff 100644
--- a/misc/patchutils/Makefile
+++ b/misc/patchutils/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://cyberelk.net/tim/data/patchutils/stable/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Small collection of programs that operate on patch files
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		perl5 shebangfix tar:xz
 USE_PERL5=	run build patch
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 68b506decb92..fad1fb414979 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple console menu program
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS=	libslang.so:devel/libslang2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/misc/pear-Services_Weather/Makefile b/misc/pear-Services_Weather/Makefile
index c287ae22024a..198a34ed499c 100644
--- a/misc/pear-Services_Weather/Makefile
+++ b/misc/pear-Services_Weather/Makefile
@@ -11,7 +11,7 @@ COMMENT=	PEAR interface to various online weather-services
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
 
 PORTSCOUT=	skipv:1.4.7
 
@@ -26,10 +26,10 @@ PEAR_DB_DESC=	PEAR::DB support
 PEAR_SOAP_DESC=	PEAR::SOAP support
 PEAR_XML_SERIALIZER_DESC=	PEAR::XML::Serializer support
 
-PEAR_NET_FTP_BUILD_DEPENDS=	${PEARDIR}/Net/FTP.php:${PORTSDIR}/ftp/pear-Net_FTP
-PEAR_CACHE_BUILD_DEPENDS=	${PEARDIR}/Cache.php:${PORTSDIR}/sysutils/pear-Cache
-PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_SOAP_BUILD_DEPENDS=${PEARDIR}/SOAP/Base.php:${PORTSDIR}/net/pear-SOAP
-PEAR_XML_SERIALIZER_BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+PEAR_NET_FTP_BUILD_DEPENDS=	${PEARDIR}/Net/FTP.php:ftp/pear-Net_FTP
+PEAR_CACHE_BUILD_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache
+PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_SOAP_BUILD_DEPENDS=${PEARDIR}/SOAP/Base.php:net/pear-SOAP
+PEAR_XML_SERIALIZER_BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 .include <bsd.port.mk>
diff --git a/misc/pfm/Makefile b/misc/pfm/Makefile
index bf6b474d6dac..bde3dce8eb5d 100644
--- a/misc/pfm/Makefile
+++ b/misc/pfm/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Terminal (curses)-based file manager written in Perl
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-libwww>=5.827:${PORTSDIR}/www/p5-libwww \
-		p5-File-Stat-Bits>=1.01:${PORTSDIR}/sysutils/p5-File-Stat-Bits \
-		p5-ReadLine-Gnu>=1.09:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Term-ScreenColor>=1.13:${PORTSDIR}/devel/p5-Term-ScreenColor
+RUN_DEPENDS=	p5-libwww>=5.827:www/p5-libwww \
+		p5-File-Stat-Bits>=1.01:sysutils/p5-File-Stat-Bits \
+		p5-ReadLine-Gnu>=1.09:devel/p5-ReadLine-Gnu \
+		p5-Term-ScreenColor>=1.13:devel/p5-Term-ScreenColor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/misc/podsleuth/Makefile b/misc/podsleuth/Makefile
index 111432019741..efda7b1e92f0 100644
--- a/misc/podsleuth/Makefile
+++ b/misc/podsleuth/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://download.banshee.fm/${PORTNAME}/${PORTVERSION}/
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Tool to discover detailed model information about an iPod
 
-LIB_DEPENDS=	libsgutils2.so:${PORTSDIR}/sysutils/sg3_utils \
-		libhal.so:${PORTSDIR}/sysutils/hal
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
+LIB_DEPENDS=	libsgutils2.so:sysutils/sg3_utils \
+		libhal.so:sysutils/hal
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
 
 CONFIGURE_ARGS+=--with-hal-callouts-dir=${PREFIX}/libexec
 CONFIGURE_ENV=	ac_cv_path_MCS=${LOCALBASE}/bin/mcs
diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile
index 562e20ebc232..596e9572773d 100644
--- a/misc/py-osd/Makefile
+++ b/misc/py-osd/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	pyosd-${PORTVERSION}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Python wrapper for osd, for displaying text on your X display
 
-LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+LIB_DEPENDS=	libxosd.so:misc/xosd
 
 USES=		python twisted:run
 USE_PYTHON=	distutils autoplist
diff --git a/misc/py-spdx-lookup/Makefile b/misc/py-spdx-lookup/Makefile
index 9e1ec961dae6..9c7afe334a6e 100644
--- a/misc/py-spdx-lookup/Makefile
+++ b/misc/py-spdx-lookup/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SPDX license list query tool
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}spdx>0:${PORTSDIR}/misc/py-spdx
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}spdx>0:misc/py-spdx
 
 USES=		python:3.3+
 USE_PYTHON=	autoplist distutils
diff --git a/misc/pylize/Makefile b/misc/pylize/Makefile
index 591662acbbf3..04cdc372d0a6 100644
--- a/misc/pylize/Makefile
+++ b/misc/pylize/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	dryice@dryice.name
 COMMENT=	Presentation generation tool
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${PYTHON_SITELIBDIR}/HTMLgen.py:${PORTSDIR}/www/py-HTMLgen \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_SITELIBDIR}/em.py:${PORTSDIR}/textproc/py-empy
+BUILD_DEPENDS=	python:lang/python \
+		${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_SITELIBDIR}/em.py:textproc/py-empy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:2 tar:bzip2
diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile
index 91446b6d4adf..f4b523a1e09f 100644
--- a/misc/raspberrypi-userland/Makefile
+++ b/misc/raspberrypi-userland/Makefile
@@ -28,7 +28,7 @@ CMAKE_ARGS+=	-DVMCS_INSTALL_PREFIX=${PREFIX} \
 OPTIONS_DEFINE=	EXAMPLES DEBUG
 OPTIONS_DEFAULT=	EXAMPLES
 EXAMPLES_DESC=	Install test applications source code (hello_pi)
-EXAMPLES_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+EXAMPLES_LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 DEBUG_CFLAGS_OFF=	-DNDEBUG
 
diff --git a/misc/rfc/Makefile b/misc/rfc/Makefile
index 999ef7f8030a..99426ee89c5e 100644
--- a/misc/rfc/Makefile
+++ b/misc/rfc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.dewn.com/rfc/
 MAINTAINER=	scf@FreeBSD.org
 COMMENT=	Perl script to search for RFC's
 
-RUN_DEPENDS=	w3m:${PORTSDIR}/www/w3m
+RUN_DEPENDS=	w3m:www/w3m
 
 NO_BUILD=	yes
 USES=	perl5 shebangfix
diff --git a/misc/rubygem-rabbit/Makefile b/misc/rubygem-rabbit/Makefile
index e16b40d64cbd..e7e012c9173f 100644
--- a/misc/rubygem-rabbit/Makefile
+++ b/misc/rubygem-rabbit/Makefile
@@ -13,17 +13,17 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/GPL
 
-RUN_DEPENDS=	rubygem-coderay>=1.0.0:${PORTSDIR}/textproc/rubygem-coderay \
-		rubygem-faraday>0:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext \
-		rubygem-gtk2>0:${PORTSDIR}/x11-toolkits/rubygem-gtk2 \
-		rubygem-hikidoc>0:${PORTSDIR}/textproc/rubygem-hikidoc \
-		rubygem-kramdown>0:${PORTSDIR}/textproc/rubygem-kramdown \
-		rubygem-nokogiri>0:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-poppler>0:${PORTSDIR}/x11-toolkits/rubygem-poppler \
-		rubygem-rdtool>0:${PORTSDIR}/textproc/rubygem-rdtool \
-		rubygem-rsvg2>0:${PORTSDIR}/graphics/rubygem-rsvg2 \
-		rubygem-rttool>0:${PORTSDIR}/textproc/rubygem-rttool
+RUN_DEPENDS=	rubygem-coderay>=1.0.0:textproc/rubygem-coderay \
+		rubygem-faraday>0:www/rubygem-faraday \
+		rubygem-gettext>0:devel/rubygem-gettext \
+		rubygem-gtk2>0:x11-toolkits/rubygem-gtk2 \
+		rubygem-hikidoc>0:textproc/rubygem-hikidoc \
+		rubygem-kramdown>0:textproc/rubygem-kramdown \
+		rubygem-nokogiri>0:textproc/rubygem-nokogiri \
+		rubygem-poppler>0:x11-toolkits/rubygem-poppler \
+		rubygem-rdtool>0:textproc/rubygem-rdtool \
+		rubygem-rsvg2>0:graphics/rubygem-rsvg2 \
+		rubygem-rttool>0:textproc/rubygem-rttool
 
 NO_ARCH=	yes
 USES=		gettext
@@ -36,7 +36,7 @@ PLIST_FILES=	bin/rabbit bin/rabbirc bin/rabbit-command bin/rabbit-slide \
 OPTIONS_DEFINE=	MIMETEX
 MIMETEX_DESC=	Run with mimetex
 
-MIMETEX_RUN_DEPENDS=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex
+MIMETEX_RUN_DEPENDS=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:www/mimetex
 
 post-patch-MIMETEX-on:
 	${REINPLACE_CMD} -e 's|"mimetex.cgi"|"${PREFIX}/www/mimetex/cgi-bin/mimetex.cgi"|' \
diff --git a/misc/saaghar/Makefile b/misc/saaghar/Makefile
index f72245be6bf1..c25ed2f9b02e 100644
--- a/misc/saaghar/Makefile
+++ b/misc/saaghar/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Persian poetry software
 
 LICENSE=	GPLv3
 
-EXTRACT_DEPENDS=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${LOCALBASE}/bin/unzip:archivers/unzip
 
 OPTIONS_DEFINE=	DEBUG
 
diff --git a/misc/smssend/Makefile b/misc/smssend/Makefile
index 5c95b1812899..92aa6846ee4e 100644
--- a/misc/smssend/Makefile
+++ b/misc/smssend/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	LOCAL/laszlof \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to send a SMS to any GSM
 
-LIB_DEPENDS=	libskyutils.so:${PORTSDIR}/misc/skyutils
+LIB_DEPENDS=	libskyutils.so:misc/skyutils
 
 USES=		libtool shebangfix
 SHEBANG_FILES=	bestsms.sh email2smssend
diff --git a/misc/sshbuddy/Makefile b/misc/sshbuddy/Makefile
index 7b3666826679..5e18fdce9d48 100644
--- a/misc/sshbuddy/Makefile
+++ b/misc/sshbuddy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://linuxmafia.com/pub/linux/security/sshbuddy/
 MAINTAINER=	wrighrc@gmail.com
 COMMENT=	Simple and small GUI utility to manage ssh sessions
 
-RUN_DEPENDS=	expect:${PORTSDIR}/lang/expect
+RUN_DEPENDS=	expect:lang/expect
 
 USES=		tk
 
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 3e71f5e0269e..fcfe8dd8c296 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Framework for manipulating Bible texts
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
+BUILD_DEPENDS=	cppunit-config:devel/cppunit
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-conf --with-zlib
@@ -31,15 +31,15 @@ OPTIONS_DEFAULT=CURL CLUCENE
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 CONFIGURE_ARGS+=	--with-curl
 .else
 CONFIGURE_ARGS+=	--without-curl
 .endif
 
 .if ${PORT_OPTIONS:MCLUCENE}
-LIB_DEPENDS+=	libclucene-core.so:${PORTSDIR}/textproc/clucene \
-		libicudata.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libclucene-core.so:textproc/clucene \
+		libicudata.so:devel/icu
 CONFIGURE_ARGS+=	--with-clucene=${LOCALBASE} --with-icu
 .else
 CONFIGURE_ARGS+=	--without-clucene --without-icu
diff --git a/misc/telbook/Makefile b/misc/telbook/Makefile
index e8f055c1d86c..8dde06977dd1 100644
--- a/misc/telbook/Makefile
+++ b/misc/telbook/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple telephone book
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 USES=		shebangfix tar:bzip2
 SHEBANG_FILES=	telbook
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index b79a73c68458..fa14544b7347 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Collection manager for KDE
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
-		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
-		libyaz.so:${PORTSDIR}/net/yaz \
-		libexempi.so:${PORTSDIR}/textproc/exempi \
-		libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libtag.so:audio/taglib \
+		libpoppler-qt4.so:graphics/poppler-qt4 \
+		libyaz.so:net/yaz \
+		libexempi.so:textproc/exempi \
+		libqjson.so:devel/qjson
 
 USE_KDE4=	kdelibs kdeprefix libksane pimlibs \
 		automoc4 qimageblitz libkcddb libkcompactdisc
diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index 91bd56556b79..38f25ccfd047 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Interactive height field generation and manipulation program
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libtrio.a:${PORTSDIR}/devel/trio
+BUILD_DEPENDS=	${LOCALBASE}/lib/libtrio.a:devel/trio
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/misc/teslams/Makefile b/misc/teslams/Makefile
index a3493ff925bd..bbd367850392 100644
--- a/misc/teslams/Makefile
+++ b/misc/teslams/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Node.js implementation of Tesla Model S API client
 LICENSE=	BSD2CLAUSE BSD3CLAUSE APACHE20 MIT ISCL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	npm>=0:${PORTSDIR}/www/npm
-RUN_DEPENDS=	npm>=0:${PORTSDIR}/www/npm
+BUILD_DEPENDS=	npm>=0:www/npm
+RUN_DEPENDS=	npm>=0:www/npm
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/misc/toilet/Makefile b/misc/toilet/Makefile
index aefb68b80afe..6de9f0ed8847 100644
--- a/misc/toilet/Makefile
+++ b/misc/toilet/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://caca.zoy.org/raw-attachment/wiki/toilet/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced figlet(6)
 
-LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
+LIB_DEPENDS=	libcaca.so:graphics/libcaca
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=""
diff --git a/misc/tpp/Makefile b/misc/tpp/Makefile
index bb63cfdf4802..d8de580b5c1e 100644
--- a/misc/tpp/Makefile
+++ b/misc/tpp/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://synflood.at/tpp/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text presentation program
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/ncurses.rb:${PORTSDIR}/devel/ruby-ncurses \
-		figlet:${PORTSDIR}/misc/figlet
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/ncurses.rb:devel/ruby-ncurses \
+		figlet:misc/figlet
 
 NO_BUILD=	yes
 USE_RUBY=	yes
diff --git a/misc/translate/Makefile b/misc/translate/Makefile
index 85bd83ea493c..bd0f74ff84c8 100644
--- a/misc/translate/Makefile
+++ b/misc/translate/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.freebsdcluster.org/~mich/software/
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Translates string using Babelfish
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5 shebangfix
 NO_BUILD=	yes
diff --git a/misc/utftools/Makefile b/misc/utftools/Makefile
index e76a2f456081..c048cc8c0468 100644
--- a/misc/utftools/Makefile
+++ b/misc/utftools/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_NAME=	utftools license
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libutf.a:${PORTSDIR}/misc/libutf
+BUILD_DEPENDS=	${LOCALBASE}/lib/libutf.a:misc/libutf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include
diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile
index 5602c1c29a08..86e6924a0d40 100644
--- a/misc/wmScoreBoard/Makefile
+++ b/misc/wmScoreBoard/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Window Maker dockapp that display game scores from excite
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 USE_XORG=	xpm
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index 5c02f54eec4c..f1b599d87e54 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	Dockable calendar with interface to iCalendar based calendars
 
-LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS=	libical.so:devel/libical
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 817fbd469459..2a2427fcf94e 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -16,12 +16,12 @@ COMMENT=	Displays current conditions and forecasts with icons and text
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libHermes.so:${PORTSDIR}/graphics/Hermes \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libgif.so:${PORTSDIR}/graphics/giflib
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpcre.so:devel/pcre \
+		libtiff.so:graphics/tiff \
+		libHermes.so:graphics/Hermes \
+		libpng.so:graphics/png \
+		libgif.so:graphics/giflib
 
 WRKSRC=		${WRKDIR}/wmweather+-${PORTVERSION}
 
@@ -53,9 +53,9 @@ DESKTOP_ENTRIES="${PORTNAME}" "" "${PORTNAME}" \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWM}
-LIB_DEPENDS+=	libWMaker.so:${PORTSDIR}/x11-wm/windowmaker
+LIB_DEPENDS+=	libWMaker.so:x11-wm/windowmaker
 .else
-LIB_DEPENDS+=	libwraster.so:${PORTSDIR}/x11-wm/libwraster
+LIB_DEPENDS+=	libwraster.so:x11-wm/libwraster
 .endif
 
 post-patch:
diff --git a/misc/wotsap/Makefile b/misc/wotsap/Makefile
index 0ebdb1b2d1f8..2639ee17e941 100644
--- a/misc/wotsap/Makefile
+++ b/misc/wotsap/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Web of trust statistics and pathfinder
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 USES=		python:2,run
 NO_BUILD=	yes
diff --git a/misc/xdg-menu/Makefile b/misc/xdg-menu/Makefile
index 0f5ce0dc1aaf..8e04599f886b 100644
--- a/misc/xdg-menu/Makefile
+++ b/misc/xdg-menu/Makefile
@@ -17,9 +17,9 @@ COMMENT=	ROX panel applet that displays an applications menu button
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus
 
 WRKSRC=		${WRKDIR}/XDG-Menu
 DATADIR=	${PREFIX}/apps/XDG-Menu
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index ea103962c7f0..b16a0d775f04 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Application launcher and finder
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig gettext-tools tar:bzip2
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 2c8ed90c34ab..5258d5ff3a09 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Weather plugin for the Xfce panel
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -26,7 +26,7 @@ USE_XFCE=	panel
 OPTIONS_DEFINE=	UPOWER
 UPOWER_DESC=	Power management tasks
 
-UPOWER_LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower
+UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
 UPOWER_CONFIGURE_ENABLE=	upower
 
 .include <bsd.port.mk>
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index a389af9b5f76..152bc6265560 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Bible interface utilizing the sword framework
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
+RUN_DEPENDS=	yelp:x11/yelp
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		docbook2html:${PORTSDIR}/textproc/docbook-utils \
-		gnome-doc-tool:${PORTSDIR}/textproc/gnome-doc-utils \
-		nspr>=4.8:${PORTSDIR}/devel/nspr
-LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib  \
-		libsword.so:${PORTSDIR}/misc/sword
+		docbook2html:textproc/docbook-utils \
+		gnome-doc-tool:textproc/gnome-doc-utils \
+		nspr>=4.8:devel/nspr
+LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libdbus-glib-1.so:devel/dbus-glib  \
+		libsword.so:misc/sword
 
 USES=		gettext pkgconfig waf
 INSTALLS_OMF=	yes
diff --git a/misc/xsw/Makefile b/misc/xsw/Makefile
index 9a89472abbb9..04ebc307872e 100644
--- a/misc/xsw/Makefile
+++ b/misc/xsw/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool for creating presentations
 
 OPTIONS_DEFINE=	DOCS
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 USE_SDL=	sdl ttf image gfx
 
diff --git a/misc/xyzcmd/Makefile b/misc/xyzcmd/Makefile
index d7caee5d2650..c545760e79c2 100644
--- a/misc/xyzcmd/Makefile
+++ b/misc/xyzcmd/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Pure console visual file manager
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/urwid/raw_display.py:${PORTSDIR}/devel/py-urwid
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/urwid/raw_display.py:${PORTSDIR}/devel/py-urwid
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/urwid/raw_display.py:devel/py-urwid
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/urwid/raw_display.py:devel/py-urwid
 
 USES=		python tar:bzip2
 USE_PYTHON=	distutils
diff --git a/multimedia/2mandvd/Makefile b/multimedia/2mandvd/Makefile
index 118c98346472..1c68c495f282 100644
--- a/multimedia/2mandvd/Makefile
+++ b/multimedia/2mandvd/Makefile
@@ -12,21 +12,21 @@ COMMENT=	DVD authoring and slideshow tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
-		notify-send:${PORTSDIR}/devel/libnotify \
-		exif:${PORTSDIR}/graphics/exif \
-		netpbm>=10.26:${PORTSDIR}/graphics/netpbm \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		ffmpegthumbnailer:${PORTSDIR}/multimedia/ffmpegthumbnailer \
-		mencoder:${PORTSDIR}/multimedia/mencoder \
-		ppmtoy4m:${PORTSDIR}/multimedia/mjpegtools \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		tcprobe:${PORTSDIR}/multimedia/transcode \
-		xine:${PORTSDIR}/multimedia/xine \
-		bash:${PORTSDIR}/shells/bash \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+RUN_DEPENDS=	sox:audio/sox \
+		notify-send:devel/libnotify \
+		exif:graphics/exif \
+		netpbm>=10.26:graphics/netpbm \
+		dvdauthor:multimedia/dvdauthor \
+		ffmpegthumbnailer:multimedia/ffmpegthumbnailer \
+		mencoder:multimedia/mencoder \
+		ppmtoy4m:multimedia/mjpegtools \
+		mplayer:multimedia/mplayer \
+		tcprobe:multimedia/transcode \
+		xine:multimedia/xine \
+		bash:shells/bash \
+		cdrecord:sysutils/cdrtools \
+		growisofs:sysutils/dvd+rw-tools
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/multimedia/ab25/Makefile b/multimedia/ab25/Makefile
index 1918336e25a8..08258562d1bf 100644
--- a/multimedia/ab25/Makefile
+++ b/multimedia/ab25/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Utility for ARIB STD-B25 ECM handling in MPEG2-TS stream
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/licence.txt
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
-RUN_DEPENDS=	${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so:${PORTSDIR}/devel/libccid
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
+RUN_DEPENDS=	${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so:devel/libccid
 
 USES=		uidfix
 USE_LDCONFIG=	yes
diff --git a/multimedia/abby/Makefile b/multimedia/abby/Makefile
index 29443b52e49b..d247e63dba54 100644
--- a/multimedia/abby/Makefile
+++ b/multimedia/abby/Makefile
@@ -22,9 +22,9 @@ PLIST_FILES=	bin/abby
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCCLIVE}
-RUN_DEPENDS+=	cclive>=0.5.6:${PORTSDIR}/multimedia/cclive
+RUN_DEPENDS+=	cclive>=0.5.6:multimedia/cclive
 .else
-RUN_DEPENDS+=	clive>=2.2.5:${PORTSDIR}/multimedia/clive
+RUN_DEPENDS+=	clive>=2.2.5:multimedia/clive
 .endif
 
 do-install:
diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile
index 4dcb28d45f8d..62b71971d043 100644
--- a/multimedia/acidrip/Makefile
+++ b/multimedia/acidrip/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20-%20Your%20two-wheeled
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK2::Perl wrapper for MPlayer and MEncoder for ripping DVDs
 
-BUILD_DEPENDS=	lsdvd:${PORTSDIR}/multimedia/lsdvd \
-		mencoder:${PORTSDIR}/multimedia/mencoder \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	lsdvd:multimedia/lsdvd \
+		mencoder:multimedia/mencoder \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 7beb56d38f17..c4c7241072a6 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Cross-platform subtitle editor
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libicui18n.so:${PORTSDIR}/devel/icu \
-		libass.so:${PORTSDIR}/multimedia/libass \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libicui18n.so:devel/icu \
+		libass.so:multimedia/libass \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USE_GITHUB=	nodefault
 
@@ -50,24 +50,24 @@ OPTIONS_DEFINE=		ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \
 			PULSEAUDIO
 OPTIONS_DEFAULT=	FFMPEG FFTW HUNSPELL PULSEAUDIO
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--without-alsa
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ENV=	FFMS2_CFLAGS="${FFMS_CFLAGS}" \
 			FFMS2_LIBS="${FFMS_LIBS}"
 FFMPEG_CONFIGURE_OFF=	--without-ffms
 FFMPEG_CPPFLAGS=	${FFMS_CFLAGS}
 FFMPEG_GH_TUPLE=	FFMS:ffms2:2.20:ffms
-FFTW_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 FFTW_CONFIGURE_OFF=	--without-fftw3
-HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 HUNSPELL_CONFIGURE_OFF=	--without-hunspell
 OPENAL_USES=		openal
 OPENAL_CONFIGURE_OFF=	--without-openal
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CONFIGURE_OFF=\
 			--without-portaudio
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=\
 			--without-libpulse
 
@@ -86,8 +86,8 @@ CFLAGS_i386=	-march=pentium
 USE_CXXSTD=	c++11
 CXXFLAGS+=	-Wno-c++11-narrowing
 .if ${COMPILER_VERSION} < 34
-BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++ \
-		${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ \
+		${LOCALBASE}/bin/clang34:lang/clang34
 CPP=		clang-cpp34
 CC=		clang34
 CXX=		clang++34
diff --git a/multimedia/asdcplib/Makefile b/multimedia/asdcplib/Makefile
index 0e20ddb5dd17..7856279830d4 100644
--- a/multimedia/asdcplib/Makefile
+++ b/multimedia/asdcplib/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://download.cinecert.com/asdcplib/
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Open source implementation of SMPTE and the MXF Interop format
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-expat=${LOCALBASE}
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 5dc63f27cc56..53c10934e819 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -23,7 +23,7 @@ CMAKE_ARGS+=	"-DCMAKE_SKIP_RPATH=ON"
 
 OPTIONS_DEFINE=	BOOST
 OPTIONS_DEFAULT=	BOOST
-BOOST_LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
+BOOST_LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs
 BOOST_CMAKE_ON=	-DASSIMP_ENABLE_BOOST_WORKAROUND:BOOL=OFF
 
 .include <bsd.port.options.mk>
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 48afb10b7d38..6d4f84d583da 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Plugins needed for audacious
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
+BUILD_DEPENDS=	audacious:multimedia/audacious
 
 GNU_CONFIGURE=	yes
 USES=		compiler:c++11-lib gettext-tools gmake pkgconfig tar:bzip2
@@ -32,86 +32,86 @@ OPTIONS_DEFINE=	AAC ALSA AMIDI AOSD AOSDXCOMP BS2B CDDA CUE DBUS FFMPEG \
 OPTIONS_DEFAULT=	AAC AOSD AOSDXCOMP CDDA CUE DBUS FFMPEG FLAC GTK2 \
 		MP3 MMS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK
 
-AAC_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+AAC_LIB_DEPENDS=	libfaad.so:audio/faad
 AAC_CONFIGURE_OFF=	--disable-aac
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--disable-alsa
-AMIDI_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+AMIDI_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 AMIDI_CONFIGURE_OFF=	--disable-amidiplug
 AOSD_USE=	gnome=pango
 AOSD_CONFIGURE_ENABLE=	aosd
 AOSD_IMPLIES=	GTK2
-AOSDXCOMP_LIB_DEPENDS=	libXcomposite.so:${PORTSDIR}/x11/libXcomposite
+AOSDXCOMP_LIB_DEPENDS=	libXcomposite.so:x11/libXcomposite
 AOSDXCOMP_CONFIGURE_ENABLE=	aosd-xcomp
 AOSDXCOMP_IMPLIES=	AOSD
-BS2B_LIB_DEPENDS=	libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CONFIGURE_OFF=	--disable-bs2b
-CDDA_LIB_DEPENDS=	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia \
-	libcddb.so:${PORTSDIR}/audio/libcddb
+CDDA_LIB_DEPENDS=	libcdio_cdda.so:sysutils/libcdio-paranoia \
+	libcddb.so:audio/libcddb
 CDDA_CONFIGURE_OFF=	--disable-cdaudio
-CUE_LIB_DEPENDS=	libcue.so:${PORTSDIR}/textproc/libcue
+CUE_LIB_DEPENDS=	libcue.so:textproc/libcue
 CUE_CONFIGURE_OFF=	--disable-cue
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 DBUS_CONFIGURE_ENABLE=	gnomeshortcuts
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_WITH=	ffmpeg=ffmpeg
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ON=	--enable-flacng --enable-filewriter_flac
 FLAC_CONFIGURE_OFF=	--disable-flacng --disable-filewriter_flac
 GTK2_USE=	gnome=gtk20
 GTK2_CONFIGURE_ON=	--enable-gtk --enable-filewriter --enable-hotkey
 GTK2_CONFIGURE_OFF=	--disable-gtk --disable-filewriter --disable-hotkey
 GTK2_IMPLIES=	DBUS
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+JACK_LIB_DEPENDS=	libjack.so:audio/jack \
+	libsamplerate.so:audio/libsamplerate
 JACK_CONFIGURE_OFF=	--disable-jack
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CONFIGURE_OFF=	--disable-filewriter_mp3
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_OFF=	--disable-lirc
-MP3_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MP3_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MP3_CONFIGURE_OFF=	--disable-mp3
-MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_LIB_DEPENDS=	libmms.so:net/libmms
 MMS_CONFIGURE_OFF=	--disable-mms
-MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_OFF=	--disable-modplug
 MPRIS_CONFIGURE_ENABLE=	mpris2
 MPRIS_IMPLIES=	DBUS
-NEON_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+NEON_LIB_DEPENDS=	libneon.so:www/neon
 NEON_CONFIGURE_OFF=	--disable-neon
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=	notify
 NOTIFY_IMPLIES=	GTK2
 OPENGL_USE=	xorg=x11 gl=gl
 OPENGL_CONFIGURE_ENABLE=	glspectrum
 OPENGL_IMPLIES=	GTK2
 OSS_CONFIGURE_ENABLE=	oss4
-PULSEAUDIO_LIB_DEPENDS=	libpulse-mainloop-glib.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse-mainloop-glib.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 PULSEAUDIO_IMPLIES=	DBUS
 QT5_USE=	qt5=multimedia,opengl
 QT5_CONFIGURE_ENABLE=	qt
 QT5_CONFIGURE_OFF=	--disable-qtaudio
-SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_OFF=	--disable-resample
-SCROBBLER_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+SCROBBLER_LIB_DEPENDS=	libcurl.so:ftp/curl
 SCROBBLER_CONFIGURE_OFF=	--disable-scrobbler2
 SCROBBLER_IMPLIES=	GTK2
-SDL_LIB_DEPENDS=	libSDL2.so:${PORTSDIR}/devel/sdl20
+SDL_LIB_DEPENDS=	libSDL2.so:devel/sdl20
 SDL_CONFIGURE_ON=	--enable-sdlout --with-libsdl=2
 SDL_CONFIGURE_OFF=	--disable-sdlout
-SID_LIB_DEPENDS=	libsidplayfp.so:${PORTSDIR}/audio/libsidplayfp
+SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
 SID_CONFIGURE_OFF=	--disable-sid
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_OFF=	--disable-sndfile
 SPEEDPITCH_CONFIGURE_OFF=	--disable-speedpitch
 SPEEDPITCH_IMPLIES=	SAMPLERATE
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	vorbis
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_OFF=	--disable-wavpack
 OPTIONS_SUB=	yes
 
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 0f7c16c41ec9..9be6bd43d746 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -27,7 +27,7 @@ OPTIONS_MULTI_TOOLKITS=	GTK2 QT5
 OPTIONS_EXCLUDE=	QT5
 OPTIONS_DEFINE=	DBUS ICONV NLS EXECINFO
 OPTIONS_DEFAULT=DBUS GTK2 ICONV NLS EXECINFO
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 ICONV_USES=	iconv
 GTK2_USE=	gnome=gtk20
 GTK2_IMPLIES=	DBUS
diff --git a/multimedia/avbin/Makefile b/multimedia/avbin/Makefile
index 38fc3a5a06a8..f511270bfbae 100644
--- a/multimedia/avbin/Makefile
+++ b/multimedia/avbin/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	FFmpeg wrapper
 
-LIB_DEPENDS=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
+LIB_DEPENDS=	libavcodec0.so:multimedia/ffmpeg0
 
 LIBNAME=	libavbin.so.${PORTVERSION}
 PLIST_FILES=	include/avbin.h \
diff --git a/multimedia/avidemux-cli/Makefile b/multimedia/avidemux-cli/Makefile
index 85dbdf78c645..301fd89d1e5a 100644
--- a/multimedia/avidemux-cli/Makefile
+++ b/multimedia/avidemux-cli/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX=	-cli
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (cli)
 
-LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux
+LIB_DEPENDS=	libADM6avutil.so.54:multimedia/avidemux
 
 MASTERDIR=	${.CURDIR}/../avidemux
 PLIST=		${.CURDIR}/pkg-plist
diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile
index 9673a28b660a..00d737b11a2d 100644
--- a/multimedia/avidemux-plugins/Makefile
+++ b/multimedia/avidemux-plugins/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-plugins
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (Plugins)
 
-LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux
+LIB_DEPENDS=	libADM6avutil.so.54:multimedia/avidemux
 
 MASTERDIR=	${.CURDIR}/../avidemux
 PLIST=		${.CURDIR}/pkg-plist
@@ -23,18 +23,18 @@ CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${P
 CMAKE_ARGS+=	-DPLUGIN_UI=ALL
 
 .if ${PORT_OPTIONS:MCLI}
-BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:${PORTSDIR}/multimedia/avidemux-cli
-RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:${PORTSDIR}/multimedia/avidemux-cli
+BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli
+RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:${PORTSDIR}/multimedia/avidemux-qt4
-RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:${PORTSDIR}/multimedia/avidemux-qt4
+BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:multimedia/avidemux-qt4
+RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:multimedia/avidemux-qt4
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
-BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:${PORTSDIR}/multimedia/avidemux-gtk
-RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:${PORTSDIR}/multimedia/avidemux-gtk
+BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:multimedia/avidemux-gtk
+RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:multimedia/avidemux-gtk
 .endif
 
 post-configure: post-configure-common
diff --git a/multimedia/avidemux-qt4/Makefile b/multimedia/avidemux-qt4/Makefile
index e6a32f417322..905d42626cca 100644
--- a/multimedia/avidemux-qt4/Makefile
+++ b/multimedia/avidemux-qt4/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX=	-qt4
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (QT4 UI)
 
-LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux
+LIB_DEPENDS=	libADM6avutil.so.54:multimedia/avidemux
 
 MASTERDIR=	${.CURDIR}/../avidemux
 PLIST=		${.CURDIR}/pkg-plist
diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common
index cc66f1ed15d3..3232c9c5f450 100644
--- a/multimedia/avidemux/Makefile.common
+++ b/multimedia/avidemux/Makefile.common
@@ -6,11 +6,11 @@ MASTER_SITES=	\
 		SF/avidemux/avidemux/${PORTVERSION}
 DISTNAME=	avidemux_${PORTVERSION}
 
-BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm \
-		bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad \
-		libdca.so:${PORTSDIR}/multimedia/libdca \
-		libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS+=	yasm:devel/yasm \
+		bash:shells/bash
+LIB_DEPENDS+=	libmad.so:audio/libmad \
+		libdca.so:multimedia/libdca \
+		libpng.so:graphics/png
 
 LICENSE=	GPLv2
 
@@ -28,7 +28,7 @@ CMAKE_ARGS+=	-DQT5:BOOL=OFF
 CXXFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 
@@ -41,11 +41,11 @@ OPTIONS_SUB=	yes
 CLI_DESC=	Build CLI tool
 
 FRIBIDI_CMAKE_OFF=	-DFRIDIBI:BOOL=OFF
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 OPUS_CMAKE_OFF=		-DOPUS:BOOL=OFF
-OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 TWOLAME_CMAKE_OFF=	-DTWOLAME:BOOL=OFF
-TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 
 .if !defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	LAME FAAC AMR X264
@@ -128,7 +128,7 @@ PLIST_SUB+=	ESD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:audio/jack
 PLIST_SUB+=	JACK=""
 .else
 CMAKE_ARGS+=	-DJACK:BOOL=OFF
@@ -136,7 +136,7 @@ PLIST_SUB+=	JACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 CMAKE_ARGS+=	-DPULSEAUDIOSIMPLE:BOOL=OFF
@@ -144,7 +144,7 @@ PLIST_SUB+=	PULSE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	libfreetype.so:print/freetype2
 PLIST_SUB+=	FREETYPE=""
 .else
 CMAKE_ARGS+=	-DFREETYPE2:BOOL=OFF
@@ -152,20 +152,20 @@ PLIST_SUB+=	FREETYPE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFONTCONFIG}
-LIB_DEPENDS+=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 .else
 CMAKE_ARGS+=	-DFONTCONFIG:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MXVIDEO}
-#LIB_DEPENDS+=	Xv:${PORTSDIR}/x11/libXv
+#LIB_DEPENDS+=	Xv:x11/libXv
 USE_XORG+=	xv
 .else
 CMAKE_ARGS+=	-DXVIDEO:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MFAAC}
-LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
+LIB_DEPENDS+=	libfaac.so:audio/faac
 PLIST_SUB+=	FAAC=""
 .else
 CMAKE_ARGS+=	-DFAAC:BOOL=OFF
@@ -173,7 +173,7 @@ PLIST_SUB+=	FAAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=	libmp3lame.so:audio/lame
 PLIST_SUB+=	LAME=""
 .else
 CMAKE_ARGS+=	-DLAME:BOOL=OFF
@@ -181,7 +181,7 @@ PLIST_SUB+=	LAME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:audio/faad
 PLIST_SUB+=	FAAD=""
 .else
 CMAKE_ARGS+=	-DFAAD:BOOL=OFF -DNeAAC:BOOL=OFF
@@ -189,7 +189,7 @@ PLIST_SUB+=	FAAD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+=	libx264.so:${PORTSDIR}/multimedia/libx264
+LIB_DEPENDS+=	libx264.so:multimedia/libx264
 PLIST_SUB+=	X264=""
 .else
 CMAKE_ARGS+=	-DX264:BOOL=OFF
@@ -197,7 +197,7 @@ PLIST_SUB+=	X264="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MX265}
-LIB_DEPENDS+=	libx265.so:${PORTSDIR}/multimedia/x265
+LIB_DEPENDS+=	libx265.so:multimedia/x265
 PLIST_SUB+=	X265=""
 .else
 CMAKE_ARGS+=	-DX265:BOOL=OFF
@@ -205,7 +205,7 @@ PLIST_SUB+=	X265="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
 PLIST_SUB+=	VPX=""
 .else
 CMAKE_ARGS+=	-DVPXDEC:BOOL=OFF
@@ -213,7 +213,7 @@ PLIST_SUB+=	VPX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MXVID}
-LIB_DEPENDS+=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=	libxvidcore.so:multimedia/xvid
 PLIST_SUB+=	XVID=""
 .else
 CMAKE_ARGS+=	-DXVID:BOOL=OFF
@@ -229,7 +229,7 @@ PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVAAPI}
-LIB_DEPENDS+=	libva.so:${PORTSDIR}/multimedia/libva
+LIB_DEPENDS+=	libva.so:multimedia/libva
 PLIST_SUB+=	VAAPI=""
 .else
 CMAKE_ARGS+=	-DVAAPI:BOOL=OFF -DLIBVA:BOOL=OFF
@@ -237,7 +237,7 @@ PLIST_SUB+=	VAAPI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVDPAU}
-LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+LIB_DEPENDS+=	libvdpau.so:multimedia/libvdpau
 PLIST_SUB+=	VDPAU=""
 .else
 CMAKE_ARGS+=	-DVDPAU:BOOL=OFF
@@ -245,7 +245,7 @@ PLIST_SUB+=	VDPAU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 CMAKE_ARGS+=	-DLIBVORBIS:BOOL=OFF -DVORBIS:BOOL=OFF
@@ -253,7 +253,7 @@ PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAMR}
-LIB_DEPENDS+=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+LIB_DEPENDS+=	libopencore-amrnb.so:audio/opencore-amr
 PLIST_SUB+=	AMRNB=""
 PLIST_SUB+=	AMRWB=""
 .else
diff --git a/multimedia/bangarang/Makefile b/multimedia/bangarang/Makefile
index f97f3638c7e3..85c6e616b937 100644
--- a/multimedia/bangarang/Makefile
+++ b/multimedia/bangarang/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Media player for KDE 4
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:audio/taglib
 
 PROJECTHOST=	bangarangissuetracking
 USES=		cmake:outsource gettext
diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index 7721c68d60d1..f302edc42098 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -11,15 +11,15 @@ MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Music management and playback for gnome
 
 # Could do without bash, but it's brought in by gnome anyway.
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
-LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
-		${LOCALBASE}/libdata/pkgconfig/taglib-sharp.pc:${PORTSDIR}/audio/taglib-sharp \
-		${LOCALBASE}/libdata/pkgconfig/mono-zeroconf.pc:${PORTSDIR}/net/mono-zeroconf \
-		${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:${PORTSDIR}/devel/mono-addins \
-		${LOCALBASE}/libdata/pkgconfig/notify-sharp.pc:${PORTSDIR}/devel/notify-sharp
+LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:devel/dbus-sharp-glib \
+		${LOCALBASE}/libdata/pkgconfig/taglib-sharp.pc:audio/taglib-sharp \
+		${LOCALBASE}/libdata/pkgconfig/mono-zeroconf.pc:net/mono-zeroconf \
+		${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:devel/mono-addins \
+		${LOCALBASE}/libdata/pkgconfig/notify-sharp.pc:devel/notify-sharp
 
 # For now, remove APPLEDEV since it is broken
 OPTIONS_DEFINE=	DOCS BPMDETECT GIO MTP WEBKIT YOUTUBE
@@ -63,7 +63,7 @@ INSTALL=	/usr/bin/install
 
 .if ${PORT_OPTIONS:MGIO}
 CONFIGURE_ARGS+=--enable-gio
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gtk-sharp-beans-2.0.pc:${PORTSDIR}/x11-toolkits/gtk-sharp-beans
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gtk-sharp-beans-2.0.pc:x11-toolkits/gtk-sharp-beans
 PLIST_SUB+=	OPT_GIO=""
 .else
 CONFIGURE_ARGS+=--disable-gio
@@ -84,7 +84,7 @@ USE_GSTREAMER+=	soundtouch
 
 .if ${PORT_OPTIONS:MAPPLEDEV}
 CONFIGURE_ARGS+=--enable-appledevice
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libgpodsharp.pc:${PORTSDIR}/audio/libgpod
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libgpodsharp.pc:audio/libgpod
 BROKEN=		Missing dependency
 PLIST_SUB+=	APPLEDEV=""
 .else
@@ -94,7 +94,7 @@ PLIST_SUB+=	APPLEDEV="@comment "
 
 .if ${PORT_OPTIONS:MMTP}
 CONFIGURE_ARGS+=--enable-mtp
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libmtp.pc:${PORTSDIR}/multimedia/libmtp
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libmtp.pc:multimedia/libmtp
 PLIST_SUB+=	OPT_MTP=""
 .else
 CONFIGURE_ARGS+=--disable-mtp
@@ -103,7 +103,7 @@ PLIST_SUB+=	OPT_MTP="@comment "
 
 .if ${PORT_OPTIONS:MWEBKIT}
 CONFIGURE_ARGS+=--enable-webkit
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:${PORTSDIR}/www/webkit-sharp
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:www/webkit-sharp
 PLIST_SUB+=	OPT_WEBKIT=""
 .else
 CONFIGURE_ARGS+=--disable-webkit
@@ -112,7 +112,7 @@ PLIST_SUB+=	OPT_WEBKIT="@comment "
 
 .if ${PORT_OPTIONS:MYOUTUBE}
 CONFIGURE_ARGS+=--enable-youtube
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gdata-sharp-youtube.pc:${PORTSDIR}/devel/google-gdata
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gdata-sharp-youtube.pc:devel/google-gdata
 PLIST_SUB+=	OPT_YOUTUBE=""
 .else
 CONFIGURE_ARGS+=--disable-youtube
diff --git a/multimedia/bino/Makefile b/multimedia/bino/Makefile
index 9067523cef9f..187703b1cf4f 100644
--- a/multimedia/bino/Makefile
+++ b/multimedia/bino/Makefile
@@ -21,9 +21,9 @@ USE_QT4=	moc_build opengl rcc_build
 # no port fow equalizer now, lirc detecting not working
 CONFIGURE_ARGS+=	--without-equalizer --without-liblircclient --docdir=${DOCSDIR}
 
-LIB_DEPENDS+=	libass.so:${PORTSDIR}/multimedia/libass \
-		libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-		libopenal.so:${PORTSDIR}/audio/openal-soft
+LIB_DEPENDS+=	libass.so:multimedia/libass \
+		libavformat.so:multimedia/ffmpeg \
+		libopenal.so:audio/openal-soft
 
 INFO=	bino
 
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 92417b62ede4..aa931f361fcc 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -14,16 +14,16 @@ COMMENT=	DVD authoring program
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gm:${PORTSDIR}/graphics/GraphicsMagick
-LIB_DEPENDS=	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
-		liblavfile.so:${PORTSDIR}/multimedia/mjpegtools \
-		libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	gm:${PORTSDIR}/graphics/GraphicsMagick \
-		enca:${PORTSDIR}/converters/enca \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		toolame:${PORTSDIR}/audio/toolame
+BUILD_DEPENDS=	gm:graphics/GraphicsMagick
+LIB_DEPENDS=	libxml++-2.6.so:textproc/libxml++26 \
+		liblavfile.so:multimedia/mjpegtools \
+		libdvdread.so:multimedia/libdvdread \
+		libavcodec.so:multimedia/ffmpeg \
+		libboost_filesystem.so:devel/boost-libs
+RUN_DEPENDS=	gm:graphics/GraphicsMagick \
+		enca:converters/enca \
+		growisofs:sysutils/dvd+rw-tools \
+		toolame:audio/toolame
 
 USES=		desktop-file-utils gettext pkgconfig scons shared-mime-info \
 		tar:bzip2
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 4736b655ef4f..d993d9fc7fc8 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Free program to do streaming video via the web
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		autoreconf jpeg libtool
 GNU_CONFIGURE=	yes
@@ -27,13 +27,13 @@ OPTIONS_DEFINE=	IMLIB2 PIXBUF V4L DOCS
 OPTIONS_DEFAULT=IMLIB2
 OPTIONS_SUB=	yes
 
-IMLIB2_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_CONFIGURE_OFF=	ac_cv_path_IMLIB2_CONFIG=no
 
 PIXBUF_USE=	GNOME=gdkpixbuf
 PIXBUF_CONFIGURE_OFF=	ac_cv_path_GDKPIXBUF_CONFIG=no
 
-V4L_BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 V4L_CONFIGURE_OFF=	ac_cv_header_linux_videodev_h=no
 
 post-patch:
diff --git a/multimedia/cclive/Makefile b/multimedia/cclive/Makefile
index 1679e72afc53..26c5137e1ec5 100644
--- a/multimedia/cclive/Makefile
+++ b/multimedia/cclive/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Lightweight command line video extraction tool
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libquvi.so:${PORTSDIR}/multimedia/libquvi
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libcurl.so:ftp/curl \
+		libpcre.so:devel/pcre \
+		libquvi.so:multimedia/libquvi
 
 USES=		pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 32055d6c112d..bc7c84513c35 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -10,15 +10,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Photobooth-inspired app for taking pictures and videos from webcam
 
-BUILD_DEPENDS=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat \
-		gnome-video-effects>=0:${PORTSDIR}/graphics/gnome-video-effects \
-		vala>=0.14.0:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libhal.so:${PORTSDIR}/sysutils/hal \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libclutter-gst-3.0.so:${PORTSDIR}/multimedia/clutter-gst3
-RUN_DEPENDS=	gnome-video-effects>=0:${PORTSDIR}/graphics/gnome-video-effects
+BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat \
+		gnome-video-effects>=0:graphics/gnome-video-effects \
+		vala>=0.14.0:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libhal.so:sysutils/hal \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libclutter-gst-3.0.so:multimedia/clutter-gst3
+RUN_DEPENDS=	gnome-video-effects>=0:graphics/gnome-video-effects
 
 PORTSCOUT=	limitw:1,even
 
@@ -41,8 +41,8 @@ OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
 MANPAGES_CONFIGURE_ENABLE=	man
-MANPAGES_BUILD_DEPENDS=	docbook-xml>=0:${PORTSDIR}/textproc/docbook-xml \
-			docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
+MANPAGES_BUILD_DEPENDS=	docbook-xml>=0:textproc/docbook-xml \
+			docbook-xsl>=0:textproc/docbook-xsl
 MANPAGES_USE=	GNOME=libxslt:build
 
 post-install:
diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index 0e731feaad52..3a0c9bf07d65 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Command line video extraction tool for YouTube and others
 
 LICENSE=	GPLv3
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
-BUILD_DEPENDS=	p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-JSON-XS>=2.30:${PORTSDIR}/converters/p5-JSON-XS
-RUN_DEPENDS=	p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-JSON-XS>=2.30:${PORTSDIR}/converters/p5-JSON-XS \
-		quvi>=0.2.16.1:${PORTSDIR}/multimedia/quvi
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
+BUILD_DEPENDS=	p5-Getopt-ArgvFile>=1.11:devel/p5-Getopt-ArgvFile \
+		p5-JSON-XS>=2.30:converters/p5-JSON-XS
+RUN_DEPENDS=	p5-Getopt-ArgvFile>=1.11:devel/p5-Getopt-ArgvFile \
+		p5-JSON-XS>=2.30:converters/p5-JSON-XS \
+		quvi>=0.2.16.1:multimedia/quvi
 
 # deskutils/ljclive, multimedia/clive1 (same executable/manpage/distfile name)
 CONFLICTS=	py*-clive-[0-1]* ljclive-[0-9]*
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 16de56786831..8a23b1221611 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clutter GStreamer integration
 
-LIB_DEPENDS=	libclutter-1.0.so:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter
 
 PORTSCOUT=	ignore:1
 
diff --git a/multimedia/clutter-gst3/Makefile b/multimedia/clutter-gst3/Makefile
index 402580718e23..cd902fbf9193 100644
--- a/multimedia/clutter-gst3/Makefile
+++ b/multimedia/clutter-gst3/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clutter GStreamer integration
 
-LIB_DEPENDS=	libclutter-1.0.so:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter
 
 USES=		gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix introspection:build
diff --git a/multimedia/cx88/Makefile b/multimedia/cx88/Makefile
index eaa1527f5de0..31ef30a54123 100644
--- a/multimedia/cx88/Makefile
+++ b/multimedia/cx88/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Drivers for Conexant CX23880/1/2/3/5/7/8-based TV/radio capture cards
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	${LOCALBASE}/lib/libezxml.a:${PORTSDIR}/textproc/ezxml \
-		libtuner>=1.1.2:${PORTSDIR}/multimedia/libtuner
+LIB_DEPENDS=	libjson-c.so:devel/json-c
+BUILD_DEPENDS=	${LOCALBASE}/lib/libezxml.a:textproc/ezxml \
+		libtuner>=1.1.2:multimedia/libtuner
 
 MAKE_ARGS+=	LIBTUNER_LIB=${LOCALBASE}/lib/libtuner LIBTUNER_HEADER=${LOCALBASE}/include/libtuner KMODDIR=${KMODDIR} PREFIX=${STAGEDIR}${PREFIX}
 MAKE_JOBS_UNSAFE=	yes
@@ -36,12 +36,12 @@ MAKE_ARGS+=	DIAGNOSTIC=0x7f -DDEBUG
 .endif
 
 .if ${PORT_OPTIONS:MLINUX_COMPAT}
-LIB_DEPENDS+=	libcuse4bsd.so:${PORTSDIR}/multimedia/cuse4bsd-kmod
-BUILD_DEPENDS+=	v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS+=	libcuse4bsd.so:multimedia/cuse4bsd-kmod
+BUILD_DEPENDS+=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
 MAKE_ARGS+=	-D WITH_LINUX_COMPAT
 .if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal \
-		libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	libhal.so:sysutils/hal \
+		libdbus-1.so:devel/dbus
 MAKE_ARGS+=	-D WITH_HAL
 .endif
 .endif
diff --git a/multimedia/deforaos-player/Makefile b/multimedia/deforaos-player/Makefile
index 577ab3f61545..f366c67c1f8e 100644
--- a/multimedia/deforaos-player/Makefile
+++ b/multimedia/deforaos-player/Makefile
@@ -14,11 +14,11 @@ COMMENT=	DeforaOS desktop media player
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop
+RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 MAKE_ARGS+=	PREFIX=${PREFIX}
 USE_GNOME=	gtk20
diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index 6e0f3dc8f865..8b3d3c09ae69 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Create video DVDs, VCDs, sVCDs, or CVDs from any number of video files
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
-		mencoder:${PORTSDIR}/multimedia/mencoder \
-		spumux:${PORTSDIR}/multimedia/dvdauthor \
-		vcdimager:${PORTSDIR}/multimedia/vcdimager \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
+		mencoder:multimedia/mencoder \
+		spumux:multimedia/dvdauthor \
+		vcdimager:multimedia/vcdimager \
+		cdrecord:sysutils/cdrtools
 
 USE_GNOME=	pygtk2
 USES=		iconv python tar:bzip2
@@ -30,7 +30,7 @@ IBUS_DESC=	iBus support
 DEJAVU_FONTSDIR=	${LOCALBASE}/share/fonts/dejavu
 DEJAVU_FONTFILE=	${DEJAVU_FONTSDIR}/DejaVuSans.ttf
 
-IBUS_RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus
+IBUS_RUN_DEPENDS=	ibus-daemon:textproc/ibus
 NLS_USES=	gettext
 OPTIONS_SUB=	yes
 
diff --git a/multimedia/dtv/Makefile b/multimedia/dtv/Makefile
index 50e53078281c..9c26d9967e2d 100644
--- a/multimedia/dtv/Makefile
+++ b/multimedia/dtv/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Client/server based TV capture/display program
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
 
 MAKE_ENV=	X11BASE=${LOCALBASE}
 USES=		uidfix
diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
index 707186d77850..77fbc87b7d36 100644
--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Dump frames from mpeg movies
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl
diff --git a/multimedia/dv2jpg/Makefile b/multimedia/dv2jpg/Makefile
index 4c6624d81fce..9b98e49552d8 100644
--- a/multimedia/dv2jpg/Makefile
+++ b/multimedia/dv2jpg/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Convert Type-2 DV codec-encoded AVI streams to mjpeg-encoded AVI
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libdv.so:${PORTSDIR}/multimedia/libdv
+LIB_DEPENDS=	libdv.so:multimedia/libdv
 
 USE_GNOME=	gdkpixbuf
 MAKEFILE=	makefile
diff --git a/multimedia/dv2sub/Makefile b/multimedia/dv2sub/Makefile
index 865a5381fd50..bdb4a1be1e19 100644
--- a/multimedia/dv2sub/Makefile
+++ b/multimedia/dv2sub/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	oz@nixil.net
 COMMENT=	Extracts info or subtitles from DV stream
 
-LIB_DEPENDS=	libdv.so:${PORTSDIR}/multimedia/libdv
+LIB_DEPENDS=	libdv.so:multimedia/libdv
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index b7a1191fc014..69a87dc6f97f 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Qt application for cutting of MPEG PS and MPEG TS streams (DVB)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
-		ffmpeg:${PORTSDIR}/multimedia/ffmpeg
-LIB_DEPENDS=	liba52.so:${PORTSDIR}/audio/liba52 \
-		libao.so:${PORTSDIR}/audio/libao \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+BUILD_DEPENDS=	mplayer:multimedia/mplayer \
+		ffmpeg:multimedia/ffmpeg
+LIB_DEPENDS=	liba52.so:audio/liba52 \
+		libao.so:audio/libao \
+		libmad.so:audio/libmad \
+		libavutil.so:multimedia/ffmpeg
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index a078f99ac0be..41b1366b2657 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -14,16 +14,16 @@ THEMEVERSION=	0.8.4
 MAINTAINER=	oz@nixil.net
 COMMENT=	Script to create slideshow-style DVD with some simple menus
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		identify:${PORTSDIR}/graphics/ImageMagick \
-		mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
-		ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
-		sox:${PORTSDIR}/audio/sox \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		jhead:${PORTSDIR}/graphics/jhead \
-		flvtool2:${PORTSDIR}/multimedia/rubygem-flvtool2 \
-		${LOCALBASE}/share/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	bash:shells/bash \
+		identify:graphics/ImageMagick \
+		mpeg2enc:multimedia/mjpegtools \
+		ffmpeg:multimedia/ffmpeg \
+		sox:audio/sox \
+		dvdauthor:multimedia/dvdauthor \
+		jhead:graphics/jhead \
+		flvtool2:multimedia/rubygem-flvtool2 \
+		${LOCALBASE}/share/fonts/urwfonts-ttf/README:x11-fonts/urwfonts-ttf \
+		cdrecord:sysutils/cdrtools
 
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/share/apps/${PORTNAME}
@@ -31,9 +31,9 @@ DATADIR=	${PREFIX}/share/apps/${PORTNAME}
 OPTIONS_DEFINE=	LAME THEMES TOOLAME VORBIS
 THEMES_DESC=	Install optional themes
 
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-VORBIS_RUN_DEPENDS=	oggdec:${PORTSDIR}/audio/vorbis-tools
-TOOLAME_RUN_DEPENDS=	toolame:${PORTSDIR}/audio/toolame
+LAME_RUN_DEPENDS=	lame:audio/lame
+VORBIS_RUN_DEPENDS=	oggdec:audio/vorbis-tools
+TOOLAME_RUN_DEPENDS=	toolame:audio/toolame
 
 .include <bsd.port.options.mk>
 
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 49f90959d382..ca9608404595 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Makes a DVD file structure from one or more MPEG2 streams
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread \
+		libfribidi.so:converters/fribidi \
+		libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -45,7 +45,7 @@ PAL_DESC=	Default video format PAL
 
 SUB_FILES=	README.FreeBSD
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick
 
 .include <bsd.port.options.mk>
 
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 0663e0d4a2ac..fe96936be00f 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -11,36 +11,36 @@ MASTER_SITE_SUBDIR=	CPAN:JRED
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl Gtk+ based dvd-ripper
 
-BUILD_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Event-ExecFlow>=0:${PORTSDIR}/devel/p5-Event-ExecFlow \
-		p5-Gtk2-Ex-FormFactory>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-FormFactory \
-		p5-Event-RPC>=0:${PORTSDIR}/devel/p5-Event-RPC \
-		p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Event-ExecFlow>=0:${PORTSDIR}/devel/p5-Event-ExecFlow \
-		p5-Gtk2-Ex-FormFactory>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-FormFactory \
-		p5-Event-RPC>=0:${PORTSDIR}/devel/p5-Event-RPC \
-		p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl \
-		cdrdao:${PORTSDIR}/sysutils/cdrdao \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		pstree:${PORTSDIR}/sysutils/pstree \
-		transcode:${PORTSDIR}/multimedia/transcode \
-		vcdimager:${PORTSDIR}/multimedia/vcdimager \
-		${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Event-ExecFlow>=0:devel/p5-Event-ExecFlow \
+		p5-Gtk2-Ex-FormFactory>=0:x11-toolkits/p5-Gtk2-Ex-FormFactory \
+		p5-Event-RPC>=0:devel/p5-Event-RPC \
+		p5-Locale-libintl>=0:devel/p5-Locale-libintl
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Event-ExecFlow>=0:devel/p5-Event-ExecFlow \
+		p5-Gtk2-Ex-FormFactory>=0:x11-toolkits/p5-Gtk2-Ex-FormFactory \
+		p5-Event-RPC>=0:devel/p5-Event-RPC \
+		p5-Locale-libintl>=0:devel/p5-Locale-libintl \
+		cdrdao:sysutils/cdrdao \
+		convert:graphics/ImageMagick \
+		mplayer:multimedia/mplayer \
+		pstree:sysutils/pstree \
+		transcode:multimedia/transcode \
+		vcdimager:multimedia/vcdimager \
+		${LOCALBASE}/sbin/fping:net/fping \
+		cdrecord:sysutils/cdrtools
 
 OPTIONS_DEFINE=	VORBIS SUBTITLE RAR
 OPTIONS_DEFAULT=	VORBIS SUBTITLE
 RAR_DESC=	Support RAR-compressed vobsub subtitles
 SUBTITLE_DESC=	Enable support for getting subtitles
 
-RAR_RUN_DEPENDS=	rar:${PORTSDIR}/archivers/rar
-SUBTITLE_RUN_DEPENDS=	subtitle2pgm:${PORTSDIR}/multimedia/subtitleripper
-VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools \
-			ogmmerge:${PORTSDIR}/multimedia/ogmtools
+RAR_RUN_DEPENDS=	rar:archivers/rar
+SUBTITLE_RUN_DEPENDS=	subtitle2pgm:multimedia/subtitleripper
+VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools \
+			ogmmerge:multimedia/ogmtools
 
 CONFIGURE_ENV=	SKIP_UNPACK_REQUIRED_MODULES=1
 USES=		gettext perl5 shebangfix
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 1ba8677dd6b4..e019ee272baf 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -14,21 +14,21 @@ COMMENT=	WxWidgets frontend to dvd recoding and authoring programs
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		wxsvg>=1.2:${PORTSDIR}/graphics/wxsvg \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		mplex:${PORTSDIR}/multimedia/mjpegtools \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		docbook-xml>=4.1.2:${PORTSDIR}/textproc/docbook-xml \
-		xmlto:${PORTSDIR}/textproc/xmlto
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		wxsvg>=1.2:${PORTSDIR}/graphics/wxsvg \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		mplex:${PORTSDIR}/multimedia/mjpegtools \
-		mkisofs:${PORTSDIR}/sysutils/cdrtools \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+BUILD_DEPENDS=	zip:archivers/zip \
+		wxsvg>=1.2:graphics/wxsvg \
+		dvdauthor:multimedia/dvdauthor \
+		mplex:multimedia/mjpegtools \
+		growisofs:sysutils/dvd+rw-tools \
+		docbook-xml>=4.1.2:textproc/docbook-xml \
+		xmlto:textproc/xmlto
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libavcodec.so:multimedia/ffmpeg
+RUN_DEPENDS=	zip:archivers/zip \
+		wxsvg>=1.2:graphics/wxsvg \
+		dvdauthor:multimedia/dvdauthor \
+		mplex:multimedia/mjpegtools \
+		mkisofs:sysutils/cdrtools \
+		growisofs:sysutils/dvd+rw-tools
 
 USES=		autoreconf compiler:c++11-lib gettext gmake pkgconfig tar:bzip2
 USE_CXXSTD=	gnu++11
diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index a0bc296c61a3..5381e35e3687 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Home media server built using mono and other open source technologies
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-LIB_DEPENDS=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
+		libsqlite3.so:databases/sqlite3
 
 CONFLICTS_INSTALL=	mediabrowser
 
@@ -30,8 +30,8 @@ GROUPS=		emby
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
-X11_LIB_DEPENDS=libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
-X11_LIB_DEPENDS_OFF=libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11
+X11_LIB_DEPENDS=libMagickWand-6.so:graphics/ImageMagick
+X11_LIB_DEPENDS_OFF=libMagickWand-6.so:graphics/ImageMagick-nox11
 
 do-build:
 	(cd ${WRKSRC} && \
diff --git a/multimedia/emotion_generic_players-vlc/Makefile b/multimedia/emotion_generic_players-vlc/Makefile
index 788f55d18e9e..f153b344d70a 100644
--- a/multimedia/emotion_generic_players-vlc/Makefile
+++ b/multimedia/emotion_generic_players-vlc/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Additional loader for Emotion (vlc)
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libvlc.so:${PORTSDIR}/multimedia/vlc
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libvlc.so:multimedia/vlc
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index a3b0ddc8cc5a..98293b78080d 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Realtime audio/video encoder/converter and streaming server
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
-		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS=	yasm:devel/yasm \
+		${LOCALBASE}/bin/as:devel/binutils
 
 HAS_CONFIGURE=	yes
 USES=		compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
@@ -75,47 +75,47 @@ ZVBI_DESC=	Teletext support via libzvbi
 OPTIONS_SUB=	yes
 
 # aacplus
-AACPLUS_LIB_DEPENDS=	libaacplus.so:${PORTSDIR}/audio/libaacplus
+AACPLUS_LIB_DEPENDS=	libaacplus.so:audio/libaacplus
 AACPLUS_CONFIGURE_ENABLE=	libaacplus
 AACPLUS_IMPLIES=	NONFREE
 
 # alsa
 ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
 			--disable-outdev=alsa
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
 # Opencore AMR NB
-AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:audio/opencore-amr
 AMR_NB_CONFIGURE_ENABLE=	libopencore-amrnb
 AMR_NB_IMPLIES=		GPL3
 
 # Opencore AMR WB
-AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
+AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:audio/opencore-amr
 AMR_WB_CONFIGURE_ENABLE=	libopencore-amrwb
 AMR_WB_IMPLIES=		GPL3
 
 # ass
-ASS_LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass
+ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
 # bs2b
-BS2B_LIB_DEPENDS=	libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CONFIGURE_ENABLE=	libbs2b
 
 # caca
-CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_ENABLE=	libcaca
 
 # cdio
-CDIO_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDIO_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ENABLE=	libcdio
 
 # celt
-CELT_LIB_DEPENDS=	libcelt0.so:${PORTSDIR}/audio/celt
+CELT_LIB_DEPENDS=	libcelt0.so:audio/celt
 CELT_CONFIGURE_ENABLE=	libcelt
 
 # dc1394
-DC1394_LIB_DEPENDS=	libdc1394.so:${PORTSDIR}/multimedia/libdc1394
+DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 DC1394_CONFIGURE_ENABLE=	libdc1394
 
 # debugging
@@ -123,16 +123,16 @@ DEBUG_CONFIGURE_ON=	--disable-stripping
 DEBUG_CONFIGURE_OFF=	--disable-debug
 
 # docs
-DOCS_BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
+DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
 DOCS_CONFIGURE_ENABLE=	htmlpages
 
 # faac
-FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
+FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 FAAC_CONFIGURE_ENABLE=	libfaac
 FAAC_IMPLIES=		NONFREE
 
 # fdk_aac
-FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:${PORTSDIR}/audio/fdk-aac
+FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
 FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
 FDK_AAC_IMPLIES=	NONFREE
 
@@ -141,35 +141,35 @@ FFSERVER_CONFIGURE_ENABLE=	ffserver
 FFSERVER_VARS=		USE_RC_SUBR+=ffserver
 
 # flite
-FLITE_LIB_DEPENDS=	libflite.so:${PORTSDIR}/audio/flite
+FLITE_LIB_DEPENDS=	libflite.so:audio/flite
 FLITE_CONFIGURE_ENABLE=	libflite
 
 # fontconfig
-FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_ENABLE=	fontconfig
 
 # freetype
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	libfreetype
 
 # frei0r
-FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=	frei0r
 
 # fribidi
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	libfribidi
 
 # gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 
 # gme
-GME_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CONFIGURE_ENABLE=	libgme
 
 # gsm
-GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CONFIGURE_ENABLE=	libgsm
 
 # iconv
@@ -177,29 +177,29 @@ ICONV_USES=	iconv
 ICONV_CONFIGURE_ENABLE=	iconv
 
 # ilbc
-ILBC_LIB_DEPENDS=	libilbc.so:${PORTSDIR}/net/libilbc
+ILBC_LIB_DEPENDS=	libilbc.so:net/libilbc
 ILBC_CONFIGURE_ENABLE=	libilbc
 
 # jack
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-indev=jack
 
 # ladspa
-LADSPA_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
+LADSPA_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
 LADSPA_CONFIGURE_ENABLE=	ladspa
 
 # lame
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=	libmp3lame
 
 # libbluray
-LIBBLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
 # libv4l
-V4L_BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=	libv4l2
 V4L_CONFIGURE_OFF=		--disable-indev=v4l2 \
 				--disable-outdev=v4l2
@@ -208,21 +208,21 @@ V4L_CONFIGURE_OFF=		--disable-indev=v4l2 \
 MMX_CONFIGURE_ENABLE=	mmx
 
 # modplug
-MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	libmodplug
 
 # OpenAL
-OPENAL_LIB_DEPENDS=	libopenal.so:${PORTSDIR}/audio/openal-soft
+OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
 OPENAL_CONFIGURE_ENABLE=	openal
 OPENAL_CONFIGURE_OFF=		--disable-indev=openal
 
 # opencl
-OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
-OPENCL_LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd
+OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
+OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 OPENCL_CONFIGURE_ENABLE=	opencl
 
 # opencv
-OPENCV_LIB_DEPENDS=	libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
+OPENCV_LIB_DEPENDS=	libopencv_imgproc.so:graphics/opencv-core
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
 # opengl
@@ -230,11 +230,11 @@ OPENGL_USE=		GL=gl
 OPENGL_CONFIGURE_ENABLE=	opengl
 
 # openh264
-OPENH264_LIB_DEPENDS=	libopenh264.so:${PORTSDIR}/multimedia/openh264
+OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CONFIGURE_ENABLE=	libopenh264
 
 # openjpeg
-OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 # openssl
@@ -246,28 +246,28 @@ OPENSSL_IMPLIES=	NONFREE
 OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
 
 # opus
-OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_ENABLE=	libopus
 
 # pulseaudio
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
 PULSEAUDIO_CONFIGURE_OFF=	--disable-indev=pulse \
 				--disable-outdev=pulse
 
 # quvi
-QUVI_LIB_DEPENDS=	libquvi.so:${PORTSDIR}/multimedia/libquvi
+QUVI_LIB_DEPENDS=	libquvi.so:multimedia/libquvi
 QUVI_CONFIGURE_ENABLE=	libquvi
 
 # rtcpu
 RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
 
 # rtmp
-RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
+RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 RTMP_CONFIGURE_ENABLE=	librtmp
 
 # schroedinger
-SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
 
 # sdl
@@ -276,16 +276,16 @@ SDL_CONFIGURE_ENABLE=	ffplay
 SDL_CONFIGURE_OFF=	--disable-outdev=sdl
 
 # smbclient
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CONFIGURE_ENABLE=	libsmbclient
 SMB_IMPLIES=		GPL3
 
 # snappy
-SNAPPY_LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
+SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 SNAPPY_CONFIGURE_ENABLE=	libsnappy
 
 # speex
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=	libspeex
 
 # sse support
@@ -294,23 +294,23 @@ SSE_VARS=		FFMPEG_CFLAGS+="-msse"
 SSE_IMPLIES=		MMX
 
 # ssh
-SSH_LIB_DEPENDS=	libssh.so:${PORTSDIR}/security/libssh
+SSH_LIB_DEPENDS=	libssh.so:security/libssh
 SSH_CONFIGURE_ENABLE=	libssh
 
 # theora
-THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
 
 # twolame
-TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 TWOLAME_CONFIGURE_ENABLE=	libtwolame
 
 # vaapi
-VAAPI_LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=	vaapi
 
 # vdpau
-VDPAU_BUILD_DEPENDS=	${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
+VDPAU_BUILD_DEPENDS=	${LOCALBASE}/include/vdpau/vdpau.h:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
 # armv6
@@ -319,34 +319,34 @@ NEON_CONFIGURE_ENABLE=	neon
 NEON_CONFIGURE_ON=	--cpu=armv7-a
 
 # vo-aacenc
-VO_AACENC_LIB_DEPENDS=	libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
+VO_AACENC_LIB_DEPENDS=	libvo-aacenc.so:audio/vo-aacenc
 VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
 VO_AACENC_IMPLIES=	GPL3
 
 # vo-amrwbenc
-VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
+VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:audio/vo-amrwbenc
 VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
 VO_AMRWBENC_IMPLIES=	GPL3
 
 # vid.stab
-VIDSTAB_LIB_DEPENDS=	libvidstab.so:${PORTSDIR}/multimedia/vid.stab
+VIDSTAB_LIB_DEPENDS=	libvidstab.so:multimedia/vid.stab
 VIDSTAB_CONFIGURE_ENABLE=	libvidstab
 
 # vorbis
-VORBIS_LIB_DEPENDS=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbisenc.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	libvorbis
 VORBIS_VARS=		FFMPEG_CFLAGS+="-I${LOCALBASE}/include/vorbis"
 
 # vp8
-VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	libvpx
 
 # wavpack
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_ENABLE=	libwavpack
 
 # webp
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=	libwebp
 
 # x11grab
@@ -354,11 +354,11 @@ X11GRAB_USE=		XORG=x11,xext,xfixes
 X11GRAB_CONFIGURE_ENABLE=	x11grab
 
 # x264
-X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264
+X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=	libx264
 
 # x265
-X265_LIB_DEPENDS=	libx265.so:${PORTSDIR}/multimedia/x265
+X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 X265_CONFIGURE_ENABLE=	libx265
 
 # xcb
@@ -366,7 +366,7 @@ XCB_USE=		XORG=xcb
 XCB_CONFIGURE_ENABLE=	libxcb
 
 # xvid
-XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENABLE=	libxvid
 
 # xv
@@ -374,12 +374,12 @@ XVIDEO_USE=		XORG=xv
 XVIDEO_CONFIGURE_OFF=	--disable-outdev=xv
 
 # zmq
-ZMQ_LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq${ZMQ_VERSION}
+ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq${ZMQ_VERSION}
 ZMQ_CONFIGURE_ENABLE=	libzmq
 ZMQ_VERSION?=		4
 
 # zvbi
-ZVBI_LIB_DEPENDS=	libzvbi.so:${PORTSDIR}/devel/libzvbi
+ZVBI_LIB_DEPENDS=	libzvbi.so:devel/libzvbi
 ZVBI_CONFIGURE_ENABLE=	libzvbi
 
 # License knobs
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
index ae09f9f6d88c..c9ed72617b63 100644
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@@ -17,9 +17,9 @@ LICENSE_COMB=		multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
-		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
-		${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
+BUILD_DEPENDS=	yasm:devel/yasm \
+		${LOCALBASE}/bin/as:devel/binutils \
+		${LOCALBASE}/bin/texi2html:textproc/texi2html
 
 PORTSCOUT=	limit:^0\.7.*
 
@@ -74,14 +74,14 @@ OPTIONS_SUB=		yes
 FFSERVER_DESC=		Build and install ffserver
 X11GRAB_DESC=		Enable x11 grabbing
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
 			--disable-outdev=alsa
 
-CELT_LIB_DEPENDS=	libcelt0.so:${PORTSDIR}/audio/celt
+CELT_LIB_DEPENDS=	libcelt0.so:audio/celt
 CELT_CONFIGURE_ENABLE=	libcelt
 
-DIRAC_LIB_DEPENDS=	libdirac_encoder.so:${PORTSDIR}/multimedia/dirac
+DIRAC_LIB_DEPENDS=	libdirac_encoder.so:multimedia/dirac
 DIRAC_CONFIGURE_ENABLE=	libdirac
 
 DEBUG_CONFIGURE_ON=	--disable-stripping
@@ -89,48 +89,48 @@ DEBUG_CONFIGURE_OFF=	--disable-debug
 
 FFSERVER_CONFIGURE_OFF=	--disable-ffserver
 
-FREETYPE_LIB_DEPENDS=		libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	libfreetype
 
-FREI0R_BUILD_DEPENDS=		${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_BUILD_DEPENDS=		${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=	frei0r
 
-GSM_LIB_DEPENDS=		libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
 GSM_CONFIGURE_ENABLE=		libgsm
 
-LAME_LIB_DEPENDS=		libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=		libmp3lame
 
-OPENCV_LIB_DEPENDS=		libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
+OPENCV_LIB_DEPENDS=		libopencv_imgproc.so:graphics/opencv-core
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
-OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 RTMP_USE=			OPENSSL=yes
 
-SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
 
-SPEEX_LIB_DEPENDS=		libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=		libspeex
 
-THEORA_LIB_DEPENDS=		libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
 
 X11GRAB_USE=		XORG=x11,xext,xfixes
 X11GRAB_CONFIGURE_ON=	--enable-x11grab
 
-X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264
+X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=	libx264
 
-XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENABLE=	libxvid
 
-VDPAU_BUILD_DEPENDS=	${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
+VDPAU_BUILD_DEPENDS=	${LOCALBASE}/include/vdpau/vdpau.h:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
-VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	libvpx
 
 COMPAT_HEADERS=libavcodec/avcodec.h \
@@ -206,7 +206,7 @@ CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
 #aacplus
 .if ${PORT_OPTIONS:MAACPLUS}
 FFMPEG_NONFREE=	yes
-LIB_DEPENDS+=	libaacplus.so:${PORTSDIR}/audio/libaacplus
+LIB_DEPENDS+=	libaacplus.so:audio/libaacplus
 CONFIGURE_ARGS+=	--enable-libaacplus
 .else
 CONFIGURE_ARGS+=	--disable-libaacplus
@@ -215,7 +215,7 @@ CONFIGURE_ARGS+=	--disable-libaacplus
 # Opencore AMR NB
 .if ${PORT_OPTIONS:MAMR_NB}
 FFMPEG_LICENSE_GPL3=	yes
-LIB_DEPENDS+=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+LIB_DEPENDS+=	libopencore-amrnb.so:audio/opencore-amr
 CONFIGURE_ARGS+=	--enable-libopencore-amrnb
 .else
 CONFIGURE_ARGS+=	--disable-libopencore-amrnb
@@ -224,7 +224,7 @@ CONFIGURE_ARGS+=	--disable-libopencore-amrnb
 # Opencore AMR WB
 .if ${PORT_OPTIONS:MAMR_WB}
 FFMPEG_LICENSE_GPL3=	yes
-LIB_DEPENDS+=	libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
+LIB_DEPENDS+=	libopencore-amrwb.so:audio/opencore-amr
 CONFIGURE_ARGS+=	--enable-libopencore-amrwb
 .else
 CONFIGURE_ARGS+=	--disable-libopencore-amrwb
@@ -233,7 +233,7 @@ CONFIGURE_ARGS+=	--disable-libopencore-amrwb
 # faac
 .if ${PORT_OPTIONS:MFAAC}
 FFMPEG_NONFREE=	yes
-LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
+LIB_DEPENDS+=	libfaac.so:audio/faac
 CONFIGURE_ARGS+=	--enable-libfaac
 .else
 CONFIGURE_ARGS+=	--disable-libfaac
@@ -241,7 +241,7 @@ CONFIGURE_ARGS+=	--disable-libfaac
 
 # rtmp
 .if ${PORT_OPTIONS:MRTMP}
-LIB_DEPENDS+=	librtmp.so:${PORTSDIR}/multimedia/librtmp
+LIB_DEPENDS+=	librtmp.so:multimedia/librtmp
 CONFIGURE_ARGS+=	--enable-librtmp
 . if ${OPENSSLBASE} != "/usr"
 FFMPEG_CFLAGS+=		-I${OPENSSLINC}
@@ -263,7 +263,7 @@ CONFIGURE_ARGS+=	--disable-ffplay
 # vaapi
 .if ${PORT_OPTIONS:MVAAPI}
 FFMPEG_LICENSE_GPL3=	yes
-LIB_DEPENDS+=	libva.so:${PORTSDIR}/multimedia/libva
+LIB_DEPENDS+=	libva.so:multimedia/libva
 CONFIGURE_ARGS+=	--enable-vaapi
 .else
 CONFIGURE_ARGS+=	--disable-vaapi
@@ -272,7 +272,7 @@ CONFIGURE_ARGS+=	--disable-vaapi
 # vo-aacenc
 .if ${PORT_OPTIONS:MVO_AACENC}
 FFMPEG_LICENSE_GPL3=	yes
-LIB_DEPENDS+=	libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
+LIB_DEPENDS+=	libvo-aacenc.so:audio/vo-aacenc
 CONFIGURE_ARGS+=	--enable-libvo-aacenc
 .else
 CONFIGURE_ARGS+=	--disable-libvo-aacenc
@@ -281,7 +281,7 @@ CONFIGURE_ARGS+=	--disable-libvo-aacenc
 # vo-amrwbenc
 .if ${PORT_OPTIONS:MVO_AMRWBENC}
 FFMPEG_LICENSE_GPL3=	yes
-LIB_DEPENDS+=	libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
+LIB_DEPENDS+=	libvo-amrwbenc.so:audio/vo-amrwbenc
 CONFIGURE_ARGS+=	--enable-libvo-amrwbenc
 .else
 CONFIGURE_ARGS+=	--disable-libvo-amrwbenc
@@ -289,7 +289,7 @@ CONFIGURE_ARGS+=	--disable-libvo-amrwbenc
 
 # vorbis
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisenc.so:audio/libvorbis
 CONFIGURE_ARGS+=	--enable-libvorbis
 FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
 .else
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
index 3baa0159edd7..47ebd27add3c 100644
--- a/multimedia/ffmpeg2theora/Makefile
+++ b/multimedia/ffmpeg2theora/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Reencode many media file formats to Ogg Theora
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libkate.so:${PORTSDIR}/multimedia/libkate \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libkate.so:multimedia/libkate \
+		libtheora.so:multimedia/libtheora
 
 USES=		iconv pkgconfig scons tar:bzip2
 MAKE_ARGS=	APPEND_CCFLAGS="${CFLAGS} ${CPPFLAGS}" \
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 244713ec458b..1b03d987a4a4 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Lightweight video thumbnailer that can be used by file managers
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libswscale.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libswscale.so:multimedia/ffmpeg
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/multimedia/flvtool++/Makefile b/multimedia/flvtool++/Makefile
index c369c530f116..af5f04f4b5d2 100644
--- a/multimedia/flvtool++/Makefile
+++ b/multimedia/flvtool++/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool for hinting and manipulating the metadata of FLV files
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs
 
 CFLAGS+=	-I${LOCALBASE}/include/boost
 NO_WRKSUBDIR=	yes
diff --git a/multimedia/fpc-dts/Makefile b/multimedia/fpc-dts/Makefile
index 7953675594a2..942e7ac1b044 100644
--- a/multimedia/fpc-dts/Makefile
+++ b/multimedia/fpc-dts/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBDCA
 LIBDCA_DESC=	Install dts library
 OPTIONS_DEFAULT=	LIBDCA
 
-LIBDCA_LIB_DEPENDS=	libdca.so:${PORTSDIR}/multimedia/libdca
+LIBDCA_LIB_DEPENDS=	libdca.so:multimedia/libdca
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/fpc-libvlc/Makefile b/multimedia/fpc-libvlc/Makefile
index 29e3350074c9..10fc7f508349 100644
--- a/multimedia/fpc-libvlc/Makefile
+++ b/multimedia/fpc-libvlc/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	VLC
 VLC_DESC=	Install vlc media player
 OPTIONS_DEFAULT=	VLC
 
-VLC_RUN_DEPENDS=	vlc:${PORTSDIR}/multimedia/vlc
+VLC_RUN_DEPENDS=	vlc:multimedia/vlc
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile
index ce56ad9b4725..6a0b019eab2b 100644
--- a/multimedia/freetuxtv/Makefile
+++ b/multimedia/freetuxtv/Makefile
@@ -11,11 +11,11 @@ COMMENT=	WebTV player based on GTK3+ and LibVLC
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libvlc.so:multimedia/vlc \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libsqlite3.so:databases/sqlite3 \
+		libcurl.so:ftp/curl \
+		libnotify.so:devel/libnotify
 
 USES=		gmake iconv libtool pkgconfig
 USE_GNOME=	gtk30 intltool
@@ -34,7 +34,7 @@ OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 NLS_USES_OFF=	gettext-tools
-NLS_BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+NLS_BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 SUB_FILES=	pkg-message
 
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index 5e36a5b0df09..0c883bc6d1cc 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -12,18 +12,18 @@ COMMENT=	Open source digital jukebox
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
-		mencoder:${PORTSDIR}/multimedia/mencoder \
-		aumix:${PORTSDIR}/audio/aumix \
-		tv_cat:${PORTSDIR}/textproc/p5-xmltv \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_SITELIBDIR}/kaa/__init__.py:${PORTSDIR}/multimedia/py-kaa-base \
-		${PYTHON_SITELIBDIR}/kaa/imlib2/__init__.py:${PORTSDIR}/multimedia/py-kaa-imlib2 \
-		${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:${PORTSDIR}/multimedia/py-kaa-metadata \
-		${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:${PORTSDIR}/math/py-numeric
+RUN_DEPENDS=	mplayer:multimedia/mplayer \
+		mencoder:multimedia/mencoder \
+		aumix:audio/aumix \
+		tv_cat:textproc/p5-xmltv \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:devel/py-zope.interface \
+		${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base \
+		${PYTHON_SITELIBDIR}/kaa/imlib2/__init__.py:multimedia/py-kaa-imlib2 \
+		${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:multimedia/py-kaa-metadata \
+		${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \
+		${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric
 
 FREEVO_USER=	freevo
 FREEVO_GROUP=	${FREEVO_USER}
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 388cca74d8d6..a53a20717205 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -12,8 +12,8 @@ COMMENT=	X11-based TV display and capture application (for use with bt848 driver
 
 ONLY_FOR_ARCHS=	i386 ia64 amd64
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libXaw3d.so:x11-toolkits/Xaw3d
 
 USES=		gmake tar:tgz
 MAKE_ENV=	X11BASE=${LOCALBASE}
@@ -25,10 +25,10 @@ EXTRA_DESC=	Extra programs required to record/playback/save
 
 # This program does not actually require the programs below unless you
 # use audio/video recording and/or playback and save to a non-raw format.
-EXTRA_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
-			mpg123:${PORTSDIR}/audio/mpg123 \
-			mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
-			mplex:${PORTSDIR}/multimedia/mplex
+EXTRA_RUN_DEPENDS=	sox:audio/sox \
+			mpg123:audio/mpg123 \
+			mpeg_encode:multimedia/mpeg_encode \
+			mplex:multimedia/mplex
 
 pre-install:
 	${CP} -p ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man
diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile
index 4efc98e4c7ea..19bbbadda535 100644
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Subtitle editor
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		py*-chardet>=0:${PORTSDIR}/textproc/py-chardet \
-		py*-enchant>=1.5.1:${PORTSDIR}/textproc/py-enchant
+RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		py*-chardet>=0:textproc/py-chardet \
+		py*-enchant>=1.5.1:textproc/py-enchant
 
 USE_GNOME=	pygtk2 intltool
 USE_PYTHON=	distutils
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index 28945467f292..11d26e09608d 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -25,7 +25,7 @@ PORTDOCS=	README
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS PNG DOCS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS PNG
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_OFF=	--disable-libpng
 
 .include <bsd.port.options.mk>
diff --git a/multimedia/gcap/Makefile b/multimedia/gcap/Makefile
index f4d3eae3befa..bb26df7bb42e 100644
--- a/multimedia/gcap/Makefile
+++ b/multimedia/gcap/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Command line tool for downloading Youtube closed captions
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-HTML-Parser>=3.68:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Umph-Prompt>=0:${PORTSDIR}/multimedia/p5-Umph-Prompt \
-		p5-XML-DOM>=1.44:${PORTSDIR}/textproc/p5-XML-DOM
+BUILD_DEPENDS=	p5-Getopt-ArgvFile>=1.11:devel/p5-Getopt-ArgvFile \
+		p5-HTML-Parser>=3.68:www/p5-HTML-Parser \
+		p5-Umph-Prompt>=0:multimedia/p5-Umph-Prompt \
+		p5-XML-DOM>=1.44:textproc/p5-XML-DOM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/multimedia/gcfilms/Makefile b/multimedia/gcfilms/Makefile
index 98c218c73224..4bb9de0c8b80 100644
--- a/multimedia/gcfilms/Makefile
+++ b/multimedia/gcfilms/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	http://download.gna.org/gcfilms/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to manage movie collections
 
-BUILD_DEPENDS=	p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/multimedia/gdialog/Makefile b/multimedia/gdialog/Makefile
index 09e891259aac..38df0454eb38 100644
--- a/multimedia/gdialog/Makefile
+++ b/multimedia/gdialog/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Project X addon to read Siemens Gigaset M740AV video recordings
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	projectx>=0.90.4.00:${PORTSDIR}/multimedia/projectx
-RUN_DEPENDS=	projectx>=0.90.4.00:${PORTSDIR}/multimedia/projectx
+BUILD_DEPENDS=	projectx>=0.90.4.00:multimedia/projectx
+RUN_DEPENDS=	projectx>=0.90.4.00:multimedia/projectx
 
 USES=		zip
 USE_JAVA=	yes
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 8afa7a87b80f..57999ca69845 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnome2 front-end to mplayer/mencoder
 
-BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
-RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
+BUILD_DEPENDS=	mencoder:multimedia/mencoder
+RUN_DEPENDS=	mencoder:multimedia/mencoder
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index b052649632f6..6a318d9cab84 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -12,8 +12,8 @@ COMMENT=	General purpose media decoding library
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libgavl.so:${PORTSDIR}/multimedia/gavl
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/dvb/frontend.h:multimedia/v4l_compat
+LIB_DEPENDS=	libgavl.so:multimedia/gavl
 
 OPTIONS_DEFINE=	A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \
 		MJPEGTOOLS MPEG2 MUSEPACK OPENJPEG OPTIMIZED_CFLAGS PNG \
@@ -36,7 +36,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGMERLIN}
-LIB_DEPENDS+=	libgmerlin.so:${PORTSDIR}/multimedia/gmerlin
+LIB_DEPENDS+=	libgmerlin.so:multimedia/gmerlin
 PLIST_SUB+=	GMERLIN=""
 .else
 CONFIGURE_ARGS+=--disable-gmerlin
@@ -44,68 +44,68 @@ PLIST_SUB+=	GMERLIN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
+LIB_DEPENDS+=	libavcodec0.so:multimedia/ffmpeg0
 .else
 CONFIGURE_ARGS+=--disable-libavcodec --disable-libpostproc --disable-libswscale --disable-libavformat
 .endif
 
 .if ${PORT_OPTIONS:MTHEORA}
-LIB_DEPENDS+=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=	libtheora.so:multimedia/libtheora
 .else
 CONFIGURE_ARGS+=--disable-theoradec
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:audio/speex
 .else
 CONFIGURE_ARGS+=--disable-speex
 .endif
 
 .if ${PORT_OPTIONS:MMJPEGTOOLS}
-LIB_DEPENDS+=	liblavjpeg.so:${PORTSDIR}/multimedia/mjpegtools
+LIB_DEPENDS+=	liblavjpeg.so:multimedia/mjpegtools
 .else
 CONFIGURE_ARGS+=--disable-mjpegtools
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 CONFIGURE_ARGS+=--with-vorbis=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
 .if ${PORT_OPTIONS:MMPEG2}
-LIB_DEPENDS+=	libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
+LIB_DEPENDS+=	libmpeg2.so:multimedia/libmpeg2
 .else
 CONFIGURE_ARGS+=--disable-libmpeg2
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libtiff.so:graphics/tiff
 .else
 CONFIGURE_ARGS+=--disable-libtiff
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS+=	libsmbclient.so:net/samba-libsmbclient
 .else
 CONFIGURE_ARGS+=--disable-samba
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 .else
 CONFIGURE_ARGS+=--disable-libpng
 .endif
 
 .if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:audio/faad
 .else
 CONFIGURE_ARGS+=--disable-faad2
 .endif
 
 .if ${PORT_OPTIONS:MDVDREAD}
-LIB_DEPENDS+=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS+=	libdvdread.so:multimedia/libdvdread
 PLIST_SUB+=	DVDREAD=""
 .else
 CONFIGURE_ARGS+=--disable-dvdread
@@ -113,38 +113,38 @@ PLIST_SUB+=	DVDREAD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:audio/flac
 .else
 CONFIGURE_ARGS+=--disable-flac
 .endif
 
 .if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
+LIB_DEPENDS+=	libmpcdec.so:audio/musepack
 .else
 CONFIGURE_ARGS+=--disable-musepack
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=	libmad.so:audio/libmad
 .else
 CONFIGURE_ARGS+=--disable-mad
 .endif
 
 .if ${PORT_OPTIONS:MA52}
-LIB_DEPENDS+=	liba52.so:${PORTSDIR}/audio/liba52
+LIB_DEPENDS+=	liba52.so:audio/liba52
 .else
 CONFIGURE_ARGS+=--disable-liba52
 .endif
 
 .if ${PORT_OPTIONS:MDCA}
-LIB_DEPENDS+=	libdca.so:${PORTSDIR}/multimedia/libdca
+LIB_DEPENDS+=	libdca.so:multimedia/libdca
 .else
 # error in configure
 CONFIGURE_ARGS+=--disable-libcda --disable-libdca
 .endif
 
 .if ${PORT_OPTIONS:MCDIO}
-LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS+=	libcdio.so:sysutils/libcdio
 PLIST_SUB+=	CDIO=""
 .else
 CONFIGURE_ARGS+=--disable-libcdio
@@ -152,19 +152,19 @@ PLIST_SUB+=	CDIO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENJPEG}
-LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+LIB_DEPENDS+=	libopenjpeg.so:graphics/openjpeg15
 .else
 CONFIGURE_ARGS+=--disable-openjpeg
 .endif
 
 .if ${PORT_OPTIONS:MSCHROEDINGER}
-LIB_DEPENDS+=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+LIB_DEPENDS+=	libschroedinger-1.0.so:multimedia/schroedinger
 .else
 CONFIGURE_ARGS+=--disable-schroedinger
 .endif
 
 .if ${PORT_OPTIONS:MVDPAU}
-LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+LIB_DEPENDS+=	libvdpau.so:multimedia/libvdpau
 .else
 CONFIGURE_ARGS+=	--disable-vdpau
 .endif
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 22db7ca71821..8dc3b3dbc091 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Multimedia framework
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libgavl.so:${PORTSDIR}/multimedia/gavl \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libgavl.so:multimedia/gavl \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		gettext libtool makeinfo pathfix pkgconfig sqlite
 USE_GNOME=	gtk20 libxml2
@@ -41,29 +41,29 @@ OPTIONS_DEFAULT=	CDDB JACK JPEG LIBVISUAL \
 			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF
 OPTIONS_SUB=		yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--disable-alsa --disable-alsamixer
-CDDB_LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
+CDDB_LIB_DEPENDS=	libcddb.so:audio/libcddb
 CDDB_CONFIGURE_OFF=	--disable-cddb
-CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_LIB_DEPENDS=	libcdio.so:sysutils/libcdio
 CDIO_CONFIGURE_OFF=	--disable-libcdio
 CDIO_BROKEN=		fails to build with new libcdio
 ESOUND_USE=		gnome=esound
 ESOUND_CONFIGURE_OFF=	--disable-esd
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-jack
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_OFF=	--disable-libjpeg
-LIBVISUAL_LIB_DEPENDS=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
+LIBVISUAL_LIB_DEPENDS=	libvisual-0.4.so:graphics/libvisual04
 LIBVISUAL_CONFIGURE_OFF=--disable-libvisual
 OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops -fomit-frame-pointer -ffast-math
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_OFF=	--disable-libpng
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=--disable-pulseaudio
-QUICKTIME_LIB_DEPENDS=	libquicktime.so:${PORTSDIR}/multimedia/libquicktime
+QUICKTIME_LIB_DEPENDS=	libquicktime.so:multimedia/libquicktime
 QUICKTIME_CONFIGURE_OFF=--disable-lqt
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_OFF=	--disable-libtiff
 
 post-patch:
diff --git a/multimedia/gmimms/Makefile b/multimedia/gmimms/Makefile
index ff562b33c6ff..e15117c64429 100644
--- a/multimedia/gmimms/Makefile
+++ b/multimedia/gmimms/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Frontend to MiMMS (Multimedia Stream ripper)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	mimms:${PORTSDIR}/multimedia/mimms
+RUN_DEPENDS=	mimms:multimedia/mimms
 
 USES=		pkgconfig tar:bzip2
 USE_GNOME=	gtk20
diff --git a/multimedia/gmtk/Makefile b/multimedia/gmtk/Makefile
index 43d9781fa06b..f8f0bb76e822 100644
--- a/multimedia/gmtk/Makefile
+++ b/multimedia/gmtk/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Library for gnome-mplayer and gecko-mediaplayer
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>0:textproc/p5-XML-Parser
 
 USES=		gettext gmake libtool pathfix perl5 pkgconfig
 USE_XORG=	x11
@@ -27,13 +27,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		ALSA DOCS GIO GTK3 PULSEAUDIO
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_WITH=	alsa
 GIO_DESC=		Use GIO for file I/O
 GIO_CONFIGURE_WITH=	gio
 GTK3_USE=		gnome=gtk30
 GTK3_CONFIGURE_ENABLE=	gtk3
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 
 .include <bsd.port.options.mk>
diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 055730cce2d7..4987adbc9329 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -11,9 +11,9 @@ COMMENT=	GNOME frontend for MPlayer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgmtk.so:${PORTSDIR}/multimedia/gmtk
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libgmtk.so:multimedia/gmtk
+RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 USES=		desktop-file-utils gettext gmake pkgconfig
 USE_XORG=	x11 xscrnsaver
@@ -35,24 +35,24 @@ GLIB_SCHEMAS=	apps.gecko-mediaplayer.preferences.gschema.xml \
 
 OPTIONS_DEFINE=		ALSA BRAINZ3 DOCS GIO GPOD GTK3 NOTIFY PULSEAUDIO
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_RUN_DEPENDS=	alsa-plugins>0:${PORTSDIR}/audio/alsa-plugins
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_RUN_DEPENDS=	alsa-plugins>0:audio/alsa-plugins
 ALSA_CONFIGURE_WITH=	alsa
 BRAINZ3_DESC=		Add support for libmusicbrainz
-BRAINZ3_LIB_DEPENDS=	libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \
-			libcurl.so:${PORTSDIR}/ftp/curl
+BRAINZ3_LIB_DEPENDS=	libmusicbrainz3.so:audio/libmusicbrainz3 \
+			libcurl.so:ftp/curl
 BRAINZ3_CONFIGURE_WITH=	libmusicbrainz3
 GIO_DESC=		Use GIO for file I/O
 GIO_CONFIGURE_WITH=	gio
 GPOD_DESC=		Add support for libgpod
-GPOD_LIB_DEPENDS=	libgpod.so:${PORTSDIR}/audio/libgpod
+GPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod
 GPOD_CONFIGURE_WITH=	libgpod
 GTK3_USE=		gnome=gtk30
 GTK3_CONFIGURE_ENABLE=	gtk3
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-NOTIFY_RUN_DEPENDS=	notification-daemon>0:${PORTSDIR}/deskutils/notification-daemon
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
+NOTIFY_RUN_DEPENDS=	notification-daemon>0:deskutils/notification-daemon
 NOTIFY_CONFIGURE_WITH=	libnotify
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 
 .include <bsd.port.options.mk>
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index 48bcf043e6a9..90f03e0cc4e4 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Subtitle editor with video preview
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
-		libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+LIB_DEPENDS=	libenchant.so:textproc/enchant \
+		libgtkspell.so:textproc/gtkspell
 
 USES=		cpe gmake mono pkgconfig libtool localbase desktop-file-utils
 CPE_VENDOR=	pedro_castro
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index 07993915d1a0..b7d71ce0e970 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -40,13 +40,13 @@ SSL_USE=	OPENSSL=yes
 SSL_CONFIGURE_ENABLE=	ssl
 OPENGL_USE=	GL=gl GL=glu
 OPENGL_CONFIGURE_ENABLE=3d
-XVIDEO_LIB_DEPENDS=	libXv.so:${PORTSDIR}/x11/libXv
+XVIDEO_LIB_DEPENDS=	libXv.so:x11/libXv
 XVIDEO_CONFIGURE_OFF=	--disable-x11-xv --disable-x11-shm
 IPV6_CONFIGURE_ENABLE=	ipv6
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ON=	--use-jpeg=local
 JPEG_CONFIGURE_OFF=	--use-jpeg=no
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ON=	--use-png=local
 PNG_CONFIGURE_OFF=	--use-png=no
 
diff --git a/multimedia/gpac-mp4box/Makefile b/multimedia/gpac-mp4box/Makefile
index 76937a925e45..823f257c46c1 100644
--- a/multimedia/gpac-mp4box/Makefile
+++ b/multimedia/gpac-mp4box/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tool for merge mpg4 from Gpac
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac
+LIB_DEPENDS=	libgpac.so:multimedia/gpac-libgpac
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lgpac
diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index 35b4a62413b1..a01632a49a68 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Media aggregator and podcast client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
-		help2man:${PORTSDIR}/misc/help2man
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}mygpoclient>=1.4:${PORTSDIR}/devel/py-mygpoclient \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}eyed3>=0:${PORTSDIR}/audio/py-eyed3
+BUILD_DEPENDS=	intltool-extract:textproc/intltool \
+		help2man:misc/help2man
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}mygpoclient>=1.4:devel/py-mygpoclient \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}eyed3>=0:audio/py-eyed3
 
 OPTIONS_DEFINE=		GTK2 NOTIFY MUTAGEN OGG2MP3
 OPTIONS_DEFAULT=	GTK2
@@ -26,10 +26,10 @@ OPTIONS_SUB=		yes
 MUTAGEN_DESC=		Allow metadata manipulation
 OGG2MP3_DESC=		Ogg Vorbis conversion to MP3 support
 OPTIONS_EXCLUDE=	NLS
-NOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0:${PORTSDIR}/devel/py-notify
-MUTAGEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen
-OGG2MP3_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-			oggdec:${PORTSDIR}/audio/vorbis-tools
+NOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify
+MUTAGEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen
+OGG2MP3_RUN_DEPENDS=	lame:audio/lame \
+			oggdec:audio/vorbis-tools
 
 ALL_TARGET=	messages
 MAKE_ENV=	GPODDER_MANPATH_NO_SHARE="yes"
@@ -43,8 +43,8 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 PORTDOCS=	PKG-INFO README
 
 GTK2_VARS=	MAKE_ENV+=GPODDER_INSTALL_UIS="cli gtk"
-GTK2_RUN_DEPENDS+=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-			xdg-open:${PORTSDIR}/devel/xdg-utils
+GTK2_RUN_DEPENDS+=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+			xdg-open:devel/xdg-utils
 GTK2_USE=	GNOME=pygtk2
 
 .if empty(GTK2)
diff --git a/multimedia/grake/Makefile b/multimedia/grake/Makefile
index 145aea9b22b3..576741393a66 100644
--- a/multimedia/grake/Makefile
+++ b/multimedia/grake/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Command line tool for scanning webpages for Youtube links
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-Umph-Prompt>=0:${PORTSDIR}/multimedia/p5-Umph-Prompt \
-		p5-libwww>=5.835:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-Umph-Prompt>=0:${PORTSDIR}/multimedia/p5-Umph-Prompt \
-		p5-libwww>=5.835:${PORTSDIR}/www/p5-libwww
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+BUILD_DEPENDS=	p5-Getopt-ArgvFile>=1.11:devel/p5-Getopt-ArgvFile \
+		p5-Umph-Prompt>=0:multimedia/p5-Umph-Prompt \
+		p5-libwww>=5.835:www/p5-libwww
+RUN_DEPENDS=	p5-Getopt-ArgvFile>=1.11:devel/p5-Getopt-ArgvFile \
+		p5-Umph-Prompt>=0:multimedia/p5-Umph-Prompt \
+		p5-libwww>=5.835:www/p5-libwww
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index 40499c389e4f..176bb4cfe437 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -16,7 +16,7 @@ COMMENT=	GStreamer plug-in for manipulating MPEG video streams
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/devel/orc
+LIB_DEPENDS=	liborc-0.4.so:devel/orc
 
 PORTSCOUT=	limit:0\.10\..*
 
@@ -31,11 +31,11 @@ PLIST_SUB=	VERSION="${PORTVERSION:R}"
 OPTIONS_DEFINE=	FFMPEG
 FFMPEG_DESC?=	Use system ffmpeg instead of internal libav
 
-FFMPEG_LIB_DEPENDS=libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
+FFMPEG_LIB_DEPENDS=libavcodec0.so:multimedia/ffmpeg0
 FFMPEG_CONFIGURE_WITH=system-ffmpeg
 
 FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav
-FFMPEG_BUILD_DEPENDS_OFF=yasm:${PORTSDIR}/devel/yasm
+FFMPEG_BUILD_DEPENDS_OFF=yasm:devel/yasm
 FFMPEG_LDFLAGS_OFF=-Wl,-Bsymbolic
 FFMPEG_CONFIGURE_OFF=--with-ffmpeg-extra-configure="${FFMPEG_CONFIG}"
 FFMPEG_CONFIG=	--cc=${CC} \
@@ -65,14 +65,14 @@ FFMPEG_CFLAGS_OFF+=-msse
 .if ${ARCH} == armv6
 CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
 CFLAGS=	-no-integrated-as
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
 .if ! ${PORT_OPTIONS:MFFMPEG}
 .if ${ARCH} == ia64
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
index bb06c94a166a..f4952d3e6f60 100644
--- a/multimedia/gstreamer-plugins-bad/Makefile
+++ b/multimedia/gstreamer-plugins-bad/Makefile
@@ -12,9 +12,9 @@ GST_PLUGIN_SUFFIX=	-bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins \
-		v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
-RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins \
+		v4l_compat>=1.0.20100321:multimedia/v4l_compat
+RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins
 
 gst_bad_DIST=	bad
 BAD_GST_DIRS=	gst-libs sys gst po
diff --git a/multimedia/gstreamer-plugins-buzztard/Makefile b/multimedia/gstreamer-plugins-buzztard/Makefile
index f586f39c62ec..0be92f77574d 100644
--- a/multimedia/gstreamer-plugins-buzztard/Makefile
+++ b/multimedia/gstreamer-plugins-buzztard/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Buzztard gstreamer plugins
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 
 USES=		pathfix libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
index 6ce4b9cc03f2..ca1b69ebeb0a 100644
--- a/multimedia/gstreamer-plugins-good/Makefile
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -12,8 +12,8 @@ GST_PLUGIN_SUFFIX=	-good
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins
+RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins
 
 USE_XORG+=	xdamage
 
diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile
index fc8c26e2b495..b5b410bf7dfa 100644
--- a/multimedia/gstreamer-plugins-ugly/Makefile
+++ b/multimedia/gstreamer-plugins-ugly/Makefile
@@ -12,8 +12,8 @@ GST_PLUGIN_SUFFIX=	-ugly
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins
+RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins
 
 gst_ugly_DIST=	ugly
 UGLY_GST_DIRS=	gst po gst-libs
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index fcb542fb907a..e000894803f4 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -18,11 +18,11 @@ PKGNAMESUFFIX?=	-plugins${GST_PLUGIN_SUFFIX}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	GStreamer written collection of plugins handling several media types
 
-BUILD_DEPENDS+=	v4l_compat>=1.0.20110720:${PORTSDIR}/multimedia/v4l_compat \
-		gstreamer>=0.10.36:${PORTSDIR}/multimedia/gstreamer \
-		orc>=0.4.14:${PORTSDIR}/devel/orc
-LIB_DEPENDS+=	libgstreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer \
-		liborc-0.4.so:${PORTSDIR}/devel/orc
+BUILD_DEPENDS+=	v4l_compat>=1.0.20110720:multimedia/v4l_compat \
+		gstreamer>=0.10.36:multimedia/gstreamer \
+		orc>=0.4.14:devel/orc
+LIB_DEPENDS+=	libgstreamer-0.10.so:multimedia/gstreamer \
+		liborc-0.4.so:devel/orc
 
 PORTSCOUT=	limit:0\.10\..*
 
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 7bbdecfd0afa..feb739df1efe 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -170,27 +170,27 @@ GST_LIB_DIR=		lib/gstreamer-${VERSION}
 PLIST=		${NONEXISTENT}
 
 # a52dec
-gst_a52dec_LIB_DEPENDS+=	liba52.so:${PORTSDIR}/audio/liba52
+gst_a52dec_LIB_DEPENDS+=	liba52.so:audio/liba52
 gst_a52dec_PLIST_FILES=	${GST_LIB_DIR}/libgsta52dec.la \
 		${GST_LIB_DIR}/libgsta52dec.so
 gst_a52dec_DIST=	ugly
 
 # aalib
-gst_aalib_LIB_DEPENDS+=	libaa.so:${PORTSDIR}/graphics/aalib
+gst_aalib_LIB_DEPENDS+=	libaa.so:graphics/aalib
 gst_aalib_PLIST_FILES=	${GST_LIB_DIR}/libgstaasink.so \
 		${GST_LIB_DIR}/libgstaasink.la
 
 # amrnb
-gst_amrnb_BUILD_DEPENDS+=opencore-amr>=0.1.3:${PORTSDIR}/audio/opencore-amr
-gst_amrnb_LIB_DEPENDS+=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+gst_amrnb_BUILD_DEPENDS+=opencore-amr>=0.1.3:audio/opencore-amr
+gst_amrnb_LIB_DEPENDS+=	libopencore-amrnb.so:audio/opencore-amr
 gst_amrnb_PLIST_FILES=	${GST_LIB_DIR}/libgstamrnb.la \
 			${GST_LIB_DIR}/libgstamrnb.so \
 			share/gstreamer-${VERSION}/presets/GstAmrnbEnc.prs
 gst_amrnb_DIST=		ugly
 
 # amrwbdec
-gst_amrwbdec_BUILD_DEPENDS+=	opencore-amr>=0.1.3:${PORTSDIR}/audio/opencore-amr
-gst_amrwbdec_LIB_DEPENDS+=	libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
+gst_amrwbdec_BUILD_DEPENDS+=	opencore-amr>=0.1.3:audio/opencore-amr
+gst_amrwbdec_LIB_DEPENDS+=	libopencore-amrwb.so:audio/opencore-amr
 gst_amrwbdec_CONFIGURE_ARGS+=	--enable-amrwb
 gst_amrwbdec_PLIST_FILES=	${GST_LIB_DIR}/libgstamrwbdec.la \
 				${GST_LIB_DIR}/libgstamrwbdec.so
@@ -212,38 +212,38 @@ gst_cairo_PLIST_FILES=		${GST_LIB_DIR}/libgstcairo.la \
 				${GST_LIB_DIR}/libgstcairo.so
 
 # cdaudio
-gst_cdaudio_LIB_DEPENDS+=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
+gst_cdaudio_LIB_DEPENDS+=	libcdaudio.so:audio/libcdaudio
 gst_cdaudio_PLIST_FILES=	${GST_LIB_DIR}/libgstcdaudio.la \
 		${GST_LIB_DIR}/libgstcdaudio.so
 gst_cdaudio_DIST=	bad
 
 # cdparanoia
-gst_cdparanoia_LIB_DEPENDS+=	libcdda_interface.so:${PORTSDIR}/audio/cdparanoia
+gst_cdparanoia_LIB_DEPENDS+=	libcdda_interface.so:audio/cdparanoia
 gst_cdparanoia_EXTRA_LIBS+=	-lgstcdda-${VERSION}
 gst_cdparanoia_PLIST_FILES=	${GST_LIB_DIR}/libgstcdparanoia.la \
 		${GST_LIB_DIR}/libgstcdparanoia.so
 gst_cdparanoia_DIST=	base
 
 # cdio
-gst_cdio_LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+gst_cdio_LIB_DEPENDS+=	libcdio.so:sysutils/libcdio
 gst_cdio_PLIST_FILES=	${GST_LIB_DIR}/libgstcdio.la \
 		${GST_LIB_DIR}/libgstcdio.so
 gst_cdio_DIST=		ugly
 
 # dts
-gst_dts_LIB_DEPENDS+=	libdca.so:${PORTSDIR}/multimedia/libdca
+gst_dts_LIB_DEPENDS+=	libdca.so:multimedia/libdca
 gst_dts_PLIST_FILES=	${GST_LIB_DIR}/libgstdtsdec.la \
 		${GST_LIB_DIR}/libgstdtsdec.so
 gst_dts_EXTRA_LIBS+=	-ldca
 gst_dts_DIST=	bad
 
 # dv
-gst_dv_LIB_DEPENDS+=	libdv.so:${PORTSDIR}/multimedia/libdv
+gst_dv_LIB_DEPENDS+=	libdv.so:multimedia/libdv
 gst_dv_PLIST_FILES=	${GST_LIB_DIR}/libgstdv.la \
 			${GST_LIB_DIR}/libgstdv.so
 
 # dvd
-gst_dvd_LIB_DEPENDS+=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+gst_dvd_LIB_DEPENDS+=	libdvdread.so:multimedia/libdvdread
 gst_dvd_GST_PLUGIN_DIR=	ext/dvdread
 gst_dvd_PLIST_FILES=	${GST_LIB_DIR}/libgstdvdread.la \
 		${GST_LIB_DIR}/libgstdvdread.so
@@ -260,31 +260,31 @@ gst_esound_PLIST_FILES=	${GST_LIB_DIR}/libgstesd.so \
 
 # exif
 # hmm not a real plugin, seems to be part of metadata?
-#gst_exif_LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
+#gst_exif_LIB_DEPENDS+=	libexif.so:graphics/libexif
 #gst_exif_PLIST_FILES=	${GST_LIB_DIR}/libgstexif.la \
 #			${GST_LIB_DIR}/libgstexif.so
 #gst_exif_DIST=	bad
 
 # faac
-gst_faac_LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
+gst_faac_LIB_DEPENDS+=	libfaac.so:audio/faac
 gst_faac_PLIST_FILES=	${GST_LIB_DIR}/libgstfaac.la \
 	${GST_LIB_DIR}/libgstfaac.so
 gst_faac_DIST=	bad
 
 # faad
 gst_faad_USE_GSTREAMER+=	bad
-gst_faad_LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
+gst_faad_LIB_DEPENDS+=	libfaad.so:audio/faad
 gst_faad_PLIST_FILES=	${GST_LIB_DIR}/libgstfaad.la \
 		${GST_LIB_DIR}/libgstfaad.so
 gst_faad_DIST=	bad
 
 # flac
-gst_flac_LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
+gst_flac_LIB_DEPENDS+=	libFLAC.so:audio/flac
 gst_flac_PLIST_FILES=	${GST_LIB_DIR}/libgstflac.la \
 			${GST_LIB_DIR}/libgstflac.so
 
 # flite
-gst_flite_LIB_DEPENDS+=	libflite.so:${PORTSDIR}/audio/flite
+gst_flite_LIB_DEPENDS+=	libflite.so:audio/flite
 gst_flite_PLIST_FILES=	${GST_LIB_DIR}/libgstflite.la \
 			${GST_LIB_DIR}/libgstflite.so
 gst_flite_DIST=		bad
@@ -311,7 +311,7 @@ gst_gio_PLIST_FILES=	${GST_LIB_DIR}/libgstgio.la \
 gst_gio_DIST=	base
 
 # gme
-gst_gme_LIB_DEPENDS+=   libgme.so:${PORTSDIR}/audio/libgme
+gst_gme_LIB_DEPENDS+=   libgme.so:audio/libgme
 gst_gme_PLIST_FILES=    ${GST_LIB_DIR}/libgstgme.la \
 		${GST_LIB_DIR}/libgstgme.so
 gst_gme_DIST=           bad
@@ -324,18 +324,18 @@ gst_gnomevfs_PLIST_FILES=	${GST_LIB_DIR}/libgstgnomevfs.la \
 gst_gnomevfs_DIST=	base
 
 # gsm
-gst_gsm_LIB_DEPENDS+=	libgsm.so:${PORTSDIR}/audio/gsm
+gst_gsm_LIB_DEPENDS+=	libgsm.so:audio/gsm
 gst_gsm_PLIST_FILES=	${GST_LIB_DIR}/libgstgsm.la \
 		${GST_LIB_DIR}/libgstgsm.so
 gst_gsm_DIST=	bad
 
 # hal
-gst_hal_LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
+gst_hal_LIB_DEPENDS+=	libhal.so:sysutils/hal
 gst_hal_PLIST_FILES=	${GST_LIB_DIR}/libgsthalelements.la \
 		${GST_LIB_DIR}/libgsthalelements.so
 
 # jack
-gst_jack_LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
+gst_jack_LIB_DEPENDS+=	libjack.so:audio/jack
 gst_jack_PLIST_FILES=	${GST_LIB_DIR}/libgstjack.la \
 		${GST_LIB_DIR}/libgstjack.so
 gst_jack_DIST=	good
@@ -346,95 +346,95 @@ gst_jpeg_PLIST_FILES=	${GST_LIB_DIR}/libgstjpeg.la \
 			${GST_LIB_DIR}/libgstjpeg.so
 
 # ladspa
-gst_ladspa_BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-gst_ladspa_LIB_DEPENDS+=	liblrdf.so:${PORTSDIR}/textproc/liblrdf
+gst_ladspa_BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+gst_ladspa_LIB_DEPENDS+=	liblrdf.so:textproc/liblrdf
 gst_ladspa_PLIST_FILES=		${GST_LIB_DIR}/libgstladspa.la \
 				${GST_LIB_DIR}/libgstladspa.so
 gst_ladspa_DIST=	bad
 
 # lame
-gst_lame_LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
+gst_lame_LIB_DEPENDS+=	libmp3lame.so:audio/lame
 gst_lame_PLIST_FILES=	${GST_LIB_DIR}/libgstlame.la \
 		${GST_LIB_DIR}/libgstlame.so
 gst_lame_DIST=	ugly
 
 # libcaca
-gst_libcaca_LIB_DEPENDS+=	libcaca.so:${PORTSDIR}/graphics/libcaca
+gst_libcaca_LIB_DEPENDS+=	libcaca.so:graphics/libcaca
 gst_libcaca_PLIST_FILES=	${GST_LIB_DIR}/libgstcacasink.so \
 		${GST_LIB_DIR}/libgstcacasink.la
 
 # libmms
-gst_libmms_LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
+gst_libmms_LIB_DEPENDS+=	libmms.so:net/libmms
 gst_libmms_PLIST_FILES=	${GST_LIB_DIR}/libgstmms.so \
 		${GST_LIB_DIR}/libgstmms.la
 gst_libmms_DIST=	bad
 
 # libpng and the snapshot plugin
-gst_libpng_LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+gst_libpng_LIB_DEPENDS+=	libpng.so:graphics/png
 gst_libpng_GST_PLUGIN_DIR=	ext/libpng
 gst_libpng_PLIST_FILES=	${GST_LIB_DIR}/libgstpng.so \
 		${GST_LIB_DIR}/libgstpng.la
 
 # libvisual
-gst_libvisual_LIB_DEPENDS+=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
+gst_libvisual_LIB_DEPENDS+=	libvisual-0.4.so:graphics/libvisual04
 gst_libvisual_PLIST_FILES=	${GST_LIB_DIR}/libgstlibvisual.la \
 		${GST_LIB_DIR}/libgstlibvisual.so
 gst_libvisual_DIST=	base
 
 # mad
-gst_mad_LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad \
-			libid3tag.so:${PORTSDIR}/audio/libid3tag
+gst_mad_LIB_DEPENDS+=	libmad.so:audio/libmad \
+			libid3tag.so:audio/libid3tag
 gst_mad_PLIST_FILES=	${GST_LIB_DIR}/libgstmad.la \
 		${GST_LIB_DIR}/libgstmad.so
 gst_mad_DIST=	ugly
 
 # mpeg2enc
-gst_mpeg2enc_LIB_DEPENDS+=	libmjpegutils.so:${PORTSDIR}/multimedia/mjpegtools
+gst_mpeg2enc_LIB_DEPENDS+=	libmjpegutils.so:multimedia/mjpegtools
 gst_mpeg2enc_PLIST_FILES=	${GST_LIB_DIR}/libgstmpeg2enc.la \
 		${GST_LIB_DIR}/libgstmpeg2enc.so
 gst_mpeg2enc_DIST=	bad
 
 # mpeg2dec
-gst_mpeg2dec_LIB_DEPENDS+=	libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
+gst_mpeg2dec_LIB_DEPENDS+=	libmpeg2.so:multimedia/libmpeg2
 gst_mpeg2dec_PLIST_FILES=	${GST_LIB_DIR}/libgstmpeg2dec.la \
 		${GST_LIB_DIR}/libgstmpeg2dec.so
 gst_mpeg2dec_DIST=	ugly
 
 # musepack
-gst_musepack_LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
+gst_musepack_LIB_DEPENDS+=	libmpcdec.so:audio/musepack
 gst_musepack_PLIST_FILES=	${GST_LIB_DIR}/libgstmusepack.la \
 		${GST_LIB_DIR}/libgstmusepack.so
 gst_musepack_DIST=	bad
 
 # nas
-gst_nas_LIB_DEPENDS+=	libaudio.so:${PORTSDIR}/audio/nas
+gst_nas_LIB_DEPENDS+=	libaudio.so:audio/nas
 gst_nas_DIST=	bad
 gst_nas_PLIST_FILES=	${GST_LIB_DIR}/libgstnassink.la \
 		${GST_LIB_DIR}/libgstnassink.so
 
 # neon
-gst_neon_LIB_DEPENDS+=	libneon.so:${PORTSDIR}/www/neon
+gst_neon_LIB_DEPENDS+=	libneon.so:www/neon
 gst_neon_CONFIGURE_ENV+=	NEON_CFLAGS="-I${LOCALBASE}/include/neon"
 gst_neon_PLIST_FILES=	${GST_LIB_DIR}/libgstneonhttpsrc.la \
 			${GST_LIB_DIR}/libgstneonhttpsrc.so
 gst_neon_DIST=		bad
 
 # ogg
-gst_ogg_LIB_DEPENDS+=	libogg.so:${PORTSDIR}/audio/libogg
+gst_ogg_LIB_DEPENDS+=	libogg.so:audio/libogg
 gst_ogg_EXTRA_LIBS+=	-lgstriff-${VERSION}
 gst_ogg_PLIST_FILES=	${GST_LIB_DIR}/libgstogg.la \
 		${GST_LIB_DIR}/libgstogg.so
 gst_ogg_DIST=	base
 
 # opencv
-gst_opencv_LIB_DEPENDS+=libopencv_highgui.so:${PORTSDIR}/graphics/opencv
+gst_opencv_LIB_DEPENDS+=libopencv_highgui.so:graphics/opencv
 gst_opencv_CONFIGURE_ENV+=	OPENCV_CFLAGS="-I${LOCALBASE}/include/opencv"
 gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.la \
 			${GST_LIB_DIR}/libgstopencv.so
 gst_opencv_DIST=	bad
 
 # opus
-gst_opus_LIB_DEPENDS+=	libopus.so:${PORTSDIR}/audio/opus
+gst_opus_LIB_DEPENDS+=	libopus.so:audio/opus
 gst_opus_PLIST_FILES=	${GST_LIB_DIR}/libgstopus.la \
 			${GST_LIB_DIR}/libgstopus.so
 gst_opus_DIST=		bad
@@ -446,14 +446,14 @@ gst_pango_PLIST_FILES=	${GST_LIB_DIR}/libgstpango.la \
 gst_pango_DIST=	base
 
 # pulse
-gst_pulse_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+gst_pulse_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 gst_pulse_PLIST_FILES=	${GST_LIB_DIR}/libgstpulse.la \
 		${GST_LIB_DIR}/libgstpulse.so
 gst_pulse_DIST=	good
 
 # resindvd
-gst_resindvd_BUILD_DEPENDS+=	libdvdnav>=4.1.2:${PORTSDIR}/multimedia/libdvdnav
-gst_resindvd_RUN_DEPENDS+=	libdvdnav>=4.1.2:${PORTSDIR}/multimedia/libdvdnav
+gst_resindvd_BUILD_DEPENDS+=	libdvdnav>=4.1.2:multimedia/libdvdnav
+gst_resindvd_RUN_DEPENDS+=	libdvdnav>=4.1.2:multimedia/libdvdnav
 gst_resindvd_PLIST_FILES=	${GST_LIB_DIR}/libresindvd.la \
 				${GST_LIB_DIR}/libresindvd.so
 gst_resindvd_DIST=		bad
@@ -465,77 +465,77 @@ gst_sdl_PLIST_FILES=	${GST_LIB_DIR}/libgstsdl.la \
 gst_sdl_DIST=	bad
 
 # shout2
-gst_shout2_LIB_DEPENDS+=	libshout.so:${PORTSDIR}/audio/libshout
+gst_shout2_LIB_DEPENDS+=	libshout.so:audio/libshout
 gst_shout2_PLIST_FILES=		${GST_LIB_DIR}/libgstshout2.la \
 				${GST_LIB_DIR}/libgstshout2.so
 
 # sidplay
-gst_sidplay_LIB_DEPENDS+=	libsidplay.so:${PORTSDIR}/audio/libsidplay
+gst_sidplay_LIB_DEPENDS+=	libsidplay.so:audio/libsidplay
 gst_sidplay_PLIST_FILES=	${GST_LIB_DIR}/libgstsid.so \
 		${GST_LIB_DIR}/libgstsid.la
 gst_sidplay_DIST=	ugly
 
 # sndfile
-gst_sndfile_LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+gst_sndfile_LIB_DEPENDS+=	libsndfile.so:audio/libsndfile
 gst_sndfile_PLIST_FILES=	${GST_LIB_DIR}/libgstsndfile.la \
 		${GST_LIB_DIR}/libgstsndfile.so
 gst_sndfile_DIST=	bad
 
 # soundtouch
-gst_soundtouch_LIB_DEPENDS+=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
+gst_soundtouch_LIB_DEPENDS+=	libSoundTouch.so:audio/soundtouch
 gst_soundtouch_PLIST_FILES=	${GST_LIB_DIR}/libgstsoundtouch.la \
 		${GST_LIB_DIR}/libgstsoundtouch.so
 gst_soundtouch_DIST=	bad
 
 # souphttpsrc
-gst_soup_LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+gst_soup_LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 gst_soup_GST_PLUGIN_DIR=ext/soup
 gst_soup_PLIST_FILES=	${GST_LIB_DIR}/libgstsouphttpsrc.la \
 			${GST_LIB_DIR}/libgstsouphttpsrc.so
 
 # spc
-gst_spc_LIB_DEPENDS+=	libopenspc.so:${PORTSDIR}/audio/libopenspc
+gst_spc_LIB_DEPENDS+=	libopenspc.so:audio/libopenspc
 gst_spc_PLIST_FILES=	${GST_LIB_DIR}/libgstspc.la \
 		${GST_LIB_DIR}/libgstspc.so
 gst_spc_DIST=		bad
 
 # speex
-gst_speex_LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
+gst_speex_LIB_DEPENDS+=	libspeex.so:audio/speex
 gst_speex_PLIST_FILES=	${GST_LIB_DIR}/libgstspeex.la \
 			${GST_LIB_DIR}/libgstspeex.so
 
 # schro(edinger)
-gst_schroedinger_LIB_DEPENDS+=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+gst_schroedinger_LIB_DEPENDS+=	libschroedinger-1.0.so:multimedia/schroedinger
 gst_schroedinger_CONFIGURE_ARGS+=--enable-schro
 gst_schroedinger_PLIST_FILES=	${GST_LIB_DIR}/libgstschro.la \
 				${GST_LIB_DIR}/libgstschro.so
 gst_schroedinger_DIST=		bad
 
 # swfdec
-gst_swfdec_LIB_DEPENDS+=libswfdec-0.4.so:${PORTSDIR}/graphics/swfdec
+gst_swfdec_LIB_DEPENDS+=libswfdec-0.4.so:graphics/swfdec
 gst_swfdec_DIST=	bad
 
 # taglib
-gst_taglib_LIB_DEPENDS+=	libtag.so:${PORTSDIR}/audio/taglib
+gst_taglib_LIB_DEPENDS+=	libtag.so:audio/taglib
 gst_taglib_PLIST_FILES=		${GST_LIB_DIR}/libgsttaglib.la \
 				${GST_LIB_DIR}/libgsttaglib.so
 
 # theora
-gst_theora_LIB_DEPENDS+=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+gst_theora_LIB_DEPENDS+=	libtheora.so:multimedia/libtheora
 gst_theora_PLIST_FILES=		${GST_LIB_DIR}/libgsttheora.la \
 		${GST_LIB_DIR}/libgsttheora.so
 gst_theora_DIST=	base
 
 # twolame
-gst_twolame_LIB_DEPENDS+=	libtwolame.so:${PORTSDIR}/audio/twolame
+gst_twolame_LIB_DEPENDS+=	libtwolame.so:audio/twolame
 gst_twolame_PLIST_FILES=	${GST_LIB_DIR}/libgsttwolame.la \
 				${GST_LIB_DIR}/libgsttwolame.so
 gst_twolame_DIST=		ugly
 
 # gst_v4l2
-gst_gst_v4l2_LIB_DEPENDS+=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+gst_gst_v4l2_LIB_DEPENDS+=	libv4l2.so:multimedia/libv4l
 .if ${OPSYS} == FreeBSD
-gst_gst_v4l2_RUN_DEPENDS+=	webcamd:${PORTSDIR}/multimedia/webcamd
+gst_gst_v4l2_RUN_DEPENDS+=	webcamd:multimedia/webcamd
 .endif
 gst_gst_v4l2_PLIST_FILES=	${GST_LIB_DIR}/libgstvideo4linux2.la \
 		${GST_LIB_DIR}/libgstvideo4linux2.so
@@ -544,7 +544,7 @@ gst_gst_v4l2_GST_PLUGIN_DIR=sys/v4l2
 gst_gst_v4l2_DIST=	good
 
 # vdpau
-gst_vdpau_LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+gst_vdpau_LIB_DEPENDS+=	libvdpau.so:multimedia/libvdpau
 gst_vdpau_GST_PLUGIN_DIR=sys/vdpau
 gst_vdpau_PLIST_FILES=	${GST_INC_DIR}/gst/vdpau/gstvdp.h \
 			${GST_INC_DIR}/gst/vdpau/gstvdpbuffer.h \
@@ -569,34 +569,34 @@ gst_vdpau_DIST=		bad
 
 # vorbis
 gst_vorbis_USE_GSTREAMER+=	ogg
-gst_vorbis_LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+gst_vorbis_LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 gst_vorbis_EXTRA_LIBS+=	-lgsttag-${VERSION} -lgstaudio-${VERSION}
 gst_vorbis_PLIST_FILES=	${GST_LIB_DIR}/libgstvorbis.la \
 		${GST_LIB_DIR}/libgstvorbis.so
 gst_vorbis_DIST=	base
 
 # vp8
-gst_vp8_BUILD_DEPENDS+=	libvpx>=1.1.0:${PORTSDIR}/multimedia/libvpx
-gst_vp8_LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+gst_vp8_BUILD_DEPENDS+=	libvpx>=1.1.0:multimedia/libvpx
+gst_vp8_LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
 gst_vp8_PLIST_FILES=	${GST_LIB_DIR}/libgstvp8.la \
 			${GST_LIB_DIR}/libgstvp8.so
 gst_vp8_DIST=		bad
 
 # x264
-gst_x264_LIB_DEPENDS+=	libx264.so:${PORTSDIR}/multimedia/libx264
+gst_x264_LIB_DEPENDS+=	libx264.so:multimedia/libx264
 gst_x264_PLIST_FILES=	${GST_LIB_DIR}/libgstx264.la \
 		${GST_LIB_DIR}/libgstx264.so \
 		share/gstreamer-${VERSION}/presets/GstX264Enc.prs
 gst_x264_DIST=	ugly
 
 # xvid
-gst_xvid_LIB_DEPENDS+=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
+gst_xvid_LIB_DEPENDS+=	libxvidcore.so:multimedia/xvid
 gst_xvid_PLIST_FILES=	${GST_LIB_DIR}/libgstxvid.la \
 		${GST_LIB_DIR}/libgstxvid.so
 gst_xvid_DIST=	bad
 
 # wavpack
-gst_wavpack_LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
+gst_wavpack_LIB_DEPENDS+=	libwavpack.so:audio/wavpack
 gst_wavpack_PLIST_FILES=	${GST_LIB_DIR}/libgstwavpack.la \
 				${GST_LIB_DIR}/libgstwavpack.so
 
diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile
index 915c15c82b49..f7d29725d7a8 100644
--- a/multimedia/gstreamer-qt4/Makefile
+++ b/multimedia/gstreamer-qt4/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Qt4 bindings for GStreamer multimedia library
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		bison cmake gmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 01db35b56737..6eaeb13667f8 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -36,7 +36,7 @@ OPTIONS_DEFINE=	LIBCHECK NLS
 OPTIONS_SUB=	yes
 LIBCHECK_DESC=	Unit tests support
 
-LIBCHECK_LIB_DEPENDS=	libcheck.so:${PORTSDIR}/devel/libcheck
+LIBCHECK_LIB_DEPENDS=	libcheck.so:devel/libcheck
 LIBCHECK_CONFIGURE_OFF=	--disable-check
 
 NLS_USES=	gettext
@@ -51,7 +51,7 @@ USE_GCC=	any
 .endif
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CONFIGURE_ENV+=	FLEX_PATH="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/multimedia/gstreamer1-editing-services/Makefile b/multimedia/gstreamer1-editing-services/Makefile
index 05de89f81383..2c96ab965cd3 100644
--- a/multimedia/gstreamer1-editing-services/Makefile
+++ b/multimedia/gstreamer1-editing-services/Makefile
@@ -26,7 +26,7 @@ PLIST_SUB=	VERSION=1.0 SOVERSION=0.800.0
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CONFIGURE_ENV+=	FLEX_PATH="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/multimedia/gstreamer1-libav/Makefile b/multimedia/gstreamer1-libav/Makefile
index ebfd6845de14..5d3f4a048230 100644
--- a/multimedia/gstreamer1-libav/Makefile
+++ b/multimedia/gstreamer1-libav/Makefile
@@ -13,9 +13,9 @@ COMMENT=	GStreamer plug-in with many audio/video decoders/encoders
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	orc>=0.4.16:${PORTSDIR}/devel/orc
-LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/devel/orc \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+BUILD_DEPENDS=	orc>=0.4.16:devel/orc
+LIB_DEPENDS=	liborc-0.4.so:devel/orc \
+		libavcodec.so:multimedia/ffmpeg
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/multimedia/gstreamer1-plugins-bad/Makefile b/multimedia/gstreamer1-plugins-bad/Makefile
index c4840ec289e3..00ba03e99ae6 100644
--- a/multimedia/gstreamer1-plugins-bad/Makefile
+++ b/multimedia/gstreamer1-plugins-bad/Makefile
@@ -11,9 +11,9 @@ GST_PLUGIN_SUFFIX=	-bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins \
-		v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
-RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MININAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
+BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:multimedia/gstreamer1-plugins \
+		v4l_compat>=1.0.20100321:multimedia/v4l_compat
+RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MININAL_VERSION}:multimedia/gstreamer1-plugins
 
 DIST=		bad
 BAD_GST_DIRS=	gst-libs sys gst po pkgconfig
diff --git a/multimedia/gstreamer1-plugins-good/Makefile b/multimedia/gstreamer1-plugins-good/Makefile
index aba16fee35df..a1b1d498fdaa 100644
--- a/multimedia/gstreamer1-plugins-good/Makefile
+++ b/multimedia/gstreamer1-plugins-good/Makefile
@@ -11,8 +11,8 @@ GST_PLUGIN_SUFFIX=	-good
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
-RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
+BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:multimedia/gstreamer1-plugins
+RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:multimedia/gstreamer1-plugins
 
 DIST=	good
 GOOD_GST_DIRS=	gst sys po
diff --git a/multimedia/gstreamer1-plugins-ugly/Makefile b/multimedia/gstreamer1-plugins-ugly/Makefile
index e68981b6a357..7de2d0098f4c 100644
--- a/multimedia/gstreamer1-plugins-ugly/Makefile
+++ b/multimedia/gstreamer1-plugins-ugly/Makefile
@@ -11,8 +11,8 @@ GST_PLUGIN_SUFFIX=	-ugly
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
-RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
+BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:multimedia/gstreamer1-plugins
+RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:multimedia/gstreamer1-plugins
 
 DIST=	ugly
 UGLY_GST_DIRS=	gst po gst-libs
diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile
index 8c54dac84b83..6ccb211ebd22 100644
--- a/multimedia/gstreamer1-plugins/Makefile
+++ b/multimedia/gstreamer1-plugins/Makefile
@@ -16,13 +16,13 @@ PKGNAMESUFFIX?=	1-plugins${GST_PLUGIN_SUFFIX}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	GStreamer written collection of plugins handling several media types
 
-BUILD_DEPENDS+=	gstreamer1>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1 \
-		iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		orc>=0.4.16:${PORTSDIR}/devel/orc
-LIB_DEPENDS+=	libgstreamer-1.0.so:${PORTSDIR}/multimedia/gstreamer1 \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		liborc-0.4.so:${PORTSDIR}/devel/orc
-RUN_DEPENDS+=	iso-codes>=0:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS+=	gstreamer1>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:multimedia/gstreamer1 \
+		iso-codes>=0:misc/iso-codes \
+		orc>=0.4.16:devel/orc
+LIB_DEPENDS+=	libgstreamer-1.0.so:multimedia/gstreamer1 \
+		libfreetype.so:print/freetype2 \
+		liborc-0.4.so:devel/orc
+RUN_DEPENDS+=	iso-codes>=0:misc/iso-codes
 
 PORTSCOUT=	limitw:1,even
 
@@ -71,8 +71,8 @@ PLIST_SUB+=	VERSION="${VERSION}" \
 DIST=	base
 NO_GSTREAMER_COMMON=	yes
 .else
-BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
-RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
+BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:multimedia/gstreamer1-plugins
+RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:multimedia/gstreamer1-plugins
 .endif
 
 .if ${DIST} == base || ${DIST} == ugly
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index e8b3d063787f..95a40c3520ae 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -199,69 +199,69 @@ PLIST?=		${NONEXISTENT}
 # ------- plugins ---------
 
 # a52dec
-gst_a52dec_LIB_DEPENDS=	liba52.so:${PORTSDIR}/audio/liba52
+gst_a52dec_LIB_DEPENDS=	liba52.so:audio/liba52
 
 # aalib
-gst_aalib_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+gst_aalib_LIB_DEPENDS=	libaa.so:graphics/aalib
 gst_aalib_PLIST_FILES=	${GST_LIB_DIR}/libgstaasink.so
 
 # amrnb
-gst_amrnb_LIB_DEPENDS=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+gst_amrnb_LIB_DEPENDS=	libopencore-amrnb.so:audio/opencore-amr
 gst_amrnb_PLIST_FILES=	${GST_LIB_DIR}/libgstamrnb.so \
 			share/gstreamer-${VERSION}/presets/GstAmrnbEnc.prs
 
 # amrwb
-gst_amrwb_LIB_DEPENDS=	libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
+gst_amrwb_LIB_DEPENDS=	libopencore-amrwb.so:audio/opencore-amr
 gst_amrwb_GST_PLUGIN_DIR=	ext/amrwbdec
 gst_amrwb_PLIST_FILES=	${GST_LIB_DIR}/libgstamrwbdec.so
 
 # assrender
-gst_assrender_LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass
+gst_assrender_LIB_DEPENDS=	libass.so:multimedia/libass
 
 # bs2b
-gst_bs2b_LIB_DEPENDS=	libbs2b.so:${PORTSDIR}/audio/libbs2b
+gst_bs2b_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 
 # cairo
 gst_cairo_USE_GNOME=	cairo
 
 # cdparanoia
-gst_cdparanoia_LIB_DEPENDS=	libcdda_interface.so:${PORTSDIR}/audio/cdparanoia
+gst_cdparanoia_LIB_DEPENDS=	libcdda_interface.so:audio/cdparanoia
 
 # cdio
-gst_cdio_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+gst_cdio_LIB_DEPENDS=	libcdio.so:sysutils/libcdio
 
 # chromaprint
-gst_chromaprint_LIB_DEPENDS=	libchromaprint.so:${PORTSDIR}/audio/chromaprint
+gst_chromaprint_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
 
 # curl
-gst_curl_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+gst_curl_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 # dtls
 gst_dtls_USES=		compiler:c11
 
 # dts
-gst_dts_LIB_DEPENDS=	libdca.so:${PORTSDIR}/multimedia/libdca
+gst_dts_LIB_DEPENDS=	libdca.so:multimedia/libdca
 gst_dts_PLIST_FILES=	${GST_LIB_DIR}/libgstdtsdec.so
 
 # libdv
-gst_libdv_LIB_DEPENDS=		libdv.so:${PORTSDIR}/multimedia/libdv
+gst_libdv_LIB_DEPENDS=		libdv.so:multimedia/libdv
 gst_libdv_GST_PLUGIN_DIR=	ext/dv
 gst_libdv_PLIST_FILES=		${GST_LIB_DIR}/libgstdv.so
 
 # dvdread
-gst_dvdread_LIB_DEPENDS=libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+gst_dvdread_LIB_DEPENDS=libdvdread.so:multimedia/libdvdread
 
 # faac
-gst_faac_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
+gst_faac_LIB_DEPENDS=	libfaac.so:audio/faac
 
 # faad
-gst_faad_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+gst_faad_LIB_DEPENDS=	libfaad.so:audio/faad
 
 # flac
-gst_flac_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+gst_flac_LIB_DEPENDS=	libFLAC.so:audio/flac
 
 # flite
-gst_flite_LIB_DEPENDS=	libflite.so:${PORTSDIR}/audio/flite
+gst_flite_LIB_DEPENDS=	libflite.so:audio/flite
 
 # gdk_pixbuf
 gst_gdk_pixbuf_USE_GNOME=	gdkpixbuf2
@@ -276,158 +276,158 @@ gst_gl_CONFIGURE_ARGS=	--enable-gl --enable-glx \
 gst_gl_PLIST_FILES=		#
 
 # gme
-gst_gme_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+gst_gme_LIB_DEPENDS=	libgme.so:audio/libgme
 
 # gsm
-gst_gsm_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+gst_gsm_LIB_DEPENDS=	libgsm.so:audio/gsm
 
 # gtksink
 gst_gtksink_USE_GNOME=	gtk30
 gst_gtksink_GST_PLUGIN_DIR=ext/gtk
 
 # hls
-gst_hls_LIB_DEPENDS=	libnettle.so:${PORTSDIR}/security/nettle
+gst_hls_LIB_DEPENDS=	libnettle.so:security/nettle
 
 # jack
-gst_jack_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+gst_jack_LIB_DEPENDS=	libjack.so:audio/jack
 
 # jpeg
 gst_jpeg_USES=		jpeg
 
 # kate
-gst_kate_LIB_DEPENDS=	libkate.so:${PORTSDIR}/multimedia/libkate
+gst_kate_LIB_DEPENDS=	libkate.so:multimedia/libkate
 
 # lame
-gst_lame_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+gst_lame_LIB_DEPENDS=	libmp3lame.so:audio/lame
 
 # libcaca
-gst_libcaca_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
+gst_libcaca_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 gst_libcaca_PLIST_FILES=	${GST_LIB_DIR}/libgstcacasink.so
 
 # libde265
-gst_libde265_LIB_DEPENDS=	libde265.so:${PORTSDIR}/multimedia/libde265
+gst_libde265_LIB_DEPENDS=	libde265.so:multimedia/libde265
 
 # libmms
-gst_libmms_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+gst_libmms_LIB_DEPENDS=	libmms.so:net/libmms
 gst_libmms_PLIST_FILES=	${GST_LIB_DIR}/libgstmms.so
 
 # png
-gst_libpng_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+gst_libpng_LIB_DEPENDS=	libpng.so:graphics/png
 gst_libpng_PLIST_FILES=	${GST_LIB_DIR}/libgstpng.so
 
 # libvisual
-gst_libvisual_LIB_DEPENDS=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
+gst_libvisual_LIB_DEPENDS=	libvisual-0.4.so:graphics/libvisual04
 
 # mad
-gst_mad_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+gst_mad_LIB_DEPENDS=	libmad.so:audio/libmad
 
 # modplug
-gst_modplug_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+gst_modplug_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 
 # mpeg2enc
-gst_mpeg2enc_LIB_DEPENDS=	libmjpegutils.so:${PORTSDIR}/multimedia/mjpegtools
+gst_mpeg2enc_LIB_DEPENDS=	libmjpegutils.so:multimedia/mjpegtools
 
 # mpeg2dec
-gst_mpeg2dec_LIB_DEPENDS=	libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
+gst_mpeg2dec_LIB_DEPENDS=	libmpeg2.so:multimedia/libmpeg2
 
 # mpg123
-gst_mpg123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+gst_mpg123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 
 # neon
-gst_neon_LIB_DEPENDS+=  libneon.so:${PORTSDIR}/www/neon
+gst_neon_LIB_DEPENDS+=  libneon.so:www/neon
 gst_neon_PLIST_FILES=	${GST_LIB_DIR}/libgstneonhttpsrc.so
 
 # ogg
-gst_ogg_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+gst_ogg_LIB_DEPENDS=	libogg.so:audio/libogg
 
 # opencv
-gst_opencv_LIB_DEPENDS=	libopencv_highgui.so:${PORTSDIR}/graphics/opencv
+gst_opencv_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv
 gst_opencv_PLIST_FILES=	${GST_LIB_DIR}/libgstopencv.so \
 			share/gst-plugins-bad/${VERSION}/opencv_haarcascades/fist.xml \
 			share/gst-plugins-bad/${VERSION}/opencv_haarcascades/palm.xml
 gst_opencv_USES=	compiler:c++11-lib
 
 # openjpeg
-gst_openjpeg_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+gst_openjpeg_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
 
 # openh264
-gst_openh264_LIB_DEPENDS=	libopenh264.so:${PORTSDIR}/multimedia/openh264
+gst_openh264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 
 # opus
-gst_opus_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+gst_opus_LIB_DEPENDS=	libopus.so:audio/opus
 
 # pango
 gst_pango_USE_GNOME=	pango
 
 # pulse
-gst_pulse_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+gst_pulse_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 # resindvd
-gst_resindvd_BUILD_DEPENDS=	libdvdnav>=4.1.2:${PORTSDIR}/multimedia/libdvdnav
-gst_resindvd_RUN_DEPENDS=	libdvdnav>=4.1.2:${PORTSDIR}/multimedia/libdvdnav
+gst_resindvd_BUILD_DEPENDS=	libdvdnav>=4.1.2:multimedia/libdvdnav
+gst_resindvd_RUN_DEPENDS=	libdvdnav>=4.1.2:multimedia/libdvdnav
 
 # rtmp xxx
-gst_rtmp_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
+gst_rtmp_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 
 # rsvg
 gst_rsvg_USE_GNOME=	librsvg2
 
 # shout2
-gst_shout2_LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout
+gst_shout2_LIB_DEPENDS=	libshout.so:audio/libshout
 
 # sidplay
-gst_sidplay_LIB_DEPENDS=	libsidplay.so:${PORTSDIR}/audio/libsidplay
+gst_sidplay_LIB_DEPENDS=	libsidplay.so:audio/libsidplay
 gst_sidplay_PLIST_FILES=	${GST_LIB_DIR}/libgstsid.so
 
 # soundtouch
-gst_soundtouch_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
+gst_soundtouch_LIB_DEPENDS=	libSoundTouch.so:audio/soundtouch
 
 # souphttpsrc
-gst_soup_LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+gst_soup_LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 gst_soup_GST_PLUGIN_DIR=ext/soup
 gst_soup_PLIST_FILES=	${GST_LIB_DIR}/libgstsouphttpsrc.so
 
 # spandsp
-gst_spandsp_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
+gst_spandsp_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 
 # speex
-gst_speex_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+gst_speex_LIB_DEPENDS=	libspeex.so:audio/speex
 
 # schroedinger or schro for short
-gst_schro_LIB_DEPENDS=		libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+gst_schro_LIB_DEPENDS=		libschroedinger-1.0.so:multimedia/schroedinger
 gst_schro_GST_PLUGIN_DIR=	ext/schroedinger
 
 # taglib
-gst_taglib_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+gst_taglib_LIB_DEPENDS=	libtag.so:audio/taglib
 
 # theora
-gst_theora_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+gst_theora_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 
 # twolame
-gst_twolame_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
+gst_twolame_LIB_DEPENDS=	libtwolame.so:audio/twolame
 
 # gst_v4l2
-gst_gst_v4l2_BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
-gst_gst_v4l2_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
-gst_gst_v4l2_RUN_DEPENDS=	webcamd:${PORTSDIR}/multimedia/webcamd
+gst_gst_v4l2_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
+gst_gst_v4l2_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
+gst_gst_v4l2_RUN_DEPENDS=	webcamd:multimedia/webcamd
 gst_gst_v4l2_PLIST_FILES=	${GST_LIB_DIR}/libgstvideo4linux2.so
 gst_gst_v4l2_GST_PLUGIN_DIR=	sys/v4l2
 
 # vorbis
 gst_vorbis_USE_GSTREAMER1=	ogg
-gst_vorbis_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+gst_vorbis_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 # vpx
-gst_vpx_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+gst_vpx_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 gst_vpx_PLIST_FILES=	${GST_LIB_DIR}/libgstvpx.so \
 			share/gstreamer-${VERSION}/presets/GstVP8Enc.prs
 
 # vdpau
-gst_vdpau_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+gst_vdpau_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 gst_vdpau_GST_PLUGIN_DIR=	sys/vdpau
 
 # webp
-gst_webp_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+gst_webp_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 # X ximage and xvimage sinks aka output
 .if ${DIST} == base
@@ -447,21 +447,21 @@ gst_x_PLIST_FILES=	${GST_LIB_DIR}/libgstximagesrc.so
 .endif
 
 # x264
-gst_x264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264
+gst_x264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 gst_x264_PLIST_FILES=	${GST_LIB_DIR}/libgstx264.so \
 			share/gstreamer-${VERSION}/presets/GstX264Enc.prs
 
 # x265
-gst_x265_LIB_DEPENDS=	libx265.so:${PORTSDIR}/multimedia/x265
+gst_x265_LIB_DEPENDS=	libx265.so:multimedia/x265
 
 # xvid
-gst_xvid_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
+gst_xvid_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
 
 # wavpack
-gst_wavpack_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+gst_wavpack_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 
 # zbar
-gst_zbar_LIB_DEPENDS=	libzbar.so:${PORTSDIR}/graphics/zbar
+gst_zbar_LIB_DEPENDS=	libzbar.so:graphics/zbar
 
 .endif # NO_GSTREAMER_COMMON
 
diff --git a/multimedia/gstreamer1-qt4/Makefile b/multimedia/gstreamer1-qt4/Makefile
index 45d04da8e548..cb3c4c0b8bc8 100644
--- a/multimedia/gstreamer1-qt4/Makefile
+++ b/multimedia/gstreamer1-qt4/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	qt-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4 bindings for GStreamer 1.x multimedia library
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 CONFLICTS_INSTALL=	gstreamer-qt4-*
 
diff --git a/multimedia/gstreamer1-vaapi/Makefile b/multimedia/gstreamer1-vaapi/Makefile
index 3aee68c2f4af..088e0d12f8f1 100644
--- a/multimedia/gstreamer1-vaapi/Makefile
+++ b/multimedia/gstreamer1-vaapi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GStreamer hardware video decoding via VA-API plug-in
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
+LIB_DEPENDS=	libva.so:multimedia/libva
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-wayland \
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index f392025a9038..97b9654899d5 100644
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -35,12 +35,12 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	LIBCHECK
 LIBCHECK_DESC=	Unit tests support
 LIBCHECK_CONFIGURE_ENABLE=	check
-LIBCHECK_LIB_DEPENDS=	libcheck.so:${PORTSDIR}/devel/libcheck
+LIBCHECK_LIB_DEPENDS=	libcheck.so:devel/libcheck
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CONFIGURE_ENV+=	FLEX_PATH="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/multimedia/gtk-recordmydesktop/Makefile b/multimedia/gtk-recordmydesktop/Makefile
index c30cd1b8798c..637eda574c1a 100644
--- a/multimedia/gtk-recordmydesktop/Makefile
+++ b/multimedia/gtk-recordmydesktop/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GTK+ frontend to recordMyDesktop
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/recordmydesktop:${PORTSDIR}/multimedia/recordmydesktop
+RUN_DEPENDS=	${LOCALBASE}/bin/recordmydesktop:multimedia/recordmydesktop
 
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gettext gmake pkgconfig python:2
diff --git a/multimedia/gtk-youtube-viewer/Makefile b/multimedia/gtk-youtube-viewer/Makefile
index 6210594791cc..5feb707de276 100644
--- a/multimedia/gtk-youtube-viewer/Makefile
+++ b/multimedia/gtk-youtube-viewer/Makefile
@@ -13,25 +13,25 @@ LICENSE=	ART10 GPLv3
 LICENSE_COMB=	dual
 
 # According to Build.PL
-BUILD_DEPENDS=	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-MIME-Base64>0:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-File-Path>0:${PORTSDIR}/devel/p5-File-Path \
-		p5-Getopt-Long>0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-PathTools>0:${PORTSDIR}/devel/p5-PathTools \
-		p5-ReadLine-Gnu>0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Term-ANSIColor>0:${PORTSDIR}/devel/p5-Term-ANSIColor \
-		p5-Term-ReadLine>0:${PORTSDIR}/devel/p5-Term-ReadLine \
-		p5-Thread-Queue>0:${PORTSDIR}/devel/p5-Thread-Queue \
-		p5-threads>0:${PORTSDIR}/devel/p5-threads \
-		p5-Socket>0:${PORTSDIR}/net/p5-Socket \
-		p5-Text-CharWidth>0:${PORTSDIR}/textproc/p5-Text-CharWidth \
-		p5-Text-ParseWords>0:${PORTSDIR}/textproc/p5-Text-ParseWords \
-		p5-Text-Tabs+Wrap>0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap  \
-		p5-LWP-Protocol-https>0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Mozilla-CA>0:${PORTSDIR}/www/p5-Mozilla-CA \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>0:converters/p5-JSON \
+		p5-JSON-XS>0:converters/p5-JSON-XS \
+		p5-MIME-Base64>0:converters/p5-MIME-Base64 \
+		p5-Data-Dump>0:devel/p5-Data-Dump \
+		p5-File-Path>0:devel/p5-File-Path \
+		p5-Getopt-Long>0:devel/p5-Getopt-Long \
+		p5-PathTools>0:devel/p5-PathTools \
+		p5-ReadLine-Gnu>0:devel/p5-ReadLine-Gnu \
+		p5-Term-ANSIColor>0:devel/p5-Term-ANSIColor \
+		p5-Term-ReadLine>0:devel/p5-Term-ReadLine \
+		p5-Thread-Queue>0:devel/p5-Thread-Queue \
+		p5-threads>0:devel/p5-threads \
+		p5-Socket>0:net/p5-Socket \
+		p5-Text-CharWidth>0:textproc/p5-Text-CharWidth \
+		p5-Text-ParseWords>0:textproc/p5-Text-ParseWords \
+		p5-Text-Tabs+Wrap>0:textproc/p5-Text-Tabs+Wrap  \
+		p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https \
+		p5-Mozilla-CA>0:www/p5-Mozilla-CA \
+		p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
@@ -51,17 +51,17 @@ OPTIONS_MULTI_PLAYER=	MPLAYER MPV VLC
 OPTIONS_DEFAULT=	GTK2 MPLAYER
 OPTIONS_SUB=		yes
 
-GTK2_BUILD_DEPENDS=	p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
-			p5-Gtk2>0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-GTK2_RUN_DEPENDS=	p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
-			p5-Gtk2>0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+GTK2_BUILD_DEPENDS=	p5-File-ShareDir>0:devel/p5-File-ShareDir \
+			p5-Gtk2>0:x11-toolkits/p5-Gtk2
+GTK2_RUN_DEPENDS=	p5-File-ShareDir>0:devel/p5-File-ShareDir \
+			p5-Gtk2>0:x11-toolkits/p5-Gtk2
 GTK2_CONFIGURE_ON=	--gtk-youtube-viewer
-MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 MPV_DESC=		MPV media player support
-MPV_RUN_DEPENDS=	mpv:${PORTSDIR}/multimedia/mpv
+MPV_RUN_DEPENDS=	mpv:multimedia/mpv
 PLAYER_DESC=		Media player
 VLC_DESC=		VLC media player support
-VLC_RUN_DEPENDS=	vlc:${PORTSDIR}/multimedia/vlc
+VLC_RUN_DEPENDS=	vlc:multimedia/vlc
 
 post-install-GTK2-on:
 	${LN} -sf \
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 6955b23b2361..9b55337cfd10 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Alternative GUI for the Xine media player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr \
-		libmozjs185.so:${PORTSDIR}/lang/spidermonkey185 \
-		libxine.so:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS=	libnspr4.so:devel/nspr \
+		libmozjs185.so:lang/spidermonkey185 \
+		libxine.so:multimedia/libxine
 
 USES=		desktop-file-utils gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gtk20
@@ -28,12 +28,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lm
 OPTIONS_DEFINE=		GNOME LIRC WEBPLUGIN
 OPTIONS_SUB=		yes
 
-GNOME_BUILD_DEPENDS=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
-GNOME_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-GNOME_RUN_DEPENDS=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
+GNOME_BUILD_DEPENDS=	gnome-screensaver:x11/gnome-screensaver
+GNOME_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+GNOME_RUN_DEPENDS=	gnome-screensaver:x11/gnome-screensaver
 GNOME_CONFIGURE_ON=	--with-dbus
 GNOME_CONFIGURE_OFF=	--disable-integration-wizard --without-dbus
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_ON=	--enable-lirc
 LIRC_CONFIGURE_OFF=	--disable-lirc
 WEBPLUGIN_DESC=		Build and/or install Web browser plugins
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 7417344f7cba..1ccea61fa5ef 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -28,26 +28,26 @@ COMMENT=	Versatile DVD ripper and video transcoder
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
-		cmake:${PORTSDIR}/devel/cmake
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libass.so:${PORTSDIR}/multimedia/libass \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libvorbisenc.so:${PORTSDIR}/audio/libvorbis \
-		libtheoradec.so:${PORTSDIR}/multimedia/libtheora \
-		libtheoraenc.so:${PORTSDIR}/multimedia/libtheora \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libx264.so:${PORTSDIR}/multimedia/libx264 \
-		libmp3lame.so:${PORTSDIR}/audio/lame
+BUILD_DEPENDS=	yasm:devel/yasm \
+		cmake:devel/cmake
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libfribidi.so:converters/fribidi \
+		libxml2.so:textproc/libxml2 \
+		libass.so:multimedia/libass \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libvorbisenc.so:audio/libvorbis \
+		libtheoradec.so:multimedia/libtheora \
+		libtheoraenc.so:multimedia/libtheora \
+		libsamplerate.so:audio/libsamplerate \
+		libx264.so:multimedia/libx264 \
+		libmp3lame.so:audio/lame
 CONFLICTS_BUILD=	x265
 
 .if !defined(PACKAGE_BUILDING)
 # DVDCSS version hardcoded in contrib/libdvdread/libdvdread/src/dvd_input.c (dlopen'ed)
-LIB_DEPENDS+=	libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
+LIB_DEPENDS+=	libdvdcss.so.2:multimedia/libdvdcss
 .endif
 
 GNU_CONFIGURE=	yes
@@ -75,10 +75,10 @@ OPTIONS_DEFAULT=	X11
 # Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and
 # to support --exclude-libs option for ld(1) when building GUI program
 .if ${PORT_OPTIONS:MX11}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
 .endif
 CC!=/usr/bin/which ${CC}
 MAKE_ENV+=ACLOCAL=${LOCALBASE}/bin/aclocal
@@ -87,8 +87,8 @@ MAKE_ENV+=ACLOCAL=${LOCALBASE}/bin/aclocal
 CONFIGURE_ARGS+=	--disable-gtk-update-checks --disable-gst
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	libdbus-glib-1.so:devel/dbus-glib \
+		libnotify.so:devel/libnotify
 USES+=		gettext
 USE_GNOME+=	gtk30 intltool
 PLIST_FILES+=	bin/HandBrake
diff --git a/multimedia/imagination/Makefile b/multimedia/imagination/Makefile
index b14e12312d80..b1d500baaa1d 100644
--- a/multimedia/imagination/Makefile
+++ b/multimedia/imagination/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 MAINTAINER=	jessefrgsmith@yahoo.ca
 COMMENT=	DVD slideshow maker
 
-LIB_DEPENDS=	libsox.so:${PORTSDIR}/audio/sox \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libsox.so:audio/sox \
+		libavcodec.so:multimedia/ffmpeg
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/multimedia/iriverter/Makefile b/multimedia/iriverter/Makefile
index 6f09b18b30b2..6f5f7f68b8cb 100644
--- a/multimedia/iriverter/Makefile
+++ b/multimedia/iriverter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross-platform frontend to mencoder
 
-RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
+RUN_DEPENDS=	mencoder:multimedia/mencoder
 
 USE_JAVA=	yes
 GNU_CONFIGURE=	yes
@@ -25,15 +25,15 @@ CONFIGURE_ARGS=	--with-swt="${JAVALIBDIR}/${SWT_JAR}"
 
 .if ${PORT_OPTIONS:MSWTDEVEL}
 BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+		${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
 RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+		${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
 SWT_JAR=	swt-devel.jar
 .else
 BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+		${JAVALIBDIR}/swt.jar:x11-toolkits/swt
 RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+		${JAVALIBDIR}/swt.jar:x11-toolkits/swt
 SWT_JAR=	swt.jar
 .endif
 
diff --git a/multimedia/iso2mkv/Makefile b/multimedia/iso2mkv/Makefile
index 1c2a33973e70..c94efe6b9582 100644
--- a/multimedia/iso2mkv/Makefile
+++ b/multimedia/iso2mkv/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Script to convert DVD image, device, or VIDEO_TS to mkv
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-		normalize:${PORTSDIR}/audio/normalize \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		mencoder:${PORTSDIR}/multimedia/mencoder \
-		mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix \
-		dvdxchap:${PORTSDIR}/multimedia/ogmtools \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	lame:audio/lame \
+		normalize:audio/normalize \
+		oggenc:audio/vorbis-tools \
+		mencoder:multimedia/mencoder \
+		mkvmerge:multimedia/mkvtoolnix \
+		dvdxchap:multimedia/ogmtools \
+		bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index a1ed67e9a7b7..c80c57b14564 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -13,9 +13,9 @@ COMMENT=	DVD-9 to DVD-5 shrinking application for KDE
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine \
-		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \
-		libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
+LIB_DEPENDS=	libxine.so:multimedia/libxine \
+		libmpeg2.so:multimedia/libmpeg2 \
+		libavcodec0.so:multimedia/ffmpeg0
 
 USES=		cmake gettext
 USE_KDE4=	kdeprefix kdelibs automoc4
@@ -26,9 +26,9 @@ MENCODER_DESC=	MEncoder support
 MPLAYER_DESC=	MPlayer support
 DVDAUTHOR_DESC=	DVD Author support
 
-MENCODER_RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
-MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-DVDAUTHOR_RUN_DEPENDS=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor
+MENCODER_RUN_DEPENDS=	mencoder:multimedia/mencoder
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
+DVDAUTHOR_RUN_DEPENDS=	dvdauthor:multimedia/dvdauthor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/cmake/*.cmake
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index ee7632d11a7f..ca3697b32f09 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Multimedia player based on KDE and VLC
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc-qt4
+BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
+LIB_DEPENDS=	libvlc.so:multimedia/vlc-qt4
 
 USES=		cmake cpe gettext pkgconfig
 USE_KDE4=	automoc4 kdelibs kdeprefix
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
index a05bf059e810..52b436908003 100644
--- a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
+++ b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	FFmpeg-based thumbnail generator for video files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libswscale.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libswscale.so:multimedia/ffmpeg
 
 USES=		cmake:outsource pkgconfig tar:xz
 USE_KDE4=	automoc4 kdelibs kdeprefix
diff --git a/multimedia/kdemultimedia4-mplayerthumbs/Makefile b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
index 93dda070ccbe..faafc749e4da 100644
--- a/multimedia/kdemultimedia4-mplayerthumbs/Makefile
+++ b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	MPlayer-based thumbnail generator for video files
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	automoc4 kdelibs kdeprefix
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index dc7b29b7e999..5ce93990215f 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -15,24 +15,24 @@ OPTIONS_DEFINE=		DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD MPLAYER
 OPTIONS_DEFAULT=	DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD
 
 DRAGON_DESC=		Simple video player
-DRAGON_RUN_DEPENDS=	${KDE4_PREFIX}/bin/dragon:${PORTSDIR}/multimedia/dragon
+DRAGON_RUN_DEPENDS=	${KDE4_PREFIX}/bin/dragon:multimedia/dragon
 
 FFMPEG_DESC=		FFMPEG-based video thumbnailer
-FFMPEG_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/ffmpegthumbs.so:${PORTSDIR}/multimedia/kdemultimedia4-ffmpegthumbs
+FFMPEG_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/ffmpegthumbs.so:multimedia/kdemultimedia4-ffmpegthumbs
 
 JUK_DESC=		Audio player
-JUK_RUN_DEPENDS=	${KDE4_PREFIX}/bin/juk:${PORTSDIR}/audio/juk
+JUK_RUN_DEPENDS=	${KDE4_PREFIX}/bin/juk:audio/juk
 
 KIO_AUDIOCD_DESC=	Audio CD IOSlave
-KIO_AUDIOCD_RUN_DEPENDS=	${KDE4_PREFIX}/lib/libaudiocdplugins.so:${PORTSDIR}/audio/kio-audiocd
+KIO_AUDIOCD_RUN_DEPENDS=	${KDE4_PREFIX}/lib/libaudiocdplugins.so:audio/kio-audiocd
 
 KMIX_DESC=		Audio mixer
-KMIX_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmix:${PORTSDIR}/audio/kmix
+KMIX_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmix:audio/kmix
 
 KSCD_DESC=		CD Player
-KSCD_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kscd:${PORTSDIR}/audio/kscd
+KSCD_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kscd:audio/kscd
 
 MPLAYER_DESC=		MPlayer-based video thumbnailer
-MPLAYER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/mplayerthumbsconfig:${PORTSDIR}/multimedia/kdemultimedia4-mplayerthumbs
+MPLAYER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/mplayerthumbsconfig:multimedia/kdemultimedia4-mplayerthumbs
 
 .include <bsd.port.mk>
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index 191bdf07d41f..b84ef7192347 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -10,9 +10,9 @@ COMMENT=	KDE professional quality non-linear video editing suite
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmlt.so:${PORTSDIR}/multimedia/mlt \
-		libqjson.so:${PORTSDIR}/devel/qjson
-RUN_DEPENDS=	ffmpeg${FFMPEG_SUFX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFX}
+LIB_DEPENDS=	libmlt.so:multimedia/mlt \
+		libqjson.so:devel/qjson
+RUN_DEPENDS=	ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX}
 
 USE_KDE4=	automoc4 kdelibs kdeprefix nepomuk-core
 USE_QT4=	corelib dbus gui opengl script svg xml \
@@ -35,23 +35,23 @@ XINE_DESC=	DVD preview support via xine
 
 DOCS_CMAKE_OFF=		-DBUILD_doc:BOOL=FALSE
 
-DVDWIZARD_RUN_DEPENDS=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-			cdrecord:${PORTSDIR}/sysutils/cdrtools
+DVDWIZARD_RUN_DEPENDS=	dvdauthor:multimedia/dvdauthor \
+			cdrecord:sysutils/cdrtools
 
-FREI0R_RUN_DEPENDS=	frei0r-plugins>=0:${PORTSDIR}/graphics/frei0r-plugins
+FREI0R_RUN_DEPENDS=	frei0r-plugins>=0:graphics/frei0r-plugins
 
-LADSPA_RUN_DEPENDS=	swhplugins>=0:${PORTSDIR}/audio/swhplugins
+LADSPA_RUN_DEPENDS=	swhplugins>=0:audio/swhplugins
 
 NLS_USES=		gettext
 NLS_CMAKE_OFF=		-DBUILD_po:BOOL=FALSE
 
-SCREENCAST_RUN_DEPENDS=	recordmydesktop:${PORTSDIR}/multimedia/recordmydesktop
+SCREENCAST_RUN_DEPENDS=	recordmydesktop:multimedia/recordmydesktop
 
-V4L_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
-V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
+V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_CMAKE_OFF=		-DWITH_LibV4L2:BOOL=FALSE
 
-XINE_RUN_DEPENDS=	xine:${PORTSDIR}/multimedia/xine
+XINE_RUN_DEPENDS=	xine:multimedia/xine
 
 post-patch:
 	@${REINPLACE_CMD} -E -e '/${PORTNAME}.(menu|xpm)/ d' \
diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index 4d08b92d115f..c91f62c24a20 100644
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Multimedia streaming server for KiSS/Linksys player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libdvdread.so:multimedia/libdvdread
 
 USES=		compiler:nestedfct dos2unix iconv jpeg
 MAKE_ENV=	FreeBSD=defined
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index dc5131aebd07..fc7c89b98a28 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -17,9 +17,9 @@ BROKEN=		unfetchable
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libcairo.so:${PORTSDIR}/graphics/cairo
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libcairo.so:graphics/cairo
+RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 USES=		cmake gettext pkgconfig tar:bzip2
 USE_GNOME=	gtk20
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 79ab1599db0d..b8590343778a 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -10,45 +10,45 @@ COMMENT=	Award winning media center application
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	enca:${PORTSDIR}/converters/enca \
-		gawk:${PORTSDIR}/lang/gawk \
-		gperf:${PORTSDIR}/devel/gperf \
-		cmake:${PORTSDIR}/devel/cmake \
-		zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip \
-		nasm:${PORTSDIR}/devel/nasm \
-		gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20 \
-		swig2.0:${PORTSDIR}/devel/swig20
-LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libcdio.so:${PORTSDIR}/sysutils/libcdio	\
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libenca.so:${PORTSDIR}/converters/enca \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libxslt.so:${PORTSDIR}/textproc/libxslt	\
-		libyajl.so:${PORTSDIR}/devel/yajl
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		glxinfo:${PORTSDIR}/graphics/mesa-demos \
-		python:${PORTSDIR}/lang/python \
-		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
+BUILD_DEPENDS=	enca:converters/enca \
+		gawk:lang/gawk \
+		gperf:devel/gperf \
+		cmake:devel/cmake \
+		zip:archivers/zip \
+		unzip:archivers/unzip \
+		nasm:devel/nasm \
+		gtk-update-icon-cache:x11-toolkits/gtk20 \
+		swig2.0:devel/swig20
+LIB_DEPENDS=	libass.so:multimedia/libass \
+		libboost_thread.so:devel/boost-libs \
+		libcdio.so:sysutils/libcdio	\
+		libcurl.so:ftp/curl \
+		libdbus-1.so:devel/dbus \
+		libdrm.so:graphics/libdrm \
+		libenca.so:converters/enca \
+		libFLAC.so:audio/flac \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libfribidi.so:converters/fribidi \
+		libgnutls.so:security/gnutls \
+		liblzo2.so:archivers/lzo2 \
+		libjasper.so:graphics/jasper \
+		libltdl.so:devel/libltdl \
+		libmodplug.so:audio/libmodplug \
+		libmpeg2.so:multimedia/libmpeg2 \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libsamplerate.so:audio/libsamplerate \
+		libsqlite3.so:databases/sqlite3 \
+		libtag.so:audio/taglib \
+		libtinyxml.so:textproc/tinyxml \
+		libvorbis.so:audio/libvorbis \
+		libxslt.so:textproc/libxslt	\
+		libyajl.so:devel/yajl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		glxinfo:graphics/mesa-demos \
+		python:lang/python \
+		xdpyinfo:x11/xdpyinfo
 
 USE_GITHUB=	yes
 GH_TUPLE=	xbmc:xbmc:f4dda26 xbmc:FFmpeg:2.6.4-Isengard:ffmpeg
@@ -84,56 +84,56 @@ SFTP_DESC=	SSH SFTP support via libssh
 OPTIONS_DEFAULT=	AIRPLAY AIRTUNES AVAHI LIBBLURAY LIRC MYSQL \
 			NFS PULSEAUDIO RTMP SFTP SMB VAAPI VDPAU WEBSERVER
 
-AIRPLAY_LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist
+AIRPLAY_LIB_DEPENDS=	libplist.so:devel/libplist
 AIRPLAY_CONFIGURE_ENABLE=	airplay
 
-AIRTUNES_LIB_DEPENDS=	libshairplay.so:${PORTSDIR}/audio/shairplay
+AIRTUNES_LIB_DEPENDS=	libshairplay.so:audio/shairplay
 AIRTUNES_CONFIGURE_ENABLE=	airtunes
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
 CEC_BROKEN=		libcec >= 3.0.0 has not been ported yet
-CEC_BUILD_DEPENDS=	libcec>=3.0.0:${PORTSDIR}/multimedia/libcec
-CEC_LIB_DEPENDS=	libcec.so:${PORTSDIR}/multimedia/libcec
+CEC_BUILD_DEPENDS=	libcec>=3.0.0:multimedia/libcec
+CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec
 CEC_CONFIGURE_ENABLE=	libcec
 
-LIBBLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
-LIRC_RUN_DEPENDS=	lircd:${PORTSDIR}/comms/lirc
+LIRC_RUN_DEPENDS=	lircd:comms/lirc
 
 MYSQL_USE=	MYSQL=yes
 MYSQL_CONFIGURE_ENABLE=	mysql
 
-NFS_LIB_DEPENDS=	libnfs.so:${PORTSDIR}/net/libnfs
+NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CONFIGURE_ENABLE=	nfs
 
 NONFREE_CONFIGURE_ENABLE=	non-free
 NONFREE_VARS=		NO_CDROM="Restricted binary distribution" \
 			NO_PACKAGE="Restricted binary distribution"
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
-RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
+RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 RTMP_CONFIGURE_ENABLE=	rtmp
 
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
-SMB_RUN_DEPENDS=	nmblookup:${PORTSDIR}/net/samba-nmblookup
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
+SMB_RUN_DEPENDS=	nmblookup:net/samba-nmblookup
 SMB_CONFIGURE_ENABLE=	samba
 
-VAAPI_LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=	vaapi
 
-VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
-WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
+WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 WEBSERVER_CONFIGURE_ENABLE=	webserver
 
-SFTP_BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
-SFTP_RUN_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
+SFTP_BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:security/libssh
+SFTP_RUN_DEPENDS=	${LOCALBASE}/lib/libssh.so:security/libssh
 SFTP_CONFIGURE_ENABLE=	ssh
 
 CONFIGURE_ARGS+=	--disable-debug --disable-alsa
diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile
index ab2857886bcf..02654ac75ef1 100644
--- a/multimedia/kplayer-kde4/Makefile
+++ b/multimedia/kplayer-kde4/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Movie player based on mplayer
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 USES=		cmake gettext tar:bzip2
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
diff --git a/multimedia/libaacs/Makefile b/multimedia/libaacs/Makefile
index 1497e12b4110..39fcc6d45c01 100644
--- a/multimedia/libaacs/Makefile
+++ b/multimedia/libaacs/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Advanced Access Content System implementation
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LEX="${LOCALBASE}/bin/flex"
diff --git a/multimedia/libass/Makefile b/multimedia/libass/Makefile
index 4a1bb8f8f46c..116f8809a304 100644
--- a/multimedia/libass/Makefile
+++ b/multimedia/libass/Makefile
@@ -9,9 +9,9 @@ COMMENT=	Portable ASS/SSA subtitle renderer
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfribidi.so:converters/fribidi \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}
@@ -29,10 +29,10 @@ OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT_amd64=	ASM
 OPTIONS_DEFAULT_i386=	ASM
 
-ASM_BUILD_DEPENDS=${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
+ASM_BUILD_DEPENDS=${LOCALBASE}/bin/yasm:devel/yasm
 ASM_CONFIGURE_ENABLE=asm
 
-HARFBUZZ_LIB_DEPENDS=libharfbuzz.so:${PORTSDIR}/print/harfbuzz
+HARFBUZZ_LIB_DEPENDS=libharfbuzz.so:print/harfbuzz
 HARFBUZZ_CONFIGURE_ENABLE=harfbuzz
 HARFBUZZ_DESC?=	Font shaping via HarfBuzz
 
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index bafaa2021889..16cacd35b89d 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://libav.org/releases/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Realtime audio/video conversion library
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS=	yasm:devel/yasm
 
 USES=		cpe gmake perl5 pkgconfig tar:xz
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
@@ -45,119 +45,119 @@ DC1394_DESC=	IIDC-1394 grabbing using libdc1394
 
 OPTIONS_SUB=	yes
 
-ALSA_LIB_DEPENDS=		libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ON=		--enable-indev=alsa --enable-outdev=alsa
 ALSA_CONFIGURE_OFF=		--disable-indev=alsa --disable-outdev=alsa
 
-AMR_NB_LIB_DEPENDS=		libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+AMR_NB_LIB_DEPENDS=		libopencore-amrnb.so:audio/opencore-amr
 AMR_NB_CONFIGURE_ENABLE=	libopencore-amrnb
 
-AMR_WB_LIB_DEPENDS=		libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+AMR_WB_LIB_DEPENDS=		libopencore-amrnb.so:audio/opencore-amr
 AMR_WB_CONFIGURE_ENABLE=	libopencore-amrwb
 
 BZIP2_CONFIGURE_ENABLE=		bzlib
 
-CDIO_LIB_DEPENDS=		libcdio.so:${PORTSDIR}/sysutils/libcdio \
-				libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDIO_LIB_DEPENDS=		libcdio.so:sysutils/libcdio \
+				libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ENABLE=		libcdio
 
-DC1394_LIB_DEPENDS=		libdc1394.so:${PORTSDIR}/multimedia/libdc1394
+DC1394_LIB_DEPENDS=		libdc1394.so:multimedia/libdc1394
 DC1394_CONFIGURE_ENABLE=	libdc1394
 
-DOCS_BUILD_DEPENDS=		texi2html:${PORTSDIR}/textproc/texi2html
+DOCS_BUILD_DEPENDS=		texi2html:textproc/texi2html
 
-FREI0R_BUILD_DEPENDS=		${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_BUILD_DEPENDS=		${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=	frei0r
 
-FAAC_LIB_DEPENDS=		libfaac.so:${PORTSDIR}/audio/faac
+FAAC_LIB_DEPENDS=		libfaac.so:audio/faac
 FAAC_CONFIGURE_ENABLE=		libfaac
 
-FDK_AAC_LIB_DEPENDS=		libfdk-aac.so:${PORTSDIR}/audio/fdk-aac
+FDK_AAC_LIB_DEPENDS=		libfdk-aac.so:audio/fdk-aac
 FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
 
-FREETYPE_LIB_DEPENDS=		libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	libfreetype
 
-GNUTLS_LIB_DEPENDS=		libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 
-GSM_LIB_DEPENDS=		libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
 GSM_CONFIGURE_ENABLE=		libgsm
 
-ILBC_BUILD_DEPENDS=		${LOCALBASE}/include/ilbc.h:${PORTSDIR}/net/libilbc
+ILBC_BUILD_DEPENDS=		${LOCALBASE}/include/ilbc.h:net/libilbc
 ILBC_CONFIGURE_ENABLE=		libilbc
 
-JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_ON=		--enable-indev=jack
 JACK_CONFIGURE_OFF=		--disable-indev=jack
 
-LAME_LIB_DEPENDS=		libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=		libmp3lame
 
-OPENCV_LIB_DEPENDS=		libopencv_gpu.so:${PORTSDIR}/graphics/opencv
+OPENCV_LIB_DEPENDS=		libopencv_gpu.so:graphics/opencv
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
-OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 OPENSSL_CONFIGURE_ENABLE=	openssl
 OPENSSL_USE=		OPENSSL=yes
 
-OPUS_LIB_DEPENDS=		libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=		libopus.so:audio/opus
 OPUS_CONFIGURE_ENABLE=		libopus
 
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
 
-RTMP_LIB_DEPENDS=		librtmp.so:${PORTSDIR}/multimedia/librtmp
+RTMP_LIB_DEPENDS=		librtmp.so:multimedia/librtmp
 RTMP_CONFIGURE_ENABLE=		librtmp
 
-SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
 
 SDL_USE=			SDL=sdl
 SDL_CONFIGURE_ENABLE=		avplay
 
-SPEEX_LIB_DEPENDS=		libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=		libspeex
 
-THEORA_LIB_DEPENDS=		libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
 
-V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_CONFIGURE_ON=		--enable-indev=v4l2
 V4L_CONFIGURE_OFF=		--disable-indev=v4l2
 
-VAAPI_LIB_DEPENDS=		libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=		vaapi
 
-VDPAU_BUILD_DEPENDS=		${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
+VDPAU_BUILD_DEPENDS=		${LOCALBASE}/include/vdpau/vdpau.h:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=		vdpau
 
-VO_AACENC_LIB_DEPENDS=		libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
+VO_AACENC_LIB_DEPENDS=		libvo-aacenc.so:audio/vo-aacenc
 VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
 
-VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
+VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:audio/vo-amrwbenc
 VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
 
-VORBIS_LIB_DEPENDS=		libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=		libvorbisenc.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	libvorbis
 
-VPX_LIB_DEPENDS=		libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_LIB_DEPENDS=		libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=		libvpx
 
-WAVPACK_LIB_DEPENDS=		libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=		libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_ENABLE=	libwavpack
 
-WEBP_LIB_DEPENDS=		libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=		libwebp
 
 X11GRAB_USE=			XORG=x11,xext,xfixes
 
-X264_LIB_DEPENDS=		libx264.so:${PORTSDIR}/multimedia/libx264
+X264_LIB_DEPENDS=		libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=		libx264
 
-XVID_LIB_DEPENDS=		libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_LIB_DEPENDS=		libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENABLE=		libxvid
 
 ZLIB_CONFIGURE_ENABLE=		zlib
diff --git a/multimedia/libbdplus/Makefile b/multimedia/libbdplus/Makefile
index 1c0127411d41..5381a814c8f6 100644
--- a/multimedia/libbdplus/Makefile
+++ b/multimedia/libbdplus/Makefile
@@ -12,8 +12,8 @@ COMMENT=	BD+ System research implementation
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error
 
 USE_LDCONFIG=	yes
 USES=		autoreconf tar:bzip2 pkgconfig libtool
diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile
index d1c03fbffdcd..dd086641691e 100644
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Blu-Ray discs playback library for media players
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 # dlopen dependencies
-LIB_DEPENDS+=	libaacs.so:${PORTSDIR}/multimedia/libaacs \
-		libbdplus.so:${PORTSDIR}/multimedia/libbdplus
+LIB_DEPENDS+=	libaacs.so:multimedia/libaacs \
+		libbdplus.so:multimedia/libbdplus
 
 INSTALL_TARGET=	install-strip
 USES=		autoreconf iconv libtool pathfix pkgconfig tar:bzip2
@@ -34,7 +34,7 @@ JAVA_DESC=	Enable Blu-Ray Java support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJAVA}
-BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
+BUILD_DEPENDS+=	ant:devel/apache-ant
 CATEGORIES+=	java
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index fb4b190a9d16..100ef0a02da1 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Quasar DV codec (libdv): software codec for DV video encoding format
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index d47f0b9764e1..361e7a11c4dd 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DOXYGEN DOCS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 PORTDOCS=	*
 .endif
 
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 0e1c21ac954b..afacfa5b3eea 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -14,7 +14,7 @@ COMMENT=	MPlayer version of the libdvdnav project
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index ee0d4c483077..a92490643bf2 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -27,6 +27,6 @@ OPTIONS_DEFAULT=	DVDCSS
 .endif
 
 # DVDCSS version hardcoded in src/dvd_input.c (dlopen'ed)
-DVDCSS_LIB_DEPENDS=	libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
+DVDCSS_LIB_DEPENDS=	libdvdcss.so.2:multimedia/libdvdcss
 
 .include <bsd.port.mk>
diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index a18f7d1a39b9..08e23f3a6b58 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Codec for karaoke and text encapsulation for Ogg
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig gmake libtool
@@ -33,13 +33,13 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 .else
 CONFIGURE_ARGS+=	--disable-doc
 .endif
 
 .if ${PORT_OPTIONS:MKATEDJ}
-RUN_DEPENDS=	${LOCALBASE}/bin/oggz:${PORTSDIR}/audio/liboggz
+RUN_DEPENDS=	${LOCALBASE}/bin/oggz:audio/liboggz
 USES+=		python
 USE_WX=		2.8
 WX_UNICODE=	yes
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index 7daf7e89067e..800cfea263f3 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extensible Multimedia Container Format
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libebml.so:${PORTSDIR}/textproc/libebml
+LIB_DEPENDS=	libebml.so:textproc/libebml
 
 USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/multimedia/libmediaart/Makefile b/multimedia/libmediaart/Makefile
index 4f0cb733e1bf..8479b2d8f14d 100644
--- a/multimedia/libmediaart/Makefile
+++ b/multimedia/libmediaart/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for handling media art
 
-BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
-		vala>=0:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc \
+		vala>=0:lang/vala
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gdkpixbuf2 glib20 introspection
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index 1dcbbbb7b520..45fda6746453 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -14,7 +14,7 @@ COMMENT=	MediaInfo library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../../../License.html
 
-LIB_DEPENDS=	libzen.so:${PORTSDIR}/multimedia/libzen
+LIB_DEPENDS=	libzen.so:multimedia/libzen
 
 CONFLICTS_INSTALL=	mediainfo-0.[0-6]* mediainfo-0.7.[0-5]*
 
@@ -31,11 +31,11 @@ USES=		alias libtool localbase pathfix pkgconfig tar:xz
 WRKSRC=		${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library
 
 CURL_CONFIGURE_ON=	--with-libcurl=${LOCALBASE}
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 MMS_CONFIGURE_ON=	--with-libmms=${LOCALBASE}
-MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_LIB_DEPENDS=	libmms.so:net/libmms
 TINYXML2_CONFIGURE_ON=	--with-libtinyxml2=yes
-TINYXML2_LIB_DEPENDS=	libtinyxml2.so:${PORTSDIR}/textproc/tinyxml2
+TINYXML2_LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/aclocal.m4
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 95cb2dae8d6e..19c4dbcfd472 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Advanced editing and manipulation of MPEG streams
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	liba52.so:${PORTSDIR}/audio/liba52
+LIB_DEPENDS=	liba52.so:audio/liba52
 
 USES=		alias gmake tar:bzip2
 MAKE_ARGS=	CC="${CC}" USE_CSS=0 OBJDIR="obj" \
@@ -36,7 +36,7 @@ NASM?=		${LOCALBASE}/bin/nasm
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFINE_i386=	MMX
 
-MMX_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+MMX_BUILD_DEPENDS=	nasm:devel/nasm
 MMX_MAKE_ARGS=		USE_MMX=1 NASM="${NASM}"
 MMX_CFLAGS=		-DHAVE_MMX
 MMX_MAKE_ARGS_OFF=	USE_MMX=0
diff --git a/multimedia/libquicktime-lame/Makefile b/multimedia/libquicktime-lame/Makefile
index 2ceaab56af88..12fe264148e8 100644
--- a/multimedia/libquicktime-lame/Makefile
+++ b/multimedia/libquicktime-lame/Makefile
@@ -9,8 +9,8 @@ PKGNAMESUFFIX=	-lame
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LAME plugin for libquicktime
 
-LIB_DEPENDS=	libquicktime.so:${PORTSDIR}/multimedia/libquicktime \
-		libmp3lame.so:${PORTSDIR}/audio/lame
+LIB_DEPENDS=	libquicktime.so:multimedia/libquicktime \
+		libmp3lame.so:audio/lame
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 81b9d2f1f3cd..fdb3cd1c0bdc 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	library for reading and writing quicktime files
 
 .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 .endif
 
 LICENSE=	LGPL21
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--without-gtk
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS=	libasound.so:audio/alsa-lib
 .else
 CONFIGURE_ARGS+=	--without-alsa
 .endif
@@ -71,7 +71,7 @@ CONFIGURE_ARGS+=	--without-opengl
 .endif
 
 .if ${PORT_OPTIONS:MDV}
-LIB_DEPENDS+=	libdv.so:${PORTSDIR}/multimedia/libdv
+LIB_DEPENDS+=	libdv.so:multimedia/libdv
 CONFIGURE_ARGS+=	--with-libdv
 .else
 CONFIGURE_ARGS+=	--without-libdv
@@ -85,42 +85,42 @@ CONFIGURE_ARGS+=	--without-libjpeg
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 CONFIGURE_ARGS+=	--with-libpng
 .else
 CONFIGURE_ARGS+=	--without-libpng
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 CONFIGURE_ARGS+=	--with-ffmpeg
 .else
 CONFIGURE_ARGS+=	--without-ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MFAAC}
-LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
+LIB_DEPENDS+=	libfaac.so:audio/faac
 CONFIGURE_ARGS+=	--with-faac
 .else
 CONFIGURE_ARGS+=	--without-faac
 .endif
 
 .if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:audio/faad
 CONFIGURE_ARGS+=	--with-faad2
 .else
 CONFIGURE_ARGS+=	--without-faad2
 .endif
 
 .if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+=	libx264.so:${PORTSDIR}/multimedia/libx264
+LIB_DEPENDS+=	libx264.so:multimedia/libx264
 CONFIGURE_ARGS+=	--with-x264
 .else
 CONFIGURE_ARGS+=	--without-x264
 .endif
 
 .if ${PORT_OPTIONS:MSCHROEDINGER}
-LIB_DEPENDS+=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+LIB_DEPENDS+=	libschroedinger-1.0.so:multimedia/schroedinger
 .else
 CONFIGURE_ARGS+=	--without-schroedinger
 .endif
diff --git a/multimedia/libquvi/Makefile b/multimedia/libquvi/Makefile
index 07c120b883b4..8c77f825498a 100644
--- a/multimedia/libquvi/Makefile
+++ b/multimedia/libquvi/Makefile
@@ -14,8 +14,8 @@ LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	libquvi-scripts>=0.4.0:${PORTSDIR}/multimedia/libquvi-scripts
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	libquvi-scripts>=0.4.0:multimedia/libquvi-scripts
+LIB_DEPENDS=	libcurl.so:ftp/curl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS LUAJIT
@@ -30,7 +30,7 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_USES_OFF=	lua
 
 post-patch-LUAJIT-off:
diff --git a/multimedia/libquvi09/Makefile b/multimedia/libquvi09/Makefile
index 968265ceb096..c765cb19fe4b 100644
--- a/multimedia/libquvi09/Makefile
+++ b/multimedia/libquvi09/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Cross-platform library for parsing flash media stream URLs
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	libquvi-scripts09>=0.9:${PORTSDIR}/multimedia/libquvi-scripts09
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libproxy.so:${PORTSDIR}/net/libproxy \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+BUILD_DEPENDS=	libquvi-scripts09>=0.9:multimedia/libquvi-scripts09
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libproxy.so:net/libproxy \
+		libgcrypt.so:security/libgcrypt
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index a9f01cd4e1fd..de52ae978a47 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/theora/ \
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Theora video codec for the Ogg multimedia streaming system
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-sdltest \
diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile
index fecb25ba68b2..42661d666166 100644
--- a/multimedia/libv4l/Makefile
+++ b/multimedia/libv4l/Makefile
@@ -23,7 +23,7 @@ USES=		tar:bzip2
 WRKSRC=		${WRKDIR}/v4l-utils-${PORTVERSION}
 
 .if ${LIBV4L_SLAVE} != compat
-BUILD_DEPENDS+=	v4l_compat>=${PORTVERSION}:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS+=	v4l_compat>=${PORTVERSION}:multimedia/v4l_compat
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -36,9 +36,9 @@ CONFIGURE_ARGS=	--enable-libdvbv5 \
 INSTALL_TARGET=	install-strip
 
 . if ${LIBV4L_SLAVE} == utils
-BUILD_DEPENDS+=	libv4l>=${PORTVERSION}:${PORTSDIR}/multimedia/libv4l
-LIB_DEPENDS+=	libargp.so:${PORTSDIR}/devel/argp-standalone \
-		libv4l2.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS+=	libv4l>=${PORTVERSION}:multimedia/libv4l
+LIB_DEPENDS+=	libargp.so:devel/argp-standalone \
+		libv4l2.so:multimedia/libv4l
 # Disabling building libv4l in the utils slave is too much hackery
 # Lets wait for subpackages
 CONFIGURE_ARGS+=--enable-v4l-utils
diff --git a/multimedia/libva-intel-driver/Makefile b/multimedia/libva-intel-driver/Makefile
index 1a952f5f541b..7ed814ec3d66 100644
--- a/multimedia/libva-intel-driver/Makefile
+++ b/multimedia/libva-intel-driver/Makefile
@@ -12,8 +12,8 @@ COMMENT=	VAAPI intel driver
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS=	libva.so:multimedia/libva
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
 GNU_CONFIGURE=	yes
 USES=		alias autoreconf compiler:c11 gmake libtool pkgconfig tar:bzip2
diff --git a/multimedia/libva-vdpau-driver/Makefile b/multimedia/libva-vdpau-driver/Makefile
index 1a47e1ac80e0..db4751f48996 100644
--- a/multimedia/libva-vdpau-driver/Makefile
+++ b/multimedia/libva-vdpau-driver/Makefile
@@ -12,9 +12,9 @@ COMMENT=	VDPAU-based backend for VAAPI
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libva.pc:${PORTSDIR}/multimedia/libva \
-		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libva.pc:multimedia/libva \
+		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 USES=		libtool gmake pkgconfig tar:bzip2
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index 69407376b204..d4d25522e438 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -11,8 +11,8 @@ COMMENT=	VAAPI wrapper and dummy driver
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 USES=		alias autoreconf gmake libtool pkgconfig tar:bzip2
 USE_XORG=	glproto pciaccess xext xfixes
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 9d0aa6838fb1..9c958b3a454f 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -13,7 +13,7 @@ COMMENT=	VP8/VP9 Codec SDK
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS=	yasm:devel/yasm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	webmproject
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index fc817a96461f..7c4cc8a16344 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -15,29 +15,29 @@ COMMENT=	Libraries for xine multimedia player
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		liba52.so:${PORTSDIR}/audio/liba52 \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libmng.so:${PORTSDIR}/graphics/libmng \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfame.so:${PORTSDIR}/multimedia/libfame \
-		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libvcdinfo.so:${PORTSDIR}/multimedia/vcdimager \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libdca.so:${PORTSDIR}/multimedia/libdca \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libfaad.so:${PORTSDIR}/audio/faad \
-		libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+BUILD_DEPENDS=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		liba52.so:audio/liba52 \
+		libvorbis.so:audio/libvorbis \
+		libspeex.so:audio/speex \
+		libmng.so:graphics/libmng \
+		libpng.so:graphics/png \
+		libdvdread.so:multimedia/libdvdread \
+		libfreetype.so:print/freetype2 \
+		libfame.so:multimedia/libfame \
+		libcdio_paranoia.so:sysutils/libcdio-paranoia \
+		libmodplug.so:audio/libmodplug \
+		libvcdinfo.so:multimedia/vcdimager \
+		libtheora.so:multimedia/libtheora \
+		libmad.so:audio/libmad \
+		libdca.so:multimedia/libdca \
+		libavcodec.so:multimedia/ffmpeg \
+		libfaad.so:audio/faad \
+		libvdpau.so:multimedia/libvdpau
 .if !defined(PACKAGE_BUILDING)
 # DVDCSS version hardcoded in src/input/input_dvd.c misc/cdda_server.c
 # and src/input/libdvdnav/dvd_input.c (dlopen'ed)
-LIB_DEPENDS+=	libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
+LIB_DEPENDS+=	libdvdcss.so.2:multimedia/libdvdcss
 .endif
 
 USES=		compiler cpe execinfo gmake iconv libtool:keepla \
@@ -75,39 +75,39 @@ OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_OFF=	--without-caca --disable-cacatest
 ESOUND_USE=		GNOME=esound
 ESOUND_CONFIGURE_OFF=	--without-esound
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--without-jack
 GNOMEVFS2_USE=		GNOME=gnomevfs2
 GNOMEVFS2_CONFIGURE_OFF=--disable-gnomevfs
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=--without-pulseaudio
 .if defined(WITH_NVIDIA304_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
 XVMC_CONFIGURE_ON=	--with-xvmc-lib=XvMCNVIDIA
-XVMC_LIB_DEPENDS=	libXvMCNVIDIA.so:${PORTSDIR}/x11/nvidia-driver-304
+XVMC_LIB_DEPENDS=	libXvMCNVIDIA.so:x11/nvidia-driver-304
 .else
 XVMC_CONFIGURE_ON=	--with-xvmc-lib=XvMCW
-XVMC_LIB_DEPENDS=	libXvMC.so:${PORTSDIR}/x11/libXvMC
+XVMC_LIB_DEPENDS=	libXvMC.so:x11/libXvMC
 .endif
 XVMC_CONFIGURE_OFF=	--disable-xvmc
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CONFIGURE_ENV=	LIBSMBCLIENT_LIBS="-L${LOCALBASE}/lib -lsmbclient" \
 			LIBSMBCLIENT_CFLAGS="-I${LOCALBASE}/include"
 SMB_CONFIGURE_ENABLE=	samba
-AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_OFF=	--disable-aalib --disable-aalibtest
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
 IMAGEMAGICK_CONFIGURE_OFF=	--without-imagemagick
 PIXBUF_USE=		GNOME=gdkpixbuf2
 PIXBUF_CONFIGURE_OFF=	--disable-gdkpixbuf
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_WITH=	wavpack
-VAAPI_LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CONFIGURE_ON=	--enable-vaapi
-LIBBLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	bluray
 
 .include <bsd.port.options.mk>
diff --git a/multimedia/libxspf/Makefile b/multimedia/libxspf/Makefile
index 1da9fd3e2d34..a5546c444c46 100644
--- a/multimedia/libxspf/Makefile
+++ b/multimedia/libxspf/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	SF/libspiff/Sources/${PORTVERSION}
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	XSPF parsing library
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 # We need 0.7.5, which uses pkg-config
-BUILD_DEPENDS=	uriparser>=0.7.5:${PORTSDIR}/net/uriparser
-RUN_DEPENDS=	uriparser>=0.7.5:${PORTSDIR}/net/uriparser
+BUILD_DEPENDS=	uriparser>=0.7.5:net/uriparser
+RUN_DEPENDS=	uriparser>=0.7.5:net/uriparser
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-expat=${LOCALBASE} --disable-test
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 30b4dae628cb..6c37588b837e 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -11,33 +11,33 @@ COMMENT=	Video editing system
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:${PORTSDIR}/multimedia/v4l_compat \
-		${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libjack.so:${PORTSDIR}/audio/jack \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		liboil-0.3.so:${PORTSDIR}/devel/liboil \
-		libprojectM.so:${PORTSDIR}/graphics/libprojectm \
-		libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04 \
-		libopencv_calib3d.so:${PORTSDIR}/graphics/opencv \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libdv.so:${PORTSDIR}/multimedia/libdv \
-		libmjpegutils.so:${PORTSDIR}/multimedia/mjpegtools \
-		libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
-RUN_DEPENDS=	${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa \
-		mpg123:${PORTSDIR}/audio/mpg123 \
-		sox:${PORTSDIR}/audio/sox \
-		ogg123:${PORTSDIR}/audio/vorbis-tools \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		sswf:${PORTSDIR}/graphics/sswf \
-		mencoder:${PORTSDIR}/multimedia/mencoder \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
-		transcode:${PORTSDIR}/multimedia/transcode \
-		x264:${PORTSDIR}/multimedia/x264 \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat \
+		${LOCALBASE}/bin/analyseplugin:audio/ladspa
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libjack.so:audio/jack \
+		libpulse.so:audio/pulseaudio \
+		liboil-0.3.so:devel/liboil \
+		libprojectM.so:graphics/libprojectm \
+		libvisual-0.4.so:graphics/libvisual04 \
+		libopencv_calib3d.so:graphics/opencv \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libavcodec.so:multimedia/ffmpeg \
+		libdv.so:multimedia/libdv \
+		libmjpegutils.so:multimedia/mjpegtools \
+		libschroedinger-1.0.so:multimedia/schroedinger
+RUN_DEPENDS=	${LOCALBASE}/bin/analyseplugin:audio/ladspa \
+		mpg123:audio/mpg123 \
+		sox:audio/sox \
+		ogg123:audio/vorbis-tools \
+		convert:graphics/ImageMagick \
+		sswf:graphics/sswf \
+		mencoder:multimedia/mencoder \
+		mplayer:multimedia/mplayer \
+		ogmmerge:multimedia/ogmtools \
+		transcode:multimedia/transcode \
+		x264:multimedia/x264 \
+		cdrecord:sysutils/cdrtools
 
 USES=		ghostscript:run libtool localbase pathfix perl5 pkgconfig \
 		python shebangfix tar:bzip2
@@ -65,12 +65,12 @@ PORT_VERBS=	lives LiVES _encoder.py midistart midistop smogrify sendOSC
 OPTIONS_DEFINE=	DOCS DOXYGEN FREI0R MATROSKA NLS
 OPTIONS_SUB=	yes
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
-FREI0R_BUILD_DEPENDS=	frei0r>0:${PORTSDIR}/graphics/frei0r
-FREI0R_RUN_DEPENDS=	frei0r>0:${PORTSDIR}/graphics/frei0r
+FREI0R_BUILD_DEPENDS=	frei0r>0:graphics/frei0r
+FREI0R_RUN_DEPENDS=	frei0r>0:graphics/frei0r
 FREI0R_CONFIGURE_ENV_OFF=	ac_cv_header_frei0r_h=no
-MATROSKA_RUN_DEPENDS=	mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix
+MATROSKA_RUN_DEPENDS=	mkvmerge:multimedia/mkvtoolnix
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
diff --git a/multimedia/livestreamer/Makefile b/multimedia/livestreamer/Makefile
index e1bc1bb3b1e5..c6cb65dce3f1 100644
--- a/multimedia/livestreamer/Makefile
+++ b/multimedia/livestreamer/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Extract web streams and pipe them into video player of choice
 LICENSE=	BSD2CLAUSE MIT APACHE20
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	rtmpdump:${PORTSDIR}/multimedia/rtmpdump \
-		${PYTHON_PKGNAMEPREFIX}requests1>=0:${PORTSDIR}/www/py-requests1 \
-		${PYTHON_PKGNAMEPREFIX}futures>=0:${PORTSDIR}/devel/py-futures \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}librtmp>=0:${PORTSDIR}/multimedia/py-librtmp
+RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump \
+		${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1 \
+		${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}librtmp>=0:multimedia/py-librtmp
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 090e6061c076..8319bb7e5bdf 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Print information about the contents and structure of a DVD
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile
index 371684e2506f..0e46b6f8608f 100644
--- a/multimedia/lxdvdrip/Makefile
+++ b/multimedia/lxdvdrip/Makefile
@@ -11,14 +11,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Command Line Tool to make a copy from a Video DVD
 
-LIB_DEPENDS=	libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav \
-		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
-RUN_DEPENDS=	buffer:${PORTSDIR}/misc/buffer \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		mpgtx:${PORTSDIR}/multimedia/mpgtx \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		transcode:${PORTSDIR}/multimedia/transcode
+LIB_DEPENDS=	libdvdnav.so:multimedia/libdvdnav \
+		libdvdread.so:multimedia/libdvdread
+RUN_DEPENDS=	buffer:misc/buffer \
+		dvdauthor:multimedia/dvdauthor \
+		growisofs:sysutils/dvd+rw-tools \
+		mpgtx:multimedia/mpgtx \
+		mplayer:multimedia/mplayer \
+		transcode:multimedia/transcode
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/multimedia/m2tstoavi/Makefile b/multimedia/m2tstoavi/Makefile
index 99a691efdd2e..cc47c35d8033 100644
--- a/multimedia/m2tstoavi/Makefile
+++ b/multimedia/m2tstoavi/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	m2ts
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Utility which eases conversion of AVCHD (m2ts) to AVI
 
-RUN_DEPENDS=	xporthdmv:${PORTSDIR}/multimedia/xporthdmv \
-		ldecod:${PORTSDIR}/multimedia/jmref \
-		ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+RUN_DEPENDS=	xporthdmv:multimedia/xporthdmv \
+		ldecod:multimedia/jmref \
+		ffmpeg:multimedia/ffmpeg
 
 do-build:
 	${DO_NADA}
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 71c25efeffc5..7f3b48d0c986 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Provides technical and tag information for video and audio files
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../../../License.html
 
-LIB_DEPENDS=	libmediainfo.so:${PORTSDIR}/multimedia/libmediainfo \
-		libzen.so:${PORTSDIR}/multimedia/libzen
+LIB_DEPENDS=	libmediainfo.so:multimedia/libmediainfo \
+		libzen.so:multimedia/libzen
 
 CONFIGURE_ARGS=	--enable-shared
 GNU_CONFIGURE=	yes
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 8b941f0f81cf..399c3b805cba 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=	--disable-mplayer \
 			--disable-enca \
 			--disable-musepack
 
-LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=	libmp3lame.so:audio/lame
 
 ALL_TARGET=	mencoder
 
diff --git a/multimedia/mimms/Makefile b/multimedia/mimms/Makefile
index c8f4aeee5f18..b5e1afb45303 100644
--- a/multimedia/mimms/Makefile
+++ b/multimedia/mimms/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Download streams using the MMS protocol
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+LIB_DEPENDS=	libmms.so:net/libmms
 
 USES=		python tar:bzip2
 USE_PYTHON=	distutils
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index 50172afe95d0..fc7223af5e1d 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -13,22 +13,22 @@ COMMENT=	Video player to get internet TV broadcasts
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex \
-		${PYTHON_SITELIBDIR}/webkit/__init__.py:${PORTSDIR}/www/py-webkitgtk \
-		update-mime-database:${PORTSDIR}/misc/shared-mime-info \
-		${LOCALBASE}/include/boost/numeric/ublas/matrix.hpp:${PORTSDIR}/devel/boost-libs \
-		${LOCALBASE}/include/taglib/taglib.h:${PORTSDIR}/audio/taglib
-LIB_DEPENDS=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/dbus/glib.py:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:${PORTSDIR}/devel/py-notify \
-		${PYTHON_SITELIBDIR}/libtorrent.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar-python \
-		${PYTHON_SITELIBDIR}/webkit/webkit.so:${PORTSDIR}/www/py-webkitgtk \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:${PORTSDIR}/x11-toolkits/py-gnome2 \
-		${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-pycurl \
-		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
+BUILD_DEPENDS=	pyrexc:devel/pyrex \
+		${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk \
+		update-mime-database:misc/shared-mime-info \
+		${LOCALBASE}/include/boost/numeric/ublas/matrix.hpp:devel/boost-libs \
+		${LOCALBASE}/include/taglib/taglib.h:audio/taglib
+LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
+		libsqlite3.so:databases/sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_SITELIBDIR}/dbus/glib.py:devel/py-dbus \
+		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify \
+		${PYTHON_SITELIBDIR}/libtorrent.so:net-p2p/libtorrent-rasterbar-python \
+		${PYTHON_SITELIBDIR}/webkit/webkit.so:www/py-webkitgtk \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:x11-toolkits/py-gnome2 \
+		${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl \
+		${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen
 
 BUILD_WRKSRC=	${WRKSRC}/linux
 INSTALL_WRKSRC=	${WRKSRC}/linux
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 70489cb5f7f4..d27604612baa 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Set of tools to record/playback/edit videos in MPEG format
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 
 CONFLICTS=	mplex-[0-9]*
 
@@ -31,13 +31,13 @@ OPTIONS_DEFINE=		DOCS DV GTK2 PNG QUICKTIME SDL
 OPTIONS_DEFAULT=	GTK2 PNG SDL
 OPTIONS_SUB=		yes
 
-DV_LIB_DEPENDS=		libdv.so:${PORTSDIR}/multimedia/libdv
+DV_LIB_DEPENDS=		libdv.so:multimedia/libdv
 DV_CONFIGURE_WITH=	libdv
 GTK2_USE=		GNOME=gtk20
 GTK2_CONFIGURE_WITH=	gtk
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	libpng
-QUICKTIME_LIB_DEPENDS=	libquicktime.so:${PORTSDIR}/multimedia/libquicktime
+QUICKTIME_LIB_DEPENDS=	libquicktime.so:multimedia/libquicktime
 QUICKTIME_CONFIGURE_WITH=	libquicktime
 SDL_USE=		SDL=gfx,sdl
 SDL_CONFIGURE_OFF=	--without-libsdl --without-sdlgfx
diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index 683d8fada70a..acca86eeb013 100644
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -11,7 +11,7 @@ COMMENT=	HTTP video streaming daemon
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
 
 APP_BINARY=	mjpg_streamer
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index f67084172f3e..afff21092f72 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Tools to extract from/get info about/create Matroska media streams
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libebml.so:${PORTSDIR}/textproc/libebml \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libmatroska.so:${PORTSDIR}/multimedia/libmatroska
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg \
+		libebml.so:textproc/libebml \
+		libboost_regex.so:devel/boost-libs \
+		libmatroska.so:multimedia/libmatroska
 
 USES=		compiler:c++11-lib iconv pkgconfig tar:xz
 GNU_CONFIGURE=	yes
@@ -38,10 +38,10 @@ OPTIONS_DEFAULT=	FLAC QT5
 OPTIONS_SUB=	yes
 
 CURL_DESC=	Online update checks using curl
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_WITH=	flac
 
 NLS_USES=	gettext
diff --git a/multimedia/mkxvcd/Makefile b/multimedia/mkxvcd/Makefile
index 01651fcee6ea..caec0118efa1 100644
--- a/multimedia/mkxvcd/Makefile
+++ b/multimedia/mkxvcd/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Makes high quality X/K/S/VCD movies from many formats
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
-		bash:${PORTSDIR}/shells/bash \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		transcode:${PORTSDIR}/multimedia/transcode
+RUN_DEPENDS=	mpeg2enc:multimedia/mjpegtools \
+		bash:shells/bash \
+		mplayer:multimedia/mplayer \
+		transcode:multimedia/transcode
 
 USES=		shebangfix
 SHEBANG_FILES=	${PORTNAME}.sh
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index e74d468eaf94..a97bbd89a83f 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -49,43 +49,43 @@ SOX_DESC=	SoX audio effects support
 VIDSTAB_DESC=	Video stabilization support via Vid.Stab
 
 FFMPEG_SUFX=		# Currently empty.
-FFMPEG_LIB_DEPENDS=	libavformat${FFMPEG_SUFX}.so:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFX}
+FFMPEG_LIB_DEPENDS=	libavformat${FFMPEG_SUFX}.so:multimedia/ffmpeg${FFMPEG_SUFX}
 FFMPEG_CONFIGURE_ENABLE=avformat
 FFMPEG_CONFIGURE_ON=	--avformat-suffix="${FFMPEG_SUFX}"
 
-FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=frei0r
 
-GTK2_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+GTK2_LIB_DEPENDS=	libexif.so:graphics/libexif
 GTK2_USE=		GNOME=gdkpixbuf2,gtk20,pango
 GTK2_CONFIGURE_ENABLE=	gtk2
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
-JACK_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 JACK_CONFIGURE_ENABLE=	jackrack
 
 KDE4_CONFIGURE_ENV=	PATH="${KDE4_PREFIX}/bin:$$PATH"
 KDE4_CONFIGURE_WITH=	kde
 
-QT4_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+QT4_LIB_DEPENDS=	libexif.so:graphics/libexif
 QT4_USE=		QT4=corelib,gui,opengl,svg,xml
 QT4_CONFIGURE_ENABLE=	qt
 QT4_CONFIGURE_ON=	--qt-libdir="${QT_LIBDIR}" \
 			--qt-includedir="${QT_INCDIR}"
 
-SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_ENABLE=resample
 
-SOX_LIB_DEPENDS=	libsox.so:${PORTSDIR}/audio/sox
+SOX_LIB_DEPENDS=	libsox.so:audio/sox
 SOX_CONFIGURE_ENABLE=	sox
 
-SWFDEC_LIB_DEPENDS=	libswfdec-0.8.so:${PORTSDIR}/graphics/swfdec
+SWFDEC_LIB_DEPENDS=	libswfdec-0.8.so:graphics/swfdec
 SWFDEC_CONFIGURE_ENABLE=swfdec
 
 VDPAU_CONFIGURE_ON=	--avformat-vdpau
 VDPAU_CONFIGURE_OFF=	--avformat-no-vdpau
 
-VIDSTAB_LIB_DEPENDS=	libvidstab.so:${PORTSDIR}/multimedia/vid.stab
+VIDSTAB_LIB_DEPENDS=	libvidstab.so:multimedia/vid.stab
 VIDSTAB_CONFIGURE_ENABLE=vid.stab
 
 .include <bsd.port.options.mk>
diff --git a/multimedia/mmpython/Makefile b/multimedia/mmpython/Makefile
index 8861247a7ab8..09a2882cea43 100644
--- a/multimedia/mmpython/Makefile
+++ b/multimedia/mmpython/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Retrieves metadata from mp3, ogg, avi, jpg, and other formats
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
-RUN_DEPENDS=	lsdvd:${PORTSDIR}/multimedia/lsdvd
+LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
+RUN_DEPENDS=	lsdvd:multimedia/lsdvd
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index cf588bb4dc46..9b489c46f0b5 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -46,8 +46,8 @@ CONFIGURE_ARGS+=--without-bktr
 .if ${PORT_OPTIONS:MPWCBSD}
 # Location /boot/modules is hard coded in the pwc port, so use it here too
 KMODDIR=	/boot/modules
-BUILD_DEPENDS+=	v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat
-RUN_DEPENDS+=	${KMODDIR}/pwc.ko:${PORTSDIR}/multimedia/pwcbsd
+BUILD_DEPENDS+=	v4l_compat>=1.0.20060801:multimedia/v4l_compat
+RUN_DEPENDS+=	${KMODDIR}/pwc.ko:multimedia/pwcbsd
 CONFIGURE_ARGS+=--with-pwcbsd
 .else
 CONFIGURE_ARGS+=--without-pwcbsd
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--without-pwcbsd
 CONFIGURE_ARGS+=--without-linuxthreads
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavformat0.so:${PORTSDIR}/multimedia/ffmpeg0
+LIB_DEPENDS+=	libavformat0.so:multimedia/ffmpeg0
 CONFIGURE_ARGS+=--with-ffmpeg=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-ffmpeg
diff --git a/multimedia/mp3cd/Makefile b/multimedia/mp3cd/Makefile
index 52383742a9c2..d2609f2399f3 100644
--- a/multimedia/mp3cd/Makefile
+++ b/multimedia/mp3cd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl script that burns MP3 to audio CDs
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	p5-Config-Simple>=0:${PORTSDIR}/devel/p5-Config-Simple
+BUILD_DEPENDS=	p5-Config-Simple>=0:devel/p5-Config-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index ea240bafacdf..9069cecb94fe 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -12,17 +12,17 @@ MASTER_SITES=	LOCAL/ahze
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Standards-based system to encode, stream, and play MPEG-4 audio/video
 
-BUILD_DEPENDS=	mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2 \
-		${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac \
-		libfaad.so:${PORTSDIR}/audio/faad \
-		libmp3lame.so:${PORTSDIR}/audio/lame \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		liba52.so:${PORTSDIR}/audio/liba52 \
-		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \
-		libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \
-		libx264.so:${PORTSDIR}/multimedia/libx264
-RUN_DEPENDS=	mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2
+BUILD_DEPENDS=	mp4v2>=1.9.1:multimedia/mp4v2 \
+		${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
+LIB_DEPENDS=	libfaac.so:audio/faac \
+		libfaad.so:audio/faad \
+		libmp3lame.so:audio/lame \
+		libid3tag.so:audio/libid3tag \
+		liba52.so:audio/liba52 \
+		libmpeg2.so:multimedia/libmpeg2 \
+		libavcodec0.so:multimedia/ffmpeg0 \
+		libx264.so:multimedia/libx264
+RUN_DEPENDS=	mp4v2>=1.9.1:multimedia/mp4v2
 
 USE_GNOME=	gtk20
 USE_SDL=	sdl
@@ -72,7 +72,7 @@ USE_GNOME+=	esound
 .endif
 # nas
 .if ${PORT_OPTIONS:MNAS}
-LIB_DEPENDS+=	libaudio.so:${PORTSDIR}/audio/nas
+LIB_DEPENDS+=	libaudio.so:audio/nas
 .endif
 
 # ipv6
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=	--enable-ipv6
 
 # xvid
 .if ${PORT_OPTIONS:MXVID}
-LIB_DEPENDS+=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=	libxvidcore.so:multimedia/xvid
 
 PLIST_SUB+=	XVID=""
 .else
@@ -161,7 +161,7 @@ MMX=yes
 ###
 # mmx
 .if defined(MMX)
-BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS+=	yasm:devel/yasm
 .else
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 6a6a00a373a9..4904f335d577 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--disable-arts \
 PLIST_SUB+=	GMPLAYER=""
 DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
 .if ${PORT_OPTIONS:MSKINS}
-RUN_DEPENDS+=	mplayer-skins>=0:${PORTSDIR}/multimedia/mplayer-skins
+RUN_DEPENDS+=	mplayer-skins>=0:multimedia/mplayer-skins
 .endif
 
 USE_GNOME+=	gtk20
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 6d771f0728cb..534d91de89a1 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -12,8 +12,8 @@ DISTNAME=	MPlayer-${MPLAYER_PORT_VERSION}
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		compiler:c11 gmake iconv ncurses tar:xz
 GNU_CONFIGURE=	yes
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index 966620acb86d..c6e990eb2b2e 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -58,7 +58,7 @@ CFLAGS_i386+=	-mstack-alignment=16 -mstackrealign
 .endif # ${CHOSEN_COMPILER_TYPE} == clang
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS+=	${LOCALBASE}/bin/yasm:devel/yasm
 .endif
 
 CFLAGS_armv6+=	-no-integrated-as
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index 3c8e91f5279e..78d3ca364e10 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -4,132 +4,132 @@
 # Include before bsd.port.(pre|options).mk
 
 # OPTIONs
-AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_OFF=	--disable-aa
 
-AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:audio/opencore-amr
 AMR_NB_CONFIGURE_OFF=	--disable-libopencore_amrnb
 
-AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
+AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:audio/opencore-amr
 AMR_WB_CONFIGURE_OFF=	--disable-libopencore_amrwb
 
-BLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
+BLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 BLURAY_CONFIGURE_OFF=	--disable-bluray
 
-CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_OFF=	--disable-caca
 
-CDIO_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDIO_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_OFF=	--disable-libcdio
 
-DV_LIB_DEPENDS=		libdv.so:${PORTSDIR}/multimedia/libdv
+DV_LIB_DEPENDS=		libdv.so:multimedia/libdv
 DV_CONFIGURE_OFF=	--disable-libdv
 
-DVDNAV_LIB_DEPENDS=	libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
+DVDNAV_LIB_DEPENDS=	libdvdnav.so:multimedia/libdvdnav
 DVDNAV_CONFIGURE_OFF=	--disable-dvdnav
 
-ENCA_LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
+ENCA_LIB_DEPENDS=	libenca.so:converters/enca
 ENCA_CONFIGURE_OFF=	--disable-enca
 
-FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
+FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 FAAC_CONFIGURE_OFF=	--disable-faac
 
-FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_OFF=	--disable-fontconfig
 
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_OFF=	--disable-fribidi
 
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_OFF=	--disable-gif
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_OFF=	--disable-gnutls
 
-GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CONFIGURE_OFF=	--disable-libgsm
 
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_OFF=	--disable-inet6
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-jack
 
-LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
 LADSPA_CONFIGURE_OFF=	--disable-ladspa
 
-LIBMNG_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
+LIBMNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 LIBMNG_CONFIGURE_OFF=	--disable-mng
 
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_OFF=	--disable-lirc
 
-LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_OFF=	--disable-liblzo
 
-NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
+NAS_LIB_DEPENDS=	libaudio.so:audio/nas
 NAS_CONFIGURE_OFF=	--disable-nas
 
 OPENAL_USES=		openal:soft
 OPENAL_CONFIGURE_OFF=	--disable-openal
 
-OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
 OPENJPEG_CONFIGURE_OFF=	--disable-libopenjpeg
 
-OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_OFF=	--disable-libopus
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
-REAL_RUN_DEPENDS=	realplay:${PORTSDIR}/multimedia/linux-realplayer
-REAL_BUILD_DEPENDS=	realplay:${PORTSDIR}/multimedia/linux-realplayer
+REAL_RUN_DEPENDS=	realplay:multimedia/linux-realplayer
+REAL_BUILD_DEPENDS=	realplay:multimedia/linux-realplayer
 REAL_CONFIGURE_OFF=	--disable-real
 
-RTC_BUILD_DEPENDS=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
-RTC_RUN_DEPENDS=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
+RTC_BUILD_DEPENDS=	${LOCALBASE}/modules/rtc.ko:emulators/rtc
+RTC_RUN_DEPENDS=	${LOCALBASE}/modules/rtc.ko:emulators/rtc
 RTC_CONFIGURE_ENABLE=	rtc
 
 RTCPU_CONFIGURE_ON=	--enable-runtime-cpudetection
 
-RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
+RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 RTMP_CONFIGURE_OFF=	--disable-librtmp
 
-SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_OFF=	--disable-libschroedinger-lavc
 
 SDL_USE=		SDL=sdl
-SDL_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+SDL_LIB_DEPENDS=	libaa.so:graphics/aalib
 SDL_CONFIGURE_OFF=	--disable-sdl
 
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CONFIGURE_OFF=	--disable-smb
 
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_OFF=	--disable-speex
 
-SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_OFF=	--disable-svga
 
-THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_OFF=	--disable-theora
 
-TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 TWOLAME_CONFIGURE_OFF=	--disable-twolame
 
-V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_OFF=	--disable-tv-v4l1 --disable-tv-v4l2
 V4L_CONFIGURE_ON=	--enable-tv-v4l1 --enable-tv-v4l2 --extra-libs="-lv4l1 -lv4l2"
 
-VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_OFF=	--disable-vdpau
 
-VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_OFF=	--disable-libvpx-lavc
 
-X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264
+X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_OFF=	--disable-x264
 
-XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_OFF=	--disable-xvid
diff --git a/multimedia/mplayer2/Makefile b/multimedia/mplayer2/Makefile
index b0ae0f940026..992e01a5d715 100644
--- a/multimedia/mplayer2/Makefile
+++ b/multimedia/mplayer2/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Advanced general-purpose video player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libavcodec.so:multimedia/ffmpeg
+BUILD_DEPENDS=	rst2man:textproc/py-docutils
 
 USES=		cpe gmake iconv ncurses pkgconfig python:3,build tar:xz
 HAS_CONFIGURE=	yes
@@ -67,71 +67,71 @@ CONFLICTS=	mplayer-1.*
 
 BROKEN_sparc64=	Does not compile on sparc64
 
-A52_LIB_DEPENDS=	liba52.so:${PORTSDIR}/audio/liba52
+A52_LIB_DEPENDS=	liba52.so:audio/liba52
 A52_CONFIGURE_OFF=	--disable-liba52
 
-ASS_LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass
+ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_OFF=	--disable-libass
 
-CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_OFF=	--disable-caca
 
-CDIO_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDIO_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_OFF=	--disable-libcdio
 
 DEBUG_CONFIGURE_ON=	--enable-debug=3
 DEBUG_CONFIGURE_OFF=	--disable-debug
 
-DV_LIB_DEPENDS=		libdv.so:${PORTSDIR}/multimedia/libdv
+DV_LIB_DEPENDS=		libdv.so:multimedia/libdv
 DV_CONFIGURE_OFF=	--disable-libdv
 
-DVDREAD_LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_OFF=	--disable-dvdread
 
-DVDNAV_LIB_DEPENDS=	libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
+DVDNAV_LIB_DEPENDS=	libdvdnav.so:multimedia/libdvdnav
 DVDNAV_CONFIGURE_OFF=	--disable-dvdnav
 
-ENCA_LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
+ENCA_LIB_DEPENDS=	libenca.so:converters/enca
 ENCA_CONFIGURE_OFF=	--disable-enca
 
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_ON=	--enable-gif
 GIF_CONFIGURE_OFF=	--disable-gif
 
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_OFF=	--disable-inet6
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-jack
 
-LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
 LADSPA_CONFIGURE_OFF=	--disable-ladspa
 
-LIBBLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_OFF=--disable-bluray
 
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_OFF=	--disable-lirc
 
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_OFF=	--disable-mad
 
 OPENGL_USE=		GL=gl XORG=glproto
 OPENGL_CONFIGURE_OFF=	--disable-gl
 OPENGL_IMPLIES=		X11
 
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CONFIGURE_OFF=--disable-portaudio
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=--disable-pulse
 
-REALPLAYER_BUILD_DEPENDS=realplay:${PORTSDIR}/multimedia/linux-realplayer
-REALPLAYER_RUN_DEPENDS=	realplay:${PORTSDIR}/multimedia/linux-realplayer
+REALPLAYER_BUILD_DEPENDS=realplay:multimedia/linux-realplayer
+REALPLAYER_RUN_DEPENDS=	realplay:multimedia/linux-realplayer
 REALPLAYER_CONFIGURE_OFF=--disable-real
 
-RTC_BUILD_DEPENDS=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
-RTC_RUN_DEPENDS=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
+RTC_BUILD_DEPENDS=	${LOCALBASE}/modules/rtc.ko:emulators/rtc
+RTC_RUN_DEPENDS=	${LOCALBASE}/modules/rtc.ko:emulators/rtc
 RTC_CONFIGURE_OFF=	--disable-rtc
 
 RTCPU_CONFIGURE_ON=	--enable-runtime-cpudetection
@@ -140,24 +140,24 @@ RTCPU_CONFIGURE_OFF=	--disable-runtime-cpudetection
 SDL_USE=		SDL=sdl
 SDL_CONFIGURE_OFF=	--disable-sdl
 
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CONFIGURE_OFF=	--disable-smb
 
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_OFF=	--disable-speex
 
-THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_OFF=	--disable-theora
 
-V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_OFF=	--disable-tv-v4l2
 V4L_LIBS=		-lv4l2
 
-VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_OFF=	--disable-vdpau
 
-WIN32_RUN_DEPENDS=	win32-codecs>0:${PORTSDIR}/multimedia/win32-codecs
+WIN32_RUN_DEPENDS=	win32-codecs>0:multimedia/win32-codecs
 WIN32_CONFIGURE_ON=	--codecsdir=${LOCALBASE}/lib/win32
 WIN32_CONFIGURE_OFF=	--disable-win32dll --disable-qtx
 
diff --git a/multimedia/mps-youtube/Makefile b/multimedia/mps-youtube/Makefile
index 05b7621ec4bd..1e8116a244c1 100644
--- a/multimedia/mps-youtube/Makefile
+++ b/multimedia/mps-youtube/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Terminal based YouTube jukebox with playlist management
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	ca_root_nss>=3.17.3:${PORTSDIR}/security/ca_root_nss \
-		${PYTHON_PKGNAMEPREFIX}pafy>=0.5.0:${PORTSDIR}/www/py-pafy
+RUN_DEPENDS=	ca_root_nss>=3.17.3:security/ca_root_nss \
+		${PYTHON_PKGNAMEPREFIX}pafy>=0.5.0:www/py-pafy
 
 CONVERTER_DESC=	Converter to MP3 and other formats
 
-FFMPEG_RUN_DEPENDS=	ffmpeg>=2.3.6:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_RUN_DEPENDS=	ffmpeg>=2.3.6:multimedia/ffmpeg
 
 LIBAV_DESC=	Realtime audio/video conversion library
-LIBAV_RUN_DEPENDS=	libav>=11.2:${PORTSDIR}/multimedia/libav
+LIBAV_RUN_DEPENDS=	libav>=11.2:multimedia/libav
 
-MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 MPV_DESC=	Free and open-source general-purpose video player
-MPV_RUN_DEPENDS=	mpv:${PORTSDIR}/multimedia/mpv
+MPV_RUN_DEPENDS=	mpv:multimedia/mpv
 
 OPTIONS_DEFAULT=	MPV
 OPTIONS_RADIO=	CONVERTER
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 339cf0db2506..43fb64705b9d 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Free and open-source general-purpose video player
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+BUILD_DEPENDS=	rst2man:textproc/py-docutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpv-player waf-project:waf
@@ -60,40 +60,40 @@ IN_DESC=	Input
 VO_DESC=	Video Output
 AO_DESC=	Audio Output
 
-ALSA_LIB_DEPENDS=		libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=		--disable-alsa
 
-ASS_LIB_DEPENDS=		libass.so:${PORTSDIR}/multimedia/libass
+ASS_LIB_DEPENDS=		libass.so:multimedia/libass
 ASS_CONFIGURE_OFF=		--disable-libass
 
-CACA_LIB_DEPENDS=		libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
 CACA_CONFIGURE_OFF=		--disable-caca
 
-CDIO_LIB_DEPENDS=		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDIO_LIB_DEPENDS=		libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_OFF=		--disable-cdda
 
-DVDNAV_LIB_DEPENDS=		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
+DVDNAV_LIB_DEPENDS=		libdvdnav.so:multimedia/libdvdnav
 DVDNAV_CONFIGURE_OFF=		--disable-dvdnav
 
-DVDREAD_LIB_DEPENDS=		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+DVDREAD_LIB_DEPENDS=		libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_OFF=		--disable-dvdread
 
-ENCA_LIB_DEPENDS=		libenca.so:${PORTSDIR}/converters/enca
+ENCA_LIB_DEPENDS=		libenca.so:converters/enca
 ENCA_CONFIGURE_OFF=		--disable-enca
 
-JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_OFF=		--disable-jack
 
-LCMS2_LIB_DEPENDS=		liblcms2.so:${PORTSDIR}/graphics/lcms2
+LCMS2_LIB_DEPENDS=		liblcms2.so:graphics/lcms2
 LCMS2_CONFIGURE_OFF=		--disable-lcms2
 
-LIBBLURAY_LIB_DEPENDS=		libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_OFF=	--disable-libbluray
 
-LIBGUESS_LIB_DEPENDS=		libguess.so:${PORTSDIR}/textproc/libguess
+LIBGUESS_LIB_DEPENDS=		libguess.so:textproc/libguess
 LIBGUESS_CONFIGURE_OFF=		--disable-libguess
 
-LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
 LUAJIT_USES_OFF=		lua
 LUAJIT_CONFIGURE_ON=		--lua=luajit
 LUAJIT_CONFIGURE_OFF=		--lua=${LUA_VER_STR}fbsd
@@ -102,27 +102,27 @@ OPENGL_USE=			GL=gl
 OPENGL_CONFIGURE_OFF=		--disable-gl
 OPENGL_IMPLIES=			X11
 
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
 SDL_USE=			SDL=sdl2
 SDL_CONFIGURE_ON=		--enable-sdl2
 SDL_CONFIGURE_OFF=		--disable-sdl2
 
-SMB_LIB_DEPENDS=		libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=		libsmbclient.so:net/samba-libsmbclient
 SMB_CONFIGURE_OFF=		--disable-libsmbclient
 
-UCHARDET_LIB_DEPENDS=		libuchardet.so:${PORTSDIR}/textproc/uchardet
+UCHARDET_LIB_DEPENDS=		libuchardet.so:textproc/uchardet
 UCHARDET_CONFIGURE_OFF=		--disable-uchardet
 
-V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS=		libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_OFF=		--disable-tv-v4l2
 
-VAAPI_LIB_DEPENDS=		libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva
 VAAPI_CONFIGURE_OFF=		--disable-vaapi
 
-VDPAU_LIB_DEPENDS=		libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+VDPAU_LIB_DEPENDS=		libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_OFF=		--disable-vdpau
 
 X11_USE=			XORG=x11,xv,xxf86vm
@@ -132,7 +132,7 @@ XINERAMA_USE=			XORG=xinerama,xineramaproto
 XINERAMA_CONFIGURE_OFF=		--disable-xinerama
 XINERAMA_IMPLIES=		X11
 
-YTDL_RUN_DEPENDS=		youtube-dl:${PORTSDIR}/www/youtube_dl
+YTDL_RUN_DEPENDS=		youtube-dl:www/youtube_dl
 
 ZSH_USES=			perl5
 ZSH_USE=			PERL5=build
diff --git a/multimedia/msopenh264/Makefile b/multimedia/msopenh264/Makefile
index 70fff999270d..74abf4aa9936 100644
--- a/multimedia/msopenh264/Makefile
+++ b/multimedia/msopenh264/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	SAVANNAH/linphone/plugins/sources/
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Mediastreamer plugin for H264 encoding/decoding
 
-LIB_DEPENDS=	libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
-		libopenh264.so:${PORTSDIR}/multimedia/openh264
+LIB_DEPENDS=	libmediastreamer_base.so:net/mediastreamer \
+		libopenh264.so:multimedia/openh264
 
 USES=		libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/multimedia/msx264/Makefile b/multimedia/msx264/Makefile
index 1df98100bec3..77968a04e609 100644
--- a/multimedia/msx264/Makefile
+++ b/multimedia/msx264/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Mediastreamer plugin for H264 encoding
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
-		libx264.so:${PORTSDIR}/multimedia/libx264
+LIB_DEPENDS=	libmediastreamer_base.so:net/mediastreamer \
+		libx264.so:multimedia/libx264
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-strict
diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile
index 58665a56904f..91a0104d6279 100644
--- a/multimedia/mythtv-frontend/Makefile
+++ b/multimedia/mythtv-frontend/Makefile
@@ -8,12 +8,12 @@ CATEGORIES=	multimedia
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	MythTV is a homebrew PVR project
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
-		yasm:${PORTSDIR}/devel/yasm
-LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
+		yasm:devel/yasm
+LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libfreetype.so:print/freetype2 \
+		libtag.so:audio/taglib \
+		libxml2.so:textproc/libxml2
 
 CONFLICTS=	mythtv-[0-9]*
 
@@ -59,13 +59,13 @@ DESKTOP_ENTRIES="MythTV Frontend" "MythTV is a homebrew PVR project" "" \
 OPTIONS_DEFINE=	OPENGL JACK PULSEAUDIO VDPAU
 OPTIONS_DEFAULT=	OPENGL
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	audio-jack
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	audio-pulseoutput
 
-VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
 OPENGL_CONFIGURE_ENABLE=	opengl-video
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 827e09519dc2..128bf6403d77 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -8,14 +8,14 @@ CATEGORIES=	multimedia
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	MythTV is a homebrew PVR project
 
-LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
-BUILD_DEPENDS=	v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat \
-		yasm:${PORTSDIR}/devel/yasm
-RUN_DEPENDS=	tv_check:${PORTSDIR}/textproc/p5-xmltv \
-		wget:${PORTSDIR}/ftp/wget
+LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libfreetype.so:print/freetype2 \
+		libtag.so:audio/taglib \
+		libxml2.so:textproc/libxml2
+BUILD_DEPENDS=	v4l_compat>=1.0.20100321:multimedia/v4l_compat \
+		yasm:devel/yasm
+RUN_DEPENDS=	tv_check:textproc/p5-xmltv \
+		wget:ftp/wget
 
 CONFLICTS=	mythtv-frontend-[0-9]*
 
@@ -64,10 +64,10 @@ OPTIONS_DEFAULT=	BINDINGS OPENGL VDPAU
 OPTIONS_SUB=	BINDINGS
 BINDINGS_DESC=	Perl and Python bindings
 
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
-MYSQL_RUN_DEPENDS=	mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
+MYSQL_RUN_DEPENDS=	mysqld_safe:databases/mysql${MYSQL_VER}-server
 
-VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
 OPENGL_CONFIGURE_ENABLE=	opengl-video
@@ -82,24 +82,24 @@ USES+=		python
 PYDISTUTILS_PKGNAME=MythTV
 PYDISTUTILS_PKGVERSION=0.27._1
 
-BUILD_DEPENDS+=	py*-lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:${PORTSDIR}/www/py-urlgrabber \
-		p5-HTTP-Request-Params>=0:${PORTSDIR}/www/p5-HTTP-Request-Params \
-		p5-LWP-UserAgent-Determined>=0:${PORTSDIR}/www/p5-LWP-UserAgent-Determined \
-		p5-Net-UPnP>=0:${PORTSDIR}/multimedia/p5-Net-UPnP \
-		p5-IO-Socket-INET6>=2.51:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql
-RUN_DEPENDS+=	py*-lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:${PORTSDIR}/www/py-urlgrabber \
-		p5-HTTP-Request-Params>=0:${PORTSDIR}/www/p5-HTTP-Request-Params \
-		p5-LWP-UserAgent-Determined>=0:${PORTSDIR}/www/p5-LWP-UserAgent-Determined \
-		p5-Net-UPnP>=0:${PORTSDIR}/multimedia/p5-Net-UPnP \
-		p5-IO-Socket-INET6>=2.51:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS+=	py*-lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb \
+		${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber \
+		p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
+		p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined \
+		p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \
+		p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>0:databases/p5-DBD-mysql
+RUN_DEPENDS+=	py*-lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb \
+		${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber \
+		p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
+		p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined \
+		p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \
+		p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>0:databases/p5-DBD-mysql
 .else
 CONFIGURE_ARGS+=--without-bindings=perl,python
 .endif
diff --git a/multimedia/nordlicht/Makefile b/multimedia/nordlicht/Makefile
index 217673af60cb..e4ba1638d48f 100644
--- a/multimedia/nordlicht/Makefile
+++ b/multimedia/nordlicht/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Create moodbars from video files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libpopt.so:${PORTSDIR}/devel/popt \
-		libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	help2man:misc/help2man
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libpopt.so:devel/popt \
+		libpng.so:graphics/png
 
 USE_GITHUB=	yes
 
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index 8014403010a7..97c45f562127 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -10,13 +10,13 @@ COMMENT=	Open Broadcaster Software Multiplatform
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo \
-		libx264.so:${PORTSDIR}/multimedia/libx264 \
-		libv4l2.so:${PORTSDIR}/multimedia/libv4l \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libfdk-aac.so:${PORTSDIR}/audio/fdk-aac
-BUILD_DEPENDS=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo \
+		libx264.so:multimedia/libx264 \
+		libv4l2.so:multimedia/libv4l \
+		libpulse.so:audio/pulseaudio \
+		libavcodec.so:multimedia/ffmpeg \
+		libfdk-aac.so:audio/fdk-aac
+BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 
 BROKEN_FreeBSD_9=	does not build
 
diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
index 837f55039eac..474af3450e73 100644
--- a/multimedia/oggvideotools/Makefile
+++ b/multimedia/oggvideotools/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Toolbox for manipulating Ogg video files
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libogg.so:audio/libogg \
+		libtheora.so:multimedia/libtheora \
+		libvorbis.so:audio/libvorbis
 
 USES=		cmake compiler:c++11-lib pkgconfig
 USE_CXXSTD=	c++11
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index cdf40219b6d2..9497ef1a60f0 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Application and libraries for encoding DVDs into DivX/OGM files
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
-RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		mencoder:${PORTSDIR}/multimedia/mencoder \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		ogmmerge:${PORTSDIR}/multimedia/ogmtools
+BUILD_DEPENDS=	mencoder:multimedia/mencoder \
+		mplayer:multimedia/mplayer \
+		gsed:textproc/gsed
+LIB_DEPENDS=	libenca.so:converters/enca \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libdvdread.so:multimedia/libdvdread
+RUN_DEPENDS=	lame:audio/lame \
+		oggenc:audio/vorbis-tools \
+		mencoder:multimedia/mencoder \
+		mplayer:multimedia/mplayer \
+		ogmmerge:multimedia/ogmtools
 
 OPTIONS_DEFINE=	GTK2 ENCHANT MATROSKA MP4BOX NLS THEORA FAAC SRT DEBUG
 OPTIONS_DEFAULT=GTK2 NLS
@@ -49,8 +49,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--enable-gtk-support --enable-dbus-support \
 			--enable-libnotify-support
-LIB_DEPENDS+=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-			libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		libdbus-glib-1.so:devel/dbus-glib \
+			libnotify.so:devel/libnotify
 USE_GNOME+=		gconf2 libglade2
 GCONF_SCHEMAS=		ogmrip.schemas
 PLIST_SUB+=		GTK2_SUPPORT=""
@@ -62,7 +62,7 @@ PLIST_SUB+=		GTK2_SUPPORT="@comment "
 
 .if ${PORT_OPTIONS:MENCHANT}
 CONFIGURE_ARGS+=	--enable-enchant-support
-LIB_DEPENDS+=		libenchant.so:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS+=		libenchant.so:textproc/enchant
 PLIST_SUB+=		ENCHANT_SUPPORT=""
 .else
 CONFIGURE_ARGS+=	--disable-enchant-support
@@ -71,7 +71,7 @@ PLIST_SUB+=		ENCHANT_SUPPORT="@comment "
 
 .if ${PORT_OPTIONS:MMATROSKA}
 CONFIGURE_ARGS+=	--enable-mkv-support
-RUN_DEPENDS+=		mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix
+RUN_DEPENDS+=		mkvmerge:multimedia/mkvtoolnix
 PLIST_SUB+=		MATROSKA_SUPPORT=""
 .else
 CONFIGURE_ARGS+=	--disable-mkv-support
@@ -80,7 +80,7 @@ PLIST_SUB+=		MATROSKA_SUPPORT="@comment "
 
 .if ${PORT_OPTIONS:MMP4BOX}
 CONFIGURE_ARGS+=	--enable-mp4-support
-RUN_DEPENDS+=		mp4box:${PORTSDIR}/multimedia/gpac-mp4box
+RUN_DEPENDS+=		mp4box:multimedia/gpac-mp4box
 PLIST_SUB+=		MP4BOX_SUPPORT=""
 .else
 CONFIGURE_ARGS+=	--disable-mp4-support
@@ -97,7 +97,7 @@ PLIST_SUB+=		NLS="@comment "
 
 .if ${PORT_OPTIONS:MTHEORA}
 CONFIGURE_ARGS+=	--enable-theora-support
-LIB_DEPENDS+=		libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=		libtheora.so:multimedia/libtheora
 PLIST_SUB+=		THEORA_SUPPORT=""
 .else
 CONFIGURE_ARGS+=	--disable-theora-support
@@ -106,7 +106,7 @@ PLIST_SUB+=		THEORA_SUPPORT="@comment "
 
 .if ${PORT_OPTIONS:MFAAC}
 CONFIGURE_ARGS+=	--enable-aac-support
-RUN_DEPENDS+=		faac:${PORTSDIR}/audio/faac
+RUN_DEPENDS+=		faac:audio/faac
 PLIST_SUB+=		FAAC_SUPPORT=""
 .else
 CONFIGURE_ARGS+=	--disable-aac-support
@@ -115,7 +115,7 @@ PLIST_SUB+=		FAAC_SUPPORT="@comment "
 
 .if ${PORT_OPTIONS:MSRT}
 CONFIGURE_ARGS+=	--enable-srt-support
-RUN_DEPENDS+=		gocr:${PORTSDIR}/graphics/gocr
+RUN_DEPENDS+=		gocr:graphics/gocr
 MAN1+=			subp2pgm.1 subptools.1
 PLIST_SUB+=		SRT_SUPPORT=""
 .else
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index b66e503fb728..49003335b183 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.bunkus.org/videotools/ogmtools/
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create OGG media streams
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 USES=	tar:bzip2
 GNU_CONFIGURE=	yes
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DVDREAD
 OPTIONS_DEFAULT=	DVDREAD
 DVDREAD_DESC=	DVD title chapter extraction via libdvdread
 
-DVDREAD_LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_ON=	--with-dvdread \
 			--with-dvdread-includes=${LOCALBASE} \
 			--with-dvdread-libs=${LOCALBASE}
diff --git a/multimedia/omxplayer/Makefile b/multimedia/omxplayer/Makefile
index 694a4e0a59c0..7d637030ebf2 100644
--- a/multimedia/omxplayer/Makefile
+++ b/multimedia/omxplayer/Makefile
@@ -10,14 +10,14 @@ COMMENT=	Raspberry Pi video player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libEGL.so:${PORTSDIR}/misc/raspberrypi-userland \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/share/fonts/freefont-ttf/FreeSans.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libdbus-1.so:devel/dbus \
+		libpcre.so:devel/pcre \
+		libEGL.so:misc/raspberrypi-userland \
+		libavcodec.so:multimedia/ffmpeg \
+		libfreetype.so:print/freetype2
+RUN_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/share/fonts/freefont-ttf/FreeSans.ttf:x11-fonts/freefont-ttf
 
 ONLY_FOR_ARCHS=	armv6
 
diff --git a/multimedia/opencinematools/Makefile b/multimedia/opencinematools/Makefile
index ad54d70e377f..258fb707360b 100644
--- a/multimedia/opencinematools/Makefile
+++ b/multimedia/opencinematools/Makefile
@@ -10,9 +10,9 @@ DISTVERSIONSUFFIX=	-src
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Tools for creating multi-reel DCPs from MXF source material
 
-LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libasdcp.so:${PORTSDIR}/multimedia/asdcplib
+LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15 \
+		libexpat.so:textproc/expat2 \
+		libasdcp.so:multimedia/asdcplib
 
 USES=		dos2unix zip
 
diff --git a/multimedia/openh264/Makefile b/multimedia/openh264/Makefile
index 046faa7c7391..929e54494dda 100644
--- a/multimedia/openh264/Makefile
+++ b/multimedia/openh264/Makefile
@@ -31,11 +31,11 @@ OPTIONS_DEFAULT=PLUGINS
 OPTIONS_SUB=	yes
 
 DEBUG_BUILD_DEPENDS_OFF=	${DEBUG_BUILD_DEPENDS_OFF_${ARCH}}
-DEBUG_BUILD_DEPENDS_OFF_amd64=	nasm:${PORTSDIR}/devel/nasm
-DEBUG_BUILD_DEPENDS_OFF_i386=	nasm:${PORTSDIR}/devel/nasm
+DEBUG_BUILD_DEPENDS_OFF_amd64=	nasm:devel/nasm
+DEBUG_BUILD_DEPENDS_OFF_i386=	nasm:devel/nasm
 DEBUG_MAKE_ARGS=BUILDTYPE=Debug
-PLUGINS_BUILD_DEPENDS=gmp-api>=34.0:${PORTSDIR}/multimedia/gmp-api
-#			gmp-api<36.0:${PORTSDIR}/multimedia/gmp-api
+PLUGINS_BUILD_DEPENDS=gmp-api>=34.0:multimedia/gmp-api
+#			gmp-api<36.0:multimedia/gmp-api
 PLUGINS_CFLAGS=	-I${LOCALBASE}/include/gmp-api
 PLUGINS_MAKE_ARGS=HAVE_GMP_API=Yes
 PLUGINS_ALL_TARGET=plugin
@@ -45,7 +45,7 @@ WEBPLUGIN_FILES=gmp${PORTNAME}.info libgmp${PORTNAME}.so
 SUB_FILES+=	gmp${PORTNAME}.js
 SUB_LIST+=	PORTVERSION=${PORTVERSION} TIMESTAMP="`date +%s`"
 
-TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest
+TEST_BUILD_DEPENDS=googletest>=1.6.0:devel/googletest
 TEST_CFLAGS=	-I${LOCALBASE}/include
 TEST_MAKE_ARGS=	HAVE_GTEST=Yes
 TEST_ALL_TARGET=test
diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index 627c6c34b292..1de4e0b932c6 100644
--- a/multimedia/openshot/Makefile
+++ b/multimedia/openshot/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Non-linear video editor
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
-		frei0r-plugins>=0:${PORTSDIR}/graphics/frei0r-plugins \
-		${PYTHON_PKGNAMEPREFIX}goocanvas>=0:${PORTSDIR}/graphics/py-goocanvas \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2 \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}mlt>=0:${PORTSDIR}/multimedia/py-mlt \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \
-		scrollkeeper-install:${PORTSDIR}/textproc/rarian \
-		sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
+		frei0r-plugins>=0:graphics/frei0r-plugins \
+		${PYTHON_PKGNAMEPREFIX}goocanvas>=0:graphics/py-goocanvas \
+		${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}mlt>=0:multimedia/py-mlt \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \
+		scrollkeeper-install:textproc/rarian \
+		sox:audio/sox
 
 USE_GNOME=	pygtk2
 USE_PYTHON=	distutils
diff --git a/multimedia/oqtencoder/Makefile b/multimedia/oqtencoder/Makefile
index 7c9464851ea3..6f5a4696339e 100644
--- a/multimedia/oqtencoder/Makefile
+++ b/multimedia/oqtencoder/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:tl}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple encoder using OpenQuicktime (TM)
 
-LIB_DEPENDS=	libopenquicktime.so:${PORTSDIR}/multimedia/openquicktime
+LIB_DEPENDS=	libopenquicktime.so:multimedia/openquicktime
 
 USES=		localbase tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile
index ba4355b0e1d5..511c1d00f8bf 100644
--- a/multimedia/oqtplayer/Makefile
+++ b/multimedia/oqtplayer/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small, not functional, video OpenQuicktime (TM) player
 
-LIB_DEPENDS=	libopenquicktime.so:${PORTSDIR}/multimedia/openquicktime
+LIB_DEPENDS=	libopenquicktime.so:multimedia/openquicktime
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/multimedia/oscam/Makefile b/multimedia/oscam/Makefile
index c26f02ecb3da..52c12ab31e6c 100644
--- a/multimedia/oscam/Makefile
+++ b/multimedia/oscam/Makefile
@@ -17,7 +17,7 @@ USE_RC_SUBR=	oscam
 MAKE_ARGS+=	HOSTCC=clang CC=clang
 
 .if target(gen-dist)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 .endif
 SVN_REV=	11062
 SVN_SRC=	http://www.streamboard.tv/svn/oscam/trunk
diff --git a/multimedia/p5-Audio-M4P/Makefile b/multimedia/p5-Audio-M4P/Makefile
index 1e85c4e6048c..ee4d380bdca1 100644
--- a/multimedia/p5-Audio-M4P/Makefile
+++ b/multimedia/p5-Audio-M4P/Makefile
@@ -13,11 +13,11 @@ COMMENT=	M4P / MP4 / m4a Quicktime audio and video tools
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-Tree-Simple>=0:${PORTSDIR}/devel/p5-Tree-Simple \
-		p5-Tree-Simple-View>=0:${PORTSDIR}/devel/p5-Tree-Simple-View
+BUILD_DEPENDS=	p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+		p5-Tree-Simple>=0:devel/p5-Tree-Simple \
+		p5-Tree-Simple-View>=0:devel/p5-Tree-Simple-View
 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/multimedia/p5-FFmpeg-Command/Makefile b/multimedia/p5-FFmpeg-Command/Makefile
index a9b809db812f..8a1a9827ee70 100644
--- a/multimedia/p5-FFmpeg-Command/Makefile
+++ b/multimedia/p5-FFmpeg-Command/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Wrapper class for ffmpeg command line utility
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+RUN_DEPENDS+=	ffmpeg:multimedia/ffmpeg
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/multimedia/p5-FLV-Info/Makefile b/multimedia/p5-FLV-Info/Makefile
index 32a1c7af5e42..4898e67ee409 100644
--- a/multimedia/p5-FLV-Info/Makefile
+++ b/multimedia/p5-FLV-Info/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extract metadata from Flash Video files
 
-BUILD_DEPENDS=	p5-AMF-Perl>=0.15:${PORTSDIR}/www/p5-AMF-Perl \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-SWF-File>=0.033:${PORTSDIR}/graphics/p5-SWF-File
+BUILD_DEPENDS=	p5-AMF-Perl>=0.15:www/p5-AMF-Perl \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-SWF-File>=0.033:graphics/p5-SWF-File
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/multimedia/p5-GStreamer/Makefile b/multimedia/p5-GStreamer/Makefile
index 23e2e9906add..42f9c4f7b2ce 100644
--- a/multimedia/p5-GStreamer/Makefile
+++ b/multimedia/p5-GStreamer/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Set of Perl5 bindings for gstreamer
 
-BUILD_DEPENDS=	p5-Glib2>=1.101:${PORTSDIR}/devel/p5-Glib2 \
-		p5-ExtUtils-Depends>=0.205:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1.07:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
-RUN_DEPENDS=	p5-Glib2>=1.101:${PORTSDIR}/devel/p5-Glib2 \
-		p5-ExtUtils-Depends>=0.205:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1.07:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
+BUILD_DEPENDS=	p5-Glib2>=1.101:devel/p5-Glib2 \
+		p5-ExtUtils-Depends>=0.205:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1.07:devel/p5-ExtUtils-PkgConfig
+RUN_DEPENDS=	p5-Glib2>=1.101:devel/p5-Glib2 \
+		p5-ExtUtils-Depends>=0.205:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1.07:devel/p5-ExtUtils-PkgConfig
 
 USES=		gmake perl5
 USE_GSTREAMER=	yes
diff --git a/multimedia/p5-MP4-Info/Makefile b/multimedia/p5-MP4-Info/Makefile
index fb305666d147..4b4f5181a7c7 100644
--- a/multimedia/p5-MP4-Info/Makefile
+++ b/multimedia/p5-MP4-Info/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fetch info from MPEG-4 files
 
-BUILD_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Encode>=2.10:${PORTSDIR}/converters/p5-Encode
+BUILD_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String \
+		p5-Encode>=2.10:converters/p5-Encode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/multimedia/p5-Subtitles/Makefile b/multimedia/p5-Subtitles/Makefile
index efc9e72eb2bb..91ad77906fa7 100644
--- a/multimedia/p5-Subtitles/Makefile
+++ b/multimedia/p5-Subtitles/Makefile
@@ -17,8 +17,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SUBTITLES_SUBPLAY)
-RUN_DEPENDS=	p5-Prima>=0:${PORTSDIR}/x11-toolkits/p5-Prima \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS=	p5-Prima>=0:x11-toolkits/p5-Prima \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes
 
 PLIST_SUB+=	SUBPLAY=""
 MAN1+=		subplay.1
diff --git a/multimedia/p5-Video-OpenQuicktime/Makefile b/multimedia/p5-Video-OpenQuicktime/Makefile
index e8152bb7b085..c79746f84bd3 100644
--- a/multimedia/p5-Video-OpenQuicktime/Makefile
+++ b/multimedia/p5-Video-OpenQuicktime/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to the OpenQuicktime library
 
-BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.01:${PORTSDIR}/devel/p5-Inline-C
-LIB_DEPENDS=	libopenquicktime.so:${PORTSDIR}/multimedia/openquicktime
+BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
+		p5-Inline-C>=0.01:devel/p5-Inline-C
+LIB_DEPENDS=	libopenquicktime.so:multimedia/openquicktime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/multimedia/pHash/Makefile b/multimedia/pHash/Makefile
index 405dd78fcbfc..553bcf99bf5d 100644
--- a/multimedia/pHash/Makefile
+++ b/multimedia/pHash/Makefile
@@ -29,7 +29,7 @@ VIDEO_DESC=	Enable video hashing
 DEBUG_CONFIGURE_ENABLE=	debug
 
 FFTW_CONFIGURE_WITH=	fftw
-FFTW_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 JPEG_CONFIGURE_WITH=	libjpeg
 JPEG_USES=		jpeg
@@ -38,20 +38,20 @@ OPENMP_CONFIGURE_ENABLE=openmp
 OPENMP_USES=		compiler:openmp
 
 PNG_CONFIGURE_WITH=	libpng
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 AUDIO_CONFIGURE_ENABLE=	audio-hash
-AUDIO_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-			libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-			libmpg123.so:${PORTSDIR}/audio/mpg123
+AUDIO_LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+			libsamplerate.so:audio/libsamplerate \
+			libmpg123.so:audio/mpg123
 
 IMAGE_CONFIGURE_ENABLE=	image-hash
-IMAGE_BUILD_DEPENDS=	${LOCALBASE}/include/CImg.h:${PORTSDIR}/graphics/cimg
-IMAGE_RUN_DEPENDS=	${LOCALBASE}/include/CImg.h:${PORTSDIR}/graphics/cimg
+IMAGE_BUILD_DEPENDS=	${LOCALBASE}/include/CImg.h:graphics/cimg
+IMAGE_RUN_DEPENDS=	${LOCALBASE}/include/CImg.h:graphics/cimg
 
 VIDEO_CONFIGURE_ENABLE=	video-hash
-VIDEO_BUILD_DEPENDS=	${LOCALBASE}/include/CImg.h:${PORTSDIR}/graphics/cimg
-VIDEO_RUN_DEPENDS=	${LOCALBASE}/include/CImg.h:${PORTSDIR}/graphics/cimg
-VIDEO_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+VIDEO_BUILD_DEPENDS=	${LOCALBASE}/include/CImg.h:graphics/cimg
+VIDEO_RUN_DEPENDS=	${LOCALBASE}/include/CImg.h:graphics/cimg
+VIDEO_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 .include <bsd.port.mk>
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index b1dbf066f258..742256ef82ec 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -28,7 +28,7 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GST_PLUGINS
 GST_PLUGINS_DESC=	Install GStreamer plugins
-GST_PLUGINS_RUN_DEPENDS=	gstreamer1-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer1-plugins-all
+GST_PLUGINS_RUN_DEPENDS=	gstreamer1-plugins-all>=0:multimedia/gstreamer1-plugins-all
 
 post-install:
 	${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index 32775b9c46e7..d8c5b8246b26 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	VLC backend for Phonon
 
-LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc-qt4
+LIB_DEPENDS=	libvlc.so:multimedia/vlc-qt4
 
 USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib gui phonon \
diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile
index b5a16ca5a221..2599d534802a 100644
--- a/multimedia/phonon-xine/Makefile
+++ b/multimedia/phonon-xine/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	The xine backend for Phonon
 
-LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS=	libxine.so:multimedia/libxine
 
 USES=		cmake pkgconfig tar:bzip2
 USE_KDE4=	automoc4 kdeprefix
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 3d7ba4d293f6..6639b08afa08 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -12,7 +12,7 @@ COMMENT=	KDE multimedia framework
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libqzeitgeist.so:${PORTSDIR}/sysutils/qzeitgeist
+LIB_DEPENDS=	libqzeitgeist.so:sysutils/qzeitgeist
 
 USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib dbus gui \
@@ -27,7 +27,7 @@ PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS_DEFINE=	PULSEAUDIO
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_USE=		GNOME=glib20
 PULSEAUDIO_CMAKE_ON=	-DWITH_PulseAudio:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DWITH_PulseAudio:BOOL=OFF
diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile
index b95961e878c5..0d83b90ee2c3 100644
--- a/multimedia/photofilmstrip/Makefile
+++ b/multimedia/photofilmstrip/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Creates movies out of your pictures
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
-		mplayer:${PORTSDIR}/multimedia/mplayer
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS=	mencoder:multimedia/mencoder \
+		mplayer:multimedia/mplayer
 
 USES=		python gettext
 USE_PYTHON=	distutils autoplist
diff --git a/multimedia/php-pHash/Makefile b/multimedia/php-pHash/Makefile
index 4823c5d6102f..4079f9284c9e 100644
--- a/multimedia/php-pHash/Makefile
+++ b/multimedia/php-pHash/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP extension for the pHash perceptual hash library
 LICENSE=	PHP30
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpHash.so:${PORTSDIR}/multimedia/pHash
+LIB_DEPENDS=	libpHash.so:multimedia/pHash
 
 USE_PHP=	yes
 USE_PHPIZE=	yes
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 082a98d187b0..56b5d8942f31 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Gstreamer based non-linear audio/video editor
 
-RUN_DEPENDS=	py*-zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas
+RUN_DEPENDS=	py*-zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas
 
 USES=		gettext gmake pkgconfig python tar:bzip2
 USE_GNOME=	intltool pygtk2
diff --git a/multimedia/playd/Makefile b/multimedia/playd/Makefile
index b92c766a6178..ba01b60ca8e9 100644
--- a/multimedia/playd/Makefile
+++ b/multimedia/playd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Very easy-to-use mplayer sh wrapper script (supports playlists)
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 PLIST_FILES=	bin/playd \
 		man/man1/playd.1.gz
diff --git a/multimedia/plexhometheater/Makefile b/multimedia/plexhometheater/Makefile
index 14e3732fd7e2..34c7305285ce 100644
--- a/multimedia/plexhometheater/Makefile
+++ b/multimedia/plexhometheater/Makefile
@@ -13,54 +13,54 @@ COMMENT=	Media center frontend to multimedia/plexmediaserver
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	enca:${PORTSDIR}/converters/enca \
-		gawk:${PORTSDIR}/lang/gawk \
-		gperf:${PORTSDIR}/devel/gperf \
-		cmake:${PORTSDIR}/devel/cmake \
-		zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip \
-		nasm:${PORTSDIR}/devel/nasm \
-		gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20 \
-		swig2.0:${PORTSDIR}/devel/swig20
-
-LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass \
-		libavahi-client.so:${PORTSDIR}/net/avahi-app \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libcdio.so:${PORTSDIR}/sysutils/libcdio \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libenca.so:${PORTSDIR}/converters/enca \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libhal.so:${PORTSDIR}/sysutils/hal \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libplist.so:${PORTSDIR}/devel/libplist \
-		libpng.so:${PORTSDIR}/graphics/png \
-		librtmp.so:${PORTSDIR}/multimedia/librtmp \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libshairport.so:${PORTSDIR}/audio/libshairport \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
-		libva.so:${PORTSDIR}/multimedia/libva \
-		libvdpau.so:${PORTSDIR}/multimedia/libvdpau \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libyajl.so:${PORTSDIR}/devel/yajl
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		glxinfo:${PORTSDIR}/graphics/mesa-demos \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
+BUILD_DEPENDS=	enca:converters/enca \
+		gawk:lang/gawk \
+		gperf:devel/gperf \
+		cmake:devel/cmake \
+		zip:archivers/zip \
+		unzip:archivers/unzip \
+		nasm:devel/nasm \
+		gtk-update-icon-cache:x11-toolkits/gtk20 \
+		swig2.0:devel/swig20
+
+LIB_DEPENDS=	libass.so:multimedia/libass \
+		libavahi-client.so:net/avahi-app \
+		libboost_thread.so:devel/boost-libs \
+		libcdio.so:sysutils/libcdio \
+		libcurl.so:ftp/curl \
+		libdbus-1.so:devel/dbus \
+		libenca.so:converters/enca \
+		libFLAC.so:audio/flac \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libfribidi.so:converters/fribidi \
+		libhal.so:sysutils/hal \
+		libjasper.so:graphics/jasper \
+		liblzo2.so:archivers/lzo2 \
+		libmad.so:audio/libmad \
+		libmicrohttpd.so:www/libmicrohttpd \
+		libmodplug.so:audio/libmodplug \
+		libmpeg2.so:multimedia/libmpeg2 \
+		libpcre.so:devel/pcre \
+		libplist.so:devel/libplist \
+		libpng.so:graphics/png \
+		librtmp.so:multimedia/librtmp \
+		libsamplerate.so:audio/libsamplerate \
+		libshairport.so:audio/libshairport \
+		libsqlite3.so:databases/sqlite3 \
+		libtag.so:audio/taglib \
+		libtiff.so:graphics/tiff \
+		libtinyxml.so:textproc/tinyxml \
+		libva.so:multimedia/libva \
+		libvdpau.so:multimedia/libvdpau \
+		libvorbis.so:audio/libvorbis \
+		libxslt.so:textproc/libxslt \
+		libyajl.so:devel/yajl
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		glxinfo:graphics/mesa-demos \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		xdpyinfo:x11/xdpyinfo
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	plexinc
@@ -103,13 +103,13 @@ CEC_DESC=	Control plexhometheater over HDMI with TV remote
 
 OPTIONS_DEFAULT=	CEC LIRC
 
-CEC_BUILD_DEPENDS=	libcec>=2.2.0:${PORTSDIR}/multimedia/libcec
-CEC_LIB_DEPENDS=	libcec.so:${PORTSDIR}/multimedia/libcec
+CEC_BUILD_DEPENDS=	libcec>=2.2.0:multimedia/libcec
+CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec
 CEC_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_CEC:BOOL=true
 
-LIRC_RUN_DEPENDS=	lircd:${PORTSDIR}/comms/lirc
+LIRC_RUN_DEPENDS=	lircd:comms/lirc
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio:BOOL=true
 
 .include <bsd.port.options.mk>
diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile
index c7f6480188cc..4b00299fd118 100644
--- a/multimedia/plexmediaserver/Makefile
+++ b/multimedia/plexmediaserver/Makefile
@@ -37,7 +37,7 @@ ONLY_FOR_ARCHS_REASON=	binary-only program, source code not available
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000054
-RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
+RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
 .endif
 
 post-patch:
diff --git a/multimedia/plexpy/Makefile b/multimedia/plexpy/Makefile
index d4fa1d5348df..cfbf5be60b9b 100644
--- a/multimedia/plexpy/Makefile
+++ b/multimedia/plexpy/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Monitoring, analytics, and notifications for Plex Media Server
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
diff --git a/multimedia/plexwatch/Makefile b/multimedia/plexwatch/Makefile
index c3343bdd2f2a..06fe8d01610c 100644
--- a/multimedia/plexwatch/Makefile
+++ b/multimedia/plexwatch/Makefile
@@ -9,14 +9,14 @@ CATEGORIES=	multimedia
 MAINTAINER=	ultima1252@gmail.com
 COMMENT=	Notify, Log Now Playing and Watched content from a Plex Media Server
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Time-Duration>=0:${PORTSDIR}/devel/p5-Time-Duration \
-		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Time-Duration>=0:devel/p5-Time-Duration \
+		p5-Time-modules>=0:devel/p5-Time-modules \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	plexWatch.pl
@@ -30,17 +30,17 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=	EMAIL GNTP IPLOG TWITTER
 OPTIONS_DEFAULT=
 
-EMAIL_RUN_DEPENDS=	p5-Net-SMTPS>=0:${PORTSDIR}/mail/p5-Net-SMTPS
+EMAIL_RUN_DEPENDS=	p5-Net-SMTPS>=0:mail/p5-Net-SMTPS
 EMAIL_DESC=		Email support
 
-GNTP_RUN_DEPENDS=	p5-Growl-GNTP>=0:${PORTSDIR}/net/p5-Growl-GNTP
+GNTP_RUN_DEPENDS=	p5-Growl-GNTP>=0:net/p5-Growl-GNTP
 GNTP_DESC=		Growl GNTP support
 
-IPLOG_RUN_DEPENDS=	p5-File-ReadBackwards>=0:${PORTSDIR}/devel/p5-File-ReadBackwards
+IPLOG_RUN_DEPENDS=	p5-File-ReadBackwards>=0:devel/p5-File-ReadBackwards
 IPLOG_DESC=		Client IP logging support
 
-TWITTER_RUN_DEPENDS=	p5-Net-Twitter-Lite>=0:${PORTSDIR}/net/p5-Net-Twitter-Lite \
-			p5-Net-OAuth>=0:${PORTSDIR}/net/p5-Net-OAuth
+TWITTER_RUN_DEPENDS=	p5-Net-Twitter-Lite>=0:net/p5-Net-Twitter-Lite \
+			p5-Net-OAuth>=0:net/p5-Net-OAuth
 TWITTER_DESC=		Twitter support
 
 post-patch:
diff --git a/multimedia/podcastdl/Makefile b/multimedia/podcastdl/Makefile
index b0986a3d6980..c22429ede9f6 100644
--- a/multimedia/podcastdl/Makefile
+++ b/multimedia/podcastdl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple command line podcast client written in plain C
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libmrss.so:${PORTSDIR}/textproc/libmrss
+LIB_DEPENDS=	libmrss.so:textproc/libmrss
 
 USES=		cmake
 
diff --git a/multimedia/poe/Makefile b/multimedia/poe/Makefile
index 204ddd8fb32d..bdb38e0c1fd8 100644
--- a/multimedia/poe/Makefile
+++ b/multimedia/poe/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Vorbis comment editor for GNUstep
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 USES=		gnustep
 USE_GNUSTEP=	back build
diff --git a/multimedia/pwcview/Makefile b/multimedia/pwcview/Makefile
index 6a3d933a701a..287623b4c971 100644
--- a/multimedia/pwcview/Makefile
+++ b/multimedia/pwcview/Makefile
@@ -12,8 +12,8 @@ MASTER_SITES=	http://raaf.atspace.org/ \
 MAINTAINER=	hselasky@FreeBSD.org
 COMMENT=	The Video4Linux PWC webcam viewer
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
+LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
 
 CONFLICTS=	pwcbsd-[0-9]*
 
diff --git a/multimedia/py-ffmpeg/Makefile b/multimedia/py-ffmpeg/Makefile
index 1473807e2417..a7fcfc61ebcc 100644
--- a/multimedia/py-ffmpeg/Makefile
+++ b/multimedia/py-ffmpeg/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Python bindings for FFmpeg
 LICENSE=	LGPL20 LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+BUILD_DEPENDS=	cython:lang/cython
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 MAKE_ENV=	FFMPEG_LIBRARIES="SDL SDL_mixer" FFMPEG_LIBRARY_DIRS=${LOCALBASE}/lib \
 		FFMPEG_INCLUDES=${LOCALBASE}/include/SDL FFMPEG_ROOT=${LOCALBASE}
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index d57ab47f60ef..f0fadf859365 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Python bindings for gstreamer
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2
 
 PORTSCOUT=	limit:0\.10\..*
 
diff --git a/multimedia/py-guessit/Makefile b/multimedia/py-guessit/Makefile
index 0037b09cacc3..9bc8c95afcf0 100644
--- a/multimedia/py-guessit/Makefile
+++ b/multimedia/py-guessit/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Extract as much information as possible from a video file
 
 LICENSE=	LGPL3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.4:${PORTSDIR}/devel/py-babelfish \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}stevedore>=0.14:${PORTSDIR}/devel/py-stevedore \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}enzyme>=0:${PORTSDIR}/multimedia/py-enzyme
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.4:devel/py-babelfish \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}stevedore>=0.14:devel/py-stevedore \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}enzyme>=0:multimedia/py-enzyme
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/multimedia/py-kaa-base/Makefile b/multimedia/py-kaa-base/Makefile
index df1a129aa964..73033902e866 100644
--- a/multimedia/py-kaa-base/Makefile
+++ b/multimedia/py-kaa-base/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	fbsd@opal.com
 COMMENT=	Kaa Media Repository
 
-LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+LIB_DEPENDS=	libglib-2.0.so:devel/glib20
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
+		${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/multimedia/py-kaa-imlib2/Makefile b/multimedia/py-kaa-imlib2/Makefile
index 37b87b80018b..daa48a10ae62 100644
--- a/multimedia/py-kaa-imlib2/Makefile
+++ b/multimedia/py-kaa-imlib2/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	fbsd@opal.com
 COMMENT=	Kaa Media Repository - imlib2 wrapper for python
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/kaa/__init__.py:${PORTSDIR}/multimedia/py-kaa-base
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile
index 803b26fab1aa..8aeb711736a1 100644
--- a/multimedia/py-kaa-metadata/Makefile
+++ b/multimedia/py-kaa-metadata/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	fbsd@opal.com
 COMMENT=	Kaa Media Repository - media file metadata parser
 
-LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}kaa-base>0:${PORTSDIR}/multimedia/py-kaa-base \
-		${PYTHON_PKGNAMEPREFIX}exiv2>0:${PORTSDIR}/graphics/py-exiv2
+LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}kaa-base>0:multimedia/py-kaa-base \
+		${PYTHON_PKGNAMEPREFIX}exiv2>0:graphics/py-exiv2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:2
diff --git a/multimedia/py-librtmp/Makefile b/multimedia/py-librtmp/Makefile
index 0b22720c8b59..6bf9207e6ae1 100644
--- a/multimedia/py-librtmp/Makefile
+++ b/multimedia/py-librtmp/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python bindings for librtmp, built with cffi
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=0:${PORTSDIR}/devel/py-cffi
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=0:${PORTSDIR}/devel/py-cffi
+LIB_DEPENDS=	librtmp.so:multimedia/librtmp
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -26,7 +26,7 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}singledispatch>=0:${PORTSDIR}/devel/py-singledispatch
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/py-mlt/Makefile b/multimedia/py-mlt/Makefile
index ac85393897d0..65ae44a0ba64 100644
--- a/multimedia/py-mlt/Makefile
+++ b/multimedia/py-mlt/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Python bindings for the MLT multimedia framework
 LICENSE=	GPLv2
 LICENSE_COMB=	single
 
-LIB_DEPENDS=	libmlt.so:${PORTSDIR}/${MASTER_PORT}
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LIB_DEPENDS=	libmlt.so:${MASTER_PORT}
+BUILD_DEPENDS=	swig:devel/swig13
 
 USES=		python:2
 MASTERDIR=	${.CURDIR:H:H}/multimedia/mlt
diff --git a/multimedia/py-openlp/Makefile b/multimedia/py-openlp/Makefile
index 27f860f65ae4..4bd480b44cc8 100644
--- a/multimedia/py-openlp/Makefile
+++ b/multimedia/py-openlp/Makefile
@@ -11,28 +11,28 @@ COMMENT=	Open Source Lyrics Projection
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.5:${PORTSDIR}/databases/py-sqlalchemy
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-phonon>=0:${PORTSDIR}/multimedia/py-qt4-phonon \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.5:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-opengl>=0:${PORTSDIR}/x11/py-qt4-opengl \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_PKGNAMEPREFIX}qt4-test>=0:${PORTSDIR}/devel/py-qt4-test \
-		${PYTHON_PKGNAMEPREFIX}chardet>=0:${PORTSDIR}/textproc/py-chardet \
-		${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako \
-		${PYTHON_PKGNAMEPREFIX}enchant>0:${PORTSDIR}/textproc/py-enchant \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:${PORTSDIR}/databases/py-sqlalchemy-migrate \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		unoconv:${PORTSDIR}/textproc/unoconv
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.5:databases/py-sqlalchemy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32 \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-phonon>=0:multimedia/py-qt4-phonon \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.5:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:www/py-qt4-webkit \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-opengl>=0:x11/py-qt4-opengl \
+		${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:graphics/py-qt4-svg \
+		${PYTHON_PKGNAMEPREFIX}qt4-test>=0:devel/py-qt4-test \
+		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \
+		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
+		${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:databases/py-sqlalchemy-migrate \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		unoconv:textproc/unoconv
 
 USES=		desktop-file-utils python
 USE_PYTHON=	distutils autoplist
diff --git a/multimedia/py-periscope/Makefile b/multimedia/py-periscope/Makefile
index 721970a0acea..17ab551dd7a4 100644
--- a/multimedia/py-periscope/Makefile
+++ b/multimedia/py-periscope/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Subtitles searching module
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PYTHON=	distutils autoplist
@@ -26,7 +26,7 @@ USES=		desktop-file-utils python
 
 OPTIONS_DEFINE=	UNRAR
 UNRAR_DESC=	rar support (.rar) for compressed subtitles
-UNRAR_RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
+UNRAR_RUN_DEPENDS=	unrar:archivers/unrar
 
 OPTIONS_DEFAULT=	UNRAR
 
diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile
index 264940a597c4..f1a240f0c2b1 100644
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtMultimedia 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/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile
index 9d74484de306..8034fca6f405 100644
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install Phonon 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/multimedia/py-qt5-multimedia/Makefile b/multimedia/py-qt5-multimedia/Makefile
index fb76d3f42d9b..4d8b311b4d90 100644
--- a/multimedia/py-qt5-multimedia/Makefile
+++ b/multimedia/py-qt5-multimedia/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtMultimedia 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/multimedia/py-qt5-multimediawidgets/Makefile b/multimedia/py-qt5-multimediawidgets/Makefile
index 0901aaa88b72..398dafbde6bf 100644
--- a/multimedia/py-qt5-multimediawidgets/Makefile
+++ b/multimedia/py-qt5-multimediawidgets/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtMultimedia 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/multimedia/py-soco/Makefile b/multimedia/py-soco/Makefile
index 1e458e1e958e..9443de530f13 100644
--- a/multimedia/py-soco/Makefile
+++ b/multimedia/py-soco/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python library to control Sonos speakers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SoCo
diff --git a/multimedia/py-subliminal/Makefile b/multimedia/py-subliminal/Makefile
index 913ff75751e2..074c44205910 100644
--- a/multimedia/py-subliminal/Makefile
+++ b/multimedia/py-subliminal/Makefile
@@ -11,18 +11,18 @@ COMMENT=	Python library to search and download subtitles
 
 LICENSE=	LGPL3
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/__init__.py:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.0:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}enzyme>=0.4.1:${PORTSDIR}/multimedia/py-enzyme \
-		${PYTHON_PKGNAMEPREFIX}guessit>=0.9.1:${PORTSDIR}/multimedia/py-guessit \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}click>=4.0:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}stevedore>=1.0.0:${PORTSDIR}/devel/py-stevedore \
-		${PYTHON_PKGNAMEPREFIX}chardet>=2.3.0:${PORTSDIR}/textproc/py-chardet \
-		${PYTHON_PKGNAMEPREFIX}pysrt>=1.0.1:${PORTSDIR}/textproc/py-pysrt \
-		${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.2:${PORTSDIR}/devel/py-babelfish \
-		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.4:${PORTSDIR}/devel/py-dogpile.cache \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.0:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}enzyme>=0.4.1:multimedia/py-enzyme \
+		${PYTHON_PKGNAMEPREFIX}guessit>=0.9.1:multimedia/py-guessit \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}click>=4.0:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}stevedore>=1.0.0:devel/py-stevedore \
+		${PYTHON_PKGNAMEPREFIX}chardet>=2.3.0:textproc/py-chardet \
+		${PYTHON_PKGNAMEPREFIX}pysrt>=1.0.1:textproc/py-pysrt \
+		${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.2:devel/py-babelfish \
+		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.4:devel/py-dogpile.cache \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Diaoul
diff --git a/multimedia/py-tvnamer/Makefile b/multimedia/py-tvnamer/Makefile
index ef733d8bb6fc..15138ca9e9a3 100644
--- a/multimedia/py-tvnamer/Makefile
+++ b/multimedia/py-tvnamer/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Automatically names downloaded/recorded TV-episode
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:${PORTSDIR}/www/py-tvdb_api
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:${PORTSDIR}/www/py-tvdb_api
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/multimedia/pyjama/Makefile b/multimedia/pyjama/Makefile
index fa470d32f669..1bd6d2e58b53 100644
--- a/multimedia/pyjama/Makefile
+++ b/multimedia/pyjama/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	pyjama-0.3.0.1_all
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Frontend to the Jamendo music network
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}lxml>=2.2:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson	\
-		${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:${PORTSDIR}/multimedia/py-gstreamer
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson	\
+		${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer
 
 NO_BUILD=	yes
 USE_GSTREAMER=	core good bad gnomevfs
diff --git a/multimedia/pymp/Makefile b/multimedia/pymp/Makefile
index d6fe4b9b23d9..09efb37d897d 100644
--- a/multimedia/pymp/Makefile
+++ b/multimedia/pymp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Lean, flexible frontend to MPlayer written in Python
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jdolan
diff --git a/multimedia/qmmp-plugin-pack-qt5/Makefile b/multimedia/qmmp-plugin-pack-qt5/Makefile
index 33881557d886..ca117cba89fa 100644
--- a/multimedia/qmmp-plugin-pack-qt5/Makefile
+++ b/multimedia/qmmp-plugin-pack-qt5/Makefile
@@ -14,8 +14,8 @@ LICENSE=	GPLv2
 
 CONFLICTS=	${PORTNAME}-0.*
 
-LIB_DEPENDS=	libqmmpui.so:${PORTSDIR}/multimedia/qmmp-qt5
-BUILD_DEPENDS=	qmmp-qt5>=1.0.0:${PORTSDIR}/multimedia/qmmp-qt5
+LIB_DEPENDS=	libqmmpui.so:multimedia/qmmp-qt5
+BUILD_DEPENDS=	qmmp-qt5>=1.0.0:multimedia/qmmp-qt5
 
 USES=		cmake:outsource pkgconfig tar:bzip2
 USE_QT5=	core gui qmake_build buildtools_build linguisttools_build
@@ -29,7 +29,7 @@ OPTIONS_MULTI_PLUGINS=	FFAP MPG123 XMP
 OPTIONS_DEFAULT=	FFAP MPG123 XMP
 
 FFAP_DESC=		Support APE sound file
-FFAP_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+FFAP_LIB_DEPENDS=	libtag.so:audio/taglib
 FFAP_CMAKE_ON=	-DUSE_FFAP:BOOL=TRUE
 FFAP_CMAKE_OFF=	-DUSE_FFAP:BOOL=FALSE
 OPTIONS_DEFINE_i386=	FFAPASM
@@ -37,16 +37,16 @@ OPTIONS_DEFAULT_i386=	FFAPASM
 OPTIONS_DEFINE_amd64=	FFAPASM
 OPTIONS_DEFAULT_amd64=	FFAPASM
 FFAPASM_DESC=	Optimize FFap decoder using devel/yasm
-FFAPASM_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+FFAPASM_BUILD_DEPENDS=	yasm:devel/yasm
 FFAPASM_CMAKE_ON=	-DUSE_ASM:BOOL=TRUE
 FFAPASM_CMAKE_OFF=	-DUSE_ASM:BOOL=FALSE
 
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CMAKE_ON=	-DUSE_MPG123:BOOL=TRUE
 MPG123_CMAKE_OFF=	-DUSE_MPG123:BOOL=FALSE
 
 XMP_DESC=		Support various module formats using libxmp
-XMP_LIB_DEPENDS=	libxmp.so:${PORTSDIR}/audio/libxmp
+XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
 XMP_CMAKE_ON=	-DUSE_XMP:BOOL=TRUE
 XMP_CMAKE_OFF=	-DUSE_XMP:BOOL=FALSE
 
diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile
index 5e46d52f357f..e63766858e32 100644
--- a/multimedia/qmmp-plugin-pack/Makefile
+++ b/multimedia/qmmp-plugin-pack/Makefile
@@ -13,8 +13,8 @@ LICENSE=	GPLv2
 
 CONFLICTS=	${PORTNAME}-qt5-1.*
 
-LIB_DEPENDS=	libqmmpui.so:${PORTSDIR}/multimedia/qmmp
-BUILD_DEPENDS=	qmmp>=0.9.0:${PORTSDIR}/multimedia/qmmp
+LIB_DEPENDS=	libqmmpui.so:multimedia/qmmp
+BUILD_DEPENDS=	qmmp>=0.9.0:multimedia/qmmp
 
 USES=		cmake:outsource pkgconfig tar:bzip2
 USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
@@ -28,7 +28,7 @@ OPTIONS_MULTI_PLUGINS=	FFAP MPG123 XMP
 OPTIONS_DEFAULT=	FFAP MPG123 XMP
 
 FFAP_DESC=		Support APE sound file
-FFAP_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+FFAP_LIB_DEPENDS=	libtag.so:audio/taglib
 FFAP_CMAKE_ON=	-DUSE_FFAP:BOOL=TRUE
 FFAP_CMAKE_OFF=	-DUSE_FFAP:BOOL=FALSE
 OPTIONS_DEFINE_i386=	FFAPASM
@@ -36,17 +36,17 @@ OPTIONS_DEFAULT_i386=	FFAPASM
 OPTIONS_DEFINE_amd64=	FFAPASM
 OPTIONS_DEFAULT_amd64=	FFAPASM
 FFAPASM_DESC=	Optimize FFap decoder using devel/yasm
-FFAPASM_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+FFAPASM_BUILD_DEPENDS=	yasm:devel/yasm
 FFAPASM_CMAKE_ON=	-DUSE_ASM:BOOL=TRUE
 FFAPASM_CMAKE_OFF=	-DUSE_ASM:BOOL=FALSE
 
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_USE=	QT4=uic_build
 MPG123_CMAKE_ON=	-DUSE_MPG123:BOOL=TRUE
 MPG123_CMAKE_OFF=	-DUSE_MPG123:BOOL=FALSE
 
 XMP_DESC=		Support various module formats using libxmp
-XMP_LIB_DEPENDS=	libxmp.so:${PORTSDIR}/audio/libxmp
+XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
 XMP_CMAKE_ON=	-DUSE_XMP:BOOL=TRUE
 XMP_CMAKE_OFF=	-DUSE_XMP:BOOL=FALSE
 
diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index 87e597e059f8..282f3bd1f4c5 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -62,7 +62,7 @@ OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \
 		SB SCROBBLER SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \
 		TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 QSUI_DESC=	Simple UI based on standard widgets set
 QSUI_CMAKE_ON=	-DUSE_QSUI:BOOL=TRUE
@@ -77,71 +77,71 @@ DIR_ASSOC_DESC=	inode/directory mime type association
 DIR_ASSOC_CMAKE_ON=	-DUSE_DIR_ASSOC:BOOL=TRUE
 DIR_ASSOC_CMAKE_OFF=	-DUSE_DIR_ASSOC:BOOL=FALSE
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
-JACK_BUILD_DEPENDS=	jackit>=0.121.2:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_BUILD_DEPENDS=	jackit>=0.121.2:audio/jack
 JACK_CMAKE_ON=	-DUSE_JACK:BOOL=TRUE
 JACK_CMAKE_OFF=	-DUSE_JACK:BOOL=FALSE
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_ON=	-DUSE_ALSA:BOOL=TRUE
 ALSA_CMAKE_OFF=	-DUSE_ALSA:BOOL=FALSE
 
 BS2B_DESC=		Support the Bauer stereophonic2binaural effect
-BS2B_LIB_DEPENDS=	libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CMAKE_ON=	-DUSE_BS2B:BOOL=TRUE
 BS2B_CMAKE_OFF=	-DUSE_BS2B:BOOL=FALSE
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DUSE_PULSE:BOOL=TRUE
 PULSEAUDIO_CMAKE_OFF=	-DUSE_PULSE:BOOL=FALSE
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libtag.so:${PORTSDIR}/audio/taglib
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libtag.so:audio/taglib
 FLAC_CMAKE_ON=	-DUSE_FLAC:BOOL=TRUE
 FLAC_CMAKE_OFF=	-DUSE_FLAC:BOOL=FALSE
 
-MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack \
-		libtag.so:${PORTSDIR}/audio/taglib
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack \
+		libtag.so:audio/taglib
 MUSEPACK_CMAKE_ON=	-DUSE_MPC:BOOL=TRUE
 MUSEPACK_CMAKE_OFF=	-DUSE_MPC:BOOL=FALSE
 
 GME_DESC=		Support video game music files
-GME_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CMAKE_ON=	-DUSE_GME:BOOL=TRUE
 GME_CMAKE_OFF=	-DUSE_GME:BOOL=FALSE
 
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=TRUE
 FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=FALSE
 
-MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CMAKE_ON=	-DUSE_MODPLUG:BOOL=TRUE
 MODPLUG_CMAKE_OFF=	-DUSE_MODPLUG:BOOL=FALSE
 
-FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad \
-		libtag.so:${PORTSDIR}/audio/taglib
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
+		libtag.so:audio/taglib
 FAAD_CMAKE_ON=	-DUSE_AAC:BOOL=TRUE
 FAAD_CMAKE_OFF=	-DUSE_AAC:BOOL=FALSE
 
-CDDA_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
-	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
+	libcdio_cdda.so:sysutils/libcdio-paranoia
 CDDA_CMAKE_ON=	-DUSE_CDA:BOOL=TRUE
 CDDA_CMAKE_OFF=	-DUSE_CDA:BOOL=FALSE
 
 ENCA_DESC=		Support automatic character set detection
-ENCA_LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
+ENCA_LIB_DEPENDS=	libenca.so:converters/enca
 ENCA_CMAKE_ON=	-DUSE_ENCA:BOOL=TRUE
 ENCA_CMAKE_OFF=	-DUSE_ENCA:BOOL=FALSE
 
 MPLAYER1_DESC=	mplayer-1.1.x (multimedia/mplayer)
 MPLAYER2_DESC=	mplayer-2.0.x (multimedia/mplayer2)
-MPLAYER1_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-MPLAYER2_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer2
+MPLAYER1_RUN_DEPENDS=	mplayer:multimedia/mplayer
+MPLAYER2_RUN_DEPENDS=	mplayer:multimedia/mplayer2
 MPLAYER1_PREVENTS=	MPLAYER2
 MPLAYER2_PREVENTS=	MPLAYER1
 
 PROJECTM_DESC=	Support the projectM music visualiser
-PROJECTM_LIB_DEPENDS=	libprojectM.so.2:${PORTSDIR}/graphics/libprojectm
+PROJECTM_LIB_DEPENDS=	libprojectM.so.2:graphics/libprojectm
 PROJECTM_USE=	QT5=opengl
 PROJECTM_CMAKE_ON=	-DUSE_PROJECTM:BOOL=TRUE
 PROJECTM_CMAKE_OFF=	-DUSE_PROJECTM:BOOL=FALSE
@@ -150,53 +150,53 @@ OSS_CMAKE_ON=	-DUSE_OSS:BOOL=TRUE
 OSS_CMAKE_OFF=	-DUSE_OSS:BOOL=FALSE
 
 OSS4_DESC=		Open Sound System (ver4) support
-OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:${PORTSDIR}/audio/oss
+OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:audio/oss
 OSS4_CMAKE_ON=	-DUSE_OSS4:BOOL=TRUE
 OSS4_CMAKE_OFF=	-DUSE_OSS4:BOOL=FALSE
 
-LADSPA_RUN_DEPENDS=	analyseplugin:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS=	analyseplugin:audio/ladspa
 LADSPA_CMAKE_ON=	-DUSE_LADSPA:BOOL=TRUE
 LADSPA_CMAKE_OFF=	-DUSE_LADSPA:BOOL=FALSE
 
 WILDMIDI_DESC=	Support to playback MIDI files
-WILDMIDI_LIB_DEPENDS=	libWildMidi.so:${PORTSDIR}/audio/wildmidi
+WILDMIDI_LIB_DEPENDS=	libWildMidi.so:audio/wildmidi
 WILDMIDI_CMAKE_ON=	-DUSE_MIDI:BOOL=TRUE
 WILDMIDI_CMAKE_OFF=	-DUSE_MIDI:BOOL=FALSE
 
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
-		libtag.so:${PORTSDIR}/audio/taglib
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad \
+		libtag.so:audio/taglib
 MAD_CMAKE_ON=	-DUSE_MAD:BOOL=TRUE
 MAD_CMAKE_OFF=	-DUSE_MAD:BOOL=FALSE
 
 OPUS_DESC=		Enable reading opusfile tags
-OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile \
-		libtag.so:${PORTSDIR}/audio/taglib
+OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile \
+		libtag.so:audio/taglib
 OPUS_CMAKE_ON=	-DUSE_OPUS:BOOL=TRUE
 OPUS_CMAKE_OFF=	-DUSE_OPUS:BOOL=FALSE
 
 RGSCAN_DESC=	ReplayGain scanner
-RGSCAN_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+RGSCAN_LIB_DEPENDS=	libtag.so:audio/taglib
 RGSCAN_CMAKE_ON=	-DUSE_RGSCAN:BOOL=TRUE
 RGSCAN_CMAKE_OFF=	-DUSE_RGSCAN:BOOL=FALSE
 
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CMAKE_ON=	-DUSE_SNDFILE:BOOL=TRUE
 SNDFILE_CMAKE_OFF=	-DUSE_SNDFILE:BOOL=FALSE
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libtag.so:${PORTSDIR}/audio/taglib
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libtag.so:audio/taglib
 VORBIS_CMAKE_ON=	-DUSE_VORBIS:BOOL=TRUE
 VORBIS_CMAKE_OFF=	-DUSE_VORBIS:BOOL=FALSE
 
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CMAKE_ON=	-DUSE_WAVPACK:BOOL=TRUE
 WAVPACK_CMAKE_OFF=	-DUSE_WAVPACK:BOOL=FALSE
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_ON=	-DUSE_CURL:BOOL=TRUE
 CURL_CMAKE_OFF=	-DUSE_CURL:BOOL=FALSE
 
-MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_LIB_DEPENDS=	libmms.so:net/libmms
 MMS_CMAKE_ON=	-DUSE_MMS:BOOL=TRUE
 MMS_CMAKE_OFF=	-DUSE_MMS:BOOL=FALSE
 
@@ -208,7 +208,7 @@ NULLOUT_CMAKE_ON=	-DUSE_NULL:BOOL=TRUE
 NULLOUT_CMAKE_OFF=	-DUSE_NULL:BOOL=FALSE
 
 SRCONV_DESC=	Support the sample rate converter
-SRCONV_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SRCONV_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SRCONV_CMAKE_ON=	-DUSE_SRC:BOOL=TRUE
 SRCONV_CMAKE_OFF=	-DUSE_SRC:BOOL=FALSE
 
@@ -225,7 +225,7 @@ ANALYZER_CMAKE_ON=	-DUSE_ANALYZER:BOOL=TRUE
 ANALYZER_CMAKE_OFF=	-DUSE_ANALYZER:BOOL=FALSE
 
 CONVERTER_DESC=	Support file type converter
-CONVERTER_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+CONVERTER_LIB_DEPENDS=	libtag.so:audio/taglib
 CONVERTER_CMAKE_ON=	-DUSE_CONVERTER:BOOL=TRUE
 CONVERTER_CMAKE_OFF=	-DUSE_CONVERTER:BOOL=FALSE
 
@@ -243,7 +243,7 @@ SCROBBLER_CMAKE_ON=	-DUSE_SCROBBLER:BOOL=TRUE
 SCROBBLER_CMAKE_OFF=	-DUSE_SCROBBLER:BOOL=FALSE
 
 SID_DESC=	Support sid
-SID_LIB_DEPENDS=	libsidplayfp.so:${PORTSDIR}/audio/libsidplayfp
+SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
 SID_CMAKE_ON=	-DUSE_SID:BOOL=TRUE
 SID_CMAKE_OFF=	-DUSE_SID:BOOL=FALSE
 
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 7b3adc52ae77..fb245c2c772f 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -61,7 +61,7 @@ OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \
 		SB SCROBBLER SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \
 		TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 QSUI_DESC=	Simple UI based on standard widgets set
 QSUI_USE=	QT4=network,uic_build
@@ -76,71 +76,71 @@ DIR_ASSOC_DESC=	inode/directory mime type association
 DIR_ASSOC_CMAKE_ON=	-DUSE_DIR_ASSOC:BOOL=TRUE
 DIR_ASSOC_CMAKE_OFF=	-DUSE_DIR_ASSOC:BOOL=FALSE
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
-JACK_BUILD_DEPENDS=	jackit>=0.121.2:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_BUILD_DEPENDS=	jackit>=0.121.2:audio/jack
 JACK_CMAKE_ON=	-DUSE_JACK:BOOL=TRUE
 JACK_CMAKE_OFF=	-DUSE_JACK:BOOL=FALSE
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_ON=	-DUSE_ALSA:BOOL=TRUE
 ALSA_CMAKE_OFF=	-DUSE_ALSA:BOOL=FALSE
 
 BS2B_DESC=		Support the Bauer stereophonic2binaural effect
-BS2B_LIB_DEPENDS=	libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CMAKE_ON=	-DUSE_BS2B:BOOL=TRUE
 BS2B_CMAKE_OFF=	-DUSE_BS2B:BOOL=FALSE
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DUSE_PULSE:BOOL=TRUE
 PULSEAUDIO_CMAKE_OFF=	-DUSE_PULSE:BOOL=FALSE
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libtag.so:${PORTSDIR}/audio/taglib
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libtag.so:audio/taglib
 FLAC_CMAKE_ON=	-DUSE_FLAC:BOOL=TRUE
 FLAC_CMAKE_OFF=	-DUSE_FLAC:BOOL=FALSE
 
-MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack \
-		libtag.so:${PORTSDIR}/audio/taglib
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack \
+		libtag.so:audio/taglib
 MUSEPACK_CMAKE_ON=	-DUSE_MPC:BOOL=TRUE
 MUSEPACK_CMAKE_OFF=	-DUSE_MPC:BOOL=FALSE
 
 GME_DESC=		Support video game music files
-GME_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CMAKE_ON=	-DUSE_GME:BOOL=TRUE
 GME_CMAKE_OFF=	-DUSE_GME:BOOL=FALSE
 
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=TRUE
 FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=FALSE
 
-MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CMAKE_ON=	-DUSE_MODPLUG:BOOL=TRUE
 MODPLUG_CMAKE_OFF=	-DUSE_MODPLUG:BOOL=FALSE
 
-FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad \
-		libtag.so:${PORTSDIR}/audio/taglib
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
+		libtag.so:audio/taglib
 FAAD_CMAKE_ON=	-DUSE_AAC:BOOL=TRUE
 FAAD_CMAKE_OFF=	-DUSE_AAC:BOOL=FALSE
 
-CDDA_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
-	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
+	libcdio_cdda.so:sysutils/libcdio-paranoia
 CDDA_CMAKE_ON=	-DUSE_CDA:BOOL=TRUE
 CDDA_CMAKE_OFF=	-DUSE_CDA:BOOL=FALSE
 
 ENCA_DESC=		Support automatic character set detection
-ENCA_LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
+ENCA_LIB_DEPENDS=	libenca.so:converters/enca
 ENCA_CMAKE_ON=	-DUSE_ENCA:BOOL=TRUE
 ENCA_CMAKE_OFF=	-DUSE_ENCA:BOOL=FALSE
 
 MPLAYER1_DESC=	mplayer-1.1.x (multimedia/mplayer)
 MPLAYER2_DESC=	mplayer-2.0.x (multimedia/mplayer2)
-MPLAYER1_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-MPLAYER2_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer2
+MPLAYER1_RUN_DEPENDS=	mplayer:multimedia/mplayer
+MPLAYER2_RUN_DEPENDS=	mplayer:multimedia/mplayer2
 MPLAYER1_PREVENTS=	MPLAYER2
 MPLAYER2_PREVENTS=	MPLAYER1
 
 PROJECTM_DESC=	Support the projectM music visualiser
-PROJECTM_LIB_DEPENDS=	libprojectM.so.2:${PORTSDIR}/graphics/libprojectm
+PROJECTM_LIB_DEPENDS=	libprojectM.so.2:graphics/libprojectm
 PROJECTM_USE=	QT4=opengl
 PROJECTM_CMAKE_ON=	-DUSE_PROJECTM:BOOL=TRUE
 PROJECTM_CMAKE_OFF=	-DUSE_PROJECTM:BOOL=FALSE
@@ -149,53 +149,53 @@ OSS_CMAKE_ON=	-DUSE_OSS:BOOL=TRUE
 OSS_CMAKE_OFF=	-DUSE_OSS:BOOL=FALSE
 
 OSS4_DESC=		Open Sound System (ver4) support
-OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:${PORTSDIR}/audio/oss
+OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:audio/oss
 OSS4_CMAKE_ON=	-DUSE_OSS4:BOOL=TRUE
 OSS4_CMAKE_OFF=	-DUSE_OSS4:BOOL=FALSE
 
-LADSPA_RUN_DEPENDS=	analyseplugin:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS=	analyseplugin:audio/ladspa
 LADSPA_CMAKE_ON=	-DUSE_LADSPA:BOOL=TRUE
 LADSPA_CMAKE_OFF=	-DUSE_LADSPA:BOOL=FALSE
 
 WILDMIDI_DESC=	Support to playback MIDI files
-WILDMIDI_LIB_DEPENDS=	libWildMidi.so:${PORTSDIR}/audio/wildmidi
+WILDMIDI_LIB_DEPENDS=	libWildMidi.so:audio/wildmidi
 WILDMIDI_CMAKE_ON=	-DUSE_MIDI:BOOL=TRUE
 WILDMIDI_CMAKE_OFF=	-DUSE_MIDI:BOOL=FALSE
 
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
-		libtag.so:${PORTSDIR}/audio/taglib
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad \
+		libtag.so:audio/taglib
 MAD_CMAKE_ON=	-DUSE_MAD:BOOL=TRUE
 MAD_CMAKE_OFF=	-DUSE_MAD:BOOL=FALSE
 
 OPUS_DESC=		Enable reading opusfile tags
-OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile \
-		libtag.so:${PORTSDIR}/audio/taglib
+OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile \
+		libtag.so:audio/taglib
 OPUS_CMAKE_ON=	-DUSE_OPUS:BOOL=TRUE
 OPUS_CMAKE_OFF=	-DUSE_OPUS:BOOL=FALSE
 
 RGSCAN_DESC=	ReplayGain scanner
-RGSCAN_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+RGSCAN_LIB_DEPENDS=	libtag.so:audio/taglib
 RGSCAN_CMAKE_ON=	-DUSE_RGSCAN:BOOL=TRUE
 RGSCAN_CMAKE_OFF=	-DUSE_RGSCAN:BOOL=FALSE
 
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CMAKE_ON=	-DUSE_SNDFILE:BOOL=TRUE
 SNDFILE_CMAKE_OFF=	-DUSE_SNDFILE:BOOL=FALSE
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libtag.so:${PORTSDIR}/audio/taglib
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libtag.so:audio/taglib
 VORBIS_CMAKE_ON=	-DUSE_VORBIS:BOOL=TRUE
 VORBIS_CMAKE_OFF=	-DUSE_VORBIS:BOOL=FALSE
 
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CMAKE_ON=	-DUSE_WAVPACK:BOOL=TRUE
 WAVPACK_CMAKE_OFF=	-DUSE_WAVPACK:BOOL=FALSE
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_ON=	-DUSE_CURL:BOOL=TRUE
 CURL_CMAKE_OFF=	-DUSE_CURL:BOOL=FALSE
 
-MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_LIB_DEPENDS=	libmms.so:net/libmms
 MMS_CMAKE_ON=	-DUSE_MMS:BOOL=TRUE
 MMS_CMAKE_OFF=	-DUSE_MMS:BOOL=FALSE
 
@@ -207,7 +207,7 @@ NULLOUT_CMAKE_ON=	-DUSE_NULL:BOOL=TRUE
 NULLOUT_CMAKE_OFF=	-DUSE_NULL:BOOL=FALSE
 
 SRCONV_DESC=	Support the sample rate converter
-SRCONV_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SRCONV_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SRCONV_CMAKE_ON=	-DUSE_SRC:BOOL=TRUE
 SRCONV_CMAKE_OFF=	-DUSE_SRC:BOOL=FALSE
 
@@ -224,7 +224,7 @@ ANALYZER_CMAKE_ON=	-DUSE_ANALYZER:BOOL=TRUE
 ANALYZER_CMAKE_OFF=	-DUSE_ANALYZER:BOOL=FALSE
 
 CONVERTER_DESC=	Support file type converter
-CONVERTER_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+CONVERTER_LIB_DEPENDS=	libtag.so:audio/taglib
 CONVERTER_CMAKE_ON=	-DUSE_CONVERTER:BOOL=TRUE
 CONVERTER_CMAKE_OFF=	-DUSE_CONVERTER:BOOL=FALSE
 
@@ -242,7 +242,7 @@ SCROBBLER_CMAKE_ON=	-DUSE_SCROBBLER:BOOL=TRUE
 SCROBBLER_CMAKE_OFF=	-DUSE_SCROBBLER:BOOL=FALSE
 
 SID_DESC=	Support sid
-SID_LIB_DEPENDS=	libsidplayfp.so:${PORTSDIR}/audio/libsidplayfp
+SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
 SID_CMAKE_ON=	-DUSE_SID:BOOL=TRUE
 SID_CMAKE_OFF=	-DUSE_SID:BOOL=FALSE
 
diff --git a/multimedia/qt4-mobility/Makefile b/multimedia/qt4-mobility/Makefile
index 4640d7519cb3..385af1e2f123 100644
--- a/multimedia/qt4-mobility/Makefile
+++ b/multimedia/qt4-mobility/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Qt APIs for mobile devices and desktop platforms
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libblkid.so:${PORTSDIR}/misc/e2fsprogs-libblkid
+LIB_DEPENDS=	libblkid.so:misc/e2fsprogs-libblkid
 
 DATE=	20130703
 USES=		pkgconfig qmake shebangfix tar:xz
@@ -42,8 +42,8 @@ LOCATION_USE=		qt4=rcc_build,sql
 MESSAGING_DESC=		Messaging module
 
 MULTIMEDIA_DESC=	Multimedia module
-MULTIMEDIA_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-MULTIMEDIA_BUILD_DEPENDS=	v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
+MULTIMEDIA_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+MULTIMEDIA_BUILD_DEPENDS=	v4l_compat>=1.0.20120501:multimedia/v4l_compat
 MULTIMEDIA_USE=		qt4=opengl gstreamer=bad
 
 ORGANIZER_DESC=		Organizer module
diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile
index 97058e672ddb..6d4a85ec23f3 100644
--- a/multimedia/qt5-multimedia/Makefile
+++ b/multimedia/qt5-multimedia/Makefile
@@ -26,12 +26,12 @@ OPTIONS_RADIO_AUDIOPLUGIN=	ALSA PULSEAUDIO
 OPTIONS_SUB=			yes
 AUDIOPLUGIN_DESC=		Audio plugins to build
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-GSTREAMER_BUILD_DEPENDS=${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+GSTREAMER_BUILD_DEPENDS=${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 GSTREAMER_EXTRA_PATCHES_OFF=	${FILESDIR}/extrapatch-no-gstreamer
 GSTREAMER_USE=		GSTREAMER1=bad
 OPENAL_USES=		openal
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 .include <bsd.port.options.mk>
 
diff --git a/multimedia/qt5-phonon4-gstreamer/Makefile b/multimedia/qt5-phonon4-gstreamer/Makefile
index 9465742d0f01..cbaefa215243 100644
--- a/multimedia/qt5-phonon4-gstreamer/Makefile
+++ b/multimedia/qt5-phonon4-gstreamer/Makefile
@@ -24,6 +24,6 @@ CMAKE_ARGS=	-DPHONON_BUILD_PHONON4QT5=ON
 
 OPTIONS_DEFINE=	GST_PLUGINS
 GST_PLUGINS_DESC=	Install GStreamer plugins
-GST_PLUGINS_RUN_DEPENDS=	gstreamer1-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer1-plugins-all
+GST_PLUGINS_RUN_DEPENDS=	gstreamer1-plugins-all>=0:multimedia/gstreamer1-plugins-all
 
 .include <bsd.port.mk>
diff --git a/multimedia/qt5-phonon4-vlc/Makefile b/multimedia/qt5-phonon4-vlc/Makefile
index 3d9b7b095b7d..d4c668d6259d 100644
--- a/multimedia/qt5-phonon4-vlc/Makefile
+++ b/multimedia/qt5-phonon4-vlc/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	VLC backend for Phonon 4 Qt 5
 
-LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc
+LIB_DEPENDS=	libvlc.so:multimedia/vlc
 
 USES=		cmake pkgconfig tar:xz
 USE_QT5=	core gui widgets phonon4 \
diff --git a/multimedia/qt5-phonon4/Makefile b/multimedia/qt5-phonon4/Makefile
index 59a93e7993df..47e3c3d3b397 100644
--- a/multimedia/qt5-phonon4/Makefile
+++ b/multimedia/qt5-phonon4/Makefile
@@ -26,7 +26,7 @@ PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS_DEFINE=	PULSEAUDIO
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_USE=		GNOME=glib20
 PULSEAUDIO_CMAKE_ON=	-DWITH_PulseAudio:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DWITH_PulseAudio:BOOL=OFF
diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile
index f094aede06b5..bf43e237daea 100644
--- a/multimedia/quark/Makefile
+++ b/multimedia/quark/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Audio player, for geeks, by geeks
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS=	libxine.so:multimedia/libxine
 
 USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix gnomevfs2
diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index 55422eb816a0..259ee96515cd 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GTK+-based audio player written in Python
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:${PORTSDIR}/audio/py-mutagen
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:${PORTSDIR}/audio/py-mutagen
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen
 
 USE_PYTHON=	distutils autoplist
 USE_GNOME=	intltool pygtk2
@@ -40,20 +40,20 @@ SPEEX_USE=	GSTREAMER=speex
 MP3_USE=	GSTREAMER=mp3
 FLAC_USE=	GSTREAMER=flac
 
-MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack
 MUSEPACK_USE=		GSTREAMER=musepack
 
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_USE=		GSTREAMER=wavpack
 
-AAC_LIB_DEPENDS=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+AAC_LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 AAC_USE=		GSTREAMER=faad
 
-DBUS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
-DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
+DBUS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
+DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
 
-REMOTE_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>0:${PORTSDIR}/textproc/py-feedparser
-REMOTE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>0:${PORTSDIR}/textproc/py-feedparser
+REMOTE_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser
+REMOTE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser
 REMOTE_USE=		GSTREAMER=gnomevfs
 
 .include <bsd.port.mk>
diff --git a/multimedia/quvi/Makefile b/multimedia/quvi/Makefile
index e9c316348eb8..4923e6a6f4bd 100644
--- a/multimedia/quvi/Makefile
+++ b/multimedia/quvi/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Command line tool for parsing flash media stream URLs
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	libquvi>=0.4.0:${PORTSDIR}/multimedia/libquvi
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	libquvi>=0.4.0:multimedia/libquvi
+LIB_DEPENDS=	libcurl.so:ftp/curl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	limit:0.4.[0-9]*
diff --git a/multimedia/quvi09/Makefile b/multimedia/quvi09/Makefile
index cff0d55183ce..baddefd4ff98 100644
--- a/multimedia/quvi09/Makefile
+++ b/multimedia/quvi09/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Command line tool for parsing flash media stream URLs
 
 LICENSE=	AGPLv3
 
-BUILD_DEPENDS=	libquvi09>=0.9:${PORTSDIR}/multimedia/libquvi09
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	libquvi09>=0.9:multimedia/libquvi09
+LIB_DEPENDS=	libcurl.so:ftp/curl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFIGURE_ARGS=	--program-suffix=${PKGNAMESUFFIX}
diff --git a/multimedia/rage/Makefile b/multimedia/rage/Makefile
index e80aeef30478..d35f88aa7ac7 100644
--- a/multimedia/rage/Makefile
+++ b/multimedia/rage/Makefile
@@ -11,8 +11,8 @@ COMMENT=	EFL video and audio player with some extra bells and whistles
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libelementary.so:${PORTSDIR}/x11-toolkits/elementary
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libelementary.so:x11-toolkits/elementary
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/multimedia/recmpeg/Makefile b/multimedia/recmpeg/Makefile
index 66261ad67bde..df26872b8fcd 100644
--- a/multimedia/recmpeg/Makefile
+++ b/multimedia/recmpeg/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/fame/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple video encoder
 
-LIB_DEPENDS=	libfame.so:${PORTSDIR}/multimedia/libfame
+LIB_DEPENDS=	libfame.so:multimedia/libfame
 
 GNU_CONFIGURE=	yes
 
diff --git a/multimedia/recordmydesktop/Makefile b/multimedia/recordmydesktop/Makefile
index be862d640cf6..82e69eaf6009 100644
--- a/multimedia/recordmydesktop/Makefile
+++ b/multimedia/recordmydesktop/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SF
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Record desktop sessions to an Ogg-Theora-Vorbis file
 
-LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libtheora.so:multimedia/libtheora \
+		libjack.so:audio/jack
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-oss=yes \
diff --git a/multimedia/rox-videothumbnail/Makefile b/multimedia/rox-videothumbnail/Makefile
index 043f40c72428..d479e5e8a94b 100644
--- a/multimedia/rox-videothumbnail/Makefile
+++ b/multimedia/rox-videothumbnail/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	VideoThumbnail-${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Video thumbnail provider for the ROX file manager
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
 
 WRKSRC=		${WRKDIR}/VideoThumbnail
 
diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile
index d888eeac40e3..dd1af9bd61ad 100644
--- a/multimedia/rtmpdump/Makefile
+++ b/multimedia/rtmpdump/Makefile
@@ -11,7 +11,7 @@ COMMENT=	RTMP streams download utility
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
+LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 
 USES=		pkgconfig tar:bz2
 USE_OPENSSL=	yes
diff --git a/multimedia/rubygem-clutter-gstreamer/Makefile b/multimedia/rubygem-clutter-gstreamer/Makefile
index f10a90344daf..d7a56d62cac6 100644
--- a/multimedia/rubygem-clutter-gstreamer/Makefile
+++ b/multimedia/rubygem-clutter-gstreamer/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby/GStreamer is a Ruby binding for GStreamer
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-clutter>=${PORTSVERSION}:${PORTSDIR}/graphics/rubygem-clutter \
-		rubygem-gstreamer>=${PORTVERSION}:${PORTSDIR}/multimedia/rubygem-gstreamer
+RUN_DEPENDS=	rubygem-clutter>=${PORTSVERSION}:graphics/rubygem-clutter \
+		rubygem-gstreamer>=${PORTVERSION}:multimedia/rubygem-gstreamer
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/multimedia/rubygem-gstreamer/Makefile b/multimedia/rubygem-gstreamer/Makefile
index e56cb87eeb4f..54473a9a518c 100644
--- a/multimedia/rubygem-gstreamer/Makefile
+++ b/multimedia/rubygem-gstreamer/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Ruby/GStreamer is a Ruby binding for GStreamer
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libgstreamer-1.0.so:${PORTSDIR}/multimedia/gstreamer1
-RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2 \
-		rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection
+LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1
+RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2 \
+		rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 738d478861cd..037586e03c01 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Program used to time subtitles
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libavcodec0.so:multimedia/ffmpeg0 \
+		libsndfile.so:audio/libsndfile
 
 USES=		tar:bzip2 gmake pkgconfig iconv
 GNU_CONFIGURE=	yes
@@ -25,7 +25,7 @@ LDFLAGS+=	-lswscale0 -lgmodule-2.0
 OPTIONS_DEFINE=	GTKSPELL
 OPTIONS_DEFAULT=GTKSPELL
 
-GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 
 .include <bsd.port.options.mk>
 
diff --git a/multimedia/schroedinger/Makefile b/multimedia/schroedinger/Makefile
index 7dac0f943900..3ec6c4456def 100644
--- a/multimedia/schroedinger/Makefile
+++ b/multimedia/schroedinger/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE_MIT=	${WRKSRC}/COPYING.MIT
 LICENSE_FILE_MPL=	${WRKSRC}/COPYING.MPL
 
-LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/devel/orc
+LIB_DEPENDS=	liborc-0.4.so:devel/orc
 
 USES=		libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index 695729bb2c8a..4dad6c2bcd24 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Complete front-end based on Qt4 for mplayer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/Copying.txt
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
-		smplayer-skins>=0:${PORTSDIR}/multimedia/smplayer-skins \
-		smplayer-themes>=0:${PORTSDIR}/multimedia/smplayer-themes
+RUN_DEPENDS=	mplayer:multimedia/mplayer \
+		smplayer-skins>=0:multimedia/smplayer-skins \
+		smplayer-themes>=0:multimedia/smplayer-themes
 
 USE_QT4=	gui dbus network script xml moc_build rcc_build uic_build \
 		uic3_build porting_build linguist_build
diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile
index 94fa99b28a95..6643b2f3454f 100644
--- a/multimedia/smtube/Makefile
+++ b/multimedia/smtube/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/smtube/SMTube/${PORTVERSION}/
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	SMPlayer YouTube browser
 
-RUN_DEPENDS=	smplayer:${PORTSDIR}/multimedia/smplayer
+RUN_DEPENDS=	smplayer:multimedia/smplayer
 
 USES=		gmake tar:bzip2
 ALL_TARGET=	#empty
diff --git a/multimedia/snappy/Makefile b/multimedia/snappy/Makefile
index 385074b5871b..92c5c6d2c9f7 100644
--- a/multimedia/snappy/Makefile
+++ b/multimedia/snappy/Makefile
@@ -12,9 +12,9 @@ PKGNAMESUFFIX=	player
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Open source gstreamer media player
 
-LIB_DEPENDS=	libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
-		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+LIB_DEPENDS=	libclutter-gst-2.0.so:multimedia/clutter-gst \
+		libclutter-1.0.so:graphics/clutter \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3
 
 USES=		desktop-file-utils gettext gmake pathfix \
 		pkgconfig tar:xz
diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile
index 929df6f04ae2..101a48769367 100644
--- a/multimedia/spook/Makefile
+++ b/multimedia/spook/Makefile
@@ -40,13 +40,13 @@ CONFIGURE_ARGS+=	--enable-encoder-jpeg
 .endif
 
 .if ${PORT_OPTIONS:MMPEG4}
-LIB_DEPENDS+=		libxvidcore.so:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=		libxvidcore.so:multimedia/xvid
 CONFIGURE_ARGS+=	--enable-encoder-mpeg4
 .endif
 
 .if ${PORT_OPTIONS:MV4L}
-LIB_DEPENDS+=		libv4l1.so:${PORTSDIR}/multimedia/libv4l
-BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS+=		libv4l1.so:multimedia/libv4l
+BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 CONFIGURE_ARGS+=	--enable-input-v4l2 --enable-input-v4l
 .endif
 
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index b0a0ff67211a..be70c2f70b03 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	multimedia kde
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Subtitle editor for KDE
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USES=		cmake:outsource gettext shared-mime-info
 USE_KDE4=	kdeprefix kdelibs automoc4
@@ -23,10 +23,10 @@ BACKEND_DESC=	Additional video backens
 OPTIONS_GROUP_BACKEND=	GSTREAMER MPLAYER XINE
 
 MPLAYER_DESC=	Install MPlayer
-MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 XINE_DESC=	Build Xine backend
-XINE_LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
+XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 XINE_CMAKE_OFF=	-DWITH_Xine:Bool=Off
 
 GSTREAMER_DESC=	Build GStreamer 1.x backend
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index d743cf23ad09..a0d03cd6aadf 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Subtitle editor
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	iso-codes>0:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libenchant.so:${PORTSDIR}/textproc/enchant
+BUILD_DEPENDS=	iso-codes>0:misc/iso-codes
+LIB_DEPENDS=	libglademm-2.4.so:devel/libglademm24 \
+		libpcre.so:devel/pcre \
+		libenchant.so:textproc/enchant
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		desktop-file-utils gettext gmake libtool pkgconfig
@@ -32,7 +32,7 @@ OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_OFF=	--disable-nls
 
-OPENGL_LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:${PORTSDIR}/x11-toolkits/gtkglextmm
+OPENGL_LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm
 OPENGL_USE=		gl=glu
 OPENGL_CONFIGURE_ENABLE=gl
 
diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile
index 4044ccb4eb4e..85d88dfc10fe 100644
--- a/multimedia/subtitleripper/Makefile
+++ b/multimedia/subtitleripper/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.3-4
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Convert DVD subtitles into text format (subrip srt) or VobSub format
 
-LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm \
-		libpng.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	gocr:${PORTSDIR}/graphics/gocr \
-		xv:${PORTSDIR}/graphics/xv \
-		transcode:${PORTSDIR}/multimedia/transcode
+LIB_DEPENDS=	libnetpbm.so:graphics/netpbm \
+		libpng.so:graphics/png
+RUN_DEPENDS=	gocr:graphics/gocr \
+		xv:graphics/xv \
+		transcode:multimedia/transcode
 
 USES=		gmake tar:tgz
 
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index ed8f3276be6c..d9c45277a272 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gtk flash player and thumbnailer
 
-LIB_DEPENDS=	libswfdec-0.8.so:${PORTSDIR}/graphics/swfdec
+LIB_DEPENDS=	libswfdec-0.8.so:graphics/swfdec
 
 USE_GNOME=	gnomeprefix gtk20 intlhack gconf2
 INSTALLS_ICONS=	yes
diff --git a/multimedia/szap-s2/Makefile b/multimedia/szap-s2/Makefile
index 6caaf45b1ae8..c6bc09edca10 100644
--- a/multimedia/szap-s2/Makefile
+++ b/multimedia/szap-s2/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/nox
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple zapping tool for the Linux DVB S2 API
 
-BUILD_DEPENDS=  ${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=  ${LOCALBASE}/include/linux/dvb/frontend.h:multimedia/v4l_compat
 
 USES=		gmake tar:bzip2
 PATCH_STRIP=	-p1
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index f63347db4b75..882f8cfb534e 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject-based library to parse a host of playlist formats
 
-LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
-		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
+LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome
 
 USES=		gettext gmake gnome libarchive libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 gnomeprefix intltool introspection:build \
@@ -26,8 +26,8 @@ OPTIONS_DEFINE=	GCRYPT QUVI
 OPTIONS_DEFAULT=GCRYPT QUVI
 QUVI_DESC=	Flash media stream URL support
 QUVI_CONFIGURE_ENABLE=	quvi
-QUVI_LIB_DEPENDS=	libquvi-0.9.so:${PORTSDIR}/multimedia/libquvi09
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+QUVI_LIB_DEPENDS=	libquvi-0.9.so:multimedia/libquvi09
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_ENABLE=	libgcrypt
 
 post-patch:
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 47d5b47015ee..049f2059f28b 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -10,24 +10,24 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gstreamer-based video player for the GNOME 3 Desktop
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
-		pylint${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/devel/pylint \
-		appstream-glib>=0:${PORTSDIR}/devel/appstream-glib \
-		itstool:${PORTSDIR}/textproc/itstool \
-		grilo-plugins>=0:${PORTSDIR}/net/grilo-plugins
-LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libclutter-gst-3.0.so:${PORTSDIR}/multimedia/clutter-gst3 \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
-		${PYTHON_PKGNAMEPREFIX}libpeas>=0:${PORTSDIR}/devel/py-libpeas \
-		gnome-settings-daemon>=2.91.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
-		gnome-icon-theme-symbolic>=2.91.0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
-		grilo-plugins>=0:${PORTSDIR}/net/grilo-plugins
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
+		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
+		pylint${PYTHON_PKGNAMESUFFIX}>=0:devel/pylint \
+		appstream-glib>=0:devel/appstream-glib \
+		itstool:textproc/itstool \
+		grilo-plugins>=0:net/grilo-plugins
+LIB_DEPENDS=	libgdata.so:devel/libgdata \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libclutter-gst-3.0.so:multimedia/clutter-gst3 \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libpeas-1.0.so:devel/libpeas \
+		libtotem-plparser.so:multimedia/totem-pl-parser
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
+		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
+		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas \
+		gnome-settings-daemon>=2.91.0:sysutils/gnome-settings-daemon \
+		gnome-icon-theme-symbolic>=2.91.0:x11-themes/gnome-icon-theme-symbolic \
+		grilo-plugins>=0:net/grilo-plugins
 
 PORTSCOUT=	limitw:1,even
 
@@ -73,7 +73,7 @@ TOTEM_PLUGINS=	apple-trailers autoload-subtitles brasero-disc-recorder chapters
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIB_DEPENDS+=	liblirc_client.so:comms/lirc
 PLIST_SUB+=	LIRC=""
 TOTEM_PLUGINS:=	${TOTEM_PLUGINS} lirc
 .else
diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index c55600858981..42d6c340c368 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -11,20 +11,20 @@ COMMENT=	Suite of tools for making DVD video disks
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	txt2tags:${PORTSDIR}/textproc/txt2tags
-LIB_DEPENDS=	libTix8.4.3.so:${PORTSDIR}/x11-toolkits/tix
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
-		mplex:${PORTSDIR}/multimedia/mjpegtools \
-		ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
-		composite:${PORTSDIR}/graphics/ImageMagick \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		sox:${PORTSDIR}/audio/sox \
-		normalize:${PORTSDIR}/audio/normalize \
-		lame:${PORTSDIR}/audio/lame \
-		gnubc>0:${PORTSDIR}/math/gnubc \
-		${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	txt2tags:textproc/txt2tags
+LIB_DEPENDS=	libTix8.4.3.so:x11-toolkits/tix
+RUN_DEPENDS=	mplayer:multimedia/mplayer \
+		mplex:multimedia/mjpegtools \
+		ffmpeg:multimedia/ffmpeg \
+		composite:graphics/ImageMagick \
+		dvdauthor:multimedia/dvdauthor \
+		growisofs:sysutils/dvd+rw-tools \
+		sox:audio/sox \
+		normalize:audio/normalize \
+		lame:audio/lame \
+		gnubc>0:math/gnubc \
+		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+		bash:shells/bash
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -39,7 +39,7 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=	DOCS TRANSCODE
 TRANSCODE_DESC=	Faster seeks when making menus. Needs mjpegtools enabled.
 
-TRANSCODE_RUN_DEPENDS=	transcode:${PORTSDIR}/multimedia/transcode
+TRANSCODE_RUN_DEPENDS=	transcode:multimedia/transcode
 
 post-extract:
 	${MV} ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION} ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index ed750af9248e..d5c8e677fd02 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Text-console utility for video stream processing
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 USE_LDCONFIG=	yes
 USES=		gmake libtool pkgconfig tar:bzip2
@@ -35,69 +35,69 @@ LZO_DESC=		LZO compression support
 X11_USE=			xorg=xv,xaw,xpm
 X11_CONFIGURE_WITH=		x
 
-MPEG2_LIB_DEPENDS=		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
+MPEG2_LIB_DEPENDS=		libmpeg2.so:multimedia/libmpeg2
 MPEG2_CONFIGURE_ENABLE=		libmpeg2 libmpeg2convert
 
 BKTR_CONFIGURE_ENABLE=		bktr
 
 POSTPROC_CONFIGURE_ENABLE=	libpostproc
 
-FREETYPE_LIB_DEPENDS=		libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype2
 
-LAME_LIB_DEPENDS=		libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=		lame
 LAME_CONFIGURE_ON=		--with-lame-prefix=${LOCALBASE}
 
-XVID_LIB_DEPENDS=		libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_LIB_DEPENDS=		libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENABLE=		xvid
 XVID_CONFIGURE_ON=		--with-xvid-prefix=${LOCALBASE}
 
-X264_LIB_DEPENDS=		libx264.so:${PORTSDIR}/multimedia/libx264
+X264_LIB_DEPENDS=		libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=		x264
 
-OGG_LIB_DEPENDS=		libogg.so:${PORTSDIR}/audio/libogg
+OGG_LIB_DEPENDS=		libogg.so:audio/libogg
 OGG_CONFIGURE_ENABLE=		ogg
 
-VORBIS_LIB_DEPENDS=		libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=		libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	vorbis
 
-THEORA_LIB_DEPENDS=		libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	theora
 
-DVDREAD_LIB_DEPENDS=		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+DVDREAD_LIB_DEPENDS=		libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_ENABLE=	libdvdread
 DVDREAD_CONFIGURE_ON=		--with-libdvdread-prefix=${LOCALBASE}
 
-DV_LIB_DEPENDS=			libdv.so:${PORTSDIR}/multimedia/libdv
+DV_LIB_DEPENDS=			libdv.so:multimedia/libdv
 DV_CONFIGURE_ENABLE=		libdv
 
-QUICKTIME_LIB_DEPENDS=		libquicktime.so:${PORTSDIR}/multimedia/libquicktime
+QUICKTIME_LIB_DEPENDS=		libquicktime.so:multimedia/libquicktime
 QUICKTIME_CONFIGURE_ENABLE=	libquicktime
 
-LZO_LIB_DEPENDS=		liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO_LIB_DEPENDS=		liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_ENABLE=		lzo
 LZO_CONFIGURE_ON=		--with-lzo-prefix=${LOCALBASE} --with-lzo-includes=${LOCALBASE}
 
-A52_LIB_DEPENDS=		liba52.so:${PORTSDIR}/audio/liba52
+A52_LIB_DEPENDS=		liba52.so:audio/liba52
 A52_CONFIGURE_ENABLE=		a52
 A52_CONFIGURE_ON=		--with-a52-prefix=${LOCALBASE}
 
-FAAC_LIB_DEPENDS=		libfaac.so:${PORTSDIR}/audio/faac
+FAAC_LIB_DEPENDS=		libfaac.so:audio/faac
 FAAC_CONFIGURE_ENABLE=		faac
 FAAC_CONFIGURE_ON=		--with-faac-prefix=${LOCALBASE}
 
 LIBXML2_USE=			GNOME=libxml2
 LIBXML2_CONFIGURE_ENABLE=	libxml2
 
-MJPEGTOOLS_LIB_DEPENDS=		liblavjpeg.so:${PORTSDIR}/multimedia/mjpegtools
+MJPEGTOOLS_LIB_DEPENDS=		liblavjpeg.so:multimedia/mjpegtools
 MJPEGTOOLS_CONFIGURE_ENABLE=	mjpegtools
 
 SDL_USE=			SDL=sdl
 SDL_CONFIGURE_ENABLE=		sdl
 SDL_CONFIGURE_ENV_ON=		SDL_CONFIG="${SDL_CONFIG}"
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
 IMAGEMAGICK_CONFIGURE_ENABLE=	imagemagick
 IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick-prefix=${LOCALBASE}
 
@@ -109,7 +109,7 @@ ICONV_USES=			iconv
 ICONV_CONFIGURE_ENABLE=		iconv
 ICONV_CONFIGURE_ON=		--with-iconv-prefix=${ICONV_PREFIX}
 
-V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_CONFIGURE_ENABLE=		v4l
 
 .include <bsd.port.pre.mk>
diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile
index 7cfccee4b851..cd18f809090e 100644
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -11,12 +11,12 @@ COMMENT=	TV streaming server supporting DVB, IPTV and V4L
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		liburiparser.so:${PORTSDIR}/net/uriparser
-RUN_DEPENDS=	dtv-scan-tables>=0:${PORTSDIR}/multimedia/dtv-scan-tables
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		liburiparser.so:net/uriparser
+RUN_DEPENDS=	dtv-scan-tables>=0:multimedia/dtv-scan-tables
 
 USE_GITHUB=	yes
 GH_TAGNAME=	0499859
@@ -49,21 +49,21 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz
 OPTIONS_DEFINE=	AVAHI DVBCSA HDHOMERUN TRANSCODING XMLTV
 OPTIONS_DEFAULT=DVBCSA HDHOMERUN
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
 DVBCSA_DESC=		Replace internal ffdecsa with dvbcsa
-DVBCSA_LIB_DEPENDS=	libdvbcsa.so:${PORTSDIR}/multimedia/libdvbcsa
+DVBCSA_LIB_DEPENDS=	libdvbcsa.so:multimedia/libdvbcsa
 DVBCSA_CONFIGURE_ENABLE=	dvbcsa
 
 HDHOMERUN_DESC=		Native support for HDHomeRun network tuners
-HDHOMERUN_LIB_DEPENDS=	libhdhomerun.so:${PORTSDIR}/multimedia/libhdhomerun
+HDHOMERUN_LIB_DEPENDS=	libhdhomerun.so:multimedia/libhdhomerun
 HDHOMERUN_CONFIGURE_ENABLE=	hdhomerun_client
 
 TRANSCODING_DESC=	Transcoding for mobile and web clients
-TRANSCODING_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+TRANSCODING_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 TRANSCODING_CONFIGURE_ENABLE=	libav
 
-XMLTV_RUN_DEPENDS=	p5-xmltv>=0:${PORTSDIR}/textproc/p5-xmltv
+XMLTV_RUN_DEPENDS=	p5-xmltv>=0:textproc/p5-xmltv
 
 .include <bsd.port.pre.mk>
 
diff --git a/multimedia/umph/Makefile b/multimedia/umph/Makefile
index 18686ef017db..d2cc213cb440 100644
--- a/multimedia/umph/Makefile
+++ b/multimedia/umph/Makefile
@@ -13,9 +13,9 @@ COMMENT=	YouTube video playlist parser for cclive and alike tools
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-Umph-Prompt>=0:${PORTSDIR}/multimedia/p5-Umph-Prompt \
-		p5-XML-DOM>=1.44:${PORTSDIR}/textproc/p5-XML-DOM
+BUILD_DEPENDS=	p5-Getopt-ArgvFile>=1.11:devel/p5-Getopt-ArgvFile \
+		p5-Umph-Prompt>=0:multimedia/p5-Umph-Prompt \
+		p5-XML-DOM>=1.44:textproc/p5-XML-DOM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/multimedia/umplayer/Makefile b/multimedia/umplayer/Makefile
index d4b2cad78d6f..5350f4917b36 100644
--- a/multimedia/umplayer/Makefile
+++ b/multimedia/umplayer/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Modern front-end for MPlayer (fork of SMPlayer)
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/Copying.txt
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 USES=		desktop-file-utils gmake qmake tar:xz
 USE_QT4=	gui network xml moc_build rcc_build uic_build \
diff --git a/multimedia/vamps/Makefile b/multimedia/vamps/Makefile
index 4ca936298915..2045ae0040f1 100644
--- a/multimedia/vamps/Makefile
+++ b/multimedia/vamps/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/Vamps/${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	High performance tool to transcode DVD videos to a smaller size
 
-LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 USES=		gmake
 
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index 04f19c0a4dc0..20748e96a14b 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -12,9 +12,9 @@ COMMENT=	GNU VCDImager/VCDRip -- The GNU VideoCD Image Maker/Ripping Tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libcdio.so:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libxml2.so:textproc/libxml2 \
+		libcdio.so:sysutils/libcdio
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/multimedia/vdpauinfo/Makefile b/multimedia/vdpauinfo/Makefile
index f15034ca0ae3..460c696cdc11 100644
--- a/multimedia/vdpauinfo/Makefile
+++ b/multimedia/vdpauinfo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool to query VDPAU capabilities
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/multimedia/vdr-plugin-epgsearch/Makefile b/multimedia/vdr-plugin-epgsearch/Makefile
index e81b361cf490..98594bcb86d3 100644
--- a/multimedia/vdr-plugin-epgsearch/Makefile
+++ b/multimedia/vdr-plugin-epgsearch/Makefile
@@ -12,8 +12,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - EPG search plugin
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libtre.so:${PORTSDIR}/textproc/libtre
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		libtre.so:textproc/libtre
 
 USES=		pkgconfig tar:bzip2
 PATCH_STRIP=	-p1
diff --git a/multimedia/vdr-plugin-markad/Makefile b/multimedia/vdr-plugin-markad/Makefile
index 7172d479bc8f..2ab72615df76 100644
--- a/multimedia/vdr-plugin-markad/Makefile
+++ b/multimedia/vdr-plugin-markad/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERS
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - MarkAd plugin
 
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 
 USES=		execinfo pkgconfig tar:tgz
 PATCH_STRIP=	-p1
diff --git a/multimedia/vdr-plugin-osdpip/Makefile b/multimedia/vdr-plugin-osdpip/Makefile
index d37266d651c1..5e8248c34ea3 100644
--- a/multimedia/vdr-plugin-osdpip/Makefile
+++ b/multimedia/vdr-plugin-osdpip/Makefile
@@ -14,7 +14,7 @@ PATCHFILES=	osdpip-vdr-1.7.26.diff
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - picture-in-picture plugin
 
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 
 USES=		pkgconfig tar:tgz
 DIST_SUBDIR=	vdr
diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile
index c6e2c74b42c7..1496d01598ce 100644
--- a/multimedia/vdr-plugin-softhddevice/Makefile
+++ b/multimedia/vdr-plugin-softhddevice/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERS
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - softhddevice plugin
 
-LIB_DEPENDS+=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \
-		libvdpau.so:${PORTSDIR}/multimedia/libvdpau \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
-		libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libavcodec0.so:multimedia/ffmpeg0 \
+		libvdpau.so:multimedia/libvdpau \
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libasound.so:audio/alsa-lib
 
 USES=		compiler:features pkgconfig tar:tgz
 USE_XORG+=	xv x11 xcb xinerama
@@ -36,7 +36,7 @@ VAAPI_DESC=	Enable vaapi support (experimental)
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MVAAPI}
-LIB_DEPENDS+=	libva.so:${PORTSDIR}/multimedia/libva
+LIB_DEPENDS+=	libva.so:multimedia/libva
 CONFIG+= 	-DUSE_VAAPI
 .endif
 
diff --git a/multimedia/vdr-plugin-streamdev/Makefile b/multimedia/vdr-plugin-streamdev/Makefile
index faf80676e2a0..0400ef28a5d4 100644
--- a/multimedia/vdr-plugin-streamdev/Makefile
+++ b/multimedia/vdr-plugin-streamdev/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	${DISTNAME:S/plugin-//}${EXTRACT_SUFX}:release
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - stream device plugin
 
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS+=	bash:shells/bash
 
 USES=		shebangfix tar:tgz
 SHEBANG_FILES=	streamdev-server/externremux.sh
diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile
index e972e7ed179d..66f7a07e129c 100644
--- a/multimedia/vdr-plugin-upnp/Makefile
+++ b/multimedia/vdr-plugin-upnp/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - UPnP/DLNA plugin (alpha!)
 
-LIB_DEPENDS+=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libupnp.so:${PORTSDIR}/devel/upnp \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	libavcodec0.so:multimedia/ffmpeg0 \
+		libboost_system.so:devel/boost-libs \
+		libupnp.so:devel/upnp \
+		libsqlite3.so:databases/sqlite3
 
 USES=		tar:tgz
 DIST_SUBDIR=	vdr
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index 02e7221b9ff3..5ecfc3cfd59d 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -12,10 +12,10 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - xineliboutput plugin/viewer
 
-LIB_DEPENDS+=	libxine.so:${PORTSDIR}/multimedia/libxine \
-		libavutil.so:${PORTSDIR}/multimedia/ffmpeg \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+LIB_DEPENDS+=	libxine.so:multimedia/libxine \
+		libavutil.so:multimedia/ffmpeg \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libvdpau.so:multimedia/libvdpau
 
 PATCH_STRIP=	-p1
 USES=		pkgconfig tar:bzip2
@@ -39,13 +39,13 @@ PLIST_SUB+=	XINE_PLUGINSDIR=${XINE_PLUGINSDIR}
 CONFIGURE_ARGS+=	--cc="${CC}" --cxx="${CXX}" --add-cflags=-I${VDRDIR}
 
 .if ${PORT_OPTIONS:MLIBEXTRACTOR}
-LIB_DEPENDS+=	libextractor.so:${PORTSDIR}/textproc/libextractor
+LIB_DEPENDS+=	libextractor.so:textproc/libextractor
 .else
 CONFIGURE_ARGS+=	--disable-libextractor
 .endif
 
 .if ${PORT_OPTIONS:MLIBBLURAY}
-LIB_DEPENDS+=	libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIB_DEPENDS+=	libbluray.so:multimedia/libbluray
 .else
 CONFIGURE_ARGS+=	--disable-libbluray
 .endif
diff --git a/multimedia/vdr-plugins/Makefile b/multimedia/vdr-plugins/Makefile
index 9a9fa8aed3f5..817d65b3606f 100644
--- a/multimedia/vdr-plugins/Makefile
+++ b/multimedia/vdr-plugins/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	multimedia
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - plugin metaport
 
-RUN_DEPENDS+=	vdr:${PORTSDIR}/multimedia/vdr
+RUN_DEPENDS+=	vdr:multimedia/vdr
 
 USES=		metaport
 
@@ -53,13 +53,13 @@ VDRDIR=		${LOCALBASE}/lib/vdr
 
 .for OPT in ${OPTIONS_DEFINE}
 . if ${OPTIONS_DEFINE:MREELSCAN} == ${OPT}
-${OPT}_RUN_DEPENDS=	${VDRDIR}/libvdr-reelchannelscan.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-reelchannelscan
+${OPT}_RUN_DEPENDS=	${VDRDIR}/libvdr-reelchannelscan.so.${PORTVERSION}:multimedia/vdr-plugin-reelchannelscan
 . elif ${OPTIONS_DEFINE:MSTREAMDEV} == ${OPT}
-${OPT}_RUN_DEPENDS=	${VDRDIR}/libvdr-${OPT:tl}-server.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-${OPT:tl}
+${OPT}_RUN_DEPENDS=	${VDRDIR}/libvdr-${OPT:tl}-server.so.${PORTVERSION}:multimedia/vdr-plugin-${OPT:tl}
 . elif ${OPTIONS_DEFINE:MLIVE} == ${OPT}
-${OPT}_RUN_DEPENDS=	${VDRDIR}/libvdr-${OPT:tl}.so.${PORTVERSION}:${PORTSDIR}/www/vdr-plugin-${OPT:tl}
+${OPT}_RUN_DEPENDS=	${VDRDIR}/libvdr-${OPT:tl}.so.${PORTVERSION}:www/vdr-plugin-${OPT:tl}
 . else
-${OPT}_RUN_DEPENDS=	${VDRDIR}/libvdr-${OPT:tl}.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-${OPT:tl}
+${OPT}_RUN_DEPENDS=	${VDRDIR}/libvdr-${OPT:tl}.so.${PORTVERSION}:multimedia/vdr-plugin-${OPT:tl}
 . endif
 .endfor
 
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 5358390a7612..8c4b71e344c6 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Video Disk Recorder - development version
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=  v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig \
-		xorg-fonts-truetype>=0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
+BUILD_DEPENDS=  v4l_compat>=1.0.20120501:multimedia/v4l_compat
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \
+		xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype
 
 OPTIONS_DEFINE=		IPTVPATCH TTXPATCH STB0899_SIGNAL DOCS NLS
 IPTVPATCH_DESC=		Stops EIT scans on IPTV channels
diff --git a/multimedia/vdr/Makefile.plugins b/multimedia/vdr/Makefile.plugins
index 1ed89b835847..0267ff688271 100644
--- a/multimedia/vdr/Makefile.plugins
+++ b/multimedia/vdr/Makefile.plugins
@@ -2,10 +2,10 @@
 #
 # $FreeBSD$
 
-BUILD_DEPENDS+=  ${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS+=  ${LOCALBASE}/include/linux/dvb/frontend.h:multimedia/v4l_compat
 
-BUILD_DEPENDS+=	vdr:${PORTSDIR}/multimedia/vdr
-RUN_DEPENDS+=	vdr:${PORTSDIR}/multimedia/vdr
+BUILD_DEPENDS+=	vdr:multimedia/vdr
+RUN_DEPENDS+=	vdr:multimedia/vdr
 
 APIVERSION=	1.7.29
 DIST_SUBDIR=	vdr
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index d29474608d31..e374fc379bfc 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-2.8ucl1.1.6
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	MBone video conferencing tool
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libuclmmbase.so:${PORTSDIR}/devel/uclmmbase
+BUILD_DEPENDS=	v4l_compat>=1.0.20060801:multimedia/v4l_compat
+LIB_DEPENDS=	libuclmmbase.so:devel/uclmmbase
 
 USES=		autoreconf gmake tk:84 # parallel builds (-jX) are broken with BSD make(1)
 USE_OPENSSL=	yes
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 2c5ac9ab2503..8d5c6105c3dd 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -15,14 +15,14 @@ COMMENT?=	Qt based multimedia player and streaming server
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libidn.so:${PORTSDIR}/dns/libidn
-BUILD_DEPENDS=	ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg \
-		yasm:${PORTSDIR}/devel/yasm
-RUN_DEPENDS=	ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libdvbpsi.so:multimedia/libdvbpsi \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libidn.so:dns/libidn
+BUILD_DEPENDS=	ffmpeg>=2.0:multimedia/ffmpeg \
+		yasm:devel/yasm
+RUN_DEPENDS=	ffmpeg>=2.0:multimedia/ffmpeg
 
 USES=		compiler:c11 desktop-file-utils gmake iconv libtool pathfix \
 		pkgconfig tar:xz
@@ -89,89 +89,89 @@ ZVBI_DESC=	VBI decoding support
 
 A52_CONFIGURE_ENABLE=	a52
 A52_CONFIGURE_ON=	--with-a52=${LOCALBASE}
-A52_LIB_DEPENDS=	liba52.so:${PORTSDIR}/audio/liba52
+A52_LIB_DEPENDS=	liba52.so:audio/liba52
 
-AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_ENABLE=	aa
 
-ASS_LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass
+ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
-AVAHI_LIB_DEPENDS=	libavahi-common.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	bonjour
 
-CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_ENABLE=	caca
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_ENABLE=	dbus
 
-DCA_LIB_DEPENDS=	libdca.so:${PORTSDIR}/multimedia/libdca
+DCA_LIB_DEPENDS=	libdca.so:multimedia/libdca
 DCA_CONFIGURE_ENABLE=	dca
 
-DIRAC_LIB_DEPENDS=	libdirac_decoder.so:${PORTSDIR}/multimedia/dirac
+DIRAC_LIB_DEPENDS=	libdirac_decoder.so:multimedia/dirac
 DIRAC_CONFIGURE_ENABLE=	dirac
 
-DVDREAD_LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_ENABLE=	dvdread
 
-DVDNAV_LIB_DEPENDS=	libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
+DVDNAV_LIB_DEPENDS=	libdvdnav.so:multimedia/libdvdnav
 DVDNAV_CONFIGURE_ENABLE=dvdnav
 
-FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CONFIGURE_ENABLE=	faad
 FAAD_CONFIGURE_ENV=	CPPFLAGS_faad="-I${LOCALBASE}/include" \
 			LIBS_faad="-L${LOCALBASE}/lib"
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ENABLE=	flac
 
-FLUID_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUID_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUID_CONFIGURE_ENABLE=	fluidsynth
 
 # XXX vlc doesn't seem to like the freerdp version in ports
-#FREERDP_LIB_DEPENDS=	libfreerdp-core.so:${PORTSDIR}/net/freerdp
+#FREERDP_LIB_DEPENDS=	libfreerdp-core.so:net/freerdp
 #FREERDP_CONFIGURE_ENABLE=	libfreerdp
 CONFIGURE_ARGS+=	-disable-freerdp
 
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	fribidi
 
-GME_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CONFIGURE_ENABLE=	gme
 GME_CONFIGURE_ENV=	LIBS_gme="-L${LOCALBASE}/lib -lgme"
 
 GNOMEVFS2_USE=			GNOME=gnomevfs2
 GNOMEVFS2_CONFIGURE_ENABLE=	gnomevfs
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=gnutls
 
-GOOM_LIB_DEPENDS=	libgoom2.so:${PORTSDIR}/graphics/goom
+GOOM_LIB_DEPENDS=	libgoom2.so:graphics/goom
 GOOM_CONFIGURE_ENABLE=	goom
 
 HTTPD_CONFIGURE_ENABLE=	httpd
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack
 
-KATE_LIB_DEPENDS=	libkate.so:${PORTSDIR}/multimedia/libkate
+KATE_LIB_DEPENDS=	libkate.so:multimedia/libkate
 KATE_CONFIGURE_ENABLE=	kate
 
-LIBBLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	bluray
 
 LIBRSVG2_USE=			GNOME=librsvg2
 LIBRSVG2_CONFIGURE_ENABLE=	svg
 
-LIBSSH2_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 LIBSSH2_CONFIGURE_ENABLE=	sftp
 
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_ENABLE=	lirc
 LIRC_CONFIGURE_ENV=	LIBS_lirc="-L${LOCALBASE}/lib -llirc_client"
 
-LIVEMEDIA_LIB_DEPENDS=	libliveMedia.so:${PORTSDIR}/net/liveMedia
+LIVEMEDIA_LIB_DEPENDS=	libliveMedia.so:net/liveMedia
 LIVEMEDIA_CONFIGURE_ENABLE=	live555
 LIVEMEDIA_CONFIGURE_ENV= \
 	LIVE555_CFLAGS="-I${LOCALBASE}/include/liveMedia \
@@ -187,23 +187,23 @@ LUA_CONFIGURE_ENABLE=	lua
 LUA_CONFIGURE_ON=	LUAC=${LUAC_CMD} LUA_CFLAGS="-I${LUA_INCDIR}" \
 			LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
 
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_ENABLE=	mad
 MAD_CONFIGURE_ON=	--with-mad=${LOCALBASE}
 
-MATROSKA_LIB_DEPENDS=	libmatroska.so:${PORTSDIR}/multimedia/libmatroska
+MATROSKA_LIB_DEPENDS=	libmatroska.so:multimedia/libmatroska
 MATROSKA_CONFIGURE_ENABLE=	mkv
 
-MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	mod
 
-MPEG2_LIB_DEPENDS=	libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
+MPEG2_LIB_DEPENDS=	libmpeg2.so:multimedia/libmpeg2
 MPEG2_CONFIGURE_ENABLE=	libmpeg2
 
-MTP_LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp
+MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CONFIGURE_ENABLE=	mtp
 
-MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack
 MUSEPACK_CONFIGURE_ENABLE=	mpc
 MUSEPACK_CONFIGURE_ENV=		LIBS_mpc="-L${LOCALBASE}/lib -lmpcdec"
 
@@ -215,22 +215,22 @@ NCURSES_CONFIGURE_ENABLE=	ncurses
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_USE=		GNOME=gtk20
 NOTIFY_CONFIGURE_ENABLE=notify
 
-OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_CONFIGURE_ENABLE=	ogg
 
 OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	optimizations
 
-OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_ENABLE=	opus
 
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	png
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
 QT4_USE=		QT4=gui,corelib,moc_build,rcc_build,uic_build
@@ -245,10 +245,10 @@ REALRTSP_CONFIGURE_ENABLE=	realrtsp
 
 RUNROOT_CONFIGURE_ENABLE=	run-as-root
 
-SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_ENABLE=	samplerate
 
-SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	schroedinger
 
 SDL_USE=		SDL=image
@@ -256,62 +256,62 @@ SDL_CONFIGURE_ENABLE=	sdl sdl-image
 
 # libsidplay build broken with:
 # /usr/bin/ld: /usr/local/lib/sidplay/builders/libresid-builder.a(resid-builder.o): relocation R_X86_64_32S against `_ZTV12ReSIDBuilder' can not be used when making a shared object; recompile with -fPIC
-#SIDPLAY_LIB_DEPENDS=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
+#SIDPLAY_LIB_DEPENDS=	libsidplay2.so:audio/libsidplay2
 #SIDPLAY_LDFLAGS=	-L${LOCALBASE}/lib/sidplay/builders
 #SIDPLAY_CONFIGURE_ENABLE=	sid
 CONFIGURE_ARGS+=	--disable-sid
 
-SHOUTCAST_LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout
+SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout
 SHOUTCAST_CONFIGURE_ENABLE=	shout
 
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CONFIGURE_ENABLE=	smbclient
 
 STREAM_CONFIGURE_ENABLE=sout
 
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=	speex
 
-TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CONFIGURE_ENABLE=taglib
 
-THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=theora
 
-TWOLAME_LIB_DEPENDS=		libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_LIB_DEPENDS=		libtwolame.so:audio/twolame
 TWOLAME_CONFIGURE_ENABLE=	twolame
 
-UPNP_LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
+UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 UPNP_CONFIGURE_ENABLE=	upnp
 
-V4L_BUILD_DEPENDS=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=	v4l2
 
-VAAPI_LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=	libva
 
-VCD_LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
+VCD_LIB_DEPENDS=	libcddb.so:audio/libcddb
 VCD_CONFIGURE_ENABLE=	vcd libcddb
 
-VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=vorbis
 
 X11_USE=		GL=gl XORG=xcb,xproto
-X11_LIB_DEPENDS=	libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
+X11_LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 X11_CONFIGURE_ENABLE=	glx xcb xvideo
 X11_CONFIGURE_WITH=	x
 
-X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264
+X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=	x264
 
-X265_LIB_DEPENDS=	libx265.so:${PORTSDIR}/multimedia/x265
+X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 X265_CONFIGURE_ENABLE=	x265
 
-ZVBI_LIB_DEPENDS=	libzvbi.so:${PORTSDIR}/devel/libzvbi
+ZVBI_LIB_DEPENDS=	libzvbi.so:devel/libzvbi
 ZVBI_CONFIGURE_ENABLE=	zvbi
 
 PORTDATA=	*
@@ -338,8 +338,8 @@ IGNORE=	please choose one of QT4 or QT5
 
 .if ${PORT_OPTIONS:MSKINS}
 .if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libminizip.so:${PORTSDIR}/archivers/minizip \
-		libtar.so:${PORTSDIR}/devel/libtar
+LIB_DEPENDS+=	libminizip.so:archivers/minizip \
+		libtar.so:devel/libtar
 USE_XORG+=	xext xinerama xpm
 CONFIGURE_ARGS+=--enable-skins2 --enable-libtar
 .else
diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile
index 8fe91aba0ff9..4d12b984e908 100644
--- a/multimedia/w_scan/Makefile
+++ b/multimedia/w_scan/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perform frequency scans for DVB and ATSC transmissions
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=  v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=  v4l_compat>=1.0.20120501:multimedia/v4l_compat
 
 PATCH_STRIP=	-lp1
 
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	LINUX DOCS
 
 LINUX_DESC=		Install Linux binary too (linux-w_scan)
 LINUX_USE=		LINUX=yes
-LINUX_RUN_DEPENDS=	linux_dvbwrapper-kmod>=1.0:${PORTSDIR}/multimedia/linux_dvbwrapper-kmod
+LINUX_RUN_DEPENDS=	linux_dvbwrapper-kmod>=1.0:multimedia/linux_dvbwrapper-kmod
 LINUX_PLIST_FILES=	bin/linux-${PORTNAME}
 
 post-patch:
diff --git a/multimedia/webcamd/Makefile b/multimedia/webcamd/Makefile
index ac34aabf9dae..f9cc959ebc31 100644
--- a/multimedia/webcamd/Makefile
+++ b/multimedia/webcamd/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Port of Linux USB webcam and DVB drivers into userspace
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
+LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
 
 USES=		pkgconfig tar:bzip2 uidfix
 MAKE_ARGS=	LIBDIR="${LOCALBASE}/lib"
@@ -33,13 +33,13 @@ OPTIONS_EXCLUDE+=	CUSE
 CUSE_DESC=	Use cuse(3) over multimedia/cuse4bsd-kmod
 CUSE_MAKE_ARGS=		HAVE_CUSE="YES"
 CUSE_SUB_LIST=		LIBCUSE=""
-CUSE_BUILD_DEPENDS_OFF=	cuse4bsd-kmod>=0.1.24:${PORTSDIR}/multimedia/cuse4bsd-kmod
-CUSE_LIB_DEPENDS_OFF=	libcuse4bsd.so:${PORTSDIR}/multimedia/cuse4bsd-kmod
+CUSE_BUILD_DEPENDS_OFF=	cuse4bsd-kmod>=0.1.24:multimedia/cuse4bsd-kmod
+CUSE_LIB_DEPENDS_OFF=	libcuse4bsd.so:multimedia/cuse4bsd-kmod
 CUSE_SUB_LIST_OFF=	LIBCUSE="${LOCALBASE}/lib/libcuse4bsd.so"
 
 HAL_DESC=	Build with HAL and DBUS support
-HAL_LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
-HAL_LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+HAL_LIB_DEPENDS+=	libhal.so:sysutils/hal
+HAL_LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 HAL_MAKE_ARGS=		HAVE_HAL="YES"
 HAL_SUB_LIST=		LIBHAL="${LOCALBASE}/lib/libhal.so:${LOCALBASE}/lib/libdbus-1.so:"
 HAL_SUB_LIST_OFF=	LIBHAL=""
diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index da59291e219a..e9e74b0bcd5e 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert your videos quickly, easily, and all at once
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus
-LIB_DEPENDS=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+BUILD_DEPENDS=	lazbuild:editors/lazarus
+LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 NO_WRKSUBDIR=	yes
 USE_FPC=	cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg x11
@@ -51,13 +51,13 @@ OPTIONS_DEFAULT=	GTK2
 USE_FPC+=	gtk2
 USE_GNOME+=	gtk20
 LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
+LIB_DEPENDS+=	libQt4Pas.so:x11-toolkits/qt4pas
 LCL_PLATFORM=	qt
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
 .endif
 
 pre-configure:
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 60ead2e5b309..fdb005fec86c 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -34,8 +34,8 @@ COMMENT?=	H.264/MPEG-4 AVC Video Encoding (Front End CLI)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	yasm>=1.2.0:${PORTSDIR}/devel/yasm \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	yasm>=1.2.0:devel/yasm \
+		bash:shells/bash
 
 X264_BUILD=	144
 X264_REV=	2533
@@ -59,13 +59,13 @@ DEBUG_CONFIGURE_ON=	--enable-debug
 DEBUG_CONFIGURE_OFF=	--enable-strip
 
 GPAC_CONFIGURE_OFF=	--disable-gpac
-GPAC_LIB_DEPENDS=	libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac
+GPAC_LIB_DEPENDS=	libgpac.so:multimedia/gpac-libgpac
 
 LAVF_CONFIGURE_OFF=	--disable-swscale --disable-lavf
-LAVF_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-			libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-			libavutil.so:${PORTSDIR}/multimedia/ffmpeg \
-			libswscale.so:${PORTSDIR}/multimedia/ffmpeg
+LAVF_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+			libavformat.so:multimedia/ffmpeg \
+			libavutil.so:multimedia/ffmpeg \
+			libswscale.so:multimedia/ffmpeg
 
 CONFIGURE_COMMON_ARGS=	--prefix=${PREFIX} \
 			--extra-cflags="-I${LOCALBASE}/include" \
@@ -81,7 +81,7 @@ CFLAGS_armv6+=		-mcpu=arm1136jf-s
 
 .if ${SLAVE_PORT} == "no"
 PLIST_FILES=	bin/x264
-LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264
+LIB_DEPENDS=	libx264.so:multimedia/libx264
 .endif
 
 .if ${PORT_OPTIONS:MGCC}
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 7a7ef98115ce..31226786c30a 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -14,7 +14,7 @@ COMMENT=	H.265/High Efficiency Video Coding (HEVC) format
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS=	yasm:devel/yasm
 
 USES=		cmake pathfix tar:bz2
 USE_LDCONFIG=	yes
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 3dd611b9bc60..909bdf158178 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://linuxtv.org/downloads/xawtv/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	TV viewing application and a few TV utilities
 
-BUILD_DEPENDS=	${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:x11-fonts/tv-fonts
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:x11-fonts/tv-fonts
+LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	AALIB DV QUICKTIME ZVBI
 OPTIONS_DEFINE_i386=	MMX
@@ -34,7 +34,7 @@ FILES_LIBJPEG=	console/Subdir.mk x11/Subdir.mk libng/plugins/Subdir.mk
 
 .if ${PORT_OPTIONS:MAALIB}
 CONFIGURE_ARGS+=--enable-aa
-LIB_DEPENDS+=	libaa.so:${PORTSDIR}/graphics/aalib
+LIB_DEPENDS+=	libaa.so:graphics/aalib
 PLIST_SUB+=	AA=""
 .else
 CONFIGURE_ARGS+=--disable-aa
@@ -42,7 +42,7 @@ PLIST_SUB+=	AA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MZVBI}
-LIB_DEPENDS+=	libzvbi.so:${PORTSDIR}/devel/libzvbi
+LIB_DEPENDS+=	libzvbi.so:devel/libzvbi
 CONFIGURE_ARGS+=--enable-zvbi
 PLIST_SUB+=	ZVBI=""
 .else
@@ -51,7 +51,7 @@ PLIST_SUB+=	ZVBI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDV}
-LIB_DEPENDS+=	libdv.so:${PORTSDIR}/multimedia/libdv
+LIB_DEPENDS+=	libdv.so:multimedia/libdv
 CONFIGURE_ARGS+=--enable-dv
 PLIST_SUB+=	DV=
 .else
@@ -66,7 +66,7 @@ CFLAGS+=	-DMMX=1
 
 .if ${PORT_OPTIONS:MQUICKTIME}
 CONFIGURE_ARGS+=--enable-quicktime
-LIB_DEPENDS+=	libquicktime.so:${PORTSDIR}/multimedia/libquicktime
+LIB_DEPENDS+=	libquicktime.so:multimedia/libquicktime
 PLIST_SUB+=	QT=
 .else
 CONFIGURE_ARGS+=--enable-quicktime=no
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 777c6eb6a327..f7f4580d911d 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Lightweight media player for Xfce4 based on GStreamer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libtag.so:audio/taglib \
+		libnotify.so:devel/libnotify \
+		libdbus-glib-1.so:devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -40,8 +40,8 @@ OPTIONS_GROUP=	GST_PLUG
 OPTIONS_GROUP_GST_PLUG=	CDDA HTTP
 # Since 0.5.91 release, GStreamer 1.0 is enabled by default
 OPTIONS_DEFAULT=	GST10 HTTP NLS
-CLUTTER_LIB_DEPENDS=	libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
-	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+CLUTTER_LIB_DEPENDS=	libclutter-gst-2.0.so:multimedia/clutter-gst \
+	libclutter-gtk-1.0.so:graphics/clutter-gtk3
 CLUTTER_IMPLIES=	GST10
 CLUTTER_CONFIGURE_ENABLE=	clutter
 NLS_USES=	gettext-runtime
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 6eec9df53942..23bafd96b55e 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -12,8 +12,8 @@ COMMENT=	X11 multimedia player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libxine.so:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libxine.so:multimedia/libxine
 
 USES=		desktop-file-utils execinfo gmake iconv jpeg pkgconfig readline \
 		shared-mime-info tar:xz
@@ -35,14 +35,14 @@ OPTIONS_DEFAULT=	CURL XFT
 OPTIONS_DEFINE_i386=	WIN32_CODECS
 OPTIONS_SUB=		yes
 
-AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_WITH=	aalib
-CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
-CACA_RUN_DEPENDS=	${LOCALBASE}/${XINE_PLUGINSDIR}/xineplug_vo_out_caca.so:${PORTSDIR}/multimedia/libxine
+CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
+CACA_RUN_DEPENDS=	${LOCALBASE}/${XINE_PLUGINSDIR}/xineplug_vo_out_caca.so:multimedia/libxine
 CACA_CONFIGURE_WITH=	caca
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_ENV=	LIRC_CFLAGS="-I${LOCALBASE}/include" \
 			LIRC_LIBS="-L${LOCALBASE}/libs -llirc_client"
 LIRC_CONFIGURE_ENABLE=	lirc
@@ -50,7 +50,7 @@ NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 WIN32_CODECS_DESC=	Enable win32 codecs
 WIN32_CODECS_RUN_DEPENDS=\
-			win32-codecs>0:${PORTSDIR}/multimedia/win32-codecs
+			win32-codecs>0:multimedia/win32-codecs
 XFT_USE=		XORG=xft
 XFT_CONFIGURE_ENABLE=	xft
 
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 14f5bc5b17ff..75f7dac314d3 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -45,7 +45,7 @@ ESOUND_USE=		GNOME=esound
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 MIKMOD_CONFIGURE_ENABLE=mikmod
-MIKMOD_LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
@@ -60,7 +60,7 @@ VFILEINFO_DESC=		Enable Extended Vorbis Fileinfo
 VFILEINFO_CPPFLAGS=	-DALL_VORBIS_TAGS
 
 VORBIS_CONFIGURE_ENABLE=vorbis
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 .if !defined(WITH_DEBUG)
 INSTALL_TARGET=	install-strip
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 2e7155154e78..ef00fb4b09cb 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -15,7 +15,7 @@ COMMENT=	MPEG-1 player in GTK+ capable of playing MPEG-1 format streams
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 
 USE_SDL=	sdl
 USE_GNOME=	gtk12
diff --git a/multimedia/xvid/Makefile b/multimedia/xvid/Makefile
index 89a1834b6488..64a11fc155a5 100644
--- a/multimedia/xvid/Makefile
+++ b/multimedia/xvid/Makefile
@@ -37,7 +37,7 @@ OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index ef61eeb15665..3bf0ea0f3055 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -14,19 +14,19 @@ COMMENT=	Complete security camera solution, fully web based with image analysis
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/sudo:${PORTSDIR}/security/sudo
-LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libavutil0.so:${PORTSDIR}/multimedia/ffmpeg0
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
+RUN_DEPENDS=	${LOCALBASE}/bin/sudo:security/sudo
+LIB_DEPENDS=	libnetpbm.so:graphics/netpbm \
+		libpcre.so:devel/pcre \
+		libavutil0.so:multimedia/ffmpeg0
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
 
 USES=		jpeg perl5 shebangfix
 GNU_CONFIGURE=	yes
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 1007674f2395..2b403d64b005 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Chat program that combines AIM, ICQ, and Yahoo! Chat into one
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libgpgme.so:${PORTSDIR}/security/gpgme \
-		libenchant.so:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile \
+		libltdl.so:devel/libltdl \
+		libjasper.so:graphics/jasper \
+		libgpgme.so:security/gpgme \
+		libenchant.so:textproc/enchant
 
 OPTIONS_DEFINE=	ESOUND YAHOO
 OPTIONS_SUB=	yes
@@ -39,7 +39,7 @@ INSTALL_TARGET=	install-strip
 ESOUND_CONFIGURE_ENABLE=	esd
 ESOUND_USE=		GNOME=esound
 
-YAHOO_LIB_DEPENDS=	libyahoo2.so:${PORTSDIR}/net-im/libyahoo2
+YAHOO_LIB_DEPENDS=	libyahoo2.so:net-im/libyahoo2
 YAHOO_CONFIGURE_ENABLE=	yahoo
 
 post-patch:
diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile
index 9c0815b08efe..92e6b954bf94 100644
--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Text mode menu- and window-driven IM interface
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		iconv gmake ncurses perl5 pkgconfig python:run shebangfix
 USE_PERL5=	run
@@ -50,7 +50,7 @@ PORTDOCS=	FAQ README
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 MULTIBYTE_CONFIGURE_ENABLE=locales-fix
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_WITH=	fribidi
 MSN_CONFIGURE_ENABLE=	msn
 YAHOO_CONFIGURE_ENABLE=	yahoo
@@ -59,9 +59,9 @@ IRC_CONFIGURE_ENABLE=	irc
 JABBER_CONFIGURE_ENABLE=jabber
 RSS_CONFIGURE_ENABLE=	rss
 LJ_CONFIGURE_ENABLE=	lj
-GG_LIB_DEPENDS=		libgadu.so:${PORTSDIR}/polish/libgadu
+GG_LIB_DEPENDS=		libgadu.so:polish/libgadu
 GG_CONFIGURE_ENABLE=	gg
-GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GPGME_CONFIGURE_OFF=	--with-gpgme-prefix=/nonexistent
 
 post-patch:
diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile
index 33f7466e92cb..2fcc13fdc69b 100644
--- a/net-im/centerim/Makefile
+++ b/net-im/centerim/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.centerim.org/download/releases/ \
 MAINTAINER=	frank@altpeter.de
 COMMENT=	Text mode menu- and window-driven IM interface
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		iconv gmake ncurses pkgconfig shebangfix
 USE_OPENSSL=	yes
@@ -48,7 +48,7 @@ PORTDOCS=	FAQ README
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 MULTIBYTE_CONFIGURE_ENABLE=locales-fix
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_WITH=	fribidi
 MSN_CONFIGURE_ENABLE=	msn
 YAHOO_CONFIGURE_ENABLE=	yahoo
@@ -57,9 +57,9 @@ IRC_CONFIGURE_ENABLE=	irc
 JABBER_CONFIGURE_ENABLE=jabber
 RSS_CONFIGURE_ENABLE=	rss
 LJ_CONFIGURE_ENABLE=	lj
-GG_LIB_DEPENDS=		libgadu.so:${PORTSDIR}/polish/libgadu
+GG_LIB_DEPENDS=		libgadu.so:polish/libgadu
 GG_CONFIGURE_ENABLE=	gg
-GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GPGME_CONFIGURE_OFF=	--with-gpgme-prefix=/nonexistent
 
 post-patch:
diff --git a/net-im/cjc/Makefile b/net-im/cjc/Makefile
index 76d2fdb33b92..d49ceda29441 100644
--- a/net-im/cjc/Makefile
+++ b/net-im/cjc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Console Jabber Client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:${PORTSDIR}/net-im/py-pyxmpp
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:net-im/py-pyxmpp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jajcus
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index 17f5357f0dad..900ade1a1464 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -28,7 +28,7 @@ XMPP_DESC=	Enable XMPP Jabber support
 .if ${PORT_OPTIONS:MOTR}
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-otr
-LIB_DEPENDS+=		libotr.so.2:${PORTSDIR}/security/libotr3
+LIB_DEPENDS+=		libotr.so.2:security/libotr3
 .else
 CONFIGURE_ARGS+=	--disable-otr
 .endif
@@ -62,10 +62,10 @@ CFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-xmpp --enable-ssl=gnutls \
 			--with-libgcrypt-prefix=${LOCALBASE}
 CONFIGURE_ENV+=		LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkgconf gnutls"
-LIB_DEPENDS+=		libiksemel.so:${PORTSDIR}/textproc/iksemel \
-			libgnutls.so:${PORTSDIR}/security/gnutls \
-			libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-			libgpg-error.so:${PORTSDIR}/security/libgpg-error
+LIB_DEPENDS+=		libiksemel.so:textproc/iksemel \
+			libgnutls.so:security/gnutls \
+			libgcrypt.so:security/libgcrypt \
+			libgpg-error.so:security/libgpg-error
 .else
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--disable-xmpp --enable-ssl=openssl
diff --git a/net-im/coccinella/Makefile b/net-im/coccinella/Makefile
index 86499f1b3bc7..1e85e3852a07 100644
--- a/net-im/coccinella/Makefile
+++ b/net-im/coccinella/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Jabber client with whiteboard communication
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	snack>=0:${PORTSDIR}/audio/snack \
-		tcltls>=0:${PORTSDIR}/devel/tcltls \
-		tkpng>=0:${PORTSDIR}/graphics/tkpng \
-		tktray>=0:${PORTSDIR}/x11-toolkits/tktray \
-		tktreectrl>=0:${PORTSDIR}/x11-toolkits/tktreectrl
+RUN_DEPENDS=	snack>=0:audio/snack \
+		tcltls>=0:devel/tcltls \
+		tkpng>=0:graphics/tkpng \
+		tktray>=0:x11-toolkits/tktray \
+		tktreectrl>=0:x11-toolkits/tktreectrl
 
 NO_BUILD=	yes
 USES=		tk
diff --git a/net-im/corebird/Makefile b/net-im/corebird/Makefile
index dd56d1b11117..17ddc03ed0d7 100644
--- a/net-im/corebird/Makefile
+++ b/net-im/corebird/Makefile
@@ -10,12 +10,12 @@ COMMENT=	GTK3 Twitter client written in Vala
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		librest-0.7.so:${PORTSDIR}/devel/librest \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libnotify.so:devel/libnotify \
+		libjson-glib-1.0.so:devel/json-glib \
+		librest-0.7.so:devel/librest \
+		libgee-0.8.so:devel/libgee
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	baedert
diff --git a/net-im/cutegram/Makefile b/net-im/cutegram/Makefile
index c1eacab271e0..d4769d2b698e 100644
--- a/net-im/cutegram/Makefile
+++ b/net-im/cutegram/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Free and opensource telegram client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libqtelegram-ae.so:${PORTSDIR}/net-im/libqtelegram-ae \
-		libtelegramqml.so:${PORTSDIR}/net-im/telegramqml
+LIB_DEPENDS=	libqtelegram-ae.so:net-im/libqtelegram-ae \
+		libtelegramqml.so:net-im/telegramqml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Aseman-Land
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 64f90fbd8c79..645225f4e65d 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -16,12 +16,12 @@ COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
-		git:${PORTSDIR}/devel/git
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libyaml.so:${PORTSDIR}/textproc/libyaml
+BUILD_DEPENDS=	erlc:lang/erlang \
+		git:devel/git
+RUN_DEPENDS=	erl:lang/erlang \
+		bash:shells/bash
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libyaml.so:textproc/libyaml
 
 USERS=		ejabberd
 GROUPS=		${USERS}
diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile
index a681d2674eea..2db49db86a4c 100644
--- a/net-im/ekiga/Makefile
+++ b/net-im/ekiga/Makefile
@@ -12,12 +12,12 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VoIP and video conferencing application
 
-BUILD_DEPENDS=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat \
-		gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	libboost_signals.so:${PORTSDIR}/devel/boost-libs \
-		libopal.so:${PORTSDIR}/net/opal \
-		libv4l2.so:${PORTSDIR}/multimedia/libv4l
-RUN_DEPENDS=	gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat \
+		gnome-icon-theme>=3.0.0:misc/gnome-icon-theme
+LIB_DEPENDS=	libboost_signals.so:devel/boost-libs \
+		libopal.so:net/opal \
+		libv4l2.so:multimedia/libv4l
+RUN_DEPENDS=	gnome-icon-theme>=3.0.0:misc/gnome-icon-theme
 
 GNU_CONFIGURE=	yes
 USES=		cpe gettext gmake libtool pathfix perl5 pkgconfig \
@@ -78,21 +78,21 @@ CONFIGURE_ARGS+=--disable-gstreamer
 
 .if ${PORT_OPTIONS:MXCAP}
 CONFIGURE_ARGS+=--enable-xcap
-LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 .else
 CONFIGURE_ARGS+=--disable-xcap
 .endif
 
 .if ${PORT_OPTIONS:MLOUDMOUTH}
 CONFIGURE_ARGS+=--enable-loudmouth
-LIB_DEPENDS+=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
+LIB_DEPENDS+=	libloudmouth-1.so:net-im/loudmouth
 .else
 CONFIGURE_ARGS+=--disable-loudmouth
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
-LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=--enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}"
 PLIST_SUB+=	LDAP=""
 WITH_PLUGINS=	1
@@ -108,7 +108,7 @@ PLIST_SUB+=	PLUGINS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	libnotify.so:devel/libnotify
 CONFIGURE_ARGS+=--enable-notify
 PLIST_SUB+=	NOTIFY=""
 WITH_PLUGINS=	1
@@ -118,7 +118,7 @@ PLIST_SUB+=	NOTIFY="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 CONFIGURE_ARGS+=--enable-dbus --enable-dbus-service
 PLIST_SUB+=	DBUS=""
 .else
@@ -138,7 +138,7 @@ PLIST_SUB+=	GCONF=""
 
 .if ${PORT_OPTIONS:MEVOLUTION}
 USE_GNOME+=	evolutiondataserver3
-LIB_DEPENDS+=	libgcr-3.so:${PORTSDIR}/security/gcr
+LIB_DEPENDS+=	libgcr-3.so:security/gcr
 CONFIGURE_ARGS+=--enable-eds
 PLIST_SUB+=	EVOLUTION=""
 WITH_PLUGINS=	1
@@ -149,7 +149,7 @@ PLIST_SUB+=	EVOLUTION="@comment "
 
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=--enable-avahi
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
 PLIST_SUB+=	AVAHI=""
 WITH_PLUGINS=	1
 .else
diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index 54a39401939c..ed7d1e8e5b3f 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Instant messenging client written in python
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}notify>0:${PORTSDIR}/devel/py-notify \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:${PORTSDIR}/www/py-webkitgtk \
-		xprop:${PORTSDIR}/x11/xprop
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk \
+		xprop:x11/xprop
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index e84461a2d933..3974f191af9c 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -10,32 +10,32 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME IM client based around telepathy
 
-BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		geoclue>=0:${PORTSDIR}/net/geoclue \
-		itstool:${PORTSDIR}/textproc/itstool \
-		mc-tool:${PORTSDIR}/net-im/telepathy-mission-control
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
-		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libtelepathy.so:${PORTSDIR}/net-im/libtelepathy \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libtelepathy-farstream.so:${PORTSDIR}/net-im/telepathy-farstream \
-		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
-		libfolks-telepathy.so:${PORTSDIR}/net-im/folks \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
-		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		geoclue>=0:${PORTSDIR}/net/geoclue \
-		mc-tool:${PORTSDIR}/net-im/telepathy-mission-control
+BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		ca_root_nss>=0:security/ca_root_nss \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		geoclue>=0:net/geoclue \
+		itstool:textproc/itstool \
+		mc-tool:net-im/telepathy-mission-control
+LIB_DEPENDS=	libenchant.so:textproc/enchant \
+		libgeocode-glib.so:net/geocode-glib \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libpulse.so:audio/pulseaudio \
+		libtelepathy.so:net-im/libtelepathy \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libtelepathy-farstream.so:net-im/telepathy-farstream \
+		libtelepathy-logger.so:net-im/telepathy-logger \
+		libfolks-telepathy.so:net-im/folks \
+		libnotify.so:devel/libnotify \
+		libgcr-3.so:security/gcr \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libclutter-gst-2.0.so:multimedia/clutter-gst \
+		libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		ca_root_nss>=0:security/ca_root_nss \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		geoclue>=0:net/geoclue \
+		mc-tool:net-im/telepathy-mission-control
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig python tar:xz
 USE_GNOME=	evolutiondataserver3 intlhack
@@ -65,16 +65,16 @@ SALUT_DESC=	Enable link-local (serverless) XMPP support
 HAZE_DESC=	Enable libpurple protocol integration
 MAP_DESC=	Enable graphical map support
 CHEESE_DESC=	Enable cheese camera support
-JABBER_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble
-MSN_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly
-IRC_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-idle:${PORTSDIR}/net-im/telepathy-idle
-SALUT_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut
-HAZE_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze
+JABBER_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-gabble:net-im/telepathy-gabble
+MSN_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-butterfly:net-im/telepathy-butterfly
+IRC_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-idle:net-im/telepathy-idle
+SALUT_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-salut:net-im/telepathy-salut
+HAZE_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-haze:net-im/telepathy-haze
 MAP_USE=		GL=gl
-MAP_LIB_DEPENDS=	libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain
+MAP_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain
 MAP_CONFIGURE_ENABLE=	map
-CHEESE_BUILD_DEPENDS=	cheese>=0:${PORTSDIR}/multimedia/cheese
-CHEESE_RUN_DEPENDS=	cheese>=0:${PORTSDIR}/multimedia/cheese
+CHEESE_BUILD_DEPENDS=	cheese>=0:multimedia/cheese
+CHEESE_RUN_DEPENDS=	cheese>=0:multimedia/cheese
 CHEESE_CONFIGURE_WITH=	cheese
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index e630d916c6e4..bd5bcd497b39 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -12,8 +12,8 @@ MASTER_SITES=	http://www.freedesktop.org/software/farstream/releases/farsight2/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of GStreamer modules and libraries for videoconferencing
 
-LIB_DEPENDS=	libnice.so:${PORTSDIR}/net-im/libnice
-RUN_DEPENDS=	libnice-gst010>=0:${PORTSDIR}/net-im/libnice-gst010
+LIB_DEPENDS=	libnice.so:net-im/libnice
+RUN_DEPENDS=	libnice-gst010>=0:net-im/libnice-gst010
 
 USES=		gettext libtool gmake pathfix pkgconfig python
 USE_LDCONFIG=	yes
diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile
index 9284e48ab8fe..7e300d5ba94d 100644
--- a/net-im/farstream/Makefile
+++ b/net-im/farstream/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://freedesktop.org/software/farstream/releases/farstream/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of GStreamer modules and libraries for videoconferencing
 
-LIB_DEPENDS=	libnice.so:${PORTSDIR}/net-im/libnice
-RUN_DEPENDS=	libnice-gst1>=0:${PORTSDIR}/net-im/libnice-gst1
+LIB_DEPENDS=	libnice.so:net-im/libnice
+RUN_DEPENDS=	libnice-gst1>=0:net-im/libnice-gst1
 
 USE_LDCONFIG=	yes
 USES=		gettext libtool gmake pathfix pkgconfig python
diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index f29431c7a4c7..e75a5dddcdf6 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -8,7 +8,7 @@ PORTREVISION=	0
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Finch multi-protocol messaging client (Console UI)
 
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	libpurple.so:net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/finch
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index 336256c9dbdd..05ff252fe37c 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	library to aggregates people from multiple sources
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libzeitgeist-2.0.so:${PORTSDIR}/sysutils/zeitgeist \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
+		libgcr-3.so:security/gcr \
+		libzeitgeist-2.0.so:sysutils/zeitgeist \
+		libtelepathy-glib.so:net-im/telepathy-glib
 
 CONFLICTS=	folks-0.4.[0-9]*
 
@@ -36,9 +36,9 @@ OPTIONS_DEFAULT=SOCIALWEB TRACKER
 SOCIALWEB_DESC=	Social web backend
 TRACKER_DESC=	Tracker backend
 SOCIALWEB_CONFIGURE_ENABLE=	libsocialweb-backend
-SOCIALWEB_LIB_DEPENDS=	libsocialweb.so:${PORTSDIR}/www/libsocialweb
+SOCIALWEB_LIB_DEPENDS=	libsocialweb.so:www/libsocialweb
 TRACKER_CONFIGURE_ENABLE=	tracker-backend
-TRACKER_LIB_DEPENDS=	libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker
+TRACKER_LIB_DEPENDS=	libtracker-control-1.0.so:sysutils/tracker
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|--fatal-warnings||g' \
diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile
index 17ccf3a2a89f..c71ef8659333 100644
--- a/net-im/freetalk/Makefile
+++ b/net-im/freetalk/Makefile
@@ -13,9 +13,9 @@ COMMENT=	GNU console based Jabber client
 
 OPTIONS_DEFINE=	NLS
 
-LIB_DEPENDS=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
-BUILD_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth
+BUILD_DEPENDS=	guile>=1.8.6:lang/guile
+RUN_DEPENDS=	guile>=1.8.6:lang/guile
 
 USES=		pkgconfig
 USE_GNOME=	glib20
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index e11c9cdb938d..a8e9f015ea0f 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Graphical client for the Gale instant messaging system
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Pmw>0:${PORTSDIR}/x11-toolkits/py-Pmw
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw
 
 USE_OPENSSL=	yes
 USES=		python
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index b89df94c920b..d0d5ba8b0715 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Jabber client based on a plugin system
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}nbxmpp>0:${PORTSDIR}/net-im/py-nbxmpp
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp
 
 NO_ARCH=	yes
 USES=		cpe dos2unix gmake pathfix python:2 tar:bzip2
@@ -37,12 +37,12 @@ CRYPTO_DESC=	End to end encryption support
 GUPNP_DESC=	UPnP IGD protocol support
 SPELL_DESC=	Spell checking support
 
-AVAHI_RUN_DEPENDS=	avahi-discover:${PORTSDIR}/net/py-avahi
-CRYPTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
-DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus
-GUPNP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gupnp/__init__.py:${PORTSDIR}/net/gupnp-igd
+AVAHI_RUN_DEPENDS=	avahi-discover:net/py-avahi
+CRYPTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
+DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus
+GUPNP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gupnp/__init__.py:net/gupnp-igd
 NLS_USES=		gettext
-SPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+SPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 
 PORTDOCS=	AUTHORS ChangeLog README.html
 SUB_FILES=	pkg-message
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 4b2863fda5e1..ea4166f51c60 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}ruit
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Secure instant messaging system
 
-LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc \
-		libwwwcore.so:${PORTSDIR}/www/libwww \
-		libadns.so:${PORTSDIR}/dns/adns
+LIB_DEPENDS=	libgc.so:devel/boehm-gc \
+		libwwwcore.so:www/libwww \
+		libadns.so:dns/adns
 
 USES=		iconv libtool ncurses
 GNU_CONFIGURE=	yes
diff --git a/net-im/gloox/Makefile b/net-im/gloox/Makefile
index 0150fd15bb15..5d827a86c27c 100644
--- a/net-im/gloox/Makefile
+++ b/net-im/gloox/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Jabber/XMPP client library
 LICENSE=	GPLv3
 #LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libgnutls.so:security/gnutls
 
 USES=		libtool pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
@@ -28,7 +28,7 @@ PORTSCOUT=	skipv:1.0.x
 
 OPTIONS_DEFINE=		MDNSRESPONDER
 
-MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 MDNSRESPONDER_CONFIGURE_ENABLE=	mdns
 
 post-patch:
diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index 512ce9fef2b3..b1ba6fbadc83 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -29,8 +29,8 @@ KDE4_DESC=	KDE 4 integration (implies Qt 4)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/webkit/__init__.py:${PORTSDIR}/www/py-webkitgtk \
-		${PYTHON_SITELIBDIR}/keybinder/__init__.py:${PORTSDIR}/x11/keybinder
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk \
+		${PYTHON_SITELIBDIR}/keybinder/__init__.py:x11/keybinder
 PLIST_SUB+=	GTK2=""
 .else
 CMAKE_ARGS+=	-DWITH_GTK=off
diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index c98fc189e930..6986e1d5a2d1 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Python ICQ-Transport for Jabber
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 PROJECTHOST=	pyicqt
 OPTIONS_DEFINE=	DOCS EXAMPLES MYSQL TWISTED
@@ -43,7 +43,7 @@ INST_DIR=	${PREFIX}/lib/jabber/${PORTNAME}
 PORTDOCS=	NEWS README
 PORTEXAMPLES=	db-setup.mysql jabber-pyicq.xml
 
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb
 TWISTED_USES=		twisted:web,words
 
 .include <bsd.port.options.mk>
@@ -53,19 +53,19 @@ JABBER_REQUIRE?=	jabber
 JABBER_USER?=		jabber
 JABBER_PIDDIR?=		/var/run/jabberd
 JABBER_SPOOLDIR?=	/var/spool/jabberd
-RUN_DEPENDS+=		jabberd14:${PORTSDIR}/net-im/jabber
+RUN_DEPENDS+=		jabberd14:net-im/jabber
 .elif ${PORT_OPTIONS:MJABBERD}
 JABBER_REQUIRE?=	jabberd
 JABBER_USER?=		jabber
 JABBER_PIDDIR?=		/var/jabberd/pid
 JABBER_SPOOLDIR?=	/var/spool/jabber
-RUN_DEPENDS+=		jabberd:${PORTSDIR}/net-im/jabberd
+RUN_DEPENDS+=		jabberd:net-im/jabberd
 .elif ${PORT_OPTIONS:MEJABBERD}
 JABBER_REQUIRE?=	ejabberd
 JABBER_USER?=		ejabberd
 JABBER_PIDDIR?=		/var/jabberd/pid
 JABBER_SPOOLDIR?=	/var/spool/jabber
-RUN_DEPENDS+=		ejabberdctl:${PORTSDIR}/net-im/ejabberd
+RUN_DEPENDS+=		ejabberdctl:net-im/ejabberd
 .elif ${PORT_OPTIONS:MDAEMON}
 JABBER_REQUIRE?=	DAEMON
 JABBER_USER?=		nobody
diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile
index bee7ce3ba575..b591f9cce861 100644
--- a/net-im/jabber.el/Makefile
+++ b/net-im/jabber.el/Makefile
@@ -11,7 +11,7 @@ DISTNAME=		emacs-jabber-${PORTVERSION}
 MAINTAINER=	max.n.boyarov@gmail.com
 COMMENT=	Minimal jabber client for [X]Emacs
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gnutls-cli:${PORTSDIR}/security/gnutls
+RUN_DEPENDS=	${LOCALBASE}/bin/gnutls-cli:security/gnutls
 
 INFO=		emacs-jabber
 PORTDOCS+=	AUTHORS NEWS README
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 0b8d81bd94bc..ecd1c0028d3d 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -16,11 +16,11 @@ COMMENT=	XMPP/Jabber server daemon
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libpth.so:${PORTSDIR}/devel/pth-hard \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libpth.so:devel/pth-hard \
+		libidn.so:dns/libidn \
+		libgnutls.so:security/gnutls \
+		libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE= IPV6 MYSQL PGSQL DOCS
 
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 393b57eee5fb..eb98f6019523 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Online presence and instant messaging server
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libgsasl.so:${PORTSDIR}/security/gsasl \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libudns.so:${PORTSDIR}/dns/udns
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libgsasl.so:security/gsasl \
+		libidn.so:dns/libidn \
+		libudns.so:dns/udns
 
 OPTIONS_DEFINE=	MYSQL PGSQL LDAP BDB SQLITE PAM PIPE ANON FS DEBUG REQUIRES \
 		DOCS SUPERSEDED EXPERIMENTAL
@@ -71,7 +71,7 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	pgsql
 
 SQLITE_CONFIGURE_ENABLE=sqlite
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ENABLE=	mysql
diff --git a/net-im/jarl/Makefile b/net-im/jarl/Makefile
index c4960153565d..9cca0ad7998a 100644
--- a/net-im/jarl/Makefile
+++ b/net-im/jarl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl/Tk Jabber client
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	ptksh:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-Net-Jabber>=0:${PORTSDIR}/net-im/p5-Net-Jabber
+RUN_DEPENDS=	ptksh:x11-toolkits/p5-Tk \
+		p5-Net-Jabber>=0:net-im/p5-Net-Jabber
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/net-im/jggtrans/Makefile b/net-im/jggtrans/Makefile
index 52e548d8721f..7e1fde09d3e7 100644
--- a/net-im/jggtrans/Makefile
+++ b/net-im/jggtrans/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Jabberd XMPP to GG instant messaging service gateway
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libgadu.so:${PORTSDIR}/polish/libgadu
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libexpat.so:textproc/expat2 \
+		libgadu.so:polish/libgadu
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pkgconfig
diff --git a/net-im/kde-telepathy/Makefile b/net-im/kde-telepathy/Makefile
index b7e8488a58b1..ea3960161d6a 100644
--- a/net-im/kde-telepathy/Makefile
+++ b/net-im/kde-telepathy/Makefile
@@ -7,14 +7,14 @@ CATEGORIES=	net-im kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE integrated instant messaging framework
 
-RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kcm_ktp_accounts.so:${PORTSDIR}/net-im/ktp-accounts-kcm \
-		${KDE4_PREFIX}/lib/kde4/kded_ktp_approver.so:${PORTSDIR}/net-im/ktp-approver \
-		${KDE4_PREFIX}/lib/kde4/libexec/ktp-auth-handler:${PORTSDIR}/net-im/ktp-auth-handler \
-		${KDE4_PREFIX}/bin/ktp-contactlist:${PORTSDIR}/net-im/ktp-contact-list \
-		${KDE4_PREFIX}/lib/kde4/krunner_ktp_contacts.so:${PORTSDIR}/net-im/ktp-contact-runner \
-		${KDE4_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:${PORTSDIR}/net-im/ktp-filetransfer-handler \
-		${KDE4_PREFIX}/lib/kde4/kded_ktp_integration_module.so:${PORTSDIR}/net-im/ktp-kded-integration-module \
-		${KDE4_PREFIX}/lib/kde4/libexec/ktp-text-ui:${PORTSDIR}/net-im/ktp-text-ui
+RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kcm_ktp_accounts.so:net-im/ktp-accounts-kcm \
+		${KDE4_PREFIX}/lib/kde4/kded_ktp_approver.so:net-im/ktp-approver \
+		${KDE4_PREFIX}/lib/kde4/libexec/ktp-auth-handler:net-im/ktp-auth-handler \
+		${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list \
+		${KDE4_PREFIX}/lib/kde4/krunner_ktp_contacts.so:net-im/ktp-contact-runner \
+		${KDE4_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \
+		${KDE4_PREFIX}/lib/kde4/kded_ktp_integration_module.so:net-im/ktp-kded-integration-module \
+		${KDE4_PREFIX}/lib/kde4/libexec/ktp-text-ui:net-im/ktp-text-ui
 
 USE_KDE4=	kdeprefix
 USES=		metaport
@@ -28,11 +28,11 @@ SEND_FILE_DESC=	Context menu plugin for sending files
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPLASMA}
-RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/plasma_applet_ktp_presence.so:${PORTSDIR}/net-im/plasma-applet-ktp
+RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/plasma_applet_ktp_presence.so:net-im/plasma-applet-ktp
 .endif
 
 .if ${PORT_OPTIONS:MSEND_FILE}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/ktp-send-file:${PORTSDIR}/net-im/ktp-send-file
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/ktp-send-file:net-im/ktp-send-file
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 850f09d542f3..3d1bc2762eec 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/Latest%20versions/${PORTVERSION}/
 MAINTAINER=	syncer@gmail.com
 COMMENT=	MSN Messenger client for KDE
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca \
-		libgif.so:${PORTSDIR}/graphics/giflib
+LIB_DEPENDS=	libqca.so:devel/qca \
+		libgif.so:graphics/giflib
 
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdeprefix kdelibs libkonq automoc4
diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile
index 944c3e09714d..9066fbb794e4 100644
--- a/net-im/kopete-kde4/Makefile
+++ b/net-im/kopete-kde4/Makefile
@@ -10,15 +10,15 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE multi-protocol instant messenger
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libotr.so.5:${PORTSDIR}/security/libotr \
-		libgadu.so:${PORTSDIR}/polish/libgadu \
-		libkleo.so:${PORTSDIR}/deskutils/kdepim4 \
-		libmeanwhile.so:${PORTSDIR}/net-im/meanwhile \
-		libv4l2.so:${PORTSDIR}/multimedia/libv4l \
-		libjasper.so:${PORTSDIR}/graphics/jasper
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libqca.so:devel/qca \
+		libotr.so.5:security/libotr \
+		libgadu.so:polish/libgadu \
+		libkleo.so:deskutils/kdepim4 \
+		libmeanwhile.so:net-im/meanwhile \
+		libv4l2.so:multimedia/libv4l \
+		libjasper.so:graphics/jasper
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
 USES=		cmake:outsource jpeg pkgconfig shebangfix sqlite tar:xz webplugin:native
 USE_GNOME=	libxml2 libxslt
@@ -51,7 +51,7 @@ CFLAGS+=	-DHAVE_LINUX_INTEGER_TYPES=1
 
 OPTIONS_DEFINE=	XMMS
 XMMS_DESC=	XMMS Kopete nowlistening plugin
-XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_LIB_DEPENDS=	libxmms.so:multimedia/xmms
 XMMS_CMAKE_ON=	-DWITH_Xmms:BOOL=ON
 XMMS_CMAKE_OFF=	-DWITH_Xmms:BOOL=OFF
 
diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile
index 9aec82ce70af..00e0197c7b77 100644
--- a/net-im/ktp-accounts-kcm/Makefile
+++ b/net-im/ktp-accounts-kcm/Makefile
@@ -8,10 +8,10 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging account management module
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libtelepathy-logger-qt4.so:${PORTSDIR}/net-im/telepathy-logger-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
-RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:${PORTSDIR}/net-im/ktp-contact-list
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
@@ -22,14 +22,14 @@ OPTIONS_DEFINE=	HAZE IRC JABBER SALUT
 OPTIONS_DEFAULT=JABBER
 
 HAZE_DESC=	libpurple protocols support
-HAZE_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze
+HAZE_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-haze:net-im/telepathy-haze
 
 IRC_DESC=	Internet Relay Chat support
-IRC_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-idle:${PORTSDIR}/net-im/telepathy-idle
+IRC_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-idle:net-im/telepathy-idle
 
-JABBER_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble
+JABBER_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-gabble:net-im/telepathy-gabble
 
 SALUT_DESC=	Link-local (serverless) XMPP support
-SALUT_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut
+SALUT_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-salut:net-im/telepathy-salut
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-approver/Makefile b/net-im/ktp-approver/Makefile
index 517e5535a68c..e36d345a2330 100644
--- a/net-im/ktp-approver/Makefile
+++ b/net-im/ktp-approver/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging notifier
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
-RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:${PORTSDIR}/net-im/ktp-contact-list
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
diff --git a/net-im/ktp-auth-handler/Makefile b/net-im/ktp-auth-handler/Makefile
index 911d8ac4bf36..51fdcb96bfc5 100644
--- a/net-im/ktp-auth-handler/Makefile
+++ b/net-im/ktp-auth-handler/Makefile
@@ -8,10 +8,10 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KWallet integration module for KDE Telepathy
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
+LIB_DEPENDS=	libqjson.so:devel/qjson \
+		libqca.so:devel/qca \
+		libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib dbus gui xml webkit \
diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile
index 4c66affd9888..684e5b0aa5be 100644
--- a/net-im/ktp-common-internals/Makefile
+++ b/net-im/ktp-common-internals/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Telepathy internal library
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libtelepathy-logger-qt4.so:${PORTSDIR}/net-im/telepathy-logger-qt4
-RUN_DEPENDS=	${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4
+RUN_DEPENDS=	${LOCALBASE}/libexec/mission-control-5:net-im/telepathy-mission-control
 
 USE_KDE4=	kdeprefix kdelibs pimlibs automoc4
 USE_QT4=	declarative script \
diff --git a/net-im/ktp-contact-list/Makefile b/net-im/ktp-contact-list/Makefile
index 3375fd37eafd..9e9c9a4a5efb 100644
--- a/net-im/ktp-contact-list/Makefile
+++ b/net-im/ktp-contact-list/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging contact list application
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libtelepathy-logger-qt4.so:${PORTSDIR}/net-im/telepathy-logger-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
diff --git a/net-im/ktp-contact-runner/Makefile b/net-im/ktp-contact-runner/Makefile
index eb39dd2d55e4..9f9e6cf1da33 100644
--- a/net-im/ktp-contact-runner/Makefile
+++ b/net-im/ktp-contact-runner/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KRunner integration module for KDE Telepathy
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
diff --git a/net-im/ktp-desktop-applets/Makefile b/net-im/ktp-desktop-applets/Makefile
index 809dabdf42c7..01cbeb7d33be 100644
--- a/net-im/ktp-desktop-applets/Makefile
+++ b/net-im/ktp-desktop-applets/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging plasma widgets
 
-LIB_DEPENDS=	libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
+LIB_DEPENDS=	libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
diff --git a/net-im/ktp-filetransfer-handler/Makefile b/net-im/ktp-filetransfer-handler/Makefile
index b87cb923f4a0..acb57d33de8b 100644
--- a/net-im/ktp-filetransfer-handler/Makefile
+++ b/net-im/ktp-filetransfer-handler/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging file transfer handler
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
diff --git a/net-im/ktp-kded-integration-module/Makefile b/net-im/ktp-kded-integration-module/Makefile
index a17e718c4379..c508b8b6ca98 100644
--- a/net-im/ktp-kded-integration-module/Makefile
+++ b/net-im/ktp-kded-integration-module/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Module for integration of instant messaging into KDE Workspaces
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
diff --git a/net-im/ktp-send-file/Makefile b/net-im/ktp-send-file/Makefile
index 4fbe767513dc..4854a5c84ea7 100644
--- a/net-im/ktp-send-file/Makefile
+++ b/net-im/ktp-send-file/Makefile
@@ -8,10 +8,10 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging file transfer application
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
-RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:${PORTSDIR}/net-im/ktp-filetransfer-handler \
-		${KDE4_PREFIX}/bin/ktp-contactlist:${PORTSDIR}/net-im/ktp-contact-list
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \
+		${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile
index 437ffa91c861..de21ab385946 100644
--- a/net-im/ktp-text-ui/Makefile
+++ b/net-im/ktp-text-ui/Makefile
@@ -8,10 +8,10 @@ MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE chat window application
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libtelepathy-logger-qt4.so:${PORTSDIR}/net-im/telepathy-logger-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
-RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:${PORTSDIR}/net-im/ktp-contact-list
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
 USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib webkit xml \
diff --git a/net-im/libaccounts-glib/Makefile b/net-im/libaccounts-glib/Makefile
index 89e5cd640cc1..4515efd81fdb 100644
--- a/net-im/libaccounts-glib/Makefile
+++ b/net-im/libaccounts-glib/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Accounts and SSO framework for Linux and POSIX based platforms
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libsqlite3.so:databases/sqlite3
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 
diff --git a/net-im/libaccounts-qt5/Makefile b/net-im/libaccounts-qt5/Makefile
index b2d3ac5fbe5b..7116d8dd2e28 100644
--- a/net-im/libaccounts-qt5/Makefile
+++ b/net-im/libaccounts-qt5/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Qt5 wrapper for SSO framework
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libaccounts-glib.so:${PORTSDIR}/net-im/libaccounts-glib
-BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+LIB_DEPENDS=	libaccounts-glib.so:net-im/libaccounts-glib
+BUILD_DEPENDS=	doxygen:devel/doxygen
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 
diff --git a/net-im/libjreen/Makefile b/net-im/libjreen/Makefile
index cdb05012b8b9..0f63404b1c57 100644
--- a/net-im/libjreen/Makefile
+++ b/net-im/libjreen/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Qt4 based jabber library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca \
-		libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	libqca.so:devel/qca \
+		libspeex.so:audio/speex
 
 GH_ACCOUNT=	euroelessar
 GH_PROJECT=	jreen
diff --git a/net-im/libnice-gst010/Makefile b/net-im/libnice-gst010/Makefile
index 4ea59475768a..a7739953b3b5 100644
--- a/net-im/libnice-gst010/Makefile
+++ b/net-im/libnice-gst010/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-gst010
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GStreamer 0.10 plugin from libnice
 
-LIB_DEPENDS=	libnice.so:${PORTSDIR}/net-im/libnice
+LIB_DEPENDS=	libnice.so:net-im/libnice
 
 MASTERDIR=	${.CURDIR}/../libnice
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net-im/libnice-gst1/Makefile b/net-im/libnice-gst1/Makefile
index 467cbc8ce5c8..807da0bf5ae3 100644
--- a/net-im/libnice-gst1/Makefile
+++ b/net-im/libnice-gst1/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX=	-gst1
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GStreamer 1 plugin from libnice
 
-LIB_DEPENDS=	libnice.so:${PORTSDIR}/net-im/libnice
+LIB_DEPENDS=	libnice.so:net-im/libnice
 
 MASTERDIR=	${.CURDIR}/../libnice
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index 08887e6431af..390d3134f601 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -20,7 +20,7 @@ INSTALL_TARGET=	install-strip
 .if !defined(LIBNICE_SLAVE)
 OPTIONS_DEFINE=	GUPNP
 GUPNP_DESC=	UPnP IGD port mapping support
-GUPNP_LIB_DEPENDS+=	libgupnp-igd-1.0.so:${PORTSDIR}/net/gupnp-igd
+GUPNP_LIB_DEPENDS+=	libgupnp-igd-1.0.so:net/gupnp-igd
 GUPNP_CONFIGURE_ENABLE=	gupnp
 .endif
 
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 5999ddc80f89..8c12ebe5d1d0 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -142,7 +142,7 @@ CONFIGURE_ARGS+=--disable-gstreamer
 .endif
 
 .if ${PORT_OPTIONS:MVV} && ${PORT_OPTIONS:MGSTREAMER}
-LIB_DEPENDS+=	libfarstream-0.2.so:${PORTSDIR}/net-im/farstream
+LIB_DEPENDS+=	libfarstream-0.2.so:net-im/farstream
 USE_GSTREAMER+=	v4l2
 PLIST_SUB+=	VV=""
 .else
@@ -151,13 +151,13 @@ PLIST_SUB+=	VV="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIDN}
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 .else
 CONFIGURE_ARGS+=--disable-idn
 .endif
 
 .if ${PORT_OPTIONS:MCAP}
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 CONFIGURE_ARGS+=--enable-cap
 PLIST_SUB+=	CAP=""
 .else
@@ -166,7 +166,7 @@ PLIST_SUB+=	CAP="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=	--enable-gnutls=yes
 PLIST_SUB+=		GNUTLS=""
 .else
@@ -175,7 +175,7 @@ PLIST_SUB+=		GNUTLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNSS}
-LIB_DEPENDS+=		libnss3.so:${PORTSDIR}/security/nss
+LIB_DEPENDS+=		libnss3.so:security/nss
 CONFIGURE_ARGS+=	--enable-nss=yes \
 			--with-nspr-includes=${LOCALBASE}/include/nspr \
 			--with-nspr-libs=${LOCALBASE}/lib \
@@ -188,12 +188,12 @@ PLIST_SUB+=		NSS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-cyrus-sasl
 .endif
 
 .if ${PORT_OPTIONS:MBONJOUR}
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
 PLIST_SUB+=	BONJOUR=""
 PRPL_MODULES:=	bonjour,${PRPL_MODULES}
 .else
@@ -202,15 +202,15 @@ PLIST_SUB+=	BONJOUR="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=		libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+LIB_DEPENDS+=		libgtkspell.so:textproc/gtkspell
 .else
 CONFIGURE_ARGS+=	--disable-gtkspell
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=		libdbus-glib-1.so:devel/dbus-glib
 .if !defined(PIDGIN_SLAVE)
-RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus
 .endif
 CONFIGURE_ARGS+=	--enable-dbus
 PLIST_SUB+=		DBUS=""
@@ -220,7 +220,7 @@ PLIST_SUB+=		DBUS="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MSAMETIME}
-LIB_DEPENDS+=	libmeanwhile.so:${PORTSDIR}/net-im/meanwhile
+LIB_DEPENDS+=	libmeanwhile.so:net-im/meanwhile
 PLIST_SUB+=	SAMETIME=""
 PRPL_MODULES:=	sametime,${PRPL_MODULES}
 .else
@@ -229,7 +229,7 @@ CONFIGURE_ARGS+=--disable-meanwhile
 .endif
 
 .if ${PORT_OPTIONS:MSILC}
-LIB_DEPENDS+=		libsilcclient.so:${PORTSDIR}/devel/silc-toolkit
+LIB_DEPENDS+=		libsilcclient.so:devel/silc-toolkit
 CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc \
 			--with-silc-libs=${LOCALBASE}/lib
 PLIST_SUB+=		SILC=""
diff --git a/net-im/libstrophe/Makefile b/net-im/libstrophe/Makefile
index c883d89ecd28..dbec051f7166 100644
--- a/net-im/libstrophe/Makefile
+++ b/net-im/libstrophe/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Lightweight XMPP library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE.txt
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	strophe
diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile
index 2811ac8b5cd9..71b7093c9030 100644
--- a/net-im/libtelepathy/Makefile
+++ b/net-im/libtelepathy/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Flexible Communications Framework
 
-LIB_DEPENDS=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libtelepathy-glib.so:net-im/telepathy-glib \
+		libdbus-glib-1.so:devel/dbus-glib
 
 USES=		gmake libtool pathfix pkgconfig python:build
 USE_LDCONFIG=	yes
diff --git a/net-im/licq-icq/Makefile b/net-im/licq-icq/Makefile
index aba25e0f06da..fe3cab044892 100644
--- a/net-im/licq-icq/Makefile
+++ b/net-im/licq-icq/Makefile
@@ -9,7 +9,7 @@ COMMENT=	ICQ plugin for Licq
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
 USES=		cmake
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/net-im/licq-jabber/Makefile b/net-im/licq-jabber/Makefile
index d9dd4ef21182..ae2be51b4102 100644
--- a/net-im/licq-jabber/Makefile
+++ b/net-im/licq-jabber/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Jabber (XMPP) plugin for Licq
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgloox.so:${PORTSDIR}/net-im/gloox \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libgloox.so:net-im/gloox \
+		libboost_regex.so:devel/boost-libs
 
 USES=		cmake pkgconfig
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/net-im/licq-msn/Makefile b/net-im/licq-msn/Makefile
index 1dcbb231139f..fcb2b1e324a4 100644
--- a/net-im/licq-msn/Makefile
+++ b/net-im/licq-msn/Makefile
@@ -9,7 +9,7 @@ COMMENT=	MSN plugin for Licq
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
 USES=		cmake
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile
index a57ce33e2309..20af0475af3f 100644
--- a/net-im/licq-osd/Makefile
+++ b/net-im/licq-osd/Makefile
@@ -9,9 +9,9 @@ CATEGORIES=	net-im
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	OnScreenDisplay messages in licq
 
-LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/lib/licq/licq_qt4-gui.so:${PORTSDIR}/${LICQ_PORT}-qt-gui
+LIB_DEPENDS=	libxosd.so:misc/xosd \
+		libboost_regex.so:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/lib/licq/licq_qt4-gui.so:${LICQ_PORT}-qt-gui
 # run dependency may be too strict, delete it if you use another
 # plugin (gtk+) and wish run osd with it. i've not tested with
 # plugins other than qt-gui
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index 2e24fd9bb5f4..3d87c692cf4f 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Qt plugin for licq
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/lib/licq/protocol_icq.so:${PORTSDIR}/${LICQ_PORT}-icq
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/lib/licq/protocol_icq.so:${LICQ_PORT}-icq
 
 USE_XORG=	x11 xext ice xscrnsaver
 USES=		cmake
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=HUNSPELL
 
 LICQ_PORT?=	net-im/licq
 
-HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 HUNSPELL_CMAKE_ON=	-DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \
 			-DHUNSPELL_LIBRARIES=${LOCALBASE}/lib/libhunspell-1.3.so \
 			-DHUNSPELL_FOUND:BOOL=ON
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 90e9a6dca9dc..7a5e644c432f 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Popular ICQ-compatible plugin-based program
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
 USES=		cmake iconv
 USE_OPENSSL=	yes
@@ -29,9 +29,9 @@ GPGME_DESC=	Build support for gpgme
 NLS_USES=	gettext
 NLS_CMAKE_OFF=	-DENABLE_NLS:BOOL=OFF
 
-GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-			libassuan.so:${PORTSDIR}/security/libassuan \
-			libgpg-error.so:${PORTSDIR}/security/libgpg-error
+GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme \
+			libassuan.so:security/libassuan \
+			libgpg-error.so:security/libgpg-error
 
 .include <bsd.port.options.mk>
 
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index e07741cfcd87..6caff76d099a 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -4,8 +4,8 @@
 PKGNAMEPREFIX=		licq-
 LICQ_VER=		1.8.2
 .if ${PORTNAME} != "base"
-BUILD_DEPENDS+=		licq:${PORTSDIR}/${LICQ_PORT}
-RUN_DEPENDS+=		licq:${PORTSDIR}/${LICQ_PORT}
+BUILD_DEPENDS+=		licq:${LICQ_PORT}
+RUN_DEPENDS+=		licq:${LICQ_PORT}
 WRKSRC?=		${WRKDIR}/${DISTNAME}/plugins/${PORTNAME}
 .endif
 MASTER_SITES=		SF/licq/licq/${LICQ_VER}
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index b9a502b49517..ead1d4ed3049 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Lightweight Jabber client library
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libidn.so:dns/libidn
 
 USES=		gettext gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	glib20
@@ -32,12 +32,12 @@ OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 .elif ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-ssl=openssl
-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
diff --git a/net-im/mbpurple/Makefile b/net-im/mbpurple/Makefile
index ad56c5bc9f87..ce946fe6bf5e 100644
--- a/net-im/mbpurple/Makefile
+++ b/net-im/mbpurple/Makefile
@@ -10,8 +10,8 @@ PROJECTHOST=	microblog-purple
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Integrate Twitter with Pidgin (AKA microblog-purple)
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
+BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:net-im/pidgin
+RUN_DEPENDS=	${LOCALBASE}/bin/pidgin:net-im/pidgin
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index a9c311cc40eb..41fc838a4ebf 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Small Jabber console client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
+LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth
 
 USES=		gettext iconv libtool ncurses pathfix pkgconfig tar:bzip2
 USE_GNOME=	glib20
@@ -34,17 +34,17 @@ OTR_DESC=		Off-the-record messaging support
 
 OPTIONS_SUB=		yes
 
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ENABLE=aspell
 
-ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 ENCHANT_CONFIGURE_ENABLE=enchant
 
-GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GPGME_CONFIGURE_ENABLE=	gpgme
 
-OTR_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-			libotr.so.5:${PORTSDIR}/security/libotr
+OTR_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+			libotr.so.5:security/libotr
 OTR_CONFIGURE_ENABLE=	otr
 
 post-patch:
diff --git a/net-im/mikutter/Makefile b/net-im/mikutter/Makefile
index 5ef0c04ef792..f800a60cd6c5 100644
--- a/net-im/mikutter/Makefile
+++ b/net-im/mikutter/Makefile
@@ -14,24 +14,24 @@ COMMENT=	Simple, powerful, and moeful Twitter client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-gtk2>=3.0.7:${PORTSDIR}/x11-toolkits/rubygem-gtk2 \
-		rubygem-cairo>=1.12.9:${PORTSDIR}/graphics/rubygem-cairo \
-		rubygem-addressable>=2.3.8:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-delayer>=0.0.2:${PORTSDIR}/devel/rubygem-delayer \
-		rubygem-delayer-deferred>=1.0.3:${PORTSDIR}/devel/rubygem-delayer-deferred \
-		rubygem-gettext>=3.0.9:${PORTSDIR}/devel/rubygem-gettext \
-		rubygem-instance_storage>=1.0.0:${PORTSDIR}/devel/rubygem-instance_storage \
-		rubygem-json_pure>=1.8.3:${PORTSDIR}/devel/rubygem-json_pure \
-		rubygem-locale>=2.1.1:${PORTSDIR}/devel/rubygem-locale \
-		rubygem-memoist>=0.14.0:${PORTSDIR}/devel/rubygem-memoist \
-		rubygem-oauth>=0.4.7:${PORTSDIR}/net/rubygem-oauth \
-		rubygem-pluggaloid>=1.0.2:${PORTSDIR}/devel/rubygem-pluggaloid \
-		rubygem-ruby-hmac>=0.4.0:${PORTSDIR}/security/rubygem-ruby-hmac \
-		rubygem-text>=1.3.1:${PORTSDIR}/textproc/rubygem-text \
-		rubygem-totoridipjp>=0.1.0:${PORTSDIR}/www/rubygem-totoridipjp \
-		rubygem-twitter-text>=1.13.0:${PORTSDIR}/textproc/rubygem-twitter-text \
-		rubygem-typed-array>=0.1.2:${PORTSDIR}/devel/rubygem-typed-array \
-		rubygem-unf>=0.1.4:${PORTSDIR}/textproc/rubygem-unf
+RUN_DEPENDS=	rubygem-gtk2>=3.0.7:x11-toolkits/rubygem-gtk2 \
+		rubygem-cairo>=1.12.9:graphics/rubygem-cairo \
+		rubygem-addressable>=2.3.8:www/rubygem-addressable \
+		rubygem-delayer>=0.0.2:devel/rubygem-delayer \
+		rubygem-delayer-deferred>=1.0.3:devel/rubygem-delayer-deferred \
+		rubygem-gettext>=3.0.9:devel/rubygem-gettext \
+		rubygem-instance_storage>=1.0.0:devel/rubygem-instance_storage \
+		rubygem-json_pure>=1.8.3:devel/rubygem-json_pure \
+		rubygem-locale>=2.1.1:devel/rubygem-locale \
+		rubygem-memoist>=0.14.0:devel/rubygem-memoist \
+		rubygem-oauth>=0.4.7:net/rubygem-oauth \
+		rubygem-pluggaloid>=1.0.2:devel/rubygem-pluggaloid \
+		rubygem-ruby-hmac>=0.4.0:security/rubygem-ruby-hmac \
+		rubygem-text>=1.3.1:textproc/rubygem-text \
+		rubygem-totoridipjp>=0.1.0:www/rubygem-totoridipjp \
+		rubygem-twitter-text>=1.13.0:textproc/rubygem-twitter-text \
+		rubygem-typed-array>=0.1.2:devel/rubygem-typed-array \
+		rubygem-unf>=0.1.4:textproc/rubygem-unf
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
@@ -58,7 +58,7 @@ OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 .include <bsd.port.options.mk>
 
-NOTIFY_RUN_DEPENDS=	notify-send:${PORTSDIR}/devel/libnotify
+NOTIFY_RUN_DEPENDS=	notify-send:devel/libnotify
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|" \
diff --git a/net-im/mu-conference/Makefile b/net-im/mu-conference/Makefile
index 9bf7af1fa5f8..fb9cfa433755 100644
--- a/net-im/mu-conference/Makefile
+++ b/net-im/mu-conference/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Multi-User Conferencing component for Jabber
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libidn.so:dns/libidn
 
 USES=		pkgconfig shebangfix
 SHEBANG_FILES=	scripts/roommaker.pl scripts/roomname.pl
@@ -58,19 +58,19 @@ JABBER_REQUIRE?=        jabber
 JABBER_USER?=           jabber
 JABBER_PIDDIR?=         /var/run/jabberd
 JABBER_SPOOLDIR?=       /var/spool/jabberd
-RUN_DEPENDS+=           jabberd14:${PORTSDIR}/net-im/jabber
+RUN_DEPENDS+=           jabberd14:net-im/jabber
 .elif ${PORT_OPTIONS:MJABBERD}
 JABBER_REQUIRE?=        jabberd
 JABBER_USER?=           jabber
 JABBER_PIDDIR?=         /var/jabberd/pid
 JABBER_SPOOLDIR?=       /var/spool/jabber
-RUN_DEPENDS+=           jabberd:${PORTSDIR}/net-im/jabberd
+RUN_DEPENDS+=           jabberd:net-im/jabberd
 .elif ${PORT_OPTIONS:MEJABBERD}
 JABBER_REQUIRE?=        ejabberd
 JABBER_USER?=           ejabberd
 JABBER_PIDDIR?=         /var/jabberd/pid
 JABBER_SPOOLDIR?=       /var/spool/jabber
-RUN_DEPENDS+=           ejabberdctl:${PORTSDIR}/net-im/ejabberd
+RUN_DEPENDS+=           ejabberdctl:net-im/ejabberd
 .elif ${PORT_OPTIONS:MDAEMON}
 JABBER_REQUIRE?=        DAEMON
 JABBER_USER?=           nobody
diff --git a/net-im/naim/Makefile b/net-im/naim/Makefile
index 437aabe5b278..ecbc09427318 100644
--- a/net-im/naim/Makefile
+++ b/net-im/naim/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--without-pkgdocdir
 .endif
 
 .if ${PORT_OPTIONS:MDETACH}
-RUN_DEPENDS=	screen:${PORTSDIR}/sysutils/screen
+RUN_DEPENDS=	screen:sysutils/screen
 CONFIGURE_ARGS+=	--enable-detach
 .endif
 
diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index ab2c7c372668..c9d9b99f0742 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Enterprise instant messaging server
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j
+RUN_DEPENDS=	${JAVAJARDIR}/slf4j-api.jar:devel/slf4j
 
 OPTIONS_DEFINE=	DOCS PLUGINS
 OPTIONS_DEFAULT=PLUGINS
diff --git a/net-im/p5-AnyEvent-XMPP/Makefile b/net-im/p5-AnyEvent-XMPP/Makefile
index 90859f0edc74..c7f7866f2d3e 100644
--- a/net-im/p5-AnyEvent-XMPP/Makefile
+++ b/net-im/p5-AnyEvent-XMPP/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Implementation of the XMPP Protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Net-LibIDN>=0:${PORTSDIR}/dns/p5-Net-LibIDN \
-		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-Object-Event>=0.7:${PORTSDIR}/devel/p5-Object-Event
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Net-LibIDN>=0:dns/p5-Net-LibIDN \
+		p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer \
+		p5-Object-Event>=0.7:devel/p5-Object-Event
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-im/p5-DJabberd/Makefile b/net-im/p5-DJabberd/Makefile
index 7bb1498e6c30..592bb8eae4c6 100644
--- a/net-im/p5-DJabberd/Makefile
+++ b/net-im/p5-DJabberd/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Scalable, extensible Jabber/XMPP server framework
 
-BUILD_DEPENDS=	p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-Unicode-Stringprep>=0:${PORTSDIR}/converters/p5-Unicode-Stringprep
+BUILD_DEPENDS=	p5-Danga-Socket>=0:devel/p5-Danga-Socket \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-Unicode-Stringprep>=0:converters/p5-Unicode-Stringprep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+TEST_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
diff --git a/net-im/p5-Jabber-Connection/Makefile b/net-im/p5-Jabber-Connection/Makefile
index 7fcec4e1a8ae..9be9e0ee77e8 100644
--- a/net-im/p5-Jabber-Connection/Makefile
+++ b/net-im/p5-Jabber-Connection/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lars.eggert@gmx.net
 COMMENT=	Jabber Perl library for client/component connectivity
 
-RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-im/p5-Jabber-Lite/Makefile b/net-im/p5-Jabber-Lite/Makefile
index b31bc490cf31..06b7ec0b3749 100644
--- a/net-im/p5-Jabber-Lite/Makefile
+++ b/net-im/p5-Jabber-Lite/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Standalone library for communicating with Jabber servers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net-im/p5-Jabber-SimpleSend/Makefile b/net-im/p5-Jabber-SimpleSend/Makefile
index 2d7871395daa..bda6b7d14502 100644
--- a/net-im/p5-Jabber-SimpleSend/Makefile
+++ b/net-im/p5-Jabber-SimpleSend/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Send a Jabber message simply
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Net-Jabber>=0:${PORTSDIR}/net-im/p5-Net-Jabber
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Net-Jabber>=0:net-im/p5-Net-Jabber
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net-im/p5-Net-Async-XMPP/Makefile b/net-im/p5-Net-Async-XMPP/Makefile
index f14ebcb15b9a..cae97eb21ff4 100644
--- a/net-im/p5-Net-Async-XMPP/Makefile
+++ b/net-im/p5-Net-Async-XMPP/Makefile
@@ -15,17 +15,17 @@ COMMENT=	Asynchronous XMPP client and server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>=0.29:${PORTSDIR}/devel/p5-Future \
-		p5-IO-Async-Resolver-DNS>=0.04:${PORTSDIR}/dns/p5-IO-Async-Resolver-DNS \
-		p5-IO-Async-SSL>=0.14:${PORTSDIR}/security/p5-IO-Async-SSL \
-		p5-IO-Async>=0.60:${PORTSDIR}/devel/p5-IO-Async \
-		p5-Mixin-Event-Dispatch>=1:${PORTSDIR}/devel/p5-Mixin-Event-Dispatch \
-		p5-Protocol-XMPP>=0.006:${PORTSDIR}/net-im/p5-Protocol-XMPP \
-		p5-Socket>=2:${PORTSDIR}/net/p5-Socket \
-		p5-curry>=0:${PORTSDIR}/devel/p5-curry
+BUILD_DEPENDS=	p5-Future>=0.29:devel/p5-Future \
+		p5-IO-Async-Resolver-DNS>=0.04:dns/p5-IO-Async-Resolver-DNS \
+		p5-IO-Async-SSL>=0.14:security/p5-IO-Async-SSL \
+		p5-IO-Async>=0.60:devel/p5-IO-Async \
+		p5-Mixin-Event-Dispatch>=1:devel/p5-Mixin-Event-Dispatch \
+		p5-Protocol-XMPP>=0.006:net-im/p5-Protocol-XMPP \
+		p5-Socket>=2:net/p5-Socket \
+		p5-curry>=0:devel/p5-curry
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:${PORTSDIR}/devel/p5-Test-CheckDeps \
-		p5-Test-Fatal>=0.010:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
+		p5-Test-Fatal>=0.010:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index b3ddd2e37f82..d3aa86077f2e 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	jabber
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Net::Jabber provides Perl Developer access to the Jabber protocol
 
-BUILD_DEPENDS=	p5-Net-XMPP>=0:${PORTSDIR}/net-im/p5-Net-XMPP
+BUILD_DEPENDS=	p5-Net-XMPP>=0:net-im/p5-Net-XMPP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-im/p5-Net-OSCAR/Makefile b/net-im/p5-Net-OSCAR/Makefile
index ca24868ca161..48b6b55b18b4 100644
--- a/net-im/p5-Net-OSCAR/Makefile
+++ b/net-im/p5-Net-OSCAR/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for the AOL Instant Messenger OSCAR protocol
 
-BUILD_DEPENDS=	p5-SOCKS>=0:${PORTSDIR}/net/p5-Socks \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-SOCKS>=0:net/p5-Socks \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-im/p5-Net-Stomp/Makefile b/net-im/p5-Net-Stomp/Makefile
index e4903127ff31..96624b18a1e3 100644
--- a/net-im/p5-Net-Stomp/Makefile
+++ b/net-im/p5-Net-Stomp/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Streaming Text Orientated Messaging Protocol Client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-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
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-im/p5-Net-XMPP/Makefile b/net-im/p5-Net-XMPP/Makefile
index 57d2b51c7f2e..bfe22b5179ca 100644
--- a/net-im/p5-Net-XMPP/Makefile
+++ b/net-im/p5-Net-XMPP/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Net::XMPP provides Perl Developer access to the XMPP protocol
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Authen-SASL>=2.12:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Digest-SHA>=5.95:${PORTSDIR}/security/p5-Digest-SHA \
-		p5-XML-Stream>=1.24:${PORTSDIR}/textproc/p5-XML-Stream
+BUILD_DEPENDS=	p5-Authen-SASL>=2.12:security/p5-Authen-SASL \
+		p5-Digest-SHA>=5.95:security/p5-Digest-SHA \
+		p5-XML-Stream>=1.24:textproc/p5-XML-Stream
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-LWP-Online>=1.07:${PORTSDIR}/www/p5-LWP-Online \
-		p5-YAML-Tiny>=1.41:${PORTSDIR}/textproc/p5-YAML-Tiny
+TEST_DEPENDS=	p5-LWP-Online>=1.07:www/p5-LWP-Online \
+		p5-YAML-Tiny>=1.41:textproc/p5-YAML-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/net-im/p5-Net-XMPP2/Makefile b/net-im/p5-Net-XMPP2/Makefile
index 26b770134862..5f8421e38ba7 100644
--- a/net-im/p5-Net-XMPP2/Makefile
+++ b/net-im/p5-Net-XMPP2/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implementation of the XMPP Protocol
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-BS-Event>=0:${PORTSDIR}/devel/p5-BS-Event \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-LibIDN>=0:${PORTSDIR}/dns/p5-Net-LibIDN \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Object-Event>=0:${PORTSDIR}/devel/p5-Object-Event \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-BS-Event>=0:devel/p5-BS-Event \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-LibIDN>=0:dns/p5-Net-LibIDN \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-Object-Event>=0:devel/p5-Object-Event \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-im/p5-Protocol-XMPP/Makefile b/net-im/p5-Protocol-XMPP/Makefile
index 549db8c65116..ea3e06e077bc 100644
--- a/net-im/p5-Protocol-XMPP/Makefile
+++ b/net-im/p5-Protocol-XMPP/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Protocol-level support for XMPP interaction
 
-RUN_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-XML-LibXML-SAX-ChunkParser>=0.00003:${PORTSDIR}/textproc/p5-XML-LibXML-SAX-ChunkParser
+RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-XML-LibXML-SAX-ChunkParser>=0.00003:textproc/p5-XML-LibXML-SAX-ChunkParser
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-im/p5-SOAP-Transport-JABBER/Makefile b/net-im/p5-SOAP-Transport-JABBER/Makefile
index c9957e9cd0b8..0f5f91263951 100644
--- a/net-im/p5-SOAP-Transport-JABBER/Makefile
+++ b/net-im/p5-SOAP-Transport-JABBER/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Jabber-based transport backend for SOAP::Lite
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Net-Jabber>=0:${PORTSDIR}/net-im/p5-Net-Jabber \
-		p5-SOAP-Lite>=0.711:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-Net-Jabber>=0:net-im/p5-Net-Jabber \
+		p5-SOAP-Lite>=0.711:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile
index e39edd1ba7d8..5a6e225c4372 100644
--- a/net-im/papyon/Makefile
+++ b/net-im/papyon/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Fork of pymsn to support the telepathy MSN connection manager
 
-BUILD_DEPENDS=	py*-openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:${PORTSDIR}/security/py-pycrypto \
-		${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:${PORTSDIR}/multimedia/py-gstreamer \
-		${PYTHON_SITELIBDIR}/farsight.so:${PORTSDIR}/net-im/farsight2
-RUN_DEPENDS=	py*-openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:${PORTSDIR}/security/py-pycrypto \
-		${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:${PORTSDIR}/multimedia/py-gstreamer \
-		${PYTHON_SITELIBDIR}/farsight.so:${PORTSDIR}/net-im/farsight2
+BUILD_DEPENDS=	py*-openssl>0:security/py-openssl \
+		${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto \
+		${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer \
+		${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2
+RUN_DEPENDS=	py*-openssl>0:security/py-openssl \
+		${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto \
+		${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer \
+		${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2
 
 USE_GNOME=	pygobject
 USES=		python
@@ -27,8 +27,8 @@ USE_PYTHON=	distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index 7628046d51dc..3a133513230d 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Birthday reminder for Pidgin
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+LIB_DEPENDS=	libpurple.so:net-im/libpurple
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool pkgconfig
diff --git a/net-im/pidgin-bs/Makefile b/net-im/pidgin-bs/Makefile
index ed27168faa63..c56d2729f137 100644
--- a/net-im/pidgin-bs/Makefile
+++ b/net-im/pidgin-bs/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Pidgin plugin to prevent instant message spam
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+LIB_DEPENDS=	libpurple.so:net-im/libpurple
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool pkgconfig tar:bzip2
diff --git a/net-im/pidgin-fetion/Makefile b/net-im/pidgin-fetion/Makefile
index 4be34821ffb7..dc1020324349 100644
--- a/net-im/pidgin-fetion/Makefile
+++ b/net-im/pidgin-fetion/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Fetion protocol plugin for libpurple
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	libpurple.so:net-im/libpurple
 
 GNU_CONFIGURE=	yes
 USES=		libtool pkgconfig tar:bzip2
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 4908f3049627..aa4b31b0cc12 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Plugin to add msn style "toaster" popups to Pidgin
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	gtk20 intltool
diff --git a/net-im/pidgin-hotkeys/Makefile b/net-im/pidgin-hotkeys/Makefile
index 16c002af3fdc..0dd46a8c0948 100644
--- a/net-im/pidgin-hotkeys/Makefile
+++ b/net-im/pidgin-hotkeys/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Pidgin plugin that allows user to assign global hotkeys
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+LIB_DEPENDS=	libpurple.so:net-im/libpurple
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 USES=		libtool pkgconfig
 USE_GNOME=	gtk20
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index c92585e30ee0..da1cdca6a245 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	Display LaTeX output in your IMs
 
-BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
-		convert:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin \
+		convert:graphics/ImageMagick
 
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index d5959647702c..4c533259210b 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	meethune@gmail.com
 COMMENT=	This plugin adds a libnotify interface to Pidgin
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
-		${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libpurple.so:${PORTSDIR}/net-im/libpurple
+BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:net-im/pidgin \
+		${LOCALBASE}/libdata/pkgconfig/libnotify.pc:devel/libnotify
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libpurple.so:net-im/libpurple
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig
diff --git a/net-im/pidgin-manualsize/Makefile b/net-im/pidgin-manualsize/Makefile
index aad27c26b4e1..cc2c1b59c5f4 100644
--- a/net-im/pidgin-manualsize/Makefile
+++ b/net-im/pidgin-manualsize/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Plugin to allow manual resizing of Pidgin's message input area
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 MAKEFILE=	makefile
 
diff --git a/net-im/pidgin-osd/Makefile b/net-im/pidgin-osd/Makefile
index 054c9f787ac6..da01385f1add 100644
--- a/net-im/pidgin-osd/Makefile
+++ b/net-im/pidgin-osd/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	https://babelize.org/download/pidgin-osd/
 MAINTAINER=	anikinsl@gmail.com
 COMMENT=	Pidgin plugin for displaying new messages on screen
 
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
-		xosd>=2.2.12:${PORTSDIR}/misc/xosd
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
-		xosd>=2.2.12:${PORTSDIR}/misc/xosd
+BUILD_DEPENDS=	pidgin:net-im/pidgin \
+		xosd>=2.2.12:misc/xosd
+RUN_DEPENDS=	pidgin:net-im/pidgin \
+		xosd>=2.2.12:misc/xosd
 
 USES=		gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	glib20
diff --git a/net-im/pidgin-pidgimpd/Makefile b/net-im/pidgin-pidgimpd/Makefile
index 730334b64daf..c964fa8b46dc 100644
--- a/net-im/pidgin-pidgimpd/Makefile
+++ b/net-im/pidgin-pidgimpd/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	pidgin-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PidgiMPD is a Pidgin plugin for monitoring/controlling MPD
 
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple \
-		libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+LIB_DEPENDS=	libpurple.so:net-im/libpurple \
+		libmpd.so:audio/libmpd
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 USES=		libtool pkgconfig tar:bzip2
 USE_GNOME=	gtk20
diff --git a/net-im/pidgin-privacy-please/Makefile b/net-im/pidgin-privacy-please/Makefile
index 48768c525deb..83598e18b66f 100644
--- a/net-im/pidgin-privacy-please/Makefile
+++ b/net-im/pidgin-privacy-please/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Privacy plugin for the pidgin instant messenger
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+LIB_DEPENDS=	libpurple.so:net-im/libpurple
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool pkgconfig
diff --git a/net-im/pidgin-rhythmbox/Makefile b/net-im/pidgin-rhythmbox/Makefile
index bc2f8dd7ed61..8d34a43dd3eb 100644
--- a/net-im/pidgin-rhythmbox/Makefile
+++ b/net-im/pidgin-rhythmbox/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Plugin to update your status with info from Rhythmbox
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
-		rhythmbox:${PORTSDIR}/audio/rhythmbox
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	pidgin:net-im/pidgin \
+		rhythmbox:audio/rhythmbox
 
 USES=		gmake libtool pkgconfig
 USE_GNOME=	gtk20
diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile
index 1ce53a45be57..b49d3a84b854 100644
--- a/net-im/pidgin-sipe/Makefile
+++ b/net-im/pidgin-sipe/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Plugin for Pidgin to provide LCS/OCS connectivity
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss \
-		libpurple.so:${PORTSDIR}/net-im/libpurple
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+LIB_DEPENDS=	libnss3.so:security/nss \
+		libpurple.so:net-im/libpurple
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig tar:bzip2
diff --git a/net-im/pidgin-skype/Makefile b/net-im/pidgin-skype/Makefile
index 0d65c0da5b36..0771035b2628 100644
--- a/net-im/pidgin-skype/Makefile
+++ b/net-im/pidgin-skype/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Plugin to use Skype chat from Pidgin (with Skype running)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin \
-    ${LOCALBASE}/bin/skype:${PORTSDIR}/net-im/skype
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
-    ${LOCALBASE}/bin/skype:${PORTSDIR}/net-im/skype
+BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:net-im/pidgin \
+    ${LOCALBASE}/bin/skype:net-im/skype
+RUN_DEPENDS=	pidgin:net-im/pidgin \
+    ${LOCALBASE}/bin/skype:net-im/skype
 
 USES=		gmake pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/net-im/pidgin-skypeweb/Makefile b/net-im/pidgin-skypeweb/Makefile
index 3d92b5c2bc72..92278aeb2b6f 100644
--- a/net-im/pidgin-skypeweb/Makefile
+++ b/net-im/pidgin-skypeweb/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Plugin to use Skype chat from Pidgin(without Skype running)
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/gpl3.txt
 
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
+LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	EionRobb
diff --git a/net-im/pidgin-twitter/Makefile b/net-im/pidgin-twitter/Makefile
index 72662cdcec63..e37616fd6314 100644
--- a/net-im/pidgin-twitter/Makefile
+++ b/net-im/pidgin-twitter/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.honeyplanet.jp/
 MAINTAINER=	jun-g@daemonfreaks.com
 COMMENT=	Pidgin plugin to help twitting via pidgin
 
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 USES=		gmake pkgconfig
 USE_GNOME=	glib20 libxml2
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index d63dfabacfe7..cc10ae2fea6c 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -7,8 +7,8 @@ PORTNAME=	pidgin
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
 
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libpurple.so:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libpurple.so:net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/pidgin
diff --git a/net-im/plasma-applet-ktp/Makefile b/net-im/plasma-applet-ktp/Makefile
index d696e02bc34e..77e29ef955c4 100644
--- a/net-im/plasma-applet-ktp/Makefile
+++ b/net-im/plasma-applet-ktp/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	${PORTNAME}-desktop-applets-${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging Plasma applets
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib declarative \
diff --git a/net-im/poezio/Makefile b/net-im/poezio/Makefile
index b77bd87ffcea..0c25526402f3 100644
--- a/net-im/poezio/Makefile
+++ b/net-im/poezio/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Console XMPP client
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:${PORTSDIR}/net-im/py-sleekxmpp
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython \
+		${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:net-im/py-sleekxmpp
 
 USES=		tar:xz python:3.3+
 USE_PYTHON=	distutils autoplist
diff --git a/net-im/profanity/Makefile b/net-im/profanity/Makefile
index a059adc9b2ee..72d84479cdf2 100644
--- a/net-im/profanity/Makefile
+++ b/net-im/profanity/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Console based XMPP client
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libstrophe.so:${PORTSDIR}/net-im/libstrophe \
-		libglib-2.0.so:${PORTSDIR}/devel/glib20 \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libotr.so.5:${PORTSDIR}/security/libotr \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libgpgme.so:${PORTSDIR}/security/gpgme
+LIB_DEPENDS=	libstrophe.so:net-im/libstrophe \
+		libglib-2.0.so:devel/glib20 \
+		libcurl.so:ftp/curl \
+		libotr.so.5:security/libotr \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libgpgme.so:security/gpgme
 
 USES=		ncurses pkgconfig
 GNU_CONFIGURE=	yes
@@ -26,7 +26,7 @@ CONFIGURE_ENV=	LIBS="${CFLAGS} -lcrypto"
 
 OPTIONS_DEFINE=	NOTIFY
 
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=notifications
 
 .include <bsd.port.mk>
diff --git a/net-im/prosody/Makefile b/net-im/prosody/Makefile
index eaa8adaa4e12..472fac05d545 100644
--- a/net-im/prosody/Makefile
+++ b/net-im/prosody/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Simple extensible XMPP server written in Lua
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket \
-		${LUA_MODLIBDIR}/ssl.so:${PORTSDIR}/security/luasec \
-		${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat \
-		${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem-51
+RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:net/luasocket \
+		${LUA_MODLIBDIR}/ssl.so:security/luasec \
+		${LUA_MODLIBDIR}/lxp.so:textproc/luaexpat \
+		${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem-51
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libidn.so:dns/libidn
 
 USERS=		prosody
 GROUPS=		${USERS}
@@ -27,7 +27,7 @@ USE_RC_SUBR=	prosody
 
 OPTIONS_DEFINE=	LUAJIT
 LUAJIT_DESC=	Run prosody using luajit
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 
 .include <bsd.port.options.mk>
 
diff --git a/net-im/proxy65/Makefile b/net-im/proxy65/Makefile
index c1ce0840c68a..cfb189644dbd 100644
--- a/net-im/proxy65/Makefile
+++ b/net-im/proxy65/Makefile
@@ -9,7 +9,7 @@ COMMENT=	XEP-0065 SOCKS5 Bytestreams external component for Jabber
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmatuska
@@ -41,13 +41,13 @@ GROUPS=		${PROXY65_GROUP}
 # No jabber depends
 .elif ${PORT_OPTIONS:MJABBER}
 JABBER_REQUIRE?=        jabber
-RUN_DEPENDS+=           jabberd14:${PORTSDIR}/net-im/jabber
+RUN_DEPENDS+=           jabberd14:net-im/jabber
 .elif ${PORT_OPTIONS:MJABBERD}
 JABBER_REQUIRE?=        jabberd
-RUN_DEPENDS+=           jabberd:${PORTSDIR}/net-im/jabberd
+RUN_DEPENDS+=           jabberd:net-im/jabberd
 .elif ${PORT_OPTIONS:MEJABBERD}
 JABBER_REQUIRE?=        ejabberd
-RUN_DEPENDS+=           ejabberdctl:${PORTSDIR}/net-im/ejabberd
+RUN_DEPENDS+=           ejabberdctl:net-im/ejabberd
 .endif
 
 SUB_LIST+=	PYTHON_CMD="${PYTHON_CMD}" \
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 5f199dd0de0c..bead190dd790 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt 4 based Jabber client
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca \
-		libminizip.so:${PORTSDIR}/archivers/minizip
+LIB_DEPENDS=	libqca.so:devel/qca \
+		libminizip.so:archivers/minizip
 
 HAS_CONFIGURE=	yes
 QT_NONSTANDARD=	yes
@@ -36,13 +36,13 @@ DBUS_USE=	QT4=dbus
 DBUS_CONFIGURE_OFF=	--disable-qdbus
 
 ASPELL_DESC=	Use aspell for spell checking
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ON=	--with-aspell-inc=${LOCALBASE}/include \
 			--with-aspell-lib=${LOCALBASE}/lib
 ASPELL_CONFIGURE_OFF=	--disable-aspell
 
 ENCHANT_DESC=	Use Enchant for spell checking
-ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 ENCHANT_CONFIGURE_OFF=	--disable-enchant
 
 post-configure:
diff --git a/net-im/psimedia/Makefile b/net-im/psimedia/Makefile
index fcb6101066e4..fef2c2853495 100644
--- a/net-im/psimedia/Makefile
+++ b/net-im/psimedia/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://delta.affinix.com/download/psimedia/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Voice and video API for Psi-like IM clients
 
-LIB_DEPENDS=	liboil-0.3.so:${PORTSDIR}/devel/liboil \
-		libspeexdsp.so:${PORTSDIR}/audio/speexdsp
+LIB_DEPENDS=	liboil-0.3.so:devel/liboil \
+		libspeexdsp.so:audio/speexdsp
 
 USES=		pkgconfig tar:bzip2
 HAS_CONFIGURE=	yes
diff --git a/net-im/pwytter/Makefile b/net-im/pwytter/Makefile
index e43164af7d71..6a160305b3ed 100644
--- a/net-im/pwytter/Makefile
+++ b/net-im/pwytter/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Free multi-platform Twitter client written in Python
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=1.7.1:${PORTSDIR}/devel/py-simplejson
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=1.7.1:devel/py-simplejson
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/net-im/py-jabberbot/Makefile b/net-im/py-jabberbot/Makefile
index 0f66c42fd35e..4aa289851958 100644
--- a/net-im/py-jabberbot/Makefile
+++ b/net-im/py-jabberbot/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple Jabber Bot for Python
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xmpppy>0:${PORTSDIR}/net-im/py-xmpppy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/net-im/py-libturpial/Makefile b/net-im/py-libturpial/Makefile
index 64e3819381f9..8654f5559a69 100644
--- a/net-im/py-libturpial/Makefile
+++ b/net-im/py-libturpial/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Twitter API
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:${PORTSDIR}/net/py-oauth \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:net/py-oauth \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:www/py-requests
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/net-im/py-nbxmpp/Makefile b/net-im/py-nbxmpp/Makefile
index ec9ef60570ec..c2796ff33e00 100644
--- a/net-im/py-nbxmpp/Makefile
+++ b/net-im/py-nbxmpp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Non blocking Jabber/XMPP module
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
index d853fd10e1cb..202786462d43 100644
--- a/net-im/py-pyxmpp/Makefile
+++ b/net-im/py-pyxmpp/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Python XMPP library
 LICENSE=	LGPL21 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:${PORTSDIR}/security/py-m2crypto \
-		${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:security/py-m2crypto \
+		${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/net-im/py-slackclient/Makefile b/net-im/py-slackclient/Makefile
index 613133230ede..bff89fc55375 100644
--- a/net-im/py-slackclient/Makefile
+++ b/net-im/py-slackclient/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Python client for Slack.com
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}websocket-client>0:${PORTSDIR}/www/py-websocket-client \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python:-2.7
 USE_GITHUB=	yes
diff --git a/net-im/py-xmpppy-irc/Makefile b/net-im/py-xmpppy-irc/Makefile
index 92fa5cffd4d3..c732b6ef6ebf 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	irc-transport-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xmpp to irc transport
 
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:${PORTSDIR}/net-im/py-xmpppy \
-		${PYTHON_PKGNAMEPREFIX}irc>0:${PORTSDIR}/irc/py-irc
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy \
+		${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc
 
 USES=		python
 NO_BUILD=	yes
diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile
index c22ad2dc1f77..51027c5fb799 100644
--- a/net-im/py-xmpppy-yahoo/Makefile
+++ b/net-im/py-xmpppy-yahoo/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Yahoo! transport for Jabber
 OPTIONS_DEFINE=	EJABBERD
 EJABBERD_DESC=	transport with ejabberd
 
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:${PORTSDIR}/net-im/py-xmpppy \
-		${PYTHON_SITELIBDIR}/DNS/__init__.py:${PORTSDIR}/dns/py-dns
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy \
+		${PYTHON_SITELIBDIR}/DNS/__init__.py:dns/py-dns
 
 USES=		python
 NO_BUILD=	yes
diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile
index ce5978f9f249..f39e8001eeb9 100644
--- a/net-im/py-xmpppy/Makefile
+++ b/net-im/py-xmpppy/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}rc1
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Python library that provides easy scripting with Jabber
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:${PORTSDIR}/dns/py-dnspython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index b53533d69edd..7be5c027bc94 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Qt 5 based Tox client
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libtoxcore.so:${PORTSDIR}/net-im/tox \
-		libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
-		libopencv_core.so:${PORTSDIR}/graphics/opencv-core \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libvpx.so:${PORTSDIR}/multimedia/libvpx \
-		libfilteraudio.so:${PORTSDIR}/audio/libfilteraudio \
-		libsodium.so:${PORTSDIR}/security/libsodium \
-		libqrencode.so:${PORTSDIR}/graphics/libqrencode \
-		libsqlcipher.so:${PORTSDIR}/databases/sqlcipher
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+LIB_DEPENDS=	libtoxcore.so:net-im/tox \
+		libopencv_highgui.so:graphics/opencv \
+		libopencv_core.so:graphics/opencv-core \
+		libavcodec.so:multimedia/ffmpeg \
+		libvpx.so:multimedia/libvpx \
+		libfilteraudio.so:audio/libfilteraudio \
+		libsodium.so:security/libsodium \
+		libqrencode.so:graphics/libqrencode \
+		libsqlcipher.so:databases/sqlcipher
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tux3
diff --git a/net-im/ricochet/Makefile b/net-im/ricochet/Makefile
index 7732219cafbb..8b1bcdf94fb9 100644
--- a/net-im/ricochet/Makefile
+++ b/net-im/ricochet/Makefile
@@ -14,8 +14,8 @@ LICENSE_NAME=	Ricochet
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
-RUN_DEPENDS=	tor:${PORTSDIR}/security/tor
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
+RUN_DEPENDS=	tor:security/tor
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ricochet-im
diff --git a/net-im/rubygem-earthquake/Makefile b/net-im/rubygem-earthquake/Makefile
index 04ff30de83fc..9ec6b2320354 100644
--- a/net-im/rubygem-earthquake/Makefile
+++ b/net-im/rubygem-earthquake/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Terminal based Twitter client with Twitter streaming API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-awesome_print>=0:${PORTSDIR}/devel/rubygem-awesome_print \
-		rubygem-i18n>=0:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-jugyo-twitter_oauth>=0.5.0.pre5:${PORTSDIR}/security/rubygem-jugyo-twitter_oauth \
-		rubygem-launchy>=0:${PORTSDIR}/devel/rubygem-launchy \
-		rubygem-notify>=0:${PORTSDIR}/devel/rubygem-notify \
-		rubygem-oauth>=0:${PORTSDIR}/net/rubygem-oauth \
-		rubygem-slop>=3.4.0:${PORTSDIR}/devel/rubygem-slop \
-		rubygem-twitter-stream>=0:${PORTSDIR}/net/rubygem-twitter-stream
+RUN_DEPENDS=	rubygem-activesupport>=0:devel/rubygem-activesupport \
+		rubygem-awesome_print>=0:devel/rubygem-awesome_print \
+		rubygem-i18n>=0:devel/rubygem-i18n \
+		rubygem-jugyo-twitter_oauth>=0.5.0.pre5:security/rubygem-jugyo-twitter_oauth \
+		rubygem-launchy>=0:devel/rubygem-launchy \
+		rubygem-notify>=0:devel/rubygem-notify \
+		rubygem-oauth>=0:net/rubygem-oauth \
+		rubygem-slop>=3.4.0:devel/rubygem-slop \
+		rubygem-twitter-stream>=0:net/rubygem-twitter-stream
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net-im/rubygem-hipchat/Makefile b/net-im/rubygem-hipchat/Makefile
index 756ac3681d99..a15c6c2eb60b 100644
--- a/net-im/rubygem-hipchat/Makefile
+++ b/net-im/rubygem-hipchat/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby library to interact with HipChat
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-httparty>=0:${PORTSDIR}/www/rubygem-httparty \
-		rubygem-mimemagic>=0:${PORTSDIR}/misc/rubygem-mimemagic
+RUN_DEPENDS=	rubygem-httparty>=0:www/rubygem-httparty \
+		rubygem-mimemagic>=0:misc/rubygem-mimemagic
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net-im/rubygem-lita/Makefile b/net-im/rubygem-lita/Makefile
index 7781a31c7fca..0e88e3196ae6 100644
--- a/net-im/rubygem-lita/Makefile
+++ b/net-im/rubygem-lita/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Multi-service chat bot with extendable behavior
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	redis>=0:${PORTSDIR}/databases/redis \
-		rubygem-bundler>=1.3:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-faraday>=0.8.7:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-http_router>=0.11.2:${PORTSDIR}/www/rubygem-http_router \
-		rubygem-i18n>=0.6.9:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-ice_nine>=0.11.0:${PORTSDIR}/devel/rubygem-ice_nine \
-		rubygem-multi_json>=1.7.7:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-puma>=2.7.1:${PORTSDIR}/www/rubygem-puma \
-		rubygem-rack16>=1.5.2:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-redis-namespace>=1.3.0:${PORTSDIR}/databases/rubygem-redis-namespace \
-		rubygem-thor>=0.18.1:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	redis>=0:databases/redis \
+		rubygem-bundler>=1.3:sysutils/rubygem-bundler \
+		rubygem-faraday>=0.8.7:www/rubygem-faraday \
+		rubygem-http_router>=0.11.2:www/rubygem-http_router \
+		rubygem-i18n>=0.6.9:devel/rubygem-i18n \
+		rubygem-ice_nine>=0.11.0:devel/rubygem-ice_nine \
+		rubygem-multi_json>=1.7.7:devel/rubygem-multi_json \
+		rubygem-puma>=2.7.1:www/rubygem-puma \
+		rubygem-rack16>=1.5.2:www/rubygem-rack16 \
+		rubygem-redis-namespace>=1.3.0:databases/rubygem-redis-namespace \
+		rubygem-thor>=0.18.1:devel/rubygem-thor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net-im/rubygem-termtter/Makefile b/net-im/rubygem-termtter/Makefile
index 823fbf5e8e21..522d78e0e423 100644
--- a/net-im/rubygem-termtter/Makefile
+++ b/net-im/rubygem-termtter/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Terminal based Twitter client
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.1.0:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-builder32>=3.1.4:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-fluent-logger>=0.4.6:${PORTSDIR}/devel/rubygem-fluent-logger \
-		rubygem-highline>=1.6.0:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-json>=1.8.0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-notify>=0.5.1:${PORTSDIR}/devel/rubygem-notify \
-		rubygem-rubytter>=1.5.1:${PORTSDIR}/net/rubygem-rubytter \
-		rubygem-termcolor>=1.0:${PORTSDIR}/textproc/rubygem-termcolor
+RUN_DEPENDS=	rubygem-activerecord4>=4.1.0:databases/rubygem-activerecord4 \
+		rubygem-builder32>=3.1.4:devel/rubygem-builder32 \
+		rubygem-fluent-logger>=0.4.6:devel/rubygem-fluent-logger \
+		rubygem-highline>=1.6.0:devel/rubygem-highline \
+		rubygem-json>=1.8.0:devel/rubygem-json \
+		rubygem-notify>=0.5.1:devel/rubygem-notify \
+		rubygem-rubytter>=1.5.1:net/rubygem-rubytter \
+		rubygem-termcolor>=1.0:textproc/rubygem-termcolor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net-im/rubygem-tinder/Makefile b/net-im/rubygem-tinder/Makefile
index 0a4782091472..602dda04743b 100644
--- a/net-im/rubygem-tinder/Makefile
+++ b/net-im/rubygem-tinder/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Ruby API for interfacing with Campfire
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-eventmachine>=1.0:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-faraday>=0.9.0:${PORTSDIR}/www/rubygem-faraday\
-		rubygem-faraday_middleware>=0.9:${PORTSDIR}/www/rubygem-faraday_middleware \
-		rubygem-hashie>=1.0:${PORTSDIR}/devel/rubygem-hashie \
-		rubygem-json>=1.8.0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-multi_json>=1.7:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-twitter-stream>=0.1:${PORTSDIR}/net/rubygem-twitter-stream
+RUN_DEPENDS=	rubygem-eventmachine>=1.0:devel/rubygem-eventmachine \
+		rubygem-faraday>=0.9.0:www/rubygem-faraday\
+		rubygem-faraday_middleware>=0.9:www/rubygem-faraday_middleware \
+		rubygem-hashie>=1.0:devel/rubygem-hashie \
+		rubygem-json>=1.8.0:devel/rubygem-json \
+		rubygem-mime-types>=0:misc/rubygem-mime-types \
+		rubygem-multi_json>=1.7:devel/rubygem-multi_json \
+		rubygem-twitter-stream>=0.1:net/rubygem-twitter-stream
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net-im/sayaka/Makefile b/net-im/sayaka/Makefile
index e15b5e4f8f0a..e6a307142c96 100644
--- a/net-im/sayaka/Makefile
+++ b/net-im/sayaka/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Command-line twitter client for SIXEL-supported terminal
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		img2sixel:${PORTSDIR}/graphics/libsixel
+RUN_DEPENDS=	curl:ftp/curl \
+		img2sixel:graphics/libsixel
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	isaki68k
diff --git a/net-im/sendxmpp/Makefile b/net-im/sendxmpp/Makefile
index acdb2d96a75c..53a7f9d15b71 100644
--- a/net-im/sendxmpp/Makefile
+++ b/net-im/sendxmpp/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Perl-script to send xmpp (jabber) messages
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Net-XMPP>=0:${PORTSDIR}/net-im/p5-Net-XMPP
-RUN_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-Net-XMPP>=0:${PORTSDIR}/net-im/p5-Net-XMPP
+BUILD_DEPENDS=	p5-Net-XMPP>=0:net-im/p5-Net-XMPP
+RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long \
+		p5-Net-XMPP>=0:net-im/p5-Net-XMPP
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lhost
diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index 9e1b6c9e86c5..c49c0e18df2d 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -39,14 +39,14 @@ SUB_LIST+=	SKYPEDIR=${SKYPEDIR}
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MNVIDIA_GL}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 USE_LINUX_APPS+=xorglibs
 .else
 USE_LINUX_APPS+=dri
 .endif
 
 .if ${PORT_OPTIONS:MVIDEO}
-RUN_DEPENDS+=	webcamd:${PORTSDIR}/multimedia/webcamd
+RUN_DEPENDS+=	webcamd:multimedia/webcamd
 USE_LINUX_APPS+=libv4l
 SUB_LIST+=	VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so "
 .else
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index ae0629a5cfba..a1d6741a0801 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -35,14 +35,14 @@ SUB_LIST+=	SKYPEDIR=${SKYPEDIR}
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MNVIDIA_GL}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 USE_LINUX_APPS+=xorglibs
 .else
 USE_LINUX_APPS+=dri
 .endif
 
 .if ${PORT_OPTIONS:MVIDEO}
-RUN_DEPENDS+=	webcamd:${PORTSDIR}/multimedia/webcamd
+RUN_DEPENDS+=	webcamd:multimedia/webcamd
 USE_LINUX_APPS+=libv4l
 SUB_LIST+=	VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so "
 .else
diff --git a/net-im/skype4/Makefile b/net-im/skype4/Makefile
index 3f57ed2b6baa..a386077a943e 100644
--- a/net-im/skype4/Makefile
+++ b/net-im/skype4/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	4
 MAINTAINER=	xmj@chaot.net
 COMMENT=	P2P VoIP software
 
-RUN_DEPENDS=	${LINUXBASE}/lib/skype_oss_wrapper/libpulse.so.0:${PORTSDIR}/audio/linux-skype_oss_wrapper
+RUN_DEPENDS=	${LINUXBASE}/lib/skype_oss_wrapper/libpulse.so.0:audio/linux-skype_oss_wrapper
 
 CONFLICTS=	skype-devel-[0-9]*
 
@@ -39,13 +39,13 @@ SUB_LIST+=	SKYPEDIR=${SKYPEDIR}
 BROKEN=		Skype 4.3 requires Linux 2.6.32 emulation.
 .endif
 
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_GL_USE=		LINUX_APPS=xorglibs
 NVIDIA_GL_USE_OFF=	LINUX_APPS=dri
 
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MVIDEO}
-RUN_DEPENDS+=	webcamd:${PORTSDIR}/multimedia/webcamd
+RUN_DEPENDS+=	webcamd:multimedia/webcamd
 USE_LINUX_APPS+=	libv4l
 SUB_LIST+=	VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so "
 .else
diff --git a/net-im/telegram-purple/Makefile b/net-im/telegram-purple/Makefile
index 0e610c81c187..d93c268ca273 100644
--- a/net-im/telegram-purple/Makefile
+++ b/net-im/telegram-purple/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Libpurple plugin for Telegram messenger
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
 
 USES=		execinfo gmake pkgconfig tar:xz
 USE_GNOME=	glib20 libxml2
diff --git a/net-im/telegram/Makefile b/net-im/telegram/Makefile
index a68ffa9d845b..2b582482888a 100644
--- a/net-im/telegram/Makefile
+++ b/net-im/telegram/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Command-line interface for Telegram
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig \
-		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libjansson.so:${PORTSDIR}/devel/jansson
+LIB_DEPENDS=	libconfig.so:devel/libconfig \
+		libevent.so:devel/libevent2 \
+		libjansson.so:devel/jansson
 
 USES=		execinfo gmake lua:52 ncurses pkgconfig readline
 USE_OPENSSL=	yes
diff --git a/net-im/telegramqml/Makefile b/net-im/telegramqml/Makefile
index 37c213b710b0..96d2faf6f06e 100644
--- a/net-im/telegramqml/Makefile
+++ b/net-im/telegramqml/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Telegram API tools for QtQML and Qml
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libqtelegram-ae.so:${PORTSDIR}/net-im/libqtelegram-ae
+LIB_DEPENDS=	libqtelegram-ae.so:net-im/libqtelegram-ae
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Aseman-Land
diff --git a/net-im/telepathy-butterfly/Makefile b/net-im/telepathy-butterfly/Makefile
index 8794faaeba45..63e6e5e76d21 100644
--- a/net-im/telepathy-butterfly/Makefile
+++ b/net-im/telepathy-butterfly/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MSN Connection Manager for Telepathy Framework
 
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:${PORTSDIR}/net-im/papyon \
-		${PYTHON_SITELIBDIR}/telepathy/__init__.py:${PORTSDIR}/net-im/telepathy-python
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:${PORTSDIR}/net-im/papyon \
-		${PYTHON_SITELIBDIR}/telepathy/__init__.py:${PORTSDIR}/net-im/telepathy-python
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:net-im/papyon \
+		${PYTHON_SITELIBDIR}/telepathy/__init__.py:net-im/telepathy-python
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:net-im/papyon \
+		${PYTHON_SITELIBDIR}/telepathy/__init__.py:net-im/telepathy-python
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${PREFIX}
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index 06c462f9e4b7..68c442b06c8e 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Farsight Connection Manager for Telepathy Framework
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libgstfarsight-0.10.so:${PORTSDIR}/net-im/farsight2
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libgstfarsight-0.10.so:net-im/farsight2
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig python
diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile
index 0ce2b1eeda2d..6f8dc6ee2efe 100644
--- a/net-im/telepathy-farstream/Makefile
+++ b/net-im/telepathy-farstream/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Farstream Connection Manager for Telepathy Framework
 
-BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libfarstream-0.2.so:${PORTSDIR}/net-im/farstream
+BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libfarstream-0.2.so:net-im/farstream
 
 USES=		gmake libtool pathfix pkgconfig python
 USE_GNOME=	glib20 libxslt:build introspection:build
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 8ce22807122c..1b8e448ba771 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -10,16 +10,16 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Jabber Connection Manager for Telepathy Framework
 
-BUILD_DEPENDS=	telepathy-glib>=0.22.0:${PORTSDIR}/net-im/telepathy-glib \
-		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libnice.so:${PORTSDIR}/net-im/libnice \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
-RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		libnice-gst1>=0:${PORTSDIR}/net-im/libnice-gst1
+BUILD_DEPENDS=	telepathy-glib>=0.22.0:net-im/telepathy-glib \
+		ca_root_nss>=0:security/ca_root_nss
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libnice.so:net-im/libnice \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libloudmouth-1.so:net-im/loudmouth
+RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		libnice-gst1>=0:net-im/libnice-gst1
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index 4a648663b59d..a880182d7008 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib utility library for the Telepathy framework
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	vapigen:lang/vala
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile
index b4d2fbd8230f..93ff3ff7cc1d 100644
--- a/net-im/telepathy-haze/Makefile
+++ b/net-im/telepathy-haze/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-haze/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libpurple connection manager for telepathy
 
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS=	libpurple.so:net-im/libpurple \
+		libidn.so:dns/libidn \
+		libtelepathy-glib.so:net-im/telepathy-glib
 
 USES=		gmake pathfix pkgconfig
 USE_GNOME=	libxslt:build
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 5bad0f0a081e..b20a1ee5dc02 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	IRC Connection Manager for Telepathy Framework
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libtelepathy-glib.so:net-im/telepathy-glib
 
 USES=		execinfo gmake libtool pathfix pkgconfig python:build
 USE_GNOME=	glib20 libxslt:build
diff --git a/net-im/telepathy-logger-qt4/Makefile b/net-im/telepathy-logger-qt4/Makefile
index f3ad860d2ccf..eff68e898aa7 100644
--- a/net-im/telepathy-logger-qt4/Makefile
+++ b/net-im/telepathy-logger-qt4/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Qt binding for Telepathy Logger
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
-		libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libtelepathy-logger.so:net-im/telepathy-logger \
+		libtelepathy-qt4.so:net-im/telepathy-qt4
 
 USE_GNOME=	glib20 libxml2
 USE_GSTREAMER=	qt4
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index 1fb07c28aad2..7174a8b2ee02 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Logger utility library for the Telepathy framework
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libtelepathy-glib.so:net-im/telepathy-glib
 
 USES=		gettext-tools gmake libtool pathfix pkgconfig python:build \
 		sqlite tar:bzip2
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 0b25b8222980..7413c04b6a1f 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-mission-contro
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Telepathy component to apps to abstract details of connection managers
 
-LIB_DEPENDS=	libtelepathy.so:${PORTSDIR}/net-im/libtelepathy \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libtelepathy.so:net-im/libtelepathy \
+		libdbus-glib-1.so:devel/dbus-glib
 
 USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20 libxslt
diff --git a/net-im/telepathy-python/Makefile b/net-im/telepathy-python/Makefile
index 818c30a5f908..bf68fd8d6aea 100644
--- a/net-im/telepathy-python/Makefile
+++ b/net-im/telepathy-python/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for the Telepathy framework
 
-BUILD_DEPENDS=	py2?-dbus>=0:${PORTSDIR}/devel/py-dbus
-RUN_DEPENDS=	py2?-dbus>=0:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS=	py2?-dbus>=0:devel/py-dbus
+RUN_DEPENDS=	py2?-dbus>=0:devel/py-dbus
 
 USES=		gmake python:2
 USE_GNOME=	libxslt:build
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 8b33af806e2d..3799a385032a 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -12,10 +12,10 @@ COMMENT=	High-level Qt binding for Telepathy
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
-LIB_DEPENDS=	libtelepathy-farstream.so:${PORTSDIR}/net-im/telepathy-farstream \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus
+LIB_DEPENDS=	libtelepathy-farstream.so:net-im/telepathy-farstream \
+		libtelepathy-glib.so:net-im/telepathy-glib
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net-im/telepathy-rakia/Makefile b/net-im/telepathy-rakia/Makefile
index 07b34b7fcb38..991275ceb672 100644
--- a/net-im/telepathy-rakia/Makefile
+++ b/net-im/telepathy-rakia/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	SIP connection manager based around the Sofia-SIP library
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libsofia-sip-ua-glib.so:${PORTSDIR}/net/sofia-sip \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libsofia-sip-ua-glib.so:net/sofia-sip \
+		libtelepathy-glib.so:net-im/telepathy-glib
 
 USES=		gmake pathfix pkgconfig python:build
 USE_GNOME=	glib20 libxslt:build
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index 0335a10c15d2..0986e565ef0c 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Link-local Connection Manager for Telepathy Framework
 
-LIB_DEPENDS=	libavahi-glib.so:${PORTSDIR}/net/avahi-app \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libavahi-glib.so:net/avahi-app \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libsoup-2.4.so:devel/libsoup
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig python:build sqlite
diff --git a/net-im/telepathy-sofiasip/Makefile b/net-im/telepathy-sofiasip/Makefile
index d593fb704da6..0555ad479168 100644
--- a/net-im/telepathy-sofiasip/Makefile
+++ b/net-im/telepathy-sofiasip/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/tp-sofiasip/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	yuri@tsoft.com
 COMMENT=	SIP (sofia-sip) Connection Manager for Telepathy Framework
 
-LIB_DEPENDS=	libsofia-sip-ua.so:${PORTSDIR}/net/sofia-sip \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libsofia-sip-ua.so:net/sofia-sip \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libdbus-glib-1.so:devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
diff --git a/net-im/tkabber-plugins/Makefile b/net-im/tkabber-plugins/Makefile
index 6a604c7865de..b1c503be8599 100644
--- a/net-im/tkabber-plugins/Makefile
+++ b/net-im/tkabber-plugins/Makefile
@@ -13,7 +13,7 @@ COMMENT=	External Plugins for Tkabber
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	tkabber:${PORTSDIR}/net-im/tkabber
+RUN_DEPENDS=	tkabber:net-im/tkabber
 
 USES=		tar:xz
 
diff --git a/net-im/tkabber/Makefile b/net-im/tkabber/Makefile
index 1b51510bea9e..65ea7c74cc60 100644
--- a/net-im/tkabber/Makefile
+++ b/net-im/tkabber/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tcl/Tk based jabber client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	tcllib>=1.2:${PORTSDIR}/devel/tcllib \
-		bwidget>=1.4:${PORTSDIR}/x11-toolkits/bwidget
+RUN_DEPENDS=	tcllib>=1.2:devel/tcllib \
+		bwidget>=1.4:x11-toolkits/bwidget
 
 OPTIONS_DEFINE=	DOCS EXAMPLES IPV6 SOUND TDOM TKCON TKTRAY TLS GNUPG
 OPTIONS_DEFAULT=	TLS
@@ -26,15 +26,15 @@ SHEBANG_FILES=	contrib/extract-translations/extract.tcl
 
 IPV6_USES=	tk:86+
 IPV6_USES_OFF=	tk:85+
-SOUND_RUN_DEPENDS=	snack>=2.2.10:${PORTSDIR}/audio/snack
+SOUND_RUN_DEPENDS=	snack>=2.2.10:audio/snack
 TDOM_DESC=	Use more efficient tDOM parser for XML
-TDOM_RUN_DEPENDS=	tDOM>=0.8.0:${PORTSDIR}/www/tdom
+TDOM_RUN_DEPENDS=	tDOM>=0.8.0:www/tdom
 TKCON_DESC=	Install devel/tkcon for interactive debugging
-TKCON_RUN_DEPENDS=	tkcon>=2.3:${PORTSDIR}/devel/tkcon
+TKCON_RUN_DEPENDS=	tkcon>=2.3:devel/tkcon
 TKTRAY_DESC=	Install x11-toolkits/tktray for system tray support
-TKTRAY_RUN_DEPENDS=	tktray>=1.3:${PORTSDIR}/x11-toolkits/tktray
-TLS_RUN_DEPENDS=	tcltls>=1.4.1:${PORTSDIR}/devel/tcltls
-GNUPG_RUN_DEPENDS=	tclgpg>0:${PORTSDIR}/security/tclgpg
+TKTRAY_RUN_DEPENDS=	tktray>=1.3:x11-toolkits/tktray
+TLS_RUN_DEPENDS=	tcltls>=1.4.1:devel/tcltls
+GNUPG_RUN_DEPENDS=	tclgpg>0:security/tclgpg
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_BUILD=	yes
diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index 793df8d6714e..58aad78fd9bd 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -11,9 +11,9 @@ COMMENT=	ProjectTox-Core library, a decentralized and secure messenger
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	checkmk:${PORTSDIR}/devel/libcheck
-LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx		\
-		libopus.so:${PORTSDIR}/audio/opus
+BUILD_DEPENDS=	checkmk:devel/libcheck
+LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
+		libopus.so:audio/opus
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	irungentoo
@@ -33,17 +33,17 @@ OPTIONS_DEFAULT=	SODIUM
 OPTIONS_SUB=		yes
 
 SODIUM_DESC=		Prefer libsodium
-SODIUM_LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+SODIUM_LIB_DEPENDS=	libsodium.so:security/libsodium
 
 NACL_DESC=		Prefer NaCl
 NACL_CONFIGURE_ENABLE=	nacl
 NACL_CONFIGURE_ON=	--with-nacl-libs=${LOCALBASE}/lib
-NACL_BUILD_DEPENDS=	${LOCALBASE}/lib/libnacl.a:${PORTSDIR}/security/nacl
-NACL_RUN_DEPENDS=	${LOCALBASE}/lib/libnacl.a:${PORTSDIR}/security/nacl
+NACL_BUILD_DEPENDS=	${LOCALBASE}/lib/libnacl.a:security/nacl
+NACL_RUN_DEPENDS=	${LOCALBASE}/lib/libnacl.a:security/nacl
 
 DAEMON_DESC=		Bootstrap daemon
 DAEMON_CONFIGURE_ENABLE=daemon
-DAEMON_LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig
+DAEMON_LIB_DEPENDS=	libconfig.so:devel/libconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile
index d3d44db4012e..6747199fba55 100644
--- a/net-im/toxic/Makefile
+++ b/net-im/toxic/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Console client for Tox
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox	\
-		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx		\
-		libopus.so:${PORTSDIR}/audio/opus		\
-		libcurl.so:${PORTSDIR}/ftp/curl			\
-		libv4l2.so:${PORTSDIR}/multimedia/libv4l	\
-		libqrencode.so:${PORTSDIR}/graphics/libqrencode	\
-		libconfig.so:${PORTSDIR}/devel/libconfig
-RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
+BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox	\
+		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
+		libopus.so:audio/opus		\
+		libcurl.so:ftp/curl			\
+		libv4l2.so:multimedia/libv4l	\
+		libqrencode.so:graphics/libqrencode	\
+		libconfig.so:devel/libconfig
+RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Tox
@@ -31,7 +31,7 @@ OPTIONS_DEFAULT=X11
 
 X11_USE=	XORG=x11
 X11_MAKE_ARGS_OFF=	DISABLE_X11=1 DISABLE_DESKTOP_NOTIFY=1
-X11_LIB_DEPENDS=libnotify.so:${PORTSDIR}/devel/libnotify
+X11_LIB_DEPENDS=libnotify.so:devel/libnotify
 
 MAKE_ENV=	USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}"
 SUB_FILES=	pkg-message
diff --git a/net-im/ttytter/Makefile b/net-im/ttytter/Makefile
index b8277ba5986a..248371b0091e 100644
--- a/net-im/ttytter/Makefile
+++ b/net-im/ttytter/Makefile
@@ -18,8 +18,8 @@ LICENSE_NAME=	Floodgap Free Software License
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	curl:ftp/curl \
+		p5-TimeDate>=0:devel/p5-TimeDate
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
@@ -36,11 +36,11 @@ PLIST_FILES=	bin/${PORTNAME}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
-RUN_DEPENDS+=	p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl
+RUN_DEPENDS+=	p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl
 .endif
 
 .if ${PORT_OPTIONS:MRLTTYTTER}
-RUN_DEPENDS+=	p5-ReadLine-TTYtter>=1.4:${PORTSDIR}/devel/p5-ReadLine-TTYtter
+RUN_DEPENDS+=	p5-ReadLine-TTYtter>=1.4:devel/p5-ReadLine-TTYtter
 .endif
 
 do-extract:
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index ebff96f460c1..dcde24c6dadb 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Twitter client written in Python
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify \
-	${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:${PORTSDIR}/devel/py-setproctitle \
-	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:${PORTSDIR}/devel/py-Jinja2 \
-	${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:${PORTSDIR}/net-im/py-libturpial
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify \
+	${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:devel/py-setproctitle \
+	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2 \
+	${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:net-im/py-libturpial
 
 USES=		pyqt:4 python:2
 USE_PYQT=	core_run gui_run network_run phonon_run webkit_run
diff --git a/net-im/twirssi/Makefile b/net-im/twirssi/Makefile
index 696f4f49bf87..4d54a5719fdf 100644
--- a/net-im/twirssi/Makefile
+++ b/net-im/twirssi/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Twitter script to irssi
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Net-Twitter>=0:${PORTSDIR}/net/p5-Net-Twitter \
-		p5-WWW-Shorten>=0:${PORTSDIR}/www/p5-WWW-Shorten \
-		p5-WWW-Shorten-Bitly>=0:${PORTSDIR}/www/p5-WWW-Shorten-Bitly \
-		irssi:${PORTSDIR}/irc/irssi
+RUN_DEPENDS=	p5-Net-Twitter>=0:net/p5-Net-Twitter \
+		p5-WWW-Shorten>=0:www/p5-WWW-Shorten \
+		p5-WWW-Shorten-Bitly>=0:www/p5-WWW-Shorten-Bitly \
+		irssi:irc/irssi
 
 SUB_FILES=	pkg-message
 
diff --git a/net-im/twitmail/Makefile b/net-im/twitmail/Makefile
index 904ab83d7bee..259df751d611 100644
--- a/net-im/twitmail/Makefile
+++ b/net-im/twitmail/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Curses-based mail-like interface to Twitter
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=1.60.4:${PORTSDIR}/databases/p5-DBI \
-		p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
-		p5-Curses-UI>=0:${PORTSDIR}/devel/p5-Curses-UI \
-		p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Net-Twitter>=3.04002:${PORTSDIR}/net/p5-Net-Twitter \
-		p5-TimeDate>=2.24:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Getopt-GUI-Long>=0.91:${PORTSDIR}/devel/p5-Getopt-GUI-Long
+BUILD_DEPENDS=	p5-DBD-SQLite>=1.12:databases/p5-DBD-SQLite \
+		p5-DBI>=1.60.4:databases/p5-DBI \
+		p5-Curses>=0:devel/p5-Curses \
+		p5-Curses-UI>=0:devel/p5-Curses-UI \
+		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey \
+		p5-Net-Twitter>=3.04002:net/p5-Net-Twitter \
+		p5-TimeDate>=2.24:devel/p5-TimeDate \
+		p5-Getopt-GUI-Long>=0.91:devel/p5-Getopt-GUI-Long
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-im/uTox/Makefile b/net-im/uTox/Makefile
index 47a7740e7498..9ad908654d16 100644
--- a/net-im/uTox/Makefile
+++ b/net-im/uTox/Makefile
@@ -10,15 +10,15 @@ COMMENT=	Lightweight Tox client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox \
-		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libsodium.so:${PORTSDIR}/security/libsodium \
-		libv4lconvert.so:${PORTSDIR}/multimedia/libv4l \
-		libvpx.so:${PORTSDIR}/multimedia/libvpx \
-		libfilteraudio.so:${PORTSDIR}/audio/libfilteraudio
-RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
+BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox \
+		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libsodium.so:security/libsodium \
+		libv4lconvert.so:multimedia/libv4l \
+		libvpx.so:multimedia/libvpx \
+		libfilteraudio.so:audio/libfilteraudio
+RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	GrayHatter
@@ -31,7 +31,7 @@ INSTALLS_ICONS=	yes
 OPTIONS_DEFINE=		DBUS
 OPTIONS_DEFAULT=	DBUS
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_MAKE_ARGS_OFF=	DBUS=0
 
 post-patch:
diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile
index ad044a44b7e9..decc148b1b3a 100644
--- a/net-im/vqcc-gtk/Makefile
+++ b/net-im/vqcc-gtk/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT=	LAN chat client compatible with quickChat and Vypress Chat (TM)
 
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
 USES=		pathfix gmake gettext pkgconfig
 USE_GNOME=	gnomeprefix gtk20
diff --git a/net-im/xmpp-client/Makefile b/net-im/xmpp-client/Makefile
index 3d8568f8c609..d7c3aa5ec7fa 100644
--- a/net-im/xmpp-client/Makefile
+++ b/net-im/xmpp-client/Makefile
@@ -10,8 +10,8 @@ COMMENT=	XMPP client with OTR support
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:${PORTSDIR}/security/go.crypto \
-		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:${PORTSDIR}/net/go.net
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:security/go.crypto \
+		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:net/go.net
 
 PLIST_FILES=	bin/xmpp-client
 GO_PKGNAME=	github.com/agl/${PORTNAME}
diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile
index 20231fd40748..637a22c7da23 100644
--- a/net-im/zephyr/Makefile
+++ b/net-im/zephyr/Makefile
@@ -34,14 +34,14 @@ CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv_open=no
 
 .if ${PORT_OPTIONS:MHEIMDAL}
 BROKEN=		bad depobj
-LIB_DEPENDS+=	libss.so.1:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	libss.so.1:security/heimdal
 .if defined(HEIMDAL_HOME)
 KRB5_DIR?=	${HEIMDAL_HOME}
 .else
 KRB5_DIR?=	${LOCALBASE}
 .endif
 .else
-LIB_DEPENDS+=	libss.so.2:${PORTSDIR}/devel/e2fsprogs-libss
+LIB_DEPENDS+=	libss.so.2:devel/e2fsprogs-libss
 KRB5_DIR?=	${DESTDIR}/usr
 .endif
 
diff --git a/net-mgmt/TkTopNetFlows/Makefile b/net-mgmt/TkTopNetFlows/Makefile
index de3ba4a1ecbb..63df968920a8 100644
--- a/net-mgmt/TkTopNetFlows/Makefile
+++ b/net-mgmt/TkTopNetFlows/Makefile
@@ -12,9 +12,9 @@ COMMENT=	GUI tool for NetFlow data visualisation
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS+=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt \
-		libTktable2.10.so:${PORTSDIR}/x11-toolkits/tktable
-RUN_DEPENDS=	flowdumper:${PORTSDIR}/net-mgmt/p5-Cflow
+LIB_DEPENDS+=	libBLT25.so:x11-toolkits/blt \
+		libTktable2.10.so:x11-toolkits/tktable
+RUN_DEPENDS=	flowdumper:net-mgmt/p5-Cflow
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix tk:85
diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index 45324286c77b..b13e90736698 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -29,7 +29,7 @@ OPTIONS_SUB=	yes
 
 PCRE_DESC=	Use Perl Compatible Regular Expressions for wesside
 PCRE_MAKE_ARGS=	pcre=true
-PCRE_LIB_DEPENDS=   libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=   libpcre.so:devel/pcre
 PCRE_USES=	pkgconfig
 
 SQLITE_DESC=	Use SQLite for storing pre-computed key tables
diff --git a/net-mgmt/argus3-clients/Makefile b/net-mgmt/argus3-clients/Makefile
index 7f8aacf59923..fc50f195d6db 100644
--- a/net-mgmt/argus3-clients/Makefile
+++ b/net-mgmt/argus3-clients/Makefile
@@ -18,10 +18,10 @@ CONFLICTS=	argus-clients-2* argus-clients-sasl-2*
 OPTIONS_DEFINE=	GEOIP MYSQL SASL DOCS
 OPTIONS_DEFAULT=MYSQL SASL
 OPTIONS_SUB=	yes
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
 MYSQL_USE=	MYSQL=yes
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 GEOIP_CONFIGURE_ON=	--with-GeoIP=${LOCALBASE}
 
 USES=		bison ncurses perl5 readline
diff --git a/net-mgmt/argus3/Makefile b/net-mgmt/argus3/Makefile
index 500495055b26..339919b6aee3 100644
--- a/net-mgmt/argus3/Makefile
+++ b/net-mgmt/argus3/Makefile
@@ -16,7 +16,7 @@ CONFLICTS=	argus-2* argus-sasl-2* argus-clients-2*
 
 OPTIONS_DEFINE=	SASL
 OPTIONS_DEFAULT=SASL
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
 SASL_VARS=	PKGNAMESUFFIX+=-sasl
 
diff --git a/net-mgmt/arpscan/Makefile b/net-mgmt/arpscan/Makefile
index 5793980441fd..2e2697e4da83 100644
--- a/net-mgmt/arpscan/Makefile
+++ b/net-mgmt/arpscan/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple arp scanner
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
+LIB_DEPENDS=	libdnet.so:net/libdnet
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jasonish
diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile
index 7843a174a7a7..c74f33c015ed 100644
--- a/net-mgmt/bandwidthd/Makefile
+++ b/net-mgmt/bandwidthd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tracks bandwidth usage by IP address
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 SUB_FILES=	bandwidthd
 
diff --git a/net-mgmt/bgpuma/Makefile b/net-mgmt/bgpuma/Makefile
index b0fc7568dbc7..4bd6534cacf1 100644
--- a/net-mgmt/bgpuma/Makefile
+++ b/net-mgmt/bgpuma/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Searching BGP update files
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libbgpdump.so:${PORTSDIR}/net/libbgpdump \
-		libsilk.so:${PORTSDIR}/security/silktools
+LIB_DEPENDS=	libbgpdump.so:net/libbgpdump \
+		libsilk.so:security/silktools
 
 USES=		autoreconf libtool
 USE_GITHUB=	yes
diff --git a/net-mgmt/braa/Makefile b/net-mgmt/braa/Makefile
index 1be8df06b029..743c85be917b 100644
--- a/net-mgmt/braa/Makefile
+++ b/net-mgmt/braa/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://s-tech.elsat.net.pl/braa/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for making SNMP queries
 
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 USES=		gmake
 
diff --git a/net-mgmt/bsnmp-regex/Makefile b/net-mgmt/bsnmp-regex/Makefile
index 58cec5998276..fb6c0373ad9e 100644
--- a/net-mgmt/bsnmp-regex/Makefile
+++ b/net-mgmt/bsnmp-regex/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--disable-debug
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:devel/pcre
 CONFIGURE_ARGS+=	--enable-pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
diff --git a/net-mgmt/bwm-ng/Makefile b/net-mgmt/bwm-ng/Makefile
index c7408d26aa9f..8f539986004a 100644
--- a/net-mgmt/bwm-ng/Makefile
+++ b/net-mgmt/bwm-ng/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.gropp.org/bwm-ng/
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Small and simple bandwidth monitor
 
-LIB_DEPENDS=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
+LIB_DEPENDS=	libstatgrab.so:devel/libstatgrab
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/net-mgmt/cacti-spine/Makefile b/net-mgmt/cacti-spine/Makefile
index fd2adb116003..9cbebd20124a 100644
--- a/net-mgmt/cacti-spine/Makefile
+++ b/net-mgmt/cacti-spine/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Multithreaded poller for Cacti written in C
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE}
diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 794554ac8665..ff4d1a3c7dde 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Web-driven graphing interface for RRDTool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS=	rrdtool:databases/rrdtool
 
 USES=		cpe shebangfix
 USE_MYSQL=	yes
diff --git a/net-mgmt/ccnet/Makefile b/net-mgmt/ccnet/Makefile
index 3bd2bb74b2ca..3297feecd91c 100644
--- a/net-mgmt/ccnet/Makefile
+++ b/net-mgmt/ccnet/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Framework for writing networked applications
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libsearpc.so:${PORTSDIR}/devel/libsearpc \
-		libglib-2.0.so:${PORTSDIR}/devel/glib20 \
-		libgobject-2.0.so:${PORTSDIR}/devel/glib20 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libzdb.so:${PORTSDIR}/databases/libzdb \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libjansson.so:${PORTSDIR}/devel/jansson \
-		libldap.so:${PORTSDIR}/net/openldap24-client
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libsearpc.so:devel/libsearpc \
+		libglib-2.0.so:devel/glib20 \
+		libgobject-2.0.so:devel/glib20 \
+		libsqlite3.so:databases/sqlite3 \
+		libzdb.so:databases/libzdb \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libevent.so:devel/libevent2 \
+		libjansson.so:devel/jansson \
+		libldap.so:net/openldap24-client
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
diff --git a/net-mgmt/cdpsnarf/Makefile b/net-mgmt/cdpsnarf/Makefile
index 09008a8f4ee0..010e7dc2c781 100644
--- a/net-mgmt/cdpsnarf/Makefile
+++ b/net-mgmt/cdpsnarf/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool to extract information from CDP packets
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
+LIB_DEPENDS=	libpcap.so:net/libpcap
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Zapotek
diff --git a/net-mgmt/check_ipmi_sensor/Makefile b/net-mgmt/check_ipmi_sensor/Makefile
index 6a205e75bec8..d3deb0d4a438 100644
--- a/net-mgmt/check_ipmi_sensor/Makefile
+++ b/net-mgmt/check_ipmi_sensor/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Nagios/Icinga plugin to check IPMI sensors
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		ipmi-raw:${PORTSDIR}/sysutils/freeipmi
+RUN_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run \
+		ipmi-raw:sysutils/freeipmi
 
 NO_BUILD=	yes
 
diff --git a/net-mgmt/check_mysql_health/Makefile b/net-mgmt/check_mysql_health/Makefile
index d64cf6718dff..fe14539d5267 100644
--- a/net-mgmt/check_mysql_health/Makefile
+++ b/net-mgmt/check_mysql_health/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Nagios plugin to check various parameters of a MySQL database
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-statefiles-dir=${NAGIOSDIR} \
diff --git a/net-mgmt/chillispot/Makefile b/net-mgmt/chillispot/Makefile
index 5e14dc9fb178..2734218aa040 100644
--- a/net-mgmt/chillispot/Makefile
+++ b/net-mgmt/chillispot/Makefile
@@ -30,8 +30,8 @@ FREERADIUS_DESC=depend on FreeRADIUS
 OPENRADIUS_DESC=depend on OpenRADIUS
 
 APACHE_USE=	apache_run=22+
-FREERADIUS_RUN_DEPENDS=	radiusd:${PORTSDIR}/net/freeradius
-OPENRADIUS_RUN_DEPENDS=	radiusd:${PORTSDIR}/net/openradius
+FREERADIUS_RUN_DEPENDS=	radiusd:net/freeradius
+OPENRADIUS_RUN_DEPENDS=	radiusd:net/openradius
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/net-mgmt/ciscoconf/Makefile b/net-mgmt/ciscoconf/Makefile
index 95b0494dd26a..e152e4cc1f70 100644
--- a/net-mgmt/ciscoconf/Makefile
+++ b/net-mgmt/ciscoconf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ISC/ciscoconf/ \
 MAINTAINER=	jabley@automagic.org
 COMMENT=	Fetches configuration from Cisco routers and stores them under RCS
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
+BUILD_DEPENDS=	makedepend:devel/makedepend
 
 ALL_TARGET=	depend all
 
diff --git a/net-mgmt/clog/Makefile b/net-mgmt/clog/Makefile
index 91b7b8476a2c..f6d5bce8a4be 100644
--- a/net-mgmt/clog/Makefile
+++ b/net-mgmt/clog/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/obrien
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcp connection logger daemon
 
-PATCH_DEPENDS=	rcsdiff:${PORTSDIR}/devel/rcs
+PATCH_DEPENDS=	rcsdiff:devel/rcs
 
 WRKSRC=		${WRKDIR}/clog
 ALL_TARGET=	freebsd
diff --git a/net-mgmt/cnagios/Makefile b/net-mgmt/cnagios/Makefile
index 713f483bfb07..1fc1de0dc685 100644
--- a/net-mgmt/cnagios/Makefile
+++ b/net-mgmt/cnagios/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Curses-based interface for nagios
 
 LICENSE=	ISCL
 
-RUN_DEPENDS=	nagios>=3.0:${PORTSDIR}/net-mgmt/nagios
+RUN_DEPENDS=	nagios>=3.0:net-mgmt/nagios
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dannywarren
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 1bf75580aac5..2046df736ed2 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -16,8 +16,8 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # Only autoreconf stage and sigrok plugin need GLIB:
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/glib-2.0.m4:${PORTSDIR}/devel/glib20
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/glib-2.0.m4:devel/glib20
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
@@ -108,13 +108,13 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--without-oracle \
 		--disable-turbostat
 
-CGI_RUN_DEPENDS=		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-				p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
-				p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
-				p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+CGI_RUN_DEPENDS=		p5-URI>=0:net/p5-URI \
+				p5-CGI>=0:www/p5-CGI \
+				p5-Data-Dumper>=0:devel/p5-Data-Dumper \
+				p5-HTML-Parser>=0:www/p5-HTML-Parser
 CGI_IMPLIES=			RRDTOOL
 
-CURL_LIB_DEPENDS=		libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
 CURL_CONFIGURE_ENABLE=		apache curl nginx write_http
 CURL_CONFIGURE_WITH=		libcurl=${LOCALBASE}
 
@@ -126,37 +126,37 @@ CURL_XML_CONFIGURE_ENABLE=	ascent bind curl_xml
 
 DEBUG_CONFIGURE_ENABLE=		debug
 
-DBI_LIB_DEPENDS=		libdbi.so:${PORTSDIR}/databases/libdbi
+DBI_LIB_DEPENDS=		libdbi.so:databases/libdbi
 DBI_CONFIGURE_WITH=		libdbi=${LOCALBASE}
 DBI_CONFIGURE_ENABLE=		dbi
 DBI_CFLAGS=			-Wno-deprecated-declarations
 
-GCRYPT_LIB_DEPENDS=		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GCRYPT_LIB_DEPENDS=		libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_WITH=		-with-libgcrypt=${LOCALBASE}
 GCRYPT_LIBS=			-lgcrypt
 
-IPMI_LIB_DEPENDS=		libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
+IPMI_LIB_DEPENDS=		libOpenIPMI.so:sysutils/openipmi
 IPMI_CONFIGURE_ENABLE=		ipmi
 
-JSON_LIB_DEPENDS=		libyajl.so:${PORTSDIR}/devel/yajl
+JSON_LIB_DEPENDS=		libyajl.so:devel/yajl
 JSON_CONFIGURE_WITH=		libyajl=${LOCALBASE}
 
-KAFKA_LIB_DEPENDS=		librdkafka.so:${PORTSDIR}/net/librdkafka
+KAFKA_LIB_DEPENDS=		librdkafka.so:net/librdkafka
 KAFKA_CONFIGURE_ENABLE=		write_kafka
 
 LOGSTASH_CONFIGURE_ENABLE=	log_logstash
 LOGSTASH_IMPLIES=		JSON
 
-MEMCACHEC_LIB_DEPENDS=		libmemcached.so:${PORTSDIR}/databases/libmemcached
+MEMCACHEC_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 MEMCACHEC_CONFIGURE_ENABLE=	memcachec
 MEMCACHEC_CONFIGURE_WITH=	libmemcached=${LOCALBASE}
 
-MODBUS_LIB_DEPENDS=		libmodbus.so:${PORTSDIR}/comms/libmodbus
+MODBUS_LIB_DEPENDS=		libmodbus.so:comms/libmodbus
 MODBUS_CONFIGURE_ENABLE=	modbus
 MODBUS_CONFIGURE_WITH=		libmodbus=use_pkgconfig
 
-MONGODB_LIB_DEPENDS=		libmongoc-1.0.so:${PORTSDIR}/devel/mongo-c-driver
-MONGODB_LIB_DEPENDS+=		libbson-1.0.so:${PORTSDIR}/devel/libbson
+MONGODB_LIB_DEPENDS=		libmongoc-1.0.so:devel/mongo-c-driver
+MONGODB_LIB_DEPENDS+=		libbson-1.0.so:devel/libbson
 MONGODB_CONFIGURE_ENABLE=	write_mongodb
 MONGODB_CONFIGURE_WITH=		libmongoc=${LOCALBASE}
 MONGODB_BROKEN=			fails to configure with write_mongodb option
@@ -165,21 +165,21 @@ MYSQL_USE=			mysql=yes
 MYSQL_CONFIGURE_ENABLE=		mysql
 MYSQL_CONFIGURE_WITH=		libmysql=${LOCALBASE}
 
-NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFYDESKTOP_CONFIGURE_ENABLE=	notify_desktop
 NOTIFYDESKTOP_CONFIGURE_WITH=	libnotify=${LOCALBASE}
 
-NOTIFYEMAIL_LIB_DEPENDS=	libesmtp.so:${PORTSDIR}/mail/libesmtp
+NOTIFYEMAIL_LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 NOTIFYEMAIL_CONFIGURE_ENABLE=	notify_email
 NOTIFYEMAIL_CONFIGURE_WITH=	libesmtp=${LOCALBASE}
 
-NUTUPS_LIB_DEPENDS=		libupsclient.so:${PORTSDIR}/sysutils/nut
+NUTUPS_LIB_DEPENDS=		libupsclient.so:sysutils/nut
 NUTUPS_CONFIGURE_ENABLE=	nut
 NUTUPS_CONFIGURE_WITH=		upsclient=${LOCALBASE}
 
 OLSRD_CONFIGURE_ENABLE=		olsrd
 
-ONEWIRE_LIB_DEPENDS=		libow.so:${PORTSDIR}/comms/owfs
+ONEWIRE_LIB_DEPENDS=		libow.so:comms/owfs
 ONEWIRE_CONFIGURE_ENABLE=	onewire
 ONEWIRE_CONFIGURE_WITH=		libowcapi=${LOCALBASE}
 
@@ -195,10 +195,10 @@ PGSQL_USES=			pgsql
 PGSQL_CONFIGURE_ENABLE=		postgresql
 PGSQL_CONFIGURE_WITH=		postgresql=${LOCALBASE} libpq
 
-PINBA_LIB_DEPENDS=		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+PINBA_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 PINBA_CONFIGURE_ENABLE=		pinba
 
-PING_LIB_DEPENDS=		liboping.so:${PORTSDIR}/net/liboping
+PING_LIB_DEPENDS=		liboping.so:net/liboping
 PING_CONFIGURE_ENABLE=		ping
 PING_CONFIGURE_WITH=		liboping=${LOCALBASE}
 
@@ -206,59 +206,59 @@ PYTHON_USES=			python:2
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_CONFIGURE_WITH=		python=${PYTHON_CMD}
 
-RABBITMQ_LIB_DEPENDS=		librabbitmq.so:${PORTSDIR}/net/rabbitmq-c
+RABBITMQ_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c
 RABBITMQ_CONFIGURE_ENABLE=	rabbitmq
 RABBITMQ_CONFIGURE_WITH=	librabbitmq=${LOCALBASE}
 
-REDIS_LIB_DEPENDS=		libhiredis.so:${PORTSDIR}/databases/hiredis
+REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
 REDIS_CONFIGURE_ENABLE=		redis write_redis
 REDIS_CONFIGURE_WITH=		libhiredis=${LOCALBASE}
 
-RIEMANN_LIB_DEPENDS=		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+RIEMANN_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 RIEMANN_CONFIGURE_ENABLE=	write_riemann
 
-ROUTEROS_LIB_DEPENDS=		librouteros.so:${PORTSDIR}/net/librouteros
+ROUTEROS_LIB_DEPENDS=		librouteros.so:net/librouteros
 ROUTEROS_CONFIGURE_ENABLE=	routeros
 ROUTEROS_CONFIGURE_WITH=	librouteros=${LOCALBASE}
 
-RRDTOOL_LIB_DEPENDS=		librrd.so:${PORTSDIR}/databases/rrdtool
+RRDTOOL_LIB_DEPENDS=		librrd.so:databases/rrdtool
 RRDTOOL_CONFIGURE_ENABLE=	rrdcached rrdtool
 RRDTOOL_CONFIGURE_WITH=		librrd=${LOCALBASE}
 
 SIGROK_USE=			GNOME=glib20
 SIGROK_CFLAGS=			`pkg-config --cflags glib-2.0`
-SIGROK_LIB_DEPENDS=		libsigrok.so:${PORTSDIR}/devel/libsigrok
+SIGROK_LIB_DEPENDS=		libsigrok.so:devel/libsigrok
 SIGROK_CONFIGURE_ENABLE=	sigrok
 SIGROK_CONFIGURE_WITH=		libsigrok
 
-SNMP_LIB_DEPENDS=		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ENABLE=		snmp
 SNMP_CONFIGURE_WITH=		libnetsnmp
 
 STATSD_CONFIGURE_ENABLE=	statsd
 
-TOKYOTYRANT_LIB_DEPENDS=	libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
+TOKYOTYRANT_LIB_DEPENDS=	libtokyotyrant.so:databases/tokyotyrant
 TOKYOTYRANT_CONFIGURE_ENABLE=	tokyotyrant
 TOKYOTYRANT_CONFIGURE_WITH=	libtokyotyrant=${LOCALBASE}
 
-VARNISH_LIB_DEPENDS=		libvarnishapi.so:${PORTSDIR}/www/varnish4
+VARNISH_LIB_DEPENDS=		libvarnishapi.so:www/varnish4
 VARNISH_CONFIGURE_ENABLE=	varnish
 VARNISH_CONFIGURE_WITH=		libvarnish=${LOCALBASE}
 
 VIRT_IMPLIES=			XML
-VIRT_LIB_DEPENDS=		libvirt.so:${PORTSDIR}/devel/libvirt
+VIRT_LIB_DEPENDS=		libvirt.so:devel/libvirt
 VIRT_CONFIGURE_ENABLE=		virt
 VIRT_CONFIGURE_WITH=		virt=${LOCALBASE}
 
-XML_LIB_DEPENDS=		libxml2.so:${PORTSDIR}/textproc/libxml2
+XML_LIB_DEPENDS=		libxml2.so:textproc/libxml2
 XML_CONFIGURE_WITH=		libxml2=${LOCALBASE}
 
 XMMS_CFLAGS=			`xmms-config --cflags`
-XMMS_LIB_DEPENDS=		libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_LIB_DEPENDS=		libxmms.so:multimedia/xmms
 XMMS_CONFIGURE_ENABLE=		xmms
 XMMS_CONFIGURE_WITH=		libxmms=${LOCALBASE}
 
-ZOOKEEPER_LIB_DEPENDS=		libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
+ZOOKEEPER_LIB_DEPENDS=		libzookeeper_mt.so:devel/libzookeeper
 ZOOKEEPER_CONFIGURE_ENABLE=	zookeeper
 ZOOKEEPER_CONFIGURE_WITH=	libzookeeper=${LOCALBASE}
 
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index e5fb2daf65b7..2b2b879e4127 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High performance, flexible monitoring system
 
-RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	rrdtool>=0:databases/rrdtool \
+		p5-libwww>=0:www/p5-libwww \
+		p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session \
+		p5-TimeDate>=0:devel/p5-TimeDate
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	util/metaQuery.pl
diff --git a/net-mgmt/crmsh/Makefile b/net-mgmt/crmsh/Makefile
index 32e34138e28b..7b88b5031867 100644
--- a/net-mgmt/crmsh/Makefile
+++ b/net-mgmt/crmsh/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Command-line interface for High-Availability cluster management
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ClusterLabs
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc
+DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
 MANPAGES_BUILD_DEPENDS=	${DOCS_BUILD_DEPENDS}
 
diff --git a/net-mgmt/devmon-templates/Makefile b/net-mgmt/devmon-templates/Makefile
index 6d8d3149f3ca..bd6a01aa6058 100644
--- a/net-mgmt/devmon-templates/Makefile
+++ b/net-mgmt/devmon-templates/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/devmon/${PORTNAME}/templates/
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Device templates for use with devmon
 
-RUN_DEPENDS=	devmon>0:${PORTSDIR}/net-mgmt/devmon
+RUN_DEPENDS=	devmon>0:net-mgmt/devmon
 
 NO_BUILD=	yes
 
diff --git a/net-mgmt/devmon/Makefile b/net-mgmt/devmon/Makefile
index 25ce6b2b604c..7826a8b5cc61 100644
--- a/net-mgmt/devmon/Makefile
+++ b/net-mgmt/devmon/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Device monitoring addition to Xymon/Hobbit/BigBrother
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-SNMP_Session>0:${PORTSDIR}/net-mgmt/p5-SNMP_Session
+RUN_DEPENDS=	p5-SNMP_Session>0:net-mgmt/p5-SNMP_Session
 
 USES=	perl5 shebangfix
 SHEBANG_FILES=	devmon
diff --git a/net-mgmt/dhcp_probe/Makefile b/net-mgmt/dhcp_probe/Makefile
index 8958f22d2f50..dd7246eb3052 100644
--- a/net-mgmt/dhcp_probe/Makefile
+++ b/net-mgmt/dhcp_probe/Makefile
@@ -18,7 +18,7 @@ LICENSE_NAME_addl=Additional legal notices for copyrighted code
 LICENSE_FILE_addl=${WRKSRC}/COPYING
 LICENSE_PERMS_addl=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/net-mgmt/docsis/Makefile b/net-mgmt/docsis/Makefile
index 792eb79af26d..dd20253aebb9 100644
--- a/net-mgmt/docsis/Makefile
+++ b/net-mgmt/docsis/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Binary configuration file encoder/decoder
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+BUILD_DEPENDS=	gm4:devel/m4
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
diff --git a/net-mgmt/driftnet/Makefile b/net-mgmt/driftnet/Makefile
index 5f7ece2d7485..c3b05279cd22 100644
--- a/net-mgmt/driftnet/Makefile
+++ b/net-mgmt/driftnet/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tool to grab images out of (your) TCP connections
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
+LIB_DEPENDS=	libgif.so:graphics/giflib
+BUILD_DEPENDS=	makedepend:devel/makedepend
 
 USE_GNOME=	gtk12
 USES=		gmake jpeg
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index d9664ab6b615..2482460a1feb 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Network sniffer/interceptor/injector/logger for switched LANs
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 OPTIONS_DEFINE=	DESKTOP DOCS GTK2 IPV6 NCURSES PCRE PLUGINS SSL UTF8
 OPTIONS_DEFAULT=GTK2 NCURSES PCRE PLUGINS SSL UTF8
@@ -59,11 +59,11 @@ IPV6_CMAKE_OFF=		-DENABLE_IPV6=OFF
 IPV6_CMAKE_ON=		-DENABLE_IPV6=ON
 PCRE_CMAKE_OFF=		-DHAVE_PCRE=OFF
 PCRE_CMAKE_ON=		-DHAVE_PCRE=ON
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
-PLUGINS_BUILD_DEPENDS=	curl>=7.26.0:${PORTSDIR}/ftp/curl
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
+PLUGINS_BUILD_DEPENDS=	curl>=7.26.0:ftp/curl
 PLUGINS_CMAKE_OFF=	-DENABLE_PLUGINS=OFF
 PLUGINS_CMAKE_ON=	-DENABLE_PLUGINS=ON
-PLUGINS_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+PLUGINS_LIB_DEPENDS=	libcurl.so:ftp/curl
 SSL_CMAKE_OFF=		-DENABLE_SSL=OFF
 SSL_CMAKE_ON=		-DENABLE_SSL=ON
 SSL_USE=		OPENSSL=yes
diff --git a/net-mgmt/ezradius/Makefile b/net-mgmt/ezradius/Makefile
index 5d845f2f0c04..9bf59777cc04 100644
--- a/net-mgmt/ezradius/Makefile
+++ b/net-mgmt/ezradius/Makefile
@@ -13,7 +13,7 @@ COMMENT=	EzRADIUS is FreeRADIUS and Chillispot web-based management software
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	radiusd:${PORTSDIR}/net/freeradius2
+RUN_DEPENDS=	radiusd:net/freeradius2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-intl
 NO_BUILD=	yes
diff --git a/net-mgmt/fastnetmon/Makefile b/net-mgmt/fastnetmon/Makefile
index 039016066b98..b0754d0efe4f 100644
--- a/net-mgmt/fastnetmon/Makefile
+++ b/net-mgmt/fastnetmon/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Very fast DDoS analyzer with sflow/netflow/mirror support
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		liblog4cpp.so:${PORTSDIR}/devel/log4cpp
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
+		liblog4cpp.so:devel/log4cpp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FastVPSEestiOu
diff --git a/net-mgmt/fetchconfig/Makefile b/net-mgmt/fetchconfig/Makefile
index 357c00694347..e93779268031 100644
--- a/net-mgmt/fetchconfig/Makefile
+++ b/net-mgmt/fetchconfig/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl script for retrieving configuration of various network devices
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
+BUILD_DEPENDS=	p5-Net-Telnet>=0:net/p5-Net-Telnet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/flow-extract/Makefile b/net-mgmt/flow-extract/Makefile
index 44d936fa0dc1..e6938d0dbda1 100644
--- a/net-mgmt/flow-extract/Makefile
+++ b/net-mgmt/flow-extract/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Cisco NetFlow awk-like extracting tool
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ftlib.h:${PORTSDIR}/net-mgmt/flow-tools
+BUILD_DEPENDS=	${LOCALBASE}/include/ftlib.h:net-mgmt/flow-tools
 
 USES=		alias
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net-mgmt/flowviewer/Makefile b/net-mgmt/flowviewer/Makefile
index 357ad516601e..c634ad83dc25 100644
--- a/net-mgmt/flowviewer/Makefile
+++ b/net-mgmt/flowviewer/Makefile
@@ -12,8 +12,8 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Web-based user interface for the flow-tools NetFlow data
 
-RUN_DEPENDS=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS=	p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		rrdtool:databases/rrdtool
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SINGLE=	NETFLOWv
@@ -21,8 +21,8 @@ OPTIONS_SINGLE_NETFLOWv=	NETFLOWv5 NETFLOWv9
 OPTIONS_DEFAULT=	NETFLOWv5
 NETFLOWv5_DESC=	Support for NETFLOWv5
 NETFLOWv9_DESC=	Support for IPFIX/NETFLOWv9
-NETFLOWv5_RUN_DEPENDS=	flow-cat:${PORTSDIR}/net-mgmt/flow-tools-ng
-NETFLOWv9_RUN_DEPENDS=	rwptoflow:${PORTSDIR}/security/silktools
+NETFLOWv5_RUN_DEPENDS=	flow-cat:net-mgmt/flow-tools-ng
+NETFLOWv9_RUN_DEPENDS=	rwptoflow:security/silktools
 
 FLOWVIEWERDIR?=	${PREFIX}/www/flowviewer
 
diff --git a/net-mgmt/glpi-plugins-fusioninventory-server/Makefile b/net-mgmt/glpi-plugins-fusioninventory-server/Makefile
index 95fe7a21bac1..8d8966d5c369 100644
--- a/net-mgmt/glpi-plugins-fusioninventory-server/Makefile
+++ b/net-mgmt/glpi-plugins-fusioninventory-server/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Plugin of glpi to get information of networking devices
 
 LICENSE=	AGPLv3
 
-RUN_DEPENDS=	glpi>=0.85:${PORTSDIR}/www/glpi
+RUN_DEPENDS=	glpi>=0.85:www/glpi
 
 USE_PHP=	fileinfo simplexml wddx
 USES=		gettext
diff --git a/net-mgmt/grepip/Makefile b/net-mgmt/grepip/Makefile
index c99028402287..03e4ff566b5b 100644
--- a/net-mgmt/grepip/Makefile
+++ b/net-mgmt/grepip/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://komquats.com/distfiles/ \
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Print lines contans IP matching a pattern in CIDR format
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 PLIST_FILES=	bin/grepip
 PORTDOCS=	README.txt
diff --git a/net-mgmt/gsnmp/Makefile b/net-mgmt/gsnmp/Makefile
index 24a4a80fb82e..632c713df3a1 100644
--- a/net-mgmt/gsnmp/Makefile
+++ b/net-mgmt/gsnmp/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/local/${PORTNAME}/ \
 MAINTAINER=	matt@peterson.org
 COMMENT=	SNMP library written on top of glib and gnet2
 
-LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
+LIB_DEPENDS=	libgnet-2.0.so:net/gnet2
 
 USES=		libtool pathfix pkgconfig
 USE_GNOME=	glib20
diff --git a/net-mgmt/guifi-snpservices/Makefile b/net-mgmt/guifi-snpservices/Makefile
index 2f39876202eb..45e7826cf997 100644
--- a/net-mgmt/guifi-snpservices/Makefile
+++ b/net-mgmt/guifi-snpservices/Makefile
@@ -12,8 +12,8 @@ DISTNAME=		${PORTNAME}_${DISTVERSION}
 MAINTAINER=		tphilipp@potion-studios.com
 COMMENT=		Graphics server for the guifi.net meshnet
 
-RUN_DEPENDS=		mrtg:${PORTSDIR}/net-mgmt/mrtg \
-			rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS=		mrtg:net-mgmt/mrtg \
+			rrdtool:databases/rrdtool
 
 USE_PHP=		gd simplexml dom
 
diff --git a/net-mgmt/hastmon/Makefile b/net-mgmt/hastmon/Makefile
index 6906260092d0..8924caf1da0a 100644
--- a/net-mgmt/hastmon/Makefile
+++ b/net-mgmt/hastmon/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Cluster monitoring daemon
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	mk-configure>=0.20:${PORTSDIR}/devel/mk-configure
+BUILD_DEPENDS=	mk-configure>=0.20:devel/mk-configure
 
 MKCMAKE?=	${LOCALBASE}/bin/mkcmake
 INSTALL_TARGET=	installdirs install
diff --git a/net-mgmt/hawk/Makefile b/net-mgmt/hawk/Makefile
index 4008c4efde17..9932ad1ccd5e 100644
--- a/net-mgmt/hawk/Makefile
+++ b/net-mgmt/hawk/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Track uptime and DNS status for machines on your networks
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-		p5-Net-Ping-External>=0:${PORTSDIR}/net/p5-Net-Ping-External \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \
+		p5-Net-Ping-External>=0:net/p5-Net-Ping-External \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 USES=		perl5
 USE_MYSQL=	server
diff --git a/net-mgmt/icinga-classicweb/Makefile b/net-mgmt/icinga-classicweb/Makefile
index 221839fc257a..6164cb84384a 100644
--- a/net-mgmt/icinga-classicweb/Makefile
+++ b/net-mgmt/icinga-classicweb/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Classic web interface for Icinga 1 and 2
 
 .include "${.CURDIR}/../icinga-core/Makefile.common"
 
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	libgd.so:graphics/gd
 
 CONFIGURE_ARGS+=--disable-idoutils
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-mgmt/icinga-core/Makefile b/net-mgmt/icinga-core/Makefile
index 2386425e4b43..23f247ee3a32 100644
--- a/net-mgmt/icinga-core/Makefile
+++ b/net-mgmt/icinga-core/Makefile
@@ -26,13 +26,13 @@ OPTIONS_DEFAULT=	IDOUTILS MONPLUGINS
 
 IDOUTILS_DESC=		Enable Icinga Data Objects support
 
-MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins
-NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
+MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
+NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIDOUTILS}
-LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=		libdbi.so:databases/libdbi
 CONFIGURE_ARGS+=	--enable-idoutils \
 			--enable-ssl \
 			--with-dbi-lib=${LOCALBASE}/lib \
diff --git a/net-mgmt/icinga-core/Makefile.common b/net-mgmt/icinga-core/Makefile.common
index f3fe41b4ee2b..a9ed76f9ffb0 100644
--- a/net-mgmt/icinga-core/Makefile.common
+++ b/net-mgmt/icinga-core/Makefile.common
@@ -8,7 +8,7 @@ MAINTAINER=	lme@FreeBSD.org
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS+=	libltdl.so:devel/libltdl
 USES=		cpe gmake perl5
 
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index a2b577120b71..61254b16f898 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	net-mgmt
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Metaport for Icinga 1.x and its classic web interface
 
-RUN_DEPENDS=	icinga-core>=1.13.3:${PORTSDIR}/net-mgmt/icinga-core \
-		${LOCALBASE}/www/icinga/main.html:${PORTSDIR}/net-mgmt/icinga-classicweb
+RUN_DEPENDS=	icinga-core>=1.13.3:net-mgmt/icinga-core \
+		${LOCALBASE}/www/icinga/main.html:net-mgmt/icinga-classicweb
 
 USES=		metaport
 
diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index a47a0b0bcdf8..b20e2e28e39a 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Monitoring and management system for hosts, services and networks
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libyajl.so:${PORTSDIR}/devel/yajl \
-		libexecinfo.so:${PORTSDIR}/devel/libexecinfo # for better debugging
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libyajl.so:devel/yajl \
+		libexecinfo.so:devel/libexecinfo # for better debugging
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
@@ -31,8 +31,8 @@ OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 
 OPTIONS_DEFAULT=	MYSQL PGSQL MONPLUGINS
 
-MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins
-NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
+MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
+NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 
 MYSQL_CMAKE_ON=	-DICINGA2_WITH_MYSQL:BOOL=true
 PGSQL_CMAKE_ON=	-DICINGA2_WITH_PGSQL:BOOL=true
@@ -81,7 +81,7 @@ PLIST_SUB+=	DBBACKEND=""
 .endif
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=2.5.31:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=2.5.31:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex
 CXXFLAGS+=	-I${LOCALBASE}/include/flex
 .endif
diff --git a/net-mgmt/icingaweb2/Makefile b/net-mgmt/icingaweb2/Makefile
index c047c7d26280..6084bc78290b 100644
--- a/net-mgmt/icingaweb2/Makefile
+++ b/net-mgmt/icingaweb2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Next generation web interface for Icinga 1 and 2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=        ${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:${PORTSDIR}/www/zend-framework
+RUN_DEPENDS=        ${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:www/zend-framework
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
diff --git a/net-mgmt/icli/Makefile b/net-mgmt/icli/Makefile
index 9bb23f747e5c..26921b041c53 100644
--- a/net-mgmt/icli/Makefile
+++ b/net-mgmt/icli/Makefile
@@ -14,9 +14,9 @@ LICENSE_NAME=	ICLI license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
-		icinga:${PORTSDIR}/net-mgmt/icinga-core
+RUN_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Term-Size>=0:devel/p5-Term-Size \
+		icinga:net-mgmt/icinga-core
 
 ICINGADIR?=	/var/spool/icinga
 
diff --git a/net-mgmt/ipplan/Makefile b/net-mgmt/ipplan/Makefile
index a098582a7d5f..81c05b8300ac 100644
--- a/net-mgmt/ipplan/Makefile
+++ b/net-mgmt/ipplan/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/iptrack/${PORTNAME}/Release%204.92
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IP address management and tracking
 
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
+RUN_DEPENDS=	nmap:security/nmap
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/net-mgmt/isic/Makefile b/net-mgmt/isic/Makefile
index 9aee4030d9db..e9e2d821ee01 100644
--- a/net-mgmt/isic/Makefile
+++ b/net-mgmt/isic/Makefile
@@ -12,7 +12,7 @@ COMMENT=	IP Stack Integrity Checker
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 GNU_CONFIGURE=	yes
 USES=		tar:tgz
diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index 5f66430c3fc4..dcd160db67cd 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -41,7 +41,7 @@ PORTEXAMPLES=	*
 
 .if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=--enable-pcre
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 .else
 CONFIGURE_ARGS+=--disable-pcre
 .endif
diff --git a/net-mgmt/klg/Makefile b/net-mgmt/klg/Makefile
index aba77ac24a7f..70afd76c8ddf 100644
--- a/net-mgmt/klg/Makefile
+++ b/net-mgmt/klg/Makefile
@@ -36,7 +36,7 @@ SSH2_DESC=		SSH2 support for router access
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSH2}
-RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/ssh2.so:${PORTSDIR}/security/pecl-ssh2
+RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/ssh2.so:security/pecl-ssh2
 .endif
 
 do-install:
diff --git a/net-mgmt/lanmap/Makefile b/net-mgmt/lanmap/Makefile
index 4173215cd0b4..101ec73e7260 100644
--- a/net-mgmt/lanmap/Makefile
+++ b/net-mgmt/lanmap/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.parseerror.com/lanmap/rev/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lanmap sits quietly on a network and builds a picture of what it sees
 
-RUN_DEPENDS=	twopi:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	twopi:graphics/graphviz
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
index 25306987e28b..5074a5c76d5a 100644
--- a/net-mgmt/librenms/Makefile
+++ b/net-mgmt/librenms/Makefile
@@ -37,14 +37,14 @@ WANT_PHP_CLI=	yes
 
 NO_BUILD=	yes
 
-RUN_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool \
-		dot:${PORTSDIR}/graphics/graphviz \
-		Magick-config:${PORTSDIR}/graphics/ImageMagick \
-		mtr:${PORTSDIR}/net/mtr-nox11 \
-		${LOCALBASE}/share/pear/Net/IPv4.php:${PORTSDIR}/net/pear-Net_IPv4 \
-		${LOCALBASE}/share/pear/Net/IPv6.php:${PORTSDIR}/net/pear-Net_IPv6 \
-		snmpget:${PORTSDIR}/net-mgmt/net-snmp \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS+=	rrdtool:databases/rrdtool \
+		dot:graphics/graphviz \
+		Magick-config:graphics/ImageMagick \
+		mtr:net/mtr-nox11 \
+		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4 \
+		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6 \
+		snmpget:net-mgmt/net-snmp \
+		bash:shells/bash
 
 OPTIONS_DEFINE=	APACHEMOD FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER WMIC DOCS EXAMPLES
 OPTIONS_DEFAULT=	APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC DOCS EXAMPLES
@@ -55,13 +55,13 @@ MYSQLD_DESC=	Use local MySQL server
 WMIC_DESC=	Enable support for WMI polling
 PYPOLLER_DESC=	Enable Python Poller Wrapper
 
-FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
-IPMITOOL_RUN_DEPENDS=	ipmitool:${PORTSDIR}/sysutils/ipmitool
-LIBVIRT_RUN_DEPENDS=	virsh:${PORTSDIR}/devel/libvirt
-NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
-NMAP_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
-PYPOLLER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb
-WMIC_RUN_DEPENDS=	wmic:${PORTSDIR}/net-mgmt/wmi-client
+FPING_RUN_DEPENDS=	fping:net/fping
+IPMITOOL_RUN_DEPENDS=	ipmitool:sysutils/ipmitool
+LIBVIRT_RUN_DEPENDS=	virsh:devel/libvirt
+NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
+NMAP_RUN_DEPENDS=	nmap:security/nmap
+PYPOLLER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
+WMIC_RUN_DEPENDS=	wmic:net-mgmt/wmi-client
 MYSQLD_USE=		MYSQL=server
 MYSQLD_USE_OFF=		MYSQL=client
 
diff --git a/net-mgmt/lldpd/Makefile b/net-mgmt/lldpd/Makefile
index 2d6342f7bf79..b742df4eadbb 100644
--- a/net-mgmt/lldpd/Makefile
+++ b/net-mgmt/lldpd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	LLDP (802.1ab)/CDP/EDP/SONMP/FDP daemon and SNMP subagent
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		libtool
 USE_LDCONFIG=	yes
@@ -49,10 +49,10 @@ SNMP_CONFIGURE_WITH=		snmp
 XML_CONFIGURE_WITH=		xml
 PROPRIETARY_CONFIGURE_ENABLE=	cdp edp fdp sonmp
 
-JSON_LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson
+JSON_LIB_DEPENDS=	libjansson.so:devel/jansson
 JSON_USES=		pkgconfig
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-XML_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR}
diff --git a/net-mgmt/mbrowse/Makefile b/net-mgmt/mbrowse/Makefile
index f7882a78ce85..63844c40d545 100644
--- a/net-mgmt/mbrowse/Makefile
+++ b/net-mgmt/mbrowse/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	SNMP MIB Browser for X
 
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/mbrowse
diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile
index c22ff255ec87..f902ee88e14b 100644
--- a/net-mgmt/monitoring-plugins/Makefile
+++ b/net-mgmt/monitoring-plugins/Makefile
@@ -74,26 +74,26 @@ CONFIGURE_ARGS+=ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
-QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
+QSTAT_BUILD_DEPENDS=	qstat:games/qstat
+QSTAT_RUN_DEPENDS=	qstat:games/qstat
 QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QUAKESTAT= \
 			ac_cv_path_PATH_TO_QSTAT=
 
 IPV6_CONFIGURE_WITH=	ipv6
 
-FPING_BUILD_DEPENDS=	fping:${PORTSDIR}/net/fping
-FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
+FPING_BUILD_DEPENDS=	fping:net/fping
+FPING_RUN_DEPENDS=	fping:net/fping
 FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING= \
 			ac_cv_path_PATH_TO_FPING6=
 
-NETSNMP_BUILD_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-NETSNMP_RUN_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+NETSNMP_BUILD_DEPENDS=	snmpcheck:net-mgmt/net-snmp \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
+NETSNMP_RUN_DEPENDS=	snmpcheck:net-mgmt/net-snmp \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
 			ac_cv_path_PATH_TO_SNMPGETNEXT=
 
-RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 RADIUS_CONFIGURE_WITH=	radius
 
 MYSQL_USE=	mysql=yes
@@ -108,20 +108,20 @@ LDAP_CONFIGURE_WITH=	ldap
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
+DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DBI_CONFIGURE_WITH=	dbi
 
-DNS_BINDTOOLS_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind-tools
+DNS_BINDTOOLS_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind-tools
 DNS_BINDTOOLS_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
-DNS_BIND99_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind99
+DNS_BIND99_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind99
 DNS_BIND99_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
-DNS_BIND910_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind910
+DNS_BIND910_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind910
 DNS_BIND910_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 
-SSH_PORTABLE_BUILD_DEPENDS=	${LOCALBASE}/bin/ssh:${PORTSDIR}/security/openssh-portable
+SSH_PORTABLE_BUILD_DEPENDS=	${LOCALBASE}/bin/ssh:security/openssh-portable
 SSH_PORTABLE_RUN_DEPENDS:=	${SSH_PORTABLE_BUILD_DEPENDS}
 SSH_PORTABLE_CONFIGURE_ON=	--with-ssh-command=${LOCALBASE}/bin/ssh
 
diff --git a/net-mgmt/mrtg-ping-probe/Makefile b/net-mgmt/mrtg-ping-probe/Makefile
index 096518cd4576..5172c8e4e64c 100644
--- a/net-mgmt/mrtg-ping-probe/Makefile
+++ b/net-mgmt/mrtg-ping-probe/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	https://opsec.eu/src/
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	Round Trip Time and Packet Loss Probe for MRTG
 
-RUN_DEPENDS=	${LOCALBASE}/bin/mrtg:${PORTSDIR}/net-mgmt/mrtg
+RUN_DEPENDS=	${LOCALBASE}/bin/mrtg:net-mgmt/mrtg
 
 FETCH_BEFORE_ARGS=	-p      # MASTER_SITE needs PASSIVE FTP.
 
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index 92a281641979..9abafa1ddd8d 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
 MAINTAINER=	ports@subnets.ru
 COMMENT=	Multi-router traffic grapher
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/${GD_PORT}
-RUN_DEPENDS=	p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session
+LIB_DEPENDS=	libgd.so:${GD_PORT}
+RUN_DEPENDS=	p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session
 
 # slave ports override with languages specific gd
 GD_PORT?=	graphics/gd
@@ -66,8 +66,8 @@ SCRIPTS=	cfgmaker indexmaker mrtg mrtg-traffic-sum
 
 OPTIONS_DEFINE=	DOCS EXAMPLES IPV6 SNMPV3
 
-IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
-SNMPV3_RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6
+SNMPV3_RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/net-mgmt/nagcon/Makefile b/net-mgmt/nagcon/Makefile
index 039b1ff071be..fbda4b45a640 100644
--- a/net-mgmt/nagcon/Makefile
+++ b/net-mgmt/nagcon/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.vanheusden.com/nagcon/
 MAINTAINER=	rand@meridian-enviro.com
 COMMENT=	Nagios console monitor
 
-LIB_DEPENDS=	libstrfunc.so:${PORTSDIR}/devel/libstrfunc
+LIB_DEPENDS=	libstrfunc.so:devel/libstrfunc
 
 PLIST_FILES=	bin/nagcon
 
diff --git a/net-mgmt/nagios-certexp-plugin/Makefile b/net-mgmt/nagios-certexp-plugin/Makefile
index 7e67b94b35d2..387bf28999b8 100644
--- a/net-mgmt/nagios-certexp-plugin/Makefile
+++ b/net-mgmt/nagios-certexp-plugin/Makefile
@@ -11,9 +11,9 @@ EXTRACT_SUFX=
 MAINTAINER=	ecronin@gizmolabs.org
 COMMENT=	Nagios plugin for checking SSL server certificate expiration
 
-RUN_DEPENDS+=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long
+RUN_DEPENDS+=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long
 
 USES=		perl5 shebangfix
 NO_WRKSUBDIR=	yes
diff --git a/net-mgmt/nagios-check_bacula/Makefile b/net-mgmt/nagios-check_bacula/Makefile
index 0008f168b970..8f997155d9ca 100644
--- a/net-mgmt/nagios-check_bacula/Makefile
+++ b/net-mgmt/nagios-check_bacula/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	#
 MAINTAINER=	freebsd@troback.com
 COMMENT=	Nagios plugin for Bacula
 
-LIB_DEPENDS+=	libbac.so:${PORTSDIR}/sysutils/bacula-client
+LIB_DEPENDS+=	libbac.so:sysutils/bacula-client
 
 PLIST=		${.CURDIR}/pkg-plist
 PLIST_FILES=	libexec/nagios/check_bacula
diff --git a/net-mgmt/nagios-check_bacula5/Makefile b/net-mgmt/nagios-check_bacula5/Makefile
index af39fc3d5b31..7ab7942de900 100644
--- a/net-mgmt/nagios-check_bacula5/Makefile
+++ b/net-mgmt/nagios-check_bacula5/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	5
 MAINTAINER=	freebsd@troback.com
 COMMENT=	Nagios plugin for Bacula
 
-LIB_DEPENDS+=	libbac.so:${PORTSDIR}/sysutils/bacula5-client
+LIB_DEPENDS+=	libbac.so:sysutils/bacula5-client
 
 PLIST=		${.CURDIR}/pkg-plist
 PLIST_FILES=	libexec/nagios/check_bacula
diff --git a/net-mgmt/nagios-check_clamav/Makefile b/net-mgmt/nagios-check_clamav/Makefile
index 45f940ed67dd..526720357496 100644
--- a/net-mgmt/nagios-check_clamav/Makefile
+++ b/net-mgmt/nagios-check_clamav/Makefile
@@ -16,9 +16,9 @@ USES=		perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	check_clamav
 
-RUN_DEPENDS+=	${LOCALBASE}/libexec/nagios/utils.pm:${PORTSDIR}/net-mgmt/nagios-plugins \
-		clamav>=0:${PORTSDIR}/security/clamav \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS+=	${LOCALBASE}/libexec/nagios/utils.pm:net-mgmt/nagios-plugins \
+		clamav>=0:security/clamav \
+		p5-Net-DNS>=0:dns/p5-Net-DNS
 
 PLIST_FILES=	libexec/nagios/check_clamav
 
diff --git a/net-mgmt/nagios-check_dhcp.pl/Makefile b/net-mgmt/nagios-check_dhcp.pl/Makefile
index 1fb710830b52..119474776870 100644
--- a/net-mgmt/nagios-check_dhcp.pl/Makefile
+++ b/net-mgmt/nagios-check_dhcp.pl/Makefile
@@ -12,9 +12,9 @@ EXTRACT_SUFX=
 MAINTAINER=	beastie@tardisi.com
 COMMENT=	Check the availability of a DHCP server using unicast delivery
 
-RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/utils.pm:${PORTSDIR}/net-mgmt/nagios-plugins \
-		p5-IO-Interface>=0:${PORTSDIR}/net/p5-IO-Interface \
-		p5-Net-DHCP-Watch>=0:${PORTSDIR}/net/p5-Net-DHCP-Watch
+RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/utils.pm:net-mgmt/nagios-plugins \
+		p5-IO-Interface>=0:net/p5-IO-Interface \
+		p5-Net-DHCP-Watch>=0:net/p5-Net-DHCP-Watch
 
 USES=		perl5
 USE_PERL5=	run
diff --git a/net-mgmt/nagios-check_email_delivery/Makefile b/net-mgmt/nagios-check_email_delivery/Makefile
index 88f135ba4dbf..a3a740b256bd 100644
--- a/net-mgmt/nagios-check_email_delivery/Makefile
+++ b/net-mgmt/nagios-check_email_delivery/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Nagios Plugin to monitor your mail environment
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	p5-Net-SMTP-TLS>=0:${PORTSDIR}/mail/p5-Net-SMTP-TLS \
-		p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Email-Address>0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Mail-IMAPClient>=0:${PORTSDIR}/mail/p5-Mail-IMAPClient
+RUN_DEPENDS=	p5-Net-SMTP-TLS>=0:mail/p5-Net-SMTP-TLS \
+		p5-Net-DNS>0:dns/p5-Net-DNS \
+		p5-Email-Address>0:mail/p5-Email-Address \
+		p5-Mail-IMAPClient>=0:mail/p5-Mail-IMAPClient
 
 USES=		perl5 shebangfix
 SCRIPTS=	check_email_delivery check_email_delivery_epn \
diff --git a/net-mgmt/nagios-check_hdd_health/Makefile b/net-mgmt/nagios-check_hdd_health/Makefile
index 39bab451ea93..d60d311b195f 100644
--- a/net-mgmt/nagios-check_hdd_health/Makefile
+++ b/net-mgmt/nagios-check_hdd_health/Makefile
@@ -10,7 +10,7 @@ DISTFILES=	# none
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nagios plug-in to check HDD health from S.M.A.R.T
 
-RUN_DEPENDS=	smartmontools>=0:${PORTSDIR}/sysutils/smartmontools
+RUN_DEPENDS=	smartmontools>=0:sysutils/smartmontools
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/net-mgmt/nagios-check_hp_bladechassis/Makefile b/net-mgmt/nagios-check_hp_bladechassis/Makefile
index 185b3ceaa09f..16aa4e48ce68 100644
--- a/net-mgmt/nagios-check_hp_bladechassis/Makefile
+++ b/net-mgmt/nagios-check_hp_bladechassis/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Nagios Plugin to monitor your HP Blade Enclosure
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/net-mgmt/nagios-check_memcached_paranoid/Makefile b/net-mgmt/nagios-check_memcached_paranoid/Makefile
index 7fc14ff91313..13c8d0c8d675 100644
--- a/net-mgmt/nagios-check_memcached_paranoid/Makefile
+++ b/net-mgmt/nagios-check_memcached_paranoid/Makefile
@@ -10,7 +10,7 @@ DISTFILES=	nagios-plugins-1.5.tar.gz
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Nagios plugin for checking memcached
 
-LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 BUILD_DEPENDS=	nagios-plugins>0:${PLUGINS} \
 		${EXTRA_DEPENDS} \
 		${NONEXISTENT}:${PLUGINS}:build
@@ -20,9 +20,9 @@ FILE=		${PORTNAME}.c
 PLUGINS=	${PORTSDIR}/net-mgmt/nagios-plugins
 NDIR_CMD=	cd ${PLUGINS} && ${MAKE} -VWRKSRC
 # Needed for build target on net-mgmt/nagios-plugins
-EXTRA_DEPENDS=	automake>0:${PORTSDIR}/devel/automake \
-		autoconf>0:${PORTSDIR}/devel/autoconf \
-		gmake:${PORTSDIR}/devel/gmake
+EXTRA_DEPENDS=	automake>0:devel/automake \
+		autoconf>0:devel/autoconf \
+		gmake:devel/gmake
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/net-mgmt/nagios-check_mysql_slave/Makefile b/net-mgmt/nagios-check_mysql_slave/Makefile
index a73510c1ac3d..cddff8240fd1 100644
--- a/net-mgmt/nagios-check_mysql_slave/Makefile
+++ b/net-mgmt/nagios-check_mysql_slave/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Nagios Plugin to monitor MySQL replication on a slave
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-DBI>=1.60.7:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-DBI>=1.60.7:databases/p5-DBI \
+		p5-DBD-mysql>0:databases/p5-DBD-mysql
 
 PORTSCOUT=	ignore:1
 
diff --git a/net-mgmt/nagios-check_netsnmp/Makefile b/net-mgmt/nagios-check_netsnmp/Makefile
index c067f380938f..96fc32aafc37 100644
--- a/net-mgmt/nagios-check_netsnmp/Makefile
+++ b/net-mgmt/nagios-check_netsnmp/Makefile
@@ -12,8 +12,8 @@ DISTFILES=	# none
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Nagios plug-in to get some common NetSNMP-exported information
 
-RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/utils.pm:${PORTSDIR}/net-mgmt/nagios-plugins \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/utils.pm:net-mgmt/nagios-plugins \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/net-mgmt/nagios-check_relayd_status/Makefile b/net-mgmt/nagios-check_relayd_status/Makefile
index ce8358f281f6..295413067bdc 100644
--- a/net-mgmt/nagios-check_relayd_status/Makefile
+++ b/net-mgmt/nagios-check_relayd_status/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Nagios plug-in to check on the status of relayd
 
 LICENSE=	MPL
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/relayctl:${PORTSDIR}/net/relayd
+RUN_DEPENDS=	${LOCALBASE}/sbin/relayctl:net/relayd
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/net-mgmt/nagios-check_smartmon/Makefile b/net-mgmt/nagios-check_smartmon/Makefile
index eba8a3be6618..a16b3063345d 100644
--- a/net-mgmt/nagios-check_smartmon/Makefile
+++ b/net-mgmt/nagios-check_smartmon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Nagios plug-in to get status from smartmontools
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/smartctl:${PORTSDIR}/sysutils/smartmontools
+RUN_DEPENDS=	${LOCALBASE}/sbin/smartctl:sysutils/smartmontools
 
 USES=		python shebangfix
 NO_BUILD=	yes
diff --git a/net-mgmt/nagios-check_tftp/Makefile b/net-mgmt/nagios-check_tftp/Makefile
index a78daca49dc8..5bebe190e8bb 100644
--- a/net-mgmt/nagios-check_tftp/Makefile
+++ b/net-mgmt/nagios-check_tftp/Makefile
@@ -12,8 +12,8 @@ EXTRACT_SUFX=
 MAINTAINER=	holgerrepp@googlemail.com
 COMMENT=	Nagios plugin to check tftp servers
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/bin/tftp:${PORTSDIR}/ftp/tftp-hpa
+RUN_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/bin/tftp:ftp/tftp-hpa
 
 PLIST_FILES=	libexec/nagios/check_tftp
 
diff --git a/net-mgmt/nagios-check_zpools/Makefile b/net-mgmt/nagios-check_zpools/Makefile
index 616485f5f31b..a90ebe1de099 100644
--- a/net-mgmt/nagios-check_zpools/Makefile
+++ b/net-mgmt/nagios-check_zpools/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	nagios-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Nagios plugin that checks zpool state
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Napsty
diff --git a/net-mgmt/nagios-openldap-plugins/Makefile b/net-mgmt/nagios-openldap-plugins/Makefile
index 06d4a106f9a9..f558990a8c73 100644
--- a/net-mgmt/nagios-openldap-plugins/Makefile
+++ b/net-mgmt/nagios-openldap-plugins/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Nagios Plugins to monitor OpenLDAP
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Date-Manip>=6.30:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Date-Manip>=6.30:devel/p5-Date-Manip \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes
 
 PORTSCOUT=	ignore:1
 
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 5c9c243834f0..647eff235df9 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -81,26 +81,26 @@ CONFIGURE_ARGS+=ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
-QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
+QSTAT_BUILD_DEPENDS=	qstat:games/qstat
+QSTAT_RUN_DEPENDS=	qstat:games/qstat
 QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QUAKESTAT= \
 			ac_cv_path_PATH_TO_QSTAT=
 
 IPV6_CONFIGURE_WITH=	ipv6
 
-FPING_BUILD_DEPENDS=	fping:${PORTSDIR}/net/fping
-FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
+FPING_BUILD_DEPENDS=	fping:net/fping
+FPING_RUN_DEPENDS=	fping:net/fping
 FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING= \
 			ac_cv_path_PATH_TO_FPING6=
 
-NETSNMP_BUILD_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-NETSNMP_RUN_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+NETSNMP_BUILD_DEPENDS=	snmpcheck:net-mgmt/net-snmp \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
+NETSNMP_RUN_DEPENDS=	snmpcheck:net-mgmt/net-snmp \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
 			ac_cv_path_PATH_TO_SNMPGETNEXT=
 
-RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 RADIUS_CONFIGURE_WITH=	radius
 
 MYSQL_USE=	mysql=yes
@@ -115,20 +115,20 @@ LDAP_CONFIGURE_WITH=	ldap
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
+DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DBI_CONFIGURE_WITH=	dbi
 
-DNS_BINDTOOLS_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind-tools
+DNS_BINDTOOLS_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind-tools
 DNS_BINDTOOLS_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
-DNS_BIND99_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind99
+DNS_BIND99_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind99
 DNS_BIND99_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
-DNS_BIND910_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind910
+DNS_BIND910_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind910
 DNS_BIND910_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 
-SSH_PORTABLE_BUILD_DEPENDS=	${LOCALBASE}/bin/ssh:${PORTSDIR}/security/openssh-portable
+SSH_PORTABLE_BUILD_DEPENDS=	${LOCALBASE}/bin/ssh:security/openssh-portable
 SSH_PORTABLE_RUN_DEPENDS:=	${SSH_PORTABLE_BUILD_DEPENDS}
 SSH_PORTABLE_CONFIGURE_ON=	--with-ssh-command=${LOCALBASE}/bin/ssh
 
diff --git a/net-mgmt/nagios-snmp-plugins-extras/Makefile b/net-mgmt/nagios-snmp-plugins-extras/Makefile
index 0d43161461ca..d8fca067bdb1 100644
--- a/net-mgmt/nagios-snmp-plugins-extras/Makefile
+++ b/net-mgmt/nagios-snmp-plugins-extras/Makefile
@@ -17,8 +17,8 @@ USES=		perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	${PLUGINS}
 
-RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		${LOCALBASE}/libexec/nagios/utils.pm:${PORTSDIR}/net-mgmt/nagios-plugins
+RUN_DEPENDS+=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		${LOCALBASE}/libexec/nagios/utils.pm:net-mgmt/nagios-plugins
 
 PLUGINS=	check_snmp_boostedge.pl \
 		check_snmp_cpfw.pl \
diff --git a/net-mgmt/nagios-snmp-plugins/Makefile b/net-mgmt/nagios-snmp-plugins/Makefile
index 58d3fb48a233..f355e9b16f21 100644
--- a/net-mgmt/nagios-snmp-plugins/Makefile
+++ b/net-mgmt/nagios-snmp-plugins/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Additional SNMP plugins for Nagios
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake perl5 localbase
diff --git a/net-mgmt/nagios-spamd-plugin/Makefile b/net-mgmt/nagios-spamd-plugin/Makefile
index 244624db3bd1..b90511621555 100644
--- a/net-mgmt/nagios-spamd-plugin/Makefile
+++ b/net-mgmt/nagios-spamd-plugin/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	# empty
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Nagios plugin for checking SpamAssassins spamd
 
-RUN_DEPENDS+=	${LOCALBASE}/${NAGIOS_PLUGIN_DIR}/utils.pm:${PORTSDIR}/net-mgmt/nagios-plugins
+RUN_DEPENDS+=	${LOCALBASE}/${NAGIOS_PLUGIN_DIR}/utils.pm:net-mgmt/nagios-plugins
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	check_spamd.pl
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 5f4221044e78..62eb1621d4b8 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Powerful network monitoring system
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libgd.so:graphics/gd
 
 PORTSCOUT=	limit:^3.
 
@@ -83,8 +83,8 @@ NANOSLEEP_DESC=		Use nanosleep in event timing
 EVENT_BROKER_DESC=	Enable event broker functionality
 UNHANDLED_HACK_DESC=	Display passive checks in unhandled queries
 
-MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins
-NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
+MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
+NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 
 OPTIONS_SUB=
 
diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index d6e081e81fb6..f0a90e845d15 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Powerful network monitoring system
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libgd.so:graphics/gd
 
 USES=		cpe gmake perl5
 USE_PERL5=	build
@@ -79,8 +79,8 @@ OPTIONS_DEFAULT=	NAGPLUGINS
 NANOSLEEP_DESC=		Use nanosleep in event timing
 UNHANDLED_HACK_DESC=	Display passive checks in unhandled queries
 
-MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins
-NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
+MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
+NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 
 OPTIONS_SUB=
 
diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile
index 5d96cb4b3052..34c4c7728e81 100644
--- a/net-mgmt/nagiosgraph/Makefile
+++ b/net-mgmt/nagiosgraph/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	hizel@vyborg.ru
 COMMENT=	Generate rrdtool graphs using performance data from nagios plugins
 
-RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS=	rrdtool>=0:databases/rrdtool
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		NAGIOS
@@ -18,10 +18,10 @@ OPTIONS_SINGLE_NAGIOS=	NAGIOS35 NAGIOS4
 OPTIONS_DEFAULT=	NAGIOS35
 
 NAGIOS35_DESC=		Install for nagios-3.5.x (net-mgmt/nagios)
-NAGIOS35_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios
+NAGIOS35_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:net-mgmt/nagios
 
 NAGIOS4_DESC=		Install for nagios-4.0.x (net-mgmt/nagios4)
-NAGIOS4_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios4
+NAGIOS4_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:net-mgmt/nagios4
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/net-mgmt/nagiosql/Makefile b/net-mgmt/nagiosql/Makefile
index 8a43ef1f533c..dcbe666adf80 100644
--- a/net-mgmt/nagiosql/Makefile
+++ b/net-mgmt/nagiosql/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Web based administration tool for Nagios
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	nagios:${PORTSDIR}/net-mgmt/nagios \
-		${PEARDIR}/HTML/Template/IT.php:${PORTSDIR}/devel/pear-HTML_Template_IT
+RUN_DEPENDS=	nagios:net-mgmt/nagios \
+		${PEARDIR}/HTML/Template/IT.php:devel/pear-HTML_Template_IT
 
 USE_MYSQL=	yes
 USES=		cpe gettext tar:bzip2
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index a6c4ee53f044..33710d56857d 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Nagios status monitor for your desktop
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS=	sox:audio/sox
 
 USES=		cpe python:2
 CPE_VENDOR=	henri_wahl
diff --git a/net-mgmt/nagvis/Makefile b/net-mgmt/nagvis/Makefile
index 7a5dabeb6de1..6e926ed86406 100644
--- a/net-mgmt/nagvis/Makefile
+++ b/net-mgmt/nagvis/Makefile
@@ -38,15 +38,15 @@ PLIST_SUB+=	WWWDIR="${WWWDIR}"
 
 .if ${PORT_OPTIONS:MNDO2DB}
 USE_PHP+=	mysql
-RUN_DEPENDS+=	ndo2db-3x:${PORTSDIR}/net-mgmt/ndoutils
+RUN_DEPENDS+=	ndo2db-3x:net-mgmt/ndoutils
 .endif
 
 .if ${PORT_OPTIONS:MMKLIVESTATUS}
-RUN_DEPENDS+=	mk-livestatus>=0:${PORTSDIR}/net-mgmt/mk-livestatus
+RUN_DEPENDS+=	mk-livestatus>=0:net-mgmt/mk-livestatus
 .endif
 
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+=	dot:graphics/graphviz
 .endif
 
 post-extract:
diff --git a/net-mgmt/ndoutils/Makefile b/net-mgmt/ndoutils/Makefile
index 04254049cc22..019125653781 100644
--- a/net-mgmt/ndoutils/Makefile
+++ b/net-mgmt/ndoutils/Makefile
@@ -23,8 +23,8 @@ OPTIONS_DEFAULT=	NAGIOS3X NANOSLEEP
 NAGIOS3X_DESC=		For Nagios 3.X Series
 NAGIOS4X_DESC=		For Nagios 4.X Series
 NANOSLEEP_DESC=		Use of nanosleep in event timing
-NAGIOS3X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios
-NAGIOS4X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios4
+NAGIOS3X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:net-mgmt/nagios
+NAGIOS4X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:net-mgmt/nagios4
 NANOSLEEP_CONFIGURE_ENABLE=	nanosleep
 
 USE_MYSQL=	yes
diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile
index 14196d33f58e..b1b489072c18 100644
--- a/net-mgmt/ndpmon/Makefile
+++ b/net-mgmt/ndpmon/Makefile
@@ -22,7 +22,7 @@ MACRESOLV_DESC=		Enable MAC Manufacturer Resolution (use p5-libwww)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPY4SUITE}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Ft/Xml/Domlette.py:${PORTSDIR}/textproc/py-4suite-xml
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Ft/Xml/Domlette.py:textproc/py-4suite-xml
 USES+=		python
 PLIST_SUB+=	PY=""
 .else
@@ -44,8 +44,8 @@ PORTDOCS=	INSTALL README
 
 .if ${PORT_OPTIONS:MMACRESOLV}
 CONFIGURE_ARGS+=--enable-mac-resolv
-BUILD_DEPENDS+=	p5-libwww>=6.05:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS+=	p5-libwww>=6.05:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS+=	p5-libwww>=6.05:www/p5-libwww
+RUN_DEPENDS+=	p5-libwww>=6.05:www/p5-libwww
 PLIST_SUB+=	MACRESOLV=""
 .else
 PLIST_SUB+=	MACRESOLV="@comment "
diff --git a/net-mgmt/nedi/Makefile b/net-mgmt/nedi/Makefile
index 3bd8bed2e6b6..79fdb24f2d7e 100644
--- a/net-mgmt/nedi/Makefile
+++ b/net-mgmt/nedi/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Network discovery and monitoring tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-Net-Telnet-Cisco>=0:${PORTSDIR}/net-mgmt/p5-Telnet-Cisco \
-		p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-Net-Telnet-Cisco>=0:net-mgmt/p5-Telnet-Cisco \
+		p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5 shebangfix tar:tgz
 SHEBANG_FILES=	*.pl html/inc/Devsend.pl
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index f6c93d4f79d2..3dc4eb7bd279 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -69,8 +69,8 @@ CONFIGURE_ARGS+=--with-defaults
 PYDISTUTILS_PKGNAME?=		netsnmp-python
 PYDISTUTILS_PKGVERSION?=	1.0a1
 USES+=		python
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
 CONFIGURE_ARGS+=--with-python-modules
 CONFIGURE_ENV+=	PYTHONPROG="${PYTHON_CMD}"
 MAKE_ENV+=	PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}"
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=--with-dummy-values
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-local:Makefile.in
 PLIST_SUB+=	WITH_TKMIB="@comment "
 .else
-RUN_DEPENDS+=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS+=	p5-Tk>=0:x11-toolkits/p5-Tk
 PLIST_SUB+=	WITH_TKMIB=""
 .endif
 
@@ -112,7 +112,7 @@ PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
 #.if ${PORT_OPTIONS:MDMALLOC}
-#LIB_DEPENDS+=	libdmalloc.so:${PORTSDIR}/devel/dmalloc
+#LIB_DEPENDS+=	libdmalloc.so:devel/dmalloc
 #CONFIGURE_ARGS+=--with-dmalloc=${LOCALBASE}
 #.else
 #CONFIGURE_ARGS+=--without-dmalloc
diff --git a/net-mgmt/netams/Makefile b/net-mgmt/netams/Makefile
index d3593b0d8496..b8572d443fe5 100644
--- a/net-mgmt/netams/Makefile
+++ b/net-mgmt/netams/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Network Traffic Accounting and Monitoring Software
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
+LIB_DEPENDS=	libpcap.so:net/libpcap
 
 SSP_UNSAFE=	kernel module does not support ssp
 USE_SUBMAKE=	yes
@@ -65,22 +65,22 @@ PGSQL_FILES=	cardtool_schema-Pg.sql postgresql_schema.sql
 MAN_8=		netams.8 flowprobe.8 netamsctl.8
 
 .if ${PORT_OPTIONS:MCGI}
-RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil \
-		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Crypt-GeneratePassword>=0:${PORTSDIR}/security/p5-Crypt-GeneratePassword
-
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
+RUN_DEPENDS+=	p5-GD>=0:graphics/p5-GD \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \
+		p5-Storable>=0:devel/p5-Storable \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Crypt-GeneratePassword>=0:security/p5-Crypt-GeneratePassword
+
+LIB_DEPENDS+=	libgd.so:graphics/gd
 USES+=		jpeg
 
 . if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 . endif
 
 . if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 . endif
 .endif # CGI
 
diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index 5469f4e2fe5f..4addb40782b9 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -14,62 +14,62 @@ COMMENT=	Network discovery/management tool with web console
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-Net-SNMP>=6.0.1:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-Algorithm-Cron>=0.07:${PORTSDIR}/devel/p5-Algorithm-Cron \
-		p5-AnyEvent>=7.05:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-AnyEvent-DNS-EtcHosts>=0.0103:${PORTSDIR}/dns/p5-AnyEvent-DNS-EtcHosts \
-		p5-App-cpanminus>=1.6108:${PORTSDIR}/devel/p5-App-cpanminus \
-		p5-App-local-lib-helper>=0.07:${PORTSDIR}/devel/p5-App-local-lib-helper \
-		p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract \
-		p5-CGI-Expand>=2.05:${PORTSDIR}/www/p5-CGI-Expand \
-		p5-Data-Printer>=0:${PORTSDIR}/devel/p5-Data-Printer \
-		p5-DBIx-Class-Helpers>=2.023007:${PORTSDIR}/databases/p5-DBIx-Class-Helpers \
-		p5-Daemon-Control>=0.001.005:${PORTSDIR}/devel/p5-Daemon-Control \
-		p5-Dancer>=1.3132:${PORTSDIR}/www/p5-Dancer \
-		p5-Dancer-Plugin-DBIC>=0.2001:${PORTSDIR}/databases/p5-Dancer-Plugin-DBIC \
-		p5-Dancer-Plugin-Auth-Extensible>=0.30:${PORTSDIR}/security/p5-Dancer-Plugin-Auth-Extensible \
-		p5-Dancer-Plugin-Passphrase>=2.0.1:${PORTSDIR}/security/p5-Dancer-Plugin-Passphrase \
-		p5-Env-Path>=0:${PORTSDIR}/devel/p5-Env-Path \
-		p5-File-ShareDir>=1.03:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-File-Slurp>=9999.19:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Guard>=1.022:${PORTSDIR}/devel/p5-Guard \
-		p5-Graph>=0:${PORTSDIR}/math/p5-Graph \
-		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz \
-		p5-HTML-Parser>=3.70:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Tiny>=0.029:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-List-MoreUtils>=0.33:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Log-Message-Simple>=0:${PORTSDIR}/devel/p5-Log-Message-Simple \
-		p5-Module-Find>=0.12:${PORTSDIR}/devel/p5-Module-Find \
-		p5-Module-Load>=0.32:${PORTSDIR}/devel/p5-Module-Load \
-		p5-Moo>=1.001000:${PORTSDIR}/devel/p5-Moo \
-		p5-MCE>=1.515:${PORTSDIR}/devel/p5-MCE \
-		p5-Net-DNS>=0.72:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Net-OpenSSH>=0:${PORTSDIR}/net/p5-Net-OpenSSH \
-		p5-NetAddr-MAC>=0:${PORTSDIR}/net/p5-NetAddr-MAC \
-		p5-NetAddr-IP>=4.068:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		p5-Path-Class>=0.32:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Plack>=1.0023:${PORTSDIR}/www/p5-Plack \
-		p5-Plack-Middleware-Expires>=0.03:${PORTSDIR}/www/p5-Plack-Middleware-Expires \
-		p5-Plack-Middleware-ReverseProxy>=0.15:${PORTSDIR}/www/p5-Plack-Middleware-ReverseProxy \
-		p5-Role-Tiny>=1.002005:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Sereal>=0:${PORTSDIR}/converters/p5-Sereal \
-		p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6 \
-		p5-Starman>=0.4008:${PORTSDIR}/www/p5-Starman \
-		p5-SNMP-Info>=3.18:${PORTSDIR}/net-mgmt/p5-SNMP-Info \
-		p5-SQL-Translator>=0.11018:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-Template-Toolkit>=2.24:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Template-Plugin-CSV>=0.04:${PORTSDIR}/textproc/p5-Template-Plugin-CSV \
-		p5-Template-Plugin-Number-Format>=1.02:${PORTSDIR}/www/p5-Template-Plugin-Number-Format \
-		p5-Term-UI>=0:${PORTSDIR}/devel/p5-Term-UI \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-URL-Encode>=0.01:${PORTSDIR}/www/p5-URL-Encode \
-		p5-YAML>=0.84:${PORTSDIR}/textproc/p5-YAML \
-		p5-YAML-LibYAML>=0.41:${PORTSDIR}/textproc/p5-YAML-LibYAML
+BUILD_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
+		p5-Net-SNMP>=6.0.1:net-mgmt/p5-Net-SNMP \
+		p5-Algorithm-Cron>=0.07:devel/p5-Algorithm-Cron \
+		p5-AnyEvent>=7.05:devel/p5-AnyEvent \
+		p5-AnyEvent-DNS-EtcHosts>=0.0103:dns/p5-AnyEvent-DNS-EtcHosts \
+		p5-App-cpanminus>=1.6108:devel/p5-App-cpanminus \
+		p5-App-local-lib-helper>=0.07:devel/p5-App-local-lib-helper \
+		p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
+		p5-CGI-Expand>=2.05:www/p5-CGI-Expand \
+		p5-Data-Printer>=0:devel/p5-Data-Printer \
+		p5-DBIx-Class-Helpers>=2.023007:databases/p5-DBIx-Class-Helpers \
+		p5-Daemon-Control>=0.001.005:devel/p5-Daemon-Control \
+		p5-Dancer>=1.3132:www/p5-Dancer \
+		p5-Dancer-Plugin-DBIC>=0.2001:databases/p5-Dancer-Plugin-DBIC \
+		p5-Dancer-Plugin-Auth-Extensible>=0.30:security/p5-Dancer-Plugin-Auth-Extensible \
+		p5-Dancer-Plugin-Passphrase>=2.0.1:security/p5-Dancer-Plugin-Passphrase \
+		p5-Env-Path>=0:devel/p5-Env-Path \
+		p5-File-ShareDir>=1.03:devel/p5-File-ShareDir \
+		p5-File-Slurp>=9999.19:devel/p5-File-Slurp \
+		p5-Guard>=1.022:devel/p5-Guard \
+		p5-Graph>=0:math/p5-Graph \
+		p5-GraphViz>=0:graphics/p5-GraphViz \
+		p5-HTML-Parser>=3.70:www/p5-HTML-Parser \
+		p5-HTTP-Tiny>=0.029:www/p5-HTTP-Tiny \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
+		p5-Log-Message-Simple>=0:devel/p5-Log-Message-Simple \
+		p5-Module-Find>=0.12:devel/p5-Module-Find \
+		p5-Module-Load>=0.32:devel/p5-Module-Load \
+		p5-Moo>=1.001000:devel/p5-Moo \
+		p5-MCE>=1.515:devel/p5-MCE \
+		p5-Net-DNS>=0.72:dns/p5-Net-DNS \
+		p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH \
+		p5-NetAddr-MAC>=0:net/p5-NetAddr-MAC \
+		p5-NetAddr-IP>=4.068:net-mgmt/p5-NetAddr-IP \
+		p5-Path-Class>=0.32:devel/p5-Path-Class \
+		p5-Plack>=1.0023:www/p5-Plack \
+		p5-Plack-Middleware-Expires>=0.03:www/p5-Plack-Middleware-Expires \
+		p5-Plack-Middleware-ReverseProxy>=0.15:www/p5-Plack-Middleware-ReverseProxy \
+		p5-Role-Tiny>=1.002005:devel/p5-Role-Tiny \
+		p5-Sereal>=0:converters/p5-Sereal \
+		p5-Socket6>=0.23:net/p5-Socket6 \
+		p5-Starman>=0.4008:www/p5-Starman \
+		p5-SNMP-Info>=3.18:net-mgmt/p5-SNMP-Info \
+		p5-SQL-Translator>=0.11018:databases/p5-SQL-Translator \
+		p5-Template-Toolkit>=2.24:www/p5-Template-Toolkit \
+		p5-Template-Plugin-CSV>=0.04:textproc/p5-Template-Plugin-CSV \
+		p5-Template-Plugin-Number-Format>=1.02:www/p5-Template-Plugin-Number-Format \
+		p5-Term-UI>=0:devel/p5-Term-UI \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-URI>=0:net/p5-URI \
+		p5-URL-Encode>=0.01:www/p5-URL-Encode \
+		p5-YAML>=0.84:textproc/p5-YAML \
+		p5-YAML-LibYAML>=0.41:textproc/p5-YAML-LibYAML
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/net-mgmt/netdot/Makefile b/net-mgmt/netdot/Makefile
index b4d7fc5a983a..18ec8c9c5a31 100644
--- a/net-mgmt/netdot/Makefile
+++ b/net-mgmt/netdot/Makefile
@@ -12,34 +12,34 @@ COMMENT=	Open source tool to organize and maintain network information
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \
-		mp2bug:${PORTSDIR}/www/mod_perl2 \
-		p5-Apache-Session>=1.6:${PORTSDIR}/www/p5-Apache-Session \
-		p5-Apache-AuthCookie>=0:${PORTSDIR}/www/p5-Apache-AuthCookie \
-		p5-Apache2-SiteControl>=1.0:${PORTSDIR}/www/p5-Apache2-SiteControl \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-SQL-Translator>=0.07:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-Class-DBI>=3.0.17:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-Class-DBI-AbstractSearch>=0:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \
-		p5-SNMP-Info>=2.06:${PORTSDIR}/net-mgmt/p5-SNMP-Info \
-		p5-HTML-Mason>=1.31:${PORTSDIR}/www/p5-HTML-Mason \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-Net-IRR>=0:${PORTSDIR}/net/p5-Net-IRR \
-		p5-NetAddr-IP>=4.042:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		p5-Net-Patricia>=1.20:${PORTSDIR}/net/p5-Net-Patricia \
-		p5-Net-Appliance-Session>=3.113.610:${PORTSDIR}/net/p5-Net-Appliance-Session \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-ZoneFile-Fast>=1.12:${PORTSDIR}/dns/p5-Net-DNS-ZoneFile-Fast \
-		p5-BIND-Config-Parser>=0:${PORTSDIR}/dns/p5-BIND-Config-Parser \
-		p5-Carp-Assert>=0:${PORTSDIR}/devel/p5-Carp-Assert \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
-		p5-GraphViz>=2.02:${PORTSDIR}/graphics/p5-GraphViz \
-		rrdtool:${PORTSDIR}/databases/rrdtool \
-		netdisco-mibs>=0:${PORTSDIR}/net-mgmt/netdisco-mibs
+RUN_DEPENDS=	p5-libapreq2>=0:www/p5-libapreq2 \
+		mp2bug:www/mod_perl2 \
+		p5-Apache-Session>=1.6:www/p5-Apache-Session \
+		p5-Apache-AuthCookie>=0:www/p5-Apache-AuthCookie \
+		p5-Apache2-SiteControl>=1.0:www/p5-Apache2-SiteControl \
+		p5-URI>=0:net/p5-URI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-SQL-Translator>=0.07:databases/p5-SQL-Translator \
+		p5-Class-DBI>=3.0.17:databases/p5-Class-DBI \
+		p5-Class-DBI-AbstractSearch>=0:databases/p5-Class-DBI-AbstractSearch \
+		p5-SNMP-Info>=2.06:net-mgmt/p5-SNMP-Info \
+		p5-HTML-Mason>=1.31:www/p5-HTML-Mason \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
+		p5-Net-IRR>=0:net/p5-Net-IRR \
+		p5-NetAddr-IP>=4.042:net-mgmt/p5-NetAddr-IP \
+		p5-Net-Patricia>=1.20:net/p5-Net-Patricia \
+		p5-Net-Appliance-Session>=3.113.610:net/p5-Net-Appliance-Session \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-DNS-ZoneFile-Fast>=1.12:dns/p5-Net-DNS-ZoneFile-Fast \
+		p5-BIND-Config-Parser>=0:dns/p5-BIND-Config-Parser \
+		p5-Carp-Assert>=0:devel/p5-Carp-Assert \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Socket6>=0:net/p5-Socket6 \
+		p5-GraphViz>=2.02:graphics/p5-GraphViz \
+		rrdtool:databases/rrdtool \
+		netdisco-mibs>=0:net-mgmt/netdisco-mibs
 
 USES=		gmake perl5 shebangfix
 NO_BUILD=	yes
diff --git a/net-mgmt/netleak/Makefile b/net-mgmt/netleak/Makefile
index 3c67bc804e43..bb1b2fc84aa9 100644
--- a/net-mgmt/netleak/Makefile
+++ b/net-mgmt/netleak/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Tool to detect connectivity between network segments
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Net-PcapUtils>=0:${PORTSDIR}/net/p5-Net-PcapUtils \
-		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket \
-		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP \
-		p5-IO-Interface>=0:${PORTSDIR}/net/p5-IO-Interface \
-		p5-NetAddr-IP>0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+RUN_DEPENDS=	p5-Net-PcapUtils>=0:net/p5-Net-PcapUtils \
+		p5-NetPacket>=0:net/p5-NetPacket \
+		p5-Mail-Sendmail>=0:mail/p5-Mail-Sendmail \
+		p5-Net-RawIP>=0:net/p5-Net-RawIP \
+		p5-IO-Interface>=0:net/p5-IO-Interface \
+		p5-NetAddr-IP>0:net-mgmt/p5-NetAddr-IP
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/net-mgmt/netmagis-common/Makefile b/net-mgmt/netmagis-common/Makefile
index 6d769fbb5411..3984fc3024d9 100644
--- a/net-mgmt/netmagis-common/Makefile
+++ b/net-mgmt/netmagis-common/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	CeCILL-B Free Software License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS+=	dtplite:${PORTSDIR}/devel/tcllib
+RUN_DEPENDS+=	dtplite:devel/tcllib
 
 NO_ARCH?=	yes
 USES+=		pgsql:9.1+ tcl:85+
diff --git a/net-mgmt/netmagis-database/Makefile b/net-mgmt/netmagis-database/Makefile
index 86b9c70430f6..05a2ddef6b49 100644
--- a/net-mgmt/netmagis-database/Makefile
+++ b/net-mgmt/netmagis-database/Makefile
@@ -6,10 +6,10 @@ PKGNAMESUFFIX=	-database
 
 COMMENT=	Utilities for the netmagis database server
 
-RUN_DEPENDS=	netmagis-config:${PORTSDIR}/net-mgmt/netmagis-common \
-		pwgen:${PORTSDIR}/sysutils/pwgen \
-		tcltls>=1.4.1:${PORTSDIR}/devel/tcltls \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common \
+		pwgen:sysutils/pwgen \
+		tcltls>=1.4.1:devel/tcltls \
+		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 WANT_PGSQL+=	server pltcl
 
diff --git a/net-mgmt/netmagis-detecteq/Makefile b/net-mgmt/netmagis-detecteq/Makefile
index b013cad30b39..911e723c3b37 100644
--- a/net-mgmt/netmagis-detecteq/Makefile
+++ b/net-mgmt/netmagis-detecteq/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-detecteq
 
 COMMENT=	Files for detection of equipment modifications
 
-RUN_DEPENDS=	netmagis-config:${PORTSDIR}/net-mgmt/netmagis-common
+RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common
 
 MASTERDIR=	${.CURDIR}/../netmagis-common
 
diff --git a/net-mgmt/netmagis-metro/Makefile b/net-mgmt/netmagis-metro/Makefile
index 07bf4b7a63b0..ec997bbf7b3c 100644
--- a/net-mgmt/netmagis-metro/Makefile
+++ b/net-mgmt/netmagis-metro/Makefile
@@ -6,11 +6,11 @@ PKGNAMESUFFIX=	-metro
 
 COMMENT=	Netmagis metrology module
 
-RUN_DEPENDS+=	netmagis-config:${PORTSDIR}/net-mgmt/netmagis-common \
-		p5-DBD-Pg>0:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		p5-RRDTool-OO>=0:${PORTSDIR}/devel/p5-RRDTool-OO
+RUN_DEPENDS+=	netmagis-config:net-mgmt/netmagis-common \
+		p5-DBD-Pg>0:databases/p5-DBD-Pg \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session \
+		p5-RRDTool-OO>=0:devel/p5-RRDTool-OO
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	metro/bin/metrocreatedb metro/bin/metropoller metro/bin/metropoller-run \
diff --git a/net-mgmt/netmagis-servers/Makefile b/net-mgmt/netmagis-servers/Makefile
index fdf75c2818d9..9c73e917d693 100644
--- a/net-mgmt/netmagis-servers/Makefile
+++ b/net-mgmt/netmagis-servers/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-servers
 
 COMMENT=	Netmagis module for dhcp, bind and mail servers
 
-RUN_DEPENDS=	netmagis-config:${PORTSDIR}/net-mgmt/netmagis-common
+RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common
 
 MASTERDIR=	${.CURDIR}/../netmagis-common
 
diff --git a/net-mgmt/netmagis-topo/Makefile b/net-mgmt/netmagis-topo/Makefile
index 13d8a0f2fbe8..d44f04e7fe10 100644
--- a/net-mgmt/netmagis-topo/Makefile
+++ b/net-mgmt/netmagis-topo/Makefile
@@ -6,9 +6,9 @@ PKGNAMESUFFIX=	-topo
 
 COMMENT=	Netmagis topology module
 
-RUN_DEPENDS=	netmagis-config:${PORTSDIR}/net-mgmt/netmagis-common \
-		rancid-run:${PORTSDIR}/net-mgmt/rancid \
-		fping:${PORTSDIR}/net/fping
+RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common \
+		rancid-run:net-mgmt/rancid \
+		fping:net/fping
 
 NO_ARCH=	# no
 USE_RC_SUBR=	topographd toposendd
diff --git a/net-mgmt/netmagis-utils/Makefile b/net-mgmt/netmagis-utils/Makefile
index df76fac83294..59070544ee31 100644
--- a/net-mgmt/netmagis-utils/Makefile
+++ b/net-mgmt/netmagis-utils/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-utils
 
 COMMENT=	Netmagis command-line utilities
 
-RUN_DEPENDS=	netmagis-config:${PORTSDIR}/net-mgmt/netmagis-common
+RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common
 
 MASTERDIR=	${.CURDIR}/../netmagis-common
 
diff --git a/net-mgmt/netmagis-www/Makefile b/net-mgmt/netmagis-www/Makefile
index ca13b39acab6..cf7f3c1b1c44 100644
--- a/net-mgmt/netmagis-www/Makefile
+++ b/net-mgmt/netmagis-www/Makefile
@@ -6,12 +6,12 @@ PKGNAMESUFFIX=	-www
 
 COMMENT=	Netmagis web module
 
-RUN_DEPENDS=	netmagis-config:${PORTSDIR}/net-mgmt/netmagis-common \
-		dot:${PORTSDIR}/graphics/graphviz \
-		pwgen:${PORTSDIR}/sysutils/pwgen \
-		tcltls>=1.4.1:${PORTSDIR}/devel/tcltls \
-		tDOM>=0.8.0:${PORTSDIR}/www/tdom \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common \
+		dot:graphics/graphviz \
+		pwgen:sysutils/pwgen \
+		tcltls>=1.4.1:devel/tcltls \
+		tDOM>=0.8.0:www/tdom \
+		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 NO_ARCH=	# no
 USE_TEX=	full
diff --git a/net-mgmt/netmond/Makefile b/net-mgmt/netmond/Makefile
index f8418589ecc5..b7af42c4990d 100644
--- a/net-mgmt/netmond/Makefile
+++ b/net-mgmt/netmond/Makefile
@@ -33,7 +33,7 @@ PORTDOCS=	README README.ru CHANGES README.port.eng README.port.ru index.html net
 OPTIONS_DEFINE=	DOCS GD
 OPTIONS_SUB=	yes
 
-GD_LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+GD_LIB_DEPENDS=	libgd.so:graphics/gd
 GD_CONFIGURE_OFF=	--without-ifgraph
 
 DOCS_DISTFILES= ${PORTNAME}-2.2-b6.docs${EXTRACT_SUFX}:docs
diff --git a/net-mgmt/netwag/Makefile b/net-mgmt/netwag/Makefile
index 868a0dfd01b2..616c96e23f0f 100644
--- a/net-mgmt/netwag/Makefile
+++ b/net-mgmt/netwag/Makefile
@@ -13,10 +13,10 @@ DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Graphical front end for netwox
 
-BUILD_DEPENDS=	netwox:${PORTSDIR}/net-mgmt/netwox \
-		wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
-		appres:${PORTSDIR}/x11/appres \
-		xterm:${PORTSDIR}/x11/xterm
+BUILD_DEPENDS=	netwox:net-mgmt/netwox \
+		wish8.4:x11-toolkits/tk84 \
+		appres:x11/appres \
+		xterm:x11/xterm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/net-mgmt/netwox/Makefile b/net-mgmt/netwox/Makefile
index 3d392d8fa990..fe6e57e6eb89 100644
--- a/net-mgmt/netwox/Makefile
+++ b/net-mgmt/netwox/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwox a network testing toolbox
 
-BUILD_DEPENDS=	netwib-config:${PORTSDIR}/net/netwib
+BUILD_DEPENDS=	netwib-config:net/netwib
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index 9c6f4dec1d80..922c7785e4cc 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Network monitoring system
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libjansson.so:${PORTSDIR}/devel/jansson \
-		libtre.so:${PORTSDIR}/textproc/libtre
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libjansson.so:devel/jansson \
+		libtre.so:textproc/libtre
 
 PORTSCOUT=	limit:^1\.
 
@@ -41,7 +41,7 @@ PGSQL_USES=		pgsql
 SQLITE_CONFIGURE_ON=	--with-sqlite
 SQLITE_USE=		SQLITE=yes
 ODBC_CONFIGURE_ON=	--with-odbc
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 USE_OPENSSL=	yes
 USES=		gmake iconv libtool perl5
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index 23689af5e9e5..8db27e4e271e 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -80,13 +80,13 @@ CONFIGURE_ARGS+=	--disable-nftrack
 
 .if ${PORT_OPTIONS:MNFPROFILE} || ${PORT_OPTIONS:MNFTRACK}
 CONFIGURE_ARGS+=	--with-rrdpath=${LOCALBASE}
-BUILD_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
-RUN_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
+BUILD_DEPENDS+=	rrdtool:databases/rrdtool
+RUN_DEPENDS+=	rrdtool:databases/rrdtool
 .endif
 
 #flow-tools support
 .if ${PORT_OPTIONS:MFT2NFDUMP}
-BUILD_DEPENDS+=		flow-cat:${PORTSDIR}/net-mgmt/flow-tools
+BUILD_DEPENDS+=		flow-cat:net-mgmt/flow-tools
 CONFIGURE_ARGS+=	--enable-ftconv --with-ftpath=${LOCALBASE}
 PLIST_FILES+=	bin/ft2nfdump man/man1/ft2nfdump.1.gz
 .endif
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index 663d3af06687..939080a13e87 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Web based frontend to nfdump netflow collector
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/BSD-license.txt
 
-RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
-		nfdump>=0:${PORTSDIR}/net-mgmt/nfdump
+RUN_DEPENDS=	rrdtool>=0:databases/rrdtool \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-Socket6>=0:net/p5-Socket6 \
+		nfdump>=0:net-mgmt/nfdump
 
 USES=		cpe iconv shebangfix perl5
 CPE_VENDOR=	nfsen
diff --git a/net-mgmt/nrpe/Makefile b/net-mgmt/nrpe/Makefile
index 671057141bc7..caebc11e6c52 100644
--- a/net-mgmt/nrpe/Makefile
+++ b/net-mgmt/nrpe/Makefile
@@ -37,8 +37,8 @@ SSL_CFLAGS=		-I${OPENSSLINC}
 ARGS_CONFIGURE_ON=	--enable-command-args
 ARGS_CONFIGURE_OFF=	--disable-command-args
 
-MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins
-NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
+MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
+NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 
 NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
diff --git a/net-mgmt/nsca-ng/Makefile b/net-mgmt/nsca-ng/Makefile
index 3132d29537e7..5ac16faef6b3 100644
--- a/net-mgmt/nsca-ng/Makefile
+++ b/net-mgmt/nsca-ng/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Nagios Service Check Acceptor
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 .if !defined(PKGNAMESUFFIX)
-LIB_DEPENDS+=	libconfuse.so:${PORTSDIR}/devel/libconfuse
+LIB_DEPENDS+=	libconfuse.so:devel/libconfuse
 .endif
 
 CONFLICTS?=	nsca-2.* nsca27-2.*
diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index 3a753fd206da..ef0dfc3334c1 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Nagios Service Check Acceptor
 LICENSE=	GPLv2
 
 #.if !defined(_BUILDING_NSCA_CLIENT)
-#RUN_DEPENDS=	nagios:${PORTSDIR}/net-mgmt/nagios
+#RUN_DEPENDS=	nagios:net-mgmt/nagios
 #.endif
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt
 
 .if !defined(_BUILDING_NSCA_CLIENT)
 CONFLICTS=	nsca-2.7.* nsca27-*
diff --git a/net-mgmt/nsca27/Makefile b/net-mgmt/nsca27/Makefile
index f4a9094447ec..6c01a620396e 100644
--- a/net-mgmt/nsca27/Makefile
+++ b/net-mgmt/nsca27/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Nagios Service Check Acceptor
 LICENSE=	GPLv2
 
 #.if !defined(_BUILDING_NSCA_CLIENT)
-#RUN_DEPENDS=	nagios:${PORTSDIR}/net-mgmt/nagios
+#RUN_DEPENDS=	nagios:net-mgmt/nagios
 #.endif
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt
 
 .if !defined(_BUILDING_NSCA_CLIENT)
 PKGNAMESUFFIX=	27
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile
index 4e591edb3ef7..dc4acc2ffad1 100644
--- a/net-mgmt/observium/Makefile
+++ b/net-mgmt/observium/Makefile
@@ -58,15 +58,15 @@ IGNORE_WITH_PHP=	70
 
 NO_BUILD=	yes
 
-RUN_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool \
-		dot:${PORTSDIR}/graphics/graphviz \
-		Magick-config:${PORTSDIR}/graphics/ImageMagick \
-		mtr:${PORTSDIR}/net/mtr-nox11 \
-		${LOCALBASE}/share/pear/Net/IPv4.php:${PORTSDIR}/net/pear-Net_IPv4 \
-		${LOCALBASE}/share/pear/Net/IPv6.php:${PORTSDIR}/net/pear-Net_IPv6 \
-		snmpget:${PORTSDIR}/net-mgmt/net-snmp \
-		sudo:${PORTSDIR}/security/sudo
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+RUN_DEPENDS+=	rrdtool:databases/rrdtool \
+		dot:graphics/graphviz \
+		Magick-config:graphics/ImageMagick \
+		mtr:net/mtr-nox11 \
+		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4 \
+		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6 \
+		snmpget:net-mgmt/net-snmp \
+		sudo:security/sudo
+LIB_DEPENDS+=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	APACHEMOD FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER SVN WMIC
 OPTIONS_DEFAULT=	APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SVN WMIC
@@ -77,14 +77,14 @@ MYSQLD_DESC=	Use local MySQL server
 WMIC_DESC=	Enable support for WMI polling
 PYPOLLER_DESC=	Enable Python Poller Wrapper
 
-FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
-IPMITOOL_RUN_DEPENDS=	ipmitool:${PORTSDIR}/sysutils/ipmitool
-LIBVIRT_RUN_DEPENDS=	virsh:${PORTSDIR}/devel/libvirt
-NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
-NMAP_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
-PYPOLLER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb
-SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
-WMIC_RUN_DEPENDS=	wmic:${PORTSDIR}/net-mgmt/wmi-client
+FPING_RUN_DEPENDS=	fping:net/fping
+IPMITOOL_RUN_DEPENDS=	ipmitool:sysutils/ipmitool
+LIBVIRT_RUN_DEPENDS=	virsh:devel/libvirt
+NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
+NMAP_RUN_DEPENDS=	nmap:security/nmap
+PYPOLLER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
+SVN_RUN_DEPENDS=	svn:devel/subversion
+WMIC_RUN_DEPENDS=	wmic:net-mgmt/wmi-client
 
 .include <bsd.port.options.mk>
 
diff --git a/net-mgmt/ocsinventory-agent/Makefile b/net-mgmt/ocsinventory-agent/Makefile
index 3cb96ce4b398..d919a81e75ce 100644
--- a/net-mgmt/ocsinventory-agent/Makefile
+++ b/net-mgmt/ocsinventory-agent/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Keep track of the computers configuration and software
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode \
-		lspci:${PORTSDIR}/sysutils/pciutils \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	dmidecode:sysutils/dmidecode \
+		lspci:sysutils/pciutils \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	postinst.pl
@@ -43,16 +43,16 @@ SNMP_DESC=	Scan network devices using SNMP
 # define default options
 OPTIONS_DEFAULT=	SSL SNMP
 
-DAEMON_RUN_DEPENDS=	p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-			p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
-IPMI_RUN_DEPENDS=	ipmitool:${PORTSDIR}/sysutils/ipmitool
-SSL_RUN_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-			p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https
-PRINTER_RUN_DEPENDS=	p5-Net-CUPS>=0:${PORTSDIR}/print/p5-Net-CUPS
-SNMP_RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-			p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-			p5-Net-Ping>=0:${PORTSDIR}/net/p5-Net-Ping \
-			p5-Nmap-Parser>=0:${PORTSDIR}/security/p5-Nmap-Parser \
-			nmap:${PORTSDIR}/security/nmap
+DAEMON_RUN_DEPENDS=	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+			p5-Proc-PID-File>=0:devel/p5-Proc-PID-File
+IPMI_RUN_DEPENDS=	ipmitool:sysutils/ipmitool
+SSL_RUN_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+			p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
+PRINTER_RUN_DEPENDS=	p5-Net-CUPS>=0:print/p5-Net-CUPS
+SNMP_RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+			p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \
+			p5-Net-Ping>=0:net/p5-Net-Ping \
+			p5-Nmap-Parser>=0:security/p5-Nmap-Parser \
+			nmap:security/nmap
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ocsinventory-ng/Makefile b/net-mgmt/ocsinventory-ng/Makefile
index 3862a8f2d3ee..793bc7143448 100644
--- a/net-mgmt/ocsinventory-ng/Makefile
+++ b/net-mgmt/ocsinventory-ng/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Open Computer and Software Inventory Next Generation
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Compress-Raw-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-XML-Entities>=0:${PORTSDIR}/textproc/p5-XML-Entities
+RUN_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Compress-Raw-Zlib>=0:archivers/p5-Compress-Raw-Zlib \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-Apache-DBI>=0:www/p5-Apache-DBI \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-XML-Entities>=0:textproc/p5-XML-Entities
 
 USES=		perl5
 USE_APACHE_RUN=	22+
diff --git a/net-mgmt/p5-AnyEvent-SNMP/Makefile b/net-mgmt/p5-AnyEvent-SNMP/Makefile
index 4794aa9e36c3..1bcac23d31b3 100644
--- a/net-mgmt/p5-AnyEvent-SNMP/Makefile
+++ b/net-mgmt/p5-AnyEvent-SNMP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Adaptor to integrate Net::SNMP into AnyEvent
 
-RUN_DEPENDS=	p5-AnyEvent>=5.23:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Net-SNMP>=6.0.1:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-common-sense>=3.4:${PORTSDIR}/devel/p5-common-sense
+RUN_DEPENDS=	p5-AnyEvent>=5.23:devel/p5-AnyEvent \
+		p5-Net-SNMP>=6.0.1:net-mgmt/p5-Net-SNMP \
+		p5-common-sense>=3.4:devel/p5-common-sense
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-BigIP-iControl/Makefile b/net-mgmt/p5-BigIP-iControl/Makefile
index 625260511ba6..a58f077a12dc 100644
--- a/net-mgmt/p5-BigIP-iControl/Makefile
+++ b/net-mgmt/p5-BigIP-iControl/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Perl interface to the F5 iControl API
 
-RUN_DEPENDS=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Cflow/Makefile b/net-mgmt/p5-Cflow/Makefile
index 5ab1e0436c47..859c90057369 100644
--- a/net-mgmt/p5-Cflow/Makefile
+++ b/net-mgmt/p5-Cflow/Makefile
@@ -21,10 +21,10 @@ FLOW_TOOLS_NG_DESC=	Enable flow-tools-ng support
 USES=		perl5
 USE_PERL5=	configure
 
-FLOW_TOOLS_BUILD_DEPENDS=	${LOCALBASE}/lib/libft.a:${PORTSDIR}/net-mgmt/flow-tools
-FLOW_TOOLS_RUN_DEPENDS=	${LOCALBASE}/lib/libft.a:${PORTSDIR}/net-mgmt/flow-tools
-FLOW_TOOLS_NG_BUILD_DEPENDS=	${LOCALBASE}/lib/libft.a:${PORTSDIR}/net-mgmt/flow-tools-ng
-FLOW_TOOLS_NG_RUN_DEPENDS=	${LOCALBASE}/lib/libft.a:${PORTSDIR}/net-mgmt/flow-tools-ng
+FLOW_TOOLS_BUILD_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools
+FLOW_TOOLS_RUN_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools
+FLOW_TOOLS_NG_BUILD_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools-ng
+FLOW_TOOLS_NG_RUN_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools-ng
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\.\./\.\./lib|${LOCALBASE}/lib|g' ${WRKSRC}/Makefile.PL
diff --git a/net-mgmt/p5-Cisco-CopyConfig/Makefile b/net-mgmt/p5-Cisco-CopyConfig/Makefile
index b27407a8656c..9b3e76350baa 100644
--- a/net-mgmt/p5-Cisco-CopyConfig/Makefile
+++ b/net-mgmt/p5-Cisco-CopyConfig/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rihaz.jerrin@gmail.com
 COMMENT=	Cisco IOS running-config manipulation
 
-BUILD_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+BUILD_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
+RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-Cisco-Reconfig/Makefile b/net-mgmt/p5-Cisco-Reconfig/Makefile
index ceb39be5f96d..4cca7953d9fb 100644
--- a/net-mgmt/p5-Cisco-Reconfig/Makefile
+++ b/net-mgmt/p5-Cisco-Reconfig/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Parse and generate Cisco configuration files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+BUILD_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net-mgmt/p5-Data-Validate-IP/Makefile b/net-mgmt/p5-Data-Validate-IP/Makefile
index 0e28dbe67d2a..32b00d8c5e0b 100644
--- a/net-mgmt/p5-Data-Validate-IP/Makefile
+++ b/net-mgmt/p5-Data-Validate-IP/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Common data validation methods for IPs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-NetAddr-IP>=4:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-NetAddr-IP>=4:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Taint>=0:${PORTSDIR}/devel/p5-Test-Taint
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Taint>=0:devel/p5-Test-Taint
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
index f26e6ee0f5f7..0a41133d6575 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Network discovery support for FusionInventory Agent
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-FusionInventory-Agent>=2.2.0:${PORTSDIR}/net-mgmt/p5-FusionInventory-Agent \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-Net-NBName>=0:${PORTSDIR}/net/p5-Net-NBName \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-XML-TreePP>=0.26:${PORTSDIR}/textproc/p5-XML-TreePP
+BUILD_DEPENDS=	p5-FusionInventory-Agent>=2.2.0:net-mgmt/p5-FusionInventory-Agent \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-Net-NBName>=0:net/p5-Net-NBName \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-XML-TreePP>=0.26:textproc/p5-XML-TreePP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile
index 0df3d050cb9f..82bd87a5ad60 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile
@@ -14,11 +14,11 @@ COMMENT=	SNMP support for FusionInventory Agent
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-FusionInventory-Agent>=0:${PORTSDIR}/net-mgmt/p5-FusionInventory-Agent \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-FusionInventory-Agent>=0:net-mgmt/p5-FusionInventory-Agent \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-FusionInventory-Agent/Makefile b/net-mgmt/p5-FusionInventory-Agent/Makefile
index cb95586b4056..026c6497c5b4 100644
--- a/net-mgmt/p5-FusionInventory-Agent/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent/Makefile
@@ -13,30 +13,30 @@ COMMENT=	Agent for OCS Inventory server and FusionInventory for GLPI servers
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=6.59:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-XML-TreePP>=0:${PORTSDIR}/textproc/p5-XML-TreePP
+BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=6.59:devel/p5-ExtUtils-MakeMaker \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-XML-TreePP>=0:textproc/p5-XML-TreePP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-POE-Component-Client-Ping>=0:${PORTSDIR}/net/p5-POE-Component-Client-Ping \
-		p5-HTTP-Proxy>=0:${PORTSDIR}/www/p5-HTTP-Proxy \
-		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-HTTP-Server-Simple-Authen>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple-Authen \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-Test-Compile>=0:${PORTSDIR}/devel/p5-Test-Compile \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Simple>=0.93:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
+		p5-HTTP-Proxy>=0:www/p5-HTTP-Proxy \
+		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-HTTP-Server-Simple-Authen>=0:www/p5-HTTP-Server-Simple-Authen \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-IO-Capture>=0:devel/p5-IO-Capture \
+		p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-Test-Compile>=0:devel/p5-Test-Compile \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-MockModule>=0:devel/p5-Test-MockModule \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Simple>=0.93:devel/p5-Test-Simple
 
 CONFLICTS=	p5-FusionInventory-Agent-Task-NetDiscovery-* \
 		p5-FusionInventory-Agent-Task-SNMPQuery-*
@@ -60,30 +60,30 @@ USES=		gmake perl5
 USE_PERL5=	configure
 USE_RC_SUBR=    fusioninventory
 
-CUPS_RUN_DEPENDS=	p5-Net-CUPS>=0.6:${PORTSDIR}/print/p5-Net-CUPS
-DAEMON_RUN_DEPENDS=	p5-HTTP-Daemon>=0:${PORTSDIR}/www/p5-HTTP-Daemon \
-			p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-			p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
-DEPLOY_RUN_DEPENDS=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract \
-			p5-SHA>=0:${PORTSDIR}/security/p5-SHA \
-			p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-			p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-			p5-POE-Component-Client-Ping>=0:${PORTSDIR}/net/p5-POE-Component-Client-Ping \
-			p5-URI-Escape-XS>=0:${PORTSDIR}/www/p5-URI-Escape-XS
+CUPS_RUN_DEPENDS=	p5-Net-CUPS>=0.6:print/p5-Net-CUPS
+DAEMON_RUN_DEPENDS=	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
+			p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+			p5-Proc-PID-File>=0:devel/p5-Proc-PID-File
+DEPLOY_RUN_DEPENDS=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
+			p5-SHA>=0:security/p5-SHA \
+			p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+			p5-JSON>=0:converters/p5-JSON \
+			p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
+			p5-URI-Escape-XS>=0:www/p5-URI-Escape-XS
 # Wants URI::Escape, ports tree has URI::Escape::XS, seems drop-in replacement
-DMIDECODE_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode
-NETDISC_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-			p5-Net-NBName>=0:${PORTSDIR}/net/p5-Net-NBName \
-			p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-			p5-Thread-Queue>=0:${PORTSDIR}/devel/p5-Thread-Queue
-NETINV_RUN_DEPENDS=	p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES \
-			p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-			p5-Thread-Queue>=0:${PORTSDIR}/devel/p5-Thread-Queue
-PCIUTILS_RUN_DEPENDS+=	lspci:${PORTSDIR}/sysutils/pciutils
-SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=1.14:${PORTSDIR}/security/p5-IO-Socket-SSL \
-			p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https
-WOL_RUN_DEPENDS=	p5-Net-Write>=0:${PORTSDIR}/net/p5-Net-Write
-ZLIB_RUN_DEPENDS=	p5-Compress-Raw-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib
+DMIDECODE_RUN_DEPENDS=	dmidecode:sysutils/dmidecode
+NETDISC_RUN_DEPENDS=	nmap:security/nmap \
+			p5-Net-NBName>=0:net/p5-Net-NBName \
+			p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+			p5-Thread-Queue>=0:devel/p5-Thread-Queue
+NETINV_RUN_DEPENDS=	p5-Crypt-DES>=0:security/p5-Crypt-DES \
+			p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+			p5-Thread-Queue>=0:devel/p5-Thread-Queue
+PCIUTILS_RUN_DEPENDS+=	lspci:sysutils/pciutils
+SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=1.14:security/p5-IO-Socket-SSL \
+			p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
+WOL_RUN_DEPENDS=	p5-Net-Write>=0:net/p5-Net-Write
+ZLIB_RUN_DEPENDS=	p5-Compress-Raw-Zlib>=0:archivers/p5-Compress-Raw-Zlib
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f \( -name '*.orig' \) -delete
diff --git a/net-mgmt/p5-GRNOC-Config/Makefile b/net-mgmt/p5-GRNOC-Config/Makefile
index 46620ce07b86..e1885856042c 100644
--- a/net-mgmt/p5-GRNOC-Config/Makefile
+++ b/net-mgmt/p5-GRNOC-Config/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Module to allow everyone to access config files
 
-BUILD_DEPENDS=	p5-XML-LibXML>=2:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-XPath>=1:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-XML-Simple>=2:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-XML-LibXML>=2:textproc/p5-XML-LibXML \
+		p5-XML-XPath>=1:textproc/p5-XML-XPath \
+		p5-XML-Simple>=2:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-GRNOC-TL1/Makefile b/net-mgmt/p5-GRNOC-TL1/Makefile
index b22b13835ff4..4f7c76d9d052 100644
--- a/net-mgmt/p5-GRNOC-TL1/Makefile
+++ b/net-mgmt/p5-GRNOC-TL1/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Retrieve data from different models of TL1 devices
 
-BUILD_DEPENDS=	p5-Date-Calc>0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Net-SSH-Expect>0:${PORTSDIR}/net/p5-Net-SSH-Expect \
-		p5-Net-Telnet>0:${PORTSDIR}/net/p5-Net-Telnet
+BUILD_DEPENDS=	p5-Date-Calc>0:devel/p5-Date-Calc \
+		p5-Net-SSH-Expect>0:net/p5-Net-SSH-Expect \
+		p5-Net-Telnet>0:net/p5-Net-Telnet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Monitoring-Plugin/Makefile b/net-mgmt/p5-Monitoring-Plugin/Makefile
index 5630fd213e81..2a489cbea158 100644
--- a/net-mgmt/p5-Monitoring-Plugin/Makefile
+++ b/net-mgmt/p5-Monitoring-Plugin/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Modules to streamline writing Monitoring plugins
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Math-Calc-Units>=0:${PORTSDIR}/math/p5-Math-Calc-Units \
-		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Math-Calc-Units>=0:math/p5-Math-Calc-Units \
+		p5-Config-Tiny>=0:devel/p5-Config-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Nagios-Object/Makefile b/net-mgmt/p5-Nagios-Object/Makefile
index 27b1e62c10d1..e7836779e8fd 100644
--- a/net-mgmt/p5-Nagios-Object/Makefile
+++ b/net-mgmt/p5-Nagios-Object/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl objects to represent Nagios configuration
 
-BUILD_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Module-Build>=0.3607:${PORTSDIR}/devel/p5-Module-Build \
-		p5-Data-Dumper>=2.126:${PORTSDIR}/devel/p5-Data-Dumper \
-		p5-List-Compare>=0.37:${PORTSDIR}/misc/p5-List-Compare \
-		p5-Test-Simple>=0.94:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-NoWarnings>=1.01:${PORTSDIR}/devel/p5-Test-NoWarnings
+BUILD_DEPENDS=	p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+		p5-Module-Build>=0.3607:devel/p5-Module-Build \
+		p5-Data-Dumper>=2.126:devel/p5-Data-Dumper \
+		p5-List-Compare>=0.37:misc/p5-List-Compare \
+		p5-Test-Simple>=0.94:devel/p5-Test-Simple \
+		p5-Test-NoWarnings>=1.01:devel/p5-Test-NoWarnings
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile b/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile
index ac1c6a70d642..9fd45a59f97f 100644
--- a/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	thompsa@FreeBSD.org
 COMMENT=	Module to check beanstalkd via nagios
 
-BUILD_DEPENDS=	p5-Nagios-Plugin>=0:${PORTSDIR}/net-mgmt/p5-Nagios-Plugin \
-		p5-Beanstalk-Client>=0:${PORTSDIR}/net/p5-Beanstalk-Client
+BUILD_DEPENDS=	p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
+		p5-Beanstalk-Client>=0:net/p5-Beanstalk-Client
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile b/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
index 0812f66d6d5f..f6c65b1ab3a6 100644
--- a/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Nagios plugin to observe LDAP
 USES=		perl5
 USE_PERL5=	configure
 
-BUILD_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Nagios-Plugin>=0:${PORTSDIR}/net-mgmt/p5-Nagios-Plugin \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes \
+		p5-DateTime>=0:devel/p5-DateTime
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/net-mgmt/p5-Nagios-Plugin/Makefile b/net-mgmt/p5-Nagios-Plugin/Makefile
index cffe76f88588..d332b198707b 100644
--- a/net-mgmt/p5-Nagios-Plugin/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gjb@FreeBSD.org
 COMMENT=	Modules to streamline writing Nagios plugins
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Math-Calc-Units>=0:${PORTSDIR}/math/p5-Math-Calc-Units \
-		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Math-Calc-Units>=0:math/p5-Math-Calc-Units \
+		p5-Config-Tiny>=0:devel/p5-Config-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
index 89e597a6668d..88ede00d4fbc 100644
--- a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
+++ b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Module to check memcached via nagios
 USES=		perl5 shebangfix
 USE_PERL5=	configure
 
-BUILD_DEPENDS=	p5-Nagios-Plugin>=0:${PORTSDIR}/net-mgmt/p5-Nagios-Plugin \
-		p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached \
-		p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan
+BUILD_DEPENDS=	p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
+		p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
+		p5-Carp-Clan>=0:devel/p5-Carp-Clan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTDOCS=	Changes README
diff --git a/net-mgmt/p5-Net-ACL/Makefile b/net-mgmt/p5-Net-ACL/Makefile
index 2678be0c8fda..04ae4c1fa9e1 100644
--- a/net-mgmt/p5-Net-ACL/Makefile
+++ b/net-mgmt/p5-Net-ACL/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Class representing a generic access-list/route-map
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cisco-Reconfig>=0.05:${PORTSDIR}/net-mgmt/p5-Cisco-Reconfig \
-		p5-IO-String>=1.02:${PORTSDIR}/devel/p5-IO-String \
-		p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
+BUILD_DEPENDS=	p5-Cisco-Reconfig>=0.05:net-mgmt/p5-Cisco-Reconfig \
+		p5-IO-String>=1.02:devel/p5-IO-String \
+		p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Signature>=1.04:${PORTSDIR}/devel/p5-Test-Signature
+TEST_DEPENDS=	p5-Test-Signature>=1.04:devel/p5-Test-Signature
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile b/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile
index a4f93e796add..c719d4d7aead 100644
--- a/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile
+++ b/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Routines useful for checking data against the spamhaus blacklists
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.72:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0.72:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Net-Abuse-Utils/Makefile b/net-mgmt/p5-Net-Abuse-Utils/Makefile
index a33926289d36..00aa91db1049 100644
--- a/net-mgmt/p5-Net-Abuse-Utils/Makefile
+++ b/net-mgmt/p5-Net-Abuse-Utils/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Routines useful for processing network abuse
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-Net-Whois-IP>=1.11:${PORTSDIR}/net/p5-Net-Whois-IP
+BUILD_DEPENDS=	p5-Email-Address>=0:mail/p5-Email-Address \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-Net-Whois-IP>=1.11:net/p5-Net-Whois-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Net-ILO/Makefile b/net-mgmt/p5-Net-ILO/Makefile
index 303bf4a842bf..e8afecab3282 100644
--- a/net-mgmt/p5-Net-ILO/Makefile
+++ b/net-mgmt/p5-Net-ILO/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Interface to HP Integrated Lights-Out
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
+		p5-XML-Simple>0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net-mgmt/p5-Net-IP-Resolver/Makefile b/net-mgmt/p5-Net-IP-Resolver/Makefile
index d36ea0cd5713..917e351a51a7 100644
--- a/net-mgmt/p5-Net-IP-Resolver/Makefile
+++ b/net-mgmt/p5-Net-IP-Resolver/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Net::IP::Resolver - Resolve IPs to a particular network
 
-BUILD_DEPENDS=	p5-Net-IP-Match-XS>=0.03:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-XS \
-		p5-ExtUtils-AutoInstall>0:${PORTSDIR}/devel/p5-ExtUtils-AutoInstall
-RUN_DEPENDS=	p5-Net-IP-Match-XS>=0.03:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-XS
+BUILD_DEPENDS=	p5-Net-IP-Match-XS>=0.03:net-mgmt/p5-Net-IP-Match-XS \
+		p5-ExtUtils-AutoInstall>0:devel/p5-ExtUtils-AutoInstall
+RUN_DEPENDS=	p5-Net-IP-Match-XS>=0.03:net-mgmt/p5-Net-IP-Match-XS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-Net-IPv6Addr/Makefile b/net-mgmt/p5-Net-IPv6Addr/Makefile
index 7d879a316e85..089dcfad0f1a 100644
--- a/net-mgmt/p5-Net-IPv6Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv6Addr/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl extension for manipulating IPv6 addresses
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-IPv4Addr>=0:${PORTSDIR}/net-mgmt/p5-Net-IPv4Addr \
-		p5-Math-Base85>=0:${PORTSDIR}/math/p5-Math-Base85
+BUILD_DEPENDS=	p5-Net-IPv4Addr>=0:net-mgmt/p5-Net-IPv4Addr \
+		p5-Math-Base85>=0:math/p5-Math-Base85
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Net-NSCA-Client/Makefile b/net-mgmt/p5-Net-NSCA-Client/Makefile
index 774cfe3ed618..e0629784a5e5 100644
--- a/net-mgmt/p5-Net-NSCA-Client/Makefile
+++ b/net-mgmt/p5-Net-NSCA-Client/Makefile
@@ -10,36 +10,36 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Perl extension for sending passive service checks to nagios
 
-RUN_DEPENDS=	p5-Const-Fast>=0.013:${PORTSDIR}/devel/p5-Const-Fast \
-		p5-Convert-Binary-C>=0.76:${PORTSDIR}/converters/p5-Convert-Binary-C \
-		p5-Data-Rand>=0.0.4:${PORTSDIR}/devel/p5-Data-Rand \
-		p5-Data-Rand-Obscure>=0.021:${PORTSDIR}/devel/p5-Data-Rand-Obscure \
-		p5-Data-Validate-Domain>=0.10:${PORTSDIR}/dns/p5-Data-Validate-Domain \
-		p5-Digest-CRC>=0.18:${PORTSDIR}/security/p5-Digest-CRC \
-		p5-Moose>=0.89:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.05:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-MooseX-StrictConstructor>=0.08:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-MooseX-Types>=0.35:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-PortNumber>=0.02:${PORTSDIR}/devel/p5-MooseX-Types-PortNumber \
-		p5-namespace-clean>=0.04:${PORTSDIR}/devel/p5-namespace-clean
-BUILD_DEPENDS=	p5-Const-Fast>=0.013:${PORTSDIR}/devel/p5-Const-Fast \
-		p5-Convert-Binary-C>=0.76:${PORTSDIR}/converters/p5-Convert-Binary-C \
-		p5-Data-Rand>=0.0.4:${PORTSDIR}/devel/p5-Data-Rand \
-		p5-Data-Rand-Obscure>=0.021:${PORTSDIR}/devel/p5-Data-Rand-Obscure \
-		p5-Data-Section>=0.101621:${PORTSDIR}/devel/p5-Data-Section \
-		p5-Data-Validate-Domain>=0.10:${PORTSDIR}/dns/p5-Data-Validate-Domain \
-		p5-Digest-CRC>=0.18:${PORTSDIR}/security/p5-Digest-CRC \
-		p5-Moose>=0.89:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.05:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-MooseX-StrictConstructor>=0.08:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-MooseX-Types>=0.35:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-PortNumber>=0.02:${PORTSDIR}/devel/p5-MooseX-Types-PortNumber \
-		p5-namespace-clean>=0.04:${PORTSDIR}/devel/p5-namespace-clean
-TEST_DEPENDS=	p5-Test-Class>=0.37:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Command>=0.08:${PORTSDIR}/devel/p5-Test-Command \
-		p5-Test-Fatal>=0.010:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0.06:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-TCP>=1.17:${PORTSDIR}/devel/p5-Test-TCP
+RUN_DEPENDS=	p5-Const-Fast>=0.013:devel/p5-Const-Fast \
+		p5-Convert-Binary-C>=0.76:converters/p5-Convert-Binary-C \
+		p5-Data-Rand>=0.0.4:devel/p5-Data-Rand \
+		p5-Data-Rand-Obscure>=0.021:devel/p5-Data-Rand-Obscure \
+		p5-Data-Validate-Domain>=0.10:dns/p5-Data-Validate-Domain \
+		p5-Digest-CRC>=0.18:security/p5-Digest-CRC \
+		p5-Moose>=0.89:devel/p5-Moose \
+		p5-MooseX-Clone>=0.05:devel/p5-MooseX-Clone \
+		p5-MooseX-StrictConstructor>=0.08:devel/p5-MooseX-StrictConstructor \
+		p5-MooseX-Types>=0.35:devel/p5-MooseX-Types \
+		p5-MooseX-Types-PortNumber>=0.02:devel/p5-MooseX-Types-PortNumber \
+		p5-namespace-clean>=0.04:devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Const-Fast>=0.013:devel/p5-Const-Fast \
+		p5-Convert-Binary-C>=0.76:converters/p5-Convert-Binary-C \
+		p5-Data-Rand>=0.0.4:devel/p5-Data-Rand \
+		p5-Data-Rand-Obscure>=0.021:devel/p5-Data-Rand-Obscure \
+		p5-Data-Section>=0.101621:devel/p5-Data-Section \
+		p5-Data-Validate-Domain>=0.10:dns/p5-Data-Validate-Domain \
+		p5-Digest-CRC>=0.18:security/p5-Digest-CRC \
+		p5-Moose>=0.89:devel/p5-Moose \
+		p5-MooseX-Clone>=0.05:devel/p5-MooseX-Clone \
+		p5-MooseX-StrictConstructor>=0.08:devel/p5-MooseX-StrictConstructor \
+		p5-MooseX-Types>=0.35:devel/p5-MooseX-Types \
+		p5-MooseX-Types-PortNumber>=0.02:devel/p5-MooseX-Types-PortNumber \
+		p5-namespace-clean>=0.04:devel/p5-namespace-clean
+TEST_DEPENDS=	p5-Test-Class>=0.37:devel/p5-Test-Class \
+		p5-Test-Command>=0.08:devel/p5-Test-Command \
+		p5-Test-Fatal>=0.010:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0.06:devel/p5-Test-Requires \
+		p5-Test-TCP>=1.17:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/net-mgmt/p5-Net-OpenVPN-Manage/Makefile b/net-mgmt/p5-Net-OpenVPN-Manage/Makefile
index 485b89c7b591..b1e70aaa6e60 100644
--- a/net-mgmt/p5-Net-OpenVPN-Manage/Makefile
+++ b/net-mgmt/p5-Net-OpenVPN-Manage/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Manage an OpenVPN process via its management port
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
+RUN_DEPENDS=	p5-Net-Telnet>=0:net/p5-Net-Telnet
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-Net-SNMP-Util/Makefile b/net-mgmt/p5-Net-SNMP-Util/Makefile
index 08c98d935331..557fd300e405 100644
--- a/net-mgmt/p5-Net-SNMP-Util/Makefile
+++ b/net-mgmt/p5-Net-SNMP-Util/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hhyou@cs.nctu.edu.tw
 COMMENT=	Utility functions for Net::SNMP
 
-RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index 4f1c0ea2b292..bf614735e342 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -13,9 +13,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Object oriented interface to SNMP
 
-BUILD_DEPENDS=	p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
+BUILD_DEPENDS=	p5-Crypt-DES>=0:security/p5-Crypt-DES \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Net-SNMPTrapd/Makefile b/net-mgmt/p5-Net-SNMPTrapd/Makefile
index f63530270c34..62f2e4c9bad7 100644
--- a/net-mgmt/p5-Net-SNMPTrapd/Makefile
+++ b/net-mgmt/p5-Net-SNMPTrapd/Makefile
@@ -14,8 +14,8 @@ COMMENT=	SNMP Trap Listener in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Convert-ASN1>=0.22:${PORTSDIR}/converters/p5-Convert-ASN1 \
-		p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP
+BUILD_DEPENDS=	p5-Convert-ASN1>=0.22:converters/p5-Convert-ASN1 \
+		p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile b/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
index eae15ea45bde..8905b50627b4 100644
--- a/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
+++ b/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}beta
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Manage Cisco IOS Devices
 
-RUN_DEPENDS=	p5-Net-Telnet-Cisco>=0:${PORTSDIR}/net-mgmt/p5-Telnet-Cisco
+RUN_DEPENDS=	p5-Net-Telnet-Cisco>=0:net-mgmt/p5-Telnet-Cisco
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-NetApp/Makefile b/net-mgmt/p5-NetApp/Makefile
index 377cba3e2a30..7cbcc366516f 100644
--- a/net-mgmt/p5-NetApp/Makefile
+++ b/net-mgmt/p5-NetApp/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Perl interface to manage NetApp NAS devices
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Std>=0:${PORTSDIR}/devel/p5-Class-Std \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-IPC-Cmd>=0:${PORTSDIR}/devel/p5-IPC-Cmd \
-		p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common
+BUILD_DEPENDS=	p5-Class-Std>=0:devel/p5-Class-Std \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-IPC-Cmd>=0:devel/p5-IPC-Cmd \
+		p5-Net-Telnet>=0:net/p5-Net-Telnet \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-POE-Component-SNMP/Makefile b/net-mgmt/p5-POE-Component-SNMP/Makefile
index 9878d126c053..049c0932bcee 100644
--- a/net-mgmt/p5-POE-Component-SNMP/Makefile
+++ b/net-mgmt/p5-POE-Component-SNMP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Event-driven SNMP interface
 
-BUILD_DEPENDS=	p5-POE>=0.31:${PORTSDIR}/devel/p5-POE \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+BUILD_DEPENDS=	p5-POE>=0.31:devel/p5-POE \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-SNMP-Info/Makefile b/net-mgmt/p5-SNMP-Info/Makefile
index b17db348bd5e..0380f4b6be2e 100644
--- a/net-mgmt/p5-SNMP-Info/Makefile
+++ b/net-mgmt/p5-SNMP-Info/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl5 module for gathering information from network devices
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
index ac5078d7fd27..47adad1a8085 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Perl MIB compiler supporting both SMIv1 and SMIv2
 
-BUILD_DEPENDS=	p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare
+BUILD_DEPENDS=	p5-Data-Compare>=0:devel/p5-Data-Compare
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-SNMP-Simple/Makefile b/net-mgmt/p5-SNMP-Simple/Makefile
index 51a1153d0faa..ee7b7701fc58 100644
--- a/net-mgmt/p5-SNMP-Simple/Makefile
+++ b/net-mgmt/p5-SNMP-Simple/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Shortcuts for when using p5-SNMP
 
-RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp
+RUN_DEPENDS=	net-snmp>=0:net-mgmt/net-snmp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-SNMP-Util/Makefile b/net-mgmt/p5-SNMP-Util/Makefile
index a6a00bf819c7..72edf06e0fca 100644
--- a/net-mgmt/p5-SNMP-Util/Makefile
+++ b/net-mgmt/p5-SNMP-Util/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl modules to perform SNMP set,get,walk,next,walk_hash etc
 
-RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp
+RUN_DEPENDS=	net-snmp>=0:net-mgmt/net-snmp
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-net-snmp-patch-Makefile.PL
 
diff --git a/net-mgmt/p5-Telnet-Cisco/Makefile b/net-mgmt/p5-Telnet-Cisco/Makefile
index e94bd3dd1b1c..33db40dee9bd 100644
--- a/net-mgmt/p5-Telnet-Cisco/Makefile
+++ b/net-mgmt/p5-Telnet-Cisco/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lyngbol@wheel.dk
 COMMENT=	Perl5 module to telnet to Cisco routers
 
-RUN_DEPENDS=	p5-Net-Telnet>=3.02:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-Term-ReadKey>=2:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-Net-Telnet>=3.02:net/p5-Net-Telnet \
+		p5-Term-ReadKey>=2:devel/p5-Term-ReadKey
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-Tie-NetAddr-IP/Makefile b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
index e79f82b4f3ec..a0f1404200c6 100644
--- a/net-mgmt/p5-Tie-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Tie::NetAddr::IP - Implements a Hash where the key is a subnet
 
-BUILD_DEPENDS=	p5-NetAddr-IP>0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-NetAddr-IP>0:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/p5-Zenoss/Makefile b/net-mgmt/p5-Zenoss/Makefile
index e20478fe08fc..1c0108b4cd77 100644
--- a/net-mgmt/p5-Zenoss/Makefile
+++ b/net-mgmt/p5-Zenoss/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pphillips@experts-exchange.com
 COMMENT=	Perl interface to the Zenoss JSON API
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>=1.0:${PORTSDIR}/devel/p5-Moose \
-		p5-libwww>=5.0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>=1.0:${PORTSDIR}/devel/p5-Moose \
-		p5-libwww>=5.0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=2.0:converters/p5-JSON \
+		p5-Moose>=1.0:devel/p5-Moose \
+		p5-libwww>=5.0:www/p5-libwww
+RUN_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=2.0:converters/p5-JSON \
+		p5-Moose>=1.0:devel/p5-Moose \
+		p5-libwww>=5.0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-jmx4perl/Makefile b/net-mgmt/p5-jmx4perl/Makefile
index 3cdba0b30b24..088fa2539240 100644
--- a/net-mgmt/p5-jmx4perl/Makefile
+++ b/net-mgmt/p5-jmx4perl/Makefile
@@ -12,30 +12,30 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	JMX access for Perl
 
-RUN_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Carp>=0:${PORTSDIR}/devel/p5-Carp \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-Crypt-Blowfish_PP>=0:${PORTSDIR}/security/p5-Crypt-Blowfish_PP \
-		p5-Crypt-OpenPGP>=0:${PORTSDIR}/security/p5-Crypt-OpenPGP \
-		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-File-SearchPath>=0:${PORTSDIR}/devel/p5-File-SearchPath \
-		p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find \
-		p5-Nagios-Plugin>=0:${PORTSDIR}/net-mgmt/p5-Nagios-Plugin \
-		p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction \
-		p5-Term-Clui>=0:${PORTSDIR}/devel/p5-Term-Clui \
-		p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar \
-		p5-Term-ShellUI>=0:${PORTSDIR}/shells/p5-Term-ShellUI \
-		p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
-		p5-Text-ParseWords>=0:${PORTSDIR}/textproc/p5-Text-ParseWords \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-Carp>=0:devel/p5-Carp \
+		p5-Config-General>=0:devel/p5-Config-General \
+		p5-Crypt-Blowfish_PP>=0:security/p5-Crypt-Blowfish_PP \
+		p5-Crypt-OpenPGP>=0:security/p5-Crypt-OpenPGP \
+		p5-Digest-MD5>=0:security/p5-Digest-MD5 \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-File-SearchPath>=0:devel/p5-File-SearchPath \
+		p5-File-Temp>=0:devel/p5-File-Temp \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Module-Find>=0:devel/p5-Module-Find \
+		p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
+		p5-Sys-SigAction>=0:devel/p5-Sys-SigAction \
+		p5-Term-Clui>=0:devel/p5-Term-Clui \
+		p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
+		p5-Term-ShellUI>=0:shells/p5-Term-ShellUI \
+		p5-Term-Size>=0:devel/p5-Term-Size \
+		p5-Text-ParseWords>=0:textproc/p5-Text-ParseWords \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net-mgmt/packit/Makefile b/net-mgmt/packit/Makefile
index fc5df9d877b9..a100878c9885 100644
--- a/net-mgmt/packit/Makefile
+++ b/net-mgmt/packit/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network auditing tool
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-mgmt/pads/Makefile b/net-mgmt/pads/Makefile
index bf7dea84736f..cfeb058bc90f 100644
--- a/net-mgmt/pads/Makefile
+++ b/net-mgmt/pads/Makefile
@@ -15,7 +15,7 @@ SHEBANG_FILES=	src/pads-report.pl
 CFLAGS+=	-Wno-return-type
 USE_CSTD=	gnu89
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 
diff --git a/net-mgmt/pancho/Makefile b/net-mgmt/pancho/Makefile
index 232a6c2988af..49a94d7e33c9 100644
--- a/net-mgmt/pancho/Makefile
+++ b/net-mgmt/pancho/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	pancho-v${PORTVERSION}
 MAINTAINER=	ecu@200ok.org
 COMMENT=	Network devices management tool using TFTP and SNMP
 
-RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager
+RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager
 
 WRKSRC=		${WRKDIR}/Pancho-${PORTVERSION}
 USES=		perl5
diff --git a/net-mgmt/pandorafms_console/Makefile b/net-mgmt/pandorafms_console/Makefile
index 7c0427d426f2..f2a9faee8907 100644
--- a/net-mgmt/pandorafms_console/Makefile
+++ b/net-mgmt/pandorafms_console/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Pandora FMS console
 LICENSE=	${PANDORA_LICENSE}
 LICENSE_FILE=	${PANDORA_LICENSE_FILE}
 
-RUN_DEPENDS=	${LOCALBASE}/bin/twopi:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	${LOCALBASE}/bin/twopi:graphics/graphviz
 
 USES=		shebangfix
 SHEBANG_FILES=	include/languages/extract_newlines.sh \
diff --git a/net-mgmt/pandorafms_server/Makefile b/net-mgmt/pandorafms_server/Makefile
index 9751fcf4f0bc..356a86244b0d 100644
--- a/net-mgmt/pandorafms_server/Makefile
+++ b/net-mgmt/pandorafms_server/Makefile
@@ -10,22 +10,22 @@ COMMENT=	Pandora FMS server
 LICENSE=	${PANDORA_LICENSE}
 LICENSE_FILE=	${PANDORA_LICENSE_FILE}
 
-PANDORA_DEPS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
-		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+PANDORA_DEPS=	p5-DBI>=0:databases/p5-DBI \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
+		p5-NetAddr-IP>=0:net-mgmt/p5-NetAddr-IP \
+		net-snmp>=0:net-mgmt/net-snmp \
+		p5-Socket6>=0:net/p5-Socket6 \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-JSON>=0:converters/p5-JSON
 BUILD_DEPENDS=	${PANDORA_DEPS}
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-DBD-mysql>=4:${PORTSDIR}/databases/p5-DBD-mysql \
-		${LOCALBASE}/bin/wmic:${PORTSDIR}/net-mgmt/wmi-client \
-		${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \
-		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
-		p5-Encode-Locale>=0:${PORTSDIR}/converters/p5-Encode-Locale \
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-DBD-mysql>=4:databases/p5-DBD-mysql \
+		${LOCALBASE}/bin/wmic:net-mgmt/wmi-client \
+		${LOCALBASE}/bin/nmap:security/nmap \
+		p5-Storable>=0:devel/p5-Storable \
+		p5-Encode-Locale>=0:converters/p5-Encode-Locale \
 		${PANDORA_DEPS}
 
 OPTIONS_DEFINE=	DOCS TENTACLE XPROBE PGSQL ORACLE EXTRAS
@@ -78,26 +78,26 @@ PLIST_SUB+=	TENTACLE=""
 #USE_RC_SUBR+=	tentacle_server
 .endif
 .if ${PORT_OPTIONS:MXPROBE}
-RUN_DEPENDS+=	${LOCALBASE}/bin/xprobe2:${PORTSDIR}/net/xprobe
+RUN_DEPENDS+=	${LOCALBASE}/bin/xprobe2:net/xprobe
 .endif
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 .if ${PORT_OPTIONS:MORACLE}
-RUN_DEPENDS+=	p5-DBD-Oracle>=0:${PORTSDIR}/databases/p5-DBD-Oracle
+RUN_DEPENDS+=	p5-DBD-Oracle>=0:databases/p5-DBD-Oracle
 .endif
 .if ${PORT_OPTIONS:MEXTRAS}
 # plugin/bgp_pluin.pl
-RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+RUN_DEPENDS+=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 # plugin/multicast.pl
-RUN_DEPENDS+=	p5-IO-Socket-Multicast>=0:${PORTSDIR}/net/p5-IO-Socket-Multicast
+RUN_DEPENDS+=	p5-IO-Socket-Multicast>=0:net/p5-IO-Socket-Multicast
 # plugin/openvpn_pandoraplugin.pl
-RUN_DEPENDS+=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
+RUN_DEPENDS+=	p5-Net-Telnet>=0:net/p5-Net-Telnet
 # plugin/integria_plugin/integria_plugin.sh, plugin/webcheck_plugin.sh,
 # plugin/babel_plugin/babel_plugin.sh, plugin/create_integria_incident.sh
-RUN_DEPENDS+=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS+=	${LOCALBASE}/bin/wget:ftp/wget
 # plugin/ipmi-plugin.pl, recon_scripts/ipmi-recon.pl
-RUN_DEPENDS+=	${LOCALBASE}/sbin/ipmi-sensors:${PORTSDIR}/sysutils/freeipmi
+RUN_DEPENDS+=	${LOCALBASE}/sbin/ipmi-sensors:sysutils/freeipmi
 .endif
 
 post-patch:
diff --git a/net-mgmt/percona-monitoring-plugins/Makefile b/net-mgmt/percona-monitoring-plugins/Makefile
index 4c618778ddfa..a2dfdcbd2b7b 100644
--- a/net-mgmt/percona-monitoring-plugins/Makefile
+++ b/net-mgmt/percona-monitoring-plugins/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Cacti templates for MySQL, Apache, Memcached, and more by Percona
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	cacti>=0:${PORTSDIR}/net-mgmt/cacti \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
-		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	cacti>=0:net-mgmt/cacti \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-Data-Dumper>=0:devel/p5-Data-Dumper \
+		p5-Digest-MD5>=0:security/p5-Digest-MD5 \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes \
+		bash:shells/bash
 
 USES=		shebangfix perl5
 USE_PERL5=	run
diff --git a/net-mgmt/phpipam/Makefile b/net-mgmt/phpipam/Makefile
index 9053920a0f73..fd734484375e 100644
--- a/net-mgmt/phpipam/Makefile
+++ b/net-mgmt/phpipam/Makefile
@@ -11,7 +11,7 @@ COMMENT=	PHP IP Address Management IPv4/IPv6
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net-mgmt/phpweathermap/Makefile b/net-mgmt/phpweathermap/Makefile
index 6aaf458db389..751d1cd0db7d 100644
--- a/net-mgmt/phpweathermap/Makefile
+++ b/net-mgmt/phpweathermap/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Network visualisation tool with web editor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/Console/Getopt.php:${PORTSDIR}/devel/pear \
-		rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS=	${LOCALBASE}/share/pear/Console/Getopt.php:devel/pear \
+		rrdtool:databases/rrdtool
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index e023e9d7d724..1609927e7d81 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Generates packets to match a list of Cisco PIX access lists
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 WRKSRC=		${WRKDIR}/pixilate
 
diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile
index 4b61b5b49b26..3c20e816312a 100644
--- a/net-mgmt/pmacct/Makefile
+++ b/net-mgmt/pmacct/Makefile
@@ -91,14 +91,14 @@ CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MMONGO}
-LIB_DEPENDS+=	libmongoc.so:${PORTSDIR}/devel/mongo-c-driver
+LIB_DEPENDS+=	libmongoc.so:devel/mongo-c-driver
 CONFIGURE_ARGS+=--enable-mongodb \
 		--with-mongodb-libs=${LOCALBASE}/lib \
 		--with-mongodb-includes=${LOCALBASE}/include
 .endif
 
 .if ${PORT_OPTIONS:MGEOIP}
-LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
 CONFIGURE_ARGS+=--enable-geoip \
 		--with-geoip-libs=${LOCALBASE}/lib \
 		--with-geoip-includes=${LOCALBASE}/include
diff --git a/net-mgmt/pnp-icinga/Makefile b/net-mgmt/pnp-icinga/Makefile
index ae20ea165bac..895d070e05b1 100644
--- a/net-mgmt/pnp-icinga/Makefile
+++ b/net-mgmt/pnp-icinga/Makefile
@@ -7,8 +7,8 @@ COMMENT=	Icinga performance data collector and grapher
 
 MASTERDIR=	${.CURDIR}/../pnp
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \
-		${LOCALBASE}/www/icinga/main.html:${PORTSDIR}/net-mgmt/icinga-classicweb
+RUN_DEPENDS=	${LOCALBASE}/bin/rrdtool:databases/rrdtool \
+		${LOCALBASE}/www/icinga/main.html:net-mgmt/icinga-classicweb
 
 NAGIOSDIR?=	/var/spool/icinga
 NAGIOSHTMURL?=	/icinga
diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index f64b5eb83d7b..0849d32905a9 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -13,9 +13,9 @@ COMMENT?=	Nagios / Icinga performance data collector and grapher
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool
-RUN_DEPENDS?=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \
-		nagios:${PORTSDIR}/net-mgmt/nagios
+BUILD_DEPENDS=	${LOCALBASE}/bin/rrdtool:databases/rrdtool
+RUN_DEPENDS?=	${LOCALBASE}/bin/rrdtool:databases/rrdtool \
+		nagios:net-mgmt/nagios
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5 dos2unix
diff --git a/net-mgmt/py-flowtools/Makefile b/net-mgmt/py-flowtools/Makefile
index 044146b13ae9..d317d9b0d1e6 100644
--- a/net-mgmt/py-flowtools/Makefile
+++ b/net-mgmt/py-flowtools/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	pyflowtools-${PORTVERSION}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Python extension module for reading flow-tools' data
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ftlib.h:${PORTSDIR}/net-mgmt/flow-tools
+BUILD_DEPENDS=	${LOCALBASE}/include/ftlib.h:net-mgmt/flow-tools
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/net-mgmt/py-pysmi/Makefile b/net-mgmt/py-pysmi/Makefile
index e2e77a62917f..85f5fb5b0d66 100644
--- a/net-mgmt/py-pysmi/Makefile
+++ b/net-mgmt/py-pysmi/Makefile
@@ -13,7 +13,7 @@ COMMENT=	SNMP/SMI MIB parsing in Python
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:${PORTSDIR}/devel/py-ply
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply
 
 NO_ARCH=	yes
 USES=		python shebangfix
diff --git a/net-mgmt/py-pyzabbix/Makefile b/net-mgmt/py-pyzabbix/Makefile
index 057c7049967e..39a09b572450 100644
--- a/net-mgmt/py-pyzabbix/Makefile
+++ b/net-mgmt/py-pyzabbix/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Zabbix API Python Library
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
diff --git a/net-mgmt/py-snmp4-apps/Makefile b/net-mgmt/py-snmp4-apps/Makefile
index 7e251db618b6..06325104906c 100644
--- a/net-mgmt/py-snmp4-apps/Makefile
+++ b/net-mgmt/py-snmp4-apps/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Command line utilities for pysnmp4
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:${PORTSDIR}/net-mgmt/py-snmp4
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net-mgmt/py-snmp4-mibs/Makefile b/net-mgmt/py-snmp4-mibs/Makefile
index e03eb7764f4e..5af9f7fffc29 100644
--- a/net-mgmt/py-snmp4-mibs/Makefile
+++ b/net-mgmt/py-snmp4-mibs/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Additional python MIB files for pysnmp4 and friends
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:${PORTSDIR}/net-mgmt/py-snmp4
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net-mgmt/py-snmp4/Makefile b/net-mgmt/py-snmp4/Makefile
index 8e33fbd1c7a0..504e3dd20fd6 100644
--- a/net-mgmt/py-snmp4/Makefile
+++ b/net-mgmt/py-snmp4/Makefile
@@ -15,8 +15,8 @@ COMMENT=	SNMP framework for Python
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:security/py-pycrypto
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile
index 427a942a52cc..6f9e39588d75 100644
--- a/net-mgmt/py-yapsnmp/Makefile
+++ b/net-mgmt/py-yapsnmp/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Python SNMP module based on net-snmp
 
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/net-mgmt/qkismet/Makefile b/net-mgmt/qkismet/Makefile
index d3609014b88c..e12790e5700a 100644
--- a/net-mgmt/qkismet/Makefile
+++ b/net-mgmt/qkismet/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/qKismet/${PORTVERSION}
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Qt 4 GUI client for Kismet
 
-RUN_DEPENDS=	kismet:${PORTSDIR}/net-mgmt/kismet
+RUN_DEPENDS=	kismet:net-mgmt/kismet
 
 USES=		qmake tar:bzip2
 USE_QT4=	gui xml uic_build moc_build rcc_build network
diff --git a/net-mgmt/rackmonkey/Makefile b/net-mgmt/rackmonkey/Makefile
index 98856d9904be..e34e897a31e6 100644
--- a/net-mgmt/rackmonkey/Makefile
+++ b/net-mgmt/rackmonkey/Makefile
@@ -13,11 +13,11 @@ MASTER_SITES=	SF \
 MAINTAINER=	ecrist@secure-computing.net
 COMMENT=	Web-based tool for managing racks of equipment
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 
 OPTIONS_DEFINE=	SQLITE MYSQL PGSQL INIT_DB SAMPLE
 OPTIONS_DEFAULT=	SQLITE INIT_DB SAMPLE
@@ -35,15 +35,15 @@ SUB_FILES=	pkg-message
 
 .if ${PORT_OPTIONS:MSQLITE}
 USES+=		sqlite
-RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+RUN_DEPENDS+=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 .endif
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MINIT_DB}
diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile
index 135f580117b3..02b969eb7fab 100644
--- a/net-mgmt/rancid/Makefile
+++ b/net-mgmt/rancid/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Really Awesome New Cisco confIg Differ
 
-LIB_DEPENDS=	libexpect.so:${PORTSDIR}/lang/expect
-RUN_DEPENDS=	p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple
+LIB_DEPENDS=	libexpect.so:lang/expect
+RUN_DEPENDS=	p5-LockFile-Simple>=0:devel/p5-LockFile-Simple
 
 USES=		gmake perl5 shebangfix
 perl_OLD_CMD=	@PERLV_PATH@
@@ -38,11 +38,11 @@ SVN_DESC=		Use Subversion instead of CVS
 
 .if ${PORT_OPTIONS:MSVN}
 CONFIGURE_ARGS+=	--with-svn
-BUILD_DEPENDS+=		svn:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS+=		svn:devel/subversion
 .else
 CONFIGURE_ARGS+=	--without-svn
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-RUN_DEPENDS+=	cvs>0:${PORTSDIR}/devel/cvs
+RUN_DEPENDS+=	cvs>0:devel/cvs
 .endif
 .endif
 
diff --git a/net-mgmt/rancid3/Makefile b/net-mgmt/rancid3/Makefile
index 563498c2d4bf..b94c57808170 100644
--- a/net-mgmt/rancid3/Makefile
+++ b/net-mgmt/rancid3/Makefile
@@ -11,8 +11,8 @@ PKGNAMESUFFIX=	3
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Really Awesome New Cisco confIg Differ
 
-LIB_DEPENDS=	libexpect.so:${PORTSDIR}/lang/expect
-RUN_DEPENDS=	p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple
+LIB_DEPENDS=	libexpect.so:lang/expect
+RUN_DEPENDS=	p5-LockFile-Simple>=0:devel/p5-LockFile-Simple
 
 USES=		gmake perl5 shebangfix
 perl_OLD_CMD=	@PERLV_PATH@
@@ -45,11 +45,11 @@ CONFLICTS=	rancid-[0-9]*
 
 .if ${PORT_OPTIONS:MSVN}
 CONFIGURE_ARGS+=	--with-svn
-BUILD_DEPENDS+=		svn:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS+=		svn:devel/subversion
 .else
 CONFIGURE_ARGS+=	--without-svn
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-RUN_DEPENDS+=	cvs>0:${PORTSDIR}/devel/cvs
+RUN_DEPENDS+=	cvs>0:devel/cvs
 .endif
 .endif
 
diff --git a/net-mgmt/remarp/Makefile b/net-mgmt/remarp/Makefile
index 4da54ff8b712..a8d8522ea9eb 100644
--- a/net-mgmt/remarp/Makefile
+++ b/net-mgmt/remarp/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://freebsdcluster.org/~mich/software/ \
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	SNMP-based ARP watcher
 
-RUN_DEPENDS=	p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+RUN_DEPENDS=	p5-AppConfig>=0:devel/p5-AppConfig \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 
 USES=		perl5
 NO_BUILD=	YES
diff --git a/net-mgmt/routers2-extensions/Makefile b/net-mgmt/routers2-extensions/Makefile
index bd64546ae189..f7e3db0fe01d 100644
--- a/net-mgmt/routers2-extensions/Makefile
+++ b/net-mgmt/routers2-extensions/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	routers2-v${PORTVERSION}
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Extensions of routers2 frontend
 
-RUN_DEPENDS=	${LOCALBASE}/www/routers2/routers2.cgi:${PORTSDIR}/net-mgmt/routers2 \
-		p5-Net-Telnet-Cisco>=0:${PORTSDIR}/net-mgmt/p5-Telnet-Cisco \
-		${LOCALBASE}/bin/htmldoc:${PORTSDIR}/textproc/htmldoc
+RUN_DEPENDS=	${LOCALBASE}/www/routers2/routers2.cgi:net-mgmt/routers2 \
+		p5-Net-Telnet-Cisco>=0:net-mgmt/p5-Telnet-Cisco \
+		${LOCALBASE}/bin/htmldoc:textproc/htmldoc
 
 WRKSRC=		${WRKDIR}/routers2-v${PORTVERSION}/extensions
 
diff --git a/net-mgmt/routers2-extras/Makefile b/net-mgmt/routers2-extras/Makefile
index eb58835dde43..a3d8ff18d002 100644
--- a/net-mgmt/routers2-extras/Makefile
+++ b/net-mgmt/routers2-extras/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	routers2-v${PORTVERSION}
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Extra extensions and scripts for routers2 frontend
 
-RUN_DEPENDS=	${LOCALBASE}/www/routers2/routers2.cgi:${PORTSDIR}/net-mgmt/routers2 \
-		${LOCALBASE}/bin/mrtg-ping-probe:${PORTSDIR}/net-mgmt/mrtg-ping-probe
+RUN_DEPENDS=	${LOCALBASE}/www/routers2/routers2.cgi:net-mgmt/routers2 \
+		${LOCALBASE}/bin/mrtg-ping-probe:net-mgmt/mrtg-ping-probe
 
 WRKSRC=		${WRKDIR}/routers2-v${PORTVERSION}/extras
 
diff --git a/net-mgmt/routers2/Makefile b/net-mgmt/routers2/Makefile
index a05fae49e8df..71730e016f0f 100644
--- a/net-mgmt/routers2/Makefile
+++ b/net-mgmt/routers2/Makefile
@@ -11,15 +11,15 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Frontend for the MRTG system monitoring software
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
-RUN_DEPENDS=	p5-Convert-ASN1>=0:${PORTSDIR}/converters/p5-Convert-ASN1 \
-		p5-Crypt-UnixCrypt>=0:${PORTSDIR}/security/p5-Crypt-UnixCrypt \
-		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-Crypt-UnixCrypt>=0:${PORTSDIR}/security/p5-Crypt-UnixCrypt \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		p5-CGI-SpeedyCGI>=0:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
-		${LOCALBASE}/bin/mrtg:${PORTSDIR}/net-mgmt/mrtg
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD
+RUN_DEPENDS=	p5-Convert-ASN1>=0:converters/p5-Convert-ASN1 \
+		p5-Crypt-UnixCrypt>=0:security/p5-Crypt-UnixCrypt \
+		p5-GD>=0:graphics/p5-GD \
+		p5-Crypt-UnixCrypt>=0:security/p5-Crypt-UnixCrypt \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session \
+		p5-CGI-SpeedyCGI>=0:www/p5-CGI-SpeedyCGI \
+		${LOCALBASE}/bin/mrtg:net-mgmt/mrtg
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-v${PORTVERSION}
 USES=		perl5
diff --git a/net-mgmt/rrdbot/Makefile b/net-mgmt/rrdbot/Makefile
index a35e822c91c6..0cd06375d851 100644
--- a/net-mgmt/rrdbot/Makefile
+++ b/net-mgmt/rrdbot/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://thewalter.net/stef/software/rrdbot/
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Threaded SNMP polling daemon which stores data in RRDs
 
-LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
+LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include \
diff --git a/net-mgmt/rubygem-blimpy/Makefile b/net-mgmt/rubygem-blimpy/Makefile
index 373498dd0a74..fc23b617da53 100644
--- a/net-mgmt/rubygem-blimpy/Makefile
+++ b/net-mgmt/rubygem-blimpy/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Tool for managing a fleet of machines in the cloud
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-fog>=0:${PORTSDIR}/devel/rubygem-fog \
-		rubygem-minitar>=0:${PORTSDIR}/archivers/rubygem-minitar \
-		rubygem-thor>=0:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-fog>=0:devel/rubygem-fog \
+		rubygem-minitar>=0:archivers/rubygem-minitar \
+		rubygem-thor>=0:devel/rubygem-thor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net-mgmt/rubygem-visage-app/Makefile b/net-mgmt/rubygem-visage-app/Makefile
index 7383b11975f2..470421ae6162 100644
--- a/net-mgmt/rubygem-visage-app/Makefile
+++ b/net-mgmt/rubygem-visage-app/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Graph tool for Collectd
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-errand>=0.7.3:${PORTSDIR}/devel/rubygem-errand \
-		rubygem-haml>=3.1.4:${PORTSDIR}/www/rubygem-haml \
-		rubygem-sinatra>=1.3.2:${PORTSDIR}/www/rubygem-sinatra \
-		rubygem-tilt>=1.3.3:${PORTSDIR}/devel/rubygem-tilt \
-		rubygem-yajl-ruby>=1.1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+RUN_DEPENDS=	rubygem-errand>=0.7.3:devel/rubygem-errand \
+		rubygem-haml>=3.1.4:www/rubygem-haml \
+		rubygem-sinatra>=1.3.2:www/rubygem-sinatra \
+		rubygem-tilt>=1.3.3:devel/rubygem-tilt \
+		rubygem-yajl-ruby>=1.1.0:devel/rubygem-yajl-ruby
 
 NO_ARCH=	yes
 
diff --git a/net-mgmt/sblim-wbemcli/Makefile b/net-mgmt/sblim-wbemcli/Makefile
index 347e5f5082d8..c99a08fa395d 100644
--- a/net-mgmt/sblim-wbemcli/Makefile
+++ b/net-mgmt/sblim-wbemcli/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SF/sblim/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	CLI for Web Based Enterprise Management by SBLIM
 
-BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	libwww-config:www/libwww
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=	tar:bzip2
 GNU_CONFIGURE=	YES
diff --git a/net-mgmt/scli/Makefile b/net-mgmt/scli/Makefile
index 6be6169175f7..37e90a213072 100644
--- a/net-mgmt/scli/Makefile
+++ b/net-mgmt/scli/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/local/${PORTNAME}/ \
 MAINTAINER=	lyngbol@wheel.dk
 COMMENT=	A collection of SNMP command line management tools
 
-LIB_DEPENDS=	libgsnmp.so:${PORTSDIR}/net-mgmt/gsnmp
+LIB_DEPENDS=	libgsnmp.so:net-mgmt/gsnmp
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig readline
diff --git a/net-mgmt/sdig/Makefile b/net-mgmt/sdig/Makefile
index c2fe507bac87..81fc6265cd4d 100644
--- a/net-mgmt/sdig/Makefile
+++ b/net-mgmt/sdig/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Translate IP/DNS/WINS/MAC address into port description
 
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/seafile-gui/Makefile b/net-mgmt/seafile-gui/Makefile
index f7dfcde683a2..07c6594db5fa 100644
--- a/net-mgmt/seafile-gui/Makefile
+++ b/net-mgmt/seafile-gui/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Seafile desktop client
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS+=	libglib-2.0.so:${PORTSDIR}/devel/glib20 \
-		libsearpc.so:${PORTSDIR}/devel/libsearpc \
-		libseafile.so:${PORTSDIR}/net-mgmt/seafile \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libccnet.so:${PORTSDIR}/net-mgmt/ccnet \
-		libjansson.so:${PORTSDIR}/devel/jansson
+LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
+		libsearpc.so:devel/libsearpc \
+		libseafile.so:net-mgmt/seafile \
+		libsqlite3.so:databases/sqlite3 \
+		libccnet.so:net-mgmt/ccnet \
+		libjansson.so:devel/jansson
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
diff --git a/net-mgmt/seafile/Makefile b/net-mgmt/seafile/Makefile
index f62791f8286c..a7838f9329a3 100644
--- a/net-mgmt/seafile/Makefile
+++ b/net-mgmt/seafile/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Framework for writing networked applications
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libsearpc.so:${PORTSDIR}/devel/libsearpc \
-		libevhtp.so:${PORTSDIR}/www/libevhtp \
-		libzdb.so:${PORTSDIR}/databases/libzdb \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libinotify.so:${PORTSDIR}/devel/libinotify \
-		libccnet.so:${PORTSDIR}/net-mgmt/ccnet
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libsearpc.so:devel/libsearpc \
+		libevhtp.so:www/libevhtp \
+		libzdb.so:databases/libzdb \
+		libcurl.so:ftp/curl \
+		libinotify.so:devel/libinotify \
+		libccnet.so:net-mgmt/ccnet
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
@@ -65,10 +65,10 @@ FUSE_DESC=		Use file system in userspace
 RIAK_DESC=		Use distributed noSQL database
 
 FUSE_CONFIGURE_ENABLE=	fuse
-FUSE_LIB_DEPENDS=	libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
+FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
 
 RIAK_CONFIGURE_ENABLE=	riak
-RIAK_RUN_DEPENDS=	riak:${PORTSDIR}/databases/riak
+RIAK_RUN_DEPENDS=	riak:databases/riak
 
 OPTIONS_DEFAULT=FUSE
 .if defined(DFLYVERSION)
diff --git a/net-mgmt/send/Makefile b/net-mgmt/send/Makefile
index 93479a2b1486..b9baf719d173 100644
--- a/net-mgmt/send/Makefile
+++ b/net-mgmt/send/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Secure Neighbor Discovery implementation for IPv6
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
+LIB_DEPENDS=	libdnet.so:net/libdnet
 
 USES=		gmake readline
 USE_RC_SUBR=	sendd
diff --git a/net-mgmt/sendip/Makefile b/net-mgmt/sendip/Makefile
index f3b3d0e35b20..8d516febd55a 100644
--- a/net-mgmt/sendip/Makefile
+++ b/net-mgmt/sendip/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SendIP is a commandline tool to allow sending arbitrary IP packets
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	help2man:misc/help2man
 
 USES=		gmake perl5 compiler
 
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index de0476d8dbd6..8de63b5d1afb 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -13,22 +13,22 @@ COMMENT=	Latency logging and graphing system
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
-BUILD_DEPENDS=	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-IO-Pty-Easy>=0:${PORTSDIR}/devel/p5-IO-Pty-Easy \
-		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
-		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI \
-		p5-Config-Grammar>=0:${PORTSDIR}/devel/p5-Config-Grammar \
-		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-Net-OpenSSH>=0:${PORTSDIR}/net/p5-Net-OpenSSH \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+LIB_DEPENDS=	librrd.so:databases/rrdtool
+BUILD_DEPENDS=	p5-CGI-Session>=0:www/p5-CGI-Session \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy \
+		p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session \
+		p5-libwww>=0:www/p5-libwww \
+		p5-CGI>=0:www/p5-CGI \
+		p5-FCGI>=0:www/p5-FCGI \
+		p5-Config-Grammar>=0:devel/p5-Config-Grammar \
+		p5-Socket6>=0:net/p5-Socket6 \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Net-Telnet>=0:net/p5-Net-Telnet \
+		p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -63,18 +63,18 @@ DNS_DESC=	Support for AnotherDNS probes
 OPTIONS_DEFINE=	ECHOPING CURL RADIUS TELNET DNS FPING
 OPTIONS_DEFAULT=	FPING
 
-FPING_RUN_DEPENDS=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
-ECHOPING_RUN_DEPENDS=	${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping
-CURL_RUN_DEPENDS=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
-RADIUS_RUN_DEPENDS=	p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
-TELNET_RUN_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
-DNS_RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+FPING_RUN_DEPENDS=	${LOCALBASE}/sbin/fping:net/fping
+ECHOPING_RUN_DEPENDS=	${LOCALBASE}/bin/echoping:net/echoping
+CURL_RUN_DEPENDS=	${LOCALBASE}/bin/curl:ftp/curl
+RADIUS_RUN_DEPENDS=	p5-Authen-Radius>=0:security/p5-Authen-Radius
+TELNET_RUN_DEPENDS=	p5-Net-Telnet>=0:net/p5-Net-Telnet
+DNS_RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502100
-BUILD_DEPENDS+=	p5-CGI-Fast>=0:${PORTSDIR}/www/p5-CGI-Fast
-RUN_DEPENDS+=	p5-CGI-Fast>=0:${PORTSDIR}/www/p5-CGI-Fast
+BUILD_DEPENDS+=	p5-CGI-Fast>=0:www/p5-CGI-Fast
+RUN_DEPENDS+=	p5-CGI-Fast>=0:www/p5-CGI-Fast
 .endif
 
 # We will take these from CPAN instead
diff --git a/net-mgmt/snmp4nagios/Makefile b/net-mgmt/snmp4nagios/Makefile
index 4a2a10bed4dc..98cb63e15fdc 100644
--- a/net-mgmt/snmp4nagios/Makefile
+++ b/net-mgmt/snmp4nagios/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Vendor specific SNMP plugins for Nagios
 
-BUILD_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp
+BUILD_DEPENDS=	snmpcheck:net-mgmt/net-snmp
+RUN_DEPENDS=	snmpcheck:net-mgmt/net-snmp
 
 GNU_CONFIGURE=	yes
 
@@ -39,7 +39,7 @@ LIBS+=		-L${LOCALBASE}/lib
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MRRDTOOL}
-LIB_DEPENDS+=	librrd.so:${PORTSDIR}/databases/rrdtool
+LIB_DEPENDS+=	librrd.so:databases/rrdtool
 CONFIGURE_ARGS+=--with-rrd
 PLIST_SUB+=	RRD=""
 .else
diff --git a/net-mgmt/snmptt/Makefile b/net-mgmt/snmptt/Makefile
index 979da60353b1..3b4a0de09d88 100644
--- a/net-mgmt/snmptt/Makefile
+++ b/net-mgmt/snmptt/Makefile
@@ -15,11 +15,11 @@ LICENSE=	GPLv2
 USES=		perl5 shebangfix tar:tgz
 USE_RC_SUBR=	snmptt
 
-RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
-		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced \
-		p5-Text-ParseWords>=0:${PORTSDIR}/textproc/p5-Text-ParseWords \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS=	net-snmp>=0:net-mgmt/net-snmp \
+		p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-Text-Balanced>=0:textproc/p5-Text-Balanced \
+		p5-Text-ParseWords>=0:textproc/p5-Text-ParseWords \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes
 
 DOCS=		faqs.html index.html layout1.css snmptt.html \
 		snmpttconvert.html snmpttconvertmib.html
diff --git a/net-mgmt/statsd/Makefile b/net-mgmt/statsd/Makefile
index 9b4f92d8dd20..e5b4db031646 100644
--- a/net-mgmt/statsd/Makefile
+++ b/net-mgmt/statsd/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple daemon for easy stats aggregation
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	node:${PORTSDIR}/www/node
+RUN_DEPENDS=	node:www/node
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/net-mgmt/super_mediator/Makefile b/net-mgmt/super_mediator/Makefile
index 38292f0cb902..58d81a336567 100644
--- a/net-mgmt/super_mediator/Makefile
+++ b/net-mgmt/super_mediator/Makefile
@@ -12,8 +12,8 @@ COMMENT=	SuperMediator is an IPFIX mediator by CMU CERT generally used with YAF
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfixbuf.so:${PORTSDIR}/net/libfixbuf \
-		libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libfixbuf.so:net/libfixbuf \
+		libltdl.so:devel/libltdl
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -30,9 +30,9 @@ SPREAD_DESC=	Enable Spread libary as a pub/sub distribution capability
 MYSQL_DESC=	Enable SuperMediator to directly write into MySQL
 SKIPSET_DESC=	Enable SiLK IPSET files for filtering
 
-SKIPSET_LIB_DEPENDS=	libsilk.so:${PORTSDIR}/security/silktools
-SPREAD_LIB_DEPENDS=	libspread.so:${PORTSDIR}/net/spread4
-MYSQL_LIB_DEPENDS=	libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
+SKIPSET_LIB_DEPENDS=	libsilk.so:security/silktools
+SPREAD_LIB_DEPENDS=	libspread.so:net/spread4
+MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
 
 MYSQL_USE=	mysql=yes
 
diff --git a/net-mgmt/sx/Makefile b/net-mgmt/sx/Makefile
index 9df4de22ffd1..d9bbdaf59688 100644
--- a/net-mgmt/sx/Makefile
+++ b/net-mgmt/sx/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Skylable Sx is a reliable, fully distributed cluster solution
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libfcgi.so:${PORTSDIR}/www/fcgi
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libfcgi.so:www/fcgi
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile
index 7f426cff2c4a..3b8d231bdd9e 100644
--- a/net-mgmt/tcpreplay/Makefile
+++ b/net-mgmt/tcpreplay/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool to replay saved packet capture files
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	pcapnav-config:${PORTSDIR}/net/libpcapnav
+BUILD_DEPENDS=	pcapnav-config:net/libpcapnav
 
 GNU_CONFIGURE=	yes
 
diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index a1f90b74ff69..c7dd5d562b42 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Data Series Processing Framework - think mrtg with xml configs
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session \
-		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI \
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON
+BUILD_DEPENDS=	rrdtool>=0:databases/rrdtool \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-BerkeleyDB>=0:databases/p5-BerkeleyDB \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-URI>=0:net/p5-URI \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Apache-Session>=0:www/p5-Apache-Session \
+		p5-FCGI>=0:www/p5-FCGI \
+		p5-JSON>0:converters/p5-JSON
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GNOME=	libxml2
diff --git a/net-mgmt/unifi3/Makefile b/net-mgmt/unifi3/Makefile
index 17e7fb868adb..dcd6365fd8cc 100644
--- a/net-mgmt/unifi3/Makefile
+++ b/net-mgmt/unifi3/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	UniFi Wireless Controller
 
-RUN_DEPENDS=	mongodb>0:${PORTSDIR}/databases/mongodb
+RUN_DEPENDS=	mongodb>0:databases/mongodb
 
 SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR}
 
diff --git a/net-mgmt/unifi4/Makefile b/net-mgmt/unifi4/Makefile
index 0697f5c65a25..823a2a7476d3 100644
--- a/net-mgmt/unifi4/Makefile
+++ b/net-mgmt/unifi4/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	UniFi Controller
 
-RUN_DEPENDS=	mongodb>0:${PORTSDIR}/databases/mongodb \
-		snappyjava>0:${PORTSDIR}/archivers/snappy-java
+RUN_DEPENDS=	mongodb>0:databases/mongodb \
+		snappyjava>0:archivers/snappy-java
 
 BUILD=		7436
 
diff --git a/net-mgmt/victorops-nagios/Makefile b/net-mgmt/victorops-nagios/Makefile
index 551ddfe92af1..0242d6709326 100644
--- a/net-mgmt/victorops-nagios/Makefile
+++ b/net-mgmt/victorops-nagios/Makefile
@@ -22,10 +22,10 @@ OPTIONS_DEFINE=	QPAGE
 OPTIONS_DEFAULT=
 QPAGE_DESC=	Integrate qpage for victorops server problems
 
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash \
-		curl:${PORTSDIR}/ftp/curl
+RUN_DEPENDS+=	bash:shells/bash \
+		curl:ftp/curl
 
-QPAGE_RUN_DEPENDS+=	qpage:${PORTSDIR}/comms/qpage
+QPAGE_RUN_DEPENDS+=	qpage:comms/qpage
 QPAGE_EXTRA_PATCHES+=	${FILESDIR}/qpage-patch
 
 do-install:
diff --git a/net-mgmt/virt-viewer/Makefile b/net-mgmt/virt-viewer/Makefile
index 2ebe3bc47525..eeede35fb683 100644
--- a/net-mgmt/virt-viewer/Makefile
+++ b/net-mgmt/virt-viewer/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Provides a graphical viewer for a guest OS display
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xml2-config:${PORTSDIR}/textproc/libxml2 \
-		intltoolize:${PORTSDIR}/textproc/intltool \
-		spice-protocol>=0.12.7:${PORTSDIR}/devel/spice-protocol
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt \
-		libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc \
-		libspice-client-glib-2.0.so:${PORTSDIR}/deskutils/spice-gtk
+BUILD_DEPENDS=	xml2-config:textproc/libxml2 \
+		intltoolize:textproc/intltool \
+		spice-protocol>=0.12.7:devel/spice-protocol
+LIB_DEPENDS=	libvirt.so:devel/libvirt \
+		libgtk-vnc-2.0.so:net/gtk-vnc \
+		libspice-client-glib-2.0.so:deskutils/spice-gtk
 
 USE_OPENSSL=yes
 WITH_OPENSSL_PORT=yes
diff --git a/net-mgmt/weathermap/Makefile b/net-mgmt/weathermap/Makefile
index 0ca3d0b0ef53..fdc2ce1feba5 100644
--- a/net-mgmt/weathermap/Makefile
+++ b/net-mgmt/weathermap/Makefile
@@ -17,9 +17,9 @@ EXPIRATION_DATE=2016-04-04
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
-RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		mrtg:${PORTSDIR}/net-mgmt/mrtg
+LIB_DEPENDS=	libgd.so:graphics/gd
+RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		mrtg:net-mgmt/mrtg
 
 USES=		perl5 shebangfix
 NO_BUILD=	yes
@@ -37,7 +37,7 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	WGET DOCS EXAMPLES
 WGET_DESC=	WGET support
-WGET_RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+WGET_RUN_DEPENDS=	wget:ftp/wget
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 45c6943f991b..6e12ebc848d8 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -13,13 +13,13 @@ COMMENT=	System for monitoring servers and networks
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libcares.so:${PORTSDIR}/dns/c-ares
-RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
-		fping:${PORTSDIR}/net/fping \
-		mtr:${PORTSDIR}/net/mtr-nox11
+BUILD_DEPENDS=	rrdtool:databases/rrdtool
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libpcre.so:devel/pcre \
+		libcares.so:dns/c-ares
+RUN_DEPENDS=	rrdtool:databases/rrdtool \
+		fping:net/fping \
+		mtr:net/mtr-nox11
 
 USERS=		xymon
 GROUPS=		xymon
@@ -63,7 +63,7 @@ USE_OPENLDAP=	yes
 
 .if ${PORT_OPTIONS:MNETSNMP}
 MAKE_ENV+=	WITH_NETSNMP=1
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 .endif
 
 post-patch:
diff --git a/net-mgmt/yaf/Makefile b/net-mgmt/yaf/Makefile
index 131bdcf2fcb8..4c4f7364733b 100644
--- a/net-mgmt/yaf/Makefile
+++ b/net-mgmt/yaf/Makefile
@@ -12,10 +12,10 @@ COMMENT=	YAF is Yet Another Flowmeter
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfixbuf.so:${PORTSDIR}/net/libfixbuf \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libpcap.so:${PORTSDIR}/net/libpcap \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libfixbuf.so:net/libfixbuf \
+		libltdl.so:devel/libltdl \
+		libpcap.so:net/libpcap \
+		libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -64,7 +64,7 @@ ENTROPY_IMPLIES=	PAYLOAD
 P0FPRINT_IMPLIES=	APPLABEL
 NONIP_IMPLIES=		MPLS
 
-P0FPRINT_LIB_DEPENDS=	libp0f.so:${PORTSDIR}/net/libp0f
+P0FPRINT_LIB_DEPENDS=	libp0f.so:net/libp0f
 
 .include <bsd.port.options.mk>
 
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index 9dd39bd62b19..ef01e996c6a2 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} \
 			--datadir=${ETCDIR}
 
 .if ${ZABBIX_BUILD} != "agent"
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 USES+=		execinfo
 
 CPPFLAGS+=	${EXECINFO_CPPFLAGS}
@@ -98,33 +98,33 @@ SQLITE_USE=	SQLITE=3
 ORACLE_CONFIGURE_WITH=	oracle
 
 CURL_CONFIGURE_WITH=	libcurl
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=	OPENLDAP=yes
 
 IPMI_CONFIGURE_WITH=	openipmi
-IPMI_LIB_DEPENDS=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
+IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 
 JABBER_CONFIGURE_WITH=	jabber
-JABBER_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
+JABBER_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 
-FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
+FPING_RUN_DEPENDS=	fping:net/fping
 
 SSH_CONFIGURE_WITH=	ssh2
-SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 
 IODBC_CONFIGURE_WITH=	iodbc
-IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 
 UNIXODBC_CONFIGURE_WITH=	unixodbc
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 .endif # if ${ZABBIX_BUILD} != "agent"
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
-NMAP_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-			sudo:${PORTSDIR}/security/sudo
+NMAP_RUN_DEPENDS=	nmap:security/nmap \
+			sudo:security/sudo
 
 JAVAGW_CONFIGURE_ENABLE=	java
 JAVAGW_USE=	JAVA=yes
diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile
index 04e603d1df09..239415dfeb32 100644
--- a/net-mgmt/zabbix22-server/Makefile
+++ b/net-mgmt/zabbix22-server/Makefile
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} \
 			--with-iconv=${ICONV_PREFIX}
 
 .if ${ZABBIX_BUILD} != "agent"
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 USES+=		execinfo
 
 CPPFLAGS+=	${EXECINFO_CPPFLAGS}
@@ -100,39 +100,39 @@ SQLITE_USE=	SQLITE=3
 ORACLE_CONFIGURE_WITH=	oracle
 
 CURL_CONFIGURE_WITH=	libcurl
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=	OPENLDAP=yes
 
 IPMI_CONFIGURE_WITH=	openipmi
-IPMI_LIB_DEPENDS=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
+IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 
 JABBER_CONFIGURE_WITH=	jabber
-JABBER_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
+JABBER_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 
-FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
+FPING_RUN_DEPENDS=	fping:net/fping
 
 SSH_CONFIGURE_WITH=	ssh2
-SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 
 IODBC_CONFIGURE_WITH=	iodbc
-IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 
 UNIXODBC_CONFIGURE_WITH=	unixodbc
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 .endif # if ${ZABBIX_BUILD} != "agent"
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
-NMAP_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-		sudo:${PORTSDIR}/security/sudo
+NMAP_RUN_DEPENDS=	nmap:security/nmap \
+		sudo:security/sudo
 
 JAVAGW_CONFIGURE_ENABLE=	java
 JAVAGW_USE=	JAVA=yes
 
 LIBXML2_CONFIGURE_WITH=	libxml2
-LIBXML2_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 .include <bsd.port.options.mk>
 
diff --git a/net-mgmt/zabbix24-server/Makefile b/net-mgmt/zabbix24-server/Makefile
index 76299f3891d0..7540e704e8f6 100644
--- a/net-mgmt/zabbix24-server/Makefile
+++ b/net-mgmt/zabbix24-server/Makefile
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} \
 			--with-iconv=${ICONV_PREFIX}
 
 .if ${ZABBIX_BUILD} != "agent"
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 USES+=		execinfo
 
 CPPFLAGS+=	${EXECINFO_CPPFLAGS}
@@ -102,39 +102,39 @@ SQLITE_USE=		SQLITE=3
 ORACLE_CONFIGURE_WITH=	oracle
 
 CURL_CONFIGURE_WITH=	libcurl
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
 IPMI_CONFIGURE_WITH=	openipmi
-IPMI_LIB_DEPENDS=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
+IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 
 JABBER_CONFIGURE_WITH=	jabber
-JABBER_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
+JABBER_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 
-FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
+FPING_RUN_DEPENDS=	fping:net/fping
 
 SSH_CONFIGURE_WITH=	ssh2
-SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 
 IODBC_CONFIGURE_WITH=	iodbc
-IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 
 UNIXODBC_CONFIGURE_WITH=unixodbc
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 .endif # if ${ZABBIX_BUILD} != "agent"
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
-NMAP_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-			sudo:${PORTSDIR}/security/sudo
+NMAP_RUN_DEPENDS=	nmap:security/nmap \
+			sudo:security/sudo
 
 JAVAGW_CONFIGURE_ENABLE=java
 JAVAGW_USE=		JAVA=yes
 
 LIBXML2_CONFIGURE_WITH=	libxml2
-LIBXML2_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 .include <bsd.port.options.mk>
 
diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile
index 886cf013755d..638ac39880b5 100644
--- a/net-mgmt/zabbix3-server/Makefile
+++ b/net-mgmt/zabbix3-server/Makefile
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} \
 			--with-iconv=${ICONV_PREFIX}
 
 .if ${ZABBIX_BUILD} != "agent"
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 USES+=		execinfo
 
 CPPFLAGS+=	${EXECINFO_CPPFLAGS}
@@ -102,39 +102,39 @@ SQLITE_USE=		SQLITE=3
 ORACLE_CONFIGURE_WITH=	oracle
 
 CURL_CONFIGURE_WITH=	libcurl
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
 IPMI_CONFIGURE_WITH=	openipmi
-IPMI_LIB_DEPENDS=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
+IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 
 JABBER_CONFIGURE_WITH=	jabber
-JABBER_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
+JABBER_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 
-FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
+FPING_RUN_DEPENDS=	fping:net/fping
 
 SSH_CONFIGURE_WITH=	ssh2
-SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 
 IODBC_CONFIGURE_WITH=	iodbc
-IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 
 UNIXODBC_CONFIGURE_WITH=unixodbc
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 .endif # if ${ZABBIX_BUILD} != "agent"
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
-NMAP_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-			sudo:${PORTSDIR}/security/sudo
+NMAP_RUN_DEPENDS=	nmap:security/nmap \
+			sudo:security/sudo
 
 JAVAGW_CONFIGURE_ENABLE=java
 JAVAGW_USE=		JAVA=yes
 
 LIBXML2_CONFIGURE_WITH=	libxml2
-LIBXML2_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 .include <bsd.port.options.mk>
 
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 42dc63538aea..d85bde2fe473 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT=	All-platform eMule p2p client
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcryptopp.so:${PORTSDIR}/security/cryptopp
+LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
 CONFLICTS=	amule-[0-9]*
 
@@ -75,14 +75,14 @@ AMULEDAEMON_USE=	RC_SUBR=amuled
 AMULEGUI_CONFIGURE_ON=	--enable-amule-gui
 
 CAS_CONFIGURE_ON=	--enable-cas
-CAS_LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+CAS_LIB_DEPENDS=	libgd.so:graphics/gd
 
 ED2K_CONFIGURE_OFF=	--disable-ed2k
 
 FILEVIEW_CONFIGURE_ON=	--enable-fileview
 
 GEOIP_CONFIGURE_ON=	--enable-geoip
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 MMAP_CONFIGURE_ON=	--enable-mmap
 
@@ -95,7 +95,7 @@ PLASMAMULE_CONFIGURE_ENV= \
 			KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
 			UPDATE_MIME_DATABASE=/usr/bin/true
 
-UPNP_LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
+UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 UPNP_CONFIGURE_OFF=	--disable-upnp
 
 WEBSERVER_CONFIGURE_ON=	--enable-webserver
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index f03955ac8383..779dc37b18fe 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -14,7 +14,7 @@ COMMENT=	All-platform eMule p2p client
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcryptopp.so:${PORTSDIR}/security/cryptopp
+LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
 CONFLICTS=	amule-devel-[0-9]*
 
@@ -74,14 +74,14 @@ AMULEDAEMON_USE=	RC_SUBR=amuled
 AMULEGUI_CONFIGURE_ON=	--enable-amule-gui
 
 CAS_CONFIGURE_ON=	--enable-cas
-CAS_LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+CAS_LIB_DEPENDS=	libgd.so:graphics/gd
 
 ED2K_CONFIGURE_OFF=	--disable-ed2k
 
 FILEVIEW_CONFIGURE_ON=	--enable-fileview
 
 GEOIP_CONFIGURE_ON=	--enable-geoip
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 MMAP_CONFIGURE_ON=	--enable-mmap
 
@@ -94,7 +94,7 @@ PLASMAMULE_CONFIGURE_ENV= \
 			KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
 			UPDATE_MIME_DATABASE=/usr/bin/true
 
-UPNP_LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
+UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 UPNP_CONFIGURE_OFF=	--disable-upnp
 
 WEBSERVER_CONFIGURE_ON=	--enable-webserver
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 9f07fde7b4ed..ff49d9ccff16 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -11,7 +11,7 @@ COMMENT?=	Virtual Peer-to-Peer Currency Client (QT)
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
 USES=		autoreconf compiler:c++0x gmake libtool pkgconfig shebangfix
 SHEBANG_FILES=	src/test/*.py
@@ -26,8 +26,8 @@ USES+=		desktop-file-utils
 USE_QT4=	corelib gui moc_build linguisttools_build network qmake_build \
 		rcc_build uic_build
 
-BUILD_DEPENDS+=	protoc:${PORTSDIR}/devel/protobuf
-LIB_DEPENDS+=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+BUILD_DEPENDS+=	protoc:devel/protobuf
+LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 
 TESTS_USE=		QT4=testlib
 TESTS_PLIST_FILES=	%%QT_BINDIR%%/test_bitcoin-qt \
@@ -57,12 +57,12 @@ TESTS_PLIST_FILES=	bin/test_bitcoin
 .endif
 
 UPNP_CONFIGURE_WITH=	miniupnpc
-UPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CPPFLAGS=		-I${LOCALBASE}/include
 UPNP_LIBS=		-L${LOCALBASE}/lib
 
 QRCODES_CONFIGURE_WITH=	qrencode
-QRCODES_LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 WALLET_CONFIGURE_ENABLE=	wallet
 WALLET_CXXFLAGS=		-I${BDB_INCLUDE_DIR}
diff --git a/net-p2p/bitflu/Makefile b/net-p2p/bitflu/Makefile
index 8821103961cb..43f4cdf8ef37 100644
--- a/net-p2p/bitflu/Makefile
+++ b/net-p2p/bitflu/Makefile
@@ -12,8 +12,8 @@ COMMENT=	BitTorrent client written in Perl
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/Documentation/artistic-2_0.txt
 
-RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket
+RUN_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Danga-Socket>=0:devel/p5-Danga-Socket
 
 USES=		perl5 shebangfix tar:tgz
 NO_BUILD=	yes
@@ -27,7 +27,7 @@ PORTDOCS=	ChangeLog.txt README.txt README_IPv6.txt
 OPTIONS_DEFINE=		DOCS EXAMPLES IPV6
 OPTIONS_DEFAULT=	IPV6
 
-IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
+IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|'\''.bitflu.config'\''|"$$ENV{HOME}/.bitflu.config"|; \
diff --git a/net-p2p/bitmessage/Makefile b/net-p2p/bitmessage/Makefile
index c2c30f112366..bd088ec5d93a 100644
--- a/net-p2p/bitmessage/Makefile
+++ b/net-p2p/bitmessage/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Secure P2P communications client
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Bitmessage
diff --git a/net-p2p/cpuminer/Makefile b/net-p2p/cpuminer/Makefile
index 8bda704c98a0..c734ccbcefde 100644
--- a/net-p2p/cpuminer/Makefile
+++ b/net-p2p/cpuminer/Makefile
@@ -13,8 +13,8 @@ COMMENT=	CPU miner for Litecoin and Bitcoin
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libjansson.so:${PORTSDIR}/devel/jansson
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libjansson.so:devel/jansson
 
 USES=		autoreconf cpe
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 8f56525fa787..8c7314f5deb8 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Bittorrent client using Python, GTK2, and libtorrent-rasterbar
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0.18:${PORTSDIR}/devel/py-xdg \
-		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:${PORTSDIR}/net-p2p/libtorrent-rasterbar-python \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.8:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:${PORTSDIR}/textproc/py-chardet \
-		${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:${PORTSDIR}/textproc/py-mako
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg \
+		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/libtorrent-rasterbar-python \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet \
+		${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako
 
 USE_RC_SUBR=	deluged deluge_web
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
@@ -35,10 +35,10 @@ PORTDOCS=	ChangeLog README
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}game>=1.8.1:${PORTSDIR}/devel/py-game \
-		${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify \
-		xdg-utils>=1.0.2:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}game>=1.8.1:devel/py-game \
+		${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify \
+		xdg-utils>=1.0.2:devel/xdg-utils
 
 USE_GNOME+=	intltool librsvg2 pygnome2 pygtk2
 USES+=		desktop-file-utils
diff --git a/net-p2p/digitalcoin/Makefile b/net-p2p/digitalcoin/Makefile
index 3a0fbf4536f0..18e7301c06a5 100644
--- a/net-p2p/digitalcoin/Makefile
+++ b/net-p2p/digitalcoin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Alternative Bitcoin peer-to-peer currency client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
+		libminiupnpc.so:net/miniupnpc
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	baritus
diff --git a/net-p2p/dogecoin/Makefile b/net-p2p/dogecoin/Makefile
index 7a1a1537eeb5..c89b8bf02875 100644
--- a/net-p2p/dogecoin/Makefile
+++ b/net-p2p/dogecoin/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Virtual Peer-to-Peer Currency Client
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
+BUILD_DEPENDS=	protoc:devel/protobuf
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
 OPTIONS_DEFINE=	GUI UPNP QRCODES
 OPTIONS_DEFAULT=	GUI QRCODES
@@ -55,12 +55,12 @@ PLIST_FILES+=	share/applications/dogecoin-qt.desktop \
 
 QRCODES_CONFIGURE_ENABLE=	qrencode
 .if ${PORT_OPTIONS:MQRCODES}
-LIB_DEPENDS+=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+LIB_DEPENDS+=	libqrencode.so:graphics/libqrencode
 .endif
 
 UPNP_CONFIGURE_ENABLE=		miniupnpc
 .if ${PORT_OPTIONS:MUPNP}
-LIB_DEPENDS+=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+LIB_DEPENDS+=	libminiupnpc.so:net/miniupnpc
 .endif
 
 SUB_FILES+=	dogecoin-qt.desktop
diff --git a/net-p2p/eiskaltdcpp-cli/Makefile b/net-p2p/eiskaltdcpp-cli/Makefile
index 5d3cc8eed2a8..03c122c09ce9 100644
--- a/net-p2p/eiskaltdcpp-cli/Makefile
+++ b/net-p2p/eiskaltdcpp-cli/Makefile
@@ -10,9 +10,9 @@ COMMENT=	EiskaltDC++ Direct Connect command-line interface
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \
-		p5-JSON-RPC>=0:${PORTSDIR}/devel/p5-JSON-RPC \
-		p5-Term-ShellUI>=0:${PORTSDIR}/shells/p5-Term-ShellUI
+RUN_DEPENDS=	p5-RPC-XML>=0:net/p5-RPC-XML \
+		p5-JSON-RPC>=0:devel/p5-JSON-RPC \
+		p5-Term-ShellUI>=0:shells/p5-Term-ShellUI
 
 MASTERDIR=	${.CURDIR}/../eiskaltdcpp-lib
 
diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp-daemon/Makefile
index ec6c8fc7e8ce..8aa69e9d5434 100644
--- a/net-p2p/eiskaltdcpp-daemon/Makefile
+++ b/net-p2p/eiskaltdcpp-daemon/Makefile
@@ -11,7 +11,7 @@ COMMENT=	EiskaltDC++ Direct Connect client daemon
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libeiskaltdcpp.so:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
+LIB_DEPENDS=	libeiskaltdcpp.so:net-p2p/eiskaltdcpp-lib
 
 MASTERDIR=	${.CURDIR}/../eiskaltdcpp-lib
 
@@ -37,7 +37,7 @@ CMAKE_ARGS+=	-DCREATE_MO:BOOL=OFF
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}
 
-XMLRPC_LIB_DEPENDS=	libxmlrpc++.so:${PORTSDIR}/net/xmlrpc-c-devel
+XMLRPC_LIB_DEPENDS=	libxmlrpc++.so:net/xmlrpc-c-devel
 XMLRPC_CMAKE_ON=	-DXMLRPC_DAEMON:BOOL=ON -DJSONRPC_DAEMON:BOOL=OFF -DNO_UI_DAEMON:BOOL=OFF
 JSONRPC_CMAKE_ON=	-DXMLRPC_DAEMON:BOOL=OFF -DJSONRPC_DAEMON:BOOL=ON -DNO_UI_DAEMON:BOOL=OFF
 NOUI_CMAKE_ON=		-DXMLRPC_DAEMON:BOOL=OFF -DJSONRPC_DAEMON:BOOL=OFF -DNO_UI_DAEMON:BOOL=ON
diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
index 16ee5df762be..24f3bf13f046 100644
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -11,8 +11,8 @@ COMMENT=	EiskaltDC++ Direct Connect client GTK GUI
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	eiskaltdcpp-data>=0:${PORTSDIR}/net-p2p/eiskaltdcpp-data
-LIB_DEPENDS=	libeiskaltdcpp.so:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
+RUN_DEPENDS=	eiskaltdcpp-data>=0:net-p2p/eiskaltdcpp-data
+LIB_DEPENDS=	libeiskaltdcpp.so:net-p2p/eiskaltdcpp-lib
 
 MASTERDIR=	${.CURDIR}/../eiskaltdcpp-lib
 
@@ -41,10 +41,10 @@ NOSOUND_CMAKE_ON=	-DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=OFF
 LIBGNOME2_USE=		gnome=libgnome
 LIBGNOME2_CMAKE_ON=	-DUSE_LIBGNOME2:BOOL=ON -DUSE_LIBCANBERRA:BOOL=OFF
 
-LIBCANBERRA_LIB_DEPENDS=libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
+LIBCANBERRA_LIB_DEPENDS=libcanberra-gtk.so:audio/libcanberra
 LIBCANBERRA_CMAKE_ON=	-DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=ON
 
-LIBNOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIBNOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 LIBNOTIFY_CMAKE_ON=	-DUSE_LIBNOTIFY:BOOL=ON
 LIBNOTIFY_CMAKE_OFF=	-DUSE_LIBNOTIFY:BOOL=OFF
 
diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index 0ecf7f368dc2..c9559f922ee4 100644
--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Direct Connect client shared library
 LICENSE=	GPLv3
 
 .if !defined (MASTERDIR)
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USES=		cmake gettext compiler:c++11-lib
 USE_OPENSSL=	yes
@@ -37,18 +37,18 @@ LUA_USES=	lua:51
 LUA_CMAKE_ON=	-DLUA_SCRIPT:BOOL=ON
 LUA_CMAKE_OFF=	-DLUA_SCRIPT:BOOL=OFF
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CMAKE_ON=	-DPERL_REGEX:BOOL=ON
 PCRE_CMAKE_OFF=	-DPERL_REGEX:BOOL=OFF
 
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CMAKE_ON=	-DUSE_IDNA:BOOL=ON
 IDN_CMAKE_OFF=	-DUSE_IDNA:BOOL=OFF
 
 DHT_CMAKE_ON=	-DWITH_DHT:BOOL=ON
 DHT_CMAKE_OFF=	-DWITH_DHT:BOOL=OFF
 
-MINIUPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+MINIUPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 MINIUPNP_CMAKE_ON=	-DUSE_MINIUPNP:BOOL=ON -DLOCAL_MINIUPNP:BOOL=OFF
 MINIUPNP_CMAKE_OFF=	-DUSE_MINIUPNP:BOOL=OFF
 .endif
diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
index fe3f878217b1..c0f468f0da96 100644
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -11,8 +11,8 @@ COMMENT=	EiskaltDC++ Direct Connect client Qt GUI
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	eiskaltdcpp-data>=0:${PORTSDIR}/net-p2p/eiskaltdcpp-data
-LIB_DEPENDS=	libeiskaltdcpp.so:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
+RUN_DEPENDS=	eiskaltdcpp-data>=0:net-p2p/eiskaltdcpp-data
+LIB_DEPENDS=	libeiskaltdcpp.so:net-p2p/eiskaltdcpp-lib
 
 MASTERDIR=	${.CURDIR}/../eiskaltdcpp-lib
 
@@ -37,7 +37,7 @@ CMAKE_ARGS+=	-DINSTALL_DATA:BOOL=OFF
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}
 
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CMAKE_ON=	-DUSE_ASPELL:BOOL=ON
 ASPELL_CMAKE_OFF=	-DUSE_ASPELL:BOOL=OFF
 
@@ -49,7 +49,7 @@ DBUS_NOTIFY_CMAKE_ON=	-DDBUS_NOTIFY:BOOL=ON
 DBUS_NOTIFY_CMAKE_OFF=	-DDBUS_NOTIFY:BOOL=OFF
 
 QTSCRIPT_USE=		QT4=script
-QTSCRIPT_RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator
+QTSCRIPT_RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:devel/qtscriptgenerator
 QTSCRIPT_CMAKE_ON=	-DUSE_JS:BOOL=ON
 QTSCRIPT_CMAKE_OFF=	-DUSE_JS:BOOL=OFF
 
diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile
index 11aecded6547..ea2c4438e031 100644
--- a/net-p2p/gkremldk/Makefile
+++ b/net-p2p/gkremldk/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Shows current mldonkey donwload/upload rates and allows setting them
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		autoreconf pkgconfig tar:tbz
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/gnunet-gtk/Makefile b/net-p2p/gnunet-gtk/Makefile
index 0bf4ee79ce57..675024db10e8 100644
--- a/net-p2p/gnunet-gtk/Makefile
+++ b/net-p2p/gnunet-gtk/Makefile
@@ -11,11 +11,11 @@ COMMENT=	GTK interface to GNUnet
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgladeui-1.so:${PORTSDIR}/devel/glade3 \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libqrencode.so:${PORTSDIR}/graphics/libqrencode \
-		libgnunetutil.so:${PORTSDIR}/net-p2p/gnunet \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	libgladeui-1.so:devel/glade3 \
+		libltdl.so:devel/libltdl \
+		libqrencode.so:graphics/libqrencode \
+		libgnunetutil.so:net-p2p/gnunet \
+		libunique-1.0.so:x11-toolkits/unique
 
 USES=		gmake iconv libtool pathfix pkgconfig
 USE_GNOME=	gtk20
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index f185d7dec771..6856458dd6df 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Anonymous, distributed, reputation-based network
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libopus.so:${PORTSDIR}/audio/opus \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libunistring.so:${PORTSDIR}/devel/libunistring \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libglpk.so:${PORTSDIR}/math/glpk \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libextractor.so:${PORTSDIR}/textproc/libextractor
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libopus.so:audio/opus \
+		libpulse.so:audio/pulseaudio \
+		libltdl.so:devel/libltdl \
+		libunistring.so:devel/libunistring \
+		libidn.so:dns/libidn \
+		libglpk.so:math/glpk \
+		libgmp.so:math/gmp \
+		libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt \
+		libextractor.so:textproc/libextractor
 
 USES=		gmake iconv libtool pathfix pkgconfig
 USE_GNOME=	glib20
@@ -56,7 +56,7 @@ OPTIONS_DEFAULT=	SQLITE
 OPTIONS_SUB=		yes
 
 HTTP_DESC=		Enable HTTP transport via libmicrohttpd
-HTTP_LIB_DEPENDS=	libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
+HTTP_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 HTTP_CONFIGURE_ON=	--with-microhttpd=${LOCALBASE}
 HTTP_CONFIGURE_OFF=	--without-microhttpd
 MYSQL_DESC=		Use MySQL for the data store and cache
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 72f028374f88..368e103b633d 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -70,7 +70,7 @@ OPTIONS_DEFINE=		DBUS DEBUG GUI IPV6 NLS PORTABILITY TLS
 OPTIONS_DEFAULT=	GUI TLS
 OPTIONS_SUB=		yes
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_OFF=	-Ud_dbus
 DEBUG_CONFIGURE_ON=	-Ud_official
 GUI_USE=		gnome=gtk20
@@ -81,7 +81,7 @@ NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	-Ud_nls
 PORTABILITY_DESC=	Use the PATH variable at run-time
 PORTABILITY_CONFIGURE_ON=	-Dd_portable
-TLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+TLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 TLS_CONFIGURE_OFF=	-Ud_gnutls
 
 .if !defined(INTERACTIVE_CONFIGURE)
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 4c558adf2029..e90715f8940d 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -15,7 +15,7 @@ COMMENT=	GTK+2 viewer and editor for BitTorrent meta files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake pkgconfig desktop-file-utils
 USE_GNOME=	gtk20 intlhack
diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index 20c96cf71346..19e31de0c20d 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://atterer.org/sites/atterer/files/2009-08/${PORTNAME}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility used to retrieve large files over the Internet
 
-RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	${LOCALBASE}/bin/wget:ftp/wget
 
 USES=		gmake tar:bzip2
 USE_SUBMAKE=	yes
@@ -26,8 +26,8 @@ GUI_DESC=		GTK2 Graphical User Interface
 BDB_DESC=		Berkeley DB support (for jigdo-file cache)
 
 GUI_CONFIGURE_WITH=	gui
-GUI_LIB_DEPENDS=	libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
-			libcurl.so:${PORTSDIR}/ftp/curl
+GUI_LIB_DEPENDS=	libgtk-x11-2.0.so:x11-toolkits/gtk20 \
+			libcurl.so:ftp/curl
 GUI_USES=		pkgconfig
 
 BDB_CONFIGURE_ON=	--with-libdb=-l${BDB_LIB_CXX_NAME}
diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index 0d372e7b1f90..5f8a8a5396b8 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION}/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	BitTorrent client for KDE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libktorrent.so:${PORTSDIR}/net-p2p/libktorrent
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:devel/boost-libs
+LIB_DEPENDS=	libtag.so:audio/taglib \
+		libgmp.so:math/gmp \
+		libktorrent.so:net-p2p/libktorrent
 
 USE_KDE4=	kdelibs kdeprefix automoc4 pimlibs workspace
 USE_QT4=	corelib gui network qt3support qtestlib webkit \
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index 23e582002e14..d77aac001359 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	C library implementing the core BitTorrent protocol
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index 6877a7dbdcbd..7e960132a3c1 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION:C,^1,4,:C,-.*,,}/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Torrent library from KTorrent project
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libqca.so:${PORTSDIR}/devel/qca
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:devel/boost-libs
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgmp.so:math/gmp \
+		libqca.so:devel/qca
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qtestlib_build qmake_build moc_build rcc_build uic_build
diff --git a/net-p2p/libtorrent-rasterbar-python/Makefile b/net-p2p/libtorrent-rasterbar-python/Makefile
index 517502a93e6d..612922a5e082 100644
--- a/net-p2p/libtorrent-rasterbar-python/Makefile
+++ b/net-p2p/libtorrent-rasterbar-python/Makefile
@@ -6,8 +6,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python bindings for libtorrent-rasterbar
 
-LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar \
-		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
+		libboost_python.so:devel/boost-python-libs
 
 MASTERDIR=	${.CURDIR}/../libtorrent-rasterbar
 
diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index 01d2bc3df747..26fd12f37df6 100644
--- a/net-p2p/libtorrent-rasterbar/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -11,8 +11,8 @@ COMMENT?=	C++ library implementing a BitTorrent client
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS?=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS?=	libboost_date_time.so:devel/boost-libs \
+		libGeoIP.so:net/GeoIP
 
 USES+=		compiler:c++11-lang iconv:wchar_t libtool pathfix pkgconfig
 USE_OPENSSL=	yes
diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile
index eb512fa60301..b5e7cf77d37d 100644
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Port of the DC++ Direct Connect client to Unix-like systems
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
 
 USES=		gettext iconv pkgconfig scons tar:bzip2
 USE_GNOME=	libglade2
@@ -30,7 +30,7 @@ MAKE_ARGS+=	debug=1
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_MAKE_ARGS_OFF=	libnotify=0
 
 post-patch:
diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile
index cb7b6aed57bc..6bc7bd3b64f0 100644
--- a/net-p2p/litecoin/Makefile
+++ b/net-p2p/litecoin/Makefile
@@ -14,7 +14,7 @@ COMMENT?=	Virtual Peer-to-Peer Currency Client (QT)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
 USES+=		autoreconf gmake libtool pkgconfig shebangfix
 SHEBANG_FILES=	src/test/*.py
@@ -32,8 +32,8 @@ CPE_VENDOR=	bitcoin
 CPE_PRODUCT=	bitcoin-qt
 CPE_VERSION=	${PORTVERSION:R}
 
-BUILD_DEPENDS+=	protoc:${PORTSDIR}/devel/protobuf
-LIB_DEPENDS+=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+BUILD_DEPENDS+=	protoc:devel/protobuf
+LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 
 DBUS_USE=		QT4=dbus
 
@@ -61,12 +61,12 @@ TESTS_CONFIGURE_ENABLE=	tests
 TESTS_PLIST_FILES+=	bin/test_litecoin
 
 UPNP_CONFIGURE_WITH=	miniupnpc
-UPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CPPFLAGS=		-I${LOCALBASE}/include
 UPNP_LIBS=		-L${LOCALBASE}/lib
 
 QRCODES_CONFIGURE_WITH=	qrencode
-QRCODES_LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 WALLET_CONFIGURE_ENABLE=	wallet
 WALLET_CXXFLAGS=		-I${BDB_INCLUDE_DIR}
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index 342c17e38ba2..c2ec3f93a34a 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -24,9 +24,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 OPTIONS_DEFINE=	FLAC OGG ZLIB
 OPTIONS_DEFAULT=	FLAC OGG ZLIB
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_WITH=	flac
-OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_CONFIGURE_WITH=	ogg
 ZLIB_CONFIGURE_WITH=	zlib
 
diff --git a/net-p2p/minder/Makefile b/net-p2p/minder/Makefile
index f81165c5bbf9..ca9b0e8f958b 100644
--- a/net-p2p/minder/Makefile
+++ b/net-p2p/minder/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small network application for automatic maintenance of peer lists
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libSockets.so:${PORTSDIR}/net/Sockets
+LIB_DEPENDS=	libSockets.so:net/Sockets
 
 USES=		gmake pkgconfig
 USE_GNOME=	libxml2
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 8e87d66802b0..f864b2e470cb 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -70,8 +70,8 @@ PLIST_SUB+=	CORE="@comment " GUI="" GUICORE="@comment "
 .endif # ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE}
 
 .if ${PORT_OPTIONS:MGUI}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-LIB_DEPENDS+=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:x11-toolkits/ocaml-lablgtk2
+LIB_DEPENDS+=	librsvg-2.so:graphics/librsvg2
 
 CONFIGURE_ARGS+=--enable-gui=newgui2
 # we don't need lablgtk as RUN dependency, but we need gtk+glib
@@ -83,7 +83,7 @@ USE_RC_SUBR=	mlnet
 SUB_LIST+=	SH=${SH:Q}
 
 . if ${PORT_OPTIONS:MGD}
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	libgd.so:graphics/gd
 . else
 CONFIGURE_ARGS+=--disable-gd
 . endif
diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile
index e58d5979902f..19fd126e9034 100644
--- a/net-p2p/namecoin/Makefile
+++ b/net-p2p/namecoin/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Decentralized, open DNS system and general purpose key/value store
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
 OPTIONS_DEFINE=	X11 UPNP QRCODES DBUS
 OPTIONS_DEFAULT=	X11 QRCODES
@@ -40,7 +40,7 @@ CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM
 USE_QT4=	corelib network gui qmake_build linguist_build uic_build moc_build rcc_build
 
 BINARY=		namecoin-qt
-LIB_DEPENDS+=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 .else
 BINARY=		namecoind
 MAKE_ARGS+=	-C ${WRKSRC}/src
@@ -48,7 +48,7 @@ USE_GNOME=	glib20
 .endif
 
 .if ${PORT_OPTIONS:MQRCODES}
-LIB_DEPENDS+=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+LIB_DEPENDS+=	libqrencode.so:graphics/libqrencode
 QMAKE_USE_QRCODE=1
 .else
 QMAKE_USE_QRCODE=0
@@ -64,7 +64,7 @@ QMAKE_USE_DBUS=	0
 PLIST_FILES+=	bin/${BINARY}
 
 .if ${PORT_OPTIONS:MUPNP}
-LIB_DEPENDS+=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+LIB_DEPENDS+=	libminiupnpc.so:net/miniupnpc
 CXXFLAGS+=	-I${LOCALBASE}/include/miniupnpc
 QMAKE_USE_UPNP=	1
 .else
diff --git a/net-p2p/ncdc/Makefile b/net-p2p/ncdc/Makefile
index 5050ad11a532..6f7fe8f03b89 100644
--- a/net-p2p/ncdc/Makefile
+++ b/net-p2p/ncdc/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Lightweight direct connect client with ncurses interface
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libnettle.so:${PORTSDIR}/security/nettle \
-		libp11-kit.so:${PORTSDIR}/security/p11-kit
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
+		libpcre.so:devel/pcre \
+		libgmp.so:math/gmp \
+		libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt \
+		libnettle.so:security/nettle \
+		libp11-kit.so:security/p11-kit
 
 USES=		gmake pkgconfig ncurses
 USE_GNOME=	glib20
@@ -35,6 +35,6 @@ OPTIONS_DEFINE=	GEOIP
 GEOIP_CONFIGURE_WITH=	geoip
 GEOIP_CONFIGURE_ENV=	GEOIP_CFLAGS="-I${LOCALBASE}/include" \
 			GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 .include <bsd.port.mk>
diff --git a/net-p2p/p5-Net-BitTorrent-File/Makefile b/net-p2p/p5-Net-BitTorrent-File/Makefile
index dc4457c2617f..be13437f6fbe 100644
--- a/net-p2p/p5-Net-BitTorrent-File/Makefile
+++ b/net-p2p/p5-Net-BitTorrent-File/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Perl5 module for handles loading and saving of .torrent file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Convert-Bencode>=0:${PORTSDIR}/converters/p5-Convert-Bencode \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Convert-Bencode>=0:converters/p5-Convert-Bencode \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net-p2p/p5-Net-DirectConnect/Makefile b/net-p2p/p5-Net-DirectConnect/Makefile
index 1e4794fbf68d..11630a4192d1 100644
--- a/net-p2p/p5-Net-DirectConnect/Makefile
+++ b/net-p2p/p5-Net-DirectConnect/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Perl Direct Connect lib and client
 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-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Crypt-RHash>=0:${PORTSDIR}/security/p5-Crypt-RHash \
-		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
-		p5-lib-abs>=0:${PORTSDIR}/devel/p5-lib-abs \
-		p5-MIME-Base32>=0:${PORTSDIR}/converters/p5-MIME-Base32 \
-		p5-Sys-Sendfile-FreeBSD>=0:${PORTSDIR}/devel/p5-Sys-Sendfile-FreeBSD
+BUILD_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Crypt-RHash>=0:security/p5-Crypt-RHash \
+		p5-Socket6>=0:net/p5-Socket6 \
+		p5-lib-abs>=0:devel/p5-lib-abs \
+		p5-MIME-Base32>=0:converters/p5-MIME-Base32 \
+		p5-Sys-Sendfile-FreeBSD>=0:devel/p5-Sys-Sendfile-FreeBSD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net-p2p/p5-WWW-BitTorrent/Makefile b/net-p2p/p5-WWW-BitTorrent/Makefile
index 613c1b6ebc27..077e4253879e 100644
--- a/net-p2p/p5-WWW-BitTorrent/Makefile
+++ b/net-p2p/p5-WWW-BitTorrent/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Search and Download .torrent(s) files from BitTorrents boards
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/net-p2p/py-transmissionrpc/Makefile b/net-p2p/py-transmissionrpc/Makefile
index baf98d3bf54a..42952261f1ee 100644
--- a/net-p2p/py-transmissionrpc/Makefile
+++ b/net-p2p/py-transmissionrpc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python module that communicates with Transmission through JSON-RPC
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/net-p2p/py-vertex/Makefile b/net-p2p/py-vertex/Makefile
index e42ec53726cc..e14fab73a16b 100644
--- a/net-p2p/py-vertex/Makefile
+++ b/net-p2p/py-vertex/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	Vertex-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Vertex is an implementation of the Q2Q protocol
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/epsilon/__init__.py:${PORTSDIR}/devel/py-epsilon \
-		${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/epsilon/__init__.py:${PORTSDIR}/devel/py-epsilon \
-		${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/epsilon/__init__.py:devel/py-epsilon \
+		${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/epsilon/__init__.py:devel/py-epsilon \
+		${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl
 
 LICENSE=	MIT
 
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index b80a8bffc4b6..de62c64c764a 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -12,8 +12,8 @@ COMMENT?=	Bittorrent client using Qt4 and libtorrent-rasterbar
 LICENSE=	GPLv2
 
 # ABI versions specified on purpose for libtorrent-rasterbar
-LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
+		libboost_system.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	qBittorrent
@@ -26,7 +26,7 @@ QT_NONSTANDARD=	yes
 DESTDIRNAME=	INSTALL_ROOT
 
 .if !defined(SLAVE_PORT)
-LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
 USES+=		desktop-file-utils
 QT4_USE+=	QT4=gui,xml
 QT5_USE+=	QT5=gui,xml
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index b3a68c6a9b9f..5de372588b05 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Private and secure decentralised communication platform
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libupnp.so:${PORTSDIR}/devel/upnp \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libssh_threads.so:${PORTSDIR}/security/libssh
+BUILD_DEPENDS=	protoc:devel/protobuf
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libupnp.so:devel/upnp \
+		libgnome-keyring.so:security/libgnome-keyring \
+		libspeex.so:audio/speex \
+		libxslt.so:textproc/libxslt \
+		libssh_threads.so:security/libssh
 
 USES=		compiler:features dos2unix pkgconfig qmake
 USE_GNOME=	glib20 libxml2 libxslt
diff --git a/net-p2p/rtgui/Makefile b/net-p2p/rtgui/Makefile
index 9093b18d947d..899910e039d6 100644
--- a/net-p2p/rtgui/Makefile
+++ b/net-p2p/rtgui/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Web based front end for rTorrent
 
-BUILD_DEPENDS+=	xmlrpc-c-config:${PORTSDIR}/net/xmlrpc-c
+BUILD_DEPENDS+=	xmlrpc-c-config:net/xmlrpc-c
 
 USES=		tar:tgz
 
@@ -22,11 +22,11 @@ OPTIONS_DEFAULTS=	APACHE
 
 .if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
-BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_scgi.so:${PORTSDIR}/www/mod_scgi
+BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_scgi.so:www/mod_scgi
 .endif
 
 .if ${PORT_OPTIONS:MLIGHTTPD}
-RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
+RUN_DEPENDS+=	lighttpd:www/lighttpd
 .endif
 
 USE_PHP=	xmlrpc session mbstring
diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index dde60534ae52..3bd77edb5345 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -12,8 +12,8 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libtorrent.so:${PORTSDIR}/net-p2p/libtorrent
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libtorrent.so:net-p2p/libtorrent
 
 BROKEN_arm=	does not configure on arm
 
@@ -34,7 +34,7 @@ SUB_FILES=	pkg-message
 IPV6_CONFIGURE_ENABLE=	ipv6
 XMLRPC_CONFIGURE_OFF=	--with-xmlrpc-c=no
 XMLRPC_CONFIGURE_ON=	--with-xmlrpc-c
-XMLRPC_LIB_DEPENDS=	libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c-devel
+XMLRPC_LIB_DEPENDS=	libxmlrpc.so:net/xmlrpc-c-devel
 
 .include <bsd.port.options.mk>
 
diff --git a/net-p2p/sonarr/Makefile b/net-p2p/sonarr/Makefile
index 522fd816a522..d30a5212f02c 100644
--- a/net-p2p/sonarr/Makefile
+++ b/net-p2p/sonarr/Makefile
@@ -12,10 +12,10 @@ COMMENT=	PVR for Usenet and BitTorrent users
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	mono>0:${PORTSDIR}/lang/mono \
-		mediainfo>0:${PORTSDIR}/multimedia/mediainfo \
-		sqlite3>0:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+RUN_DEPENDS=	mono>0:lang/mono \
+		mediainfo>0:multimedia/mediainfo \
+		sqlite3>0:databases/sqlite3
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_RC_SUBR=	sonarr
 
diff --git a/net-p2p/torrentsniff/Makefile b/net-p2p/torrentsniff/Makefile
index be5ac642575d..eca0a26e6794 100644
--- a/net-p2p/torrentsniff/Makefile
+++ b/net-p2p/torrentsniff/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.highprogrammer.com/alan/perl/
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Commandline tool for getting status of torrent
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 
 NO_BUILD=	yes
 USES=		shebangfix perl5
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index f8644d84c09c..d6706b41c930 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -31,14 +31,14 @@ EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party
 LIB_DEPENDS?=	${GEN_LIB_DEPENDS}
 
 # General dependencies
-GEN_LIB_DEPENDS=libb64.so:${PORTSDIR}/converters/libb64 \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libdht.so:${PORTSDIR}/devel/jech-dht \
-		libminiupnpc.so:${PORTSDIR}/net/miniupnpc \
-		libnatpmp.so:${PORTSDIR}/net/libnatpmp \
-		libutp.so:${PORTSDIR}/net/libutp \
-		libevent.so:${PORTSDIR}/devel/libevent2
-GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
+GEN_LIB_DEPENDS=libb64.so:converters/libb64 \
+		libcurl.so:ftp/curl \
+		libdht.so:devel/jech-dht \
+		libminiupnpc.so:net/miniupnpc \
+		libnatpmp.so:net/libnatpmp \
+		libutp.so:net/libutp \
+		libevent.so:devel/libevent2
+GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:www/transmission-web
 
 # This is master port of transmission-*, so don't override USES definition
 USES+=		gmake iconv libtool localbase pkgconfig
@@ -72,10 +72,10 @@ OPENSSL_CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 OPENSSL_CONFIGURE_ON=	--with-crypto=openssl
 
-POLARSSL_LIB_DEPENDS=	libpolarssl.so:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS=	libpolarssl.so:security/polarssl13
 POLARSSL_CONFIGURE_ON=	--with-crypto=polarssl
 
-WOLFSSL_LIB_DEPENDS=	libwolfssl.so:${PORTSDIR}/security/wolfssl
+WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
 WOLFSSL_CONFIGURE_ON=	--with-crypto=cyassl
 WOLFSSL_BROKEN=		Requires security/wolfssl built with --enable-arc4
 .endif
diff --git a/net-p2p/transmission-gtk/Makefile b/net-p2p/transmission-gtk/Makefile
index cf622e3a3152..af7e32a215ae 100644
--- a/net-p2p/transmission-gtk/Makefile
+++ b/net-p2p/transmission-gtk/Makefile
@@ -7,11 +7,11 @@ MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Fast and lightweight GTK+3 BitTorrent client
 
 LIB_DEPENDS=	${GEN_LIB_DEPENDS} \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+		libnotify.so:devel/libnotify \
+		libdbus-glib-1.so:devel/dbus-glib
 
 RUN_DEPENDS=	${GEN_RUN_DEPENDS} \
-		xdg-open:${PORTSDIR}/devel/xdg-utils
+		xdg-open:devel/xdg-utils
 
 DESCR=		${.CURDIR}/pkg-descr
 MASTERDIR=	${.CURDIR}/../transmission-cli
diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
index d376fb0f99cd..d52a2851191a 100644
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	transgui-${PORTVERSION}-src
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Remote GUI for transmission daemon
 
-BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus \
-		fpcres:${PORTSDIR}/lang/fpc-utils
-RUN_DEPENDS=	transmission-daemon:${PORTSDIR}/net-p2p/transmission-daemon
+BUILD_DEPENDS=	lazbuild:editors/lazarus \
+		fpcres:lang/fpc-utils
+RUN_DEPENDS=	transmission-daemon:net-p2p/transmission-daemon
 
 PROJECTHOST=	transmisson-remote-gui
 
@@ -46,13 +46,13 @@ OPTIONS_DEFAULT=	GTK2
 USE_FPC+=	gtk2
 USE_GNOME=	gtk20
 LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
+LIB_DEPENDS+=	libQt4Pas.so:x11-toolkits/qt4pas
 LCL_PLATFORM=	qt
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
 .endif
 
 do-build:
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index d6711fe0d129..04dcee0986ed 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -7,9 +7,9 @@ CATEGORIES=	net-p2p
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Meta-port for Transmission BitTorrent client
 
-RUN_DEPENDS=	transmission-cli:${PORTSDIR}/net-p2p/transmission-cli \
-		transmission-daemon:${PORTSDIR}/net-p2p/transmission-daemon \
-		transmission-gtk:${PORTSDIR}/net-p2p/transmission-gtk
+RUN_DEPENDS=	transmission-cli:net-p2p/transmission-cli \
+		transmission-daemon:net-p2p/transmission-daemon \
+		transmission-gtk:net-p2p/transmission-gtk
 
 CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMESUFFIX}-2.[56]*
 
diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 82d8b0c106c7..cafdae07d1ba 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Streaming capable P2P network client based on BitTorrent
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>0:${PORTSDIR}/databases/py-apsw \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}gmpy>0:${PORTSDIR}/math/py-gmpy \
-		${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.16.4:${PORTSDIR}/net-p2p/libtorrent-rasterbar-python \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}feedparser>0:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}cherrypy>0:${PORTSDIR}/www/py-cherrypy \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>0:databases/py-apsw \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy \
+		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.16.4:net-p2p/libtorrent-rasterbar-python \
+		${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 NO_ARCH=	yes
 NO_BUILD=	yes
@@ -51,8 +51,8 @@ OPTIONS_DEFINE=		DOCS VLC
 OPTIONS_DEFAULT=	VLC
 
 VLC_DESC=		Multimedia support via VLC
-VLC_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
-			vlc:${PORTSDIR}/multimedia/vlc
+VLC_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
+			vlc:multimedia/vlc
 
 TRIBLER_DIR=	${PYTHONPREFIX_SITELIBDIR}/tribler
 
diff --git a/net-p2p/twister/Makefile b/net-p2p/twister/Makefile
index 836c3dfcaf77..a045585e9c32 100644
--- a/net-p2p/twister/Makefile
+++ b/net-p2p/twister/Makefile
@@ -14,9 +14,9 @@ LICENSE=	BSD3CLAUSE MIT
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs	\
-		libleveldb.so:${PORTSDIR}/databases/leveldb	\
-		libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs	\
+		libleveldb.so:databases/leveldb	\
+		libicui18n.so:devel/icu
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net-p2p/unworkable/Makefile b/net-p2p/unworkable/Makefile
index c8dae73f6924..3e18ad8802e6 100644
--- a/net-p2p/unworkable/Makefile
+++ b/net-p2p/unworkable/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Free BitTorrent Implementation
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		scons
 USE_OPENSSL=	yes
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index eae6c9622f03..72d091829aba 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Qt-based Direct Connect client
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdc.so:${PORTSDIR}/net-p2p/dclib \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libdc.so:net-p2p/dclib \
+		libxml2.so:textproc/libxml2
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
 
diff --git a/net-p2p/verlihub-plugins-luascript/Makefile b/net-p2p/verlihub-plugins-luascript/Makefile
index deb7283a163f..d02d7ce745cd 100644
--- a/net-p2p/verlihub-plugins-luascript/Makefile
+++ b/net-p2p/verlihub-plugins-luascript/Makefile
@@ -31,8 +31,8 @@ SOCKET_DESC=	Build with LuaSocket support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSOCKET}
-BUILD_DEPENDS+=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket
-RUN_DEPENDS+=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket
+BUILD_DEPENDS+=	${LUA_MODLIBDIR}/socket/core.so:net/luasocket
+RUN_DEPENDS+=	${LUA_MODLIBDIR}/socket/core.so:net/luasocket
 CONFIGURE_ARGS+=	--with-luasocket
 .endif
 
diff --git a/net-p2p/verlihub-plugins/Makefile b/net-p2p/verlihub-plugins/Makefile
index 1afd51398f93..9891fee90932 100644
--- a/net-p2p/verlihub-plugins/Makefile
+++ b/net-p2p/verlihub-plugins/Makefile
@@ -11,14 +11,14 @@ MAINTAINER=	skylord@vt.net.ru
 COMMENT=	Meta-port for VerliHub plugins
 
 RUN_DEPENDS=	\
-		${LOCALBASE}/lib/libchatroom_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-chatroom \
-		${LOCALBASE}/lib/libfloodprot_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-floodprotect \
-		${LOCALBASE}/lib/libforbid_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-forbid \
-		${LOCALBASE}/lib/libiplog_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-iplog \
-		${LOCALBASE}/lib/libisp_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-isp \
-		${LOCALBASE}/lib/liblua_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-luascript \
-		${LOCALBASE}/lib/libmessanger_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-messanger \
-		${LOCALBASE}/lib/libstats_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-stats
+		${LOCALBASE}/lib/libchatroom_pi.so:net-p2p/verlihub-plugins-chatroom \
+		${LOCALBASE}/lib/libfloodprot_pi.so:net-p2p/verlihub-plugins-floodprotect \
+		${LOCALBASE}/lib/libforbid_pi.so:net-p2p/verlihub-plugins-forbid \
+		${LOCALBASE}/lib/libiplog_pi.so:net-p2p/verlihub-plugins-iplog \
+		${LOCALBASE}/lib/libisp_pi.so:net-p2p/verlihub-plugins-isp \
+		${LOCALBASE}/lib/liblua_pi.so:net-p2p/verlihub-plugins-luascript \
+		${LOCALBASE}/lib/libmessanger_pi.so:net-p2p/verlihub-plugins-messanger \
+		${LOCALBASE}/lib/libstats_pi.so:net-p2p/verlihub-plugins-stats
 
 USES=		metaport
 
diff --git a/net-p2p/verlihub-plugins/Makefile.plugins b/net-p2p/verlihub-plugins/Makefile.plugins
index d5c099b89900..69d57720e30e 100644
--- a/net-p2p/verlihub-plugins/Makefile.plugins
+++ b/net-p2p/verlihub-plugins/Makefile.plugins
@@ -11,8 +11,8 @@ WRKSRC?=	${WRKDIR}/${PLUGIN_NAME}
 
 COMMENT?=	${PLUGIN_DESC} plugin for VerliHub - a Direct Connect protocol server
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/verlihub:${PORTSDIR}/net-p2p/verlihub
-RUN_DEPENDS+=	${LOCALBASE}/bin/verlihub:${PORTSDIR}/net-p2p/verlihub
+BUILD_DEPENDS+=	${LOCALBASE}/bin/verlihub:net-p2p/verlihub
+RUN_DEPENDS+=	${LOCALBASE}/bin/verlihub:net-p2p/verlihub
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index bca1adb91284..04c83d17f7fd 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Direct Connect protocol server (Hub)
 
 # XXX: Actually, bash isn't required for building,
 # but otherwise configure script would pick the wrong path
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP \
-		libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP \
+		libpcre.so:devel/pcre
+RUN_DEPENDS=	bash:shells/bash
 
 LIBS+=		-L${LOCALBASE}/lib
 USE_RC_SUBR=	verlihub
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 66bd0775c506..b99deeb48b4c 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -13,11 +13,11 @@ COMMENT=	BitTorrent client written in Java
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GPL.txt
 
-BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
-		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
-		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
-RUN_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:devel/log4j \
+		${JAVALIBDIR}/commons-cli.jar:java/jakarta-commons-cli \
+		${JAVALIBDIR}/junit.jar:java/junit \
+		${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
+RUN_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
 
 USES=		zip
 USE_JAVA=	yes
diff --git a/net-p2p/zetacoin/Makefile b/net-p2p/zetacoin/Makefile
index 8d48e36ffac7..cc134848f64d 100644
--- a/net-p2p/zetacoin/Makefile
+++ b/net-p2p/zetacoin/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Peer-to-Peer crypto currency with quick transactions
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
 USES+=		autoreconf compiler:c++0x gmake libtool pkgconfig:build
 
@@ -31,15 +31,15 @@ OPTIONS_GROUP=		X11
 OPTIONS_GROUP_X11=	QRCODES
 
 UPNP_CONFIGURE_WITH=	miniupnpc
-UPNP_LIB_DEPENDS=		libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+UPNP_LIB_DEPENDS=		libminiupnpc.so:net/miniupnpc
 UPNP_CPPFLAGS=          -I${LOCALBASE}/include
 UPNP_LIBS=              -L${LOCALBASE}/lib
 
 X11_CONFIGURE_WITH=	gui
 X11_CONFIGURE_ON=	--without-daemon
 X11_CONFIGURE_OFF=	--with-daemon
-X11_BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
-X11_LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+X11_BUILD_DEPENDS=	protoc:devel/protobuf
+X11_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 X11_USE=	qt4=corelib,network,gui,qmake_build,linguisttools_build \
 			qt4=uic_build,moc_build,rcc_build,qtestlib_build
 X11_USES=	desktop-file-utils
@@ -50,7 +50,7 @@ WALLET_LIBS=		-L${BDB_LIB_DIR}
 WALLET_USE=	bdb=48
 
 QRCODES_IMPLIES=	X11
-QRCODES_LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 QRCODES_CONFIGURE_WITH=	qrencode
 
 CLI_CONFIGURE_WITH=	cli
diff --git a/net/44bsd-rdist/Makefile b/net/44bsd-rdist/Makefile
index 4d39af242bc6..ee3886228e79 100644
--- a/net/44bsd-rdist/Makefile
+++ b/net/44bsd-rdist/Makefile
@@ -19,7 +19,7 @@ PLIST_FILES=	bin/44bsd-rdist \
 .include <bsd.port.pre.mk>
 
 .if  ${OSVERSION} >= 1000055
-BUILD_DEPENDS=    rcs:${PORTSDIR}/devel/rcs57
+BUILD_DEPENDS=    rcs:devel/rcs57
 .endif
 
 post-extract:
diff --git a/net/R-cran-twitteR/Makefile b/net/R-cran-twitteR/Makefile
index 87ea4e671a90..8bdd4bc7c942 100644
--- a/net/R-cran-twitteR/Makefile
+++ b/net/R-cran-twitteR/Makefile
@@ -11,10 +11,10 @@ COMMENT=	R based Twitter client
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	R-cran-bit64>0:${PORTSDIR}/devel/R-cran-bit64 \
-		R-cran-rjson>0:${PORTSDIR}/converters/R-cran-rjson \
-		R-cran-DBI>=0.3.1:${PORTSDIR}/databases/R-cran-DBI \
-		R-cran-httr>=1.0.0:${PORTSDIR}/www/R-cran-httr
+RUN_DEPENDS=	R-cran-bit64>0:devel/R-cran-bit64 \
+		R-cran-rjson>0:converters/R-cran-rjson \
+		R-cran-DBI>=0.3.1:databases/R-cran-DBI \
+		R-cran-httr>=1.0.0:www/R-cran-httr
 
 USES=	cran:auto-plist
 
diff --git a/net/Sockets/Makefile b/net/Sockets/Makefile
index bca4fd12d65d..244f2ae4a236 100644
--- a/net/Sockets/Makefile
+++ b/net/Sockets/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ml@netfence.it
 COMMENT=	C++ wrapper for BSD-style sockets
 
 #execinfo is optional and currently not configured (would need to patch source's #ifdef LINUX)
-#LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+#LIB_DEPENDS=	execinfo.1:devel/libexecinfo
 
 #Not needed without execinfo or xml
 #CFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/abills/Makefile b/net/abills/Makefile
index d65d901d0b33..95c030522b9e 100644
--- a/net/abills/Makefile
+++ b/net/abills/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Billing system for dialup, VPN, and VoIP management
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	radiusd:${PORTSDIR}/net/freeradius2 \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-Digest-MD4>=0:${PORTSDIR}/security/p5-Digest-MD4 \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES
+RUN_DEPENDS=	radiusd:net/freeradius2 \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-Digest-MD4>=0:security/p5-Digest-MD4 \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Crypt-DES>=0:security/p5-Crypt-DES
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_ARCH=	yes
diff --git a/net/afpfs-ng/Makefile b/net/afpfs-ng/Makefile
index c698a83bbf67..9d35a52bbec0 100644
--- a/net/afpfs-ng/Makefile
+++ b/net/afpfs-ng/Makefile
@@ -23,10 +23,10 @@ LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	FUSE GCRYPT
 
-FUSE_LIB_DEPENDS=	libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
+FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
 FUSE_CONFIGURE_ENABLE=	fuse
 
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_ENABLE=gcrypt
 
 .include <bsd.port.options.mk>
diff --git a/net/anet/Makefile b/net/anet/Makefile
index 09a12027d4e6..0f956017ef1e 100644
--- a/net/anet/Makefile
+++ b/net/anet/Makefile
@@ -29,13 +29,13 @@ IGNORE=		will not build; atomics are not supported on DF i386
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/gnat/ahven.gpr:${PORTSDIR}/devel/ahven
+BUILD_DEPENDS+=	${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 ALL_TARGET+=	tests
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc \
-		source-highlight:${PORTSDIR}/textproc/source-highlight
+BUILD_DEPENDS+= asciidoc:textproc/asciidoc \
+		source-highlight:textproc/source-highlight
 ALL_TARGET+=	doc
 USES+=		gmake
 .endif
diff --git a/net/appkonference/Makefile b/net/appkonference/Makefile
index 41ebeb9dd6f2..d7ee2cfb8499 100644
--- a/net/appkonference/Makefile
+++ b/net/appkonference/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High-performance Asterisk voice/video conferencing plugin
 
-BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
-RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
+BUILD_DEPENDS=	asterisk:net/asterisk
+RUN_DEPENDS=	asterisk:net/asterisk
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/net/aprsc/Makefile b/net/aprsc/Makefile
index 1ae8ab43ea41..10ed350fa577 100644
--- a/net/aprsc/Makefile
+++ b/net/aprsc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Plain APRS-IS server
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/arp-sk/Makefile b/net/arp-sk/Makefile
index 7c6143003a58..03cb5830a7da 100644
--- a/net/arp-sk/Makefile
+++ b/net/arp-sk/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool designed to manipulate ARP tables of all kinds of equipment
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libnet=${LOCALBASE}
diff --git a/net/arping/Makefile b/net/arping/Makefile
index 95841fe50216..c4e9ae6877a5 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -12,7 +12,7 @@ COMMENT=	ARP level "ping" utility
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/arprelease/Makefile b/net/arprelease/Makefile
index 038fb5d6826e..c988c277df83 100644
--- a/net/arprelease/Makefile
+++ b/net/arprelease/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libnet tool to flush arp cache entries from devices (eg. routers)
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net/asio/Makefile b/net/asio/Makefile
index cec5c91d53c0..5f9aa6ea04d6 100644
--- a/net/asio/Makefile
+++ b/net/asio/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20(Stable)/
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Cross-platform C++ library for network and low-level I/O programming
 
-RUN_DEPENDS=	${LOCALBASE}/include/boost/chrono/system_clocks.hpp:${PORTSDIR}/devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/include/boost/chrono/system_clocks.hpp:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 USES=		gmake tar:bz2
diff --git a/net/asterisk-chan_sccp/Makefile b/net/asterisk-chan_sccp/Makefile
index ce0be1135109..fca6adaae90b 100644
--- a/net/asterisk-chan_sccp/Makefile
+++ b/net/asterisk-chan_sccp/Makefile
@@ -37,14 +37,14 @@ ASTERISK18_DESC=	Depend on Asterisk 1.8
 ASTERISK11_DESC=	Depend on Asterisk 11
 ASTERISK13_DESC=	Depend on Asterisk 13
 
-ASTERISK18_BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
-ASTERISK18_RUN_DEPENDS=		asterisk:${PORTSDIR}/net/asterisk
+ASTERISK18_BUILD_DEPENDS=	asterisk:net/asterisk
+ASTERISK18_RUN_DEPENDS=		asterisk:net/asterisk
 
-ASTERISK11_BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk11
-ASTERISK11_RUN_DEPENDS=		asterisk:${PORTSDIR}/net/asterisk11
+ASTERISK11_BUILD_DEPENDS=	asterisk:net/asterisk11
+ASTERISK11_RUN_DEPENDS=		asterisk:net/asterisk11
 
-ASTERISK13_BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk13
-ASTERISK13_RUN_DEPENDS=		asterisk:${PORTSDIR}/net/asterisk13
+ASTERISK13_BUILD_DEPENDS=	asterisk:net/asterisk13
+ASTERISK13_RUN_DEPENDS=		asterisk:net/asterisk13
 
 post-build:
 	${STRIP_CMD} ${WRKSRC}/src/.libs/chan_sccp.so
diff --git a/net/asterisk-g72x/Makefile b/net/asterisk-g72x/Makefile
index 5db3bc79ffa0..4bfe8850a4e3 100644
--- a/net/asterisk-g72x/Makefile
+++ b/net/asterisk-g72x/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://asterisk.hosting.lv/src/
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	G.729 codec for Asterisk PBX
 
-LIB_DEPENDS=	libbcg729.so:${PORTSDIR}/audio/bcg729
+LIB_DEPENDS=	libbcg729.so:audio/bcg729
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bcg729
@@ -29,14 +29,14 @@ ASTERISK18_DESC=	Depend on Asterisk 1.8
 ASTERISK11_DESC=	Depend on Asterisk 11
 ASTERISK13_DESC=	Depend on Asterisk 13
 
-ASTERISK18_BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
-ASTERISK18_RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
+ASTERISK18_BUILD_DEPENDS=	asterisk:net/asterisk
+ASTERISK18_RUN_DEPENDS=	asterisk:net/asterisk
 ASTERISK18_CONFIGURE_ON=	--with-asterisk18
-ASTERISK11_BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk11
-ASTERISK11_RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk11
+ASTERISK11_BUILD_DEPENDS=	asterisk:net/asterisk11
+ASTERISK11_RUN_DEPENDS=	asterisk:net/asterisk11
 ASTERISK11_CONFIGURE_ON=	--with-asterisk100
-ASTERISK13_BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk13
-ASTERISK13_RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk13
+ASTERISK13_BUILD_DEPENDS=	asterisk:net/asterisk13
+ASTERISK13_RUN_DEPENDS=	asterisk:net/asterisk13
 ASTERISK13_CONFIGURE_ON=	--with-asterisk130
 
 .include <bsd.port.pre.mk>
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index f8b769d2698b..0f0f19bc6949 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -108,29 +108,29 @@ BACKTRACE_USES=			execinfo
 
 CURL_CONFIGURE_ON=	--with-libcurl
 CURL_CONFIGURE_OFF=	--with-libcurl=no
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DAHDI_CONFIGURE_ON=	--with-dahdi --with-openr2
 DAHDI_CONFIGURE_OFF=	--without-dahdi --without-openr2
-DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
-			${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
-DAHDI_LIB_DEPENDS=	libpri.so:${PORTSDIR}/misc/libpri \
-			libopenr2.so:${PORTSDIR}/misc/openr2
+DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:misc/libpri \
+			${LOCALBASE}/include/dahdi/user.h:misc/dahdi
+DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
+			libopenr2.so:misc/openr2
 
 EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+EXCHANGE_LIB_DEPENDS=	libneon.so:www/neon
 
 FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
 FREETDS_CONFIGURE_OFF=	--without-tds
-FREETDS_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
+FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
 
 GSM_CONFIGURE_WITH=	gsm
-GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 
 H323_CONFIGURE_WITH=	h323
 H323_CPPFLAGS=		-I${LOCALBASE}/include/openh323
-H323_LIB_DEPENDS=	libpt_r.so:${PORTSDIR}/devel/pwlib \
-			libh323_r.so:${PORTSDIR}/net/openh323
+H323_LIB_DEPENDS=	libpt_r.so:devel/pwlib \
+			libh323_r.so:net/openh323
 H323_MAKE_ENV=		OPENH323DIR=${LOCALBASE}/share/openh323
 
 ICONV_CONFIGURE_OFF=	--with-iconv=/dev/null --with-iconv=no
@@ -138,12 +138,12 @@ ICONV_CONFIGURE_WITH=	iconv
 ICONV_USES=		iconv
 
 JABBER_CONFIGURE_WITH=	iksemel
-JABBER_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
+JABBER_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 
 ODBC_CONFIGURE_WITH=	unixodbc
 ODBC_CONFIGURE_ON=	--with-ltdl
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC \
-			libltdl.so:${PORTSDIR}/devel/libltdl
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
+			libltdl.so:devel/libltdl
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
@@ -153,41 +153,41 @@ LUA_USES=		lua:51
 LUA_CFLAGS=		-I${LUA_INCDIR}
 LUA_LDFLAGS=		-L${LUA_LIBDIR}
 
-MP3PLAYER_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+MP3PLAYER_RUN_DEPENDS=	mpg123:audio/mpg123
 
 MYSQL_CONFIGURE_WITH=	mysqlclient
 MYSQL_USE=		MYSQL=yes
 
 NCURSES_USES=		ncurses
 
-NEWT_LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
+NEWT_LIB_DEPENDS=	libnewt.so:devel/newt
 
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
 RADIUS_CONFIGURE_WITH=	radius
-RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 
 SNMP_CONFIGURE_WITH=	netsnmp
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 
 SQLITE_CONFIGURE_WITH=	sqlite
 SQLITE_CONFIGURE_OFF=	--with-sqlite3=no
-SQLITE_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2 \
-			libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite.so:databases/sqlite2 \
+			libsqlite3.so:databases/sqlite3
 
 VORBIS_CONFIGURE_WITH=	ogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 SPANDSP_CONFIGURE_WITH=	spandsp
-SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
+SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 
 SRTP_CONFIGURE_WITH=	srtp
-SRTP_BUILD_DEPENDS=	libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp
+SRTP_BUILD_DEPENDS=	libsrtp>=1.4.4:net/libsrtp
 
-SYSINFO_LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo
+SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
 
 PORTSCOUT=	limit:^1\.8\.
 
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index 0f40c24f7d3f..0d11e0c49f9c 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -112,26 +112,26 @@ BACKTRACE_USES=			execinfo
 
 CURL_CONFIGURE_ON=	--with-libcurl
 CURL_CONFIGURE_OFF=	--with-libcurl=no
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DAHDI_CONFIGURE_ON=	--with-dahdi --with-openr2
 DAHDI_CONFIGURE_OFF=	--without-dahdi --without-openr2
-DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
-			${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
-DAHDI_LIB_DEPENDS=	libpri.so:${PORTSDIR}/misc/libpri \
-			libopenr2.so:${PORTSDIR}/misc/openr2
+DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:misc/libpri \
+			${LOCALBASE}/include/dahdi/user.h:misc/dahdi
+DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
+			libopenr2.so:misc/openr2
 
 EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+EXCHANGE_LIB_DEPENDS=	libneon.so:www/neon
 
 FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
 FREETDS_CONFIGURE_OFF=	--without-tds
-FREETDS_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
+FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
 
 GCC_USE=		GCC=yes
 
 GSM_CONFIGURE_WITH=	gsm
-GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
@@ -144,54 +144,54 @@ LUA_LDFLAGS=		-L${LUA_LIBDIR}
 MYSQL_CONFIGURE_WITH=	mysqlclient
 MYSQL_USE=		MYSQL=yes
 
-MP3PLAYER_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+MP3PLAYER_RUN_DEPENDS=	mpg123:audio/mpg123
 
 NCURSES_USES=		ncurses
-NEWT_LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
+NEWT_LIB_DEPENDS=	libnewt.so:devel/newt
 
 ODBC_CONFIGURE_WITH=	unixodbc
 ODBC_CONFIGURE_ON=	--with-ltdl
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC \
-			libltdl.so:${PORTSDIR}/devel/libltdl
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
+			libltdl.so:devel/libltdl
 
 OOH323_CPPFLAGS=	-I${LOCALBASE}/include/openh323
-OOH323_LIB_DEPENDS=	libpt_r.so:${PORTSDIR}/devel/pwlib \
-			libh323_r.so:${PORTSDIR}/net/openh323
+OOH323_LIB_DEPENDS=	libpt_r.so:devel/pwlib \
+			libh323_r.so:net/openh323
 OOH323_MAKE_ENV=	OPENH323DIR=${LOCALBASE}/share/openh323
 
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
 RADIUS_CONFIGURE_WITH=	radius
-RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 
 SNMP_CONFIGURE_WITH=	netsnmp
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 SPANDSP_CONFIGURE_WITH=	spandsp
-SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
+SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 
 SPEEX_CONFIGURE_WITH=	speex
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 
 SQLITE2_CONFIGURE_WITH=	sqlite
-SQLITE2_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2
+SQLITE2_LIB_DEPENDS=	libsqlite.so:databases/sqlite2
 
 SRTP_CONFIGURE_WITH=	srtp
-SRTP_BUILD_DEPENDS=	libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp
+SRTP_BUILD_DEPENDS=	libsrtp>=1.4.4:net/libsrtp
 
-SYSINFO_LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo
+SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
 
-UUID_LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+UUID_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 UUID_CONFIGURE_ON=	--with-uuid=${LOCALBASE}
 UUID_CONFIGURE_OFF=	--disable-uuid
 UUID_CONFLICTS=		ossp-uuid-[0-9]*
 
 VORBIS_CONFIGURE_WITH=	ogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 XMPP_CONFIGURE_WITH=	iksemel
-XMPP_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
+XMPP_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index c99e8a8d9ebc..7d2cb2b150d9 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Open Source PBX and telephony toolkit
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libjansson.so:${PORTSDIR}/devel/jansson
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		libjansson.so:devel/jansson
 
 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -112,33 +112,33 @@ XMPP_DESC?=	XMPP/GTALK support
 
 OPTIONS_SUB=		yes
 
-ASTVERSION_RUN_DEPENDS=		bash:${PORTSDIR}/shells/bash
+ASTVERSION_RUN_DEPENDS=		bash:shells/bash
 
 BACKTRACE_CONFIGURE_WITH=	execinfo
 BACKTRACE_USES=			execinfo
 
 CURL_CONFIGURE_ON=	--with-libcurl
 CURL_CONFIGURE_OFF=	--with-libcurl=no
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DAHDI_CONFIGURE_ON=	--with-dahdi --with-openr2
 DAHDI_CONFIGURE_OFF=	--without-dahdi --without-openr2
-DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
-			${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
-DAHDI_LIB_DEPENDS=	libpri.so:${PORTSDIR}/misc/libpri \
-			libopenr2.so:${PORTSDIR}/misc/openr2
+DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:misc/libpri \
+			${LOCALBASE}/include/dahdi/user.h:misc/dahdi
+DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
+			libopenr2.so:misc/openr2
 
 EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+EXCHANGE_LIB_DEPENDS=	libneon.so:www/neon
 
 FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
 FREETDS_CONFIGURE_OFF=	--without-tds
-FREETDS_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
+FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
 
 GCC_USE=		GCC=yes
 
 GSM_CONFIGURE_WITH=	gsm
-GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
@@ -151,19 +151,19 @@ LUA_LDFLAGS=		-L${LUA_LIBDIR}
 MYSQL_CONFIGURE_WITH=	mysqlclient
 MYSQL_USE=		MYSQL=yes
 
-MP3PLAYER_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+MP3PLAYER_RUN_DEPENDS=	mpg123:audio/mpg123
 
 NCURSES_USES=		ncurses
-NEWT_LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
+NEWT_LIB_DEPENDS=	libnewt.so:devel/newt
 
 ODBC_CONFIGURE_WITH=	unixodbc
 ODBC_CONFIGURE_ON=	--with-ltdl
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC \
-			libltdl.so:${PORTSDIR}/devel/libltdl
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
+			libltdl.so:devel/libltdl
 
 OOH323_CPPFLAGS=	-I${LOCALBASE}/include/openh323
-OOH323_LIB_DEPENDS=     libpt_r.so:${PORTSDIR}/devel/pwlib \
-			libh323_r.so:${PORTSDIR}/net/openh323
+OOH323_LIB_DEPENDS=     libpt_r.so:devel/pwlib \
+			libh323_r.so:net/openh323
 OOH323_MAKE_ENV=	OPENH323DIR=${LOCALBASE}/share/openh323
 
 PGSQL_CONFIGURE_WITH=	postgres
@@ -173,32 +173,32 @@ PJSIP_CONFIGURE_WITH=	pjproject
 PJSIP_USES=		pkgconfig
 
 PORTAUDIO_CONFIGURE_WITH=	portaudio
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 RADIUS_CONFIGURE_WITH=	radius
-RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 
 SNMP_CONFIGURE_WITH=	netsnmp
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 SPANDSP_CONFIGURE_WITH=	spandsp
-SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
+SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 
 SPEEX_CONFIGURE_WITH=	speex
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 
 SQLITE2_CONFIGURE_WITH=	sqlite
-SQLITE2_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2
+SQLITE2_LIB_DEPENDS=	libsqlite.so:databases/sqlite2
 
 SRTP_CONFIGURE_WITH=	srtp
 
-SYSINFO_LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo
+SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
 
 VORBIS_CONFIGURE_WITH=	ogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 XMPP_CONFIGURE_WITH=	iksemel
-XMPP_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
+XMPP_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
@@ -209,11 +209,11 @@ GROUPS=	${ASTERISK_GROUP} dahdi
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP}
-LIB_DEPENDS+=	libpj.so:${PORTSDIR}/net/pjsip-extsrtp
+LIB_DEPENDS+=	libpj.so:net/pjsip-extsrtp
 .elif ${PORT_OPTIONS:MPJSIP} && ! ${PORT_OPTIONS:MSRTP}
-LIB_DEPENDS+=   libpj.so:${PORTSDIR}/net/pjsip
+LIB_DEPENDS+=   libpj.so:net/pjsip
 .elif ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP}
-LIB_DEPENDS+=   libsrtp.so:${PORTSDIR}/net/libsrtp
+LIB_DEPENDS+=   libsrtp.so:net/libsrtp
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 9b05754ca032..72c6c49cb831 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -14,10 +14,10 @@ COMMENT?=	Service discovery on a local network
 AVAHI_SLAVE?=	no
 
 .if ${AVAHI_SLAVE} != header
-LIB_DEPENDS?=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libdaemon.so:${PORTSDIR}/devel/libdaemon \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS?=	libexpat.so:textproc/expat2 \
+		libdaemon.so:devel/libdaemon \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libgdbm.so:databases/gdbm
 
 USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
diff --git a/net/avahi-autoipd/Makefile b/net/avahi-autoipd/Makefile
index 0a92a959b6a3..c0b5fdb08e81 100644
--- a/net/avahi-autoipd/Makefile
+++ b/net/avahi-autoipd/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-autoipd
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	IPv4LL network address configuration daemon
 
-LIB_DEPENDS=	libavahi-common.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 
 USERS=		avahi-autoipd
 GROUPS=		${USERS}
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index f6fdcbe92532..a02e638d3cb1 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -8,8 +8,8 @@ PKGNAMESUFFIX=	-gtk
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gtk+ tools and bindings to the Avahi mDNS system
 
-LIB_DEPENDS=	libavahi-common.so:${PORTSDIR}/net/avahi-app
-RUN_DEPENDS=	avahi-header>=0.6:${PORTSDIR}/net/avahi-header
+LIB_DEPENDS=	libavahi-common.so:net/avahi-app
+RUN_DEPENDS=	avahi-header>=0.6:net/avahi-header
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-ui
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
index 152b84e71c1a..ea95d99d2718 100644
--- a/net/avahi-gtk3/Makefile
+++ b/net/avahi-gtk3/Makefile
@@ -8,8 +8,8 @@ PKGNAMESUFFIX=	-gtk3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gtk+ 3 library to the Avahi mDNS system
 
-LIB_DEPENDS=	libavahi-common.so:${PORTSDIR}/net/avahi-app
-RUN_DEPENDS=	avahi-header>=0.6:${PORTSDIR}/net/avahi-header
+LIB_DEPENDS=	libavahi-common.so:net/avahi-app
+RUN_DEPENDS=	avahi-header>=0.6:net/avahi-header
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-ui
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
index 06593afa212a..a70dda6f06d4 100644
--- a/net/avahi-libdns/Makefile
+++ b/net/avahi-libdns/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX=	-libdns
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	mDNSResponder compatibility from Avahi
 
-LIB_DEPENDS=	libavahi-common.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-compat-libdns_sd
diff --git a/net/avahi-qt4/Makefile b/net/avahi-qt4/Makefile
index 10e3aded552b..fadb53c1305f 100644
--- a/net/avahi-qt4/Makefile
+++ b/net/avahi-qt4/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX=	-qt4
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Qt 4 bindings to the Avahi mDNS system
 
-LIB_DEPENDS=	libavahi-common.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-qt
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
index d867b5312df4..4f8f6ced6215 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX=	-sharp
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Mono bindings for Avahi service discovery
 
-LIB_DEPENDS=	libavahi-core.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	libavahi-core.so:net/avahi-app
 
 USES=		mono
 MASTERDIR=	${.CURDIR}/../avahi-app
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index ed509fb92e5a..d211d8d21ba6 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -10,7 +10,7 @@ CATEGORIES?=	net dns
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	"meta-port" for the Avahi service discovery suite
 
-RUN_DEPENDS=	avahi-app>=0.6.31:${PORTSDIR}/net/avahi-app
+RUN_DEPENDS=	avahi-app>=0.6.31:net/avahi-app
 
 USES=		metaport
 
@@ -20,11 +20,11 @@ AUTOIPD_DESC=	IPv4LL network address configuration daemon
 GTK_DESC=	Gtk+ tools and bindings
 LIBDNS_DESC=	Apple's mDNSResponder compatibility library
 
-AUTOIPD_RUN_DEPENDS=	avahi-autoipd:${PORTSDIR}/net/avahi-autoipd
-GTK_RUN_DEPENDS=	avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk
-#LIBDNS_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns
-MONO_RUN_DEPENDS=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:${PORTSDIR}/net/avahi-sharp
-QT4_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:${PORTSDIR}/net/avahi-qt4
-PYTHON_RUN_DEPENDS=	avahi-bookmarks:${PORTSDIR}/net/py-avahi
+AUTOIPD_RUN_DEPENDS=	avahi-autoipd:net/avahi-autoipd
+GTK_RUN_DEPENDS=	avahi-discover-standalone:net/avahi-gtk
+#LIBDNS_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:net/avahi-libdns
+MONO_RUN_DEPENDS=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:net/avahi-sharp
+QT4_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:net/avahi-qt4
+PYTHON_RUN_DEPENDS=	avahi-bookmarks:net/py-avahi
 
 .include <bsd.port.mk>
diff --git a/net/axa/Makefile b/net/axa/Makefile
index 65e9f5f4fd6c..9dfab408c4f8 100644
--- a/net/axa/Makefile
+++ b/net/axa/Makefile
@@ -12,12 +12,12 @@ COMMENT=	AXA library and tools
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/copyright
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		sie-nmsg>0:${PORTSDIR}/net/sie-nmsg
-LIB_DEPENDS=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \
-		libnmsg.so:${PORTSDIR}/net/nmsg \
-		libwdns.so:${PORTSDIR}/dns/wdns
-RUN_DEPENDS=	sie-nmsg>0:${PORTSDIR}/net/sie-nmsg
+BUILD_DEPENDS=	bash:shells/bash \
+		sie-nmsg>0:net/sie-nmsg
+LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c \
+		libnmsg.so:net/nmsg \
+		libwdns.so:dns/wdns
+RUN_DEPENDS=	sie-nmsg>0:net/sie-nmsg
 
 WRKSRC=		${WRKDIR}/axa-tools
 
@@ -35,7 +35,7 @@ OPTIONS_DEFAULT=DOXYGEN
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install-strip
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	html-local
 
 LDFLAGS+=	-lm
diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index f066e151ff4b..89f649ca209f 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Beacon active measurement tool to monitor multicast
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS=	p5-Net>=0:net/p5-Net
+RUN_DEPENDS=	p5-Net>=0:net/p5-Net
 
 WWW_DIR?=	${PREFIX}/www/
 PLIST_SUB+=	VERSION=${PORTVERSION}
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	DOCS IPV6
 
 IPV6_DESC=		Enable IPv6 PTR lookups
 IPV6_CONFIGURE_ENABLE=	ipv6
-IPV6_BUILD_DEPENDS=	p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
+IPV6_BUILD_DEPENDS=	p5-Socket6>=0:net/p5-Socket6
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/Multicast/Beacon/Beacon.so
diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index eb105bed141d..a308bde2ba0e 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Belle-sip is a SIP (RFC3261) implementation written in C
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libantlr3c.so:${PORTSDIR}/devel/libantlr3c
+LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=	POLARSSL
 OPTIONS_DEFAULT=POLARSSL
 
 POLARSSL_CONFIGURE_ENABLE=	tls
-POLARSSL_LIB_DEPENDS=		libmbedtls.so.9:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS=		libmbedtls.so.9:security/polarssl13
 
 post-extract:
 	@${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr-complete.jar
diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index 7e7fbb9c2121..ed99481265b6 100644
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Human-readable bandwidth monitor and rate estimator
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse
+LIB_DEPENDS=	libconfuse.so:devel/libconfuse
 
 CONFLICTS_INSTALL=	bmon-*
 
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 01fad0769374..e418cc89d6b6 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -51,16 +51,16 @@ NO_NET_INFO_DESC=	Do not send host address and name to servers
 OPTIONS_SUB=		yes
 
 MANAGER_USES=		iconv
-MANAGER_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-			libsqlite3.so:${PORTSDIR}/databases/sqlite3
+MANAGER_LIB_DEPENDS=	libnotify.so:devel/libnotify \
+			libsqlite3.so:databases/sqlite3
 MANAGER_CONFIGURE_ON=	--with-sqlite3-prefix=${LOCALBASE}
 MANAGER_CONFIGURE_OFF=	--with-wx-config=false --without-x
 MANAGER_CONFIGURE_ENABLE=manager
 MANAGER_USE=		XORG=x11,xext,xscrnsaver WX=2.8
 
 CLIENT_CONFIGURE_ENABLE=client
-CLIENT_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-CLIENT_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CLIENT_LIB_DEPENDS=	libcurl.so:ftp/curl
+CLIENT_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 CLIENT_USE=		RC_SUBR=boinc-client
 
 LINUX_CONFIGURE_ON=	--with-boinc-alt-platform=i686-pc-linux-gnu
diff --git a/net/boinc_curses/Makefile b/net/boinc_curses/Makefile
index dab6b667f098..7eb87327b0e6 100644
--- a/net/boinc_curses/Makefile
+++ b/net/boinc_curses/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/rene http://www.oook.cz/bsd/boinc_curses/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console, ncurses based monitor and manager for BOINC
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc.a:${PORTSDIR}/net/boinc-client
+BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc.a:net/boinc-client
 
 USES=		ncurses tar:bzip2
 MAKE_ENV=	BOINCLIBDIR=${LOCALBASE}/lib BOINCINCDIR=${LOCALBASE}/include/boinc
diff --git a/net/bsdec2-image-upload/Makefile b/net/bsdec2-image-upload/Makefile
index b04b23ed30e2..103f7ccb9e6b 100644
--- a/net/bsdec2-image-upload/Makefile
+++ b/net/bsdec2-image-upload/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool for creating Amazon EC2 AMIs
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		tar:tgz uidfix
 USE_OPENSSL=	yes
diff --git a/net/bwi-firmware-kmod/Makefile b/net/bwi-firmware-kmod/Makefile
index d195e0e8fb83..041f5d215e29 100644
--- a/net/bwi-firmware-kmod/Makefile
+++ b/net/bwi-firmware-kmod/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=
 MAINTAINER=	swhetzel@gmail.com
 COMMENT=	Broadcom AirForce IEEE 802.11 Firmware Kernel Module
 
-BUILD_DEPENDS=	b43-fwcutter:${PORTSDIR}/sysutils/b43-fwcutter
+BUILD_DEPENDS=	b43-fwcutter:sysutils/b43-fwcutter
 
 FIRMWARES=	ucode ucode11 ucode2 ucode4 ucode5 \
 		a0g0bsinitvals2 a0g0bsinitvals5 a0g0initvals2 \
diff --git a/net/bwn-firmware-kmod/Makefile b/net/bwn-firmware-kmod/Makefile
index 2fadee7272c5..9001b3225edf 100644
--- a/net/bwn-firmware-kmod/Makefile
+++ b/net/bwn-firmware-kmod/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=
 MAINTAINER=	swhetzel@gmail.com
 COMMENT=	Broadcom AirForce IEEE 802.11 Firmware Kernel Module
 
-BUILD_DEPENDS=	b43-fwcutter:${PORTSDIR}/sysutils/b43-fwcutter
+BUILD_DEPENDS=	b43-fwcutter:sysutils/b43-fwcutter
 
 FIRMWARES=								\
 	ucode ucode5 ucode11 ucode13 ucode14 ucode15			\
diff --git a/net/cf/Makefile b/net/cf/Makefile
index 0e5034709719..c83c3f465330 100644
--- a/net/cf/Makefile
+++ b/net/cf/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	CLI for Cloud Foundry written in Go
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go \
-		${LOCALBASE}/bin/go-bindata:${PORTSDIR}/devel/go-bindata
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go \
+		${LOCALBASE}/bin/go-bindata:devel/go-bindata
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudfoundry
diff --git a/net/clamz/Makefile b/net/clamz/Makefile
index 6449c7acbb60..fed7aa814680 100644
--- a/net/clamz/Makefile
+++ b/net/clamz/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	glathe.helko@googlemail.com
 COMMENT=	Command-line program to download MP3 files from Amazon's music store
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libgcrypt.so:security/libgcrypt
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index 2f18b81f43d2..b17119abf377 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -12,21 +12,21 @@ COMMENT=	Init scripts for use on cloud images
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	dmidecode>0:${PORTSDIR}/sysutils/dmidecode \
-		sudo>0:${PORTSDIR}/security/sudo \
-		gpart>0:${PORTSDIR}/sysutils/gpart \
-		${PYTHON_PKGNAMEPREFIX}boto>0:${PORTSDIR}/devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}prettytable>0:${PORTSDIR}/devel/py-prettytable \
-		${PYTHON_PKGNAMEPREFIX}configobj>0:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}serial>0:${PORTSDIR}/comms/py-serial \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}oauth>0:${PORTSDIR}/net/py-oauth \
-		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:${PORTSDIR}/devel/py-jsonpatch \
-		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:${PORTSDIR}/devel/py-jsonpointer
+RUN_DEPENDS=	dmidecode>0:sysutils/dmidecode \
+		sudo>0:security/sudo \
+		gpart>0:sysutils/gpart \
+		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \
+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth \
+		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch \
+		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer
 
 ETCDIR=		${PREFIX}/etc/cloud
 
diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index 4fe182850ab5..35f0dfe67425 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -14,9 +14,9 @@ PKGNAMESUFFIX=	-${CODA_SUITE}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Server programs for a replicated high-performance network file system
 
-LIB_DEPENDS=	liblwp.so:${PORTSDIR}/devel/lwp \
-		librpc2.so:${PORTSDIR}/devel/rpc2 \
-		librvmlwp.so:${PORTSDIR}/devel/rvm
+LIB_DEPENDS=	liblwp.so:devel/lwp \
+		librpc2.so:devel/rpc2 \
+		librvmlwp.so:devel/rvm
 
 USES=		pkgconfig gmake shebangfix perl5 readline
 USE_PERL5=	run
diff --git a/net/corosync/Makefile b/net/corosync/Makefile
index 4582c8bfe3a8..169885f54a42 100644
--- a/net/corosync/Makefile
+++ b/net/corosync/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Corosync Cluster Engine
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss \
-		libqb.so:${PORTSDIR}/devel/libqb
+LIB_DEPENDS=	libnss3.so:security/nss \
+		libqb.so:devel/libqb
 
 USES=		gmake libtool pathfix pkgconfig
 USE_GCC=	yes	# segfaults when built with Clang
@@ -25,10 +25,10 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFINE=	DBUS SNMP
 OPTIONS_SUB=	yes
 
-DBUS_LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_ENABLE=	dbus
 
-SNMP_LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ENABLE=	snmp
 
 post-install:
diff --git a/net/csync2/Makefile b/net/csync2/Makefile
index f291a2889bf9..a6d4386a73d6 100644
--- a/net/csync2/Makefile
+++ b/net/csync2/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Cluster synchronization tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librsync.so.2:${PORTSDIR}/net/librsync1 \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	librsync.so.2:net/librsync1 \
+		libgnutls.so:security/gnutls \
+		libsqlite3.so:databases/sqlite3
 
 OPTIONS_DEFINE=	CSYNC2_COMPARE DOCS
 OPTIONS_SUB=	yes
 CSYNC2_COMPARE_DESC=		Install csync2-compare script
-CSYNC2_COMPARE_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+CSYNC2_COMPARE_RUN_DEPENDS=	bash:shells/bash
 
 USES=		pkgconfig shebangfix
 SHEBANG_FILES=	csync2-compare
diff --git a/net/ctrace/Makefile b/net/ctrace/Makefile
index 4bd9925cbdc5..7d5d09777d83 100644
--- a/net/ctrace/Makefile
+++ b/net/ctrace/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://www.pratyeka.org/ctrace/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiprotocol traceroute tool
 
-BUILD_DEPENDS=	p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP
-RUN_DEPENDS=	p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Net-RawIP>=0:net/p5-Net-RawIP
+RUN_DEPENDS=	p5-Net-RawIP>=0:net/p5-Net-RawIP \
+		p5-libwww>=0:www/p5-libwww
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile
index 5e1c98ce3516..31548aac18b3 100644
--- a/net/cyphesis/Makefile
+++ b/net/cyphesis/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Server for WorldForge games
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libAtlas-0.6.so:${PORTSDIR}/devel/atlas-devel \
-		libvarconf-1.0.so:${PORTSDIR}/devel/varconf \
-		libwfmath-1.0.so:${PORTSDIR}/math/wfmath \
-		libmercator-0.3.so:${PORTSDIR}/devel/mercator \
-		libskstream-0.3.so:${PORTSDIR}/net/skstream \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libAtlas-0.6.so:devel/atlas-devel \
+		libvarconf-1.0.so:devel/varconf \
+		libwfmath-1.0.so:math/wfmath \
+		libmercator-0.3.so:devel/mercator \
+		libskstream-0.3.so:net/skstream \
+		libgcrypt.so:security/libgcrypt \
+		libboost_regex.so:devel/boost-libs
 
 CONFIGURE_ARGS=	--with-python=${LOCALBASE}
 
diff --git a/net/czmq/Makefile b/net/czmq/Makefile
index dc105ff4e4ff..33ac88545f25 100644
--- a/net/czmq/Makefile
+++ b/net/czmq/Makefile
@@ -13,7 +13,7 @@ COMMENT=	High-level C Binding for ZeroMQ
 LICENSE=	MPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq4
+LIB_DEPENDS=	libzmq.so:net/libzmq4
 
 USES=		autoreconf libtool pkgconfig
 USE_LDCONFIG=	yes
diff --git a/net/daemonlogger/Makefile b/net/daemonlogger/Makefile
index 9a69fafc8217..d8cc98e9683c 100644
--- a/net/daemonlogger/Makefile
+++ b/net/daemonlogger/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.snort.org/users/roesch/code/
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Packet sniffer capable of running as a daemon and as a software tap
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
+LIB_DEPENDS=	libdnet.so:net/libdnet
 
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	daemonlogger
diff --git a/net/daq/Makefile b/net/daq/Makefile
index 516b0c47af4c..ebd9e61da445 100644
--- a/net/daq/Makefile
+++ b/net/daq/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Data Acquisition abstraction library for snort 2.9+
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet \
-		libpcap.so:${PORTSDIR}/net/libpcap
-BUILD_DEPENDS=	flex:${PORTSDIR}/textproc/flex
+LIB_DEPENDS=	libdnet.so:net/libdnet \
+		libpcap.so:net/libpcap
+BUILD_DEPENDS=	flex:textproc/flex
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/net/dgd-kernel/Makefile b/net/dgd-kernel/Makefile
index aee77b881da8..c9fb593baefc 100644
--- a/net/dgd-kernel/Makefile
+++ b/net/dgd-kernel/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	kernellib-${PORTVERSION}
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Kernel mudlib, for use with DGD
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/dgd:${PORTSDIR}/net/dgd
+RUN_DEPENDS=	${LOCALBASE}/sbin/dgd:net/dgd
 
 DIST_SUBDIR=	dgd
 WRKSRC=		${WRKDIR}
diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile
index 57787e42e913..6e9b34b425dc 100644
--- a/net/dgd-lpmud/Makefile
+++ b/net/dgd-lpmud/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	2.4.5-for-1.4
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	LPmud mudlib, for use with DGD
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/dgd:${PORTSDIR}/net/dgd
+RUN_DEPENDS=	${LOCALBASE}/sbin/dgd:net/dgd
 
 NO_PACKAGE=	May not be used for monetary gain
 NO_CDROM=	${NO_PACKAGE}
diff --git a/net/dhcpd-pools/Makefile b/net/dhcpd-pools/Makefile
index 0c1e5752b8fa..304243e733af 100644
--- a/net/dhcpd-pools/Makefile
+++ b/net/dhcpd-pools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool to analyze isc-dhcp pool usage based on leases
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:${PORTSDIR}/devel/uthash
+BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash
 
 USES=		charsetfix shebangfix tar:xz
 SHEBANG_FILES=	contrib/snmptest.pl
diff --git a/net/dhcperf/Makefile b/net/dhcperf/Makefile
index b3d8f28ef053..725fd3ee5228 100644
--- a/net/dhcperf/Makefile
+++ b/net/dhcperf/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1-freebsd-5.4-i386
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	DHCPerf delivers accurate performance metrics of Dynamic Host Configuration Protocol service
 
-LIB_DEPENDS=	libc.so.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS=	libc.so.5:misc/compat5x
 
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	Rebuild of i386 package provided by Nominum.
diff --git a/net/dhcprelay/Makefile b/net/dhcprelay/Makefile
index f0e707aba250..fd08c7726b13 100644
--- a/net/dhcprelay/Makefile
+++ b/net/dhcprelay/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.mavetju.org/download/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Lightweight DHCP Relay Agent with GIF tunnel support
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
+LIB_DEPENDS=	libdnet.so:net/libdnet
 
 PLIST_FILES=	bin/dhcprelay
 USE_RC_SUBR=	${PORTNAME}
diff --git a/net/dictd-database/Makefile b/net/dictd-database/Makefile
index 4864f2725e94..952e58ace8bc 100644
--- a/net/dictd-database/Makefile
+++ b/net/dictd-database/Makefile
@@ -21,7 +21,7 @@ DISTFILES=	devils-dict-pre.tar.gz \
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Dictd words database
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/dictd:${PORTSDIR}/net/dictd
+RUN_DEPENDS=	${LOCALBASE}/sbin/dictd:net/dictd
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 39663e69d51d..16391e48f955 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Dict protocol (RFC 2229) server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmaa.so:${PORTSDIR}/devel/libmaa
+LIB_DEPENDS=	libmaa.so:devel/libmaa
 
 ALL_TARGET=	dictd dictzip
 GNU_CONFIGURE=	yes
diff --git a/net/dropbox-api-command/Makefile b/net/dropbox-api-command/Makefile
index 4af8ca172a76..82d4807a8cf6 100644
--- a/net/dropbox-api-command/Makefile
+++ b/net/dropbox-api-command/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Dropbox API wrapper command
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Encode-Locale>=0:${PORTSDIR}/converters/p5-Encode-Locale \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-WebService-Dropbox>=1.17:${PORTSDIR}/net/p5-WebService-Dropbox \
-		p5-Path-Class>=0.26:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-Encode-Locale>=0:converters/p5-Encode-Locale \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-WebService-Dropbox>=1.17:net/p5-WebService-Dropbox \
+		p5-Path-Class>=0.26:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/net/dropbox-uploader/Makefile b/net/dropbox-uploader/Makefile
index eceb882e33ee..b4830832ecc2 100644
--- a/net/dropbox-uploader/Makefile
+++ b/net/dropbox-uploader/Makefile
@@ -12,9 +12,9 @@ COMMENT=	BASH script for the Dropbox backup service
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		curl:${PORTSDIR}/ftp/curl \
-		greadlink:${PORTSDIR}/sysutils/coreutils
+RUN_DEPENDS=	bash:shells/bash \
+		curl:ftp/curl \
+		greadlink:sysutils/coreutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	andreafabrizi
diff --git a/net/dshell/Makefile b/net/dshell/Makefile
index 82d51da70e50..e5ed66a55d94 100644
--- a/net/dshell/Makefile
+++ b/net/dshell/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Extensible network forensic analysis framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${PYTHON_PKGNAMEPREFIX}pygeoip>0:${PORTSDIR}/net/py-pygeoip \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}dpkt>0:${PORTSDIR}/net/py-dpkt \
-		${PYTHON_PKGNAMEPREFIX}ipy>0:${PORTSDIR}/net-mgmt/py-ipy \
-		${PYTHON_PKGNAMEPREFIX}pypcap>0:${PORTSDIR}/net/py-pypcap
+BUILD_DEPENDS=	bash:shells/bash \
+		${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt \
+		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy \
+		${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile
index 1b24dc641016..9a32ec21e371 100644
--- a/net/dtcp/Makefile
+++ b/net/dtcp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Dynamic Tunnel Configuration Protocol daemon and client
 LICENSE=	BSD3CLAUSE
 
 .if defined(WITH_QPOPAUTH)
-RUN_DEPENDS=	qpopauth:${PORTSDIR}/mail/qpopper
+RUN_DEPENDS=	qpopauth:mail/qpopper
 .endif
 
 USES=		uidfix
diff --git a/net/easysoap/Makefile b/net/easysoap/Makefile
index a29de0cafcd1..f61a636e08e7 100644
--- a/net/easysoap/Makefile
+++ b/net/easysoap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C++ SOAP Library based on expat
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USE_OPENSSL=	yes
 USES=		libtool
diff --git a/net/echoping/Makefile b/net/echoping/Makefile
index 7b3f6401aa33..444e0f9574bd 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Ping-like program that uses TCP and/or HTTP
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libidn.so:dns/libidn
 
 USES=		cpe libtool
 CPE_VENDOR=	echoping_project
diff --git a/net/etrace/Makefile b/net/etrace/Makefile
index 60b2780ed279..93aabb0ac193 100644
--- a/net/etrace/Makefile
+++ b/net/etrace/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Configurable static port network tracing tool
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet \
-		${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
+BUILD_DEPENDS=	${LOCALBASE}/lib/libdnet.a:net/libdnet \
+		${LOCALBASE}/lib/libpcap.a:net/libpcap
 
 USES=		tar:tgz
 WRKSRC=		${WRKDIR}/etrace
diff --git a/net/exaddos/Makefile b/net/exaddos/Makefile
index e969701368c6..d17d8b11026d 100644
--- a/net/exaddos/Makefile
+++ b/net/exaddos/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Monitor your network for DDoS
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4-mibs>=0.1.4:${PORTSDIR}/net-mgmt/py-snmp4-mibs \
-		${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:${PORTSDIR}/net-mgmt/py-snmp4
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4-mibs>=0.1.4:net-mgmt/py-snmp4-mibs \
+		${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Exa-Networks
diff --git a/net/flowgrep/Makefile b/net/flowgrep/Makefile
index 6146dcbdeab8..e6976dd0c890 100644
--- a/net/flowgrep/Makefile
+++ b/net/flowgrep/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	flowgrep-${PORTVERSION}
 MAINTAINER=	corsmith@gmail.com
 COMMENT=	TCP stream/UDP/IP payload 'grep' utility
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/nidsmodule.so:${PORTSDIR}/net/pynids
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/nidsmodule.so:net/pynids
 
 USES=		python
 NO_BUILD=	yes
diff --git a/net/fonulator/Makefile b/net/fonulator/Makefile
index 92e383164f7b..ac23bc2648b5 100644
--- a/net/fonulator/Makefile
+++ b/net/fonulator/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://support.red-fone.com/fonulator/
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	FoneBRIDGE configuration utility
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libargtable2.a:${PORTSDIR}/devel/argtable\
-		${LOCALBASE}/lib/libfb.a:${PORTSDIR}/net/libfb
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	${LOCALBASE}/lib/libargtable2.a:devel/argtable\
+		${LOCALBASE}/lib/libfb.a:net/libfb
+LIB_DEPENDS=	libnet.so:net/libnet
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
index e092e45de870..877b0dd33586 100644
--- a/net/foreman-proxy/Makefile
+++ b/net/foreman-proxy/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Foreman Proxy Agent
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	rubygem-bundler_ext>=0.4:${PORTSDIR}/sysutils/rubygem-bundler_ext \
-		rubygem-json>=1.8.1:${PORTSDIR}/devel/rubygem-json \
-		rubygem-rack16>=1.4:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-sinatra>=1.4.3:${PORTSDIR}/www/rubygem-sinatra \
-		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \
+		rubygem-json>=1.8.1:devel/rubygem-json \
+		rubygem-rack16>=1.4:www/rubygem-rack16 \
+		rubygem-sinatra>=1.4.3:www/rubygem-sinatra \
+		${LOCALBASE}/bin/wget:ftp/wget
 
 OPTIONS_DEFINE=	BMC PUPPET
 BMC_DESC=	Depend on rubyipmi for BMC support
@@ -43,9 +43,9 @@ SUB_LIST=	RUBY="${RUBY}" \
 
 PLIST_SUB=	${SUB_LIST} MKDIR="${MKDIR}"
 
-BMC_RUN_DEPENDS=	rubygem-rubyipmi>=0.10.0:${PORTSDIR}/sysutils/rubygem-rubyipmi
-PUPPET_RUN_DEPENDS=	puppet:${PORTSDIR}/sysutils/puppet \
-			rubygem-ruby-augeas>=0.5:${PORTSDIR}/textproc/rubygem-ruby-augeas
+BMC_RUN_DEPENDS=	rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi
+PUPPET_RUN_DEPENDS=	puppet:sysutils/puppet \
+			rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/net/fpc-pcap/Makefile b/net/fpc-pcap/Makefile
index 333d56280d42..81465b735aea 100644
--- a/net/fpc-pcap/Makefile
+++ b/net/fpc-pcap/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBPCAP
 LIBPCAP_DESC=	Install ubiquitous network traffic capture library
 OPTIONS_DEFAULT=	LIBPCAP
 
-LIBPCAP_LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
+LIBPCAP_LIB_DEPENDS=	libpcap.so:net/libpcap
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/freediameter/Makefile b/net/freediameter/Makefile
index 7342655680d3..056f97a1b3f0 100644
--- a/net/freediameter/Makefile
+++ b/net/freediameter/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Open source Diameter protocol implementation
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls
 
 USES=		cmake bison
 USE_LDCONFIG=	yes
@@ -20,7 +20,7 @@ CMAKE_ARGS+=	-DSCTP_USE_MAPPED_ADDRESSES:BOOL=ON
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index ae73ad40c217..bbf31d56769f 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Free RADIUS server implementation
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libgdbm.so:databases/gdbm \
+		libltdl.so:devel/libltdl
 
 LOGDIR?=	/var/log
 KRB5_CONFIG?=	/usr/bin/krb5-config --libs
@@ -109,11 +109,11 @@ SUB_LIST+=	RUN_AS_USER="no"
 .if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL}
 .if ${PORT_OPTIONS:MHEIMDAL}
 .if ${PORT_OPTIONS:MHEIMDAL_PORT}
-LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	libkrb5.so:security/heimdal
 .endif
 CONFIGURE_ARGS+=--enable-heimdal-krb5
 .else
-LIB_DEPENDS+=	libkrb5support.so:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=	libkrb5support.so:security/krb5
 .endif
 CONFIGURE_ARGS+=--with-rlm_krb5
 .if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
@@ -170,7 +170,7 @@ PLIST_SUB+=	PGSQL="@comment "
 .if ${PORT_OPTIONS:MUNIXODBC}
 CONFIGURE_ARGS+=--with-rlm_sql_unixodbc
 PLIST_SUB+=	UNIXODBC=""
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-rlm_sql_unixodbc
 PLIST_SUB+=	UNIXODBC="@comment "
@@ -239,7 +239,7 @@ EXPM=		yes
 
 # No SMB option yet; rlm_smb is still unbuildable
 #.if ${PORT_OPTIONS:MSMB}
-#LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+#LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 #CONFIGURE_ARGS+=--with-rlm_smb
 #CONFIGURE_ARGS+=--with-rlm-smb-lib-dir=${LOCALBASE}/lib
 #CONFIGURE_ARGS+=--with-rlm-smb-include-dir=${LOCALBASE}/include
@@ -259,7 +259,7 @@ EXPM=		yes
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-exec.c
 CONFIGURE_ENV+=	ORACLE_HOME="${ORACLE_HOME}"
 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+=--with-oracle-home-dir=${ORACLE_HOME}/rdbms/demo
 PLIST_SUB+=	OCI8=""
 .else
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 505c265cc44f..ab483f7ecf7d 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Free RADIUS server implementation
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libtalloc.so:${PORTSDIR}/devel/talloc
+LIB_DEPENDS=	libgdbm.so:databases/gdbm \
+		libtalloc.so:devel/talloc
 
 LOGDIR?=	/var/log
 KRB5_CONFIG?=	/usr/bin/krb5-config --libs
@@ -60,7 +60,7 @@ REST_DESC=		Enable RESTful API support
 SSL_PORT_DESC=		Use OpenSSL from the ports collection
 
 SQLITE3_CONFIGURE_WITH=rlm_sql_sqlite
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 .include <bsd.port.options.mk>
 
@@ -83,11 +83,11 @@ GROUPS=		${RADIUS_GROUP}
 .if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL}
 .if ${PORT_OPTIONS:MHEIMDAL}
 .if ${PORT_OPTIONS:MHEIMDAL_PORT}
-LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	libkrb5.so:security/heimdal
 .endif
 CONFIGURE_ARGS+=--enable-heimdal-krb5 --enable-pthread-support
 .else
-LIB_DEPENDS+=	libkrb5support.so:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=	libkrb5support.so:security/krb5
 .endif
 CONFIGURE_ARGS+=--with-rlm_krb5
 .if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
@@ -115,7 +115,7 @@ CONFIGURE_ARGS+=--without-edir
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	YES
-LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=--with-rlm_ldap
 PLIST_SUB+=	LDAP=""
 _REQUIRE+=	slapd
@@ -147,7 +147,7 @@ PLIST_SUB+=	PGSQL="@comment "
 .if ${PORT_OPTIONS:MUNIXODBC}
 CONFIGURE_ARGS+=--with-rlm_sql_unixodbc
 PLIST_SUB+=	UNIXODBC=""
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-rlm_sql_unixodbc
 PLIST_SUB+=	UNIXODBC="@comment "
@@ -203,7 +203,7 @@ EXPM=		yes
 .endif
 
 .if ${PORT_OPTIONS:MREDIS}
-LIB_DEPENDS+=	libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=	libhiredis.so:databases/hiredis
 CONFIGURE_ARGS+=--with-rlm_redis --with-rlm_rediswho
 PLIST_SUB+=	RLMREDIS=""
 .else
@@ -217,8 +217,8 @@ EXPM=		yes
 .endif
 
 .if ${PORT_OPTIONS:MREST}
-LIB_DEPENDS+=	libjson-c.so:${PORTSDIR}/devel/json-c \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libjson-c.so:devel/json-c \
+		libcurl.so:ftp/curl
 CONFIGURE_ARGS+=--with-rlm_rest \
 		--with-libcurl=${LOCALBASE} \
 		--with-jsonc-lib-dir=${LOCALBASE}/lib \
@@ -235,7 +235,7 @@ EXPM=		yes
 .endif
 
 .if ${PORT_OPTIONS:MFREETDS}
-LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libct.so:databases/freetds
 CONFIGURE_ARGS+=--with-rlm_freetds
 PLIST_SUB+=	RLMFREETDS=""
 .else
@@ -249,7 +249,7 @@ EXPM=		yes
 .endif
 
 .if ${PORT_OPTIONS:MIDN}
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:dns/libidn
 CONFIGURE_ARGS+=--with-rlm_idn
 PLIST_SUB+=	RLMIDN=""
 .else
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index dacbae5141f7..73d094ecb087 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -29,24 +29,24 @@ OPTIONS_DEFINE=		ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11
 OPTIONS_DEFAULT=	CUPS GSTREAMER X11
 OPTIONS_SUB=		yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_ON=		-DWITH_ALSA=ON
 ALSA_CMAKE_OFF=		-DWITH_ALSA=OFF
 
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_ON=		-DWITH_CUPS=ON
 CUPS_CMAKE_OFF=		-DWITH_CUPS=OFF
 
 # outdated and unmaintained upstream
 DIRECTFB_DESC=		Build FreeRDP DirectFB client (outdated)
-DIRECTFB_LIB_DEPENDS=	libdirectfb.so:${PORTSDIR}/devel/directfb
+DIRECTFB_LIB_DEPENDS=	libdirectfb.so:devel/directfb
 DIRECTFB_CMAKE_ON=	-DWITH_DIRECTFB=ON
 DIRECTFB_CMAKE_OFF=	-DWITH_DIRECTFB=OFF
 # currently DirectFB option fails with clang
 DIRECTFB_USE=		gcc=yes
 
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-			libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_ON=	-DWITH_FFMPEG=ON
 FFMPEG_CMAKE_OFF=	-DWITH_FFMPEG=OFF
 
@@ -54,7 +54,7 @@ GSTREAMER_CMAKE_ON=	-DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF
 GSTREAMER_CMAKE_OFF=	-DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF
 GSTREAMER_USE=		gstreamer1=yes xorg=x11,xextproto,xext,xrandr
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DWITH_PULSE=ON
 PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE=OFF
 
@@ -62,7 +62,7 @@ SSE_CMAKE_ON=		-DWITH_SSE2=ON
 SSE_CMAKE_OFF=		-DWITH_SSE2=OFF
 
 X11_DESC=		Build FreeRDP X11 client
-X11_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
+X11_BUILD_DEPENDS=	xmlto:textproc/xmlto
 X11_CMAKE_ON=		-DWITH_X11=ON
 X11_CMAKE_OFF=		-DWITH_X11=OFF -DWITH_XKBFILE=OFF
 X11_USE=		xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr,xi,xfixes
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 74fe82ec3db4..07468496351f 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -12,33 +12,33 @@ COMMENT=	Multi-protocol soft switch for telephony applications
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
-		${LOCALBASE}/bin/aclocal:${PORTSDIR}/devel/automake
-RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libldns.so:${PORTSDIR}/dns/ldns \
-		libyuv.so:${PORTSDIR}/graphics/libyuv \
-		libvpx.so:${PORTSDIR}/multimedia/libvpx \
-		libopus.so:${PORTSDIR}/audio/opus \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-		libopencv_legacy.so:${PORTSDIR}/graphics/opencv \
-		libhiredis.so:${PORTSDIR}/databases/hiredis \
-		libmemcached.so:${PORTSDIR}/databases/libmemcached \
-		libSoundTouch.so:${PORTSDIR}/audio/soundtouch \
-		libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libmp4v2.so:${PORTSDIR}/multimedia/mp4v2 \
-		libshout.so:${PORTSDIR}/audio/libshout \
-		libmpg123.so:${PORTSDIR}/audio/mpg123 \
-		libmp3lame.so:${PORTSDIR}/audio/lame \
-		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp \
-		libvlc.so:${PORTSDIR}/multimedia/vlc \
-		libyaml.so:${PORTSDIR}/textproc/libyaml \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
+		${LOCALBASE}/bin/aclocal:devel/automake
+RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
+		libcurl.so:ftp/curl \
+		libpcre.so:devel/pcre \
+		libspeex.so:audio/speex \
+		libldns.so:dns/ldns \
+		libyuv.so:graphics/libyuv \
+		libvpx.so:multimedia/libvpx \
+		libopus.so:audio/opus \
+		libsndfile.so:audio/libsndfile \
+		libavformat.so:multimedia/ffmpeg \
+		libopencv_legacy.so:graphics/opencv \
+		libhiredis.so:databases/hiredis \
+		libmemcached.so:databases/libmemcached \
+		libSoundTouch.so:audio/soundtouch \
+		libasound.so:audio/alsa-lib \
+		libportaudio.so:audio/portaudio \
+		libmp4v2.so:multimedia/mp4v2 \
+		libshout.so:audio/libshout \
+		libmpg123.so:audio/mpg123 \
+		libmp3lame.so:audio/lame \
+		libnetsnmp.so:net-mgmt/net-snmp \
+		libvlc.so:multimedia/vlc \
+		libyaml.so:textproc/libyaml \
+		libMagickWand-6.so:graphics/ImageMagick-nox11
 
 CONFLICTS_BUILD=	xmlrpc-c-devel-*
 
diff --git a/net/geoclue/Makefile b/net/geoclue/Makefile
index a2efe0a7af15..c83abb820aa9 100644
--- a/net/geoclue/Makefile
+++ b/net/geoclue/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.freedesktop.org/software/geoclue/releases/${PORTVERSION
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	D-Bus service that provides location information
 
-LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
+		libsoup-2.4.so:devel/libsoup
 
 USES=		gettext gmake gnome pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 intlhack
diff --git a/net/geocode-glib/Makefile b/net/geocode-glib/Makefile
index 9f7b194240ca..e62809b8b811 100644
--- a/net/geocode-glib/Makefile
+++ b/net/geocode-glib/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Convenience library for the geocoding and reverse geocoding
 
-LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
+		libsoup-2.4.so:devel/libsoup
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile
index ab8170cf20ef..420da521a32f 100644
--- a/net/geoipupdate/Makefile
+++ b/net/geoipupdate/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fetch the latest copies of the paid GeoIP database
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
diff --git a/net/get_iplayer/Makefile b/net/get_iplayer/Makefile
index 3a5a6f4a8394..e415eef1307c 100644
--- a/net/get_iplayer/Makefile
+++ b/net/get_iplayer/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Search, index, or stream archive video from BBC iPlayer
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Cookies>=0:${PORTSDIR}/www/p5-HTTP-Cookies \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		rtmpdump:${PORTSDIR}/multimedia/rtmpdump
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTTP-Cookies>=0:www/p5-HTTP-Cookies \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww \
+		rtmpdump:multimedia/rtmpdump
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/net/gfbgraph/Makefile b/net/gfbgraph/Makefile
index 1fab0e11d587..64aad2c7918e 100644
--- a/net/gfbgraph/Makefile
+++ b/net/gfbgraph/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject library for Facebook Graph API
 
-BUILD_DEPENDS=	gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	librest-0.7.so:${PORTSDIR}/devel/librest \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+BUILD_DEPENDS=	gtkdoc-rebase:textproc/gtk-doc
+LIB_DEPENDS=	librest-0.7.so:devel/librest \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libjson-glib-1.0.so:devel/json-glib
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 intlhack introspection:build
diff --git a/net/gini/Makefile b/net/gini/Makefile
index 7601b382dae7..c1a27be8f30e 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/OldFiles
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight media streaming server
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 USES=		tar:bzip2 gmake
 USE_GNOME=	glib12
diff --git a/net/gkrellmwireless2/Makefile b/net/gkrellmwireless2/Makefile
index 4a68f26474c8..5fea876f4dc2 100644
--- a/net/gkrellmwireless2/Makefile
+++ b/net/gkrellmwireless2/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://gkrellm.luon.net/files/
 MAINTAINER=	ktsin@acm.org
 COMMENT=	GKrellM wireless plugin
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 WRKSRC=		${WRKDIR}/gkrellmwireless
 USE_XORG=	x11
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 42eb0d9a44fc..e6bbd75b9ad7 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -11,15 +11,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Network-related giomodules for glib
 
-BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libp11-kit.so:${PORTSDIR}/security/p11-kit \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libproxy.so:${PORTSDIR}/net/libproxy
-RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt \
+		libp11-kit.so:security/p11-kit \
+		libdbus-1.so:devel/dbus \
+		libproxy.so:net/libproxy
+RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile
index ba2f5e281d66..b4de22924c26 100644
--- a/net/glusterfs/Makefile
+++ b/net/glusterfs/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GlusterFS distributed file system
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone liburcu-bp.so:${PORTSDIR}/sysutils/liburcu
+LIB_DEPENDS=	libargp.so:devel/argp-standalone liburcu-bp.so:${PORTSDIR}/sysutils/liburcu
 
 USE_GCC=	any
 
@@ -46,7 +46,7 @@ KMODDIR?=	/boot/modules
 
 .if ${OSVERSION} < 1000000
 WITH_OPENSSL_PORT=	yes
-RUN_DEPENDS+=	${KMODDIR}/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+RUN_DEPENDS+=	${KMODDIR}/fuse.ko:sysutils/fusefs-kmod
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index ce640079b66d..c0fc32214b47 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME utility that provides network information statistics
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop
 
 USE_GNOME=	gtk30 intlhack libxml2:build
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
@@ -27,7 +27,7 @@ GLIB_SCHEMAS=	org.gnome.gnome-nettool.gschema.xml
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} > 1000000)
-RUN_DEPENDS+=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind-tools
+RUN_DEPENDS+=	${LOCALBASE}/bin/dig:dns/bind-tools
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index 090ad39e6f02..79f46bdc41b1 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -10,14 +10,14 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Interface provider to access the user's online accounts
 
-BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		librest-0.7.so:${PORTSDIR}/devel/librest
+BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libjson-glib-1.0.so:devel/json-glib \
+		libnotify.so:devel/libnotify \
+		libsecret-1.so:security/libsecret \
+		librest-0.7.so:devel/librest
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/net/gnome-online-miners/Makefile b/net/gnome-online-miners/Makefile
index 271bd287e015..2512d2ed6a5c 100644
--- a/net/gnome-online-miners/Makefile
+++ b/net/gnome-online-miners/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Crawls through your online content
 
-LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata \
-		libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker \
-		libgfbgraph-0.2.so:${PORTSDIR}/net/gfbgraph \
-		libzapojit-0.0.so:${PORTSDIR}/net/libzapojit \
-		libgrilo-0.2.so:${PORTSDIR}/net/grilo
+LIB_DEPENDS=	libgdata.so:devel/libgdata \
+		libtracker-control-1.0.so:sysutils/tracker \
+		libgfbgraph-0.2.so:net/gfbgraph \
+		libzapojit-0.0.so:net/libzapojit \
+		libgrilo-0.2.so:net/grilo
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	intlhack introspection:build
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index d5187d22684f..5a7b4ea5f756 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	gnu-
 MAINTAINER=	goran.tal@gmail.com
 COMMENT=	Flexible modular implementation of DICT server
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USE_LDCONFIG=	yes
 USES=		tar:xz gmake libtool
@@ -38,7 +38,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGUILE}
-LIB_DEPENDS+=	libguile.so:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	libguile.so:lang/guile
 PLIST_SUB+=	GUILE=""
 .else
 CONFIGURE_ARGS+=--without-guile
@@ -46,7 +46,7 @@ PLIST_SUB+=	GUILE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 PLIST_SUB+=	PCRE=""
 .else
 CONFIGURE_ARGS+=--without-pcre
@@ -54,7 +54,7 @@ PLIST_SUB+=	PCRE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGSASL}
-LIB_DEPENDS+=	libgsasl.so:${PORTSDIR}/security/gsasl
+LIB_DEPENDS+=	libgsasl.so:security/gsasl
 CONFIGURE_ARGS+=--with-gsasl
 .else
 CONFIGURE_ARGS+=--without-gsasl
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 65e40c467948..135a52c9a772 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GNU RADIUS server
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
 GNU_CONFIGURE=	yes
@@ -45,7 +45,7 @@ EMACS_DESC=	Install Emacs dotfiles
 
 SNMP_CONFIGURE_ENABLE=		snmp
 CLIENT_CONFIGURE_ENABLE=	client
-CLIENT_LIB_DEPENDS=		libguile.so:${PORTSDIR}/lang/guile
+CLIENT_LIB_DEPENDS=		libguile.so:lang/guile
 CLIENT_CONFIGURE_OFF=		--without-guile
 MYSQL_USE=			mysql=yes
 MYSQL_CONFIGURE_WITH=		mysql
diff --git a/net/go-cs/Makefile b/net/go-cs/Makefile
index 85b130e2f3c1..efe144aa7dff 100644
--- a/net/go-cs/Makefile
+++ b/net/go-cs/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Concurrent ssh client
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${GO_CMD}:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${GO_CMD}:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	akosela
diff --git a/net/go-geoip/Makefile b/net/go-geoip/Makefile
index 9f9db2aeb919..179ba3cef580 100644
--- a/net/go-geoip/Makefile
+++ b/net/go-geoip/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Go library to wrap the libgeoip C library
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 USES=		compiler
 USE_GITHUB=	yes
diff --git a/net/go.net/Makefile b/net/go.net/Makefile
index 3e9940db8ab0..b126dc797112 100644
--- a/net/go.net/Makefile
+++ b/net/go.net/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Additional Net packages for Go
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.text:${PORTSDIR}/textproc/go.text
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.text:textproc/go.text
 
 GO_PKGNAME=	code.google.com/p/go.net
 GO_TARGET=	${GO_PKGNAME}/dict		\
diff --git a/net/google-cloud-sdk/Makefile b/net/google-cloud-sdk/Makefile
index beb5db470c51..c65861e97306 100644
--- a/net/google-cloud-sdk/Makefile
+++ b/net/google-cloud-sdk/Makefile
@@ -17,7 +17,7 @@ USES=		python
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/google-cloud-sdk
 
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	python:lang/python
 
 post-extract:
 	@${RM} ${WRKSRC}/install.bat
diff --git a/net/google-daemon/Makefile b/net/google-daemon/Makefile
index 7901109703b5..e60d42dbede9 100644
--- a/net/google-daemon/Makefile
+++ b/net/google-daemon/Makefile
@@ -9,9 +9,9 @@ CATEGORIES=	net
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Google daemon for use with Google Cloud Compute Engine
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
-		sudo:${PORTSDIR}/security/sudo
+BUILD_DEPENDS=	python:lang/python
+RUN_DEPENDS=	python:lang/python \
+		sudo:security/sudo
 
 USES=		python shebangfix
 USE_GITHUB=	yes
diff --git a/net/google-startup-scripts/Makefile b/net/google-startup-scripts/Makefile
index bdd5742caa3d..95ac80f039f8 100644
--- a/net/google-startup-scripts/Makefile
+++ b/net/google-startup-scripts/Makefile
@@ -8,11 +8,11 @@ CATEGORIES=	net
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Startup scripts that interact with Google Compute Engine VMs
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
-		curl:${PORTSDIR}/ftp/curl \
-		bash:${PORTSDIR}/shells/bash \
-		flock:${PORTSDIR}/sysutils/flock
+BUILD_DEPENDS=	python:lang/python
+RUN_DEPENDS=	python:lang/python \
+		curl:ftp/curl \
+		bash:shells/bash \
+		flock:sysutils/flock
 
 USES=		python shebangfix
 USE_GITHUB=	yes
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index eead3fce6243..240783bb3d61 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Command line tools for the Google Data APIs
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/net/gpxe/Makefile b/net/gpxe/Makefile
index 82a378b33342..41b7031b6801 100644
--- a/net/gpxe/Makefile
+++ b/net/gpxe/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Open Source (GPL) gPXE network bootloader
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	syslinux:${PORTSDIR}/sysutils/syslinux \
-		mkisofs:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS=	syslinux:sysutils/syslinux \
+		mkisofs:sysutils/cdrtools
 
 USES=		gmake perl5
 MAKE_ARGS=	PERL=${PERL}
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 38fb50bc8b87..6132d19eab92 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based LDAP client
 
-LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring
 
 OPTIONS_DEFINE=	DND CACHE
 OPTIONS_DEFAULT=	DND CACHE
diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index 6838249fc5bd..fb927d8c0f83 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	GNOME frontend for the remote desktop client (rdesktop)
 
-RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rdesktop
+RUN_DEPENDS=	rdesktop:net/rdesktop
 
 GNU_CONFIGURE=	yes
 USES=		gettext-tools gmake pathfix pkgconfig
diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile
index 400cb0bb70ae..9b8af6f8fe5c 100644
--- a/net/grilo-plugins/Makefile
+++ b/net/grilo-plugins/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plugins for net/grilo
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgrilo-0.2.so:${PORTSDIR}/net/grilo \
-		libavahi-gobject.so:${PORTSDIR}/net/avahi-app \
-		libgdata.so:${PORTSDIR}/devel/libgdata
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgrilo-0.2.so:net/grilo \
+		libavahi-gobject.so:net/avahi-app \
+		libgdata.so:devel/libgdata
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
@@ -32,15 +32,15 @@ OPTIONS_DEFAULT=                TRACKER METADATA
 
 TRACKER_DESC=			Tracker support for grilo (used by gnome-music and possibly others)
 TRACKER_CONFIGURE_ENABLE=	tracker
-TRACKER_LIB_DEPENDS=		libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker
+TRACKER_LIB_DEPENDS=		libtracker-sparql-1.0.so:sysutils/tracker
 DMAP_DESC=			DMAP (DAAP, DPAP & DACP) support with libdmapsharing
 DMAP_CONFIGURE_ENABLE=		dmap
-DMAP_LIB_DEPENDS=		libdmapsharing-3.0.so:${PORTSDIR}/net/libdmapsharing
+DMAP_LIB_DEPENDS=		libdmapsharing-3.0.so:net/libdmapsharing
 DLEYNA_DESC=			DLNA support for grilo
 DLEYNA_CONFIGURE_ENABLE=	dleyna
-DLEYNA_LIB_DEPENDS=		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+DLEYNA_LIB_DEPENDS=		libsoup-2.4.so:devel/libsoup
 METADATA_DESC=			Enable Local-metadata plugin
 METADATA_CONFIGURE_ENABLE=	localmetadata
-METADATA_LIB_DEPENDS=		libmediaart-2.0.so:${PORTSDIR}/multimedia/libmediaart
+METADATA_LIB_DEPENDS=		libmediaart-2.0.so:multimedia/libmediaart
 
 .include <bsd.port.mk>
diff --git a/net/grilo/Makefile b/net/grilo/Makefile
index 254fe1db402a..66d34715999e 100644
--- a/net/grilo/Makefile
+++ b/net/grilo/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Grilo is a framework focused on making media discovery and browsing
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		liboauth.so:${PORTSDIR}/net/liboauth \
-		libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		liboauth.so:net/liboauth \
+		libtotem-plparser.so:multimedia/totem-pl-parser
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/net/grive/Makefile b/net/grive/Makefile
index f122f47d720a..60f7b94875c7 100644
--- a/net/grive/Makefile
+++ b/net/grive/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Open source client for Google Drive
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
+		libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libgcrypt.so:security/libgcrypt \
+		libjson-c.so:devel/json-c \
+		libyajl.so:devel/yajl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Grive
diff --git a/net/grsync/Makefile b/net/grsync/Makefile
index 8369c7d1c984..c7f26f786ffa 100644
--- a/net/grsync/Makefile
+++ b/net/grsync/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GTK frontend for rsync
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	rsync:net/rsync \
+		bash:shells/bash
 
 USE_GNOME=	gtk20 intltool
 USES=		desktop-file-utils gettext gmake \
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index 90124803330e..c969e74761ff 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/Gspoof-3/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console/GTK+ TCP/IP Packets Forger
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile
index d7b79f8817c9..65b920e80013 100644
--- a/net/gssdp/Makefile
+++ b/net/gssdp/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Framework for UPnP devices
 
 LICENSE=	LGPL20
 
-BUILD_DEPENDS=	gobject-introspection>=0.6.7:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+BUILD_DEPENDS=	gobject-introspection>=0.6.7:devel/gobject-introspection
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 OPTIONS_DEFINE=	GTK3 VALA
 OPTIONS_DEFAULT=GTK3
@@ -28,7 +28,7 @@ USES=		gmake libtool pathfix pkgconfig tar:xz
 
 GTK3_CONFIGURE_WITH=	gtk
 GTK3_USE=		GNOME=gtk30
-VALA_BUILD_DEPENDS=	vala>=0.20:${PORTSDIR}/lang/vala
+VALA_BUILD_DEPENDS=	vala>=0.20:lang/vala
 VALA_CONFIGURE_ENV=	ac_cv_path_VAPIGEN=${LOCALBASE}/bin/vapigen
 VALA_CONFIGURE_ENV_OFF=	ac_cv_path_VAPIGEN=""
 
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 98d1e19b0ae5..465a51c9cfe2 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -13,10 +13,10 @@ COMMENT=	VNC viewer widget for GTK+
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt \
+		libsasl2.so:security/cyrus-sasl2
 
 USE_GNOME=	gtk30 intltool introspection:build
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
@@ -35,6 +35,6 @@ OPTIONS_SUB=	yes
 
 PULSEAUDIO_DESC=	use PulseAudio for audio playback
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 .include <bsd.port.mk>
diff --git a/net/gtknetcat/Makefile b/net/gtknetcat/Makefile
index d3fe02aa72a1..ef52fc8e0f02 100644
--- a/net/gtknetcat/Makefile
+++ b/net/gtknetcat/Makefile
@@ -16,7 +16,7 @@ COMMENT=	GTK GUI for netcat
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		gmake python
 USE_GNOME=	intlhack pygtk2
diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index 1296f95f833f..78893d8c3632 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -12,10 +12,10 @@ COMMENT=	HTML5 Clientless Remote Desktop
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libossp-uuid.so:${PORTSDIR}/misc/ossp-uuid \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo
+LIB_DEPENDS=	libossp-uuid.so:misc/ossp-uuid \
+		libpng.so:graphics/png \
+		libcairo.so:graphics/cairo \
+		libjpeg.so:graphics/jpeg-turbo
 
 CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_*
 
@@ -39,16 +39,16 @@ SUB_LIST+=	GUACD_USER=${USERS} \
 OPTIONS_DEFINE=		RDP SSH VNC VORBIS PULSEAUDIO
 OPTIONS_DEFAULT=	SSH
 OPTIONS_SUB=		yes
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_DESC?=	VNC audio support (Experimental)
-RDP_LIB_DEPENDS=	libfreerdp.so:${PORTSDIR}/net/freerdp
+RDP_LIB_DEPENDS=	libfreerdp.so:net/freerdp
 RDP_DESC?=		RDP Protocal Support
-SSH_LIB_DEPENDS=	libpango-1.0.so:${PORTSDIR}/x11-toolkits/pango \
-			libssh2.so:${PORTSDIR}/security/libssh2
+SSH_LIB_DEPENDS=	libpango-1.0.so:x11-toolkits/pango \
+			libssh2.so:security/libssh2
 SSH_DESC?=		SSH Support
-VNC_LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver
+VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VNC_DESC?=		VNC Protocol Support
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_DESC?=		Ogg Vorbis for compression
 
 .include <bsd.port.pre.mk>
diff --git a/net/gupnp-av/Makefile b/net/gupnp-av/Makefile
index b1dd8b7ca927..1401f7006395 100644
--- a/net/gupnp-av/Makefile
+++ b/net/gupnp-av/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Helpers for audio/video applications using GUPnP
 
 LICENSE=	LGPL20
 
-BUILD_DEPENDS=	gobject-introspection>=0.9.5:${PORTSDIR}/devel/gobject-introspection \
-		gupnp>=0.19.0:${PORTSDIR}/net/gupnp
-LIB_DEPENDS=	libgupnp-1.0.so:${PORTSDIR}/net/gupnp
-RUN_DEPENDS=	gupnp>=0.19.0:${PORTSDIR}/net/gupnp
+BUILD_DEPENDS=	gobject-introspection>=0.9.5:devel/gobject-introspection \
+		gupnp>=0.19.0:net/gupnp
+LIB_DEPENDS=	libgupnp-1.0.so:net/gupnp
+RUN_DEPENDS=	gupnp>=0.19.0:net/gupnp
 
 OPTIONS_DEFINE=	VALA
 OPTIONS_SUB=	yes
@@ -29,7 +29,7 @@ USES=		gmake libtool pathfix pkgconfig tar:xz
 
 PORTDATA=	*
 
-VALA_BUILD_DEPENDS=	vala>=0.22:${PORTSDIR}/lang/vala
+VALA_BUILD_DEPENDS=	vala>=0.22:lang/vala
 VALA_CONFIGURE_ENV=	ac_cv_path_VAPIGEN=${LOCALBASE}/bin/vapigen
 VALA_CONFIGURE_ENV_OFF=	ac_cv_path_VAPIGEN=""
 
diff --git a/net/gupnp-dlna/Makefile b/net/gupnp-dlna/Makefile
index f1e1b7bc635f..3b2c30fdcdfd 100644
--- a/net/gupnp-dlna/Makefile
+++ b/net/gupnp-dlna/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Helpers for DLNA-related tasks using GUPnP
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala \
-		gupnp>=0.19.0:${PORTSDIR}/net/gupnp
-LIB_DEPENDS=	libgupnp-1.0.so:${PORTSDIR}/net/gupnp
-RUN_DEPENDS=	gupnp>=0.19.0:${PORTSDIR}/net/gupnp
+BUILD_DEPENDS=	valac:lang/vala \
+		gupnp>=0.19.0:net/gupnp
+LIB_DEPENDS=	libgupnp-1.0.so:net/gupnp
+RUN_DEPENDS=	gupnp>=0.19.0:net/gupnp
 
 CONFIGURE_ARGS=	--enable-introspection \
 		--enable-gstreamer-metadata-backend
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index 3a574d219352..dd7cd12004fe 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Library to handle UPnP IGD port mapping
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	gobject-introspection>=0.10:${PORTSDIR}/devel/gobject-introspection \
-		gupnp>=0.18:${PORTSDIR}/net/gupnp
-LIB_DEPENDS=	libgupnp-1.0.so:${PORTSDIR}/net/gupnp
-RUN_DEPENDS=	gupnp>=0.18:${PORTSDIR}/net/gupnp
+BUILD_DEPENDS=	gobject-introspection>=0.10:devel/gobject-introspection \
+		gupnp>=0.18:net/gupnp
+LIB_DEPENDS=	libgupnp-1.0.so:net/gupnp
+RUN_DEPENDS=	gupnp>=0.18:net/gupnp
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_DEFAULT=PYTHON
@@ -28,7 +28,7 @@ USE_LDCONFIG=	yes
 USES=		gmake libtool pathfix pkgconfig tar:xz
 
 PYTHON_CONFIGURE_ENABLE=python
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject>=2.12.0:${PORTSDIR}/devel/py-gobject
+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject>=2.12.0:devel/py-gobject
 PYTHON_USES=		python:2
 
 post-patch:
diff --git a/net/gupnp-ui/Makefile b/net/gupnp-ui/Makefile
index 31e6ed96da4a..4920c295b606 100644
--- a/net/gupnp-ui/Makefile
+++ b/net/gupnp-ui/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Framework for UPnP devices
 
 LICENSE=	LGPL20
 
-BUILD_DEPENDS=	gupnp>=0.3:${PORTSDIR}/net/gupnp
-LIB_DEPENDS=	libgupnp-1.0.so:${PORTSDIR}/net/gupnp \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+BUILD_DEPENDS=	gupnp>=0.3:net/gupnp
+LIB_DEPENDS=	libgupnp-1.0.so:net/gupnp \
+		libsoup-2.4.so:devel/libsoup
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 42d5ff266ac7..1af9c20fff14 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Framework for UPnP devices
 
 LICENSE=	LGPL20
 
-BUILD_DEPENDS=	gobject-introspection>=0.6.4:${PORTSDIR}/devel/gobject-introspection \
-		gssdp>=0.14.13:${PORTSDIR}/net/gssdp
-LIB_DEPENDS=	libgssdp-1.0.so:${PORTSDIR}/net/gssdp \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	gobject-introspection>=0.6.4:devel/gobject-introspection \
+		gssdp>=0.14.13:net/gssdp
+LIB_DEPENDS=	libgssdp-1.0.so:net/gssdp \
+		libsoup-2.4.so:devel/libsoup \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 OPTIONS_DEFINE=	VALA
 OPTIONS_SUB=	yes
@@ -31,7 +31,7 @@ USES=		compiler:c11 gmake libtool pathfix pkgconfig python:run shebangfix tar:xz
 
 SHEBANG_FILES=	tools/gupnp-binding-tool
 
-VALA_BUILD_DEPENDS=	vala>=0.20:${PORTSDIR}/lang/vala
+VALA_BUILD_DEPENDS=	vala>=0.20:lang/vala
 VALA_CONFIGURE_ENV=	ac_cv_path_VAPIGEN=${LOCALBASE}/bin/vapigen
 VALA_CONFIGURE_ENV_OFF=	ac_cv_path_VAPIGEN=""
 
diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile
index b7e2b4ab6e59..7433aff42d96 100644
--- a/net/gutenfetch/Makefile
+++ b/net/gutenfetch/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	johntabularasa@users.sf.net
 COMMENT=	Fetch listings and books from Project Gutenberg
 
-LIB_DEPENDS=	libgutenfetch.so:${PORTSDIR}/devel/libgutenfetch
+LIB_DEPENDS=	libgutenfetch.so:devel/libgutenfetch
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/gwhois/Makefile b/net/gwhois/Makefile
index 906214f1a387..47c51f4e6edd 100644
--- a/net/gwhois/Makefile
+++ b/net/gwhois/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Flexible whois client and proxy
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
-		p5-Net-LibIDN>=0:${PORTSDIR}/dns/p5-Net-LibIDN \
-		lynx:${PORTSDIR}/www/lynx \
-		curl:${PORTSDIR}/ftp/curl
+RUN_DEPENDS=	p5-libwww>=5.805:www/p5-libwww \
+		p5-Net-LibIDN>=0:dns/p5-Net-LibIDN \
+		lynx:www/lynx \
+		curl:ftp/curl
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/net/h323plus/Makefile b/net/h323plus/Makefile
index 64c01e19e9b1..1448ed522474 100644
--- a/net/h323plus/Makefile
+++ b/net/h323plus/Makefile
@@ -12,7 +12,7 @@ COMMENT=	H323 Video Conferencing library
 
 LICENSE=	MPL
 
-LIB_DEPENDS=	libpt.so:${PORTSDIR}/devel/ptlib
+LIB_DEPENDS=	libpt.so:devel/ptlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 496ad7656450..21814804f517 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -37,12 +37,12 @@ OPTIONS_DEFAULT=	SPCRE OPENSSL
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDPCRE}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 MAKE_ARGS+=	USE_PCRE=1 USE_PCRE_JIT=1
 .endif
 
 .if ${PORT_OPTIONS:MSPCRE}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcre.a:devel/pcre
 MAKE_ARGS+=	USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1
 .endif
 
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 345923b517b2..63ec8238152b 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -36,12 +36,12 @@ OPTIONS_DEFAULT=	SPCRE OPENSSL
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDPCRE}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 MAKE_ARGS+=	USE_PCRE=1 USE_PCRE_JIT=1
 .endif
 
 .if ${PORT_OPTIONS:MSPCRE}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcre.a:devel/pcre
 MAKE_ARGS+=	USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1
 .endif
 
diff --git a/net/hexinject/Makefile b/net/hexinject/Makefile
index 27f4a95b5f46..403ccd53e3cb 100644
--- a/net/hexinject/Makefile
+++ b/net/hexinject/Makefile
@@ -11,7 +11,7 @@ COMMENT=	HexInject is a very versatile packet injector and sniffer
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
+LIB_DEPENDS=	libpcap.so:net/libpcap
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/net/hinfo/Makefile b/net/hinfo/Makefile
index f4c1568b9582..9e8a0d2ceb4c 100644
--- a/net/hinfo/Makefile
+++ b/net/hinfo/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	http://www.lonesome.com/FreeBSD/distfiles/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility primarily designed to find the owner of an IP block
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		wget:ftp/wget
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile
index 339ac6f5d141..8f20b4689a58 100644
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Simulate virtual network hosts (honeypots)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libdnet.so:${PORTSDIR}/net/libdnet \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libevent.so:devel/libevent2 \
+		libdnet.so:net/libdnet \
+		libpcre.so:devel/pcre
 
 USES=		libedit libtool shebangfix
 SHEBANG_FILES=	scripts/*.pl scripts/snmp/*.pl
diff --git a/net/hping-devel/Makefile b/net/hping-devel/Makefile
index 1aa5e8661d24..7c9acc9d3a44 100644
--- a/net/hping-devel/Makefile
+++ b/net/hping-devel/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	hping3-20051105
 MAINTAINER=	ecu@200ok.org
 COMMENT=	Network auditing tool
 
-LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS=	libtcl84.so:lang/tcl84
 
 CONFLICTS=	hping-[0-9]*
 
diff --git a/net/hs-gsasl/Makefile b/net/hs-gsasl/Makefile
index 3e86bf190cec..e53b7be2391a 100644
--- a/net/hs-gsasl/Makefile
+++ b/net/hs-gsasl/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Bindings for GNU libgsasl
 LICENSE=	GPLv3
 
 USES=		pkgconfig
-LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
+LIB_DEPENDS=	libgsasl.so:security/gsasl
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/net/httping/Makefile b/net/httping/Makefile
index 7e2246539ab6..3927c810b53f 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -33,7 +33,7 @@ MAKE_ENV+=	NC=no
 
 .if ${PORT_OPTIONS:MFFTW}
 MAKE_ENV+=	FW=yes
-LIB_DEPENDS+=	libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS+=	libfftw3.so:math/fftw3
 .else
 MAKE_ENV+=	FW=no
 .endif
diff --git a/net/httpry/Makefile b/net/httpry/Makefile
index d345caf0d73b..51cf6174cd0d 100644
--- a/net/httpry/Makefile
+++ b/net/httpry/Makefile
@@ -19,7 +19,7 @@ EXTRASCRIPTS_DESC=	Install additional scripts
 PLIST_SUB=	EXTRASCRIPTS=""
 USES+=		perl5
 USE_PERL5=	run
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 .else
 PLIST_SUB=	EXTRASCRIPTS="@comment "
 .endif
diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile
index 232edd032765..a5ab8437e487 100644
--- a/net/iaxmodem/Makefile
+++ b/net/iaxmodem/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	stucchi@gufi.org
 COMMENT=	Software modem that connects to IAX channel
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 USES=		compiler:features perl5
 USE_PERL5=	patch
diff --git a/net/ifstat/Makefile b/net/ifstat/Makefile
index 7d9f6120b403..57c90900bf84 100644
--- a/net/ifstat/Makefile
+++ b/net/ifstat/Makefile
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
 OPTIONS_DEFINE=	SNMP
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=	snmp
 
 PLIST_FILES=	bin/ifstat man/man1/ifstat.1.gz
diff --git a/net/ifstated/Makefile b/net/ifstated/Makefile
index 9086b7423762..c90743491042 100644
--- a/net/ifstated/Makefile
+++ b/net/ifstated/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://christianserving.org/ports/net/ifstated/
 MAINTAINER=	ports@christianserving.org
 COMMENT=	Interface state daemon
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 PLIST_FILES=	etc/ifstated.conf-sample \
 		sbin/ifstated \
diff --git a/net/ipgrab/Makefile b/net/ipgrab/Makefile
index 3a46120bd0d3..b6e7f706a65f 100644
--- a/net/ipgrab/Makefile
+++ b/net/ipgrab/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IPgrab is a verbose packet sniffer for UNIX hosts
 
-BUILD_DEPENDS=	${LOCALBASE}/include/pcap.h:${PORTSDIR}/net/libpcap
+BUILD_DEPENDS=	${LOCALBASE}/include/pcap.h:net/libpcap
 
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
diff --git a/net/ipxe/Makefile b/net/ipxe/Makefile
index ae73d78d57e7..e4d111b634d8 100644
--- a/net/ipxe/Makefile
+++ b/net/ipxe/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Open source network boot firmware
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/share/syslinux/bios/core/isolinux.bin:${PORTSDIR}/sysutils/syslinux \
-		bash:${PORTSDIR}/shells/bash \
-		mkisofs:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS=	${LOCALBASE}/share/syslinux/bios/core/isolinux.bin:sysutils/syslinux \
+		bash:shells/bash \
+		mkisofs:sysutils/cdrtools
 
 USE_GITHUB=	yes
 GH_PROJECT=	ipxe
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index d3806a5b44f7..b2be434cae5a 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Internet Routing Registry database server
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}${PORTVERSION}/COPYRIGHT
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/src
 
diff --git a/net/istgt/Makefile b/net/istgt/Makefile
index db3db9c857d8..bdbd29166719 100644
--- a/net/istgt/Makefile
+++ b/net/istgt/Makefile
@@ -30,8 +30,8 @@ SYMLNKDEV_CONFIGURE_ON=	--enable-symlink-device
 
 .if ${PORT_OPTIONS:MVBOXVD}
 VBOX_WRKSRC=	`${MAKE} -C ${PORTSDIR}/emulators/virtualbox-ose -V WRKSRC`
-RUN_DEPENDS+=	${LOCALBASE}/lib/virtualbox/VBoxRT.so:${PORTSDIR}/emulators/virtualbox-ose
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/emulators/virtualbox-ose:patch
+RUN_DEPENDS+=	${LOCALBASE}/lib/virtualbox/VBoxRT.so:emulators/virtualbox-ose
+BUILD_DEPENDS+=	${NONEXISTENT}:emulators/virtualbox-ose:patch
 CONFIGURE_ARGS+=	--with-vbox=${VBOX_WRKSRC}/include
 .endif
 
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 187b0bcbc802..3758f8d4a3d1 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/Jags/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JAGS - Just Another GTK+ Samba Client
 
-RUN_DEPENDS=	smbclient:${PORTSDIR}/${SAMBA_PORT}
+RUN_DEPENDS=	smbclient:${SAMBA_PORT}
 
 SAMBA_PORT?=	net/samba36
 
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index ad5005478531..5ecfc758f01c 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of BEEP core and BEEP mapping for TCP in Java
 
-RUN_DEPENDS=	${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j
+RUN_DEPENDS=	${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index dd3ef2e58734..f683767d4f24 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Improved WHOIS client capable of selecting server to query
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libidn.so:dns/libidn
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake iconv
diff --git a/net/kafkacat/Makefile b/net/kafkacat/Makefile
index 8088d0831811..e3dfaf59b039 100644
--- a/net/kafkacat/Makefile
+++ b/net/kafkacat/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Generic command line non-JVM Apache Kafka producer and consumer
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		pkg-config:${PORTSDIR}/devel/pkgconf
-LIB_DEPENDS=	librdkafka.so:${PORTSDIR}/net/librdkafka
+BUILD_DEPENDS=	bash:shells/bash \
+		pkg-config:devel/pkgconf
+LIB_DEPENDS=	librdkafka.so:net/librdkafka
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	edenhill
diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index 2ed2fb4547b4..cd3852d3a47c 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Very fast and configurable open source SIP proxy
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libxml2.so:textproc/libxml2 \
+		libcurl.so:ftp/curl
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		gmake readline shebangfix
 USE_LDCONFIG=	yes
@@ -43,9 +43,9 @@ WEBSOCKET_DESC=	Websocket support
 
 MYSQL_USE=	mysql=yes
 PGSQL_USES=	pgsql
-JITSI_RUN_DEPENDS=	jitsi:${PORTSDIR}/net-im/jitsi
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
-RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+JITSI_RUN_DEPENDS=	jitsi:net-im/jitsi
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 TLS_USE=		OPENSSL=yes
 
 .include <bsd.port.options.mk>
@@ -103,7 +103,7 @@ EXTRA_GROUPS+=	presence
 
 .if ${PORT_OPTIONS:MWEBSOCKET}
 EXTRA_MODULES+=	websocket
-LIB_DEPENDS+=	libunistring.so:${PORTSDIR}/devel/libunistring
+LIB_DEPENDS+=	libunistring.so:devel/libunistring
 .endif
 
 .if !empty (EXTRA_GROUPS)
diff --git a/net/kdenetwork4-strigi-analyzers/Makefile b/net/kdenetwork4-strigi-analyzers/Makefile
index a3c9d4c872b6..1049dff4764c 100644
--- a/net/kdenetwork4-strigi-analyzers/Makefile
+++ b/net/kdenetwork4-strigi-analyzers/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi analyzers for network-related file formats
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USE_KDE4=	kdelibs kdeprefix strigi automoc4
 USES=		cmake:outsource tar:xz
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index b3645d08a574..865fd1e06354 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -14,24 +14,24 @@ OPTIONS_DEFINE=	FILESHARING KDNSSD KGET KOPETE KRDC KRFB STRIGI
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 FILESHARING_DESC=	Network file sharing via Samba
-FILESHARING_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/sambausershareplugin.so:${PORTSDIR}/net/kdenetwork4-filesharing
+FILESHARING_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/sambausershareplugin.so:net/kdenetwork4-filesharing
 
 KDNSSD_DESC=		Network monitor for DNS-SD services (Zeroconf)
-KDNSSD_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kded_dnssdwatcher.so:${PORTSDIR}/net/zeroconf-ioslave
+KDNSSD_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kded_dnssdwatcher.so:net/zeroconf-ioslave
 
 KGET_DESC=		Download manager
-KGET_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kget:${PORTSDIR}/net/kget
+KGET_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kget:net/kget
 
 KOPETE_DESC=		Multi-protocol instant messenger
-KOPETE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kopete:${PORTSDIR}/net-im/kopete-kde4
+KOPETE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kopete:net-im/kopete-kde4
 
 KRDC_DESC=		RDP and VNC client
-KRDC_RUN_DEPENDS=	${KDE4_PREFIX}/bin/krdc:${PORTSDIR}/net/krdc
+KRDC_RUN_DEPENDS=	${KDE4_PREFIX}/bin/krdc:net/krdc
 
 KRFB_DESC=		Desktop Sharing (VNC server)
-KRFB_RUN_DEPENDS=	${KDE4_PREFIX}/bin/krfb:${PORTSDIR}/net/krfb
+KRFB_RUN_DEPENDS=	${KDE4_PREFIX}/bin/krfb:net/krfb
 
 STRIGI_DESC=		Strigi analyzers for network-related file formats
-STRIGI_RUN_DEPENDS=	${KDE4_PREFIX}/lib/strigi/strigita_torrent_analyzer.so:${PORTSDIR}/net/kdenetwork4-strigi-analyzers
+STRIGI_RUN_DEPENDS=	${KDE4_PREFIX}/lib/strigi/strigita_torrent_analyzer.so:net/kdenetwork4-strigi-analyzers
 
 .include <bsd.port.mk>
diff --git a/net/kea/Makefile b/net/kea/Makefile
index 4ed1cef53d07..6e7bfb491634 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Alternative DHCP implementation by ISC
 LICENSE=	MPL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	liblog4cplus.so:${PORTSDIR}/devel/log4cplus \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	liblog4cplus.so:devel/log4cplus \
+		libboost_system.so:devel/boost-libs
 
 USES=		libtool python:3.3+ autoreconf
 USE_LDCONFIG=	yes
diff --git a/net/kget/Makefile b/net/kget/Makefile
index 0ea2a148a3eb..377c59c90095 100644
--- a/net/kget/Makefile
+++ b/net/kget/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE download manager
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-		libktorrent.so:${PORTSDIR}/net-p2p/libktorrent \
-		libmms.so:${PORTSDIR}/net/libmms \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libgpgme.so:security/gpgme \
+		libktorrent.so:net-p2p/libktorrent \
+		libmms.so:net/libmms \
+		libqca.so:devel/qca \
+		libboost_thread.so:devel/boost-libs
 
 USE_KDE4=	kdelibs kdeprefix workspace libkonq \
 		nepomuk-core nepomuk-widgets automoc4 ontologies \
diff --git a/net/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile
index 4773fbcd94f1..4b4b7a5dff3d 100644
--- a/net/kio-upnp-ms/Makefile
+++ b/net/kio-upnp-ms/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	LOCAL/fluffy
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KIO slave to access UPnP MediaServers
 
-LIB_DEPENDS=	libHUpnp.so:${PORTSDIR}/net/hupnp
+LIB_DEPENDS=	libHUpnp.so:net/hupnp
 
 USES=		cmake tar:bzip2
 USE_KDE4=	automoc4 kdeprefix kdelibs
diff --git a/net/kippo/Makefile b/net/kippo/Makefile
index a8bc7ad69504..e7d06f3be2c8 100644
--- a/net/kippo/Makefile
+++ b/net/kippo/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Medium interaction ssh honeypot
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python twisted:run,conch,web
diff --git a/net/krdc/Makefile b/net/krdc/Makefile
index 57b02105f109..f269ab10fe4f 100644
--- a/net/krdc/Makefile
+++ b/net/krdc/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	RDP and VNC client for KDE
 
-LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver \
-		libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4
+LIB_DEPENDS=	libvncserver.so:net/libvncserver \
+		libtelepathy-qt4.so:net-im/telepathy-qt4
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	kdelibs kdeprefix automoc4
@@ -20,6 +20,6 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	FREERDP
 FREERDP_DESC=	Remote Desktop support via FreeRDP
-FREERDP_RUN_DEPENDS=	xfreerdp:${PORTSDIR}/net/freerdp
+FREERDP_RUN_DEPENDS=	xfreerdp:net/freerdp
 
 .include <bsd.port.mk>
diff --git a/net/krfb/Makefile b/net/krfb/Makefile
index 037b1faf6ebf..2193fb28f097 100644
--- a/net/krfb/Makefile
+++ b/net/krfb/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	VNC server for KDE
 
-LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4
+LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4
 
 USES=		alias cmake:outsource jpeg tar:xz
 USE_KDE4=	kdelibs kdeprefix automoc4
diff --git a/net/kwooty/Makefile b/net/kwooty/Makefile
index b7755139e711..efd7f66c6fae 100644
--- a/net/kwooty/Makefile
+++ b/net/kwooty/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	syncer@gmail.com
 COMMENT=	Usenet binary downloader for KDE4
 
-RUN_DEPENDS=	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
-		${LOCALBASE}/bin/par2:${PORTSDIR}/archivers/par2cmdline \
-		${LOCALBASE}/bin/7z:${PORTSDIR}/archivers/p7zip
+RUN_DEPENDS=	${LOCALBASE}/bin/unrar:archivers/unrar \
+		${LOCALBASE}/bin/par2:archivers/par2cmdline \
+		${LOCALBASE}/bin/7z:archivers/p7zip
 
 USE_KDE4=	kdelibs kdeprefix automoc4 workspace
 USE_QT4=	qmake_build moc_build rcc_build uic_build
diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile
index c44fe566db0c..62cc727723a9 100644
--- a/net/ladvd/Makefile
+++ b/net/ladvd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Minimal LLDP/CDP/EDP/FDP/NDP sender daemon
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USERS=		ladvd
 GROUPS=		${USERS}
diff --git a/net/ldap-stats/Makefile b/net/ldap-stats/Makefile
index e4828e1cf542..82bba6c26c98 100644
--- a/net/ldap-stats/Makefile
+++ b/net/ldap-stats/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Program to generate OpenLDAP statistics reports
 
-RUN_DEPENDS=	p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long
+RUN_DEPENDS=	p5-Getopt-Long>=0:devel/p5-Getopt-Long
 
 NO_BUILD=	yes
 USES=		perl5
diff --git a/net/ldap2dns/Makefile b/net/ldap2dns/Makefile
index 4fed47c769aa..26c8978ccd44 100644
--- a/net/ldap2dns/Makefile
+++ b/net/ldap2dns/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Maintain DNS zones using an LDAP directory
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bklang
diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index cb3ea6be08b0..201673c6627b 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Scripts to manage posix accounts in an OpenLDAP directory
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	ldapadd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client \
-		ldapsearch:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client \
-		ldapdelete:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client \
-		ldapmodify:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client \
-		ldapmodrdn:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client \
-		ldappasswd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client
+RUN_DEPENDS=	ldapadd:net/openldap${OPENLDAP_VER}-client \
+		ldapsearch:net/openldap${OPENLDAP_VER}-client \
+		ldapdelete:net/openldap${OPENLDAP_VER}-client \
+		ldapmodify:net/openldap${OPENLDAP_VER}-client \
+		ldapmodrdn:net/openldap${OPENLDAP_VER}-client \
+		ldappasswd:net/openldap${OPENLDAP_VER}-client
 
 NO_ARCH=	yes
 USE_OPENLDAP=	yes
diff --git a/net/ldapsdk/Makefile b/net/ldapsdk/Makefile
index ed36468c22a6..2bb1a32c1140 100644
--- a/net/ldapsdk/Makefile
+++ b/net/ldapsdk/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	mozldap-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mozilla LDAP sdk
 
-LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr
+LIB_DEPENDS=	libnspr4.so:devel/nspr
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/c-sdk
 
diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index 8d71ff55fef6..fd6f969e4741 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -12,11 +12,11 @@ MASTER_SITE_SUBDIR=	CPAN:LOOSIFER
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Interactive shell used to administer ldap directories
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-ParseLex>=0:${PORTSDIR}/devel/p5-ParseLex
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl \
+		p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-ParseLex>=0:devel/p5-ParseLex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES=	pkg-message
diff --git a/net/libarms/Makefile b/net/libarms/Makefile
index 64d91d8dff77..c56b15179992 100644
--- a/net/libarms/Makefile
+++ b/net/libarms/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	https://dev.smf.jp/dl/ \
 MAINTAINER=	shigeru@iij.ad.jp
 COMMENT=	SMFv2/ARMS client library for C
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool
diff --git a/net/libcapn/Makefile b/net/libcapn/Makefile
index 158099c2fca5..40dcda5094a5 100644
--- a/net/libcapn/Makefile
+++ b/net/libcapn/Makefile
@@ -11,7 +11,7 @@ COMMENT=	C Library to interact with Apple Push Notification Service
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson
+LIB_DEPENDS=	libjansson.so:devel/jansson
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	adobkin
diff --git a/net/libcmis/Makefile b/net/libcmis/Makefile
index 4146e982da60..0400dc47db8a 100644
--- a/net/libcmis/Makefile
+++ b/net/libcmis/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Client library for the CMIS interface
 LICENSE=	LGPL20 MPL GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit \
-		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libcurl.so:ftp/curl
+BUILD_DEPENDS=	cppunit-config:devel/cppunit \
+		${LOCALBASE}/lib/libboost_regex.a:devel/boost-libs
 
 BROKEN_sparc64=	cannot link with boost
 
diff --git a/net/libdmapsharing/Makefile b/net/libdmapsharing/Makefile
index 59aca72fc8d9..0777f485050c 100644
--- a/net/libdmapsharing/Makefile
+++ b/net/libdmapsharing/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME music playing application
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libgee-0.8.so:devel/libgee
+BUILD_DEPENDS=	vapigen:lang/vala
 
 USES=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk20 introspection:build
@@ -31,10 +31,10 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFAULT=	AVAHI
 OPTIONS_SINGLE=	MDNS
 OPTIONS_SINGLE_MDNS=	AVAHI MDNSRESPONDER
-AVAHI_LIB_DEPENDS=	libavahi-core.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-core.so:net/avahi-app
 AVAHI_CONFIGURE_ON=	--with-mdns=avahi
-MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder \
-				libavahi-glib.so:${PORTSDIR}/net/avahi-app
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder \
+				libavahi-glib.so:net/avahi-app
 MDNSRESPONDER_CONFIGURE_ON=	--with-mdns=mdns
 MDNSRESPONDER_DESC+=	Zeroconf support via mDNSResponder (broken)
 
diff --git a/net/libexosip2/Makefile b/net/libexosip2/Makefile
index a8c2a65c7994..989516d52d5e 100644
--- a/net/libexosip2/Makefile
+++ b/net/libexosip2/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GPL library that extends the capability of the oSIP library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libosip2.so:${PORTSDIR}/net/libosip2
+LIB_DEPENDS=	libosip2.so:net/libosip2
 
 CONFLICTS_INSTALL=	libeXosip2-legacy-[0-9]*
 
diff --git a/net/libfb/Makefile b/net/libfb/Makefile
index 3505473c80f0..73fe04029cf3 100644
--- a/net/libfb/Makefile
+++ b/net/libfb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://support.red-fone.com/downloads/fonulator/
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	FoneBRIDGE configuration library
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-shared
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index 789ddeba7e9f..021910c9721e 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -20,7 +20,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 #.if !defined(WITHOUT_SSL)
-#LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+#LIB_DEPENDS+=	gnutls.13:security/gnutls
 #CONFIGURE_ARGS+=--enable-ssl=gnutls
 #.else
 CONFIGURE_ARGS+=--enable-ssl=no
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 5ad36ce14b73..71abf34f01e0 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library to accessing online weather informations
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib
+BUILD_DEPENDS=	vala:lang/vala
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libgeocode-glib.so:net/geocode-glib
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/net/libkfbapi/Makefile b/net/libkfbapi/Makefile
index da7d7bee3a1a..f46c42b61fa9 100644
--- a/net/libkfbapi/Makefile
+++ b/net/libkfbapi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for accessing Facebook services
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 USES=		cmake:outsource gettext tar:bzip2
 USE_KDE4=	automoc4 kdelibs kdeprefix pimlibs
diff --git a/net/libkvkontakte/Makefile b/net/libkvkontakte/Makefile
index aeb6fe5b7e1f..a85252ba5c9e 100644
--- a/net/libkvkontakte/Makefile
+++ b/net/libkvkontakte/Makefile
@@ -12,7 +12,7 @@ COMMENT=	KDE library for accessing vk.com
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 USES=		cmake:outsource gettext pkgconfig tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build
diff --git a/net/libmateweather/Makefile b/net/libmateweather/Makefile
index 48b9faa08c80..5ada226a0145 100644
--- a/net/libmateweather/Makefile
+++ b/net/libmateweather/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library to accessing online weather informations
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index f1af1f5ed228..866641213178 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/netdude/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for manipulating libpcap/tcpdump trace files
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libpcapnav.so:${PORTSDIR}/net/libpcapnav
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libpcapnav.so:net/libpcapnav
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 6439876b3516..30496efaf010 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT?=	Network monitoring library with TCP/IP reassembly
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 LICENSE=	GPLv2
 
diff --git a/net/liboauth/Makefile b/net/liboauth/Makefile
index 78bfeade5258..bbda719c1faa 100644
--- a/net/liboauth/Makefile
+++ b/net/liboauth/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	C library implementing the OAuth Core standard
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
diff --git a/net/libproxy-gnome/Makefile b/net/libproxy-gnome/Makefile
index 32c3fbb4ef65..4defd62a4f42 100644
--- a/net/libproxy-gnome/Makefile
+++ b/net/libproxy-gnome/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GConf-based plug-in for libproxy
 
-LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	libproxy.so:net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net/libproxy-gnome3/Makefile b/net/libproxy-gnome3/Makefile
index 13cd18b011c3..8a56f87ff581 100644
--- a/net/libproxy-gnome3/Makefile
+++ b/net/libproxy-gnome3/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX=	-gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GSettings-based configuration plug-in for libproxy
 
-LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	libproxy.so:net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net/libproxy-kde/Makefile b/net/libproxy-kde/Makefile
index 03c440049af8..2f3ff462ae3b 100644
--- a/net/libproxy-kde/Makefile
+++ b/net/libproxy-kde/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-kde
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	KDE plug-in for libproxy
 
-LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	libproxy.so:net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net/libproxy-mozjs/Makefile b/net/libproxy-mozjs/Makefile
index 3b17e7ac14ab..5718708a9b80 100644
--- a/net/libproxy-mozjs/Makefile
+++ b/net/libproxy-mozjs/Makefile
@@ -9,8 +9,8 @@ PKGNAMESUFFIX=	-mozjs
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mozilla JavaScript plug-in for libproxy
 
-LIB_DEPENDS=	libmozjs185.so:${PORTSDIR}/lang/spidermonkey185 \
-		libproxy.so:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	libmozjs185.so:lang/spidermonkey185 \
+		libproxy.so:net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net/libproxy-perl/Makefile b/net/libproxy-perl/Makefile
index 4d4dbae35c0f..d9158fd9d49e 100644
--- a/net/libproxy-perl/Makefile
+++ b/net/libproxy-perl/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-perl
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Perl binding for libproxy
 
-LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	libproxy.so:net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net/libproxy-python/Makefile b/net/libproxy-python/Makefile
index cf6f61d77fc2..bbd404c8e800 100644
--- a/net/libproxy-python/Makefile
+++ b/net/libproxy-python/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-python
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	python binding for libproxy
 
-RUN_DEPENDS=	libproxy>=${PORTVERSION}:${PORTSDIR}/net/libproxy
+RUN_DEPENDS=	libproxy>=${PORTVERSION}:net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net/libproxy-webkit/Makefile b/net/libproxy-webkit/Makefile
index 410a709a1fca..7d3113a202eb 100644
--- a/net/libproxy-webkit/Makefile
+++ b/net/libproxy-webkit/Makefile
@@ -9,8 +9,8 @@ PKGNAMESUFFIX=	-webkit
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	WebKit JavaScript plug-in for libproxy
 
-LIB_DEPENDS=	libjavascriptcoregtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libproxy.so:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	libjavascriptcoregtk-3.0.so:www/webkit-gtk3 \
+		libproxy.so:net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net/librdkafka/Makefile b/net/librdkafka/Makefile
index 9cf37151d7c8..240d75f3ba0f 100644
--- a/net/librdkafka/Makefile
+++ b/net/librdkafka/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Apache Kafka C/C++ library
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	edenhill
diff --git a/net/librouteros/Makefile b/net/librouteros/Makefile
index ba1808f23f28..b34517253815 100644
--- a/net/librouteros/Makefile
+++ b/net/librouteros/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library for communicating with network devices by MikroTik
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index 9b9875dab1f8..07603ee185f6 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for delta compression of streams
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 CONFLICTS=	librsync1-*
 
diff --git a/net/librsync1/Makefile b/net/librsync1/Makefile
index 33c34a54a12a..411fccfccdc2 100644
--- a/net/librsync1/Makefile
+++ b/net/librsync1/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	1
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Library for delta compression of streams
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 CONFLICTS=	librsync-*
 
diff --git a/net/libtnl/Makefile b/net/libtnl/Makefile
index 11a1f49a1bf0..f51357e2b86d 100644
--- a/net/libtnl/Makefile
+++ b/net/libtnl/Makefile
@@ -25,7 +25,7 @@ PLIST_SUB+=	PROFILE=''
 
 # When security/libtomcrypt is fixed to provide a shared version, we'll
 # stop extracting our own and will LIB_DEPEND on theirs instead:
-#LIB_DEPENDS=	tomcrypt:${PORTSDIR}/security/libtomcrypt
+#LIB_DEPENDS=	tomcrypt:security/libtomcrypt
 #
 #EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude tnl/libtomcrypt
 
diff --git a/net/libtrace/Makefile b/net/libtrace/Makefile
index c1204202eb14..66e7b8eeeeec 100644
--- a/net/libtrace/Makefile
+++ b/net/libtrace/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://research.wand.net.nz/software/libtrace/
 MAINTAINER=	matt@peterson.org
 COMMENT=	C library for network packet capture and processing
 
-LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
+LIB_DEPENDS=	libpcap.so:net/libpcap
 
 CONFIGURE_ARGS=	--with-libpcap=${LOCALBASE} \
 		libtrace_doxygen=false
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index b7fddc9f822f..027699cc6af6 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provide an easy API to a custom vnc server
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		jpeg libtool pathfix
 USE_LDCONFIG=	yes
@@ -27,13 +27,13 @@ OPTIONS_DEFINE=	GNUTLS OPENSSL GCRYPT IPV6
 OPTIONS_DEFAULT=OPENSSL
 GCRYPT_DESC=	libgcrypt support
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 
 OPENSSL_CONFIGURE_WITH=	crypto ssl
 OPENSSL_USE=		OPENSSL=yes
 
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_WITH=	gcrypt
 
 IPV6_CONFIGURE_WITH=	ipv6
diff --git a/net/libzapojit/Makefile b/net/libzapojit/Makefile
index 0f491b7faf2b..1cba7491b9d9 100644
--- a/net/libzapojit/Makefile
+++ b/net/libzapojit/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib/GObject wrapper for the Skydrive and Hotmail API
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		librest-0.7.so:${PORTSDIR}/devel/librest
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgoa-1.0.so:net/gnome-online-accounts \
+		libjson-glib-1.0.so:devel/json-glib \
+		librest-0.7.so:devel/librest
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix intltool
diff --git a/net/libzmq3/Makefile b/net/libzmq3/Makefile
index d67e53018dc4..ec852ebd529d 100644
--- a/net/libzmq3/Makefile
+++ b/net/libzmq3/Makefile
@@ -25,7 +25,7 @@ PGM_DESC=	Reliable multicast transport using PGM via OpenPGM
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 PGM_CONFIGURE_ON=	--with-system-pgm
-PGM_LIB_DEPENDS=	libpgm.so:${PORTSDIR}/net/openpgm
+PGM_LIB_DEPENDS=	libpgm.so:net/openpgm
 PGM_USES=		pkgconfig
 
 MAKE_ENV=	V=1
diff --git a/net/libzmq4/Makefile b/net/libzmq4/Makefile
index 13f7269ef357..e806b7f390b2 100644
--- a/net/libzmq4/Makefile
+++ b/net/libzmq4/Makefile
@@ -26,13 +26,13 @@ CURVE_DESC=	CURVE security mechanism via libsodium
 PGM_DESC=	Reliable multicast transport using PGM via OpenPGM
 
 CURVE_CONFIGURE_WITH=	libsodium
-CURVE_LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+CURVE_LIB_DEPENDS=	libsodium.so:security/libsodium
 
 DEBUG_CONFIGURE_ENABLE=	debug
 DEBUG_VARS=		WITH_DEBUG=yes
 
 PGM_CONFIGURE_WITH=	pgm
-PGM_LIB_DEPENDS=	libpgm.so:${PORTSDIR}/net/openpgm
+PGM_LIB_DEPENDS=	libpgm.so:net/openpgm
 
 CONFIGURE_ARGS+=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 32fb06350493..b3287fccfe13 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Simple RSS/RDF feed reader
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		${PYTHON_PKGNAMEPREFIX}libpeas>=0:${PORTSDIR}/devel/py-libpeas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libpeas-1.0.so:devel/libpeas \
+		libjson-glib-1.0.so:devel/json-glib
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas
 
 USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
 		python:2 sqlite tar:bzip2
@@ -34,7 +34,7 @@ INSTALLS_ICONS=	yes
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=NOTIFY
 
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=libnotify
 
 .include <bsd.port.mk>
diff --git a/net/linknx/Makefile b/net/linknx/Makefile
index 46295400c0c4..8d7411439aeb 100644
--- a/net/linknx/Makefile
+++ b/net/linknx/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Rule-based event handling in a KNX installation
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpthsem.so:${PORTSDIR}/devel/pthsem
-BUILD_DEPENDS=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
+LIB_DEPENDS=	libpthsem.so:devel/pthsem
+BUILD_DEPENDS=	${LOCALBASE}/lib/libargp.a:devel/argp-standalone
 
 USES=	gmake autoreconf pkgconfig
 GNU_CONFIGURE=	yes
@@ -28,11 +28,11 @@ LIBLUA_DESC=	Install liblua for scripting
 MYSQL_DESC=	Install libmysql for logging & persist
 
 LIBESMTP_CONFIGURE_ENABLE=	smtp
-LIBESMTP_LIB_DEPENDS=	libesmtp.so:${PORTSDIR}/mail/libesmtp
+LIBESMTP_LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 LIBCURL_CONFIGURE_WITH=	libcurl
-LIBCURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIBCURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 # autoreconf needs that anyway.
-LIBCURL_BUILD_DEPENDS_OFF=	${LOCALBASE}/share/aclocal/libcurl.m4:${PORTSDIR}/ftp/curl
+LIBCURL_BUILD_DEPENDS_OFF=	${LOCALBASE}/share/aclocal/libcurl.m4:ftp/curl
 LIBLUA_CONFIGURE_WITH=	lua
 LIBLUA_USES=	lua
 LIBLUA_CFLAGS=	-I${LUA_INCDIR}
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index 928f005936af..638bd206a78a 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES=	SAVANNAH/linphone/3.9.x/sources
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SIP client supporting voice/video calls and text messaging
 
-LIB_DEPENDS=	libbellesip.so:${PORTSDIR}/net/belle-sip \
-		libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
-		libortp.so:${PORTSDIR}/net/ortp \
-		libmbedtls.so.9:${PORTSDIR}/security/polarssl13 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libbellesip.so:net/belle-sip \
+		libmediastreamer_base.so:net/mediastreamer \
+		libortp.so:net/ortp \
+		libmbedtls.so.9:security/polarssl13 \
+		libsqlite3.so:databases/sqlite3
 
 CONFLICTS_INSTALL=	linphone-base-[0-9]*
 
@@ -38,17 +38,17 @@ OPTIONS_DEFAULT=NOTIFY UPNP VIDEO
 OPTIONS_SUB=	yes
 
 LDAP_CONFIGURE_ENABLE=	ldap
-LDAP_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LDAP_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 LDAP_USE=		OPENLDAP=yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
 NOTIFY_CONFIGURE_ENABLE=notify
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 UPNP_CONFIGURE_ENABLE=	upnp
-UPNP_LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
+UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 
 VIDEO_CONFIGURE_ENABLE=	video
 
diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index 643a1d92d5e4..61beeb4a361b 100644
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/linux-igd/linux-igd/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux UPnP Internet Gateway Device
 
-LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
+LIB_DEPENDS=	libupnp.so:devel/upnp
 
 USE_RC_SUBR=	linuxigd
 USES=		gmake
diff --git a/net/lla/Makefile b/net/lla/Makefile
index 9a1eaefe2d54..ecab68418539 100644
--- a/net/lla/Makefile
+++ b/net/lla/Makefile
@@ -12,9 +12,9 @@ EXTRACT_SUFX=	.pl
 MAINTAINER=	koj@ofug.net
 COMMENT=	Perl-based LDAP log statistics generator
 
-RUN_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Time-modules>=0:devel/p5-Time-modules
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/net/mad_fcl/Makefile b/net/mad_fcl/Makefile
index 0820f7386d12..4408cece2551 100644
--- a/net/mad_fcl/Makefile
+++ b/net/mad_fcl/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	${PORTNAME}_v${PORTVERSION}_src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FLUTE - File Delivery over Unidirectional Transport implementation
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libcurl.so:ftp/curl
 
 USES=		dos2unix gmake
 USE_OPENSSL=	yes
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index 49bb789f2359..cab6aac151c9 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Real-time audio and video streaming and processing
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/ortp \
-		libsrtp.so:${PORTSDIR}/net/libsrtp \
-		libbzrtp.so:${PORTSDIR}/security/libbzrtp \
-		libmbedtls.so.9:${PORTSDIR}/security/polarssl13
+LIB_DEPENDS=	libortp.so:net/ortp \
+		libsrtp.so:net/libsrtp \
+		libbzrtp.so:security/libbzrtp \
+		libmbedtls.so.9:security/polarssl13
 
 CONFLICTS_INSTALL=	linphone-base-[0-9]*
 
@@ -43,44 +43,44 @@ OPTIONS_SUB=		yes
 AUDIOOPT_DESC=		Audio options
 
 FFMPEG_CONFIGURE_ENABLE=ffmpeg
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 GLX_CONFIGURE_ENABLE=	glx
 GLX_USE=		GL=glew
 
 GSM_CONFIGURE_ENABLE=	gsm
-GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
 OPUS_CONFIGURE_ENABLE=	opus
-OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 
 SPANDSP_CONFIGURE_ENABLE=	spandsp
-SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
+SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 
 SPEEX_CONFIGURE_ENABLE=	speex
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 
 THEORA_CONFIGURE_ENABLE=theora
-THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 
 UPNP_CONFIGURE_ENABLE=	upnp
-UPNP_LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
+UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 
 V4L_CONFIGURE_ENABLE=	libv4l1 libv4l2
 V4L_CONFIGURE_OFF=	ac_cv_header_linux_videodev_h=no \
 			ac_cv_header_linux_videodev2_h=no
-V4L_BUILD_DEPENDS=	v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS=	v4l_compat>=1.0.20120501:multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 VIDEOOPT_DESC=		Video options
 
 VIDEO_CONFIGURE_ENABLE=	video
 
 VPX_CONFIGURE_ENABLE=	vp8
-VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 
 XVIDEO_CONFIGURE_ENABLE=x11 xv
 XVIDEO_USE=		XORG=videoproto,x11,xv
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 00b615371243..7885ee347fd8 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -13,7 +13,7 @@ COMMENT=	UPnP AV MediaServer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -61,7 +61,7 @@ LIBEXTRACTOR_DESC=		libextractor support
 CONFIGURE_ARGS+=	--enable-sqlite3 \
 			--with-sqlite3-h="${LOCALBASE}/include" \
 			--with-sqlite3-libs="${LOCALBASE}/lib"
-LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=		libsqlite3.so:databases/sqlite3
 .else
 CONFIGURE_ARGS+=	--disable-sqlite3
 .endif
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+=	--disable-mysql
 CONFIGURE_ARGS+=	--enable-libjs \
 			--with-js-h="${LOCALBASE}/include" \
 			--with-js-libs="${LOCALBASE}/lib"
-LIB_DEPENDS+=		libjs.so:${PORTSDIR}/lang/spidermonkey17
+LIB_DEPENDS+=		libjs.so:lang/spidermonkey17
 .else
 CONFIGURE_ARGS+=	--disable-libjs
 .endif
@@ -87,7 +87,7 @@ CONFIGURE_ARGS+=	--disable-libjs
 CONFIGURE_ARGS+=	--enable-libexif \
 			--with-libexif-h="${LOCALBASE}/include" \
 			--with-libexif-libs="${LOCALBASE}/lib"
-LIB_DEPENDS+=		libexif.so:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS+=		libexif.so:graphics/libexif
 .else
 CONFIGURE_ARGS+=	--disable-libexif
 .endif
@@ -102,7 +102,7 @@ CONFIGURE_ARGS+=	--disable-external-transcoding
 CONFIGURE_ARGS+=	--enable-ffmpegthumbnailer \
 			--with-ffmpegthumbnailer-h="${LOCALBASE}/include" \
 			--with-ffmpegthumbnailer-libs="${LOCALBASE}/lib"
-LIB_DEPENDS+=		libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
+LIB_DEPENDS+=		libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
 .else
 CONFIGURE_ARGS+=	--disable-ffmpegthumbnailer
 .endif
@@ -111,14 +111,14 @@ CONFIGURE_ARGS+=	--disable-ffmpegthumbnailer
 .if ${PORT_OPTIONS:MCURL} && ${PORT_OPTIONS:MEXTERNAL_TRANSCODING}
 CONFIGURE_ARGS+=	--enable-curl \
 			--with-curl-cfg="${LOCALBASE}/bin/curl-config"
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 .else
 CONFIGURE_ARGS+=	--disable-curl
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
 CONFIGURE_ARGS+=	--enable-ffmpeg
-LIB_DEPENDS+=		libavformat.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=		libavformat.so:multimedia/ffmpeg
 .else
 CONFIGURE_ARGS+=	--disable-ffmpeg
 .endif
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+=	--disable-ffmpeg
 CONFIGURE_ARGS+=	--enable-libextractor \
 			--with-extractor-h="${LOCALBASE}/include" \
 			--with-extractor-libs="${LOCALBASE}/lib"
-LIB_DEPENDS+=		libextractor.so:${PORTSDIR}/textproc/libextractor
+LIB_DEPENDS+=		libextractor.so:textproc/libextractor
 .else
 CONFIGURE_ARGS+=	--disable-libextractor
 .endif
@@ -136,7 +136,7 @@ CONFIGURE_ARGS+=	--disable-libextractor
 CONFIGURE_ARGS+=	--enable-id3lib \
 			--with-id3lib-h="${LOCALBASE}/include" \
 			--with-id3lib-libs="${LOCALBASE}/lib"
-LIB_DEPENDS+=		libid3.so:${PORTSDIR}/audio/id3lib
+LIB_DEPENDS+=		libid3.so:audio/id3lib
 .else
 CONFIGURE_ARGS+=	--disable-id3lib
 .endif
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+=	--disable-id3lib
 .if ${PORT_OPTIONS:MTAGLIB}
 CONFIGURE_ARGS+=	--enable-taglib \
 			--with-taglib-cfg="${LOCALBASE}/bin/taglib-config"
-LIB_DEPENDS+=		libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS+=		libtag.so:audio/taglib
 .else
 CONFIGURE_ARGS+=	--disable-taglib
 .endif
diff --git a/net/megatools/Makefile b/net/megatools/Makefile
index f6ff32038e8c..22619491b14f 100644
--- a/net/megatools/Makefile
+++ b/net/megatools/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tools for MEGA.CO.NZ cloud drive
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	glib-networking>=2.32.0:${PORTSDIR}/net/glib-networking
+LIB_DEPENDS=	libcurl.so:ftp/curl
+RUN_DEPENDS=	glib-networking>=2.32.0:net/glib-networking
 
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
diff --git a/net/minidlna/Makefile b/net/minidlna/Makefile
index 249f43077a5a..cf7e53a6b615 100644
--- a/net/minidlna/Makefile
+++ b/net/minidlna/Makefile
@@ -11,13 +11,13 @@ MASTER_SITES=	SF
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Media-server compatible with "Digital Life Network Alliance"
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3	\
-		libexif.so:${PORTSDIR}/graphics/libexif	\
-		libid3tag.so:${PORTSDIR}/audio/libid3tag	\
-		libogg.so:${PORTSDIR}/audio/libogg		\
-		libvorbis.so:${PORTSDIR}/audio/libvorbis	\
-		libFLAC.so:${PORTSDIR}/audio/flac		\
-		libavformat.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3	\
+		libexif.so:graphics/libexif	\
+		libid3tag.so:audio/libid3tag	\
+		libogg.so:audio/libogg		\
+		libvorbis.so:audio/libvorbis	\
+		libFLAC.so:audio/flac		\
+		libavformat.so:multimedia/ffmpeg
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-db-path=/var/db/minidlna \
diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile
index c8a8929748e8..6e33cc1addaf 100644
--- a/net/minisapserver/Makefile
+++ b/net/minisapserver/Makefile
@@ -23,7 +23,7 @@ SLP_DESC=	Enable SLP support via openslp
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-SLP_LIB_DEPENDS=	libslp.so:${PORTSDIR}/net/openslp
+SLP_LIB_DEPENDS=	libslp.so:net/openslp
 SLP_CONFIGURE_ENABLE=	slp
 
 post-patch:
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 6d89cc221cf6..450198aac88f 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Opensource Teredo (IPv6 tunneling) implementation
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libJudy.so:${PORTSDIR}/devel/judy
+LIB_DEPENDS=	libJudy.so:devel/judy
 
 USES=		libtool localbase tar:xz
 GNU_CONFIGURE=	yes
diff --git a/net/mono-zeroconf/Makefile b/net/mono-zeroconf/Makefile
index 2c49eb96a66f..64e03dc73de7 100644
--- a/net/mono-zeroconf/Makefile
+++ b/net/mono-zeroconf/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://download.banshee.fm/${PORTNAME}/
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Cross platform Zero Configuration Networking library for Mono
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-sharp.pc:${PORTSDIR}/net/avahi-sharp
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-sharp.pc:net/avahi-sharp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/net/morebalance/Makefile b/net/morebalance/Makefile
index aefabe8284ef..afa61c8947aa 100644
--- a/net/morebalance/Makefile
+++ b/net/morebalance/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://morebalance.coolprojects.org/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular open source user-space load balancing system
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libggz.so:${PORTSDIR}/games/libggz
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libgnutls.so:security/gnutls \
+		libggz.so:games/libggz
 
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 6c76963873ca..969e31b3190d 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mobile terminal that supports intermittent connectivity
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 731d3381711c..a78e144b0874 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Open-Source MQTT Broker
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	libcares.so:dns/c-ares
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
 USES=		cmake python:2
 NOCONFIGURE=	yes
diff --git a/net/mpd-l2tp-ipv6pd-client/Makefile b/net/mpd-l2tp-ipv6pd-client/Makefile
index 808964e46fcb..2615ec211a27 100644
--- a/net/mpd-l2tp-ipv6pd-client/Makefile
+++ b/net/mpd-l2tp-ipv6pd-client/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Sample implementation set of "L2TP-IPv6PD" client using mpd
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	mpd5:${PORTSDIR}/net/mpd5
-RUN_DEPENDS=	dhcp6ctl:${PORTSDIR}/net/dhcp6 \
-		mpd5:${PORTSDIR}/net/mpd5
+BUILD_DEPENDS=	mpd5:net/mpd5
+RUN_DEPENDS=	dhcp6ctl:net/dhcp6 \
+		mpd5:net/mpd5
 
 NO_BUILD=	yes
 
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index e83d717a2c07..987c21957110 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -22,11 +22,11 @@ USE_OPENSSL=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNG_IPACCT}
-BUILD_DEPENDS+=	${LOCALBASE}/include/netgraph/ng_ipacct.h:${PORTSDIR}/net-mgmt/ng_ipacct
+BUILD_DEPENDS+=	${LOCALBASE}/include/netgraph/ng_ipacct.h:net-mgmt/ng_ipacct
 .if exists(${KMODDIR}/ng_ipacct.ko)
-RUN_DEPENDS+=	${KMODDIR}/ng_ipacct.ko:${PORTSDIR}/net-mgmt/ng_ipacct
+RUN_DEPENDS+=	${KMODDIR}/ng_ipacct.ko:net-mgmt/ng_ipacct
 .else
-RUN_DEPENDS+=	/boot/modules/ng_ipacct.ko:${PORTSDIR}/net-mgmt/ng_ipacct
+RUN_DEPENDS+=	/boot/modules/ng_ipacct.ko:net-mgmt/ng_ipacct
 .endif
 .endif
 
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 254e644b719d..b328bf70923b 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	MPICH
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libhwloc.so:${PORTSDIR}/devel/hwloc
+LIB_DEPENDS=	libhwloc.so:devel/hwloc
 
 CONFLICTS=	lam-7.* mpd-[0-9]* mpiexec-0.* mpich2-[0-9]*
 GNU_CONFIGURE=	yes
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index b2168cb7f427..ac62faba7525 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -17,8 +17,8 @@ LICENSE_NAME=	MPICH
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 GNU_CONFIGURE=	yes
 USES=		execinfo libtool:keepla localbase fortran perl5 \
diff --git a/net/nanomsg/Makefile b/net/nanomsg/Makefile
index ee5787af3050..07df7b9900d7 100644
--- a/net/nanomsg/Makefile
+++ b/net/nanomsg/Makefile
@@ -29,16 +29,16 @@ OPTIONS_SUB=			yes
 
 DOCS_DESC=			Build and/or install HTML documentation
 
-MANPAGES_BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-				xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_BUILD_DEPENDS+=	asciidoc:textproc/asciidoc \
+				xmlto:textproc/xmlto
 
 .include <bsd.port.options.mk>
 
 # Avoid duplication
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ARGS+=	--enable-doc
-BUILD_DEPENDS+=		asciidoc:${PORTSDIR}/textproc/asciidoc \
-			xmlto:${PORTSDIR}/textproc/xmlto
+BUILD_DEPENDS+=		asciidoc:textproc/asciidoc \
+			xmlto:textproc/xmlto
 .endif
 
 post-extract:
diff --git a/net/nast/Makefile b/net/nast/Makefile
index 350476b49ae6..0821c5a0ab5c 100644
--- a/net/nast/Makefile
+++ b/net/nast/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Packet sniffer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/net/ncp/Makefile b/net/ncp/Makefile
index 467af3048c8a..268ac816db7a 100644
--- a/net/ncp/Makefile
+++ b/net/ncp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://dl.fefe.de/ http://dl.mteege.de/fefe/
 MAINTAINER=	matthias@mteege.de
 COMMENT=	Fast file copy tool for LANs
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/devel/libowfat
+BUILD_DEPENDS=	${LOCALBASE}/lib/libowfat.a:devel/libowfat
 
 USES=		tar:bzip2
 
diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile
index 7467135c2540..75946801b631 100644
--- a/net/ndpi/Makefile
+++ b/net/ndpi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	NTOP-maintained superset of the popular OpenDPI library
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	libjson-c.so:devel/json-c
 
 CONFIGURE_ARGS=	--with-pic
 CPPFLAGS+=	-I${LOCALBASE}/include/json-c
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index ab54b883bcd7..7f772b618525 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/${PORTNAME}/Nepenthes%20development/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Determine the malware activity on a network
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libadns.so:${PORTSDIR}/dns/adns \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libmagic.so:${PORTSDIR}/sysutils/file
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libadns.so:dns/adns \
+		libcurl.so:ftp/curl \
+		libmagic.so:sysutils/file
 
 USES=		dos2unix libtool perl5
 DOS2UNIX_FILE=	modules/shellcode-generic/sch_generic_connect_trans.cpp
@@ -28,7 +28,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE=		DEBUG_LOGGING PRELUDE
 
 DEBUG_LOGGING_CONFIGURE_ENABLE=	debug-logging
-PRELUDE_LIB_DEPENDS=	libprelude.so:${PORTSDIR}/security/libprelude
+PRELUDE_LIB_DEPENDS=	libprelude.so:security/libprelude
 PRELUDE_CONFIGURE_ENABLE=	prelude
 
 post-patch:
diff --git a/net/nepim/Makefile b/net/nepim/Makefile
index fc69b0619f61..801fbc6b1d4e 100644
--- a/net/nepim/Makefile
+++ b/net/nepim/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SAVANNAH/nepim
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for measuring available bandwidth between hosts
 
-LIB_DEPENDS=	liboop.so:${PORTSDIR}/devel/liboop
+LIB_DEPENDS=	liboop.so:devel/liboop
 
 USES=		gmake
 ALL_TARGET=	default
diff --git a/net/net6/Makefile b/net/net6/Makefile
index 9d64e0392179..4671903bada0 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Network access framework for IPv4/IPv6
 LICENSE=	LGPL20+ # though COPYING is LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
+		libgnutls.so:security/gnutls
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 382730d5c840..408bf15e4c42 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	File server for Mac OS X
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USES=		gmake iconv libtool perl5 tar:bzip2
 USE_BDB=	46+
@@ -74,7 +74,7 @@ PLIST_SUB+=		NETATALKPAM="@comment "
 
 .if ${PORT_OPTIONS:MSRVLOC}
 CONFIGURE_ARGS+=	--enable-srvloc=${LOCALBASE}
-LIB_DEPENDS+=		libslp.so:${PORTSDIR}/net/openslp
+LIB_DEPENDS+=		libslp.so:net/openslp
 SUB_LIST+=		SRVLOC="slpd"
 .else
 SUB_LIST+=		SRVLOC=""
@@ -90,7 +90,7 @@ PLIST_SUB+=		TIMELORD="@comment "
 .if ${PORT_OPTIONS:MZEROCONF}
 CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
 CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 USES+=			pkgconfig
 SUB_LIST+=		ZEROCONF="avahi_daemon"
 .else
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 0318ffa9c97b..b4b9b850285d 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -13,8 +13,8 @@ COMMENT=	File server for Mac OS X
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libevent.so:devel/libevent2
 
 USE_BDB=	5+
 USES=		iconv gmake pkgconfig perl5 libtool tar:bzip2
@@ -85,14 +85,14 @@ SUB_LIST+=		ZEROCONF=""
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
 CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 SUB_LIST+=		ZEROCONF="avahi_daemon"
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
 CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
 CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
 SUB_LIST+=		ZEROCONF="mdnsd"
 .endif
 
@@ -112,8 +112,8 @@ CONFIGURE_ARGS+=	--disable-sendfile
 
 .if ${PORT_OPTIONS:MDBUS} || exists(${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc)
 USES+=			python:2
-LIB_DEPENDS+=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+LIB_DEPENDS+=		libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
 PLIST_SUB+=		DBUS=""
 .else
 PLIST_SUB+=		DBUS="@comment "
@@ -126,7 +126,7 @@ CONFIGURE_ARGS+=--with-mysql-config=/nonexistent
 .endif
 
 .if ${PORT_OPTIONS:MACL}
-LIB_DEPENDS+=	libsunacl.so:${PORTSDIR}/sysutils/libsunacl
+LIB_DEPENDS+=	libsunacl.so:sysutils/libsunacl
 CONFIGURE_ARGS+=--with-acls
 .else
 CONFIGURE_ARGS+=--without-acls
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 22448bc6c774..12a26c9d8460 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NETwork DUmp data Displayer and Editor for tcpdump tracefiles
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libnetdude.so:${PORTSDIR}/net/libnetdude
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libnetdude.so:net/libnetdude
 
 USES=		gettext iconv libtool gmake
 GNU_CONFIGURE=	yes
diff --git a/net/netmap/Makefile b/net/netmap/Makefile
index 056174117f79..21b5e3faaa3a 100644
--- a/net/netmap/Makefile
+++ b/net/netmap/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Make a graphical representation of the surrounding network
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	dotty:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	dotty:graphics/graphviz
 
 USES=		gmake
 
diff --git a/net/netwib/Makefile b/net/netwib/Makefile
index 5a8046c6962f..9278e8584023 100644
--- a/net/netwib/Makefile
+++ b/net/netwib/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwib network programming library
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 WRKSRC_SUBDIR=	src
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
diff --git a/net/neubot/Makefile b/net/neubot/Makefile
index eb76a704668d..1a93b4944e97 100644
--- a/net/neubot/Makefile
+++ b/net/neubot/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Measures neutrality of your network connection in the background
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USES=		python:2
 NO_BUILD=	yes
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index 668fbffe1c7a..e067b62a25c0 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -39,7 +39,7 @@ PCRE_CONFIGURE_ENABLE=	pcre
 
 PORTS_PCAP_CONFIGURE_ON=	--with-pcap-includes=${LOCALBASE}/include
 PORTS_PCAP_CONFIGURE_OFF=	--with-pcap-includes=/usr/include
-PORTS_PCAP_BUILD_DEPENDS=	${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
+PORTS_PCAP_BUILD_DEPENDS=	${LOCALBASE}/lib/libpcap.a:net/libpcap
 
 .include <bsd.port.options.mk>
 
diff --git a/net/nmsg/Makefile b/net/nmsg/Makefile
index 40b365042fc8..f616709c243e 100644
--- a/net/nmsg/Makefile
+++ b/net/nmsg/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Network message encapsulation system
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \
-		libxs.so:${PORTSDIR}/devel/libxs \
-		libwdns.so:${PORTSDIR}/dns/wdns \
-		libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c \
+		libxs.so:devel/libxs \
+		libwdns.so:dns/wdns \
+		libyajl.so:devel/yajl
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -33,12 +33,12 @@ OPTIONS_SUB=		yes
 CPPFLAGS+=	-I${LOCALBASE}/include/yajl
 
 ALL_TARGET=	all
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	html-local
 DOCBOOK_XML=	${LOCALBASE}/share/xml/docbook/4.2
-MANPAGES_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-			docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-			docbook-xsl-ns>0:${PORTSDIR}/textproc/docbook-xsl-ns
+MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+			docbook-xml>0:textproc/docbook-xml \
+			docbook-xsl-ns>0:textproc/docbook-xsl-ns
 MANPAGES_CONFIGURE_WITH=	xsltproc
 
 post-install:
diff --git a/net/nos-ttb/Makefile b/net/nos-ttb/Makefile
index f9bd2530cb3e..618e02363208 100644
--- a/net/nos-ttb/Makefile
+++ b/net/nos-ttb/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	edwin@mavetju.org
 COMMENT=	NOS teletekst browser
 
 #don't know if pygtk-1.X could also be used
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
 
 NO_BUILD=	yes
 USES=		python
diff --git a/net/ns3/Makefile b/net/ns3/Makefile
index ff2ff1d03443..5f0fafa8bbbf 100644
--- a/net/ns3/Makefile
+++ b/net/ns3/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Network simulator for Internet systems
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libsqlite3.so:databases/sqlite3
 
 USES=		pkgconfig python tar:bzip2 waf
 USE_LDCONFIG=	yes
@@ -33,13 +33,13 @@ EXAMPLES_CONFIGURE_ON=	--enable-examples
 EXAMPLES_CONFIGURE_OFF=	--disable-examples
 
 GSL_DESC=		GNU Scientific Library support
-GSL_LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
-GTK2_LIB_DEPENDS=	libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
+GTK2_LIB_DEPENDS=	libgtk-x11-2.0.so:x11-toolkits/gtk20
 GTK2_CONFIGURE_OFF=	--disable-gtk
 
 SUDO_DESC=		Use sudo to set suid bits on executables
-SUDO_BUILD_DEPENDS=	sudo:${PORTSDIR}/security/sudo
+SUDO_BUILD_DEPENDS=	sudo:security/sudo
 SUDO_CONFIGURE_ON=	--enable-sudo
 
 TEST_CONFIGURE_ON=	--enable-tests
diff --git a/net/nsscache/Makefile b/net/nsscache/Makefile
index dd095e8d7661..27dfb2030339 100644
--- a/net/nsscache/Makefile
+++ b/net/nsscache/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python utility to create a local cache of directory services
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-pycurl \
-		${PYTHON_PKGNAMEPREFIX}ldap>0:${PORTSDIR}/net/py-ldap
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl \
+		${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 04dff5e3dc5c..4c62d7a6bca7 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Network monitoring tool with command line and web interfaces
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libevent.so:${PORTSDIR}/devel/libevent2
-BUILD_DEPENDS=	rrdtool>=1.2:${PORTSDIR}/databases/rrdtool \
-		dot:${PORTSDIR}/graphics/graphviz \
-		geoiplookup:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libgdbm.so:databases/gdbm \
+		libevent.so:devel/libevent2
+BUILD_DEPENDS=	rrdtool>=1.2:databases/rrdtool \
+		dot:graphics/graphviz \
+		geoiplookup:net/GeoIP
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		urwfonts>0:${PORTSDIR}/x11-fonts/urwfonts
+		urwfonts>0:x11-fonts/urwfonts
 
 DBDIR?=		/var/db
 
@@ -50,11 +50,11 @@ XMLDUMP_DESC=		Enable XML Dump support
 JUMBO_FRAMES_DESC=	Jumbo Frames (experimental)
 MAKO_DESC=		Install py-mako for Host Map, Region View
 
-PCAP_PORT_LIB_DEPENDS=	libpcap.so.1:${PORTSDIR}/net/libpcap
+PCAP_PORT_LIB_DEPENDS=	libpcap.so.1:net/libpcap
 PCAP_PORT_CONFIGURE_ON=	--with-pcap-root=${LOCALBASE}
 PCAP_PORT_CONFIGURE_OFF=--with-pcap-root=/usr
 
-XMLDUMP_LIB_DEPENDS=	libgdome.so:${PORTSDIR}/textproc/gdome2
+XMLDUMP_LIB_DEPENDS=	libgdome.so:textproc/gdome2
 XMLDUMP_CPPFLAGS=	-I${LOCALBASE}/include/libxml2 \
 			-I${LOCALBASE}/include/libxml2/libxml \
 			-I${LOCALBASE}/include/libgdome \
@@ -64,7 +64,7 @@ XMLDUMP_CPPFLAGS=	-I${LOCALBASE}/include/libxml2 \
 # see http://www.cyberciti.biz/faq/freebsd-jumbo-frames-networking-configration/
 JUMBO_FRAMES_CONFIGURE_ON=	--enable-jumbo-frames
 
-MAKO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako
+MAKO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako
 
 pre-configure:
 	@(cd ${WRKSRC} && ./autogen.sh --noconfig)
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 87727f7220bf..418a838905ef 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-dev-${PORTVERSION:S/P/p/:S/r/-RC/:S/b/-beta/}
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 CONFLICTS=	ntp-[0-9].* ntp-rc-*
 
@@ -45,7 +45,7 @@ NLS_USES=		gettext-runtime
 
 NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
 
-NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
 
 PERL_UTILS_USES=	perl5
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index f215ddc8d105..1465eabea432 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/}
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 CONFLICTS=	ntp-rc-* ntp-devel-*
 
@@ -44,7 +44,7 @@ NLS_USES=	gettext-runtime
 
 NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
 
-NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
 
 PERL_UTILS_USES=	perl5
diff --git a/net/nxproxy/Makefile b/net/nxproxy/Makefile
index c5426f6a4111..c6ce15463412 100644
--- a/net/nxproxy/Makefile
+++ b/net/nxproxy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Helper program for x2go
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libXcomp.so:${PORTSDIR}/x11/nxcomp
+LIB_DEPENDS=	libXcomp.so:x11/nxcomp
 WRKSRC=	${WRKDIR}/nx-libs-${PORTVERSION}/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/net/nylon/Makefile b/net/nylon/Makefile
index bd947fb01666..1ed6e62d4d3d 100644
--- a/net/nylon/Makefile
+++ b/net/nylon/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://monkey.org/~marius/nylon/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unix SOCKS 4 and 5 proxy server
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USE_RC_SUBR=	nylon
 
diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 3d8d0d350123..f9685d17421a 100644
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Server implementing the AnyConnect SSL VPN protocol
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	autogen:${PORTSDIR}/devel/autogen \
-		gsed:${PORTSDIR}/textproc/gsed \
-		bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	liblz4.so:${PORTSDIR}/archivers/liblz4 \
-		libiconv.so:${PORTSDIR}/converters/libiconv \
-		libtalloc.so:${PORTSDIR}/devel/talloc \
-		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libtasn1.so:${PORTSDIR}/security/libtasn1
+BUILD_DEPENDS=	autogen:devel/autogen \
+		gsed:textproc/gsed \
+		bash:shells/bash
+LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
+		libiconv.so:converters/libiconv \
+		libtalloc.so:devel/talloc \
+		libprotobuf-c.so:devel/protobuf-c \
+		libgnutls.so:security/gnutls \
+		libtasn1.so:security/libtasn1
 
 USES=		autoreconf cpe gettext gmake gperf libtool ncurses \
 		pathfix pkgconfig readline tar:xz
@@ -47,7 +47,7 @@ PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
 PORTEXAMPLES=	profile.xml sample.config sample.passwd
 
 GSSAPI_USES=		gssapi:mit
-GSSAPI_LIB_DEPENDS=	libkrb5support.so:${PORTSDIR}/security/krb5
+GSSAPI_LIB_DEPENDS=	libkrb5support.so:security/krb5
 GSSAPI_CONFIGURE_OFF=	--without-gssapi
 
 post-patch:
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index e70508662355..fc7340906455 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	H323 Video Conferencing Program, compatible with NetMeeting
 
-LIB_DEPENDS=	libh323_r.so:${PORTSDIR}/net/openh323
+LIB_DEPENDS=	libh323_r.so:net/openh323
 
 USES=		bison gmake
 ALL_TARGET=	optshared
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index b79763655720..67e5f6272b5b 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.olsr.org/releases/0.6/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OLSR routing daemon
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
+BUILD_DEPENDS=	makedepend:devel/makedepend
 
 USES=		bison gmake tar:bzip2
 USE_LDCONFIG=	yes
@@ -23,7 +23,7 @@ INSTALL_TARGET=	install_all
 OPTIONS_DEFINE=	MULTI_IF
 MULTI_IF_DESC=	IPv4 multiple interface support
 
-MULTI_IF_LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+MULTI_IF_LIB_DEPENDS=	libnet.so:net/libnet
 MULTI_IF_MAKE_ARGS=	LIBNET=1
 
 .include <bsd.port.pre.mk>
diff --git a/net/omcmd/Makefile b/net/omcmd/Makefile
index f6720039684b..97d1a678fddd 100644
--- a/net/omcmd/Makefile
+++ b/net/omcmd/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://people.bridgewater.edu/~dparsley/omcmd/
 MAINTAINER=	pavelivolkov@googlemail.com
 COMMENT=	CLI utility for performing OMAPI queries and updates on a ISC DHCP
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/dhcpd:${PORTSDIR}/net/isc-dhcp41-server
+BUILD_DEPENDS=	${LOCALBASE}/sbin/dhcpd:net/isc-dhcp41-server
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
diff --git a/net/omnitty/Makefile b/net/omnitty/Makefile
index 51e79dc9e21e..15d024016f54 100644
--- a/net/omnitty/Makefile
+++ b/net/omnitty/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/omnitty/omnitty/omnitty-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses-based SSH multiplexer
 
-LIB_DEPENDS=	librote.so:${PORTSDIR}/devel/rote
+LIB_DEPENDS=	librote.so:devel/rote
 
 USES=		gmake ncurses
 GNU_CONFIGURE=	yes
diff --git a/net/onioncat/Makefile b/net/onioncat/Makefile
index b2c24db083f8..58e648c04606 100644
--- a/net/onioncat/Makefile
+++ b/net/onioncat/Makefile
@@ -11,7 +11,7 @@ COMMENT=	IP-transparent Tor Hidden Service connector
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	tor:${PORTSDIR}/security/tor
+RUN_DEPENDS=	tor:security/tor
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_LIBS="-pthread"
diff --git a/net/opal/Makefile b/net/opal/Makefile
index b1aa63f06438..a40a8c416da5 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -12,7 +12,7 @@ COMMENT=	VoIP abstraction library
 
 LICENSE=	MPL
 
-LIB_DEPENDS=	libpt.so:${PORTSDIR}/devel/ptlib
+LIB_DEPENDS=	libpt.so:devel/ptlib
 
 USES=		gmake pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
@@ -86,20 +86,20 @@ PLIST_SUB+=	DEBUG="@comment "
 .if !defined(SAFE_ZRTP)
 IGNORE=	please build devel/libzrtpcpp WITHOUT ports SSL and re-run build with SAFE_ZRTP set
 .endif
-LIB_DEPENDS+=	libzrtpcpp.so:${PORTSDIR}/devel/libzrtpcpp
+LIB_DEPENDS+=	libzrtpcpp.so:devel/libzrtpcpp
 CONFIGURE_ARGS+=	--enable-zrtp
 .else
 CONFIGURE_ARGS+=	--disable-zrtp
 .endif
 
 .if ${PORT_OPTIONS:MGSM}
-LIB_DEPENDS+=	libgsm.so:${PORTSDIR}/audio/gsm
+LIB_DEPENDS+=	libgsm.so:audio/gsm
 .else
 CONFIGURE_ARGS+=	--enable-localgsm
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:audio/speex
 .else
 CONFIGURE_ARGS+=	--enable-localspeex
 .endif
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+=	--disable-ruby
 .endif
 
 .if ${PORT_OPTIONS:MCELT}
-LIB_DEPENDS+=	libcelt0.so:${PORTSDIR}/audio/celt
+LIB_DEPENDS+=	libcelt0.so:audio/celt
 CONFIGURE_ARGS+=	--enable-celt
 PLIST_SUB+=	CELT=""
 .else
@@ -126,13 +126,13 @@ PLIST_SUB+=	CELT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MILBC}
-LIB_DEPENDS+=	libilbc.so:${PORTSDIR}/net/ilbc
+LIB_DEPENDS+=	libilbc.so:net/ilbc
 .else
 CONFIGURE_ARGS+=	--enable-localilbc
 .endif
 
 .if ${PORT_OPTIONS:MTHEORA}
-LIB_DEPENDS+=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=	libtheora.so:multimedia/libtheora
 CONFIGURE_ARGS+=	--enable-theora
 PLIST_SUB+=	THEORA=""
 WITH_VIDEO=	yes
@@ -142,7 +142,7 @@ PLIST_SUB+=	THEORA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MX264} && ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libx264.so:${PORTSDIR}/multimedia/libx264
+LIB_DEPENDS+=	libx264.so:multimedia/libx264
 CONFIGURE_ARGS+=	--enable-x264
 PLIST_SUB+=	X264=""
 WITH_VIDEO=	yes
@@ -156,8 +156,8 @@ PLIST_SUB+=	X264="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-BUILD_DEPENDS+=		ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
-RUN_DEPENDS+=		ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
+BUILD_DEPENDS+=		ffmpeg>=2:multimedia/ffmpeg
+RUN_DEPENDS+=		ffmpeg>=2:multimedia/ffmpeg
 CONFIGURE_ARGS+=	--enable-libavcodec
 PLIST_SUB+=	FFMPEG=""
 WITH_VIDEO=	yes
@@ -206,7 +206,7 @@ CONFIGURE_ARGS+=	--disable-h281
 .endif
 
 .if ${PORT_OPTIONS:MFAX}
-LIB_DEPENDS+=		libspandsp.so:${PORTSDIR}/comms/spandsp
+LIB_DEPENDS+=		libspandsp.so:comms/spandsp
 CONFIGURE_ARGS+=	--enable-spandsp --enable-fax --enable-t38
 PLIST_SUB+=	FAX=""
 .else
diff --git a/net/openbsc/Makefile b/net/openbsc/Makefile
index dce55a29c711..6dea19ce8b55 100644
--- a/net/openbsc/Makefile
+++ b/net/openbsc/Makefile
@@ -12,11 +12,11 @@ COMMENT=	GSM network in a box software
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi \
-		libosmocore.so:${PORTSDIR}/devel/libosmocore \
-		libosmoabis.so:${PORTSDIR}/devel/libosmo-abis \
-		libosmonetif.so:${PORTSDIR}/devel/libosmo-netif \
-		libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS=	libdbi.so:databases/libdbi \
+		libosmocore.so:devel/libosmocore \
+		libosmoabis.so:devel/libosmo-abis \
+		libosmonetif.so:devel/libosmo-netif \
+		libdbi.so:databases/libdbi
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 
@@ -38,10 +38,10 @@ OPTIONS_SUB=	yes
 BSC_CONFIGURE_ENABLE=	osmo-bsc
 
 NAT_CONFIGURE_ENABLE=	nat
-NAT_BUILD_DEPENDS=	${LOCALBASE}/lib/libsccp.a:${PORTSDIR}/devel/libosmo-sccp
-NAT_RUN_DEPENDS=	${LOCALBASE}/lib/libsccp.a:${PORTSDIR}/devel/libosmo-sccp
+NAT_BUILD_DEPENDS=	${LOCALBASE}/lib/libsccp.a:devel/libosmo-sccp
+NAT_RUN_DEPENDS=	${LOCALBASE}/lib/libsccp.a:devel/libosmo-sccp
 
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 post-patch:
 	${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
diff --git a/net/openggsn/Makefile b/net/openggsn/Makefile
index ed00b69cb149..c712f5702ae4 100644
--- a/net/openggsn/Makefile
+++ b/net/openggsn/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Implementation of the Gateway GPRS Support Node element
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=    libosmocore.so:${PORTSDIR}/devel/libosmocore
+LIB_DEPENDS=    libosmocore.so:devel/libosmocore
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool pkgconfig
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 01735c85c27b..1456fa23b068 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	openh323
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	H323 Video Conferencing library
 
-LIB_DEPENDS=	libpt_r.so:${PORTSDIR}/devel/pwlib
+LIB_DEPENDS=	libpt_r.so:devel/pwlib
 
 CONFLICTS=	h323plus-1.*
 
@@ -32,10 +32,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	BUILDTIME="YES"
 
 OPTIONS_DEFINE=		FFMPEG SPEEX
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--enable-rfc2190avcodec=${LOCALBASE}/include/ffmpeg
 
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_ON=	--enable-localspeex=no
 SPEEX_CONFIGURE_OFF=	--enable-localspeex=yes
 
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index a20405a3cab5..efb6e65e5d9c 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -156,7 +156,7 @@ WANT_OPENLDAP_SASL=	yes
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.*
 PKGNAMESUFFIX=		-sasl-server
 .if ${PORT_OPTIONS:MGSSAPI}
-RUN_DEPENDS+=		cyrus-sasl-gssapi>0:${PORTSDIR}/security/cyrus-sasl2-gssapi
+RUN_DEPENDS+=		cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
 .endif
 .else
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
@@ -198,7 +198,7 @@ BROKEN=	using OpenSSL from ports and OPTION FETCH together is not supported
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl
 .else
 CONFIGURE_ARGS+=	--without-cyrus-sasl
@@ -227,7 +227,7 @@ USE_RC_SUBR=		slapd
 EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
 
 .if ${PORT_OPTIONS:MMODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI}
-LIB_DEPENDS+=		libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS+=		libltdl.so:devel/libltdl
 CONFIGURE_ARGS+=	--enable-modules
 PLIST_SUB+=		MODULES=""
 .else
@@ -440,7 +440,7 @@ CONFIGURE_ARGS+=	--enable-spasswd
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--enable-sql=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_SQL=${BACKEND_PLIST}
-LIB_DEPENDS+=		libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 LDFLAGS+=		-L${LOCALBASE}/lib
 .else
 PLIST_SUB+=		BACK_SQL="@comment "
@@ -475,7 +475,7 @@ PLIST_SUB+=		SLAPI="@comment "
 
 .if ${PORT_OPTIONS:MSLP}
 CONFIGURE_ARGS+=	--enable-slp
-LIB_DEPENDS+=		libslp.so:${PORTSDIR}/net/openslp
+LIB_DEPENDS+=		libslp.so:net/openslp
 .endif
 
 # Include tcp-wrapper support
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 39da701fbc93..402d72055b9b 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	High Performance Message Passing Library
 
-LIB_DEPENDS=	libhwloc.so:${PORTSDIR}/devel/hwloc \
-		libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libhwloc.so:devel/hwloc \
+		libltdl.so:devel/libltdl
 
 HAS_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -51,7 +51,7 @@ IPV6_CONFIGURE_ENABLE=	ipv6
 
 TORQUE_CONFIGURE_ON=	--with-tm=${LOCALBASE}
 TORQUE_CONFIGURE_OFF=	--without-tm
-TORQUE_LIB_DEPENDS=	libtorque.so:${PORTSDIR}/sysutils/torque
+TORQUE_LIB_DEPENDS=	libtorque.so:sysutils/torque
 TORQUE_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_plm_tm.so \
 			${MPIDIR}/lib/openmpi/mca_plm_tm.la \
 			${MPIDIR}/lib/openmpi/mca_ras_tm.la \
@@ -62,7 +62,7 @@ TORQUE_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_plm_tm.so \
 			${MPIDIR}/share/openmpi/help-ras-tm.txt
 
 SLURM_CONFIGURE_WITH=	slurm
-SLURM_LIB_DEPENDS=	libslurm.so:${PORTSDIR}/sysutils/slurm-wlm
+SLURM_LIB_DEPENDS=	libslurm.so:sysutils/slurm-wlm
 SLURM_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_ess_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_ess_slurm.so \
 			${MPIDIR}/lib/openmpi/mca_plm_slurm.la \
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 8f27e9dea03b..fe256228f236 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -29,11 +29,11 @@ RESSL_DESC=		SSL/TLS support via LibreSSL
 
 OPTIONS_DEFAULT=	RESSL
 
-RESSL_LIB_DEPENDS=	libtls.so:${PORTSDIR}/security/libressl
+RESSL_LIB_DEPENDS=	libtls.so:security/libressl
 RESSL_CONFIGURE_WITH=	cacert=${LOCALBASE}/etc/ssl/cert.pem
 RESSL_CPPFLAGS=		-I${LOCALBASE}/include
 RESSL_LDFLAGS=		-L${LOCALBASE}/lib
-RESSL_RUN_DEPENDS=	ca_root_nss>=3.22.2:${PORTSDIR}/security/ca_root_nss
+RESSL_RUN_DEPENDS=	ca_root_nss>=3.22.2:security/ca_root_nss
 
 pre-build:
 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
diff --git a/net/opennx/Makefile b/net/opennx/Makefile
index 4abcb03afd19..c3cf1070d009 100644
--- a/net/opennx/Makefile
+++ b/net/opennx/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Open source drop in replacement for NoMachine's NX client
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+BUILD_DEPENDS=	${LOCALBASE}/bin/zip:archivers/zip
+LIB_DEPENDS=	libcups.so:print/cups \
+		libcurl.so:ftp/curl \
+		libsmbclient.so:net/samba-libsmbclient
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.16
 
diff --git a/net/openospfd/Makefile b/net/openospfd/Makefile
index 6da266037aa7..bef8b51964b6 100644
--- a/net/openospfd/Makefile
+++ b/net/openospfd/Makefile
@@ -18,7 +18,7 @@ LICENSE=	ISCL
 
 CONFLICTS=	zebra-0* quagga-0*
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${PREFIX}/man/man"
diff --git a/net/opensips/Makefile b/net/opensips/Makefile
index 98ff6c1a65ec..778e060c40f5 100644
--- a/net/opensips/Makefile
+++ b/net/opensips/Makefile
@@ -12,23 +12,23 @@ COMMENT=		Open SIP Server
 LICENSE=		GPLv2
 LICENSE_FILE=		${WRKSRC}/COPYING
 
-LIB_DEPENDS=		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-			libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c-devel \
-			libpcre.so:${PORTSDIR}/devel/pcre \
-			libconfuse.so:${PORTSDIR}/devel/libconfuse \
-			librabbitmq.so:${PORTSDIR}/net/rabbitmq-c-devel \
-			libhiredis.so:${PORTSDIR}/databases/hiredis \
-			libexpat.so:${PORTSDIR}/textproc/expat2 \
-			libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=		ginstall:${PORTSDIR}/sysutils/coreutils \
-			gtar:${PORTSDIR}/archivers/gtar \
-			gm4:${PORTSDIR}/devel/m4 \
-			redis-server:${PORTSDIR}/databases/redis-devel \
-			python2:${PORTSDIR}/lang/python2 \
-			python:${PORTSDIR}/lang/python
-RUN_DEPENDS=		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-			${LOCALBASE}/bin/python2:${PORTSDIR}/lang/python2 \
-			${LOCALBASE}/bin/grep:${PORTSDIR}/textproc/gnugrep
+LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
+			libxmlrpc.so:net/xmlrpc-c-devel \
+			libpcre.so:devel/pcre \
+			libconfuse.so:devel/libconfuse \
+			librabbitmq.so:net/rabbitmq-c-devel \
+			libhiredis.so:databases/hiredis \
+			libexpat.so:textproc/expat2 \
+			libjson-c.so:devel/json-c
+BUILD_DEPENDS=		ginstall:sysutils/coreutils \
+			gtar:archivers/gtar \
+			gm4:devel/m4 \
+			redis-server:databases/redis-devel \
+			python2:lang/python2 \
+			python:lang/python
+RUN_DEPENDS=		${LOCALBASE}/bin/bash:shells/bash \
+			${LOCALBASE}/bin/python2:lang/python2 \
+			${LOCALBASE}/bin/grep:textproc/gnugrep
 
 GINSTALL=		ginstall
 
@@ -55,12 +55,12 @@ LDAP_USE=		OPENLDAP=client
 MYSQL_USE=		MYSQL=client
 PGSQL_USES+=		pgsql
 
-PGSQL_BUILD_DEPENDS+=	p5-DBD-Pg>=3.4:${PORTSDIR}/databases/p5-DBD-Pg
-RADIUS_BUILD_DEPENDS+=	radiusclient:${PORTSDIR}/net/radiusclient
-HTTP_LIB_DEPENDS+=	libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
-GEOIP_LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
-MEMCACHED_LIB_DEPENDS+=	libmemcached.so:${PORTSDIR}/databases/libmemcached
-UNIXODBC_LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+PGSQL_BUILD_DEPENDS+=	p5-DBD-Pg>=3.4:databases/p5-DBD-Pg
+RADIUS_BUILD_DEPENDS+=	radiusclient:net/radiusclient
+HTTP_LIB_DEPENDS+=	libmicrohttpd.so:www/libmicrohttpd
+GEOIP_LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
+MEMCACHED_LIB_DEPENDS+=	libmemcached.so:databases/libmemcached
+UNIXODBC_LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 SHEBANG_FILES=		scripts/osipsconsole \
 			modules/jabber/doc/jabberreg.pl \
diff --git a/net/opentracker/Makefile b/net/opentracker/Makefile
index cd2cbda1062b..d5e15b24adff 100644
--- a/net/opentracker/Makefile
+++ b/net/opentracker/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}/ \
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Free lightweight bittorrent tracker using libowfat
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/devel/libowfat
+BUILD_DEPENDS=	${LOCALBASE}/lib/libowfat.a:devel/libowfat
 
 USES=		tar:bzip2
 USE_RC_SUBR=	${PORTNAME}
diff --git a/net/ossp-sa/Makefile b/net/ossp-sa/Makefile
index f46427ac5a87..dcd3b2efabc1 100644
--- a/net/ossp-sa/Makefile
+++ b/net/ossp-sa/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	ossp-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstraction library for the Unix socket API
 
-LIB_DEPENDS=	libex.so:${PORTSDIR}/devel/ossp-ex
+LIB_DEPENDS=	libex.so:devel/ossp-ex
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ex=${LOCALBASE}
diff --git a/net/ostinato/Makefile b/net/ostinato/Makefile
index 2fb1d9a42f13..fac0a55115bf 100644
--- a/net/ostinato/Makefile
+++ b/net/ostinato/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Packet crafter/generator and analyzer with friendly GUI
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USES=		qmake
 USE_QT4=	gui moc_build rcc_build uic_build network script \
diff --git a/net/p5-Acme-HTTP/Makefile b/net/p5-Acme-HTTP/Makefile
index d5b043bdb28d..92eb49fced35 100644
--- a/net/p5-Acme-HTTP/Makefile
+++ b/net/p5-Acme-HTTP/Makefile
@@ -13,8 +13,8 @@ COMMENT=	High-level access to Net::HTTP::NB and Net::HTTPS::NB
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-HTTP>=0:${PORTSDIR}/net/p5-Net-HTTP \
-		p5-Net-HTTPS-NB>=0:${PORTSDIR}/net/p5-Net-HTTPS-NB
+BUILD_DEPENDS=	p5-Net-HTTP>=0:net/p5-Net-HTTP \
+		p5-Net-HTTPS-NB>=0:net/p5-Net-HTTPS-NB
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-AddressBook/Makefile b/net/p5-AddressBook/Makefile
index 03424152ffc2..b0588871472c 100644
--- a/net/p5-AddressBook/Makefile
+++ b/net/p5-AddressBook/Makefile
@@ -13,10 +13,10 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module providing an LDAP addressbook interface
 
 
-BUILD_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
-RUN_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
+BUILD_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-XML-DOM>=0:textproc/p5-XML-DOM
+RUN_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-XML-DOM>=0:textproc/p5-XML-DOM
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Amazon-SQS-Simple/Makefile b/net/p5-Amazon-SQS-Simple/Makefile
index a243e519179e..973a13c86db8 100644
--- a/net/p5-Amazon-SQS-Simple/Makefile
+++ b/net/p5-Amazon-SQS-Simple/Makefile
@@ -15,10 +15,10 @@ COMMENT=	OO API for accessing the Amazon Simple Queue Service
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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}
 
 USES=		perl5
diff --git a/net/p5-AnyEvent-MPRPC/Makefile b/net/p5-AnyEvent-MPRPC/Makefile
index 187f081ff18a..d48210d0ee46 100644
--- a/net/p5-AnyEvent-MPRPC/Makefile
+++ b/net/p5-AnyEvent-MPRPC/Makefile
@@ -11,13 +11,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for simple TCP-based MPRPC client/server
 
 RUN_DEPENDS=	\
-	p5-Any-Moose>=0.13:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-AnyEvent>=5.261:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-Data-MessagePack>=0.34:${PORTSDIR}/devel/p5-Data-MessagePack \
-	p5-Data-MessagePack-Stream>=0.05:${PORTSDIR}/devel/p5-Data-MessagePack-Stream \
-	p5-AnyEvent-MessagePack>=0.19:${PORTSDIR}/devel/p5-AnyEvent-MessagePack
+	p5-Any-Moose>=0.13:devel/p5-Any-Moose \
+	p5-AnyEvent>=5.261:devel/p5-AnyEvent \
+	p5-Data-MessagePack>=0.34:devel/p5-Data-MessagePack \
+	p5-Data-MessagePack-Stream>=0.05:devel/p5-Data-MessagePack-Stream \
+	p5-AnyEvent-MessagePack>=0.19:devel/p5-AnyEvent-MessagePack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>=0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-AnyEvent-RabbitMQ/Makefile b/net/p5-AnyEvent-RabbitMQ/Makefile
index 2411f00e032e..1cff461e72c1 100644
--- a/net/p5-AnyEvent-RabbitMQ/Makefile
+++ b/net/p5-AnyEvent-RabbitMQ/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Asynchronous and multi channel Perl AMQP client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Net-AMQP>=0.6:${PORTSDIR}/net/p5-Net-AMQP \
-		p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Net-AMQP>=0.6:net/p5-Net-AMQP \
+		p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Readonly>=1.03:devel/p5-Readonly \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-AnyEvent-Twitter-Stream/Makefile b/net/p5-AnyEvent-Twitter-Stream/Makefile
index 1f744ba329c4..3bab8d29a080 100644
--- a/net/p5-AnyEvent-Twitter-Stream/Makefile
+++ b/net/p5-AnyEvent-Twitter-Stream/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl module to receive Twitter streaming API in an event loop
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-AnyEvent-HTTP>=2.0:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-		p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-AnyEvent-HTTP>=2.0:www/p5-AnyEvent-HTTP \
+		p5-JSON>=2.0:converters/p5-JSON \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/net/p5-AnyEvent-Twitter/Makefile b/net/p5-AnyEvent-Twitter/Makefile
index f804cb60a68e..a53f2f90a869 100644
--- a/net/p5-AnyEvent-Twitter/Makefile
+++ b/net/p5-AnyEvent-Twitter/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implementation of the Twitter API for AnyEvent
 
-BUILD_DEPENDS=	p5-AnyEvent>=5.34:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-AnyEvent-HTTP>=2.12:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-		p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-		p5-Net-OAuth>=0.27:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-URI>=1.58:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-AnyEvent>=5.34:devel/p5-AnyEvent \
+		p5-AnyEvent-HTTP>=2.12:www/p5-AnyEvent-HTTP \
+		p5-JSON>=2.53:converters/p5-JSON \
+		p5-Net-OAuth>=0.27:net/p5-Net-OAuth \
+		p5-URI>=1.58:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-AnyMQ-AMQP/Makefile b/net/p5-AnyMQ-AMQP/Makefile
index bbc144a48c03..feedecabadbf 100644
--- a/net/p5-AnyMQ-AMQP/Makefile
+++ b/net/p5-AnyMQ-AMQP/Makefile
@@ -15,10 +15,10 @@ COMMENT=	AMQP binding for AnyMQ
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-AnyMQ>=0:${PORTSDIR}/devel/p5-AnyMQ \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-AnyEvent-RabbitMQ>=0:${PORTSDIR}/net/p5-AnyEvent-RabbitMQ \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+RUN_DEPENDS=	p5-AnyMQ>=0:devel/p5-AnyMQ \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-AnyEvent-RabbitMQ>=0:net/p5-AnyEvent-RabbitMQ \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Apache2-SOAP/Makefile b/net/p5-Apache2-SOAP/Makefile
index 558dd9a8f1cd..47535c735eb5 100644
--- a/net/p5-Apache2-SOAP/Makefile
+++ b/net/p5-Apache2-SOAP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Apache2 mod_perl2 SOAP Server
 
-BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-BBS-Client/Makefile b/net/p5-BBS-Client/Makefile
index 64bf7b188fce..545f0e4a8086 100644
--- a/net/p5-BBS-Client/Makefile
+++ b/net/p5-BBS-Client/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Client Module For BBS Systems
 
-BUILD_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
+BUILD_DEPENDS=	p5-Net-Telnet>=0:net/p5-Net-Telnet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-BBS-UserInfo-Maple3/Makefile b/net/p5-BBS-UserInfo-Maple3/Makefile
index b9655c65bdc1..1ccca8aae1e5 100644
--- a/net/p5-BBS-UserInfo-Maple3/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Get user information of Maple3-style BBS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect
+BUILD_DEPENDS=	p5-Expect>=0:lang/p5-Expect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-BBS-UserInfo-Maple3itoc/Makefile b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
index 854f91c522f1..32cc58c37f92 100644
--- a/net/p5-BBS-UserInfo-Maple3itoc/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Get user information of Maple3itoc-style BBS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect
+BUILD_DEPENDS=	p5-Expect>=0:lang/p5-Expect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-BBS-UserInfo-Ptt/Makefile b/net/p5-BBS-UserInfo-Ptt/Makefile
index 2ad892389b11..d354ffa65d35 100644
--- a/net/p5-BBS-UserInfo-Ptt/Makefile
+++ b/net/p5-BBS-UserInfo-Ptt/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Get user information of PTT-style BBS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect
+BUILD_DEPENDS=	p5-Expect>=0:lang/p5-Expect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-BBS-UserInfo-SOB/Makefile b/net/p5-BBS-UserInfo-SOB/Makefile
index e0c23700b2c7..be1e0017ac7d 100644
--- a/net/p5-BBS-UserInfo-SOB/Makefile
+++ b/net/p5-BBS-UserInfo-SOB/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Get user information of SOB-style BBS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect
+BUILD_DEPENDS=	p5-Expect>=0:lang/p5-Expect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-BBS-UserInfo-Wretch/Makefile b/net/p5-BBS-UserInfo-Wretch/Makefile
index 1305caf54fbd..53811b82545e 100644
--- a/net/p5-BBS-UserInfo-Wretch/Makefile
+++ b/net/p5-BBS-UserInfo-Wretch/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Get user information of Wretch-style BBS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect
+BUILD_DEPENDS=	p5-Expect>=0:lang/p5-Expect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Beanstalk-Client/Makefile b/net/p5-Beanstalk-Client/Makefile
index 680ba8ffea68..06967ad5b741 100644
--- a/net/p5-Beanstalk-Client/Makefile
+++ b/net/p5-Beanstalk-Client/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Perl API for beanstalkd, a distributed queue daemon
 
-BUILD_DEPENDS=	p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck \
-				p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-				p5-Error>=0:${PORTSDIR}/lang/p5-Error
+BUILD_DEPENDS=	p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+				p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+				p5-Error>=0:lang/p5-Error
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Crypt-DH-GMP/Makefile b/net/p5-Crypt-DH-GMP/Makefile
index fc896908c270..02b202bf2868 100644
--- a/net/p5-Crypt-DH-GMP/Makefile
+++ b/net/p5-Crypt-DH-GMP/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Crypt::DH Using GMP Directly
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckLib>=0.40:${PORTSDIR}/devel/p5-Devel-CheckLib
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+BUILD_DEPENDS=	p5-Devel-CheckLib>=0.40:devel/p5-Devel-CheckLib
+LIB_DEPENDS=	libgmp.so:math/gmp
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
diff --git a/net/p5-Daemon-Generic/Makefile b/net/p5-Daemon-Generic/Makefile
index 3463807b86f6..d5b4baebe533 100644
--- a/net/p5-Daemon-Generic/Makefile
+++ b/net/p5-Daemon-Generic/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Framework to provide start/stop/reload for a daemon
 
-BUILD_DEPENDS=	p5-File-Flock>=0:${PORTSDIR}/devel/p5-File-Flock \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Event>=0:${PORTSDIR}/devel/p5-Event \
-		p5-Eval-LineNumbers>=0:${PORTSDIR}/devel/p5-Eval-LineNumbers
+BUILD_DEPENDS=	p5-File-Flock>=0:devel/p5-File-Flock \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Event>=0:devel/p5-Event \
+		p5-Eval-LineNumbers>=0:devel/p5-Eval-LineNumbers
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-EasyTCP/Makefile b/net/p5-EasyTCP/Makefile
index bad96a78d324..79fed74451d3 100644
--- a/net/p5-EasyTCP/Makefile
+++ b/net/p5-EasyTCP/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easily create TCP/IP clients and servers
 
-BUILD_DEPENDS=	p5-Crypt-RSA>=0:${PORTSDIR}/security/p5-Crypt-RSA
+BUILD_DEPENDS=	p5-Crypt-RSA>=0:security/p5-Crypt-RSA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Event-tcp/Makefile b/net/p5-Event-tcp/Makefile
index ea5715943d43..93d138fe5162 100644
--- a/net/p5-Event-tcp/Makefile
+++ b/net/p5-Event-tcp/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Glue code to build client-server style TCP-based services
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Event>=0:${PORTSDIR}/devel/p5-Event \
-		p5-Ioctl>=0:${PORTSDIR}/devel/p5-Ioctl
+BUILD_DEPENDS=	p5-Event>=0:devel/p5-Event \
+		p5-Ioctl>=0:devel/p5-Ioctl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-File-Rsync/Makefile b/net/p5-File-Rsync/Makefile
index 4410690604fb..5f499329f4a9 100644
--- a/net/p5-File-Rsync/Makefile
+++ b/net/p5-File-Rsync/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl convenience wrapper for the rsync(1) program
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	rsync:${PORTSDIR}/net/rsync \
-		p5-IPC-Run3>=0.042:${PORTSDIR}/devel/p5-IPC-Run3
+BUILD_DEPENDS=	rsync:net/rsync \
+		p5-IPC-Run3>=0.042:devel/p5-IPC-Run3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Filesys-SmbClient/Makefile b/net/p5-Filesys-SmbClient/Makefile
index fa203cf4df5f..0aadbc63f0ea 100644
--- a/net/p5-Filesys-SmbClient/Makefile
+++ b/net/p5-Filesys-SmbClient/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface for access Samba filesystem with libsmclient.so
 
-LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
-BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
+BUILD_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Frontier-RPC/Makefile b/net/p5-Frontier-RPC/Makefile
index 49ebe62cf388..1cbb27820003 100644
--- a/net/p5-Frontier-RPC/Makefile
+++ b/net/p5-Frontier-RPC/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	${PORTNAME}-0.07b4
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Frontier::RPC implements UserLand Software's XML RPC
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Geo-IP/Makefile b/net/p5-Geo-IP/Makefile
index 6205d1c5c34b..8e47bf46a401 100644
--- a/net/p5-Geo-IP/Makefile
+++ b/net/p5-Geo-IP/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Gets country name by IP or hostname
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 CONFIGURE_ARGS=	INC="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 USES=		perl5
diff --git a/net/p5-GeoIP2/Makefile b/net/p5-GeoIP2/Makefile
index 2dcc785099ca..97ec66cd1429 100644
--- a/net/p5-GeoIP2/Makefile
+++ b/net/p5-GeoIP2/Makefile
@@ -14,23 +14,23 @@ COMMENT=	Perl API for MaxMind GeoIP2 web services and databases
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Validate-IP>=0.19:${PORTSDIR}/net-mgmt/p5-Data-Validate-IP \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MaxMind-DB-Common>=0:${PORTSDIR}/net/p5-MaxMind-DB-Common \
-		p5-MaxMind-DB-Reader>=0:${PORTSDIR}/net/p5-MaxMind-DB-Reader \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Throwable>=0:${PORTSDIR}/devel/p5-Throwable \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Data-Validate-IP>=0.19:net-mgmt/p5-Data-Validate-IP \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-MaxMind-DB-Common>=0:net/p5-MaxMind-DB-Common \
+		p5-MaxMind-DB-Reader>=0:net/p5-MaxMind-DB-Reader \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Throwable>=0:devel/p5-Throwable \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/net/p5-Google-SAML-Request/Makefile b/net/p5-Google-SAML-Request/Makefile
index 3b3862f940eb..f2e618136f62 100644
--- a/net/p5-Google-SAML-Request/Makefile
+++ b/net/p5-Google-SAML-Request/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Create or parse Google SAML requests
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-TimeDate>0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-TimeDate>0:devel/p5-TimeDate \
+		p5-URI>0:net/p5-URI \
+		p5-XML-Simple>0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/net/p5-Google-SAML-Response/Makefile b/net/p5-Google-SAML-Response/Makefile
index 4a3b9c1b954d..c0ff6f18f42f 100644
--- a/net/p5-Google-SAML-Response/Makefile
+++ b/net/p5-Google-SAML-Response/Makefile
@@ -13,16 +13,16 @@ COMMENT=	SAML responses for Google SSO implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Bignum \
-		p5-Crypt-OpenSSL-DSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-DSA \
-		p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-Google-SAML-Request>=0:${PORTSDIR}/net/p5-Google-SAML-Request \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-XML-CanonicalizeXML>=0:${PORTSDIR}/textproc/p5-XML-CanonicalizeXML
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0:security/p5-Crypt-OpenSSL-Bignum \
+		p5-Crypt-OpenSSL-DSA>=0:security/p5-Crypt-OpenSSL-DSA \
+		p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-Google-SAML-Request>=0:net/p5-Google-SAML-Request \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-XML-CanonicalizeXML>=0:textproc/p5-XML-CanonicalizeXML
 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/net/p5-Growl-GNTP/Makefile b/net/p5-Growl-GNTP/Makefile
index 08ccc76a24e3..0eb1b4a86079 100644
--- a/net/p5-Growl-GNTP/Makefile
+++ b/net/p5-Growl-GNTP/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl implementation of the Growl GNTP Protocol (Client Part)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID
+BUILD_DEPENDS=	p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+		p5-Data-UUID>=0:devel/p5-Data-UUID
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile
index f4d3b5431a24..8dddcd2e4c9c 100644
--- a/net/p5-IO-Socket-INET6/Makefile
+++ b/net/p5-IO-Socket-INET6/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl module with object interface to AF_INET6 domain sockets
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Socket6>=0.12:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-Socket6>=0.12:net/p5-Socket6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-IO-Socket-IP/Makefile b/net/p5-IO-Socket-IP/Makefile
index 96539c636fd8..7623beb2e691 100644
--- a/net/p5-IO-Socket-IP/Makefile
+++ b/net/p5-IO-Socket-IP/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Drop-in replacement for IO::Socket::INET supporting IPv4 and IPv6
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Socket>=1.97:${PORTSDIR}/net/p5-Socket
+BUILD_DEPENDS=	p5-Socket>=1.97:net/p5-Socket
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/net/p5-IO-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile
index 0803ccfc9c24..424bcdaa1cd9 100644
--- a/net/p5-IO-Socket-Multicast/Makefile
+++ b/net/p5-IO-Socket-Multicast/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Perl module to send and receive multicast messages
 
-RUN_DEPENDS=	p5-IO-Interface>=0:${PORTSDIR}/net/p5-IO-Interface
+RUN_DEPENDS=	p5-IO-Interface>=0:net/p5-IO-Interface
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/net/p5-IO-Socket-Multicast6/Makefile b/net/p5-IO-Socket-Multicast6/Makefile
index 1f201a9098a9..bbe2a9844d6f 100644
--- a/net/p5-IO-Socket-Multicast6/Makefile
+++ b/net/p5-IO-Socket-Multicast6/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Send and receive IPv4 and IPv6 multicast messages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Interface>=1.01:${PORTSDIR}/net/p5-IO-Interface \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-Socket-Multicast6>=0.01:${PORTSDIR}/net/p5-Socket-Multicast6 \
-		p5-Socket6>=0.19:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-IO-Interface>=1.01:net/p5-IO-Interface \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
+		p5-Socket-Multicast6>=0.01:net/p5-Socket-Multicast6 \
+		p5-Socket6>=0.19:net/p5-Socket6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-IO-Socket-Timeout/Makefile b/net/p5-IO-Socket-Timeout/Makefile
index 45cc491d5ef3..6c0b03f3cac4 100644
--- a/net/p5-IO-Socket-Timeout/Makefile
+++ b/net/p5-IO-Socket-Timeout/Makefile
@@ -12,7 +12,7 @@ COMMENT=	IO::Socket with read/write timeout
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PerlIO-via-Timeout>=0.32:${PORTSDIR}/devel/p5-PerlIO-via-Timeout
+BUILD_DEPENDS=	p5-PerlIO-via-Timeout>=0.32:devel/p5-PerlIO-via-Timeout
 
 NO_ARCH=	yes
 
diff --git a/net/p5-IP-Anonymous/Makefile b/net/p5-IP-Anonymous/Makefile
index b6dd80049c01..34a233aea79e 100644
--- a/net/p5-IP-Anonymous/Makefile
+++ b/net/p5-IP-Anonymous/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension to provide anonymous IP addresses
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael
+RUN_DEPENDS=	p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-IP-Country/Makefile b/net/p5-IP-Country/Makefile
index c79ebd128928..abca0c6b9f21 100644
--- a/net/p5-IP-Country/Makefile
+++ b/net/p5-IP-Country/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dikshie@lapi.itb.ac.id
 COMMENT=	Fast lookup of country codes from IP addresses
 
-BUILD_DEPENDS=	p5-Geography-Countries>=0:${PORTSDIR}/misc/p5-Geography-Countries
+BUILD_DEPENDS=	p5-Geography-Countries>=0:misc/p5-Geography-Countries
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Kafka/Makefile b/net/p5-Kafka/Makefile
index 9fa1af05489f..751b70b35d72 100644
--- a/net/p5-Kafka/Makefile
+++ b/net/p5-Kafka/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Apache Kafka interface for Perl
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Compress-Snappy>=0:${PORTSDIR}/archivers/p5-Compress-Snappy \
-		p5-Socket>=2:${PORTSDIR}/net/p5-Socket \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Exporter>=0:${PORTSDIR}/devel/p5-Exporter \
-		p5-Const-Fast>=0:${PORTSDIR}/devel/p5-Const-Fast \
-		p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32 \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction \
-		p5-Scalar-Util-Numeric>=0:${PORTSDIR}/devel/p5-Scalar-Util-Numeric \
-		p5-Data-HexDump-Range>=0:${PORTSDIR}/devel/p5-Data-HexDump-Range
+BUILD_DEPENDS=	p5-Compress-Snappy>=0:archivers/p5-Compress-Snappy \
+		p5-Socket>=2:net/p5-Socket \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-Exporter>=0:devel/p5-Exporter \
+		p5-Const-Fast>=0:devel/p5-Const-Fast \
+		p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-String-CRC32>=0:devel/p5-String-CRC32 \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Sys-SigAction>=0:devel/p5-Sys-SigAction \
+		p5-Scalar-Util-Numeric>=0:devel/p5-Scalar-Util-Numeric \
+		p5-Data-HexDump-Range>=0:devel/p5-Data-HexDump-Range
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -34,8 +34,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=      p5-Scalar-List-Utils>=1.38:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=        p5-Scalar-List-Utils>=1.38:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=      p5-Scalar-List-Utils>=1.38:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=        p5-Scalar-List-Utils>=1.38:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/p5-MaxMind-DB-Common/Makefile b/net/p5-MaxMind-DB-Common/Makefile
index 96751122d78d..c4f47feba275 100644
--- a/net/p5-MaxMind-DB-Common/Makefile
+++ b/net/p5-MaxMind-DB-Common/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Code shared by the DB reader and writer modules
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Data-Dumper-Concise>=0:${PORTSDIR}/devel/p5-Data-Dumper-Concise \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-List-AllUtils>=0:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooX-StrictConstructor \
-		p5-autodie>=0:${PORTSDIR}/devel/p5-autodie \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Data-Dumper-Concise>=0:devel/p5-Data-Dumper-Concise \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-List-AllUtils>=0:devel/p5-List-AllUtils \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-MooX-StrictConstructor>=0:devel/p5-MooX-StrictConstructor \
+		p5-autodie>=0:devel/p5-autodie \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-MaxMind-DB-Writer/Makefile b/net/p5-MaxMind-DB-Writer/Makefile
index 1baac67519c1..959e66c56dc6 100644
--- a/net/p5-MaxMind-DB-Writer/Makefile
+++ b/net/p5-MaxMind-DB-Writer/Makefile
@@ -14,28 +14,28 @@ COMMENT=	Create MaxMind DB database files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Dumper-Concise>=0:${PORTSDIR}/devel/p5-Data-Dumper-Concise \
-		p5-Data-IEEE754>=0:${PORTSDIR}/devel/p5-Data-IEEE754 \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Math-Int128>=0.21:${PORTSDIR}/math/p5-Math-Int128 \
-		p5-Math-Int64>=0.51:${PORTSDIR}/math/p5-Math-Int64 \
-		p5-MaxMind-DB-Common>=0.031003:${PORTSDIR}/net/p5-MaxMind-DB-Common \
-		p5-MaxMind-DB-Reader>=0:${PORTSDIR}/net/p5-MaxMind-DB-Reader \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Params-Validate>=0:${PORTSDIR}/devel/p5-MooseX-Params-Validate \
-		p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-Net-Works>=0.20:${PORTSDIR}/net/p5-Net-Works \
-		p5-Sereal-Decoder>=0:${PORTSDIR}/converters/p5-Sereal-Decoder \
-		p5-Sereal-Encoder>=3.002:${PORTSDIR}/converters/p5-Sereal-Encoder \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Data-Dumper-Concise>=0:devel/p5-Data-Dumper-Concise \
+		p5-Data-IEEE754>=0:devel/p5-Data-IEEE754 \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Math-Int128>=0.21:math/p5-Math-Int128 \
+		p5-Math-Int64>=0.51:math/p5-Math-Int64 \
+		p5-MaxMind-DB-Common>=0.031003:net/p5-MaxMind-DB-Common \
+		p5-MaxMind-DB-Reader>=0:net/p5-MaxMind-DB-Reader \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Params-Validate>=0:devel/p5-MooseX-Params-Validate \
+		p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
+		p5-Net-Works>=0.20:net/p5-Net-Works \
+		p5-Sereal-Decoder>=0:converters/p5-Sereal-Decoder \
+		p5-Sereal-Encoder>=3.002:converters/p5-Sereal-Encoder \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Data-Printer>=0:${PORTSDIR}/devel/p5-Data-Printer \
-		p5-Devel-Refcount>=0:${PORTSDIR}/devel/p5-Devel-Refcount \
-		p5-List-AllUtils>=0:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-Test-Bits>=0:${PORTSDIR}/devel/p5-Test-Bits \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Data-Printer>=0:devel/p5-Data-Printer \
+		p5-Devel-Refcount>=0:devel/p5-Devel-Refcount \
+		p5-List-AllUtils>=0:devel/p5-List-AllUtils \
+		p5-Test-Bits>=0:devel/p5-Test-Bits \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/net/p5-Net-AMQP/Makefile b/net/p5-Net-AMQP/Makefile
index 653d9cf88687..ad1360cf95e7 100644
--- a/net/p5-Net-AMQP/Makefile
+++ b/net/p5-Net-AMQP/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Advanced Message Queue Protocol (de)serialization and representation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/net/p5-Net-APNS/Makefile b/net/p5-Net-APNS/Makefile
index e5fee37f9228..44c1507c548d 100644
--- a/net/p5-Net-APNS/Makefile
+++ b/net/p5-Net-APNS/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Apple Push Notification Service
 
 RUN_DEPENDS=	\
-	p5-Any-Moose>=0.10:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-JSON-XS>=2.25:${PORTSDIR}/converters/p5-JSON-XS \
-	p5-Net-SSLeay>=1.35:${PORTSDIR}/security/p5-Net-SSLeay \
-	p5-Sub-Exporter>=0.982:${PORTSDIR}/devel/p5-Sub-Exporter
+	p5-Any-Moose>=0.10:devel/p5-Any-Moose \
+	p5-JSON-XS>=2.25:converters/p5-JSON-XS \
+	p5-Net-SSLeay>=1.35:security/p5-Net-SSLeay \
+	p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-APNs-Extended/Makefile b/net/p5-Net-APNs-Extended/Makefile
index fe1c5ae6d6e5..979407ab2fde 100644
--- a/net/p5-Net-APNs-Extended/Makefile
+++ b/net/p5-Net-APNs-Extended/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-JSON-XS>0:${PORTSDIR}/converters/p5-JSON-XS \
-	p5-Net-SSLeay>0:${PORTSDIR}/security/p5-Net-SSLeay
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-JSON-XS>0:converters/p5-JSON-XS \
+	p5-Net-SSLeay>0:security/p5-Net-SSLeay
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-ARP/Makefile b/net/p5-Net-ARP/Makefile
index 45c85177fd57..c51601499f02 100644
--- a/net/p5-Net-ARP/Makefile
+++ b/net/p5-Net-ARP/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for creating ARP packets
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap
+BUILD_DEPENDS=	p5-Net-Pcap>=0:net/p5-Net-Pcap
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/net/p5-Net-Address-Ethernet/Makefile b/net/p5-Net-Address-Ethernet/Makefile
index 22ef64028876..5cc16b2a5b8a 100644
--- a/net/p5-Net-Address-Ethernet/Makefile
+++ b/net/p5-Net-Address-Ethernet/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Find hardware ethernet address
 
-BUILD_DEPENDS=	p5-Env-Path>=0:${PORTSDIR}/devel/p5-Env-Path \
-		p5-Net-Ifconfig-Wrapper>=0:${PORTSDIR}/net/p5-Net-Ifconfig-Wrapper \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common
+BUILD_DEPENDS=	p5-Env-Path>=0:devel/p5-Env-Path \
+		p5-Net-Ifconfig-Wrapper>=0:net/p5-Net-Ifconfig-Wrapper \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Address-IPv4-Local/Makefile b/net/p5-Net-Address-IPv4-Local/Makefile
index 7048f145ca03..ddc7cb8032f6 100644
--- a/net/p5-Net-Address-IPv4-Local/Makefile
+++ b/net/p5-Net-Address-IPv4-Local/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Class for discovering the local system's IP address
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
+BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Amazon-AWSSign/Makefile b/net/p5-Net-Amazon-AWSSign/Makefile
index c6e17605f07f..ca67eb16bc11 100644
--- a/net/p5-Net-Amazon-AWSSign/Makefile
+++ b/net/p5-Net-Amazon-AWSSign/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to create signatures for AWS requests
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Amazon-EC2/Makefile b/net/p5-Net-Amazon-EC2/Makefile
index 8987aba8508f..15a1aac65eb1 100644
--- a/net/p5-Net-Amazon-EC2/Makefile
+++ b/net/p5-Net-Amazon-EC2/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl interface to the Amazon Elastic Compute Cloud
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Moose>=0.38:${PORTSDIR}/devel/p5-Moose \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-XML-Simple>=2.18:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Moose>=0.38:devel/p5-Moose \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-XML-Simple>=2.18:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Test-Exception>=0.31:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Amazon-MechanicalTurk/Makefile b/net/p5-Net-Amazon-MechanicalTurk/Makefile
index a2a32b03c6b3..9538784c5b7b 100644
--- a/net/p5-Net-Amazon-MechanicalTurk/Makefile
+++ b/net/p5-Net-Amazon-MechanicalTurk/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Perl interface to the Amazon Mechanical Turk
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Mozilla-CA>=0:${PORTSDIR}/www/p5-Mozilla-CA \
-		p5-Net-SSLeay>=1.33:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=6:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
+		p5-Net-SSLeay>=1.33:security/p5-Net-SSLeay \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=6:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/net/p5-Net-Amazon-S3/Makefile b/net/p5-Net-Amazon-S3/Makefile
index aa3d1221900d..8fbc2a72b5a2 100644
--- a/net/p5-Net-Amazon-S3/Makefile
+++ b/net/p5-Net-Amazon-S3/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Use the Amazon S3 - Simple Storage Service
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Data-Stream-Bulk>=0.06:${PORTSDIR}/devel/p5-Data-Stream-Bulk \
-		p5-DateTime-Format-HTTP>=0:${PORTSDIR}/devel/p5-DateTime-Format-HTTP \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-Digest-MD5-File>=0:${PORTSDIR}/security/p5-Digest-MD5-File \
-		p5-LWP-UserAgent-Determined>=0:${PORTSDIR}/www/p5-LWP-UserAgent-Determined \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-StrictConstructor>=0.16:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-MooseX-Types-DateTime-MoreCoercions>=0.07:${PORTSDIR}/devel/p5-MooseX-Types-DateTime-MoreCoercions \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-VM-EC2-Security-CredentialCache>=0:${PORTSDIR}/net/p5-VM-EC2-Security-CredentialCache \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-libwww>=6.03:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Data-Stream-Bulk>=0.06:devel/p5-Data-Stream-Bulk \
+		p5-DateTime-Format-HTTP>=0:devel/p5-DateTime-Format-HTTP \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-Digest-MD5-File>=0:security/p5-Digest-MD5-File \
+		p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-StrictConstructor>=0.16:devel/p5-MooseX-StrictConstructor \
+		p5-MooseX-Types-DateTime-MoreCoercions>=0.07:devel/p5-MooseX-Types-DateTime-MoreCoercions \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-URI>=0:net/p5-URI \
+		p5-VM-EC2-Security-CredentialCache>=0:net/p5-VM-EC2-Security-CredentialCache \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-libwww>=6.03:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Amazon-Signature-V3/Makefile b/net/p5-Net-Amazon-Signature-V3/Makefile
index a585eb990e32..44190775bcea 100644
--- a/net/p5-Net-Amazon-Signature-V3/Makefile
+++ b/net/p5-Net-Amazon-Signature-V3/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Perl extension to sign AWS requests V3
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	\
-	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
-	p5-HTTP-Date>0:${PORTSDIR}/www/p5-HTTP-Date \
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Types-Common>=0:${PORTSDIR}/devel/p5-MooseX-Types-Common \
-	p5-namespace-autoclean>0:${PORTSDIR}/devel/p5-namespace-autoclean
+	p5-Digest-HMAC>0:security/p5-Digest-HMAC \
+	p5-HTTP-Date>0:www/p5-HTTP-Date \
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-Types-Common>=0:devel/p5-MooseX-Types-Common \
+	p5-namespace-autoclean>0:devel/p5-namespace-autoclean
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Amazon-Signature-V4/Makefile b/net/p5-Net-Amazon-Signature-V4/Makefile
index 37934decb65f..328f75f0afa4 100644
--- a/net/p5-Net-Amazon-Signature-V4/Makefile
+++ b/net/p5-Net-Amazon-Signature-V4/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-DateTime-Format-Strptime>0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Net>0:${PORTSDIR}/net/p5-Net
+	p5-DateTime-Format-Strptime>0:devel/p5-DateTime-Format-Strptime \
+	p5-File-Slurp>0:devel/p5-File-Slurp \
+	p5-libwww>0:www/p5-libwww \
+	p5-Net>0:net/p5-Net
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Amazon-Signature/Makefile b/net/p5-Net-Amazon-Signature/Makefile
index ac22a2348dc9..c43243363ca3 100644
--- a/net/p5-Net-Amazon-Signature/Makefile
+++ b/net/p5-Net-Amazon-Signature/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to create Amazon AWS signatures
 
-TEST_DEPENDS=	p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
+TEST_DEPENDS=	p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-URI>=0:net/p5-URI \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Amazon-Thumbnail/Makefile b/net/p5-Net-Amazon-Thumbnail/Makefile
index ee12e3c8ea77..893e26baf3c5 100644
--- a/net/p5-Net-Amazon-Thumbnail/Makefile
+++ b/net/p5-Net-Amazon-Thumbnail/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Perl interface to Amazon Alexa Site Thumbnail web service
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.15:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/net/p5-Net-Amazon/Makefile b/net/p5-Net-Amazon/Makefile
index 3c6628bea941..9501961f9b9f 100644
--- a/net/p5-Net-Amazon/Makefile
+++ b/net/p5-Net-Amazon/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Framework for accessing amazon.com via SOAP and XML/HTTP
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		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-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Analysis/Makefile b/net/p5-Net-Analysis/Makefile
index 1d39c7f1495f..c82d4fb72ff3 100644
--- a/net/p5-Net-Analysis/Makefile
+++ b/net/p5-Net-Analysis/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Modules for analysing network traffic
 
-RUN_DEPENDS=	p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Net-Pcap>=0:net/p5-Net-Pcap \
+		p5-NetPacket>=0:net/p5-NetPacket \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Appliance-Phrasebook/Makefile b/net/p5-Net-Appliance-Phrasebook/Makefile
index b31b87e8756a..0a4413343f71 100644
--- a/net/p5-Net-Appliance-Phrasebook/Makefile
+++ b/net/p5-Net-Appliance-Phrasebook/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Network appliance command-line phrasebook
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Data-Phrasebook>=0:${PORTSDIR}/textproc/p5-Data-Phrasebook \
-		p5-Data-Phrasebook-Loader-YAML>=0:${PORTSDIR}/textproc/p5-Data-Phrasebook-Loader-YAML \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Data-Phrasebook>=0:textproc/p5-Data-Phrasebook \
+		p5-Data-Phrasebook-Loader-YAML>=0:textproc/p5-Data-Phrasebook-Loader-YAML \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Appliance-Session/Makefile b/net/p5-Net-Appliance-Session/Makefile
index 55da97ad54a5..e630faf11ab9 100644
--- a/net/p5-Net-Appliance-Session/Makefile
+++ b/net/p5-Net-Appliance-Session/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Run command-line sessions to network appliances
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Prompt-Tiny>=0:${PORTSDIR}/devel/p5-IO-Prompt-Tiny \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-Types-MooseLike>=0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-		p5-Net-CLI-Interact>=2.122.730:${PORTSDIR}/net/p5-Net-CLI-Interact \
-		p5-Term-ReadPassword>=0:${PORTSDIR}/devel/p5-Term-ReadPassword \
-		p5-Text-Glob>=0:${PORTSDIR}/textproc/p5-Text-Glob \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-IO-Prompt-Tiny>=0:devel/p5-IO-Prompt-Tiny \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
+		p5-Net-CLI-Interact>=2.122.730:net/p5-Net-CLI-Interact \
+		p5-Term-ReadPassword>=0:devel/p5-Term-ReadPassword \
+		p5-Text-Glob>=0:textproc/p5-Text-Glob \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Blogger/Makefile b/net/p5-Net-Blogger/Makefile
index 21fc9c7103c3..a3cec61f7439 100644
--- a/net/p5-Net-Blogger/Makefile
+++ b/net/p5-Net-Blogger/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OOP-ish interface for accessing a weblog via the XML-RPC API
 
-BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-SOAP-Lite>0.55:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww \
+		p5-SOAP-Lite>0.55:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+TEST_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/net/p5-Net-CIDR-MobileJP/Makefile b/net/p5-Net-CIDR-MobileJP/Makefile
index f7e20526b56f..f15b545eeab9 100644
--- a/net/p5-Net-CIDR-MobileJP/Makefile
+++ b/net/p5-Net-CIDR-MobileJP/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for mobile IP address in Japan
 
 RUN_DEPENDS=	\
-	p5-File-ShareDir>=1.02:${PORTSDIR}/devel/p5-File-ShareDir \
-	p5-Net-CIDR-Lite>=0.21:${PORTSDIR}/net/p5-Net-CIDR-Lite \
-	ja-p5-WWW-MobileCarrierJP>=0.55:${PORTSDIR}/japanese/p5-WWW-MobileCarrierJP \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+	p5-File-ShareDir>=1.02:devel/p5-File-ShareDir \
+	p5-Net-CIDR-Lite>=0.21:net/p5-Net-CIDR-Lite \
+	ja-p5-WWW-MobileCarrierJP>=0.55:japanese/p5-WWW-MobileCarrierJP \
+	p5-YAML>0:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/net/p5-Net-CLI-Interact/Makefile b/net/p5-Net-CLI-Interact/Makefile
index 8166cfec0c35..6767681f3d44 100644
--- a/net/p5-Net-CLI-Interact/Makefile
+++ b/net/p5-Net-CLI-Interact/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Toolkit for CLI Automation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Class-Mix>=0:${PORTSDIR}/devel/p5-Class-Mix \
-		p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Log-Dispatch-Config>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Config \
-		p5-Log-Dispatch-Configurator-Any>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Configurator-Any \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-Types-MooseLike>=0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-		p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Class-Mix>=0:devel/p5-Class-Mix \
+		p5-IO-Tty>=0:devel/p5-IO-Tty \
+		p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config \
+		p5-Log-Dispatch-Configurator-Any>=0:devel/p5-Log-Dispatch-Configurator-Any \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
+		p5-Net-Telnet>=0:net/p5-Net-Telnet \
+		p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-CSTA/Makefile b/net/p5-Net-CSTA/Makefile
index 7a8e5f48f25f..f75ba55a946b 100644
--- a/net/p5-Net-CSTA/Makefile
+++ b/net/p5-Net-CSTA/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for ECMA CSTA
 
-RUN_DEPENDS=	p5-Convert-ASN1>=0:${PORTSDIR}/converters/p5-Convert-ASN1 \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-Convert-ASN1>=0:converters/p5-Convert-ASN1 \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-CascadeCopy/Makefile b/net/p5-Net-CascadeCopy/Makefile
index ace270592e93..d82c0a855ba2 100644
--- a/net/p5-Net-CascadeCopy/Makefile
+++ b/net/p5-Net-CascadeCopy/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Rapidly propagate files to many servers in multiple locations
 
-BUILD_DEPENDS=	p5-Class-Std-Utils>=v0.0.0:${PORTSDIR}/devel/p5-Class-Std-Utils \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Proc-Queue>=0:${PORTSDIR}/devel/p5-Proc-Queue
+BUILD_DEPENDS=	p5-Class-Std-Utils>=v0.0.0:devel/p5-Class-Std-Utils \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Proc-Queue>=0:devel/p5-Proc-Queue
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Cassandra-Easy/Makefile b/net/p5-Net-Cassandra-Easy/Makefile
index 41b366042ca7..fb7b4a21899c 100644
--- a/net/p5-Net-Cassandra-Easy/Makefile
+++ b/net/p5-Net-Cassandra-Easy/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perlish interface to the Cassandra database
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-Modern-Perl>=0:${PORTSDIR}/lang/p5-Modern-Perl \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+		p5-Modern-Perl>=0:lang/p5-Modern-Perl \
+		p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/net/p5-Net-Cassandra/Makefile b/net/p5-Net-Cassandra/Makefile
index 9147d223d220..242943f5466d 100644
--- a/net/p5-Net-Cassandra/Makefile
+++ b/net/p5-Net-Cassandra/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Interface to Cassandra
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-DAV-Server/Makefile b/net/p5-Net-DAV-Server/Makefile
index 360eb7d7ddfb..ab570af8237b 100644
--- a/net/p5-Net-DAV-Server/Makefile
+++ b/net/p5-Net-DAV-Server/Makefile
@@ -12,14 +12,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provide a DAV Server
 
-BUILD_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-File-Find-Rule-Filesys-Virtual>=0:${PORTSDIR}/devel/p5-File-Find-Rule-Filesys-Virtual \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=1.62000:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-File-Find-Rule-Filesys-Virtual>=0:devel/p5-File-Find-Rule-Filesys-Virtual \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=1.62000:textproc/p5-XML-LibXML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-DHCP/Makefile b/net/p5-Net-DHCP/Makefile
index 05ca4058e72a..e348d4ac0c0d 100644
--- a/net/p5-Net-DHCP/Makefile
+++ b/net/p5-Net-DHCP/Makefile
@@ -13,7 +13,7 @@ COMMENT=	DHCP set of classes designed to handle basic DHCP handling
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/net/p5-Net-DHCPClient/Makefile b/net/p5-Net-DHCPClient/Makefile
index af0dbd6773b7..034548c7fd77 100644
--- a/net/p5-Net-DHCPClient/Makefile
+++ b/net/p5-Net-DHCPClient/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Perl implementation of a DHCP client API
 
-RUN_DEPENDS+=	p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP
+RUN_DEPENDS+=	p5-Net-RawIP>=0:net/p5-Net-RawIP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Delicious/Makefile b/net/p5-Net-Delicious/Makefile
index f7d4a22cd8f2..97dc50c5c931 100644
--- a/net/p5-Net-Delicious/Makefile
+++ b/net/p5-Net-Delicious/Makefile
@@ -12,15 +12,15 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OOP for managing posts on del.icio.us
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Config-Simple>=2:${PORTSDIR}/devel/p5-Config-Simple \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-IO-stringy>=2.1:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Log-Dispatch>=2:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-TimeDate>=2.27:${PORTSDIR}/devel/p5-TimeDate \
-		p5-XML-Simple>=2:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-YAML>=0.35:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Config-Simple>=2:devel/p5-Config-Simple \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-IO-stringy>=2.1:devel/p5-IO-stringy \
+		p5-Log-Dispatch>=2:devel/p5-Log-Dispatch \
+		p5-URI>=0:net/p5-URI \
+		p5-TimeDate>=2.27:devel/p5-TimeDate \
+		p5-XML-Simple>=2:textproc/p5-XML-Simple \
+		p5-YAML>=0.35:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Dict/Makefile b/net/p5-Net-Dict/Makefile
index fb84d3cec3e9..493323ef0fd5 100644
--- a/net/p5-Net-Dict/Makefile
+++ b/net/p5-Net-Dict/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple client API for the DICT protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Differences>=0.620:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-RequiresInternet>=0.05:${PORTSDIR}/devel/p5-Test-RequiresInternet
+TEST_DEPENDS=	p5-Test-Differences>=0.620:devel/p5-Test-Differences \
+		p5-Test-RequiresInternet>=0.05:devel/p5-Test-RequiresInternet
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/net/p5-Net-Dropbox-API/Makefile b/net/p5-Net-Dropbox-API/Makefile
index 435905347a4e..6743931d1d30 100644
--- a/net/p5-Net-Dropbox-API/Makefile
+++ b/net/p5-Net-Dropbox-API/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dropbox API interface
 
-BUILD_DEPENDS=	p5-Data-Random>=0:${PORTSDIR}/devel/p5-Data-Random \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-Net-OAuth>=0:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Data-Random>=0:devel/p5-Data-Random \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-Net-OAuth>=0:net/p5-Net-OAuth \
+		p5-common-sense>=0:devel/p5-common-sense \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-EPP-Proxy/Makefile b/net/p5-Net-EPP-Proxy/Makefile
index 9442e26295c4..3d754d1a5926 100644
--- a/net/p5-Net-EPP-Proxy/Makefile
+++ b/net/p5-Net-EPP-Proxy/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Proxy server for the EPP protocol
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-IO-Multiplex>=0:${PORTSDIR}/devel/p5-IO-Multiplex \
-		p5-Net-EPP>=0.03:${PORTSDIR}/net/p5-Net-EPP \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-IO-Multiplex>=0:devel/p5-IO-Multiplex \
+		p5-Net-EPP>=0.03:net/p5-Net-EPP \
+		p5-Net-Server>=0:net/p5-Net-Server \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-EPP/Makefile b/net/p5-Net-EPP/Makefile
index eedd59b4b622..939d521d4003 100644
--- a/net/p5-Net-EPP/Makefile
+++ b/net/p5-Net-EPP/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Client library for the TCP transport for EPP
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-Digest-SHA1>=2.12:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-Digest-SHA1>=2.12:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-FS-Flickr/Makefile b/net/p5-Net-FS-Flickr/Makefile
index 619190cfed29..403e996a86f1 100644
--- a/net/p5-Net-FS-Flickr/Makefile
+++ b/net/p5-Net-FS-Flickr/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Perl interface for store and retrieve files on Flickr
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Acme-Steganography-Image-Png>=0:${PORTSDIR}/graphics/p5-Acme-Steganography-Image-Png \
-		p5-Flickr-Upload>=0:${PORTSDIR}/www/p5-Flickr-Upload
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Acme-Steganography-Image-Png>=0:graphics/p5-Acme-Steganography-Image-Png \
+		p5-Flickr-Upload>=0:www/p5-Flickr-Upload
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-FS-Gmail/Makefile b/net/p5-Net-FS-Gmail/Makefile
index 1bad6eb4a5cc..389a062472d3 100644
--- a/net/p5-Net-FS-Gmail/Makefile
+++ b/net/p5-Net-FS-Gmail/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Perl interface for store and retrieve files on Gmail
 
-BUILD_DEPENDS=	p5-Mail-Webmail-Gmail>=0:${PORTSDIR}/mail/p5-Mail-Webmail-Gmail \
-		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Mail-Webmail-Gmail>=0:mail/p5-Mail-Webmail-Gmail \
+		p5-Time-modules>=0:devel/p5-Time-modules \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Frame-Dump/Makefile b/net/p5-Net-Frame-Dump/Makefile
index 59bf2f237662..8d835058d27a 100644
--- a/net/p5-Net-Frame-Dump/Makefile
+++ b/net/p5-Net-Frame-Dump/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Tcpdump like perl implementation
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
-		p5-Net-Frame>=0:${PORTSDIR}/net/p5-Net-Frame \
-		p5-Net-Pcap>=0.12:${PORTSDIR}/net/p5-Net-Pcap
+BUILD_DEPENDS=	p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+		p5-Net-Frame>=0:net/p5-Net-Frame \
+		p5-Net-Pcap>=0.12:net/p5-Net-Pcap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Frame-Layer-ICMPv6/Makefile b/net/p5-Net-Frame-Layer-ICMPv6/Makefile
index e61384686ab9..02c74988d01d 100644
--- a/net/p5-Net-Frame-Layer-ICMPv6/Makefile
+++ b/net/p5-Net-Frame-Layer-ICMPv6/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	spry@anarchy.in.the.ph
 COMMENT=	Perl encoding/decoding implementation of the ICMPv6 layer
 
-BUILD_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Net-Frame>=0:${PORTSDIR}/net/p5-Net-Frame \
-		p5-Net-Pcap>=0.12:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor
+BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-Net-Frame>=0:net/p5-Net-Frame \
+		p5-Net-Pcap>=0.12:net/p5-Net-Pcap \
+		p5-Class-Gomor>=1.00:devel/p5-Class-Gomor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Frame-Layer-IPv6/Makefile b/net/p5-Net-Frame-Layer-IPv6/Makefile
index 2ae4437505a8..525c264498ab 100644
--- a/net/p5-Net-Frame-Layer-IPv6/Makefile
+++ b/net/p5-Net-Frame-Layer-IPv6/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	spry@anarchy.in.the.ph
 COMMENT=	Perl encoding/decoding implementation of the IPv6 layer
 
-BUILD_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Net-Frame>=0:${PORTSDIR}/net/p5-Net-Frame \
-		p5-Net-Pcap>=0.12:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor
+BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-Net-Frame>=0:net/p5-Net-Frame \
+		p5-Net-Pcap>=0.12:net/p5-Net-Pcap \
+		p5-Class-Gomor>=1.00:devel/p5-Class-Gomor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Frame/Makefile b/net/p5-Net-Frame/Makefile
index f283f7ec77ee..17baca86bd99 100644
--- a/net/p5-Net-Frame/Makefile
+++ b/net/p5-Net-Frame/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Base framework for frame crafting
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
-		p5-Net-IPv6Addr>=0:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr \
-		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+		p5-Net-IPv6Addr>=0:net-mgmt/p5-Net-IPv6Addr \
+		p5-Socket6>=0:net/p5-Socket6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-GitHub/Makefile b/net/p5-Net-GitHub/Makefile
index a5448a93f3f2..dc23f2b06917 100644
--- a/net/p5-Net-GitHub/Makefile
+++ b/net/p5-Net-GitHub/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl interface to github.com
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-LRU>=0:${PORTSDIR}/devel/p5-Cache-LRU \
-		p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Cache-LRU>=0:devel/p5-Cache-LRU \
+		p5-HTTP-Message>0:www/p5-HTTP-Message \
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Type-Tiny>=0:devel/p5-Type-Tiny \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-Google-Analytics/Makefile b/net/p5-Net-Google-Analytics/Makefile
index 20f71a9d9846..3c49e39ab0d2 100644
--- a/net/p5-Net-Google-Analytics/Makefile
+++ b/net/p5-Net-Google-Analytics/Makefile
@@ -13,10 +13,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-XSAccessor>=1.05:${PORTSDIR}/devel/p5-Class-XSAccessor \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Class-XSAccessor>=1.05:devel/p5-Class-XSAccessor \
+	p5-JSON>0:converters/p5-JSON \
+	p5-libwww>0:www/p5-libwww \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Google-AuthSub/Makefile b/net/p5-Net-Google-AuthSub/Makefile
index 6efb1da53037..262bee19dc7a 100644
--- a/net/p5-Net-Google-AuthSub/Makefile
+++ b/net/p5-Net-Google-AuthSub/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Interact with sites that implement Google style AuthSub
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Google-Calendar/Makefile b/net/p5-Net-Google-Calendar/Makefile
index 3be20fd40e0b..00337b2e7f1a 100644
--- a/net/p5-Net-Google-Calendar/Makefile
+++ b/net/p5-Net-Google-Calendar/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mhsin@mhsin.org
 COMMENT=	Programmatic access to Google's Calendar API
 
-BUILD_DEPENDS=	p5-XML-Atom>=0.37:${PORTSDIR}/textproc/p5-XML-Atom \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Net-Google-AuthSub>=0:${PORTSDIR}/net/p5-Net-Google-AuthSub
+BUILD_DEPENDS=	p5-XML-Atom>=0.37:textproc/p5-XML-Atom \
+		p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-Net-Google-AuthSub>=0:net/p5-Net-Google-AuthSub
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Google-Code/Makefile b/net/p5-Net-Google-Code/Makefile
index 212392b2d39f..f02761bfe3a7 100644
--- a/net/p5-Net-Google-Code/Makefile
+++ b/net/p5-Net-Google-Code/Makefile
@@ -11,23 +11,23 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Simple client library for Google code
 
-BUILD_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-Test-Mock-LWP>=0:${PORTSDIR}/devel/p5-Test-Mock-LWP \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Mock-LWP>=0:${PORTSDIR}/devel/p5-Test-Mock-LWP \
-		p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-XML-FeedPP>=0:${PORTSDIR}/textproc/p5-XML-FeedPP
+BUILD_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Test-MockModule>=0:devel/p5-Test-MockModule \
+		p5-Test-Mock-LWP>=0:devel/p5-Test-Mock-LWP \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple \
+		p5-Test-Mock-LWP>=0:devel/p5-Test-Mock-LWP \
+		p5-Test-MockModule>=0:devel/p5-Test-MockModule \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-File-MMagic>=0:devel/p5-File-MMagic \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-MIME-Types>=0:mail/p5-MIME-Types \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-XML-FeedPP>=0:textproc/p5-XML-FeedPP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Google-DataAPI/Makefile b/net/p5-Net-Google-DataAPI/Makefile
index f500a800ba0d..045bbfc9234e 100644
--- a/net/p5-Net-Google-DataAPI/Makefile
+++ b/net/p5-Net-Google-DataAPI/Makefile
@@ -12,24 +12,24 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	gunter@six-two.net
 COMMENT=	Base implementations for modules to negotiate with Google Data APIs
 
-BUILD_DEPENDS=	p5-Any-Moose>=0.04:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Lingua-EN-Inflect-Number>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
-		p5-Mouse>=0.51:${PORTSDIR}/devel/p5-Mouse \
-		p5-Net-Google-AuthSub>=0.5:${PORTSDIR}/net/p5-Net-Google-AuthSub \
-		p5-Net-OAuth>=0:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-Net-OAuth2>=0.07:${PORTSDIR}/net/p5-Net-OAuth2 \
-		p5-Text-Glob>=0:${PORTSDIR}/textproc/p5-Text-Glob \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Any-Moose>=0.04:devel/p5-Any-Moose \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number \
+		p5-Mouse>=0.51:devel/p5-Mouse \
+		p5-Net-Google-AuthSub>=0.5:net/p5-Net-Google-AuthSub \
+		p5-Net-OAuth>=0:net/p5-Net-OAuth \
+		p5-Net-OAuth2>=0.07:net/p5-Net-OAuth2 \
+		p5-Text-Glob>=0:textproc/p5-Text-Glob \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Atom>=0:textproc/p5-XML-Atom \
+		p5-libwww>=0:www/p5-libwww \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-MockModule>=0:devel/p5-Test-MockModule \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Google-PicasaWeb/Makefile b/net/p5-Net-Google-PicasaWeb/Makefile
index 8de15856ef58..7d4850d79fdf 100644
--- a/net/p5-Net-Google-PicasaWeb/Makefile
+++ b/net/p5-Net-Google-PicasaWeb/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Use Google Picasa Web API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Prompt>=0:${PORTSDIR}/devel/p5-IO-Prompt \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Matcher>=0:${PORTSDIR}/devel/p5-MooseX-Role-Matcher \
-		p5-Net-Google-AuthSub>=0:${PORTSDIR}/net/p5-Net-Google-AuthSub \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Twig>=3.30:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Role-Matcher>=0:devel/p5-MooseX-Role-Matcher \
+		p5-Net-Google-AuthSub>=0:net/p5-Net-Google-AuthSub \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Twig>=3.30:textproc/p5-XML-Twig \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Able>=0.09:${PORTSDIR}/devel/p5-Test-Able \
-		p5-Test-Able-Runner>=1.000:${PORTSDIR}/devel/p5-Test-Able-Runner \
-		p5-Test-Mock-LWP>=0:${PORTSDIR}/devel/p5-Test-Mock-LWP
+TEST_DEPENDS=	p5-Test-Able>=0.09:devel/p5-Test-Able \
+		p5-Test-Able-Runner>=1.000:devel/p5-Test-Able-Runner \
+		p5-Test-Mock-LWP>=0:devel/p5-Test-Mock-LWP
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/net/p5-Net-Google-SafeBrowsing2/Makefile b/net/p5-Net-Google-SafeBrowsing2/Makefile
index 9bb0e4b7bc02..fde870ae397c 100644
--- a/net/p5-Net-Google-SafeBrowsing2/Makefile
+++ b/net/p5-Net-Google-SafeBrowsing2/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ale@biancalanas.net
 COMMENT=	Perl extension for the Google Safe Browsing v2 API
 
-BUILD_DEPENDS=	p5-libwww>=5:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1:${PORTSDIR}/net/p5-URI \
-		p5-Digest-SHA>=5:${PORTSDIR}/security/p5-Digest-SHA \
-		p5-Net-IPAddress>=1:${PORTSDIR}/net-mgmt/p5-Net-IPAddress \
-		p5-Text-Trim>=1:${PORTSDIR}/textproc/p5-Text-Trim \
-		p5-MIME-Base64>=3:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-MIME-Base64-URLSafe>=0.01:${PORTSDIR}/converters/p5-MIME-Base64-URLSafe \
-		p5-Digest-HMAC>=1:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-String-HexConvert>=0.01:${PORTSDIR}/textproc/p5-String-HexConvert \
-		p5-File-Slurp>9:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-libwww>=5:www/p5-libwww \
+		p5-URI>=1:net/p5-URI \
+		p5-Digest-SHA>=5:security/p5-Digest-SHA \
+		p5-Net-IPAddress>=1:net-mgmt/p5-Net-IPAddress \
+		p5-Text-Trim>=1:textproc/p5-Text-Trim \
+		p5-MIME-Base64>=3:converters/p5-MIME-Base64 \
+		p5-MIME-Base64-URLSafe>=0.01:converters/p5-MIME-Base64-URLSafe \
+		p5-Digest-HMAC>=1:security/p5-Digest-HMAC \
+		p5-String-HexConvert>=0.01:textproc/p5-String-HexConvert \
+		p5-File-Slurp>9:devel/p5-File-Slurp
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -38,18 +38,18 @@ USE_PERL5=	configure
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSQLite}
-BUILD_DEPENDS+=	p5-DBD-SQLite>=1:${PORTSDIR}/databases/p5-DBD-SQLite
-RUN_DEPENDS+=	p5-DBD-SQLite>=1:${PORTSDIR}/databases/p5-DBD-SQLite
+BUILD_DEPENDS+=	p5-DBD-SQLite>=1:databases/p5-DBD-SQLite
+RUN_DEPENDS+=	p5-DBD-SQLite>=1:databases/p5-DBD-SQLite
 .endif
 
 .if ${PORT_OPTIONS:MMySQL}
-BUILD_DEPENDS+=	p5-DBD-mysql>=4:${PORTSDIR}/databases/p5-DBD-mysql
-RUN_DEPENDS+=	p5-DBD-mysql>=4:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS+=	p5-DBD-mysql>=4:databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=4:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPostgres}
-BUILD_DEPENDS+=	p5-DBD-Pg>=2:${PORTSDIR}/databases/p5-DBD-Pg
-RUN_DEPENDS+=	p5-DBD-Pg>=2:${PORTSDIR}/databases/p5-DBD-Pg
+BUILD_DEPENDS+=	p5-DBD-Pg>=2:databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=2:databases/p5-DBD-Pg
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Google-Spreadsheets/Makefile b/net/p5-Net-Google-Spreadsheets/Makefile
index 49b9faef55f0..d9713de49bca 100644
--- a/net/p5-Net-Google-Spreadsheets/Makefile
+++ b/net/p5-Net-Google-Spreadsheets/Makefile
@@ -12,16 +12,16 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	gunter@six-two.net
 COMMENT=	Perl module for using Google Spreadsheets API
 
-BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Mouse>=0.51:${PORTSDIR}/devel/p5-Mouse \
-		p5-Net-Google-AuthSub>=0:${PORTSDIR}/net/p5-Net-Google-AuthSub \
-		p5-Net-Google-DataAPI>=0.27:${PORTSDIR}/net/p5-Net-Google-DataAPI \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Mouse>=0.51:devel/p5-Mouse \
+		p5-Net-Google-AuthSub>=0:net/p5-Net-Google-AuthSub \
+		p5-Net-Google-DataAPI>=0.27:net/p5-Net-Google-DataAPI \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Atom>=0:textproc/p5-XML-Atom
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-MockModule>=0:devel/p5-Test-MockModule \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index 9e5c99d9088c..c6200470bb8c 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple OOP-ish interface to the Google SOAP API
 
-BUILD_DEPENDS=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile b/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile
index 926e78d28c2a..2fa9195eaa38 100644
--- a/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile
+++ b/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Spore Middleware to add header on each request
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Net-HTTP-Spore>=0:${PORTSDIR}/net/p5-Net-HTTP-Spore
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Net-HTTP-Spore>=0:net/p5-Net-HTTP-Spore
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-HTTP-Spore/Makefile b/net/p5-Net-HTTP-Spore/Makefile
index 9ccc7405d426..ace4e8971dca 100644
--- a/net/p5-Net-HTTP-Spore/Makefile
+++ b/net/p5-Net-HTTP-Spore/Makefile
@@ -14,20 +14,20 @@ COMMENT=	SPORE client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-URI>=0:${PORTSDIR}/devel/p5-MooseX-Types-URI \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-MooseX-Types-URI>=0:devel/p5-MooseX-Types-URI \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-libwww>=0:www/p5-libwww
 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
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/net/p5-Net-HTTP/Makefile b/net/p5-Net-HTTP/Makefile
index dbc86c60743a..0c4f81b9d9d3 100644
--- a/net/p5-Net-HTTP/Makefile
+++ b/net/p5-Net-HTTP/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Low-level HTTP client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.38:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.38:security/p5-IO-Socket-SSL \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-HTTPS-Any/Makefile b/net/p5-Net-HTTPS-Any/Makefile
index d9b05388ce5a..8f428b2af1b4 100644
--- a/net/p5-Net-HTTPS-Any/Makefile
+++ b/net/p5-Net-HTTPS-Any/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Simple HTTPS class using whichever underlying SSL module is available
 
-BUILD_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Net-SSLeay>=1.30:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-URI>=0:net/p5-URI \
+		p5-Net-SSLeay>=1.30:security/p5-Net-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-HTTPS-NB/Makefile b/net/p5-Net-HTTPS-NB/Makefile
index 279d95aa6eb9..295c55ec3a08 100644
--- a/net/p5-Net-HTTPS-NB/Makefile
+++ b/net/p5-Net-HTTPS-NB/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Non-blocking HTTPS client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=0.98:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-HTTP>=0:${PORTSDIR}/net/p5-Net-HTTP
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=0.98:security/p5-IO-Socket-SSL \
+		p5-Net-HTTP>=0:net/p5-Net-HTTP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-Hiveminder/Makefile b/net/p5-Net-Hiveminder/Makefile
index c996a11d012a..973ffc821079 100644
--- a/net/p5-Net-Hiveminder/Makefile
+++ b/net/p5-Net-Hiveminder/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to hiveminder.com
 
-RUN_DEPENDS=	p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Term-Encoding>=0:${PORTSDIR}/devel/p5-Term-Encoding \
-		p5-Net-Jifty>=0:${PORTSDIR}/net/p5-Net-Jifty \
-		p5-Number-RecordLocator>=0:${PORTSDIR}/converters/p5-Number-RecordLocator
+RUN_DEPENDS=	p5-Email-Simple>=0:mail/p5-Email-Simple \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Term-Encoding>=0:devel/p5-Term-Encoding \
+		p5-Net-Jifty>=0:net/p5-Net-Jifty \
+		p5-Number-RecordLocator>=0:converters/p5-Number-RecordLocator
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-INET6Glue/Makefile b/net/p5-Net-INET6Glue/Makefile
index 728f9e189e33..efb12c1526d8 100644
--- a/net/p5-Net-INET6Glue/Makefile
+++ b/net/p5-Net-INET6Glue/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Make common modules IPv6 ready by hotpatching
 
-BUILD_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
+BUILD_DEPENDS=	p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-IP-RangeCompare/Makefile b/net/p5-Net-IP-RangeCompare/Makefile
index 9d230329444a..fac32efec9e3 100644
--- a/net/p5-Net-IP-RangeCompare/Makefile
+++ b/net/p5-Net-IP-RangeCompare/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl extension for IP Range Comparisons
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-IPV4-Range-Parse>=0.05:${PORTSDIR}/net/p5-Data-IPV4-Range-Parse \
-		p5-Data-Range-Compare>=1.030:${PORTSDIR}/devel/p5-Data-Range-Compare
+BUILD_DEPENDS=	p5-Data-IPV4-Range-Parse>=0.05:net/p5-Data-IPV4-Range-Parse \
+		p5-Data-Range-Compare>=1.030:devel/p5-Data-Range-Compare
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-IPTrie/Makefile b/net/p5-Net-IPTrie/Makefile
index 2621719fd98b..394b913a37d3 100644
--- a/net/p5-Net-IPTrie/Makefile
+++ b/net/p5-Net-IPTrie/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Module for building IPv4 and IPv6 address space hierarchies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-NetAddr-IP>=4.00.7:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Jaiku/Makefile b/net/p5-Net-Jaiku/Makefile
index 93887c462905..ba7e008c0d21 100644
--- a/net/p5-Net-Jaiku/Makefile
+++ b/net/p5-Net-Jaiku/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to jaiku.com's API
 
-RUN_DEPENDS=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
-		p5-JSON-Any>0:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
-BUILD_DEPENDS=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
-		p5-JSON-Any>0:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
+RUN_DEPENDS=	p5-libwww>=5.805:www/p5-libwww \
+		p5-JSON-Any>0:converters/p5-JSON-Any \
+		p5-Params-Validate>0:devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-libwww>=5.805:www/p5-libwww \
+		p5-JSON-Any>0:converters/p5-JSON-Any \
+		p5-Params-Validate>0:devel/p5-Params-Validate
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/net/p5-Net-Jifty/Makefile b/net/p5-Net-Jifty/Makefile
index 38815dd9b6b0..799dd7641373 100644
--- a/net/p5-Net-Jifty/Makefile
+++ b/net/p5-Net-Jifty/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Perl interface to online Jifty applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0.04:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Any-Moose>=0.04:devel/p5-Any-Moose \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Email-Address>=0:mail/p5-Email-Address \
+		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-URI>=0:net/p5-URI \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-LDAP-AutoServer/Makefile b/net/p5-Net-LDAP-AutoServer/Makefile
index d071cce0e3ad..d64e7536b57b 100644
--- a/net/p5-Net-LDAP-AutoServer/Makefile
+++ b/net/p5-Net-LDAP-AutoServer/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Automatically make some default decisions some LDAP server information
 
-RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-DNS-RR-SRV-Helper>=0:${PORTSDIR}/dns/p5-Net-DNS-RR-SRV-Helper
+RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-DNS-RR-SRV-Helper>=0:dns/p5-Net-DNS-RR-SRV-Helper
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-LDAP-Express/Makefile b/net/p5-Net-LDAP-Express/Makefile
index 8f80e7993670..988d1c9abc1d 100644
--- a/net/p5-Net-LDAP-Express/Makefile
+++ b/net/p5-Net-LDAP-Express/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Module to simplify connecting up to a LDAP server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-perl-ldap>=0.23:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	p5-perl-ldap>=0.23:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-LDAP-LDAPhash/Makefile b/net/p5-Net-LDAP-LDAPhash/Makefile
index 099e5d8c4831..4c253edb19e7 100644
--- a/net/p5-Net-LDAP-LDAPhash/Makefile
+++ b/net/p5-Net-LDAP-LDAPhash/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Make a hash out of the return from a search using Net::LDAP::Search
 
-BUILD_DEPENDS=	p5-perl-ldap>=0.39:${PORTSDIR}/net/p5-perl-ldap
-RUN_DEPENDS=	p5-perl-ldap>=0.39:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	p5-perl-ldap>=0.39:net/p5-perl-ldap
+RUN_DEPENDS=	p5-perl-ldap>=0.39:net/p5-perl-ldap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-LDAP-Makepath/Makefile b/net/p5-Net-LDAP-Makepath/Makefile
index e6e4ef3e32ba..36092ab6b3d1 100644
--- a/net/p5-Net-LDAP-Makepath/Makefile
+++ b/net/p5-Net-LDAP-Makepath/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Provides a method for creating paths in LDAP simply
 
-RUN_DEPENDS=	 p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	 p5-perl-ldap>=0:net/p5-perl-ldap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-LDAP-Server-Test/Makefile b/net/p5-Net-LDAP-Server-Test/Makefile
index 1019af28a432..5c8611e32ff5 100644
--- a/net/p5-Net-LDAP-Server-Test/Makefile
+++ b/net/p5-Net-LDAP-Server-Test/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl module to test Net::LDAP code
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Net-LDAP-Server>=0.3:${PORTSDIR}/net/p5-Net-LDAP-Server \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Net-LDAP-Server>=0.3:net/p5-Net-LDAP-Server \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-LDAP-Server/Makefile b/net/p5-Net-LDAP-Server/Makefile
index fcbc128e15cb..c88fdae45d7d 100644
--- a/net/p5-Net-LDAP-Server/Makefile
+++ b/net/p5-Net-LDAP-Server/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Perl module for LDAP server side protocol handling
 
-BUILD_DEPENDS=	p5-Convert-ASN1>=0.22:${PORTSDIR}/converters/p5-Convert-ASN1 \
-		p5-perl-ldap>=0.39:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	p5-Convert-ASN1>=0.22:converters/p5-Convert-ASN1 \
+		p5-perl-ldap>=0.39:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-LDAP-posixAccount/Makefile b/net/p5-Net-LDAP-posixAccount/Makefile
index f85ecea33b9c..9d762b7f53f5 100644
--- a/net/p5-Net-LDAP-posixAccount/Makefile
+++ b/net/p5-Net-LDAP-posixAccount/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Creates new Net::LDAP::Entry objects for a posixAccount entry
 
-RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Sys-User-UIDhelper>=0:${PORTSDIR}/sysutils/p5-Sys-User-UIDhelper \
-		p5-Sys-Group-GIDhelper>=0:${PORTSDIR}/sysutils/p5-Sys-Group-GIDhelper
+RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Sys-User-UIDhelper>=0:sysutils/p5-Sys-User-UIDhelper \
+		p5-Sys-Group-GIDhelper>=0:sysutils/p5-Sys-Group-GIDhelper
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-LDAP-posixGroup/Makefile b/net/p5-Net-LDAP-posixGroup/Makefile
index 982d0f5d0abf..497758a22268 100644
--- a/net/p5-Net-LDAP-posixGroup/Makefile
+++ b/net/p5-Net-LDAP-posixGroup/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Creates new Net::LDAP::Entry objects for a posixGroup entry
 
-RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Libdnet/Makefile b/net/p5-Net-Libdnet/Makefile
index 7ea451ecd33f..4c5d585a1f21 100644
--- a/net/p5-Net-Libdnet/Makefile
+++ b/net/p5-Net-Libdnet/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Libdnet interface
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	p5-Class-Gomor>=0:${PORTSDIR}/devel/p5-Class-Gomor
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
+BUILD_DEPENDS=	p5-Class-Gomor>=0:devel/p5-Class-Gomor
+LIB_DEPENDS=	libdnet.so:net/libdnet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFIGURE_ARGS=	INC='-I${LOCALBASE}/include'
diff --git a/net/p5-Net-LimeLight-Purge/Makefile b/net/p5-Net-LimeLight-Purge/Makefile
index a800a7e6a3d8..725432f0bed9 100644
--- a/net/p5-Net-LimeLight-Purge/Makefile
+++ b/net/p5-Net-LimeLight-Purge/Makefile
@@ -14,10 +14,10 @@ COMMENT=	LimeLight Purge Service API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime-Format-ISO8601>=0.06:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-Moose>=0.72:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-AttributeHelpers>=0.14:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-SOAP-Lite>=0.710.08:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-DateTime-Format-ISO8601>=0.06:devel/p5-DateTime-Format-ISO8601 \
+		p5-Moose>=0.72:devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>=0.14:devel/p5-MooseX-AttributeHelpers \
+		p5-SOAP-Lite>=0.710.08:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-MAC-Vendor/Makefile b/net/p5-Net-MAC-Vendor/Makefile
index 54052f193d1d..4da3f7dc3a52 100644
--- a/net/p5-Net-MAC-Vendor/Makefile
+++ b/net/p5-Net-MAC-Vendor/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Look up the vendor for a MAC
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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/net/p5-Net-MAC/Makefile b/net/p5-Net-MAC/Makefile
index 4c5c26e59b30..9732af7f5ded 100644
--- a/net/p5-Net-MAC/Makefile
+++ b/net/p5-Net-MAC/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl 5 module for representing and manipulating MAC addresses
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Mosso-CloudFiles/Makefile b/net/p5-Net-Mosso-CloudFiles/Makefile
index d00760669383..5034ac7a1f89 100644
--- a/net/p5-Net-Mosso-CloudFiles/Makefile
+++ b/net/p5-Net-Mosso-CloudFiles/Makefile
@@ -14,19 +14,19 @@ COMMENT=	Perl interface to the Mosso CloudFiles service
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-Data-Stream-Bulk>=0:${PORTSDIR}/devel/p5-Data-Stream-Bulk \
-		p5-DateTime-Format-HTTP>=0:${PORTSDIR}/devel/p5-DateTime-Format-HTTP \
-		p5-Digest-MD5-File>=0:${PORTSDIR}/security/p5-Digest-MD5-File \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-JSON-XS-VersionOneAndTwo>=0:${PORTSDIR}/converters/p5-JSON-XS-VersionOneAndTwo \
-		p5-LWP-ConnCache-MaxKeepAliveRequests>=0:${PORTSDIR}/www/p5-LWP-ConnCache-MaxKeepAliveRequests \
-		p5-LWP-UserAgent-Determined>=0:${PORTSDIR}/www/p5-LWP-UserAgent-Determined \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-Data-Stream-Bulk>=0:devel/p5-Data-Stream-Bulk \
+		p5-DateTime-Format-HTTP>=0:devel/p5-DateTime-Format-HTTP \
+		p5-Digest-MD5-File>=0:security/p5-Digest-MD5-File \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-JSON-XS-VersionOneAndTwo>=0:converters/p5-JSON-XS-VersionOneAndTwo \
+		p5-LWP-ConnCache-MaxKeepAliveRequests>=0:www/p5-LWP-ConnCache-MaxKeepAliveRequests \
+		p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-MovableType/Makefile b/net/p5-Net-MovableType/Makefile
index e00eeb730239..f472514b0854 100644
--- a/net/p5-Net-MovableType/Makefile
+++ b/net/p5-Net-MovableType/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lightweight MovableType client Perl module
 
-BUILD_DEPENDS=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-NBsocket/Makefile b/net/p5-Net-NBsocket/Makefile
index 2811bde41557..f4abbfb752b0 100644
--- a/net/p5-Net-NBsocket/Makefile
+++ b/net/p5-Net-NBsocket/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Non-Blocking Sockets
 
-BUILD_DEPENDS=	p5-NetAddr-IP>=4.049:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-NetAddr-IP>=4.049:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-NIS-Listgroup/Makefile b/net/p5-Net-NIS-Listgroup/Makefile
index 3a6b1fbedc6b..f439ad78f3ab 100644
--- a/net/p5-Net-NIS-Listgroup/Makefile
+++ b/net/p5-Net-NIS-Listgroup/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Lists hosts/users in a netgroup group
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Net-NIS>0:${PORTSDIR}/net/p5-Net-NIS
+RUN_DEPENDS=	p5-Net-NIS>0:net/p5-Net-NIS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Nessus-XMLRPC/Makefile b/net/p5-Net-Nessus-XMLRPC/Makefile
index 704ccd931532..ff98a9c821d4 100644
--- a/net/p5-Net-Nessus-XMLRPC/Makefile
+++ b/net/p5-Net-Nessus-XMLRPC/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Perl5 interface for communication with Nessus scanner over XMLRPC
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Nmsg/Makefile b/net/p5-Net-Nmsg/Makefile
index e84151be0621..e765e30e0d95 100644
--- a/net/p5-Net-Nmsg/Makefile
+++ b/net/p5-Net-Nmsg/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Net::Nmsg is a perl binding to libnmsg
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libnmsg.so:${PORTSDIR}/net/nmsg
-RUN_DEPENDS=	p5-Math-Int64>=0:${PORTSDIR}/math/p5-Math-Int64 \
-		p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+LIB_DEPENDS=	libnmsg.so:net/nmsg
+RUN_DEPENDS=	p5-Math-Int64>=0:math/p5-Math-Int64 \
+		p5-NetAddr-IP>=0:net-mgmt/p5-NetAddr-IP
 
 USES=		perl5
 MAKE_JOBS_UNSAFE=	yes
diff --git a/net/p5-Net-OAuth-Simple/Makefile b/net/p5-Net-OAuth-Simple/Makefile
index efe59e077c87..39e7a70a5d51 100644
--- a/net/p5-Net-OAuth-Simple/Makefile
+++ b/net/p5-Net-OAuth-Simple/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Simple wrapper around the OAuth protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0.57:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-libwww>=5.825:${PORTSDIR}/www/p5-libwww \
-		p5-Net-OAuth>=0.27:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-URI>=1.37:${PORTSDIR}/net/p5-URI \
-		p5-Test-Simple>=0.86:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0.57:security/p5-Crypt-SSLeay \
+		p5-libwww>=5.825:www/p5-libwww \
+		p5-Net-OAuth>=0.27:net/p5-Net-OAuth \
+		p5-URI>=1.37:net/p5-URI \
+		p5-Test-Simple>=0.86:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-OAuth/Makefile b/net/p5-Net-OAuth/Makefile
index dce4457743b0..19a02a67d8ca 100644
--- a/net/p5-Net-OAuth/Makefile
+++ b/net/p5-Net-OAuth/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Implementation of the OAuth protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.31:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0.06:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Digest-HMAC>=1.01:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Class-Accessor>=0.31:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0.06:devel/p5-Class-Data-Inheritable \
+		p5-Digest-HMAC>=1.01:security/p5-Digest-HMAC \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0.21:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0.21:devel/p5-Test-Warn
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/net/p5-Net-OAuth2/Makefile b/net/p5-Net-OAuth2/Makefile
index 92cfd30539f3..06b4d564c7a1 100644
--- a/net/p5-Net-OAuth2/Makefile
+++ b/net/p5-Net-OAuth2/Makefile
@@ -13,15 +13,15 @@ COMMENT=	OAuth 2.0 for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Mock-LWP-Dispatch>=0:${PORTSDIR}/devel/p5-Test-Mock-LWP-Dispatch \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-Test-Mock-LWP-Dispatch>=0:devel/p5-Test-Mock-LWP-Dispatch \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-YAML>=0:textproc/p5-YAML
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/net/p5-Net-OpenID-Consumer/Makefile b/net/p5-Net-OpenID-Consumer/Makefile
index 04913308f941..5679b03e8dc8 100644
--- a/net/p5-Net-OpenID-Consumer/Makefile
+++ b/net/p5-Net-OpenID-Consumer/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Net-OpenID-Common>=1.18:${PORTSDIR}/security/p5-Net-OpenID-Common \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Net-OpenID-Common>=1.18:security/p5-Net-OpenID-Common \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CGI>=0:${PORTSDIR}/www/p5-CGI
+TEST_DEPENDS=	p5-CGI>=0:www/p5-CGI
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/net/p5-Net-OpenSSH-Parallel/Makefile b/net/p5-Net-OpenSSH-Parallel/Makefile
index 26ade2d3ca9a..ab17af5faae7 100644
--- a/net/p5-Net-OpenSSH-Parallel/Makefile
+++ b/net/p5-Net-OpenSSH-Parallel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Run SSH jobs in parallel
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-OpenSSH>=0.39:${PORTSDIR}/net/p5-Net-OpenSSH
+BUILD_DEPENDS=	p5-Net-OpenSSH>=0.39:net/p5-Net-OpenSSH
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-OpenSSH/Makefile b/net/p5-Net-OpenSSH/Makefile
index d2e71f542308..6dde51c46c63 100644
--- a/net/p5-Net-OpenSSH/Makefile
+++ b/net/p5-Net-OpenSSH/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl SSH client package implemented on top of OpenSSH
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty
+BUILD_DEPENDS=	p5-IO-Tty>=0:devel/p5-IO-Tty
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-OpenStack-Attack/Makefile b/net/p5-Net-OpenStack-Attack/Makefile
index 1c99ecf5cb6a..698df0bf5f14 100644
--- a/net/p5-Net-OpenStack-Attack/Makefile
+++ b/net/p5-Net-OpenStack-Attack/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Tools for stress testing an OpenStack deployment
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-App-Rad>=0:${PORTSDIR}/devel/p5-App-Rad \
-		p5-HTTP-Async>=0:${PORTSDIR}/www/p5-HTTP-Async \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Net-HTTPS-NB>=0:${PORTSDIR}/net/p5-Net-HTTPS-NB \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-App-Rad>=0:devel/p5-App-Rad \
+		p5-HTTP-Async>=0:www/p5-HTTP-Async \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Net-HTTPS-NB>=0:net/p5-Net-HTTPS-NB \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-Packet-Target/Makefile b/net/p5-Net-Packet-Target/Makefile
index 863c5d2ca75d..db22682c5c7c 100644
--- a/net/p5-Net-Packet-Target/Makefile
+++ b/net/p5-Net-Packet-Target/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Target object for all Net-Packet related stuff
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
-		p5-Net-Packet>=3.00:${PORTSDIR}/net/p5-Net-Packet
+BUILD_DEPENDS=	p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+		p5-Net-Packet>=3.00:net/p5-Net-Packet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Packet/Makefile b/net/p5-Net-Packet/Makefile
index 6769f4441a55..c36c6968e8c9 100644
--- a/net/p5-Net-Packet/Makefile
+++ b/net/p5-Net-Packet/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	netpkt@gomor.org
 COMMENT=	Send and receive frames from layer 2 to layer 7
 
-BUILD_DEPENDS=	p5-Bit-Vector>=6.4:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
-		p5-Net-IPv6Addr>=0.2:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr \
-		p5-Net-Libdnet>=0.01:${PORTSDIR}/net/p5-Net-Libdnet \
-		p5-Net-Write>=1.00:${PORTSDIR}/net/p5-Net-Write \
-		p5-Net-Pcap>=0.14:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-Socket6>=0.19:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-Bit-Vector>=6.4:math/p5-Bit-Vector \
+		p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+		p5-Net-IPv6Addr>=0.2:net-mgmt/p5-Net-IPv6Addr \
+		p5-Net-Libdnet>=0.01:net/p5-Net-Libdnet \
+		p5-Net-Write>=1.00:net/p5-Net-Write \
+		p5-Net-Pcap>=0.14:net/p5-Net-Pcap \
+		p5-Socket6>=0.19:net/p5-Socket6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Patricia/Makefile b/net/p5-Net-Patricia/Makefile
index 90b589ff9578..32195d5df175 100644
--- a/net/p5-Net-Patricia/Makefile
+++ b/net/p5-Net-Patricia/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for fast IP address lookups
 
-BUILD_DEPENDS=	p5-Net-CIDR-Lite>=0.20:${PORTSDIR}/net/p5-Net-CIDR-Lite
-RUN_DEPENDS=	p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-Net-CIDR-Lite>=0.20:net/p5-Net-CIDR-Lite
+RUN_DEPENDS=	p5-Socket6>=0:net/p5-Socket6
 
 MAKE_JOBS_UNSAFE=yes
 
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index 99c6871884d7..faceb60abc77 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Interface to pcap(3) LBL packet capture library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Interface>=0:${PORTSDIR}/net/p5-IO-Interface
+BUILD_DEPENDS=	p5-IO-Interface>=0:net/p5-IO-Interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-PcapUtils/Makefile b/net/p5-Net-PcapUtils/Makefile
index e89a63ff3714..8a575d25060e 100644
--- a/net/p5-Net-PcapUtils/Makefile
+++ b/net/p5-Net-PcapUtils/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Utility routines for Net::Pcap module
 
-BUILD_DEPENDS=	p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap
+BUILD_DEPENDS=	p5-Net-Pcap>=0:net/p5-Net-Pcap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-PubSubHubbub-Publisher/Makefile b/net/p5-Net-PubSubHubbub-Publisher/Makefile
index 37393a476710..b627d5d01a03 100644
--- a/net/p5-Net-PubSubHubbub-Publisher/Makefile
+++ b/net/p5-Net-PubSubHubbub-Publisher/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Client library to ping a PubSubHubbub hub
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-RTP/Makefile b/net/p5-Net-RTP/Makefile
index 2fff79fc11da..da7845fc000b 100644
--- a/net/p5-Net-RTP/Makefile
+++ b/net/p5-Net-RTP/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Send and receive RTP packets (RFC3550)
 
-BUILD_DEPENDS=	p5-IO-Socket-Multicast6>=0.02:${PORTSDIR}/net/p5-IO-Socket-Multicast6 \
-		p5-IO-Socket-Multicast>=1.00:${PORTSDIR}/net/p5-IO-Socket-Multicast \
-		p5-IO-Socket-INET6>=1.20:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-Socket6>=0.19:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-IO-Socket-Multicast6>=0.02:net/p5-IO-Socket-Multicast6 \
+		p5-IO-Socket-Multicast>=1.00:net/p5-IO-Socket-Multicast \
+		p5-IO-Socket-INET6>=1.20:net/p5-IO-Socket-INET6 \
+		p5-Socket6>=0.19:net/p5-Socket6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-RabbitFoot/Makefile b/net/p5-Net-RabbitFoot/Makefile
index 777f5cbcd91a..108ebeaf9d00 100644
--- a/net/p5-Net-RabbitFoot/Makefile
+++ b/net/p5-Net-RabbitFoot/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Synchronous interface to AnyEvent::RabbitMQ
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent-RabbitMQ>=0:${PORTSDIR}/net/p5-AnyEvent-RabbitMQ \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Coro>=0:${PORTSDIR}/devel/p5-Coro \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-App-Cmd>=0:${PORTSDIR}/devel/p5-MooseX-App-Cmd \
-		p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-MooseX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MooseX-ConfigFromFile
+BUILD_DEPENDS=	p5-AnyEvent-RabbitMQ>=0:net/p5-AnyEvent-RabbitMQ \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-Coro>=0:devel/p5-Coro \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-App-Cmd>=0:devel/p5-MooseX-App-Cmd \
+		p5-MooseX-AttributeHelpers>=0:devel/p5-MooseX-AttributeHelpers \
+		p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile
 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
 
 NO_ARCH=	yes
 
diff --git a/net/p5-Net-RabbitMQ/Makefile b/net/p5-Net-RabbitMQ/Makefile
index a9bfe14d8204..06638b3dc4dc 100644
--- a/net/p5-Net-RabbitMQ/Makefile
+++ b/net/p5-Net-RabbitMQ/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl module to interact with RabbitMQ over AMQP using librabbitmq
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/rabbitmqctl:${PORTSDIR}/net/rabbitmq
-RUN_DEPENDS=	${LOCALBASE}/sbin/rabbitmqctl:${PORTSDIR}/net/rabbitmq
+BUILD_DEPENDS=	${LOCALBASE}/sbin/rabbitmqctl:net/rabbitmq
+RUN_DEPENDS=	${LOCALBASE}/sbin/rabbitmqctl:net/rabbitmq
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile
index a4c7c5f7693d..c4c9e8eb8b3a 100644
--- a/net/p5-Net-Radius/Makefile
+++ b/net/p5-Net-Radius/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to manipulate RADIUS packets
 
-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/net/p5-Net-Random/Makefile b/net/p5-Net-Random/Makefile
index a6d5e45b3060..5a5d3c839f7c 100644
--- a/net/p5-Net-Random/Makefile
+++ b/net/p5-Net-Random/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl5 module to get random data from online sources
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 PORTSCOUT=	skipv:2.21,2.22
 
diff --git a/net/p5-Net-Rendezvous-Publish/Makefile b/net/p5-Net-Rendezvous-Publish/Makefile
index d44f0d2aab18..d4f6de78d08c 100644
--- a/net/p5-Net-Rendezvous-Publish/Makefile
+++ b/net/p5-Net-Rendezvous-Publish/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Publish Rendezvous services
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lvalue>=0:${PORTSDIR}/devel/p5-Class-Accessor-Lvalue
+BUILD_DEPENDS=	p5-Class-Accessor-Lvalue>=0:devel/p5-Class-Accessor-Lvalue
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Riak/Makefile b/net/p5-Net-Riak/Makefile
index 38f92f7a1802..5c07265af052 100644
--- a/net/p5-Net-Riak/Makefile
+++ b/net/p5-Net-Riak/Makefile
@@ -16,16 +16,16 @@ COMMENT=	Interface to Riak
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Google-ProtocolBuffers>=0:${PORTSDIR}/devel/p5-Google-ProtocolBuffers \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-Traits>=0:${PORTSDIR}/devel/p5-MooseX-Traits \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Structured>=0:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Google-ProtocolBuffers>=0:devel/p5-Google-ProtocolBuffers \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Traits>=0:devel/p5-MooseX-Traits \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Structured>=0:devel/p5-MooseX-Types-Structured \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SAP/Makefile b/net/p5-Net-SAP/Makefile
index 108d3755fc5b..c690b5d0cadf 100644
--- a/net/p5-Net-SAP/Makefile
+++ b/net/p5-Net-SAP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Session Announcement Protocol (rfc2974) packet parser
 
-BUILD_DEPENDS=	p5-IO-Interface>=0:${PORTSDIR}/net/p5-IO-Interface \
-		p5-IO-Socket-Multicast6>=0:${PORTSDIR}/net/p5-IO-Socket-Multicast6 \
-		p5-Net-SDP>=0:${PORTSDIR}/net/p5-Net-SDP
+BUILD_DEPENDS=	p5-IO-Interface>=0:net/p5-IO-Interface \
+		p5-IO-Socket-Multicast6>=0:net/p5-IO-Socket-Multicast6 \
+		p5-Net-SDP>=0:net/p5-Net-SDP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SCP-Expect/Makefile b/net/p5-Net-SCP-Expect/Makefile
index c960af63e446..f9ffca7ed661 100644
--- a/net/p5-Net-SCP-Expect/Makefile
+++ b/net/p5-Net-SCP-Expect/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Perl5 wrapper for scp that allows passwords via Expect
 
-BUILD_DEPENDS=	p5-Expect>=1.14:${PORTSDIR}/lang/p5-Expect \
-		p5-Net-IPv6Addr>=0:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr \
-		p5-Term-ReadPassword>=0.01:${PORTSDIR}/devel/p5-Term-ReadPassword
+BUILD_DEPENDS=	p5-Expect>=1.14:lang/p5-Expect \
+		p5-Net-IPv6Addr>=0:net-mgmt/p5-Net-IPv6Addr \
+		p5-Term-ReadPassword>=0.01:devel/p5-Term-ReadPassword
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SCP/Makefile b/net/p5-Net-SCP/Makefile
index c326b2a3a3ee..85dbed69d0d1 100644
--- a/net/p5-Net-SCP/Makefile
+++ b/net/p5-Net-SCP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to access and use scp protocol
 
-BUILD_DEPENDS=	p5-Net-SSH>=0:${PORTSDIR}/net/p5-Net-SSH \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
+BUILD_DEPENDS=	p5-Net-SSH>=0:net/p5-Net-SSH \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SDP/Makefile b/net/p5-Net-SDP/Makefile
index 5139f56e07cb..0702990f88ee 100644
--- a/net/p5-Net-SDP/Makefile
+++ b/net/p5-Net-SDP/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Session Description Protocol (RFC 2327) packet parser/generator
 
-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/net/p5-Net-SFTP-Foreign/Makefile b/net/p5-Net-SFTP-Foreign/Makefile
index 1309c28e8f0d..a4473f0ca940 100644
--- a/net/p5-Net-SFTP-Foreign/Makefile
+++ b/net/p5-Net-SFTP-Foreign/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Net::SFTP::Foreign - Secure File Transfer Protocol client
 
-BUILD_DEPENDS=	p5-Sort-Key>=0:${PORTSDIR}/devel/p5-Sort-Key
+BUILD_DEPENDS=	p5-Sort-Key>=0:devel/p5-Sort-Key
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which
+TEST_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-SFTP/Makefile b/net/p5-Net-SFTP/Makefile
index 9d29e041eb6e..4789fec2be7d 100644
--- a/net/p5-Net-SFTP/Makefile
+++ b/net/p5-Net-SFTP/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl5 module implementing Secure File Transfer Protocol client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-SSH-Perl>=0:${PORTSDIR}/net/p5-Net-SSH-Perl
+BUILD_DEPENDS=	p5-Net-SSH-Perl>=0:net/p5-Net-SSH-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SIP/Makefile b/net/p5-Net-SIP/Makefile
index bc7610e5f714..2194bbbac298 100644
--- a/net/p5-Net-SIP/Makefile
+++ b/net/p5-Net-SIP/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Framework SIP (Voice Over IP, RFC3261)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.56:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0.56:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SMS-Clickatell/Makefile b/net/p5-Net-SMS-Clickatell/Makefile
index 1f526f4a366e..b3288d453bc6 100644
--- a/net/p5-Net-SMS-Clickatell/Makefile
+++ b/net/p5-Net-SMS-Clickatell/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	freebsd.ports@tipstrade.net
 COMMENT=	Access to Clickatell SMS messaging service
 
-TEST_DEPENDS=	p5-libwww>=5.816:${PORTSDIR}/www/p5-libwww
+TEST_DEPENDS=	p5-libwww>=5.816:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-SMS-Mollie/Makefile b/net/p5-Net-SMS-Mollie/Makefile
index 02b59fea035e..2123469854bb 100644
--- a/net/p5-Net-SMS-Mollie/Makefile
+++ b/net/p5-Net-SMS-Mollie/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Send SMS messages via the mollie.nl service
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SMS-PChome/Makefile b/net/p5-Net-SMS-PChome/Makefile
index a1deba11bcd8..862c6d653c86 100644
--- a/net/p5-Net-SMS-PChome/Makefile
+++ b/net/p5-Net-SMS-PChome/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Send SMS messages via the sms.pchome.com.tw service
 
-BUILD_DEPENDS=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-HTML-TagParser>=0:${PORTSDIR}/www/p5-HTML-TagParser \
-		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+BUILD_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-HTML-TagParser>=0:www/p5-HTML-TagParser \
+		p5-Date-Calc>=0:devel/p5-Date-Calc
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SPDY/Makefile b/net/p5-Net-SPDY/Makefile
index 2464e4ccd5ba..41935486fcda 100644
--- a/net/p5-Net-SPDY/Makefile
+++ b/net/p5-Net-SPDY/Makefile
@@ -15,11 +15,11 @@ COMMENT=	SPDY protocol client and server implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/net/p5-Net-SSH-Expect/Makefile b/net/p5-Net-SSH-Expect/Makefile
index 5a3e07c32706..974adcdc20d0 100644
--- a/net/p5-Net-SSH-Expect/Makefile
+++ b/net/p5-Net-SSH-Expect/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	SSH wrapper to execute remote commands
 
-RUN_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect
+RUN_DEPENDS=	p5-Expect>=0:lang/p5-Expect
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SSH-Mechanize/Makefile b/net/p5-Net-SSH-Mechanize/Makefile
index 8cba44916619..21fca72df23b 100644
--- a/net/p5-Net-SSH-Mechanize/Makefile
+++ b/net/p5-Net-SSH-Mechanize/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for asynchronous ssh command invocation
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-AnyEvent-Subprocess>0:${PORTSDIR}/devel/p5-AnyEvent-Subprocess \
-	p5-Coro>0:${PORTSDIR}/devel/p5-Coro \
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Params-Validate>0:${PORTSDIR}/devel/p5-MooseX-Params-Validate
+	p5-AnyEvent>0:devel/p5-AnyEvent \
+	p5-AnyEvent-Subprocess>0:devel/p5-AnyEvent-Subprocess \
+	p5-Coro>0:devel/p5-Coro \
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-Params-Validate>0:devel/p5-MooseX-Params-Validate
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index 33ed1802b4ee..a1751b854f92 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Perl5 module implementing both the SSH1 and SSH2 protocols
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Convert-PEM>=0.05:${PORTSDIR}/converters/p5-Convert-PEM \
-		p5-Crypt-DES>0:${PORTSDIR}/security/p5-Crypt-DES \
-		p5-Crypt-DH>=0.01:${PORTSDIR}/security/p5-Crypt-DH \
-		p5-Crypt-DSA>=0.11:${PORTSDIR}/security/p5-Crypt-DSA \
-		p5-Crypt-IDEA>=0:${PORTSDIR}/security/p5-Crypt-IDEA \
-		p5-Crypt-RSA>=0:${PORTSDIR}/security/p5-Crypt-RSA \
-		p5-Digest-BubbleBabble>=0:${PORTSDIR}/security/p5-Digest-BubbleBabble \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-Digest-SHA1>=2.10:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Math-GMP>=1.04:${PORTSDIR}/math/p5-Math-GMP \
-		p5-Math-Pari>=2.001804:${PORTSDIR}/math/p5-Math-Pari \
-		p5-String-CRC32>=1.2:${PORTSDIR}/devel/p5-String-CRC32
+BUILD_DEPENDS=	p5-Convert-PEM>=0.05:converters/p5-Convert-PEM \
+		p5-Crypt-DES>0:security/p5-Crypt-DES \
+		p5-Crypt-DH>=0.01:security/p5-Crypt-DH \
+		p5-Crypt-DSA>=0.11:security/p5-Crypt-DSA \
+		p5-Crypt-IDEA>=0:security/p5-Crypt-IDEA \
+		p5-Crypt-RSA>=0:security/p5-Crypt-RSA \
+		p5-Digest-BubbleBabble>=0:security/p5-Digest-BubbleBabble \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-Digest-SHA1>=2.10:security/p5-Digest-SHA1 \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-Math-GMP>=1.04:math/p5-Math-GMP \
+		p5-Math-Pari>=2.001804:math/p5-Math-Pari \
+		p5-String-CRC32>=1.2:devel/p5-String-CRC32
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFIGURE_ENV=	PERL_MM_USE_DEFAULT="1"
@@ -37,7 +37,7 @@ OPTIONS_DEFINE=	GMP
 OPTIONS_DEFAULT=GMP
 GMP_DESC=	Use the optimized Math::BigInt::GMP backend
 
-GMP_BUILD_DEPENDS=	p5-Math-BigInt-GMP>=0:${PORTSDIR}/math/p5-Math-BigInt-GMP
+GMP_BUILD_DEPENDS=	p5-Math-BigInt-GMP>=0:math/p5-Math-BigInt-GMP
 GMP_RUN_DEPENDS=	${GMP_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-SSH2/Makefile b/net/p5-Net-SSH2/Makefile
index 0c5f8411ffeb..38e32636b3db 100644
--- a/net/p5-Net-SSH2/Makefile
+++ b/net/p5-Net-SSH2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Support for the SSH 2 protocol via libSSH2
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+LIB_DEPENDS=	libssh2.so:security/libssh2
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-STOMP-Client/Makefile b/net/p5-Net-STOMP-Client/Makefile
index 5107967abe57..03bc5c3aee3d 100644
--- a/net/p5-Net-STOMP-Client/Makefile
+++ b/net/p5-Net-STOMP-Client/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Streaming Text Orientated Messaging Protocol Client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-No-Worries>=0:${PORTSDIR}/devel/p5-No-Worries \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-No-Worries>=0:devel/p5-No-Worries \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Server-Coro/Makefile b/net/p5-Net-Server-Coro/Makefile
index 9db6ad80d56c..8a3d26d864f2 100644
--- a/net/p5-Net-Server-Coro/Makefile
+++ b/net/p5-Net-Server-Coro/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for co-operative multithreaded server using Coro
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-Coro>0:${PORTSDIR}/devel/p5-Coro \
-	p5-Net-Server>=2:${PORTSDIR}/net/p5-Net-Server
+	p5-AnyEvent>0:devel/p5-AnyEvent \
+	p5-Coro>0:devel/p5-Coro \
+	p5-Net-Server>=2:net/p5-Net-Server
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Server-SS-PreFork/Makefile b/net/p5-Net-Server-SS-PreFork/Makefile
index c7ac9ab2aaa6..9051eb5f578d 100644
--- a/net/p5-Net-Server-SS-PreFork/Makefile
+++ b/net/p5-Net-Server-SS-PreFork/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Hot-deployable variant of Net::Server::PreFork
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-Server>0:${PORTSDIR}/net/p5-Net-Server \
-		p5-Server-Starter>=0.02:${PORTSDIR}/net/p5-Server-Starter
+BUILD_DEPENDS=	p5-Net-Server>0:net/p5-Net-Server \
+		p5-Server-Starter>=0.02:net/p5-Server-Starter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-HTTP-Server-Simple>0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-Test-SharedFork>0:${PORTSDIR}/devel/p5-Test-SharedFork \
-		p5-Test-TCP>=0.06:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+TEST_DEPENDS=	p5-HTTP-Server-Simple>0:www/p5-HTTP-Server-Simple \
+		p5-Test-SharedFork>0:devel/p5-Test-SharedFork \
+		p5-Test-TCP>=0.06:devel/p5-Test-TCP \
+		p5-libwww>0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index 9653b5a3870c..ed4fd37c4bf3 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Configurable base class for writing internet servers in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Multiplex>=1.01:${PORTSDIR}/devel/p5-IO-Multiplex
+BUILD_DEPENDS=	p5-IO-Multiplex>=1.01:devel/p5-IO-Multiplex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	IPV6
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	IPV6
 USES=		perl5
 USE_PERL5=	configure
 
-IPV6_BUILD_DEPENDS=	p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6
-IPV6_RUN_DEPENDS=	p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6
+IPV6_BUILD_DEPENDS=	p5-Socket6>=0.23:net/p5-Socket6
+IPV6_RUN_DEPENDS=	p5-Socket6>=0.23:net/p5-Socket6
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Subnet/Makefile b/net/p5-Net-Subnet/Makefile
index 77b250bb1185..14fae6d602a0 100644
--- a/net/p5-Net-Subnet/Makefile
+++ b/net/p5-Net-Subnet/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-Socket6>=0.23:net/p5-Socket6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-TacacsPlus/Makefile b/net/p5-Net-TacacsPlus/Makefile
index 8bf8fcd8c5e6..2a760466ebd0 100644
--- a/net/p5-Net-TacacsPlus/Makefile
+++ b/net/p5-Net-TacacsPlus/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Pure perl implement of Tacacs+ client
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Telnet-Netscreen/Makefile b/net/p5-Net-Telnet-Netscreen/Makefile
index dde3e63d66a9..a8c03bdf4a8a 100644
--- a/net/p5-Net-Telnet-Netscreen/Makefile
+++ b/net/p5-Net-Telnet-Netscreen/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Perl interface for interact with a Netscreen firewall
 
-BUILD_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
+BUILD_DEPENDS=	p5-Net-Telnet>=0:net/p5-Net-Telnet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-TiVo/Makefile b/net/p5-Net-TiVo/Makefile
index f06fdfd3c052..b549607f0409 100644
--- a/net/p5-Net-TiVo/Makefile
+++ b/net/p5-Net-TiVo/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	Framework for accessing TiVo using XML/HTTP
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Todoist/Makefile b/net/p5-Net-Todoist/Makefile
index 658e16e3562e..2d943fdafdaa 100644
--- a/net/p5-Net-Todoist/Makefile
+++ b/net/p5-Net-Todoist/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Todoist API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-Traceroute-PurePerl/Makefile b/net/p5-Net-Traceroute-PurePerl/Makefile
index 81c1e37ad6a9..335d2c6e089e 100644
--- a/net/p5-Net-Traceroute-PurePerl/Makefile
+++ b/net/p5-Net-Traceroute-PurePerl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Traceroute(1) functionality in perl via raw sockets
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-Traceroute>=0:${PORTSDIR}/net/p5-Net-Traceroute
+BUILD_DEPENDS=	p5-Net-Traceroute>=0:net/p5-Net-Traceroute
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Traceroute6/Makefile b/net/p5-Net-Traceroute6/Makefile
index 189457ed9293..4bbee4dea4cc 100644
--- a/net/p5-Net-Traceroute6/Makefile
+++ b/net/p5-Net-Traceroute6/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module to parse traceroute6(8) output
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-Socket6>=0:net/p5-Socket6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Trackback/Makefile b/net/p5-Net-Trackback/Makefile
index 4a39d162ef04..2510bbd32861 100644
--- a/net/p5-Net-Trackback/Makefile
+++ b/net/p5-Net-Trackback/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	coryking@mozimedia.com
 COMMENT=	Interface for developing Trackback clients and servers
 
-BUILD_DEPENDS=	p5-Class-ErrorHandler>=0.01:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-Class-ErrorHandler>=0.01:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-ErrorHandler>=0.01:devel/p5-Class-ErrorHandler \
+		p5-libwww>0:www/p5-libwww
+RUN_DEPENDS=	p5-Class-ErrorHandler>=0.01:devel/p5-Class-ErrorHandler \
+		p5-libwww>0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Twitter-Lite/Makefile b/net/p5-Net-Twitter-Lite/Makefile
index e4f183c6d396..c00d6f6081d0 100644
--- a/net/p5-Net-Twitter-Lite/Makefile
+++ b/net/p5-Net-Twitter-Lite/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Perl interface to the Twitter API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2.02:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1.4:${PORTSDIR}/net/p5-URI \
-		p5-Net-OAuth>=0.25:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-Crypt-SSLeay>=0.5:${PORTSDIR}/security/p5-Crypt-SSLeay
-RUN_DEPENDS=	p5-JSON>=2.02:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1.4:${PORTSDIR}/net/p5-URI \
-		p5-Net-OAuth>=0.25:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-Crypt-SSLeay>=0.5:${PORTSDIR}/security/p5-Crypt-SSLeay
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+BUILD_DEPENDS=	p5-JSON>=2.02:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww \
+		p5-URI>=1.4:net/p5-URI \
+		p5-Net-OAuth>=0.25:net/p5-Net-OAuth \
+		p5-Crypt-SSLeay>=0.5:security/p5-Crypt-SSLeay
+RUN_DEPENDS=	p5-JSON>=2.02:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww \
+		p5-URI>=1.4:net/p5-URI \
+		p5-Net-OAuth>=0.25:net/p5-Net-OAuth \
+		p5-Crypt-SSLeay>=0.5:security/p5-Crypt-SSLeay
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/net/p5-Net-Twitter/Makefile b/net/p5-Net-Twitter/Makefile
index 2bb89b930d73..b497d92b2e69 100644
--- a/net/p5-Net-Twitter/Makefile
+++ b/net/p5-Net-Twitter/Makefile
@@ -13,29 +13,29 @@ COMMENT=	Perl interface to twitter.com
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Data-Visitor>=0:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-DateTime>=0.51:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Strptime>=1.09:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Devel-StackTrace>=1.21:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-Net-OAuth>=0:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-Try-Tiny>=0.03:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI>=1.40:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=2.032:${PORTSDIR}/www/p5-libwww \
-		p5-namespace-autoclean>=0.09:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+		p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Data-Visitor>=0:devel/p5-Data-Visitor \
+		p5-DateTime>=0.51:devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=1.09:devel/p5-DateTime-Format-Strptime \
+		p5-Devel-StackTrace>=1.21:devel/p5-Devel-StackTrace \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Moose>=0.90:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-Net-OAuth>=0:net/p5-Net-OAuth \
+		p5-Try-Tiny>=0.03:lang/p5-Try-Tiny \
+		p5-URI>=1.40:net/p5-URI \
+		p5-libwww>=2.032:www/p5-libwww \
+		p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/net/p5-Net-VNC/Makefile b/net/p5-Net-VNC/Makefile
index 9c9aac203504..aabea4894b7b 100644
--- a/net/p5-Net-VNC/Makefile
+++ b/net/p5-Net-VNC/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Simple VNC client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES \
-		p5-Image-Imlib2>=0:${PORTSDIR}/graphics/p5-Image-Imlib2
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Crypt-DES>=0:security/p5-Crypt-DES \
+		p5-Image-Imlib2>=0:graphics/p5-Image-Imlib2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-WhitePages/Makefile b/net/p5-Net-WhitePages/Makefile
index c7dd24286636..602c2bc647b2 100644
--- a/net/p5-Net-WhitePages/Makefile
+++ b/net/p5-Net-WhitePages/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Provides access to the XML API for WhitePages.com
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Whois-ARIN/Makefile b/net/p5-Net-Whois-ARIN/Makefile
index 312358198453..d9841e326881 100644
--- a/net/p5-Net-Whois-ARIN/Makefile
+++ b/net/p5-Net-Whois-ARIN/Makefile
@@ -14,7 +14,7 @@ COMMENT=	ARIN whois client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Whois-IP/Makefile b/net/p5-Net-Whois-IP/Makefile
index e185f1c24b02..780c7f10d95b 100644
--- a/net/p5-Net-Whois-IP/Makefile
+++ b/net/p5-Net-Whois-IP/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Perl extension for looking up the whois information for IP addresses
 
-BUILD_DEPENDS=	p5-Regexp-IPv6>=0.02:${PORTSDIR}/textproc/p5-Regexp-IPv6
+BUILD_DEPENDS=	p5-Regexp-IPv6>=0.02:textproc/p5-Regexp-IPv6
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile
index 2879b8dfc816..bc5999b8bcc2 100644
--- a/net/p5-Net-Whois-RIPE/Makefile
+++ b/net/p5-Net-Whois-RIPE/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Implementation of RIPE Whois
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Iterator-Util>=0:${PORTSDIR}/devel/p5-Iterator-Util
+BUILD_DEPENDS=	p5-Iterator-Util>=0:devel/p5-Iterator-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Whois-Raw/Makefile b/net/p5-Net-Whois-Raw/Makefile
index e0dca47ef4ff..2af3bb1f626a 100644
--- a/net/p5-Net-Whois-Raw/Makefile
+++ b/net/p5-Net-Whois-Raw/Makefile
@@ -14,14 +14,14 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Net-IDN-Encode>=0:${PORTSDIR}/textproc/p5-Net-IDN-Encode \
-		p5-Regexp-IPv6>=0:${PORTSDIR}/textproc/p5-Regexp-IPv6 \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode \
+		p5-Regexp-IPv6>=0:textproc/p5-Regexp-IPv6 \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Test-RequiresInternet>=0:${PORTSDIR}/devel/p5-Test-RequiresInternet
+TEST_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Test-RequiresInternet>=0:devel/p5-Test-RequiresInternet
 
 NO_ARCH=	yes
 USES=		perl5
@@ -30,8 +30,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP
-RUN_DEPENDS+=	p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP
+BUILD_DEPENDS+=	p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP
+RUN_DEPENDS+=	p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index 52c37c412940..2551991099bf 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Perl5 module to get information using the Whois protocol
 
-RUN_DEPENDS=	p5-Locale-Codes>=0:${PORTSDIR}/misc/p5-Locale-Codes
+RUN_DEPENDS=	p5-Locale-Codes>=0:misc/p5-Locale-Codes
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Works/Makefile b/net/p5-Net-Works/Makefile
index dabf16247393..46e69f4802eb 100644
--- a/net/p5-Net-Works/Makefile
+++ b/net/p5-Net-Works/Makefile
@@ -12,12 +12,12 @@ COMMENT=	APIs for IP addresses and networks
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-List-AllUtils>=0.03:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-Math-Int128>=0.07:${PORTSDIR}/math/p5-Math-Int128 \
-		p5-namespace-autoclean>=0.13:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo
+BUILD_DEPENDS=	p5-List-AllUtils>=0.03:devel/p5-List-AllUtils \
+		p5-Math-Int128>=0.07:math/p5-Math-Int128 \
+		p5-namespace-autoclean>=0.13:devel/p5-namespace-autoclean \
+		p5-Moo>=0:devel/p5-Moo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-Write/Makefile b/net/p5-Net-Write/Makefile
index e584740efd59..6689ce0e692b 100644
--- a/net/p5-Net-Write/Makefile
+++ b/net/p5-Net-Write/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	Interface to open and send raw frames to the network
 
-BUILD_DEPENDS=	p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
-		p5-Socket6>=0.19:${PORTSDIR}/net/p5-Socket6 \
-		p5-Net-Pcap>=0.14:${PORTSDIR}/net/p5-Net-Pcap
+BUILD_DEPENDS=	p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+		p5-Socket6>=0.19:net/p5-Socket6 \
+		p5-Net-Pcap>=0.14:net/p5-Net-Pcap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Yadis/Makefile b/net/p5-Net-Yadis/Makefile
index c886f970c954..7d420188c6a9 100644
--- a/net/p5-Net-Yadis/Makefile
+++ b/net/p5-Net-Yadis/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Yadis service discovery protocol, and parses XRDS xml documents
 
-RUN_DEPENDS=	p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-XML-XPath>=0:textproc/p5-XML-XPath \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net-Z3950-SimpleServer/Makefile b/net/p5-Net-Z3950-SimpleServer/Makefile
index 618807923c4a..f7da575ca8f3 100644
--- a/net/p5-Net-Z3950-SimpleServer/Makefile
+++ b/net/p5-Net-Z3950-SimpleServer/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for developing Z39.50 servers
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libyaz.so:${PORTSDIR}/net/yaz
+LIB_DEPENDS=	libyaz.so:net/yaz
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	ztest.pl grs_test.pl logging-server.pl
diff --git a/net/p5-Net-Z3950-ZOOM/Makefile b/net/p5-Net-Z3950-ZOOM/Makefile
index c3f271c40636..f375a4baaf55 100644
--- a/net/p5-Net-Z3950-ZOOM/Makefile
+++ b/net/p5-Net-Z3950-ZOOM/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Perl interface to the Z39.50 Object-Orientation Model (ZOOM)
 
-LIB_DEPENDS=	libyaz.so:${PORTSDIR}/net/yaz
-BUILD_DEPENDS=	p5-MARC-Record>=1.38:${PORTSDIR}/textproc/p5-MARC-Record
-RUN_DEPENDS=	p5-MARC-Record>=1.38:${PORTSDIR}/textproc/p5-MARC-Record
+LIB_DEPENDS=	libyaz.so:net/yaz
+BUILD_DEPENDS=	p5-MARC-Record>=1.38:textproc/p5-MARC-Record
+RUN_DEPENDS=	p5-MARC-Record>=1.38:textproc/p5-MARC-Record
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-uFTP/Makefile b/net/p5-Net-uFTP/Makefile
index 762ea8a464c4..e4f49b3c3a8c 100644
--- a/net/p5-Net-uFTP/Makefile
+++ b/net/p5-Net-uFTP/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Universal interface for FTP-like modules (FTP, SFTP, SCP)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Fast-XS>=0:${PORTSDIR}/devel/p5-Class-Accessor-Fast-XS \
-		p5-File-Stat-ModeString>=0:${PORTSDIR}/sysutils/p5-File-Stat-ModeString \
-		p5-Net-FTP-AutoReconnect>=0:${PORTSDIR}/net/p5-Net-FTP-AutoReconnect \
-		p5-Net-SSH2>=0:${PORTSDIR}/net/p5-Net-SSH2 \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS \
+		p5-File-Stat-ModeString>=0:sysutils/p5-File-Stat-ModeString \
+		p5-Net-FTP-AutoReconnect>=0:net/p5-Net-FTP-AutoReconnect \
+		p5-Net-SSH2>=0:net/p5-Net-SSH2 \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 025f46cdaa02..23719ddadfe5 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -15,17 +15,17 @@ COMMENT=	Perl5 modules to access and use network protocols
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Socket>=2.016:${PORTSDIR}/net/p5-Socket
+BUILD_DEPENDS=	p5-Socket>=2.016:net/p5-Socket
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	IPV6 SASL SSL
 OPTIONS_DEFAULT=SASL
 SASL_DESC=	SASL auth for POP3 and SMTP support
 
-SASL_BUILD_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
-SASL_RUN_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
-SSL_BUILD_DEPENDS=	p5-IO-Socket-SSL>=2.007:${PORTSDIR}/security/p5-IO-Socket-SSL
-SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=2.007:${PORTSDIR}/security/p5-IO-Socket-SSL
+SASL_BUILD_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL
+SASL_RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL
+SSL_BUILD_DEPENDS=	p5-IO-Socket-SSL>=2.007:security/p5-IO-Socket-SSL
+SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=2.007:security/p5-IO-Socket-SSL
 
 CONFIGURE_ENV=	PERL5_CPAN_IS_RUNNING=1
 NO_ARCH=	yes
@@ -35,8 +35,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MIPV6} && ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.20:${PORTSDIR}/net/p5-IO-Socket-IP
-RUN_DEPENDS+=	p5-IO-Socket-IP>=0.20:${PORTSDIR}/net/p5-IO-Socket-IP
+BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.20:net/p5-IO-Socket-IP
+RUN_DEPENDS+=	p5-IO-Socket-IP>=0.20:net/p5-IO-Socket-IP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/p5-NetAddr-IP-Count/Makefile b/net/p5-NetAddr-IP-Count/Makefile
index ac8adca0119a..597b71116d88 100644
--- a/net/p5-NetAddr-IP-Count/Makefile
+++ b/net/p5-NetAddr-IP-Count/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	NetAddr::IP::Count - Count hosts in named subnets
 
-BUILD_DEPENDS=	p5-NetAddr-IP>0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-NetAddr-IP>0:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-OAI-Harvester/Makefile b/net/p5-OAI-Harvester/Makefile
index 63e39826da05..441a8cdac63a 100644
--- a/net/p5-OAI-Harvester/Makefile
+++ b/net/p5-OAI-Harvester/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Perl module to harvest using the OAI protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=1.30:${PORTSDIR}/net/p5-URI \
-		p5-XML-SAX>=0.12:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Base>=1.04:${PORTSDIR}/textproc/p5-XML-SAX-Base \
-		p5-libwww>=2.0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>=1.30:net/p5-URI \
+		p5-XML-SAX>=0.12:textproc/p5-XML-SAX \
+		p5-XML-SAX-Base>=1.04:textproc/p5-XML-SAX-Base \
+		p5-libwww>=2.0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer
+TEST_DEPENDS=	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
diff --git a/net/p5-OurNet-BBS/Makefile b/net/p5-OurNet-BBS/Makefile
index 3e541ffdfbf0..25d4b9d093d2 100644
--- a/net/p5-OurNet-BBS/Makefile
+++ b/net/p5-OurNet-BBS/Makefile
@@ -11,31 +11,31 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Component Object Model for BBS systems
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES \
-		p5-Crypt-GOST>=0:${PORTSDIR}/security/p5-Crypt-GOST \
-		p5-Crypt-IDEA>=0:${PORTSDIR}/security/p5-Crypt-IDEA \
-		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-Crypt-TEA>=0:${PORTSDIR}/security/p5-Crypt-TEA \
-		p5-Crypt-Twofish>=0:${PORTSDIR}/security/p5-Crypt-Twofish \
-		p5-Crypt-Twofish2>=0:${PORTSDIR}/security/p5-Crypt-Twofish2 \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Crypt-Blowfish_PP>=0:${PORTSDIR}/security/p5-Crypt-Blowfish_PP \
-		p5-Crypt-DES_PP>=0:${PORTSDIR}/security/p5-Crypt-DES_PP \
-		p5-Crypt-Rijndael_PP>=0:${PORTSDIR}/security/p5-Crypt-Rijndael_PP \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-GnuPG-Interface>=0:${PORTSDIR}/security/p5-GnuPG-Interface \
-		p5-Hook-LexWrap>=0:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Mail-Box>=0:${PORTSDIR}/mail/p5-Mail-Box \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Net-Daemon>=0:${PORTSDIR}/net/p5-Net-Daemon \
-		p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-OurNet-BBSAgent>=0:${PORTSDIR}/net/p5-OurNet-BBSAgent \
-		p5-PlRPC>=0:${PORTSDIR}/net/p5-PlRPC \
-		p5-enum>=0:${PORTSDIR}/devel/p5-enum
+BUILD_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
+		p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
+		p5-Crypt-DES>=0:security/p5-Crypt-DES \
+		p5-Crypt-GOST>=0:security/p5-Crypt-GOST \
+		p5-Crypt-IDEA>=0:security/p5-Crypt-IDEA \
+		p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+		p5-Crypt-TEA>=0:security/p5-Crypt-TEA \
+		p5-Crypt-Twofish>=0:security/p5-Crypt-Twofish \
+		p5-Crypt-Twofish2>=0:security/p5-Crypt-Twofish2 \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Crypt-Blowfish_PP>=0:security/p5-Crypt-Blowfish_PP \
+		p5-Crypt-DES_PP>=0:security/p5-Crypt-DES_PP \
+		p5-Crypt-Rijndael_PP>=0:security/p5-Crypt-Rijndael_PP \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-GnuPG-Interface>=0:security/p5-GnuPG-Interface \
+		p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-Mail-Box>=0:mail/p5-Mail-Box \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-Net-Daemon>=0:net/p5-Net-Daemon \
+		p5-Net-Telnet>=0:net/p5-Net-Telnet \
+		p5-OurNet-BBSAgent>=0:net/p5-OurNet-BBSAgent \
+		p5-PlRPC>=0:net/p5-PlRPC \
+		p5-enum>=0:devel/p5-enum
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:1.67
diff --git a/net/p5-OurNet-BBSAgent/Makefile b/net/p5-OurNet-BBSAgent/Makefile
index b319dd215e81..457683b27f4b 100644
--- a/net/p5-OurNet-BBSAgent/Makefile
+++ b/net/p5-OurNet-BBSAgent/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Scriptable telnet-based virtual users
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
+BUILD_DEPENDS=	p5-Net-Telnet>=0:net/p5-Net-Telnet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-POE-Component-Client-Ident/Makefile b/net/p5-POE-Component-Client-Ident/Makefile
index ef44c3645a88..44a3013c6c16 100644
--- a/net/p5-POE-Component-Client-Ident/Makefile
+++ b/net/p5-POE-Component-Client-Ident/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE component for non-blocking ident lookups
 
-BUILD_DEPENDS=	p5-POE>=0.9999:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0.9999:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-POE-Server-TCP>=0:${PORTSDIR}/devel/p5-Test-POE-Server-TCP
+TEST_DEPENDS=	p5-Test-POE-Server-TCP>=0:devel/p5-Test-POE-Server-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-POE-Component-Client-Keepalive/Makefile b/net/p5-POE-Component-Client-Keepalive/Makefile
index b934ee47fe36..030cece61cf7 100644
--- a/net/p5-POE-Component-Client-Keepalive/Makefile
+++ b/net/p5-POE-Component-Client-Keepalive/Makefile
@@ -16,9 +16,9 @@ COMMENT=	POE component for managing connections, with keep-alive
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-IP-Minimal>=0.02:${PORTSDIR}/net/p5-Net-IP-Minimal  \
-		p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Resolver>=0.917:${PORTSDIR}/dns/p5-POE-Component-Resolver
+BUILD_DEPENDS=	p5-Net-IP-Minimal>=0.02:net/p5-Net-IP-Minimal  \
+		p5-POE>=1.311:devel/p5-POE \
+		p5-POE-Component-Resolver>=0.917:dns/p5-POE-Component-Resolver
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-POE-Component-Client-Ping/Makefile b/net/p5-POE-Component-Client-Ping/Makefile
index ae9bbbd2adc0..64df765142f4 100644
--- a/net/p5-POE-Component-Client-Ping/Makefile
+++ b/net/p5-POE-Component-Client-Ping/Makefile
@@ -14,7 +14,7 @@ COMMENT=	POE component for non-blocking/concurrent ICMP ping
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1.0070:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=1.0070:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-POE-Component-Client-Telnet/Makefile b/net/p5-POE-Component-Client-Telnet/Makefile
index 411175081807..0f9b5713f977 100644
--- a/net/p5-POE-Component-Client-Telnet/Makefile
+++ b/net/p5-POE-Component-Client-Telnet/Makefile
@@ -14,9 +14,9 @@ COMMENT=	POE component that provides non-blocking access to Net::Telnet
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-POE>=0.31:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-Net-Telnet>=0:net/p5-Net-Telnet \
+		p5-POE>=0.31:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-POE-Component-Client-Traceroute/Makefile b/net/p5-POE-Component-Client-Traceroute/Makefile
index ade6182c712c..c1f12de3f407 100644
--- a/net/p5-POE-Component-Client-Traceroute/Makefile
+++ b/net/p5-POE-Component-Client-Traceroute/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Non-blocking traceroute client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-POE>=0.11:${PORTSDIR}/devel/p5-POE
+RUN_DEPENDS=	p5-POE>=0.11:devel/p5-POE
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/net/p5-POE-Component-Client-Twitter/Makefile b/net/p5-POE-Component-Client-Twitter/Makefile
index b89ebb1a72ff..47bc2fec8694 100644
--- a/net/p5-POE-Component-Client-Twitter/Makefile
+++ b/net/p5-POE-Component-Client-Twitter/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	POE chat component for twitter.com
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Client-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Client-HTTP \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base \
-		p5-Module-Install-TestBase>=0:${PORTSDIR}/devel/p5-Module-Install-TestBase \
-		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-JSON-Any>=0:converters/p5-JSON-Any \
+		p5-POE>=0:devel/p5-POE \
+		p5-POE-Component-Client-HTTP>=0:www/p5-POE-Component-Client-HTTP \
+		p5-URI>=0:net/p5-URI \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-Test-Base>=0:devel/p5-Test-Base \
+		p5-Module-Install-TestBase>=0:devel/p5-Module-Install-TestBase \
+		p5-Module-Install>=0:devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-POE-Component-Client-Whois/Makefile b/net/p5-POE-Component-Client-Whois/Makefile
index c0eecbdcc5c8..aece999e4529 100644
--- a/net/p5-POE-Component-Client-Whois/Makefile
+++ b/net/p5-POE-Component-Client-Whois/Makefile
@@ -13,8 +13,8 @@ COMMENT=	One shot non-blocking RFC 812 WHOIS query
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-Netmask>=1.9012:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-		p5-POE>=1.004:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Net-Netmask>=1.9012:net-mgmt/p5-Net-Netmask \
+		p5-POE>=1.004:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-POE-Component-ControlPort/Makefile b/net/p5-POE-Component-ControlPort/Makefile
index e81edc2505d9..ddcd07202a7b 100644
--- a/net/p5-POE-Component-ControlPort/Makefile
+++ b/net/p5-POE-Component-ControlPort/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Network control port for POE applications
 
-RUN_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Authen-Libwrap>=0:${PORTSDIR}/security/p5-Authen-Libwrap \
-		p5-POE>=0:${PORTSDIR}/devel/p5-POE
+RUN_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Authen-Libwrap>=0:security/p5-Authen-Libwrap \
+		p5-POE>=0:devel/p5-POE
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-POE-Component-Generic/Makefile b/net/p5-POE-Component-Generic/Makefile
index 93e7ebf7235a..8fdfcf081034 100644
--- a/net/p5-POE-Component-Generic/Makefile
+++ b/net/p5-POE-Component-Generic/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides non-blocking access to a blocking object
 
-BUILD_DEPENDS=	p5-POE>=0.31:${PORTSDIR}/devel/p5-POE \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-Net-SSH2>=0:${PORTSDIR}/net/p5-Net-SSH2
+BUILD_DEPENDS=	p5-POE>=0.31:devel/p5-POE \
+		p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-Net-SSH2>=0:net/p5-Net-SSH2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile
index de09dd39c1a3..993b10287de8 100644
--- a/net/p5-POE-Component-Jabber/Makefile
+++ b/net/p5-POE-Component-Jabber/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE Component for communicating over Jabber
 
-BUILD_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Filter-Template>=0:${PORTSDIR}/devel/p5-Filter-Template \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-POE-Component-PubSub>=0:${PORTSDIR}/net/p5-POE-Component-PubSub \
-		p5-POE-Component-SSLify>=0:${PORTSDIR}/security/p5-POE-Component-SSLify \
-		p5-POE-Filter-XML>=0:${PORTSDIR}/textproc/p5-POE-Filter-XML \
-		p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Filter-Template>=0:devel/p5-Filter-Template \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-POE-Component-PubSub>=0:net/p5-POE-Component-PubSub \
+		p5-POE-Component-SSLify>=0:security/p5-POE-Component-SSLify \
+		p5-POE-Filter-XML>=0:textproc/p5-POE-Filter-XML \
+		p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/net/p5-POE-Component-Pcap/Makefile b/net/p5-POE-Component-Pcap/Makefile
index 058f7da8e4c2..b909cdfbc31b 100644
--- a/net/p5-POE-Component-Pcap/Makefile
+++ b/net/p5-POE-Component-Pcap/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE component for non-blocking use of Net::Pcap
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-Net-Pcap>=0:net/p5-Net-Pcap \
+		p5-NetPacket>=0:net/p5-NetPacket
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-POE-Component-PubSub/Makefile b/net/p5-POE-Component-PubSub/Makefile
index c91515044078..a3d5f28dcca7 100644
--- a/net/p5-POE-Component-PubSub/Makefile
+++ b/net/p5-POE-Component-PubSub/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generic publish/subscribe POE::Component
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-POE-Component-Server-Twirc/Makefile b/net/p5-POE-Component-Server-Twirc/Makefile
index d588c93b1726..f2077386c02f 100644
--- a/net/p5-POE-Component-Server-Twirc/Makefile
+++ b/net/p5-POE-Component-Server-Twirc/Makefile
@@ -13,27 +13,27 @@ COMMENT=	Twitter/IRC gateway
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-AnyEvent-Twitter>=0:${PORTSDIR}/net/p5-AnyEvent-Twitter \
-		p5-AnyEvent-Twitter-Stream>=0:${PORTSDIR}/net/p5-AnyEvent-Twitter-Stream \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0.15:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-Log-Log4perl>=0:${PORTSDIR}/devel/p5-MooseX-Log-Log4perl \
-		p5-MooseX-POE>=0.215:${PORTSDIR}/devel/p5-MooseX-POE \
-		p5-MooseX-SimpleConfig>=0:${PORTSDIR}/devel/p5-MooseX-SimpleConfig \
-		p5-MooseX-Storage>=0:${PORTSDIR}/devel/p5-MooseX-Storage \
-		p5-POE-Component-Server-IRC>=0.02005:${PORTSDIR}/irc/p5-POE-Component-Server-IRC \
-		p5-POE-Component-TSTP>=0:${PORTSDIR}/devel/p5-POE-Component-TSTP \
-		p5-POE-Loop-AnyEvent>=0:${PORTSDIR}/devel/p5-POE-Loop-AnyEvent \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-String-Truncate>=0:${PORTSDIR}/textproc/p5-String-Truncate \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-AnyEvent-Twitter>=0:net/p5-AnyEvent-Twitter \
+		p5-AnyEvent-Twitter-Stream>=0:net/p5-AnyEvent-Twitter-Stream \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Getopt>=0.15:devel/p5-MooseX-Getopt \
+		p5-MooseX-Log-Log4perl>=0:devel/p5-MooseX-Log-Log4perl \
+		p5-MooseX-POE>=0.215:devel/p5-MooseX-POE \
+		p5-MooseX-SimpleConfig>=0:devel/p5-MooseX-SimpleConfig \
+		p5-MooseX-Storage>=0:devel/p5-MooseX-Storage \
+		p5-POE-Component-Server-IRC>=0.02005:irc/p5-POE-Component-Server-IRC \
+		p5-POE-Component-TSTP>=0:devel/p5-POE-Component-TSTP \
+		p5-POE-Loop-AnyEvent>=0:devel/p5-POE-Loop-AnyEvent \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-String-Truncate>=0:textproc/p5-String-Truncate \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-POEx-Role-TCPServer/Makefile b/net/p5-POEx-Role-TCPServer/Makefile
index 97e734dd06ae..96e5d70477b2 100644
--- a/net/p5-POEx-Role-TCPServer/Makefile
+++ b/net/p5-POEx-Role-TCPServer/Makefile
@@ -12,13 +12,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for TCPServer Moose role on POE
 
 RUN_DEPENDS=	\
-	p5-MooseX-Declare>0:${PORTSDIR}/devel/p5-MooseX-Declare \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types-Structured>0:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-	p5-POE>0:${PORTSDIR}/devel/p5-POE \
-	p5-POEx-Role-SessionInstantiation>0:${PORTSDIR}/devel/p5-POEx-Role-SessionInstantiation \
-	p5-POEx-Types>0:${PORTSDIR}/devel/p5-POEx-Types \
-	p5-aliased>0:${PORTSDIR}/devel/p5-aliased
+	p5-MooseX-Declare>0:devel/p5-MooseX-Declare \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-MooseX-Types-Structured>0:devel/p5-MooseX-Types-Structured \
+	p5-POE>0:devel/p5-POE \
+	p5-POEx-Role-SessionInstantiation>0:devel/p5-POEx-Role-SessionInstantiation \
+	p5-POEx-Types>0:devel/p5-POEx-Types \
+	p5-aliased>0:devel/p5-aliased
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Parallel-Pvm/Makefile b/net/p5-Parallel-Pvm/Makefile
index 8e5b1a8a333e..09b0b44c25ab 100644
--- a/net/p5-Parallel-Pvm/Makefile
+++ b/net/p5-Parallel-Pvm/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for the Parallel Virtual Machine (PVM)
 
-BUILD_DEPENDS=	pvm:${PORTSDIR}/net/pvm
+BUILD_DEPENDS=	pvm:net/pvm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Phone-Info/Makefile b/net/p5-Phone-Info/Makefile
index 7edaa29fd8a1..d1303bfd5614 100644
--- a/net/p5-Phone-Info/Makefile
+++ b/net/p5-Phone-Info/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Provides a nicer CLI interface to Net::WhitePages
 
-RUN_DEPENDS=	p5-Net-WhitePages>=0:${PORTSDIR}/net/p5-Net-WhitePages
+RUN_DEPENDS=	p5-Net-WhitePages>=0:net/p5-Net-WhitePages
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	bin/phoneinfo
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index 9ee1ab2448ea..7394e9f1d1a6 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for writing RPC servers and clients
 
-BUILD_DEPENDS=	p5-Net-Daemon>=0:${PORTSDIR}/net/p5-Net-Daemon
+BUILD_DEPENDS=	p5-Net-Daemon>=0:net/p5-Net-Daemon
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-REST-Application/Makefile b/net/p5-REST-Application/Makefile
index 8ea22295bcc3..1a138a7821b3 100644
--- a/net/p5-REST-Application/Makefile
+++ b/net/p5-REST-Application/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Framework for building RESTful web-applications
 
-BUILD_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS=	p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-REST-Google/Makefile b/net/p5-REST-Google/Makefile
index 3f2eceb4f7d3..88e240f78710 100644
--- a/net/p5-REST-Google/Makefile
+++ b/net/p5-REST-Google/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Access Google REST (aka AJAX) API from Perl
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI \
-		p5-JSON-Any>=1.16:${PORTSDIR}/converters/p5-JSON-Any
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+		p5-URI>=1.35:net/p5-URI \
+		p5-JSON-Any>=1.16:converters/p5-JSON-Any
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-RPC-EPC-Service/Makefile b/net/p5-RPC-EPC-Service/Makefile
index 8ae1e156028e..d93c9abdeba2 100644
--- a/net/p5-RPC-EPC-Service/Makefile
+++ b/net/p5-RPC-EPC-Service/Makefile
@@ -15,8 +15,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>=6.1:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-Data-SExpression>=0.41:${PORTSDIR}/devel/p5-Data-SExpression
+	p5-AnyEvent>=6.1:devel/p5-AnyEvent \
+	p5-Data-SExpression>=0.41:devel/p5-Data-SExpression
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile
index 01de7a96a472..7a0d3e2f0eff 100644
--- a/net/p5-RPC-XML/Makefile
+++ b/net/p5-RPC-XML/Makefile
@@ -13,23 +13,23 @@ COMMENT=	XML-RPC client and server library for Perl
 LICENSE=	ART20 LGPL21
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=2.31:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=5.834:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-XML-Parser>=2.31:textproc/p5-XML-Parser \
+		p5-libwww>=5.834:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DateTime-Format-ISO8601>=0.07:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601
+TEST_DEPENDS=	p5-DateTime-Format-ISO8601>=0.07:devel/p5-DateTime-Format-ISO8601
 
 USES=		gmake perl5
 USE_PERL5=	configure
 
 OPTIONS_DEFINE=	XS
 
-XS_BUILD_DEPENDS=	p5-XML-LibXML>=1.85:${PORTSDIR}/textproc/p5-XML-LibXML
+XS_BUILD_DEPENDS=	p5-XML-LibXML>=1.85:textproc/p5-XML-LibXML
 XS_RUN_DEPENDS=		${XS_BUILD_DEPENDS}
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501905
-TEST_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+TEST_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
index 268c63927fbf..1ce652fcd65b 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
@@ -13,8 +13,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	ResourcePool wrapper for Net::LDAP
 
-BUILD_DEPENDS=	p5-ResourcePool>=0:${PORTSDIR}/devel/p5-ResourcePool \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	p5-ResourcePool>=0:devel/p5-ResourcePool \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
index 4f8a737ec89e..ef56747bcdcd 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
@@ -13,8 +13,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	ResourcePool wrapper for SOAP::Lite
 
-RUN_DEPENDS=	p5-ResourcePool>=1.0100:${PORTSDIR}/devel/p5-ResourcePool \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+RUN_DEPENDS=	p5-ResourcePool>=1.0100:devel/p5-ResourcePool \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Rose-URI/Makefile b/net/p5-Rose-URI/Makefile
index 63212a0dd37a..aa38753bde5b 100644
--- a/net/p5-Rose-URI/Makefile
+++ b/net/p5-Rose-URI/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Easy and efficient manipulation of URI components
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Rose-Object>=0.854:${PORTSDIR}/devel/p5-Rose-Object \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Rose-Object>=0.854:devel/p5-Rose-Object \
+		p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-S3/Makefile b/net/p5-S3/Makefile
index b93eb9fde601..0d1a8182902e 100644
--- a/net/p5-S3/Makefile
+++ b/net/p5-S3/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	s3-example-perl-library
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Library in Perl for working with the Amazon S3 REST interface
 
-RUN_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
+RUN_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
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix zip
diff --git a/net/p5-SOAP-Amazon-S3/Makefile b/net/p5-SOAP-Amazon-S3/Makefile
index eb84e9580919..c5b6798bbe2a 100644
--- a/net/p5-SOAP-Amazon-S3/Makefile
+++ b/net/p5-SOAP-Amazon-S3/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module for interfacing with Amazon S3 through SOAP
 
-RUN_DEPENDS=	p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-SOAP-MySOAP>=0:${PORTSDIR}/net/p5-SOAP-MySOAP \
-		p5-XML-MyXML>=0:${PORTSDIR}/textproc/p5-XML-MyXML
+RUN_DEPENDS=	p5-Time-Piece>=0:devel/p5-Time-Piece \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-SOAP-MySOAP>=0:net/p5-SOAP-MySOAP \
+		p5-XML-MyXML>=0:textproc/p5-XML-MyXML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-SOAP-Data-Builder/Makefile b/net/p5-SOAP-Data-Builder/Makefile
index e54d30477f34..11db24a3c894 100644
--- a/net/p5-SOAP-Data-Builder/Makefile
+++ b/net/p5-SOAP-Data-Builder/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Wrapper simplifying SOAP::Data and SOAP::Serialiser
 
-BUILD_DEPENDS=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index c7b9381b95ce..91e6f23a2bb5 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -14,19 +14,19 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-IO-SessionData>=1.03:${PORTSDIR}/devel/p5-IO-SessionData \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Parser>=2.23:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Parser-Lite>=0:${PORTSDIR}/textproc/p5-XML-Parser-Lite \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-IO-SessionData>=1.03:devel/p5-IO-SessionData \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Parser>=2.23:textproc/p5-XML-Parser \
+		p5-XML-Parser-Lite>=0:textproc/p5-XML-Parser-Lite \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-XML>=0:${PORTSDIR}/devel/p5-Test-XML
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Test-XML>=0:devel/p5-Test-XML
 
 CONFLICTS_INSTALL=	p5-SOAP-Lite-0.60* p5-SOAP-[0-9]*
 
diff --git a/net/p5-SOAP-MySOAP/Makefile b/net/p5-SOAP-MySOAP/Makefile
index e0fa4c858fcc..60627b164e75 100644
--- a/net/p5-SOAP-MySOAP/Makefile
+++ b/net/p5-SOAP-MySOAP/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Extremely basic SOAP client module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-SOAP-XML-Client/Makefile b/net/p5-SOAP-XML-Client/Makefile
index 03718ead5284..e21ae42fc230 100644
--- a/net/p5-SOAP-XML-Client/Makefile
+++ b/net/p5-SOAP-XML-Client/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Simple frame work for talking with web services
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-SOAP-Data-Builder>=0.8:${PORTSDIR}/net/p5-SOAP-Data-Builder \
-		p5-SOAP-Lite>=0.67:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-XML-LibXML>=0.6:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-SOAP-Data-Builder>=0.8:net/p5-SOAP-Data-Builder \
+		p5-SOAP-Lite>=0.67:net/p5-SOAP-Lite \
+		p5-XML-LibXML>=0.6:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:2.26
diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile
index 3d43645fbf44..5d8ffb85215f 100644
--- a/net/p5-SOAP/Makefile
+++ b/net/p5-SOAP/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl modules providing an API to the Simple Object Access Protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-SOAP-Lite-[0-9]*
diff --git a/net/p5-Samba-LDAP/Makefile b/net/p5-Samba-LDAP/Makefile
index 6bbb25acb376..b51ef35ff1e8 100644
--- a/net/p5-Samba-LDAP/Makefile
+++ b/net/p5-Samba-LDAP/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Manage a Samba PDC with an LDAP Backend
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Class-Base>=0:${PORTSDIR}/devel/p5-Class-Base \
-		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Crypt-SmbHash>=0:${PORTSDIR}/security/p5-Crypt-SmbHash \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Regexp-DefaultFlags>=0:${PORTSDIR}/textproc/p5-Regexp-DefaultFlags \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Unicode-MapUTF8>=0:${PORTSDIR}/converters/p5-Unicode-MapUTF8
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-Class-Base>=0:devel/p5-Class-Base \
+		p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-Crypt-SmbHash>=0:security/p5-Crypt-SmbHash \
+		p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Regexp-DefaultFlags>=0:textproc/p5-Regexp-DefaultFlags \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-Unicode-MapUTF8>=0:converters/p5-Unicode-MapUTF8
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-Server-Starter/Makefile b/net/p5-Server-Starter/Makefile
index 5e95a42fd5aa..5f563caf8321 100644
--- a/net/p5-Server-Starter/Makefile
+++ b/net/p5-Server-Starter/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl extension of superdaemon for hot-deploying server programs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-SharedFork>0:${PORTSDIR}/devel/p5-Test-SharedFork \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-SharedFork>0:devel/p5-Test-SharedFork \
+		p5-Test-TCP>=0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/net/p5-Socket-GetAddrInfo/Makefile b/net/p5-Socket-GetAddrInfo/Makefile
index 1b5ffc00e2b5..77bafb410dfb 100644
--- a/net/p5-Socket-GetAddrInfo/Makefile
+++ b/net/p5-Socket-GetAddrInfo/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	RFC 2553's getaddrinfo and getnameinfo functions
 
-BUILD_DEPENDS=	p5-ExtUtils-CChecker>=0.06:${PORTSDIR}/devel/p5-ExtUtils-CChecker
+BUILD_DEPENDS=	p5-ExtUtils-CChecker>=0.06:devel/p5-ExtUtils-CChecker
 
 USES=		perl5 shebangfix
 USE_PERL5=	modbuild
diff --git a/net/p5-Socket-Multicast6/Makefile b/net/p5-Socket-Multicast6/Makefile
index aaafde3709d9..cfe3778175a2 100644
--- a/net/p5-Socket-Multicast6/Makefile
+++ b/net/p5-Socket-Multicast6/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Constructors and constants for IPv4/IPv6 multicast socket operations
 
-RUN_DEPENDS=	p5-Socket6>=0.19:${PORTSDIR}/net/p5-Socket6
+RUN_DEPENDS=	p5-Socket6>=0.19:net/p5-Socket6
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/net/p5-Sort-Key-IPv4/Makefile b/net/p5-Sort-Key-IPv4/Makefile
index f804d144839f..20fab6d4f010 100644
--- a/net/p5-Sort-Key-IPv4/Makefile
+++ b/net/p5-Sort-Key-IPv4/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for sorting IPv4 addresses
 
-BUILD_DEPENDS=	p5-Sort-Key>=0:${PORTSDIR}/devel/p5-Sort-Key
-RUN_DEPENDS=	p5-Sort-Key>=0:${PORTSDIR}/devel/p5-Sort-Key
+BUILD_DEPENDS=	p5-Sort-Key>=0:devel/p5-Sort-Key
+RUN_DEPENDS=	p5-Sort-Key>=0:devel/p5-Sort-Key
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Test-URI/Makefile b/net/p5-Test-URI/Makefile
index aa3498cd3f35..4f197a48358f 100644
--- a/net/p5-Test-URI/Makefile
+++ b/net/p5-Test-URI/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Check Uniform Resource Identifiers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-URI-FromHash/Makefile b/net/p5-URI-FromHash/Makefile
index 355acbb508af..19cc011338b3 100644
--- a/net/p5-URI-FromHash/Makefile
+++ b/net/p5-URI-FromHash/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Create URI from hash of components
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-URI>=1.68:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-URI>=1.68:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-URI-Match/Makefile b/net/p5-URI-Match/Makefile
index bf15e2b082f7..394c9eab286c 100644
--- a/net/p5-URI-Match/Makefile
+++ b/net/p5-URI-Match/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for matching URLs by parts
 
 RUN_DEPENDS=	\
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-URI-Nested/Makefile b/net/p5-URI-Nested/Makefile
index 9e322df0fcb3..d6b0ebb6245a 100644
--- a/net/p5-URI-Nested/Makefile
+++ b/net/p5-URI-Nested/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl5 interface for nested URIs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=1.40:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=1.40:net/p5-URI
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/net/p5-URI-OpenURL/Makefile b/net/p5-URI-OpenURL/Makefile
index 231a8867c32d..1c95829aee54 100644
--- a/net/p5-URI-OpenURL/Makefile
+++ b/net/p5-URI-OpenURL/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Parse and construct OpenURL's (NISO Z39.88-2004)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-URI-Query/Makefile b/net/p5-URI-Query/Makefile
index 46b9073a0f54..d91fe27c4fa1 100644
--- a/net/p5-URI-Query/Makefile
+++ b/net/p5-URI-Query/Makefile
@@ -13,7 +13,7 @@ COMMENT=	URI query string manipulation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-URI-SmartURI/Makefile b/net/p5-URI-SmartURI/Makefile
index 1defaaaa7ba4..fa7d30d8d2c6 100644
--- a/net/p5-URI-SmartURI/Makefile
+++ b/net/p5-URI-SmartURI/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Subclassable and hostless URIs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-C3-Componentised>=0:${PORTSDIR}/devel/p5-Class-C3-Componentised \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-URI>=1.51:${PORTSDIR}/net/p5-URI \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Class-C3-Componentised>=0:devel/p5-Class-C3-Componentised \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-URI>=1.51:net/p5-URI \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+		p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-URI-Template-Restrict/Makefile b/net/p5-URI-Template-Restrict/Makefile
index 6fe031527e31..cddb27f391e4 100644
--- a/net/p5-URI-Template-Restrict/Makefile
+++ b/net/p5-URI-Template-Restrict/Makefile
@@ -11,15 +11,15 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for restricted URI Templates handler
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Unicode-Normalize>0:${PORTSDIR}/textproc/p5-Unicode-Normalize \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-Unicode-Normalize>0:textproc/p5-Unicode-Normalize \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Unicode-Normalize>0:${PORTSDIR}/textproc/p5-Unicode-Normalize \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-Unicode-Normalize>0:textproc/p5-Unicode-Normalize \
+	p5-URI>0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-URI-Template/Makefile b/net/p5-URI-Template/Makefile
index 1c540f2c0992..cebd8abe0726 100644
--- a/net/p5-URI-Template/Makefile
+++ b/net/p5-URI-Template/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Object for handling URI templates
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-URI-db/Makefile b/net/p5-URI-db/Makefile
index 47db11f18890..9213bbf67b87 100644
--- a/net/p5-URI-db/Makefile
+++ b/net/p5-URI-db/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl5 module representing database URIs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=1.40:${PORTSDIR}/net/p5-URI \
-		p5-URI-Nested>=0.10:${PORTSDIR}/net/p5-URI-Nested
+BUILD_DEPENDS=	p5-URI>=1.40:net/p5-URI \
+		p5-URI-Nested>=0.10:net/p5-URI-Nested
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/net/p5-URI-ws/Makefile b/net/p5-URI-ws/Makefile
index 4c756cbccca6..ba1b0d42e36c 100644
--- a/net/p5-URI-ws/Makefile
+++ b/net/p5-URI-ws/Makefile
@@ -13,7 +13,7 @@ COMMENT=	WebSocket support for URI package
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/net/p5-VM-EC2-Security-CredentialCache/Makefile b/net/p5-VM-EC2-Security-CredentialCache/Makefile
index bc42a1551df4..c0904f050fd2 100644
--- a/net/p5-VM-EC2-Security-CredentialCache/Makefile
+++ b/net/p5-VM-EC2-Security-CredentialCache/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Cache credentials respecting expriation time for IAM roles
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-VM-EC2>=0:${PORTSDIR}/net/p5-VM-EC2
+BUILD_DEPENDS=	p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-VM-EC2>=0:net/p5-VM-EC2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-VM-EC2/Makefile b/net/p5-VM-EC2/Makefile
index 636e068c7de8..438fdbabebe9 100644
--- a/net/p5-VM-EC2/Makefile
+++ b/net/p5-VM-EC2/Makefile
@@ -14,14 +14,14 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-AnyEvent-CacheDNS>=0.08:${PORTSDIR}/dns/p5-AnyEvent-CacheDNS \
-		p5-AnyEvent-HTTP>=2.15:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-		p5-AnyEvent>=7.04:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-String-Approx>=3.26:${PORTSDIR}/devel/p5-String-Approx \
-		p5-URI>=1.40:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=2.18:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=5.835:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-AnyEvent-CacheDNS>=0.08:dns/p5-AnyEvent-CacheDNS \
+		p5-AnyEvent-HTTP>=2.15:www/p5-AnyEvent-HTTP \
+		p5-AnyEvent>=7.04:devel/p5-AnyEvent \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-String-Approx>=3.26:devel/p5-String-Approx \
+		p5-URI>=1.40:net/p5-URI \
+		p5-XML-Simple>=2.18:textproc/p5-XML-Simple \
+		p5-libwww>=5.835:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-Validate-Net/Makefile b/net/p5-Validate-Net/Makefile
index fc057addb556..a8fe64899333 100644
--- a/net/p5-Validate-Net/Makefile
+++ b/net/p5-Validate-Net/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Format validation and more for Net:: related strings
 
-BUILD_DEPENDS=	p5-Class-Default>=0:${PORTSDIR}/devel/p5-Class-Default
+BUILD_DEPENDS=	p5-Class-Default>=0:devel/p5-Class-Default
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-WebService-Dropbox/Makefile b/net/p5-WebService-Dropbox/Makefile
index fd6bb04e910d..ed8afd5b0958 100644
--- a/net/p5-WebService-Dropbox/Makefile
+++ b/net/p5-WebService-Dropbox/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl interface to Dropbox API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-		p5-Net-OAuth>=0.28:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-URI>=1.60:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-JSON>=2.53:converters/p5-JSON \
+		p5-Net-OAuth>=0.28:net/p5-Net-OAuth \
+		p5-URI>=1.60:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	LWP
@@ -29,15 +29,15 @@ USE_PERL5=	configure
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLWP}
-BUILD_DEPENDS+=	p5-LWP-Protocol-https>=6.03:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS+=	p5-LWP-Protocol-https>=6.03:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS+=	p5-LWP-Protocol-https>=6.03:www/p5-LWP-Protocol-https \
+		p5-libwww>=6.04:www/p5-libwww
+RUN_DEPENDS+=	p5-LWP-Protocol-https>=6.03:www/p5-LWP-Protocol-https \
+		p5-libwww>=6.04:www/p5-libwww
 .else
-BUILD_DEPENDS+=	p5-Furl>=1.01:${PORTSDIR}/www/p5-Furl \
-		p5-IO-Socket-SSL>=1.77:${PORTSDIR}/security/p5-IO-Socket-SSL
-RUN_DEPENDS+=	p5-Furl>=1.01:${PORTSDIR}/www/p5-Furl \
-		p5-IO-Socket-SSL>=1.77:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS+=	p5-Furl>=1.01:www/p5-Furl \
+		p5-IO-Socket-SSL>=1.77:security/p5-IO-Socket-SSL
+RUN_DEPENDS+=	p5-Furl>=1.01:www/p5-Furl \
+		p5-IO-Socket-SSL>=1.77:security/p5-IO-Socket-SSL
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/p5-WebService-Prowl/Makefile b/net/p5-WebService-Prowl/Makefile
index d42fdb653075..6a29e372c954 100644
--- a/net/p5-WebService-Prowl/Makefile
+++ b/net/p5-WebService-Prowl/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl interface to Prowl Public API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-What/Makefile b/net/p5-What/Makefile
index c1ae98527d34..4d398b1d67ff 100644
--- a/net/p5-What/Makefile
+++ b/net/p5-What/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Find out about running services
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-Exception-Class>=1.21:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error \
+		p5-Exception-Class>=1.21:devel/p5-Exception-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/net/p5-X500-DN/Makefile b/net/p5-X500-DN/Makefile
index 5d58016ae89a..7ebc114e8b41 100644
--- a/net/p5-X500-DN/Makefile
+++ b/net/p5-X500-DN/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Handle X.500 DNs (Distinguished Names), parse, and format them
 
-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/net/p5-XML-Compile-SOAP-AnyEvent/Makefile b/net/p5-XML-Compile-SOAP-AnyEvent/Makefile
index 5078b85c3e1c..8cbb8b35d485 100644
--- a/net/p5-XML-Compile-SOAP-AnyEvent/Makefile
+++ b/net/p5-XML-Compile-SOAP-AnyEvent/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Exchange XML via AnyEvent::HTTP
 
-BUILD_DEPENDS=	p5-AnyEvent-HTTP>=1.46:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Log-Report>=1.05:${PORTSDIR}/devel/p5-Log-Report \
-		p5-XML-Compile-SOAP>=3.05:${PORTSDIR}/net/p5-XML-Compile-SOAP
+BUILD_DEPENDS=	p5-AnyEvent-HTTP>=1.46:www/p5-AnyEvent-HTTP \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Log-Report>=1.05:devel/p5-Log-Report \
+		p5-XML-Compile-SOAP>=3.05:net/p5-XML-Compile-SOAP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	ART10 GPLv1
diff --git a/net/p5-XML-Compile-SOAP-Daemon/Makefile b/net/p5-XML-Compile-SOAP-Daemon/Makefile
index 721682ade6a0..af593d499e2a 100644
--- a/net/p5-XML-Compile-SOAP-Daemon/Makefile
+++ b/net/p5-XML-Compile-SOAP-Daemon/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Base class for SOAP message servers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Report>=0.90:${PORTSDIR}/devel/p5-Log-Report \
-		p5-XML-Compile>=1.44:${PORTSDIR}/textproc/p5-XML-Compile \
-		p5-XML-Compile-Cache>=0.991:${PORTSDIR}/textproc/p5-XML-Compile-Cache \
-		p5-XML-Compile-SOAP>=3.00:${PORTSDIR}/net/p5-XML-Compile-SOAP \
-		p5-XML-Compile-WSDL11>=3.00:${PORTSDIR}/net/p5-XML-Compile-WSDL11
+BUILD_DEPENDS=	p5-Log-Report>=0.90:devel/p5-Log-Report \
+		p5-XML-Compile>=1.44:textproc/p5-XML-Compile \
+		p5-XML-Compile-Cache>=0.991:textproc/p5-XML-Compile-Cache \
+		p5-XML-Compile-SOAP>=3.00:net/p5-XML-Compile-SOAP \
+		p5-XML-Compile-WSDL11>=3.00:net/p5-XML-Compile-WSDL11
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-XML-Compile-Tester>=0.90:${PORTSDIR}/devel/p5-XML-Compile-Tester
+TEST_DEPENDS=	p5-XML-Compile-Tester>=0.90:devel/p5-XML-Compile-Tester
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-XML-Compile-SOAP-WSA/Makefile b/net/p5-XML-Compile-SOAP-WSA/Makefile
index 199a4c87e5b9..15c006ba7044 100644
--- a/net/p5-XML-Compile-SOAP-WSA/Makefile
+++ b/net/p5-XML-Compile-SOAP-WSA/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	papowell@astart.com
 COMMENT=	SOAP message messages with WSA fields
 
-BUILD_DEPENDS=	p5-Net-Server>=0.97:${PORTSDIR}/net/p5-Net-Server \
-		p5-libwww>=5.803:${PORTSDIR}/www/p5-libwww \
-		p5-Log-Report>=0.22:${PORTSDIR}/devel/p5-Log-Report \
-		p5-XML-Compile-SOAP>=2.10:${PORTSDIR}/net/p5-XML-Compile-SOAP \
-		p5-XML-Compile>=1.01:${PORTSDIR}/textproc/p5-XML-Compile \
-		p5-XML-Compile-Cache>=0.91:${PORTSDIR}/textproc/p5-XML-Compile-Cache
+BUILD_DEPENDS=	p5-Net-Server>=0.97:net/p5-Net-Server \
+		p5-libwww>=5.803:www/p5-libwww \
+		p5-Log-Report>=0.22:devel/p5-Log-Report \
+		p5-XML-Compile-SOAP>=2.10:net/p5-XML-Compile-SOAP \
+		p5-XML-Compile>=1.01:textproc/p5-XML-Compile \
+		p5-XML-Compile-Cache>=0.91:textproc/p5-XML-Compile-Cache
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-XML-Compile-SOAP/Makefile b/net/p5-XML-Compile-SOAP/Makefile
index e7d3e83119d4..1fd0dca123e8 100644
--- a/net/p5-XML-Compile-SOAP/Makefile
+++ b/net/p5-XML-Compile-SOAP/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Base-class for SOAP implementations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-Log-Report>=1.05:${PORTSDIR}/devel/p5-Log-Report \
-		p5-XML-Compile>=1.51:${PORTSDIR}/textproc/p5-XML-Compile \
-		p5-XML-Compile-Cache>=1.03:${PORTSDIR}/textproc/p5-XML-Compile-Cache \
-		p5-libwww>=6.08:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-Log-Report>=1.05:devel/p5-Log-Report \
+		p5-XML-Compile>=1.51:textproc/p5-XML-Compile \
+		p5-XML-Compile-Cache>=1.03:textproc/p5-XML-Compile-Cache \
+		p5-libwww>=6.08:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-XML-Compile-Tester>=0.90:${PORTSDIR}/devel/p5-XML-Compile-Tester
+TEST_DEPENDS=	p5-XML-Compile-Tester>=0.90:devel/p5-XML-Compile-Tester
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/net/p5-XML-Compile-WSDL11/Makefile b/net/p5-XML-Compile-WSDL11/Makefile
index 14d457070c8d..9262ff16698b 100644
--- a/net/p5-XML-Compile-WSDL11/Makefile
+++ b/net/p5-XML-Compile-WSDL11/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Create SOAP messages defined by WSDL 1.1
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Report>=1.05:${PORTSDIR}/devel/p5-Log-Report \
-		p5-XML-Compile>=1.48:${PORTSDIR}/textproc/p5-XML-Compile \
-		p5-XML-Compile-Cache>=1.03:${PORTSDIR}/textproc/p5-XML-Compile-Cache \
-		p5-XML-Compile-SOAP>=3.16:${PORTSDIR}/net/p5-XML-Compile-SOAP
+BUILD_DEPENDS=	p5-Log-Report>=1.05:devel/p5-Log-Report \
+		p5-XML-Compile>=1.48:textproc/p5-XML-Compile \
+		p5-XML-Compile-Cache>=1.03:textproc/p5-XML-Compile-Cache \
+		p5-XML-Compile-SOAP>=3.16:net/p5-XML-Compile-SOAP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/net/p5-XML-RPC-Fast/Makefile b/net/p5-XML-RPC-Fast/Makefile
index 2af5535f002d..1021a51222d4 100644
--- a/net/p5-XML-RPC-Fast/Makefile
+++ b/net/p5-XML-RPC-Fast/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mons@cpan.org
 COMMENT=	Fast and modular implementation for an XML-RPC client and server
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-WWW-Curl>=0:${PORTSDIR}/www/p5-WWW-Curl \
-		p5-XML-Hash-LX>=0.05:${PORTSDIR}/textproc/p5-XML-Hash-LX \
-		p5-XML-LibXML>=1.58:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-WWW-Curl>=0:www/p5-WWW-Curl \
+		p5-XML-Hash-LX>=0.05:textproc/p5-XML-Hash-LX \
+		p5-XML-LibXML>=1.58:textproc/p5-XML-LibXML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-XML-RPC/Makefile b/net/p5-XML-RPC/Makefile
index 4f93158a16d9..1037872caff0 100644
--- a/net/p5-XML-RPC/Makefile
+++ b/net/p5-XML-RPC/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Pure Perl implementation for an XML-RPC client and server
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-TreePP>=0:${PORTSDIR}/textproc/p5-XML-TreePP
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-TreePP>=0:${PORTSDIR}/textproc/p5-XML-TreePP
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-TreePP>=0:textproc/p5-XML-TreePP
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-TreePP>=0:textproc/p5-XML-TreePP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-XMLRPC-Lite/Makefile b/net/p5-XMLRPC-Lite/Makefile
index 88c9f78e5155..66601decc9be 100644
--- a/net/p5-XMLRPC-Lite/Makefile
+++ b/net/p5-XMLRPC-Lite/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Client and server side XMLRPC implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SOAP-Lite>=1.11:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-SOAP-Lite>=1.11:net/p5-SOAP-Lite
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/net/p5-XPC/Makefile b/net/p5-XPC/Makefile
index fae4d2bc0540..1f5a33e6a716 100644
--- a/net/p5-XPC/Makefile
+++ b/net/p5-XPC/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XML Procedure Call (XPC)
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-ZConf-Bookmarks/Makefile b/net/p5-ZConf-Bookmarks/Makefile
index 039f5c5c4ec2..1ec99cac431c 100644
--- a/net/p5-ZConf-Bookmarks/Makefile
+++ b/net/p5-ZConf-Bookmarks/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	System for bookmarking URIs using ZConf
 
-RUN_DEPENDS=	p5-ZConf>=0:${PORTSDIR}/net/p5-ZConf
+RUN_DEPENDS=	p5-ZConf>=0:net/p5-ZConf
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-ZConf/Makefile b/net/p5-ZConf/Makefile
index f7ba170970c8..c32446ab80c4 100644
--- a/net/p5-ZConf/Makefile
+++ b/net/p5-ZConf/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Configuration system allowing for either file or LDAP backed storage
 
-BUILD_DEPENDS=	p5-Chooser>=0:${PORTSDIR}/devel/p5-Chooser \
-		p5-Error-Helper>=0:${PORTSDIR}/devel/p5-Error-Helper \
-		p5-File-BaseDir>=0:${PORTSDIR}/devel/p5-File-BaseDir \
-		p5-Module-List>=0:${PORTSDIR}/devel/p5-Module-List \
-		p5-Net-LDAP-AutoDNs>=0:${PORTSDIR}/net/p5-Net-LDAP-AutoDNs \
-		p5-Net-LDAP-AutoServer>=0:${PORTSDIR}/net/p5-Net-LDAP-AutoServer \
-		p5-Net-LDAP-LDAPhash>=0:${PORTSDIR}/net/p5-Net-LDAP-LDAPhash \
-		p5-Net-LDAP-Makepath>=0:${PORTSDIR}/net/p5-Net-LDAP-Makepath \
-		p5-ZML>=0:${PORTSDIR}/devel/p5-ZML \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	p5-Chooser>=0:devel/p5-Chooser \
+		p5-Error-Helper>=0:devel/p5-Error-Helper \
+		p5-File-BaseDir>=0:devel/p5-File-BaseDir \
+		p5-Module-List>=0:devel/p5-Module-List \
+		p5-Net-LDAP-AutoDNs>=0:net/p5-Net-LDAP-AutoDNs \
+		p5-Net-LDAP-AutoServer>=0:net/p5-Net-LDAP-AutoServer \
+		p5-Net-LDAP-LDAPhash>=0:net/p5-Net-LDAP-LDAPhash \
+		p5-Net-LDAP-Makepath>=0:net/p5-Net-LDAP-Makepath \
+		p5-ZML>=0:devel/p5-ZML \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/net/p5-ZeroMQ/Makefile b/net/p5-ZeroMQ/Makefile
index f09e8736d189..1a5a3c0eb4bc 100644
--- a/net/p5-ZeroMQ/Makefile
+++ b/net/p5-ZeroMQ/Makefile
@@ -14,15 +14,15 @@ COMMENT=	ZeroMQ2 wrapper for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
-RUN_DEPENDS=	p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
-LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq2 \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-TCP>=1.08:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-JSON>=2.00:${PORTSDIR}/converters/p5-JSON
+BUILD_DEPENDS=	p5-Task-Weaken>=0:devel/p5-Task-Weaken
+RUN_DEPENDS=	p5-Task-Weaken>=0:devel/p5-Task-Weaken
+LIB_DEPENDS=	libzmq.so:net/libzmq2 \
+		libuuid.so:misc/e2fsprogs-libuuid
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0.05:devel/p5-Test-Requires \
+		p5-Test-TCP>=1.08:devel/p5-Test-TCP \
+		p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-JSON>=2.00:converters/p5-JSON
 
 USES=		pkgconfig perl5
 MAKE_JOBS_UNSAFE=	yes
diff --git a/net/p5-ldap2pf/Makefile b/net/p5-ldap2pf/Makefile
index 754e3e940107..87a221ac4714 100644
--- a/net/p5-ldap2pf/Makefile
+++ b/net/p5-ldap2pf/Makefile
@@ -9,12 +9,12 @@ PKGNAMEPREFIX=  p5-
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Create and update PF tables from LDAP groups
 
-RUN_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/net/p5-ldap2pw/Makefile b/net/p5-ldap2pw/Makefile
index fbe43f8a7644..b8d89c3e7034 100644
--- a/net/p5-ldap2pw/Makefile
+++ b/net/p5-ldap2pw/Makefile
@@ -9,11 +9,11 @@ PKGNAMEPREFIX=  p5-
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Synchronize local user database with LDAP directory
 
-RUN_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/net/p5-perl-ldap/Makefile b/net/p5-perl-ldap/Makefile
index a2a8779aaa2a..7c4a7b826b93 100644
--- a/net/p5-perl-ldap/Makefile
+++ b/net/p5-perl-ldap/Makefile
@@ -15,21 +15,21 @@ COMMENT=	Client interface to LDAP (includes Net::LDAP)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Authen-SASL>=2.00:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Convert-ASN1>=0.20:${PORTSDIR}/converters/p5-Convert-ASN1 \
-		p5-IO-Socket-SSL>=1.26:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-URI>=1.10:${PORTSDIR}/net/p5-URI \
-		p5-XML-SAX-Base>0:${PORTSDIR}/textproc/p5-XML-SAX-Base \
-		p5-XML-SAX-Writer>0:${PORTSDIR}/textproc/p5-XML-SAX-Writer
+BUILD_DEPENDS=	p5-Authen-SASL>=2.00:security/p5-Authen-SASL \
+		p5-Convert-ASN1>=0.20:converters/p5-Convert-ASN1 \
+		p5-IO-Socket-SSL>=1.26:security/p5-IO-Socket-SSL \
+		p5-URI>=1.10:net/p5-URI \
+		p5-XML-SAX-Base>0:textproc/p5-XML-SAX-Base \
+		p5-XML-SAX-Writer>0:textproc/p5-XML-SAX-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	LWP
 LWP_DESC=	LDAP support via LWP
-LWP_BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-			p5-LWP-MediaTypes>=0:${PORTSDIR}/www/p5-LWP-MediaTypes \
-			p5-HTTP-Negotiate>=0:${PORTSDIR}/www/p5-HTTP-Negotiate \
-			p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-			p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+LWP_BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+			p5-LWP-MediaTypes>=0:www/p5-LWP-MediaTypes \
+			p5-HTTP-Negotiate>=0:www/p5-HTTP-Negotiate \
+			p5-HTTP-Message>=0:www/p5-HTTP-Message \
+			p5-JSON>=0:converters/p5-JSON
 LWP_RUN_DEPENDS:=	${LWP_BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/net/p5-srv2pf/Makefile b/net/p5-srv2pf/Makefile
index 65d4becddccc..0361bb76df4a 100644
--- a/net/p5-srv2pf/Makefile
+++ b/net/p5-srv2pf/Makefile
@@ -9,9 +9,9 @@ PKGNAMEPREFIX=  p5-
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Create and update PF tables from LDAP groups
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/net/pacemaker/Makefile b/net/pacemaker/Makefile
index fe89691ec409..4bab68937e38 100644
--- a/net/pacemaker/Makefile
+++ b/net/pacemaker/Makefile
@@ -10,16 +10,16 @@ COMMENT=	Scalable High-Availability cluster resource manager
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		corosync:${PORTSDIR}/net/corosync
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libqb.so:${PORTSDIR}/devel/libqb \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		corosync:${PORTSDIR}/net/corosync
+BUILD_DEPENDS=	bash:shells/bash \
+		corosync:net/corosync
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libltdl.so:devel/libltdl \
+		libqb.so:devel/libqb \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libxml2.so:textproc/libxml2 \
+		libxslt.so:textproc/libxslt
+RUN_DEPENDS=	bash:shells/bash \
+		corosync:net/corosync
 
 CONFLICTS=	heartbeat-[0-9]*
 
@@ -60,16 +60,16 @@ OPTIONS_DEFINE=	DBUS DOCS MANPAGES SNMP
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_VARS_OFF=		REPLACE_ARGS+="-e 's/HAVE_dbus=1/HAVE_dbus=0/'"
 
-DOCS_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc
+DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
-MANPAGES_BUILD_DEPENDS=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-			help2man:${PORTSDIR}/misc/help2man \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+MANPAGES_BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
+			help2man:misc/help2man \
+			xsltproc:textproc/libxslt
 
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=	snmp
 
 post-patch:
diff --git a/net/packter-agent/Makefile b/net/packter-agent/Makefile
index 7cd470aac906..f972945a6a30 100644
--- a/net/packter-agent/Makefile
+++ b/net/packter-agent/Makefile
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .if ${PORT_OPTIONS:MPACKTERTC}
 USES+=		perl5
 USE_PERL5=	run
-RUN_DEPENDS+=	p5-XML-Pastor>=0:${PORTSDIR}/devel/p5-XML-Pastor
+RUN_DEPENDS+=	p5-XML-Pastor>=0:devel/p5-XML-Pastor
 PLIST_SUB+=	PACKTERTC=""
 .else
 PLIST_SUB+=	PACKTERTC="@comment "
diff --git a/net/panoptis/Makefile b/net/panoptis/Makefile
index 99dfdc7f12d0..bbb20c5b4d10 100644
--- a/net/panoptis/Makefile
+++ b/net/panoptis/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Detect and block DoS/DDoS attacks
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libccgnu2.so:${PORTSDIR}/devel/commoncpp
+LIB_DEPENDS=	libccgnu2.so:devel/commoncpp
 
 GNU_CONFIGURE=	yes
 USES=		python
diff --git a/net/pbnc/Makefile b/net/pbnc/Makefile
index b2d811b02188..866a1cf472e2 100644
--- a/net/pbnc/Makefile
+++ b/net/pbnc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple userspace TCP port bouncer
 
 LICENSE=	BSD
 
-RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
+RUN_DEPENDS=	p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask
 
 USES=		perl5
 USE_PERL5=	run
diff --git a/net/pdb/Makefile b/net/pdb/Makefile
index e9d23d6bcd41..743fbc34807f 100644
--- a/net/pdb/Makefile
+++ b/net/pdb/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	gnn@FreeBSD.org
 COMMENT=	Packet Debugger
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pcs/__init__.py:${PORTSDIR}/net/py-pcs
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pcs/__init__.py:net/py-pcs
 
 USES=		python
 USE_PYTHON=	distutils pythonprefix
diff --git a/net/pear-Net_CDDB/Makefile b/net/pear-Net_CDDB/Makefile
index a4fd58fff9ef..c5b772ca5041 100644
--- a/net/pear-Net_CDDB/Makefile
+++ b/net/pear-Net_CDDB/Makefile
@@ -8,12 +8,12 @@ CATEGORIES=	net audio www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class that access and query CDDB audio-CD servers
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request \
-		${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request \
-		${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
+		${PEARDIR}/MDB2.php:databases/pear-MDB2
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
+		${PEARDIR}/MDB2.php:databases/pear-MDB2
 
 USES=		dos2unix pear
 
diff --git a/net/pear-Net_DNSBL/Makefile b/net/pear-Net_DNSBL/Makefile
index ae2912c91274..6cb73c62874d 100644
--- a/net/pear-Net_DNSBL/Makefile
+++ b/net/pear-Net_DNSBL/Makefile
@@ -8,14 +8,14 @@ CATEGORIES=	net pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR DNSBL Checker
 
-BUILD_DEPENDS=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite \
-		${PEARDIR}/Net/CheckIP.php:${PORTSDIR}/net/pear-Net_CheckIP \
-		${PEARDIR}/Net/DNS/RR/A.php:${PORTSDIR}/dns/pear-Net_DNS \
-		${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
-RUN_DEPENDS:=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite \
-		${PEARDIR}/Net/CheckIP.php:${PORTSDIR}/net/pear-Net_CheckIP \
-		${PEARDIR}/Net/DNS/RR/A.php:${PORTSDIR}/dns/pear-Net_DNS \
-		${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \
+		${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP \
+		${PEARDIR}/Net/DNS/RR/A.php:dns/pear-Net_DNS \
+		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+RUN_DEPENDS:=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \
+		${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP \
+		${PEARDIR}/Net/DNS/RR/A.php:dns/pear-Net_DNS \
+		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
 
 USE_PHP=	yes
 USES=	pear
diff --git a/net/pear-Net_Dict/Makefile b/net/pear-Net_Dict/Makefile
index ac79e0c24ffb..c962f0f27ef0 100644
--- a/net/pear-Net_Dict/Makefile
+++ b/net/pear-Net_Dict/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	net www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR interface to the DICT protocol
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/Cache.php:${PORTSDIR}/sysutils/pear-Cache
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/Cache.php:${PORTSDIR}/sysutils/pear-Cache
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/Cache.php:sysutils/pear-Cache
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/Cache.php:sysutils/pear-Cache
 
 USES=	pear
 
diff --git a/net/pear-Net_Finger/Makefile b/net/pear-Net_Finger/Makefile
index a2108d8ff13b..b78ca8abdaf6 100644
--- a/net/pear-Net_Finger/Makefile
+++ b/net/pear-Net_Finger/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class that provides a tool for querying finger servers
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
 
 USES=	pear
 
diff --git a/net/pear-Net_Geo/Makefile b/net/pear-Net_Geo/Makefile
index b6dd5a26e57d..4e2159661df8 100644
--- a/net/pear-Net_Geo/Makefile
+++ b/net/pear-Net_Geo/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	net pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Geographical locations based on Internet address
 
-BUILD_DEPENDS=	${PEARDIR}/Cache.php:${PORTSDIR}/sysutils/pear-Cache \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/Cache.php:${PORTSDIR}/sysutils/pear-Cache \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+RUN_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 USES=	pear
 
diff --git a/net/pear-Net_GeoIP/Makefile b/net/pear-Net_GeoIP/Makefile
index 001fa80e44b3..ea4315c2d632 100644
--- a/net/pear-Net_GeoIP/Makefile
+++ b/net/pear-Net_GeoIP/Makefile
@@ -10,10 +10,10 @@ DISTNAME=	Net_GeoIP-1.0.0RC1
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Library to perform geo-location lookups of IP addresses
 
-BUILD_DEPENDS=	${PEARDIR}/Cache.php:${PORTSDIR}/sysutils/pear-Cache \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/Cache.php:${PORTSDIR}/sysutils/pear-Cache \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+RUN_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 USES=	pear
 
diff --git a/net/pear-Net_NNTP/Makefile b/net/pear-Net_NNTP/Makefile
index 7c232c4861f7..5c8d59b623f4 100644
--- a/net/pear-Net_NNTP/Makefile
+++ b/net/pear-Net_NNTP/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	net news pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR implementation of the NNTP protocol
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
 
 USES=	pear
 
diff --git a/net/pear-Net_Nmap/Makefile b/net/pear-Net_Nmap/Makefile
index a9ae96620740..6ec5f8660eb4 100644
--- a/net/pear-Net_Nmap/Makefile
+++ b/net/pear-Net_Nmap/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Simple Wrapper Class for the Nmap Utility
 
 LICENSE=	LGPL3
 
-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/net/pear-Net_POP3/Makefile b/net/pear-Net_POP3/Makefile
index 02e29f08e2df..3d0d81f752f7 100644
--- a/net/pear-Net_POP3/Makefile
+++ b/net/pear-Net_POP3/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Provides a POP3 class to access POP3 server
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
 
 USES=	pear
 
diff --git a/net/pear-Net_SMS/Makefile b/net/pear-Net_SMS/Makefile
index 6a7920431d5b..008db571f105 100644
--- a/net/pear-Net_SMS/Makefile
+++ b/net/pear-Net_SMS/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	net pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR SMS functionality
 
-BUILD_DEPENDS=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail \
-		${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail \
-		${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
 
 USE_PHP=	gettext
 USES=	pear
diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile
index 23e249bc5d05..8dbdead50018 100644
--- a/net/pear-Net_SMTP/Makefile
+++ b/net/pear-Net_SMTP/Makefile
@@ -10,8 +10,8 @@ COMMENT=	PEAR class that provides an implementation of the SMTP protocol
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
 
 NO_ARCH=	yes
 USES=		pear
@@ -19,6 +19,6 @@ USES=		pear
 OPTIONS_DEFINE=	PEAR_AUTH_SASL
 PEAR_AUTH_SASL_DESC=	PEAR::Auth_SASL support
 
-PEAR_AUTH_SASL_BUILD_DEPENDS=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
+PEAR_AUTH_SASL_BUILD_DEPENDS=	${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL
 
 .include <bsd.port.mk>
diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile
index 9f26e320885f..5d8030c62468 100644
--- a/net/pear-Net_Sieve/Makefile
+++ b/net/pear-Net_Sieve/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class to handle talking to timsieved
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
 
 USES=	pear
 
diff --git a/net/pear-Net_Vpopmaild/Makefile b/net/pear-Net_Vpopmaild/Makefile
index f6240c2b6d6d..c01827aa5af0 100644
--- a/net/pear-Net_Vpopmaild/Makefile
+++ b/net/pear-Net_Vpopmaild/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	net mail pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Class for accessing Vpopmail's vpopmaild daemon
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/Log.php:sysutils/pear-Log
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/Log.php:sysutils/pear-Log
 
 USES=	pear
 
diff --git a/net/pear-Net_Whois/Makefile b/net/pear-Net_Whois/Makefile
index 6bd4797db675..283990d026c8 100644
--- a/net/pear-Net_Whois/Makefile
+++ b/net/pear-Net_Whois/Makefile
@@ -10,6 +10,6 @@ COMMENT=	Tool to query internet domain name services
 
 USES=	pear
 
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
 
 .include <bsd.port.mk>
diff --git a/net/pear-SOAP/Makefile b/net/pear-SOAP/Makefile
index ee068c72ac3f..abd18bb00b41 100644
--- a/net/pear-SOAP/Makefile
+++ b/net/pear-SOAP/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR SOAP Client/Server for PHP
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
 
 USES=	pear
 
@@ -18,8 +18,8 @@ PEAR_MAIL_DESC=	PEAR::Mail support
 PEAR_MAIL_MIME_DESC=	PEAR::Mail::Mime support
 PEAR_NET_DIME_DESC=	PEAR::Net::DIME support
 
-PEAR_MAIL_BUILD_DEPENDS=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail
-PEAR_MAIL_MIME_BUILD_DEPENDS=	${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
-PEAR_NET_DIME_BUILD_DEPENDS=	${PEARDIR}/Net/DIME.php:${PORTSDIR}/net/pear-Net_DIME
+PEAR_MAIL_BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail
+PEAR_MAIL_MIME_BUILD_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
+PEAR_NET_DIME_BUILD_DEPENDS=	${PEARDIR}/Net/DIME.php:net/pear-Net_DIME
 
 .include <bsd.port.mk>
diff --git a/net/pear-Services_Twitter/Makefile b/net/pear-Services_Twitter/Makefile
index 7d8b24ca8c2b..55c59e100dc7 100644
--- a/net/pear-Services_Twitter/Makefile
+++ b/net/pear-Services_Twitter/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP interface to Twitter's API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
 
 USE_PHP=	json simplexml mbstring
 
diff --git a/net/pear-XML_RPC2/Makefile b/net/pear-XML_RPC2/Makefile
index 27005dc546c6..e38b60562480 100644
--- a/net/pear-XML_RPC2/Makefile
+++ b/net/pear-XML_RPC2/Makefile
@@ -10,10 +10,10 @@ COMMENT=	XML-RPC client/server library
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite \
-		${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite \
-		${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \
+		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+RUN_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \
+		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
 
 USE_PHP=	curl
 USES=	pear
diff --git a/net/pecl-amqp/Makefile b/net/pecl-amqp/Makefile
index a56d6c916c43..9c9701557991 100644
--- a/net/pecl-amqp/Makefile
+++ b/net/pecl-amqp/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	PHP extension for AMQP API
 
-LIB_DEPENDS=	librabbitmq.so:${PORTSDIR}/net/rabbitmq-c-devel
+LIB_DEPENDS=	librabbitmq.so:net/rabbitmq-c-devel
 
 PHP_MODNAME=	${PORTNAME}
 USE_PHP=	yes
diff --git a/net/pecl-apn/Makefile b/net/pecl-apn/Makefile
index 138cd107ab91..9f3cbacfd186 100644
--- a/net/pecl-apn/Makefile
+++ b/net/pecl-apn/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Extension to interact with Apple Push Notification Service
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libcapn.so:${PORTSDIR}/net/libcapn
+LIB_DEPENDS=	libcapn.so:net/libcapn
 
 USE_PHP=	yes
 USE_PHPIZE=	yes
diff --git a/net/pecl-geoip/Makefile b/net/pecl-geoip/Makefile
index 0765387c6ceb..c0e326d5be78 100644
--- a/net/pecl-geoip/Makefile
+++ b/net/pecl-geoip/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Map IP address to geographic places
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/net/pecl-gupnp/Makefile b/net/pecl-gupnp/Makefile
index d1ca9b4cf2ec..76a89941d124 100644
--- a/net/pecl-gupnp/Makefile
+++ b/net/pecl-gupnp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GUPnP wrapper extension
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libgupnp-1.0.so:${PORTSDIR}/net/gupnp
+LIB_DEPENDS=	libgupnp-1.0.so:net/gupnp
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/net/pecl-ip2location/Makefile b/net/pecl-ip2location/Makefile
index bfdaf1648abe..4aa3b01695cf 100644
--- a/net/pecl-ip2location/Makefile
+++ b/net/pecl-ip2location/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Get geo location information of an IP address
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libIP2Location.so:${PORTSDIR}/net/ip2location
+LIB_DEPENDS=	libIP2Location.so:net/ip2location
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/net/pecl-mosquitto/Makefile b/net/pecl-mosquitto/Makefile
index e0f2a95172ad..8b4ec469d7ee 100644
--- a/net/pecl-mosquitto/Makefile
+++ b/net/pecl-mosquitto/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Extension for libmosquitto
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	mosquitto>=0:${PORTSDIR}/net/mosquitto
+BUILD_DEPENDS=	mosquitto>=0:net/mosquitto
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/net/pecl-oauth/Makefile b/net/pecl-oauth/Makefile
index 925ef334606c..15b9b9d37ff8 100644
--- a/net/pecl-oauth/Makefile
+++ b/net/pecl-oauth/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Php Interface to the OAuth Protocol
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/curl/curl.h:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	${LOCALBASE}/include/curl/curl.h:ftp/curl
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/pecl-yaz/Makefile b/net/pecl-yaz/Makefile
index f4c1d7b6cf7f..73bd4104e6ff 100644
--- a/net/pecl-yaz/Makefile
+++ b/net/pecl-yaz/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension that implements a Z39.50 client
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libyaz.so:${PORTSDIR}/net/yaz
+LIB_DEPENDS=	libyaz.so:net/yaz
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/net/pecl-zmq/Makefile b/net/pecl-zmq/Makefile
index 1332b73eaadc..d6f78862aab6 100644
--- a/net/pecl-zmq/Makefile
+++ b/net/pecl-zmq/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PHP bindings for ZeroMQ
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq4
+LIB_DEPENDS=	libzmq.so:net/libzmq4
 
 USES=		tar:tgz pkgconfig
 USE_PHP=	yes
diff --git a/net/pen/Makefile b/net/pen/Makefile
index f44ab9dc5ba8..c48b0fb2cfad 100644
--- a/net/pen/Makefile
+++ b/net/pen/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://siag.nu/pub/pen/
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Load balancer for UDP and TCP based protocols
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index 32a1629de193..33ca03ff3742 100644
--- a/net/pjsip/Makefile
+++ b/net/pjsip/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Multimedia communication library written in C language
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 CONFLICTS=	pjsip-extsrtp-[0-9]*
 
@@ -44,39 +44,39 @@ EXTSRTP_DESC=	Use libsrtp port (needed to get SRTP support in asterisk13 pjsip b
 OPTIONS_SUB=	yes
 
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg
-FFMPEG_LIB_DEPENDS=		libswresample.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=		libswresample.so:multimedia/ffmpeg
 G711_CONFIGURE_ENABLE=		g711-codec
 G722_CONFIGURE_ENABLE=		g722-codec
 G7221_CONFIGURE_ENABLE=		g7221-codec
 GSM_CONFIGURE_ENABLE=		gsm-codec
-GSM_LIB_DEPENDS=		libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
 GSM_CONFIGURE_ON=		--with-external-gsm
 ILBC_CONFIGURE_ENABLE=		ilbc-codec
 L16_CONFIGURE_ENABLE=		l16-codec
 OPENH264_CONFIGURE_ENABLE=	openh264
-OPENH264_LIB_DEPENDS=		libopenh264.so:${PORTSDIR}/multimedia/openh264
+OPENH264_LIB_DEPENDS=		libopenh264.so:multimedia/openh264
 RESAMPLE_CONFIGURE_ENABLE=	resample
 RESAMPLEDLL_CONFIGURE_ENABLE=	resample-dll
 SAMPLERATE_CONFIGURE_ENABLE=	libsamplerate
-SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
 SDL_CONFIGURE_ENABLE=		sdl
 SDL_USE=			SDL=sdl
 SHARED_CONFIGURE_ENABLE=	shared
 SPEEX_CONFIGURE_ENABLE=		speex-codec
 SPEEX_CONFIGURE_ON=		--with-external-speex
-SPEEX_LIB_DEPENDS=		libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex
 SPEEXAEC_CONFIGURE_ENABLE=	speex-aec
 V4L_CONFIGURE_ENABLE=		v4l2
-V4L_BUILD_DEPENDS=		v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS=		libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS=		v4l_compat>=0:multimedia/v4l_compat
+V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
 IPV6_CFLAGS=			"-DPJ_HAS_IPV6=1"
 SOUND_CONFIGURE_ENABLE=		sound
 VIDEO_CONFIGURE_ENABLE=		video
 AMR_CONFIGURE_WITH=		opencore-amr
-AMR_LIB_DEPENDS=		libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr \
-				libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
+AMR_LIB_DEPENDS=		libopencore-amrwb.so:audio/opencore-amr \
+				libvo-amrwbenc.so:audio/vo-amrwbenc
 EXTSRTP_CONFIGURE_WITH=		external-srtp
-EXTSRTP_LIB_DEPENDS=		libsrtp.so:${PORTSDIR}/net/libsrtp
+EXTSRTP_LIB_DEPENDS=		libsrtp.so:net/libsrtp
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
diff --git a/net/pktanon/Makefile b/net/pktanon/Makefile
index 43e05269b1ba..ffc7300bdc93 100644
--- a/net/pktanon/Makefile
+++ b/net/pktanon/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-dev
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Network trace anonymizer
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
+		libxerces-c.so.3:textproc/xerces-c3
 
 USES=		dos2unix
 GNU_CONFIGURE=	yes
diff --git a/net/polyorb/Makefile b/net/polyorb/Makefile
index 25ed925e6c60..7cd9a8d14bc5 100644
--- a/net/polyorb/Makefile
+++ b/net/polyorb/Makefile
@@ -13,7 +13,7 @@ COMMENT=	CORBA, SOAP, Ada 95 Distributed System Annex middleware
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	xmlada>=3.2:${PORTSDIR}/textproc/xmlada
+BUILD_DEPENDS=	xmlada>=3.2:textproc/xmlada
 
 USES=		ada gmake python:build shebangfix
 GNU_CONFIGURE=	yes
@@ -45,7 +45,7 @@ OPTIONS_DEFINE=	DOCS TESTSUITE
 OPTIONS_SUB=	TESTSUITE
 
 TESTSUITE_ALL_TARGET=	testsuite
-TESTSUITE_BUILD_DEPENDS=gnatpython>=20101207:${PORTSDIR}/devel/gnatpython
+TESTSUITE_BUILD_DEPENDS=gnatpython>=20101207:devel/gnatpython
 TESTSUITE_DESC=		Enable 'make run-testsuite' target
 
 
diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile
index 23da4d5d2c57..d3d50a7f02b8 100644
--- a/net/prosearch/Makefile
+++ b/net/prosearch/Makefile
@@ -45,24 +45,24 @@ SPHINX_DESC=		sphinx fulltext search engine
 .include <bsd.port.options.mk>
 
 RUN_DEPENDS+=\
-p5-lib-abs>=0:${PORTSDIR}/devel/p5-lib-abs
+p5-lib-abs>=0:devel/p5-lib-abs
 
 .if ${PORT_OPTIONS:MCRAWLER}
 RUN_DEPENDS+=\
-p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-p5-URI>=0:${PORTSDIR}/net/p5-URI \
-p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-nmap:${PORTSDIR}/security/nmap \
-p5-Net-DirectConnect>=0:${PORTSDIR}/net-p2p/p5-Net-DirectConnect
+p5-libwww>=0:www/p5-libwww \
+p5-URI>=0:net/p5-URI \
+p5-DBI>=0:databases/p5-DBI \
+p5-HTML-Parser>=0:www/p5-HTML-Parser \
+nmap:security/nmap \
+p5-Net-DirectConnect>=0:net-p2p/p5-Net-DirectConnect
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
-RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-smbclient
+RUN_DEPENDS+=	smbclient:net/samba-smbclient
 .endif
 
 .if ${PORT_OPTIONS:MRSYNC}
-RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS+=	rsync:net/rsync
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
@@ -71,30 +71,30 @@ USE_APACHE_RUN=	22+
 
 .if ${PORT_OPTIONS:MNGINX}
 RUN_DEPENDS+=\
-nginx:${PORTSDIR}/www/nginx
+nginx:www/nginx
 .endif
 
 .if ${PORT_OPTIONS:MMOD_PERL2}
 RUN_DEPENDS+=\
-${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2
+${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:www/mod_perl2
 .endif
 
 .if ${PORT_OPTIONS:MMOD_FASTCGI}
 RUN_DEPENDS+=\
-${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi	\
-p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
+${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi	\
+p5-FCGI>=0:www/p5-FCGI
 .endif
 
 .if ${PORT_OPTIONS:MSPHINX}
 WITH_MYSQL=	client	# for dbi
 RUN_DEPENDS+=\
-searchd:${PORTSDIR}/textproc/sphinxsearch-devel
+searchd:textproc/sphinxsearch-devel
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	client
 RUN_DEPENDS+=\
-p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MDB} && ${PORT_OPTIONS:MMYSQL}
@@ -103,24 +103,24 @@ USE_MYSQL=	server
 
 .if ${PORT_OPTIONS:MMARIA}
 RUN_DEPENDS+=\
-p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-${LOCALBASE}bin/mysql:${PORTSDIR}/databases/mariadb-client
+p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+${LOCALBASE}bin/mysql:databases/mariadb-client
 .endif
 
 .if ${PORT_OPTIONS:MDB} && ${PORT_OPTIONS:MMARIA}
 RUN_DEPENDS+=\
-${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mariadb-server
+${LOCALBASE}/libexec/mysqld:databases/mariadb-server
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 RUN_DEPENDS+=\
-p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MPGPP}
 RUN_DEPENDS+=\
-p5-DBD-PgPP>=0:${PORTSDIR}/databases/p5-DBD-PgPP
+p5-DBD-PgPP>=0:databases/p5-DBD-PgPP
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MPGPP} || ${PORT_OPTIONS:MDB}
@@ -131,7 +131,7 @@ WANT_PGSQL=	client server
 .if ${PORT_OPTIONS:MSQLITE}
 USES+=	sqlite
 RUN_DEPENDS+=\
-p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 .endif
 
 WRKSRC=	${WRKDIR}/search
diff --git a/net/ptpd2/Makefile b/net/ptpd2/Makefile
index 2b800182c836..13920f654bf9 100644
--- a/net/ptpd2/Makefile
+++ b/net/ptpd2/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	DOCS SNMP
 OPTIONS_DEFAULT=SNMP
 
 SNMP_CONFIGURE_ENABLE=	snmp
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
diff --git a/net/pwhois/Makefile b/net/pwhois/Makefile
index 5d5302e4cd45..c4daf669bbb7 100644
--- a/net/pwhois/Makefile
+++ b/net/pwhois/Makefile
@@ -12,14 +12,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Whois-compatible framework for disclosing routing data
 
-RUN_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-Time-Format>0:${PORTSDIR}/devel/p5-Time-Format \
-		p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-Telnet>0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		p5-RPSL-Parser>0:${PORTSDIR}/devel/p5-RPSL-Parser \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-DBI>0:databases/p5-DBI \
+		p5-Time-Format>0:devel/p5-Time-Format \
+		p5-Log-Dispatch>0:devel/p5-Log-Dispatch \
+		p5-Net-DNS>0:dns/p5-Net-DNS \
+		p5-Net-Telnet>0:net/p5-Net-Telnet \
+		p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR \
+		p5-RPSL-Parser>0:devel/p5-RPSL-Parser \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 FETCH_ARGS=	-p
 
diff --git a/net/py-GeoIP/Makefile b/net/py-GeoIP/Makefile
index 20398e7ed9cf..391c0898d7e7 100644
--- a/net/py-GeoIP/Makefile
+++ b/net/py-GeoIP/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mapping of IP addresses/hostnames to country names in Python
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/net/py-GeoIP2/Makefile b/net/py-GeoIP2/Makefile
index fe9efc227634..b1553297c5cd 100644
--- a/net/py-GeoIP2/Makefile
+++ b/net/py-GeoIP2/Makefile
@@ -13,8 +13,8 @@ COMMENT=	MaxMind GeoIP2 Python API
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}maxminddb>=1.1.0:${PORTSDIR}/net/py-maxminddb \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.4:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}maxminddb>=1.1.0:net/py-maxminddb \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
diff --git a/net/py-amqp/Makefile b/net/py-amqp/Makefile
index e0fad29f7d3b..16dea56dbba5 100644
--- a/net/py-amqp/Makefile
+++ b/net/py-amqp/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Low-level AMQP client for Python (fork of amqplib)
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>=0.4.0:${PORTSDIR}/devel/py-unittest2 \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}coverage>0:${PORTSDIR}/devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>=0.4.0:devel/py-unittest2 \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 LICENSE=	LGPL21
 
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 74dee1bbc026..f0549a8b4709 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -10,11 +10,11 @@ PKGNAMESUFFIX=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python interface to the Avahi mDNS system
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:${PORTSDIR}/databases/py-gdbm \
-		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
-LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:${PORTSDIR}/databases/py-gdbm \
-		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
+LIB_DEPENDS=	libavahi-client.so:net/avahi-app
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-python
diff --git a/net/py-beanstalkc/Makefile b/net/py-beanstalkc/Makefile
index af90bb637b1c..9830731d9a98 100644
--- a/net/py-beanstalkc/Makefile
+++ b/net/py-beanstalkc/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple beanstalkd client library for Python
 
 LICENSE=	APACHE20
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=		YAML
 OPTIONS_DEFAULT=	YAML
 YAML_DESC=		Support parsing YAML responses
 
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 
 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/net/py-ec2-cli-tools/Makefile b/net/py-ec2-cli-tools/Makefile
index 12712a1f44be..cc781a685d25 100644
--- a/net/py-ec2-cli-tools/Makefile
+++ b/net/py-ec2-cli-tools/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Helpful CLI utilities for querying and connecting to EC2 instances
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>=1.0:${PORTSDIR}/devel/py-boto \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>=1.0:devel/py-boto \
+		bash:shells/bash
 
 USE_PYTHON=	distutils autoplist
 USES=		python shebangfix
diff --git a/net/py-eventlet/Makefile b/net/py-eventlet/Makefile
index 1567c4a16cdb..1ea6de04f4c5 100644
--- a/net/py-eventlet/Makefile
+++ b/net/py-eventlet/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Concurrent networking library for Python
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:${PORTSDIR}/devel/py-greenlet
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:devel/py-greenlet
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile
index cbdb66fa1367..717db1842fa1 100644
--- a/net/py-gntp/Makefile
+++ b/net/py-gntp/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 PYDISTUTILS_BUILD_TARGET+=	build_sphinx
 
diff --git a/net/py-gspread/Makefile b/net/py-gspread/Makefile
index 0d2aa8ff7383..ec1c68efa42f 100644
--- a/net/py-gspread/Makefile
+++ b/net/py-gspread/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Google Spreadsheets Python API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 USES=	python:2
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-gspreadsheet/Makefile b/net/py-gspreadsheet/Makefile
index 820db3099d97..ee19655a163b 100644
--- a/net/py-gspreadsheet/Makefile
+++ b/net/py-gspreadsheet/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Wrapper around Google Spreadsheets to look like csv.DictReader
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=	python:2
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile
index 3569c59c694b..60884e7ffca1 100644
--- a/net/py-impacket/Makefile
+++ b/net/py-impacket/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Collection of Python classes providing access to network packets
 LICENSE=	APACHE11
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}pcapy>=0:${PORTSDIR}/net/py-pcapy \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}pcapy>=0:net/py-pcapy \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
 
 USES=		dos2unix python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-kafka-python/Makefile b/net/py-kafka-python/Makefile
index daebba05d4ce..63457e5a9b68 100644
--- a/net/py-kafka-python/Makefile
+++ b/net/py-kafka-python/Makefile
@@ -15,6 +15,6 @@ LICENSE=	APACHE20
 USE_PYTHON=	autoplist distutils
 USES=		python shebangfix
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 .include <bsd.port.mk>
diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index 828ea6bff706..00565dfdc731 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -12,8 +12,8 @@ COMMENT=	AMQP messaging framework for Python
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=1.4.7:${PORTSDIR}/net/py-amqp \
-		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:${PORTSDIR}/devel/py-anyjson
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=1.4.7:net/py-amqp \
+		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson
 
 OPTIONS_DEFINE=	BEANSTALK BOTO MONGODB REDIS SQLALCHEMY ZMQ
 
@@ -24,12 +24,12 @@ REDIS_DESC=	Include Redis transport support
 SQLALCHEMY_DESC=Include SQLAlchemy transport support
 ZMQ_DESC=	Include ZMQ transport support
 
-BEANSTALK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beanstalkc>0:${PORTSDIR}/net/py-beanstalkc
-BOTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:${PORTSDIR}/devel/py-boto
-MONGODB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>0:${PORTSDIR}/databases/pymongo
-REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>0:${PORTSDIR}/databases/py-redis
-SQLALCHEMY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlalchemy
-ZMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:${PORTSDIR}/net/py-pyzmq
+BEANSTALK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beanstalkc>0:net/py-beanstalkc
+BOTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto
+MONGODB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo
+REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis
+SQLALCHEMY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy
+ZMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq
 
 
 USES=		python
diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile
index bf4203a58822..947088c7ca41 100644
--- a/net/py-ldap/Makefile
+++ b/net/py-ldap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	LDAP module for python, for OpenLDAP2
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:${PORTSDIR}/devel/py-pyasn1-modules
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules
 
 CONFLICTS_INSTALL=	py27-pyldap
 USES=		python:2
diff --git a/net/py-ldap3/Makefile b/net/py-ldap3/Makefile
index fb8f14176e4c..ef9922832782 100644
--- a/net/py-ldap3/Makefile
+++ b/net/py-ldap3/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Strictly RFC 4511 conforming LDAP V3 pure Python client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:${PORTSDIR}/devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net/py-ldaptor/Makefile b/net/py-ldaptor/Makefile
index bfe056d2f948..edca6a82c50d 100644
--- a/net/py-ldaptor/Makefile
+++ b/net/py-ldaptor/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	ldaptor-${PORTVERSION}-${GITVERSION}
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Pure-python LDAP module for Twisted
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:${PORTSDIR}/devel/py-pyparsing \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 
 GITVERSION=	aad8ded658b36337a08aeb7402b6b67eb8771bea
 
diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index d8951312202b..fd91dab1c847 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -6,7 +6,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python module for libdnet
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
+LIB_DEPENDS=	libdnet.so:net/libdnet
 
 NOT_FOR_ARCHS=	ia64
 NOT_FOR_ARCHS_REASON_ia64=	fails to build with internal compiler error
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index 33787320f076..0352bbf63d49 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python module for the libnet packet construction library
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 USES=		python
 USE_PYTHON=	distutils pythonprefix
diff --git a/net/py-matrix-synapse/Makefile b/net/py-matrix-synapse/Makefile
index 5df844ae0803..e5cd5f5c4fb9 100644
--- a/net/py-matrix-synapse/Makefile
+++ b/net/py-matrix-synapse/Makefile
@@ -14,29 +14,29 @@ COMMENT=	Matrix protocol reference homeserver
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}frozendict>=0.4:${PORTSDIR}/devel/py-frozendict \
-		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:${PORTSDIR}/devel/py-unpaddedbase64 \
-		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:${PORTSDIR}/devel/py-canonicaljson \
-		${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:${PORTSDIR}/security/py-signedjson \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:${PORTSDIR}/security/py-pynacl \
-		${PYTHON_PKGNAMEPREFIX}service_identity>=1.0.0:${PORTSDIR}/security/py-service_identity \
-		${PYTHON_PKGNAMEPREFIX}twisted>=15.1.0:${PORTSDIR}/devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.14:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>0:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}daemonize>0:${PORTSDIR}/devel/py-daemonize \
-		${PYTHON_PKGNAMEPREFIX}bcrypt>0:${PORTSDIR}/security/py-bcrypt \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pydenticon>0:${PORTSDIR}/devel/py-pydenticon \
-		${PYTHON_PKGNAMEPREFIX}ujson>0:${PORTSDIR}/devel/py-ujson \
-		${PYTHON_PKGNAMEPREFIX}blist>0:${PORTSDIR}/devel/py-blist \
-		${PYTHON_PKGNAMEPREFIX}pysaml2>0:${PORTSDIR}/security/py-pysaml2 \
-		${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>0:${PORTSDIR}/security/py-pymacaroons-pynacl \
-		${PYTHON_PKGNAMEPREFIX}simplejson>0:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>0:${PORTSDIR}/devel/py-matrix-angular-sdk
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>0:${PORTSDIR}/devel/py-virtualenv \
-		${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}frozendict>=0.4:devel/py-frozendict \
+		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64 \
+		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson \
+		${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson \
+		${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
+		${PYTHON_PKGNAMEPREFIX}service_identity>=1.0.0:security/py-service_identity \
+		${PYTHON_PKGNAMEPREFIX}twisted>=15.1.0:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}daemonize>0:devel/py-daemonize \
+		${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}pydenticon>0:devel/py-pydenticon \
+		${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson \
+		${PYTHON_PKGNAMEPREFIX}blist>0:devel/py-blist \
+		${PYTHON_PKGNAMEPREFIX}pysaml2>0:security/py-pysaml2 \
+		${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>0:security/py-pymacaroons-pynacl \
+		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>0:devel/py-matrix-angular-sdk
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv \
+		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/net/py-maxminddb/Makefile b/net/py-maxminddb/Makefile
index 6393589bf396..69471070d531 100644
--- a/net/py-maxminddb/Makefile
+++ b/net/py-maxminddb/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python module for reading MaxMind DB file
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libmaxminddb.so:${PORTSDIR}/net/libmaxminddb
+LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
@@ -26,7 +26,7 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr
 .endif
 
 post-install:
diff --git a/net/py-miniupnpc/Makefile b/net/py-miniupnpc/Makefile
index 490384db8150..3d082fd348cb 100644
--- a/net/py-miniupnpc/Makefile
+++ b/net/py-miniupnpc/Makefile
@@ -5,7 +5,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python module for miniupnpc
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/miniupnpc:build
+BUILD_DEPENDS=	${NONEXISTENT}:net/miniupnpc:build
 
 MASTERDIR=	${.CURDIR}/../miniupnpc
 
diff --git a/net/py-msrplib/Makefile b/net/py-msrplib/Makefile
index 0ada5a8584ff..b95e3aa32ed9 100644
--- a/net/py-msrplib/Makefile
+++ b/net/py-msrplib/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Python MSRP client library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gnutls>=1.1.6:${PORTSDIR}/security/py-gnutls \
-		${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.15:${PORTSDIR}/net/py-eventlet \
-		${PYTHON_PKGNAMEPREFIX}application>=1.1.0:${PORTSDIR}/devel/py-application
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gnutls>=1.1.6:security/py-gnutls \
+		${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.15:net/py-eventlet \
+		${PYTHON_PKGNAMEPREFIX}application>=1.1.0:devel/py-application
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python twisted:names
diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg_httpsclient/Makefile
index d0636f21aa12..5de2325c006c 100644
--- a/net/py-ndg_httpsclient/Makefile
+++ b/net/py-ndg_httpsclient/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Enhance HTTPS support for httplib and urllib2
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/net/py-netif/Makefile b/net/py-netif/Makefile
index da20e73b5785..093df51327fb 100644
--- a/net/py-netif/Makefile
+++ b/net/py-netif/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Python network configuration library for FreeBSD
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	cython>0:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython>0:lang/cython
 
 USE_GITHUB=     yes
 GH_ACCOUNT=	freenas
@@ -24,7 +24,7 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100036
diff --git a/net/py-netlib/Makefile b/net/py-netlib/Makefile
index 042f5c76efcf..1b1d545cd707 100644
--- a/net/py-netlib/Makefile
+++ b/net/py-netlib/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Collection of network utilities
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-novaclient/Makefile b/net/py-novaclient/Makefile
index f8b665885841..c03427ccefa9 100644
--- a/net/py-novaclient/Makefile
+++ b/net/py-novaclient/Makefile
@@ -11,17 +11,17 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Client for the OpenStack Nova API
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argparse>=0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.9:${PORTSDIR}/devel/py-iso8601 \
-		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:${PORTSDIR}/devel/py-keystoneauth1 \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=1.5.0:${PORTSDIR}/devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:${PORTSDIR}/devel/py-oslo.serialization \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.2.0:${PORTSDIR}/devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}prettytable>=0:${PORTSDIR}/devel/py-prettytable \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.8.1:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.9:devel/py-iso8601 \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1 \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=1.5.0:devel/py-oslo.i18n \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.2.0:devel/py-oslo.utils \
+		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.8.1:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
 
 USES=		python shebangfix
 SHEBANG_FILES=	novaclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-oauth2/Makefile b/net/py-oauth2/Makefile
index 0c44f743db89..2e4d4a51daba 100644
--- a/net/py-oauth2/Makefile
+++ b/net/py-oauth2/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Python library for OAuth version 1.0
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}coverage>0:${PORTSDIR}/devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=		TESTS
 TESTS_DESC=		Install test suite requirements
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index 5619b559fbf4..81cbb8d7653b 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python interface to LBL Packet Capture library (libpcap)
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS=	swig:devel/swig13
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-pcs/Makefile b/net/py-pcs/Makefile
index 4b6c3bf4c76e..65bc96dfa99c 100644
--- a/net/py-pcs/Makefile
+++ b/net/py-pcs/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD3CLAUSE
 PORTDOCS=	pcs.pdf
 PORTEXAMPLES=	*
 
-BUILD_DEPENDS=	cython>=0.11.2:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython>=0.11.2:lang/cython
 
 USES=		python
 USE_PYTHON=	distutils pythonprefix
diff --git a/net/py-port-for/Makefile b/net/py-port-for/Makefile
index 43746c84d743..5d4be49b8e96 100644
--- a/net/py-port-for/Makefile
+++ b/net/py-port-for/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Utility that helps with local TCP ports managment
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=0.8:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
diff --git a/net/py-pyldap/Makefile b/net/py-pyldap/Makefile
index 8af3781cd94b..2b8b33349bf7 100644
--- a/net/py-pyldap/Makefile
+++ b/net/py-pyldap/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Fork of python-ldap with Python 3 support
 
 LICENSE=	PSFL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:${PORTSDIR}/devel/py-pyasn1-modules
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules
 
 CONFLICTS_INSTALL=	py27-ldap
 USES=		python
diff --git a/net/py-pynmsg/Makefile b/net/py-pynmsg/Makefile
index 0c6fcd8291a5..59b182be9ffb 100644
--- a/net/py-pynmsg/Makefile
+++ b/net/py-pynmsg/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python wrapper for net/nmsg
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libnmsg.so:${PORTSDIR}/net/nmsg
+LIB_DEPENDS=	libnmsg.so:net/nmsg
 
 USE_PYTHON=	autoplist distutils
 USES=		pkgconfig python shebangfix uniquefiles:dirs
diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile
index 9ea9c3a76773..66c1328b3d41 100644
--- a/net/py-pynsq/Makefile
+++ b/net/py-pynsq/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Official Python client library for NSQ
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>0:${PORTSDIR}/www/py-tornado
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}python-snappy>0:${PORTSDIR}/archivers/py-python-snappy \
-		${PYTHON_PKGNAMEPREFIX}simplejson>0:${PORTSDIR}/devel/py-simplejson
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy \
+		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson
 
 USES=		python:-2.7
 USE_GITHUB=	yes
diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile
index f2edbd65f899..f29b84e962bd 100644
--- a/net/py-pypcap/Makefile
+++ b/net/py-pypcap/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Simplified object-oriented Python extension module for libpcap
 
-BUILD_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex
+BUILD_DEPENDS=	pyrexc:devel/pyrex
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-pysmb/Makefile b/net/py-pysmb/Makefile
index e0d98b7d5cf9..ba63008a4ab4 100644
--- a/net/py-pysmb/Makefile
+++ b/net/py-pysmb/Makefile
@@ -15,7 +15,7 @@ COMMENT=	SMB/CIFS library written in Python
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:${PORTSDIR}/devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net/py-pyvmomi/Makefile b/net/py-pyvmomi/Makefile
index 373de4cbb467..0c1e10fb0862 100644
--- a/net/py-pyvmomi/Makefile
+++ b/net/py-pyvmomi/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Python SDK for the VMware vSphere API of ESX, ESXi, and vCenter
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-pyzmq/Makefile b/net/py-pyzmq/Makefile
index e4a36b3eee44..41dbe853754a 100644
--- a/net/py-pyzmq/Makefile
+++ b/net/py-pyzmq/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python bindings for ZeroMQ
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq4
+LIB_DEPENDS=	libzmq.so:net/libzmq4
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -21,7 +21,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} == 3.3
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}asyncio>0:${PORTSDIR}/devel/py-asyncio
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio
 .endif
 
 pre-configure:
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index ed5efaf5e5f6..73cf3020a1b3 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtNetwork 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/net/py-qt5-network/Makefile b/net/py-qt5-network/Makefile
index 7978b6a7deec..15098a27c737 100644
--- a/net/py-qt5-network/Makefile
+++ b/net/py-qt5-network/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtNetwork 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/net/py-ripe.atlas.cousteau/Makefile b/net/py-ripe.atlas.cousteau/Makefile
index d729600b1eef..042ed37d277d 100644
--- a/net/py-ripe.atlas.cousteau/Makefile
+++ b/net/py-ripe.atlas.cousteau/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Python wrapper around the RIPE Atlas API
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:${PORTSDIR}/net/py-socketio-client \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:net/py-socketio-client \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests
 
 USES=	python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-ripe.atlas.sagan/Makefile b/net/py-ripe.atlas.sagan/Makefile
index d4d7c472cdfb..4ec1a06f312e 100644
--- a/net/py-ripe.atlas.sagan/Makefile
+++ b/net/py-ripe.atlas.sagan/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Parsing library for RIPE Atlas measurement results
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}ipy>=0:${PORTSDIR}/net-mgmt/py-ipy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-ripe.atlas.tools/Makefile b/net/py-ripe.atlas.tools/Makefile
index c5d8c2a91be2..04c3e819370c 100644
--- a/net/py-ripe.atlas.tools/Makefile
+++ b/net/py-ripe.atlas.tools/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Official command-line client for RIPE Atlas
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=1.0.4:${PORTSDIR}/net/py-ripe.atlas.cousteau \
-		${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.1.4:${PORTSDIR}/net/py-ripe.atlas.sagan \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>0:${PORTSDIR}/devel/py-tzlocal \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=1.0.4:net/py-ripe.atlas.cousteau \
+		${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.1.4:net/py-ripe.atlas.sagan \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index afa41fa75aa6..c11c7ea207da 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Unix-like tools to manipulate stored files from the command line
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-s3transfer/Makefile b/net/py-s3transfer/Makefile
index 361c89584078..9f7694e69985 100644
--- a/net/py-s3transfer/Makefile
+++ b/net/py-s3transfer/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Amazon S3 Transfer Manager for Python
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.3.0:${PORTSDIR}/devel/py-botocore
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.3.0:devel/py-botocore
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -20,7 +20,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>=2.2.0:${PORTSDIR}/devel/py-futures
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>=2.2.0:devel/py-futures
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 6f695b2ee081..3d47f0c8de1a 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -13,8 +13,8 @@ COMMENT=	SOAP Services for Python
 # Actual LICENSE is in GH Repo but not in pypi release
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>0:${PORTSDIR}/devel/py-defusedxml \
-		${PYTHON_PKGNAMEPREFIX}wstools>0:${PORTSDIR}/textproc/py-wstools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml \
+		${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-socketio-client/Makefile b/net/py-socketio-client/Makefile
index 5a3143e57bf6..0b2a656af498 100644
--- a/net/py-socketio-client/Makefile
+++ b/net/py-socketio-client/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Socket.io client library for Python
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}websocket-client>0:${PORTSDIR}/www/py-websocket-client
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-terminado/Makefile b/net/py-terminado/Makefile
index eaf9b78b4b8b..2743aeee34f3 100644
--- a/net/py-terminado/Makefile
+++ b/net/py-terminado/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Terminals served to term.js using Tornado websockets
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ptyprocess>0:${PORTSDIR}/sysutils/py-ptyprocess \
-		${PYTHON_PKGNAMEPREFIX}tornado>0:${PORTSDIR}/www/py-tornado
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess \
+		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-tweepy/Makefile b/net/py-tweepy/Makefile
index 4e46b6dacec9..06be9c89446b 100644
--- a/net/py-tweepy/Makefile
+++ b/net/py-tweepy/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Twitter API library for Python!
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:${PORTSDIR}/devel/py-pip
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:${PORTSDIR}/www/py-requests-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}six>=1.7.3:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:www/py-requests-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/net/py-twitter-tools/Makefile b/net/py-twitter-tools/Makefile
index a6d40bf3e76d..4e382b8c45d3 100644
--- a/net/py-twitter-tools/Makefile
+++ b/net/py-twitter-tools/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	-tools
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Python API and command-line toolset for Twitter
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/net/py-twitter/Makefile b/net/py-twitter/Makefile
index f260b3f54db7..106625a60857 100644
--- a/net/py-twitter/Makefile
+++ b/net/py-twitter/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python wrapper around the Twitter API
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:${PORTSDIR}/www/py-requests-oauthlib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net/py-txamqp/Makefile b/net/py-txamqp/Makefile
index 456bc8dd4f32..fdc87f83b005 100644
--- a/net/py-txamqp/Makefile
+++ b/net/py-txamqp/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	python-${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	horus.li@gmail.com
 COMMENT=	Twisted Python library for the AMQP messaging protocol
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift
 
 USES=		python:2 twisted
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index a77421aa2cb9..1037630f7425 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Enhance HTTP Python's standard library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:${PORTSDIR}/security/py-certifi \
-	${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.0:${PORTSDIR}/net/py-pysocks
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi \
+	${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.0:net/py-pysocks
 
 USES=	python
 USE_PYTHON=	distutils autoplist
@@ -24,7 +24,7 @@ NO_ARCH=	yes
 
 # ndg_httpclient is only available for Python 2
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.4.0:${PORTSDIR}/net/py-ndg_httpsclient
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.4.0:net/py-ndg_httpsclient
 .endif
 
 post-extract:
diff --git a/net/py-wolframalpha/Makefile b/net/py-wolframalpha/Makefile
index 5761fd47b303..41906cbbe42a 100644
--- a/net/py-wolframalpha/Makefile
+++ b/net/py-wolframalpha/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Python Client for Wolfram Alpha
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools \
-		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \
+		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
 
 USES=	python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-zope.proxy/Makefile b/net/py-zope.proxy/Makefile
index 09b97f792f88..5506393e8a59 100644
--- a/net/py-zope.proxy/Makefile
+++ b/net/py-zope.proxy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Generic Transparent Proxies
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/net/pynids/Makefile b/net/pynids/Makefile
index d612932d7288..c5686bea1272 100644
--- a/net/pynids/Makefile
+++ b/net/pynids/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	python
 MAINTAINER=	corsmith@gmail.com
 COMMENT=	Python interface to libnids
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 USES=		pkgconfig python
 USE_GNOME=	glib20
diff --git a/net/qoauth/Makefile b/net/qoauth/Makefile
index c30250d1a3ac..2b6fe832d394 100644
--- a/net/qoauth/Makefile
+++ b/net/qoauth/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4 support for OAuth-powered network services
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	libqca.so:devel/qca
 
 USES=		qmake tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index 874544a28d75..9146a78e9ac8 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt network module
 
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USE_QT4=	qmake_build moc_build rcc_build corelib
 QT_DIST=	yes
diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile
index 837dfabbb9cb..aaf22806fcf3 100644
--- a/net/qt5-network/Makefile
+++ b/net/qt5-network/Makefile
@@ -8,8 +8,8 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt network module
 
-LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+LIB_DEPENDS=	libproxy.so:net/libproxy
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USE_OPENSSL=	yes
 USE_QT5=	core qmake_build buildtools_build
diff --git a/net/qtweetlib/Makefile b/net/qtweetlib/Makefile
index c46379a21607..0c2e22c1eadc 100644
--- a/net/qtweetlib/Makefile
+++ b/net/qtweetlib/Makefile
@@ -10,7 +10,7 @@ COMMENT=	C++ Qt based Twitter library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 GH_ACCOUNT=	minimoog
 GH_PROJECT=	QTweetLib
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 5fec5d6d54a3..668e310ac1e9 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+BUILD_DEPENDS=	gawk:lang/gawk
 
 CONFLICTS=	openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]*
 
@@ -68,9 +68,9 @@ PAM_CONFIGURE_WITH=	libpam
 OSPF_OPAQUE_LSA_CONFIGURE_ENABLE=	opaque-lsa
 RTADV_CONFIGURE_ENABLE=	rtadv
 SNMP_CONFIGURE_ENABLE=	snmp
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 TCPSOCKETS_CONFIGURE_ENABLE=	tcp-zebra
-DLMALLOC_LIB_DEPENDS=	libdlmalloc.so:${PORTSDIR}/devel/libdlmalloc
+DLMALLOC_LIB_DEPENDS=	libdlmalloc.so:devel/libdlmalloc
 DLMALLOC_LIBS=		-L${LOCALBASE}/lib -ldlmalloc
 OSPF_NEXTHOP_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ospf-nexthop
 # inverse option.
diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index 0a524b8ec330..08862734381a 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	RabbitMQ C AMQP client library
 LICENSE=	GPLv2 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson
 
 CONFLICTS=	rabbitmq-c-[0-9]*
 
@@ -25,7 +25,7 @@ GH_ACCOUNT=	alanxz
 OPTIONS_DEFINE=	POPT
 OPTIONS_SUB=	yes
 POPT_DESC=	Popt support in tools
-POPT_LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+POPT_LIB_DEPENDS=	libpopt.so:devel/popt
 POPT_CFLAGS=	-I${LOCALBASE}/include
 POPT_LDFLAGS=	-L${LOCALBASE}/lib
 
diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile
index a75ecb4cb9ce..8d5f1c8b73a8 100644
--- a/net/rabbitmq-c/Makefile
+++ b/net/rabbitmq-c/Makefile
@@ -18,8 +18,8 @@ COMMENT=	RabbitMQ C AMQP client library
 LICENSE=	GPLv2 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson
+BUILD_DEPENDS=	python:lang/python \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson
 
 CONFLICTS=	rabbitmq-c-devel-[0-9]*
 
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-64-bit
 .endif
 
 .if ${PORT_OPTIONS:MPOPT}
-LIB_DEPENDS+=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS+=	libpopt.so:devel/popt
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 36690b139c48..9110bfa9524b 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -12,13 +12,13 @@ COMMENT=	RabbitMQ is an implementation of AMQP
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \
-		xmlto:${PORTSDIR}/textproc/xmlto \
-		unzip:${PORTSDIR}/archivers/unzip \
-		zip:${PORTSDIR}/archivers/zip \
-		rsync:${PORTSDIR}/net/rsync
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:lang/erlang \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \
+		xmlto:textproc/xmlto \
+		unzip:archivers/unzip \
+		zip:archivers/zip \
+		rsync:net/rsync
+RUN_DEPENDS=	erl:lang/erlang
 
 OPTIONS_DEFINE=	ADMIN
 OPTIONS_SUB=	yes
diff --git a/net/radiator/Makefile b/net/radiator/Makefile
index 876bfd24a8dd..7bb4feda0a95 100644
--- a/net/radiator/Makefile
+++ b/net/radiator/Makefile
@@ -32,7 +32,7 @@ IGNORE=		will not be automatically fetched due to licensing\
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 pre-configure:
diff --git a/net/radvd/Makefile b/net/radvd/Makefile
index 6e6ed8ae0654..67bd9661a70e 100644
--- a/net/radvd/Makefile
+++ b/net/radvd/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.litech.org/radvd/dist/
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Linux/BSD IPv6 router advertisement daemon
 
-LIB_DEPENDS=	libdaemon.so:${PORTSDIR}/devel/libdaemon
+LIB_DEPENDS=	libdaemon.so:devel/libdaemon
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=
diff --git a/net/raggle/Makefile b/net/raggle/Makefile
index d03ad07dbc39..60c485f2020f 100644
--- a/net/raggle/Makefile
+++ b/net/raggle/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.raggle.org/files/
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Console RSS aggregator written in Ruby
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/ncurses.rb:${PORTSDIR}/devel/ruby-ncurses
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/ncurses.rb:devel/ruby-ncurses
 
 USE_RUBY=	yes
 
diff --git a/net/rdapper/Makefile b/net/rdapper/Makefile
index 6fa9db4808c6..eb592dda8570 100644
--- a/net/rdapper/Makefile
+++ b/net/rdapper/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Command-line Registration Data Access Protocol (RDAP) client
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-JSON-Path>=0:${PORTSDIR}/devel/p5-JSON-Path
+RUN_DEPENDS=	p5-JSON-Path>=0:devel/p5-JSON-Path
 
 USES=		perl5
 USE_GITHUB=	yes
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 41e4ad4899e6..ca5f1340a2bd 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -24,14 +24,14 @@ SMARTCARD_DESC=	Enable SmartCard login via PCSC-lite
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAO}
-LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS+=	libao.so:audio/libao
 CONFIGURE_ARGS+=	--with-sound=libao
 .else
 CONFIGURE_ARGS+=	--with-sound=oss
 .endif
 
 .if exists(${LOCALBASE}/lib/libsamplerate.so) || ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libsamplerate.so:audio/libsamplerate
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=	--with-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MSMARTCARD}
-LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
 .else
 CONFIGURE_ARGS+=	--disable-smartcard
 .endif
diff --git a/net/remmina-plugin-gnome/Makefile b/net/remmina-plugin-gnome/Makefile
index 5a2522f0058b..551ad66a6857 100644
--- a/net/remmina-plugin-gnome/Makefile
+++ b/net/remmina-plugin-gnome/Makefile
@@ -5,7 +5,7 @@ PKGNAMESUFFIX=	-gnome
 
 COMMENT=	Remmina plugin for GNOME Keyring
 
-LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring
 
 MASTERDIR=	${.CURDIR}/../remmina-plugins
 
diff --git a/net/remmina-plugin-nx/Makefile b/net/remmina-plugin-nx/Makefile
index 1ff905e35ce8..e5f0b5653202 100644
--- a/net/remmina-plugin-nx/Makefile
+++ b/net/remmina-plugin-nx/Makefile
@@ -9,7 +9,7 @@ USE_XORG+=	xkbfile
 
 MASTERDIR=	${.CURDIR}/../remmina-plugins
 
-LIB_DEPENDS+=	libssh_threads.so:${PORTSDIR}/security/libssh
+LIB_DEPENDS+=	libssh_threads.so:security/libssh
 
 PLIST_SUB+=	ICONS="" SSH="@comment "
 
diff --git a/net/remmina-plugin-telepathy/Makefile b/net/remmina-plugin-telepathy/Makefile
index 9a2e30addf1c..35c0ed968baa 100644
--- a/net/remmina-plugin-telepathy/Makefile
+++ b/net/remmina-plugin-telepathy/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-telepathy
 COMMENT=	Remmina plugin for Telepathy support
 
 USE_GNOME+=	gtk30
-LIB_DEPENDS=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS=	libtelepathy-glib.so:net-im/telepathy-glib
 
 MASTERDIR=	${.CURDIR}/../remmina-plugins
 
diff --git a/net/remmina-plugin-vnc/Makefile b/net/remmina-plugin-vnc/Makefile
index 9707a3f2c107..e0b3de31b82e 100644
--- a/net/remmina-plugin-vnc/Makefile
+++ b/net/remmina-plugin-vnc/Makefile
@@ -6,9 +6,9 @@ PKGNAMESUFFIX=	-vnc
 
 COMMENT=	Remmina plugin for VNC protocol
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libvncserver.so:${PORTSDIR}/net/libvncserver
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt \
+		libvncserver.so:net/libvncserver
 
 USES=		jpeg
 
diff --git a/net/remmina-plugin-xdmcp/Makefile b/net/remmina-plugin-xdmcp/Makefile
index 81b7a4de3517..1ae0728a7d4e 100644
--- a/net/remmina-plugin-xdmcp/Makefile
+++ b/net/remmina-plugin-xdmcp/Makefile
@@ -5,7 +5,7 @@ PKGNAMESUFFIX=	-xdmcp
 
 COMMENT=	Remmina plugin for XDMCP protocol
 
-RUN_DEPENDS=	Xephyr:${PORTSDIR}/x11-servers/xephyr
+RUN_DEPENDS=	Xephyr:x11-servers/xephyr
 
 MASTERDIR=	${.CURDIR}/../remmina-plugins
 
diff --git a/net/remmina-plugins/Makefile b/net/remmina-plugins/Makefile
index 766787060fe7..5597ebf37147 100644
--- a/net/remmina-plugins/Makefile
+++ b/net/remmina-plugins/Makefile
@@ -31,27 +31,27 @@ PATCHDIR=	# none
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKEYRING}
-RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugins-gnome.so:${PORTSDIR}/net/remmina-plugin-gnome
+RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugins-gnome.so:net/remmina-plugin-gnome
 .endif
 
 .if ${PORT_OPTIONS:MVNC}
-RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-vnc.so:${PORTSDIR}/net/remmina-plugin-vnc
+RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-vnc.so:net/remmina-plugin-vnc
 .endif
 
 .if ${PORT_OPTIONS:MXDMCP}
-RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-xdmcp.so:${PORTSDIR}/net/remmina-plugin-xdmcp
+RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-xdmcp.so:net/remmina-plugin-xdmcp
 .endif
 
 .if ${PORT_OPTIONS:MTELEP}
-RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-telepathy.so:${PORTSDIR}/net/remmina-plugin-telepathy
+RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-telepathy.so:net/remmina-plugin-telepathy
 .endif
 
 .if ${PORT_OPTIONS:MNX}
-RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-nx.so:${PORTSDIR}/net/remmina-plugin-nx
+RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-nx.so:net/remmina-plugin-nx
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-RUN_DEPENDS+=	${LOCALBASE}/share/locale/bg/LC_MESSAGES/remmina-plugins.mo:${PORTSDIR}/net/remmina-plugin-i18n
+RUN_DEPENDS+=	${LOCALBASE}/share/locale/bg/LC_MESSAGES/remmina-plugins.mo:net/remmina-plugin-i18n
 .endif
 
 do-install:	# empty
diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk
index 1a9254c1650b..5a04a5a73b61 100644
--- a/net/remmina-plugins/bsd.plugin.mk
+++ b/net/remmina-plugins/bsd.plugin.mk
@@ -5,8 +5,8 @@ PATCHDIR=	${.CURDIR}/../remmina/files
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
-RUN_DEPENDS+=	remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
+BUILD_DEPENDS+=	remmina>=${PORTVERSION}:net/remmina
+RUN_DEPENDS+=	remmina>=${PORTVERSION}:net/remmina
 
 USES+=		cmake gmake pkgconfig desktop-file-utils
 USE_GNOME=	atk gdkpixbuf2 glib20 gtk20 pango
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index aa774bc4cef8..8d270532c7a4 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -48,14 +48,14 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSSH}
-LIB_DEPENDS+=	libssh_threads.so:${PORTSDIR}/security/libssh
+LIB_DEPENDS+=	libssh_threads.so:security/libssh
 LDFLAGS+=	-fstack-protector
 .else
 CMAKE_ARGS+=	-DWITH_LIBSSH=OFF
 .endif
 
 .if ${PORT_OPTIONS:MGCRYPT}
-LIB_DEPENDS+=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	libgcrypt.so:security/libgcrypt
 .else
 CMAKE_ARGS+=	-DWITH_GCRYPT=OFF
 .endif
@@ -67,7 +67,7 @@ CMAKE_ARGS+=	-DWITH_VTE=OFF
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	libavahi-ui.so:${PORTSDIR}/net/avahi-gtk
+LIB_DEPENDS+=	libavahi-ui.so:net/avahi-gtk
 .else
 CMAKE_ARGS+=	-DWITH_AVAHI=OFF
 .endif
diff --git a/net/remotebox/Makefile b/net/remotebox/Makefile
index 1460fce10e07..67ac06c5ae47 100644
--- a/net/remotebox/Makefile
+++ b/net/remotebox/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Open Source VirtualBox Client with Remote Management
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		rdesktop:${PORTSDIR}/net/rdesktop
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		rdesktop:net/rdesktop
 
 LICENSE_FILE_GPLv2=	${WRKSRC}/docs/COPYING
 
diff --git a/net/remotedesk/Makefile b/net/remotedesk/Makefile
index b1ee4b016f94..fe4abfa62ac4 100644
--- a/net/remotedesk/Makefile
+++ b/net/remotedesk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Graphical interface to rdesktop
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rdesktop
+RUN_DEPENDS=	rdesktop:net/rdesktop
 
 USES=		gnustep
 USE_GNUSTEP=	back build
diff --git a/net/reposado/Makefile b/net/reposado/Makefile
index c625761cbfdf..16417f04cf2c 100644
--- a/net/reposado/Makefile
+++ b/net/reposado/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	net
 MAINTAINER=	masaki@club.kyutech.ac.jp
 COMMENT=	Tools for replicating the Apple's Software Update Service
 
-RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+RUN_DEPENDS=	curl:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wdas
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index c42aa416aa12..cd3cb2a06e7c 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -70,7 +70,7 @@ ICONV_CPPFLAGS=	-I${LOCALBASE}/include
 ICONV_LDFLAGS=	-L${LOCALBASE}/lib
 ICONV_CONFIGURE_ENABLE=	iconv iconv-open
 
-POPT_PORT_LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+POPT_PORT_LIB_DEPENDS=	libpopt.so:devel/popt
 POPT_PORT_CPPFLAGS=	-I${LOCALBASE}/include
 POPT_PORT_LDFLAGS=	-L${LOCALBASE}/lib
 POPT_CONFIGURE_WITH=	included-popt
diff --git a/net/rtg/Makefile b/net/rtg/Makefile
index 1c5a0c6a6de0..ad8759bb095c 100644
--- a/net/rtg/Makefile
+++ b/net/rtg/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Flexible, high-performance SNMP statistics monitoring system
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 USE_RC_SUBR=	rtgpoll
 USE_MYSQL=	client
diff --git a/net/rtpbreak/Makefile b/net/rtpbreak/Makefile
index 4c745b098a40..8b5e0955f9ca 100644
--- a/net/rtpbreak/Makefile
+++ b/net/rtpbreak/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	prudhvi-krishna-bsd@surapaneni.in
 COMMENT=	Detects, reconstructs, and analyzes any RTP session
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 CFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lpcap -lnet
diff --git a/net/rtpproxy/Makefile b/net/rtpproxy/Makefile
index 20db269aa539..2ae0c30386f0 100644
--- a/net/rtpproxy/Makefile
+++ b/net/rtpproxy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	High-performance RTP proxy server for the SIP Express Router (SER)
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+LIB_DEPENDS=	libgsm.so:audio/gsm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sippy
diff --git a/net/rubygem-amazon-ec2/Makefile b/net/rubygem-amazon-ec2/Makefile
index 7bf1132be6a5..10cc464c138e 100644
--- a/net/rubygem-amazon-ec2/Makefile
+++ b/net/rubygem-amazon-ec2/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Library for accessing the Amazon Web Services APIs
 
-RUN_DEPENDS=	rubygem-xml-simple>=1.0.12:${PORTSDIR}/textproc/rubygem-xml-simple
+RUN_DEPENDS=	rubygem-xml-simple>=1.0.12:textproc/rubygem-xml-simple
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-amqp-utils/Makefile b/net/rubygem-amqp-utils/Makefile
index ff2a53fd99be..128b789367c0 100644
--- a/net/rubygem-amqp-utils/Makefile
+++ b/net/rubygem-amqp-utils/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Command line utilies for interacting with AMQP compliant queues
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-amqp>=0.7.1:${PORTSDIR}/net/rubygem-amqp \
-		rubygem-clio>=0.3.0:${PORTSDIR}/devel/rubygem-clio \
-		rubygem-facets>=2.9:${PORTSDIR}/devel/rubygem-facets \
-		rubygem-heredoc_unindent>=1.1.2:${PORTSDIR}/textproc/rubygem-heredoc_unindent \
-		rubygem-json>=1.5:${PORTSDIR}/devel/rubygem-json \
-		rubygem-msgpack>=0.4.5:${PORTSDIR}/devel/rubygem-msgpack \
-		rubygem-trollop1>=1.16.2:${PORTSDIR}/devel/rubygem-trollop1
+RUN_DEPENDS=	rubygem-amqp>=0.7.1:net/rubygem-amqp \
+		rubygem-clio>=0.3.0:devel/rubygem-clio \
+		rubygem-facets>=2.9:devel/rubygem-facets \
+		rubygem-heredoc_unindent>=1.1.2:textproc/rubygem-heredoc_unindent \
+		rubygem-json>=1.5:devel/rubygem-json \
+		rubygem-msgpack>=0.4.5:devel/rubygem-msgpack \
+		rubygem-trollop1>=1.16.2:devel/rubygem-trollop1
 
 NO_ARCH=		yes
 USE_RUBY=		yes
diff --git a/net/rubygem-amqp/Makefile b/net/rubygem-amqp/Makefile
index 681dc386ac1d..a989f811c05c 100644
--- a/net/rubygem-amqp/Makefile
+++ b/net/rubygem-amqp/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Implementation of the AMQP protocol for RabbitMQ clients
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-amq-protocol>=1.9:${PORTSDIR}/net/rubygem-amq-protocol \
-		rubygem-eventmachine>=0:${PORTSDIR}/devel/rubygem-eventmachine
+RUN_DEPENDS=	rubygem-amq-protocol>=1.9:net/rubygem-amq-protocol \
+		rubygem-eventmachine>=0:devel/rubygem-eventmachine
 
 DEPRECATED=	Upstream prefers net/rubygem-bunny
 
diff --git a/net/rubygem-aws-s3/Makefile b/net/rubygem-aws-s3/Makefile
index 303887611702..9e9d5f4a5525 100644
--- a/net/rubygem-aws-s3/Makefile
+++ b/net/rubygem-aws-s3/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	RG
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Client library for Amazon S3 REST API
 
-RUN_DEPENDS=	rubygem-xml-simple>=0:${PORTSDIR}/textproc/rubygem-xml-simple \
-		rubygem-builder>=0:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types
+RUN_DEPENDS=	rubygem-xml-simple>=0:textproc/rubygem-xml-simple \
+		rubygem-builder>=0:devel/rubygem-builder \
+		rubygem-mime-types>=0:misc/rubygem-mime-types
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-aws-ses/Makefile b/net/rubygem-aws-ses/Makefile
index 6daef0c78e31..b395cdab6d85 100644
--- a/net/rubygem-aws-ses/Makefile
+++ b/net/rubygem-aws-ses/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Client library for REST API of Amazon SES
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-mail>=2.2.5:${PORTSDIR}/mail/rubygem-mail \
-		rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-xml-simple>=0:${PORTSDIR}/textproc/rubygem-xml-simple
+RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-mail>=2.2.5:mail/rubygem-mail \
+		rubygem-mime-types>=0:misc/rubygem-mime-types \
+		rubygem-xml-simple>=0:textproc/rubygem-xml-simple
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-bunny/Makefile b/net/rubygem-bunny/Makefile
index 33016cfc8f78..06453dfeae7a 100644
--- a/net/rubygem-bunny/Makefile
+++ b/net/rubygem-bunny/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Another synchronous Ruby AMQP client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-amq-protocol>=2.0.1:${PORTSDIR}/net/rubygem-amq-protocol
+RUN_DEPENDS=	rubygem-amq-protocol>=2.0.1:net/rubygem-amq-protocol
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-dogapi/Makefile b/net/rubygem-dogapi/Makefile
index 608dc06669f2..19c465330931 100644
--- a/net/rubygem-dogapi/Makefile
+++ b/net/rubygem-dogapi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby bindings for Datadog API
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-multi_json>=0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-domain_name/Makefile b/net/rubygem-domain_name/Makefile
index 99a3b3554da0..ccf280988fed 100644
--- a/net/rubygem-domain_name/Makefile
+++ b/net/rubygem-domain_name/Makefile
@@ -13,7 +13,7 @@ LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2 LGPL21 MPL
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-unf>=0.0.5:${PORTSDIR}/textproc/rubygem-unf
+RUN_DEPENDS=	rubygem-unf>=0.0.5:textproc/rubygem-unf
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-dropbox-sdk/Makefile b/net/rubygem-dropbox-sdk/Makefile
index 7f09ce4b6bd5..cebb5e01c519 100644
--- a/net/rubygem-dropbox-sdk/Makefile
+++ b/net/rubygem-dropbox-sdk/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library of the Dropbox API web endpoints
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-json>=0:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=0:devel/rubygem-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-epp-client-afnic/Makefile b/net/rubygem-epp-client-afnic/Makefile
index 7b8b0f886457..7abfaad25c1f 100644
--- a/net/rubygem-epp-client-afnic/Makefile
+++ b/net/rubygem-epp-client-afnic/Makefile
@@ -11,11 +11,11 @@ COMMENT=	AFNIC EPP client library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-builder>=2.1.2:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-nokogiri>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-epp-client-base=${PORTVERSION}:${PORTSDIR}/net/rubygem-epp-client-base \
-		rubygem-epp-client-rgp=${PORTVERSION}:${PORTSDIR}/net/rubygem-epp-client-rgp \
-		rubygem-epp-client-secdns=${PORTVERSION}:${PORTSDIR}/net/rubygem-epp-client-secdns \
+RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri \
+		rubygem-epp-client-base=${PORTVERSION}:net/rubygem-epp-client-base \
+		rubygem-epp-client-rgp=${PORTVERSION}:net/rubygem-epp-client-rgp \
+		rubygem-epp-client-secdns=${PORTVERSION}:net/rubygem-epp-client-secdns \
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net/rubygem-epp-client-base/Makefile b/net/rubygem-epp-client-base/Makefile
index ccf631590173..00f7f31e6c17 100644
--- a/net/rubygem-epp-client-base/Makefile
+++ b/net/rubygem-epp-client-base/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Extensible EPP client library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-builder>=2.1.2:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-nokogiri>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net/rubygem-epp-client-rgp/Makefile b/net/rubygem-epp-client-rgp/Makefile
index 7f377cd9f792..6f82ac489262 100644
--- a/net/rubygem-epp-client-rgp/Makefile
+++ b/net/rubygem-epp-client-rgp/Makefile
@@ -11,8 +11,8 @@ COMMENT=	RGP EPP client library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-builder>=2.1.2:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-nokogiri>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net/rubygem-epp-client-secdns/Makefile b/net/rubygem-epp-client-secdns/Makefile
index 082778cdcce7..93b41510bfb4 100644
--- a/net/rubygem-epp-client-secdns/Makefile
+++ b/net/rubygem-epp-client-secdns/Makefile
@@ -11,8 +11,8 @@ COMMENT=	SecDNS EPP client library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-builder>=2.1.2:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-nokogiri>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net/rubygem-epp-client-smallregistry/Makefile b/net/rubygem-epp-client-smallregistry/Makefile
index 693961e854fd..3c86daec5141 100644
--- a/net/rubygem-epp-client-smallregistry/Makefile
+++ b/net/rubygem-epp-client-smallregistry/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Smallregistry EPP client library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-builder>=2.1.2:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-nokogiri>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-epp-client-base=${PORTVERSION}:${PORTSDIR}/net/rubygem-epp-client-base \
-		rubygem-epp-client-secdns=${PORTVERSION}:${PORTSDIR}/net/rubygem-epp-client-secdns \
+RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri \
+		rubygem-epp-client-base=${PORTVERSION}:net/rubygem-epp-client-base \
+		rubygem-epp-client-secdns=${PORTVERSION}:net/rubygem-epp-client-secdns \
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net/rubygem-fog-aliyun/Makefile b/net/rubygem-fog-aliyun/Makefile
index d684c7e5c689..177d9ddfc955 100644
--- a/net/rubygem-fog-aliyun/Makefile
+++ b/net/rubygem-fog-aliyun/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Module for the 'fog' gem to support aliyun OSS/ECS
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-fog-core>=1.27:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=1.0:${PORTSDIR}/devel/rubygem-fog-json \
-		rubygem-ipaddress>=0.8:${PORTSDIR}/net/rubygem-ipaddress \
-		rubygem-xml-simple>=1.1:${PORTSDIR}/textproc/rubygem-xml-simple
+RUN_DEPENDS=	rubygem-fog-core>=1.27:devel/rubygem-fog-core \
+		rubygem-fog-json>=1.0:devel/rubygem-fog-json \
+		rubygem-ipaddress>=0.8:net/rubygem-ipaddress \
+		rubygem-xml-simple>=1.1:textproc/rubygem-xml-simple
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-atmos/Makefile b/net/rubygem-fog-atmos/Makefile
index 3297d931b771..d0fabee6b4be 100644
--- a/net/rubygem-fog-atmos/Makefile
+++ b/net/rubygem-fog-atmos/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support Atmos Cloud Storage
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-xml>=0:${PORTSDIR}/textproc/rubygem-fog-xml
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-xml>=0:textproc/rubygem-fog-xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-aws/Makefile b/net/rubygem-fog-aws/Makefile
index e45b155ebfdc..9bd1c35e42bb 100644
--- a/net/rubygem-fog-aws/Makefile
+++ b/net/rubygem-fog-aws/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Module for the 'fog' gem to support Amazon Web Services
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=1.27:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=1.0:${PORTSDIR}/devel/rubygem-fog-json \
-		rubygem-fog-xml>=0.1:${PORTSDIR}/textproc/rubygem-fog-xml \
-		rubygem-ipaddress>=0.8:${PORTSDIR}/net/rubygem-ipaddress
+RUN_DEPENDS=	rubygem-fog-core>=1.27:devel/rubygem-fog-core \
+		rubygem-fog-json>=1.0:devel/rubygem-fog-json \
+		rubygem-fog-xml>=0.1:textproc/rubygem-fog-xml \
+		rubygem-ipaddress>=0.8:net/rubygem-ipaddress
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-brightbox/Makefile b/net/rubygem-fog-brightbox/Makefile
index 85c6c4109583..8428e36df1a8 100644
--- a/net/rubygem-fog-brightbox/Makefile
+++ b/net/rubygem-fog-brightbox/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Module for the 'fog' gem to support Brightbox Cloud
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-fog-core>=1.22:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json \
-		rubygem-inflecto>=0.0.2:${PORTSDIR}/devel/rubygem-inflecto
+RUN_DEPENDS=	rubygem-fog-core>=1.22:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json \
+		rubygem-inflecto>=0.0.2:devel/rubygem-inflecto
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-dynect/Makefile b/net/rubygem-fog-dynect/Makefile
index f35546e07fe7..fa30e21a7c5e 100644
--- a/net/rubygem-fog-dynect/Makefile
+++ b/net/rubygem-fog-dynect/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Module for the 'fog' gem to support Dynect DNS
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json \
-		rubygem-fog-xml>=0:${PORTSDIR}/textproc/rubygem-fog-xml
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json \
+		rubygem-fog-xml>=0:textproc/rubygem-fog-xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-ecloud/Makefile b/net/rubygem-fog-ecloud/Makefile
index 504a244e4c29..321f668f2e25 100644
--- a/net/rubygem-fog-ecloud/Makefile
+++ b/net/rubygem-fog-ecloud/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support Terremark EnterpriseCloud
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-xml>=0:${PORTSDIR}/textproc/rubygem-fog-xml
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-xml>=0:textproc/rubygem-fog-xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-google/Makefile b/net/rubygem-fog-google/Makefile
index 261ae204bd36..baea7cd9cda4 100644
--- a/net/rubygem-fog-google/Makefile
+++ b/net/rubygem-fog-google/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Module for the 'fog' gem to support Google Cloud
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json \
-		rubygem-fog-xml>=0:${PORTSDIR}/textproc/rubygem-fog-xml
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json \
+		rubygem-fog-xml>=0:textproc/rubygem-fog-xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-local/Makefile b/net/rubygem-fog-local/Makefile
index bbbc61bcc547..f897be202e93 100644
--- a/net/rubygem-fog-local/Makefile
+++ b/net/rubygem-fog-local/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Module for the 'fog' gem to support local filesystem storage
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=1.27:${PORTSDIR}/devel/rubygem-fog-core
+RUN_DEPENDS=	rubygem-fog-core>=1.27:devel/rubygem-fog-core
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-powerdns/Makefile b/net/rubygem-fog-powerdns/Makefile
index a9f3b4b57cc6..27e667a77954 100644
--- a/net/rubygem-fog-powerdns/Makefile
+++ b/net/rubygem-fog-powerdns/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Module for the 'fog' gem to support PowerDNS DNS services
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-fog-core>=1.27:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=1.0:${PORTSDIR}/devel/rubygem-fog-json \
-		rubygem-fog-xml>=0.1:${PORTSDIR}/textproc/rubygem-fog-xml
+RUN_DEPENDS=	rubygem-fog-core>=1.27:devel/rubygem-fog-core \
+		rubygem-fog-json>=1.0:devel/rubygem-fog-json \
+		rubygem-fog-xml>=0.1:textproc/rubygem-fog-xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-profitbricks/Makefile b/net/rubygem-fog-profitbricks/Makefile
index 30746af275f6..2b59447dabc9 100644
--- a/net/rubygem-fog-profitbricks/Makefile
+++ b/net/rubygem-fog-profitbricks/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Module for the 'fog' gem to support ProfitBricks
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-xml>=0:${PORTSDIR}/textproc/rubygem-fog-xml \
-		rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-xml>=0:textproc/rubygem-fog-xml \
+		rubygem-nokogiri>=0:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-radosgw/Makefile b/net/rubygem-fog-radosgw/Makefile
index 4a4bcf1137c8..60ab033c44f7 100644
--- a/net/rubygem-fog-radosgw/Makefile
+++ b/net/rubygem-fog-radosgw/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Fog backend for provisioning users on Ceph Radosgw
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=1.21.0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json \
-		rubygem-fog-xml>=0.0.1:${PORTSDIR}/textproc/rubygem-fog-xml
+RUN_DEPENDS=	rubygem-fog-core>=1.21.0:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json \
+		rubygem-fog-xml>=0.0.1:textproc/rubygem-fog-xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-riakcs/Makefile b/net/rubygem-fog-riakcs/Makefile
index 42787f50b0ab..a1e13914d4ac 100644
--- a/net/rubygem-fog-riakcs/Makefile
+++ b/net/rubygem-fog-riakcs/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Module for the 'fog' gem to support RiakCS
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json \
-		rubygem-fog-xml>=0:${PORTSDIR}/textproc/rubygem-fog-xml
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json \
+		rubygem-fog-xml>=0:textproc/rubygem-fog-xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-sakuracloud/Makefile b/net/rubygem-fog-sakuracloud/Makefile
index 9540706bb624..1199ad11d7c8 100644
--- a/net/rubygem-fog-sakuracloud/Makefile
+++ b/net/rubygem-fog-sakuracloud/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support Sakura no Cloud
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-serverlove/Makefile b/net/rubygem-fog-serverlove/Makefile
index 1428071a9de5..ab53cef2a2a6 100644
--- a/net/rubygem-fog-serverlove/Makefile
+++ b/net/rubygem-fog-serverlove/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support ServerLove
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-softlayer/Makefile b/net/rubygem-fog-softlayer/Makefile
index d3d1ec8ce240..bb18eb1533d0 100644
--- a/net/rubygem-fog-softlayer/Makefile
+++ b/net/rubygem-fog-softlayer/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Provider to use the SoftLayer Cloud in applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-storm_on_demand/Makefile b/net/rubygem-fog-storm_on_demand/Makefile
index 80aeeb3541a8..4ee5228b96b1 100644
--- a/net/rubygem-fog-storm_on_demand/Makefile
+++ b/net/rubygem-fog-storm_on_demand/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support StormOnDemand
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-terremark/Makefile b/net/rubygem-fog-terremark/Makefile
index 6cb892c6a876..72a1a4af6143 100644
--- a/net/rubygem-fog-terremark/Makefile
+++ b/net/rubygem-fog-terremark/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support Terremark vCloud
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-xml>=0:${PORTSDIR}/textproc/rubygem-fog-xml
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-xml>=0:textproc/rubygem-fog-xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-vmfusion/Makefile b/net/rubygem-fog-vmfusion/Makefile
index ed275f410051..51488c53a478 100644
--- a/net/rubygem-fog-vmfusion/Makefile
+++ b/net/rubygem-fog-vmfusion/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support VMware Fusion
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fission>=0:${PORTSDIR}/emulators/rubygem-fission \
-		rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core
+RUN_DEPENDS=	rubygem-fission>=0:emulators/rubygem-fission \
+		rubygem-fog-core>=0:devel/rubygem-fog-core
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-voxel/Makefile b/net/rubygem-fog-voxel/Makefile
index 870bcb40e2f8..928354b5d1ec 100644
--- a/net/rubygem-fog-voxel/Makefile
+++ b/net/rubygem-fog-voxel/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support Voxel
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-xml>=0:${PORTSDIR}/textproc/rubygem-fog-xml
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-xml>=0:textproc/rubygem-fog-xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-vsphere/Makefile b/net/rubygem-fog-vsphere/Makefile
index 9fed9dfa898b..55905d49c9ce 100644
--- a/net/rubygem-fog-vsphere/Makefile
+++ b/net/rubygem-fog-vsphere/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support vSphere
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-rbvmomi>=1.8:${PORTSDIR}/net/rubygem-rbvmomi
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-rbvmomi>=1.8:net/rubygem-rbvmomi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-fog-xenserver/Makefile b/net/rubygem-fog-xenserver/Makefile
index f19e558cfb85..5cd02b931708 100644
--- a/net/rubygem-fog-xenserver/Makefile
+++ b/net/rubygem-fog-xenserver/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module for the 'fog' gem to support XENSERVER
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-json>=0:${PORTSDIR}/devel/rubygem-fog-json
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-fog-json>=0:devel/rubygem-fog-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-geoip/Makefile b/net/rubygem-geoip/Makefile
index a33871df0d97..3ec0f4281ca7 100644
--- a/net/rubygem-geoip/Makefile
+++ b/net/rubygem-geoip/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Geoip implementation for rubygems
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	geoiplookup:${PORTSDIR}/net/GeoIP
+RUN_DEPENDS=	geoiplookup:net/GeoIP
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-gitlab_omniauth-ldap/Makefile b/net/rubygem-gitlab_omniauth-ldap/Makefile
index da1bd447be7a..0e6534055742 100644
--- a/net/rubygem-gitlab_omniauth-ldap/Makefile
+++ b/net/rubygem-gitlab_omniauth-ldap/Makefile
@@ -10,10 +10,10 @@ COMMENT=	LDAP strategy for OmniAuth
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-net-ldap>=0.9:${PORTSDIR}/net/rubygem-net-ldap \
-		rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-pyu-ruby-sasl>=0.0.3.1:${PORTSDIR}/security/rubygem-pyu-ruby-sasl \
-		rubygem-rubyntlm>=0.3:${PORTSDIR}/net/rubygem-rubyntlm
+RUN_DEPENDS=	rubygem-net-ldap>=0.9:net/rubygem-net-ldap \
+		rubygem-omniauth>=1.0:security/rubygem-omniauth \
+		rubygem-pyu-ruby-sasl>=0.0.3.1:security/rubygem-pyu-ruby-sasl \
+		rubygem-rubyntlm>=0.3:net/rubygem-rubyntlm
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-iproto/Makefile b/net/rubygem-iproto/Makefile
index 95882519c789..fe55f1c198ef 100644
--- a/net/rubygem-iproto/Makefile
+++ b/net/rubygem-iproto/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Ruby implementation of Mail.Ru iproto protocol
 
-RUN_DEPENDS=	rubygem-bin_utils>=0.0.3:${PORTSDIR}/devel/rubygem-bin_utils
+RUN_DEPENDS=	rubygem-bin_utils>=0.0.3:devel/rubygem-bin_utils
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-lita-gems/Makefile b/net/rubygem-lita-gems/Makefile
index 7202e089489e..ac1520c7088d 100644
--- a/net/rubygem-lita-gems/Makefile
+++ b/net/rubygem-lita-gems/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Lita handler for rubygems.org querying
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-gems>=0.8.0:${PORTSDIR}/devel/rubygem-gems \
-		rubygem-lita>=2.6:${PORTSDIR}/net-im/rubygem-lita
+RUN_DEPENDS=	rubygem-gems>=0.8.0:devel/rubygem-gems \
+		rubygem-lita>=2.6:net-im/rubygem-lita
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-macaddr/Makefile b/net/rubygem-macaddr/Makefile
index 627f929321dc..1976220956d4 100644
--- a/net/rubygem-macaddr/Makefile
+++ b/net/rubygem-macaddr/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Cross Platform Mac Address Determination for Ruby
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-systemu>=2.6.2:${PORTSDIR}/devel/rubygem-systemu
+RUN_DEPENDS=	rubygem-systemu>=2.6.2:devel/rubygem-systemu
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-net-netrc/Makefile b/net/rubygem-net-netrc/Makefile
index f400e35f0046..c31f077e146c 100644
--- a/net/rubygem-net-netrc/Makefile
+++ b/net/rubygem-net-netrc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	don@na.rim.or.jp
 COMMENT=	Net::Netrc provides ftp(1)-style .netrc parsing
 
-RUN_DEPENDS=	rubygem-platform>=0.3.0:${PORTSDIR}/devel/rubygem-platform
+RUN_DEPENDS=	rubygem-platform>=0.3.0:devel/rubygem-platform
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-oauth2/Makefile b/net/rubygem-oauth2/Makefile
index f68504c6d6ca..41ebb101f856 100644
--- a/net/rubygem-oauth2/Makefile
+++ b/net/rubygem-oauth2/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Ruby wrapper for the OAuth 2.0 protocol
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-faraday>=0.8:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-jwt>=1:${PORTSDIR}/www/rubygem-jwt \
-		rubygem-multi_json>=1.3:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-multi_xml>=0.5:${PORTSDIR}/textproc/rubygem-multi_xml \
-		rubygem-rack16>=1.2:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-faraday>=0.8:www/rubygem-faraday \
+		rubygem-jwt>=1:www/rubygem-jwt \
+		rubygem-multi_json>=1.3:devel/rubygem-multi_json \
+		rubygem-multi_xml>=0.5:textproc/rubygem-multi_xml \
+		rubygem-rack16>=1.2:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-octokit/Makefile b/net/rubygem-octokit/Makefile
index 11624cf753b2..a486dcda0e78 100644
--- a/net/rubygem-octokit/Makefile
+++ b/net/rubygem-octokit/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple wrapper for the GitHub API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-sawyer>=0.7.0:${PORTSDIR}/www/rubygem-sawyer
+RUN_DEPENDS=	rubygem-sawyer>=0.7.0:www/rubygem-sawyer
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-octopress-deploy/Makefile b/net/rubygem-octopress-deploy/Makefile
index 7f82d9350aab..c20c4d9e9116 100644
--- a/net/rubygem-octopress-deploy/Makefile
+++ b/net/rubygem-octopress-deploy/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Eases deployment of Jekyll or Octopress sites
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-colorator>=0:${PORTSDIR}/textproc/rubygem-colorator
+RUN_DEPENDS=	rubygem-colorator>=0:textproc/rubygem-colorator
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-omniauth-azure-oauth2/Makefile b/net/rubygem-omniauth-azure-oauth2/Makefile
index ecfa692bef13..0bf474a887a4 100644
--- a/net/rubygem-omniauth-azure-oauth2/Makefile
+++ b/net/rubygem-omniauth-azure-oauth2/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Azure OAuth2 Strategy for OmniAuth
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-jwt>=1.0:${PORTSDIR}/www/rubygem-jwt \
-		rubygem-omniauth-oauth2>=1.2:${PORTSDIR}/net/rubygem-omniauth-oauth2
+RUN_DEPENDS=	rubygem-jwt>=1.0:www/rubygem-jwt \
+		rubygem-omniauth-oauth2>=1.2:net/rubygem-omniauth-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-omniauth-facebook/Makefile b/net/rubygem-omniauth-facebook/Makefile
index ec8640293e1a..a51f4960b50e 100644
--- a/net/rubygem-omniauth-facebook/Makefile
+++ b/net/rubygem-omniauth-facebook/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Facebook OAuth2 Strategy for OmniAuth
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-omniauth-oauth2>=1.2:${PORTSDIR}/net/rubygem-omniauth-oauth2
+RUN_DEPENDS=	rubygem-omniauth-oauth2>=1.2:net/rubygem-omniauth-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-omniauth-github-discourse/Makefile b/net/rubygem-omniauth-github-discourse/Makefile
index 547ae343e14a..e7455979b2e9 100644
--- a/net/rubygem-omniauth-github-discourse/Makefile
+++ b/net/rubygem-omniauth-github-discourse/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Fork of Official OmniAuth strategy for GitHub
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-omniauth-oauth2>=1.1:${PORTSDIR}/net/rubygem-omniauth-oauth2
+RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth \
+		rubygem-omniauth-oauth2>=1.1:net/rubygem-omniauth-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-omniauth-github/Makefile b/net/rubygem-omniauth-github/Makefile
index a634974897e5..9d1dd93ef877 100644
--- a/net/rubygem-omniauth-github/Makefile
+++ b/net/rubygem-omniauth-github/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Official OmniAuth strategy for GitHub
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-omniauth-oauth2>=1.1:${PORTSDIR}/net/rubygem-omniauth-oauth2
+RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth \
+		rubygem-omniauth-oauth2>=1.1:net/rubygem-omniauth-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-omniauth-google-oauth2/Makefile b/net/rubygem-omniauth-google-oauth2/Makefile
index 6f874f1447a2..90e186c20881 100644
--- a/net/rubygem-omniauth-google-oauth2/Makefile
+++ b/net/rubygem-omniauth-google-oauth2/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Google OAuth2 strategy for OmniAuth 1.x
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-jwt>=1.5.2:${PORTSDIR}/www/rubygem-jwt \
-		rubygem-multi_json>=1.3:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-omniauth>=1.1.1:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-omniauth-oauth2>=1.3.1:${PORTSDIR}/net/rubygem-omniauth-oauth2
+RUN_DEPENDS=	rubygem-jwt>=1.5.2:www/rubygem-jwt \
+		rubygem-multi_json>=1.3:devel/rubygem-multi_json \
+		rubygem-omniauth>=1.1.1:security/rubygem-omniauth \
+		rubygem-omniauth-oauth2>=1.3.1:net/rubygem-omniauth-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-omniauth-oauth/Makefile b/net/rubygem-omniauth-oauth/Makefile
index 9381e009ace7..9c2b7beb6683 100644
--- a/net/rubygem-omniauth-oauth/Makefile
+++ b/net/rubygem-omniauth-oauth/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Generic OAuth strategy for OmniAuth
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-oauth>=0:${PORTSDIR}/net/rubygem-oauth \
-		rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS=	rubygem-oauth>=0:net/rubygem-oauth \
+		rubygem-omniauth>=1.0:security/rubygem-omniauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-omniauth-oauth2/Makefile b/net/rubygem-omniauth-oauth2/Makefile
index 7c29f90ce0e5..2f72be58311b 100644
--- a/net/rubygem-omniauth-oauth2/Makefile
+++ b/net/rubygem-omniauth-oauth2/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Abstract OAuth2 strategy for OmniAuth
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-oauth2>=1.0:${PORTSDIR}/net/rubygem-oauth2 \
-		rubygem-omniauth>=1.2:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS=	rubygem-oauth2>=1.0:net/rubygem-oauth2 \
+		rubygem-omniauth>=1.2:security/rubygem-omniauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-omniauth-openid/Makefile b/net/rubygem-omniauth-openid/Makefile
index a6e25d80a76e..ce59f6b11b54 100644
--- a/net/rubygem-omniauth-openid/Makefile
+++ b/net/rubygem-omniauth-openid/Makefile
@@ -12,8 +12,8 @@ COMMENT=	OpenID strategy for OmniAuth
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-rack-openid>=1.3.1:${PORTSDIR}/www/rubygem-rack-openid
+RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth \
+		rubygem-rack-openid>=1.3.1:www/rubygem-rack-openid
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-omniauth-twitter/Makefile b/net/rubygem-omniauth-twitter/Makefile
index 4f6f5b22ced1..dc9a303889c5 100644
--- a/net/rubygem-omniauth-twitter/Makefile
+++ b/net/rubygem-omniauth-twitter/Makefile
@@ -10,8 +10,8 @@ COMMENT=	OmniAuth strategy for Twitter
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-json>=1.3:${PORTSDIR}/devel/rubygem-json \
-		rubygem-omniauth-oauth>=1.1:${PORTSDIR}/net/rubygem-omniauth-oauth
+RUN_DEPENDS=	rubygem-json>=1.3:devel/rubygem-json \
+		rubygem-omniauth-oauth>=1.1:net/rubygem-omniauth-oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-opennebula/Makefile b/net/rubygem-opennebula/Makefile
index 0c3fe303a8a0..b5dcb3eebe58 100644
--- a/net/rubygem-opennebula/Makefile
+++ b/net/rubygem-opennebula/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Libraries needed to talk to OpenNebula
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-json>=0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-rbvmomi>=0:${PORTSDIR}/net/rubygem-rbvmomi
+RUN_DEPENDS=	rubygem-json>=0:devel/rubygem-json \
+		rubygem-nokogiri>=0:textproc/rubygem-nokogiri \
+		rubygem-rbvmomi>=0:net/rubygem-rbvmomi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-rabbiter/Makefile b/net/rubygem-rabbiter/Makefile
index f463c6b9b605..88133c250546 100644
--- a/net/rubygem-rabbiter/Makefile
+++ b/net/rubygem-rabbiter/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Rabbiter is a twitter client for Rabbit
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	rubygem-gio2>=1.1.4:${PORTSDIR}/devel/rubygem-gio2 \
-		rubygem-rabbit>=2.0.0:${PORTSDIR}/misc/rubygem-rabbit \
-		rubygem-twitter_oauth>0:${PORTSDIR}/security/rubygem-twitter_oauth \
-		rubygem-twitter-stream>=0.1.16:${PORTSDIR}/net/rubygem-twitter-stream
+RUN_DEPENDS=	rubygem-gio2>=1.1.4:devel/rubygem-gio2 \
+		rubygem-rabbit>=2.0.0:misc/rubygem-rabbit \
+		rubygem-twitter_oauth>0:security/rubygem-twitter_oauth \
+		rubygem-twitter-stream>=0.1.16:net/rubygem-twitter-stream
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-rbvmomi/Makefile b/net/rubygem-rbvmomi/Makefile
index 5cc5fbebbe67..be3747122608 100644
--- a/net/rubygem-rbvmomi/Makefile
+++ b/net/rubygem-rbvmomi/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Ruby interface to the VMware vSphere API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-nokogiri>=1.4.1:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-trollop>=0:${PORTSDIR}/devel/rubygem-trollop \
+RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-nokogiri>=1.4.1:textproc/rubygem-nokogiri \
+		rubygem-trollop>=0:devel/rubygem-trollop \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-right_aws/Makefile b/net/rubygem-right_aws/Makefile
index 52785b04bbc6..b768faa5458e 100644
--- a/net/rubygem-right_aws/Makefile
+++ b/net/rubygem-right_aws/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Provides access to Amazon EC2, S3, SQS, and SDB web services
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-right_http_connection>=1.2.5:${PORTSDIR}/net/rubygem-right_http_connection
+RUN_DEPENDS=	rubygem-right_http_connection>=1.2.5:net/rubygem-right_http_connection
 
 NO_ARCH=	yes
 
@@ -23,6 +23,6 @@ RUBYGEM_AUTOPLIST=	yes
 OPTIONS_DEFINE=	LIBXML
 LIBXML_DESC=	Use libxml instead of REXML
 
-LIBXML_RUN_DEPENDS=	rubygem-libxml-ruby>=0.5.2:${PORTSDIR}/textproc/rubygem-libxml-ruby
+LIBXML_RUN_DEPENDS=	rubygem-libxml-ruby>=0.5.2:textproc/rubygem-libxml-ruby
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-right_flexiscale/Makefile b/net/rubygem-right_flexiscale/Makefile
index d2fd9235310e..a46283e7e878 100644
--- a/net/rubygem-right_flexiscale/Makefile
+++ b/net/rubygem-right_flexiscale/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Provides Ruby access to the Flexiscale API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-soap4r>=1.5.8:${PORTSDIR}/devel/rubygem-soap4r
+RUN_DEPENDS=	rubygem-soap4r>=1.5.8:devel/rubygem-soap4r
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-right_gogrid/Makefile b/net/rubygem-right_gogrid/Makefile
index 7b89bac0bc08..7fcdbbe7bf55 100644
--- a/net/rubygem-right_gogrid/Makefile
+++ b/net/rubygem-right_gogrid/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Provides Ruby access to the GoGrid API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-right_http_connection>=1.2.4:${PORTSDIR}/net/rubygem-right_http_connection
+RUN_DEPENDS=	rubygem-right_http_connection>=1.2.4:net/rubygem-right_http_connection
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-right_slicehost/Makefile b/net/rubygem-right_slicehost/Makefile
index 0c1cc04d663a..d37212b40d51 100644
--- a/net/rubygem-right_slicehost/Makefile
+++ b/net/rubygem-right_slicehost/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Provides Ruby access to the Slicehost API
 
-RUN_DEPENDS=	rubygem-right_http_connection>=1.2.4:${PORTSDIR}/net/rubygem-right_http_connection
+RUN_DEPENDS=	rubygem-right_http_connection>=1.2.4:net/rubygem-right_http_connection
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-rsync/Makefile b/net/rubygem-rsync/Makefile
index c4c0b6cd06ac..23234eb3a014 100644
--- a/net/rubygem-rsync/Makefile
+++ b/net/rubygem-rsync/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby rsync library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-ruby-growl/Makefile b/net/rubygem-ruby-growl/Makefile
index b935f3bf095f..4127e9a6ae1f 100644
--- a/net/rubygem-ruby-growl/Makefile
+++ b/net/rubygem-ruby-growl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Pure-ruby growl notifier
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	rubygem-uuid>=2.3.5:${PORTSDIR}/devel/rubygem-uuid
+RUN_DEPENDS=	rubygem-uuid>=2.3.5:devel/rubygem-uuid
 
 NO_ARCH=	yes
 
diff --git a/net/rubygem-rubytter/Makefile b/net/rubygem-rubytter/Makefile
index aa1c232d0e2e..897fa486e89c 100644
--- a/net/rubygem-rubytter/Makefile
+++ b/net/rubygem-rubytter/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Simple Twitter library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-json>=1.1.3:${PORTSDIR}/devel/rubygem-json \
-		rubygem-oauth>=0.3.6:${PORTSDIR}/net/rubygem-oauth
+RUN_DEPENDS=	rubygem-json>=1.1.3:devel/rubygem-json \
+		rubygem-oauth>=0.3.6:net/rubygem-oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-rudy/Makefile b/net/rubygem-rudy/Makefile
index 85ff22ef0c36..2ad82e7dbad7 100644
--- a/net/rubygem-rudy/Makefile
+++ b/net/rubygem-rudy/Makefile
@@ -13,17 +13,17 @@ COMMENT=	EC2 deployment tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-amazon-ec2>=0.9.10:${PORTSDIR}/net/rubygem-amazon-ec2 \
-		rubygem-aws-s3>=0.6.1:${PORTSDIR}/net/rubygem-aws-s3 \
-		rubygem-annoy>=0.5.6:${PORTSDIR}/devel/rubygem-annoy \
-		rubygem-attic>=0.5.3:${PORTSDIR}/devel/rubygem-attic \
-		rubygem-caesars>=0.7.4:${PORTSDIR}/devel/rubygem-caesars \
-		rubygem-drydock>=0.6.9:${PORTSDIR}/devel/rubygem-drydock \
-		rubygem-highline>=1.5.1:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-gibbler>=0.8.9:${PORTSDIR}/devel/rubygem-gibbler \
-		rubygem-rye>=0.9.3:${PORTSDIR}/net/rubygem-rye \
-		rubygem-storable>=0.8.6:${PORTSDIR}/devel/rubygem-storable \
-		rubygem-sysinfo>=0.7.3:${PORTSDIR}/devel/rubygem-sysinfo
+RUN_DEPENDS=	rubygem-amazon-ec2>=0.9.10:net/rubygem-amazon-ec2 \
+		rubygem-aws-s3>=0.6.1:net/rubygem-aws-s3 \
+		rubygem-annoy>=0.5.6:devel/rubygem-annoy \
+		rubygem-attic>=0.5.3:devel/rubygem-attic \
+		rubygem-caesars>=0.7.4:devel/rubygem-caesars \
+		rubygem-drydock>=0.6.9:devel/rubygem-drydock \
+		rubygem-highline>=1.5.1:devel/rubygem-highline \
+		rubygem-gibbler>=0.8.9:devel/rubygem-gibbler \
+		rubygem-rye>=0.9.3:net/rubygem-rye \
+		rubygem-storable>=0.8.6:devel/rubygem-storable \
+		rubygem-sysinfo>=0.7.3:devel/rubygem-sysinfo
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net/rubygem-rye/Makefile b/net/rubygem-rye/Makefile
index 08c89c3a36dd..6c093e43559b 100644
--- a/net/rubygem-rye/Makefile
+++ b/net/rubygem-rye/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Safely run SSH commands on a bunch of machines at the same time
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-annoy>=0:${PORTSDIR}/devel/rubygem-annoy \
-		rubygem-docile>=1.0.1:${PORTSDIR}/devel/rubygem-docile \
-		rubygem-highline>=1.5.1:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-net-scp>=1.0.2:${PORTSDIR}/security/rubygem-net-scp \
-		rubygem-net-ssh>=2.0.13:${PORTSDIR}/security/rubygem-net-ssh \
-		rubygem-sysinfo>=0.8.1:${PORTSDIR}/devel/rubygem-sysinfo
+RUN_DEPENDS=	rubygem-annoy>=0:devel/rubygem-annoy \
+		rubygem-docile>=1.0.1:devel/rubygem-docile \
+		rubygem-highline>=1.5.1:devel/rubygem-highline \
+		rubygem-net-scp>=1.0.2:security/rubygem-net-scp \
+		rubygem-net-ssh>=2.0.13:security/rubygem-net-ssh \
+		rubygem-sysinfo>=0.8.1:devel/rubygem-sysinfo
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-stompserver/Makefile b/net/rubygem-stompserver/Makefile
index 35824b93f2bc..6cbc57017c10 100644
--- a/net/rubygem-stompserver/Makefile
+++ b/net/rubygem-stompserver/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Provide reliable messaging using the stomp protocol
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-daemons>=1.0.2:${PORTSDIR}/devel/rubygem-daemons \
-		rubygem-eventmachine>=0.7.2:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
+RUN_DEPENDS=	rubygem-daemons>=1.0.2:devel/rubygem-daemons \
+		rubygem-eventmachine>=0.7.2:devel/rubygem-eventmachine \
+		rubygem-hoe>=1.3.0:devel/rubygem-hoe
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-t/Makefile b/net/rubygem-t/Makefile
index df0e4335e325..064a5a320d76 100644
--- a/net/rubygem-t/Makefile
+++ b/net/rubygem-t/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Command-line power tool for Twitter
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-geokit>=1.9:${PORTSDIR}/graphics/rubygem-geokit \
-		rubygem-htmlentities>=4.3:${PORTSDIR}/textproc/rubygem-htmlentities \
-		rubygem-launchy>=2.4:${PORTSDIR}/devel/rubygem-launchy \
-		rubygem-oauth>=0.4.7:${PORTSDIR}/net/rubygem-oauth \
-		rubygem-retryable>=2.0:${PORTSDIR}/devel/rubygem-retryable \
-		rubygem-thor>=0.19.1:${PORTSDIR}/devel/rubygem-thor \
-		rubygem-twitter>=5.16:${PORTSDIR}/net/rubygem-twitter
+RUN_DEPENDS=	rubygem-geokit>=1.9:graphics/rubygem-geokit \
+		rubygem-htmlentities>=4.3:textproc/rubygem-htmlentities \
+		rubygem-launchy>=2.4:devel/rubygem-launchy \
+		rubygem-oauth>=0.4.7:net/rubygem-oauth \
+		rubygem-retryable>=2.0:devel/rubygem-retryable \
+		rubygem-thor>=0.19.1:devel/rubygem-thor \
+		rubygem-twitter>=5.16:net/rubygem-twitter
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-tweetstream/Makefile b/net/rubygem-tweetstream/Makefile
index aea6b435036b..5f8ff042b85a 100644
--- a/net/rubygem-tweetstream/Makefile
+++ b/net/rubygem-tweetstream/Makefile
@@ -12,11 +12,11 @@ COMMENT=	TweetStream provides simple Ruby access to Twitter Streaming API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-daemons>=1.1:${PORTSDIR}/devel/rubygem-daemons \
-		rubygem-em-http-request>=1.1.1:${PORTSDIR}/www/rubygem-em-http-request \
-		rubygem-em-twitter>=0.3:${PORTSDIR}/www/rubygem-em-twitter \
-		rubygem-multi_json>=1.3:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-twitter>=5.5:${PORTSDIR}/net/rubygem-twitter
+RUN_DEPENDS=	rubygem-daemons>=1.1:devel/rubygem-daemons \
+		rubygem-em-http-request>=1.1.1:www/rubygem-em-http-request \
+		rubygem-em-twitter>=0.3:www/rubygem-em-twitter \
+		rubygem-multi_json>=1.3:devel/rubygem-multi_json \
+		rubygem-twitter>=5.5:net/rubygem-twitter
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-twitter-stream/Makefile b/net/rubygem-twitter-stream/Makefile
index a565ca39911c..ce0c0aca88f7 100644
--- a/net/rubygem-twitter-stream/Makefile
+++ b/net/rubygem-twitter-stream/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Twitter realtime API client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-eventmachine>=0.12.8:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \
-		rubygem-simple_oauth>=0.1.4:${PORTSDIR}/net/rubygem-simple_oauth
+RUN_DEPENDS=	rubygem-eventmachine>=0.12.8:devel/rubygem-eventmachine \
+		rubygem-http_parser.rb>=0.5.1:net/rubygem-http_parser.rb \
+		rubygem-simple_oauth>=0.1.4:net/rubygem-simple_oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-twitter/Makefile b/net/rubygem-twitter/Makefile
index ef8b8f2f871d..051ea7e71781 100644
--- a/net/rubygem-twitter/Makefile
+++ b/net/rubygem-twitter/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Ruby interface to the Twitter API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-buftok>=0.2.0:${PORTSDIR}/devel/rubygem-buftok \
-		rubygem-equalizer>=0.0.10:${PORTSDIR}/devel/rubygem-equalizer \
-		rubygem-faraday>=0.9.0:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-http>=1.0:${PORTSDIR}/www/rubygem-http \
-		rubygem-http_parser.rb>=0.6.0:${PORTSDIR}/net/rubygem-http_parser.rb \
-		rubygem-json>=1.8:${PORTSDIR}/devel/rubygem-json \
-		rubygem-memoizable>=0.4.0:${PORTSDIR}/devel/rubygem-memoizable \
-		rubygem-naught>=1.0:${PORTSDIR}/devel/rubygem-naught \
-		rubygem-simple_oauth>=0.3.0:${PORTSDIR}/net/rubygem-simple_oauth
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable \
+		rubygem-buftok>=0.2.0:devel/rubygem-buftok \
+		rubygem-equalizer>=0.0.10:devel/rubygem-equalizer \
+		rubygem-faraday>=0.9.0:www/rubygem-faraday \
+		rubygem-http>=1.0:www/rubygem-http \
+		rubygem-http_parser.rb>=0.6.0:net/rubygem-http_parser.rb \
+		rubygem-json>=1.8:devel/rubygem-json \
+		rubygem-memoizable>=0.4.0:devel/rubygem-memoizable \
+		rubygem-naught>=1.0:devel/rubygem-naught \
+		rubygem-simple_oauth>=0.3.0:net/rubygem-simple_oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-twitter4r/Makefile b/net/rubygem-twitter4r/Makefile
index 30d97a144090..569a31a708d9 100644
--- a/net/rubygem-twitter4r/Makefile
+++ b/net/rubygem-twitter4r/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Twitter client API in pure Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-json>=1.1.1:${PORTSDIR}/devel/rubygem-json \
-		rubygem-oauth>=0.4.1:${PORTSDIR}/net/rubygem-oauth
+RUN_DEPENDS=	rubygem-json>=1.1.1:devel/rubygem-json \
+		rubygem-oauth>=0.4.1:net/rubygem-oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rubygem-whois/Makefile b/net/rubygem-whois/Makefile
index 6628a155d199..9dfbda4be736 100644
--- a/net/rubygem-whois/Makefile
+++ b/net/rubygem-whois/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby whois library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activesupport4>=3:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=3:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/net/rude/Makefile b/net/rude/Makefile
index a5653b2a9a4d..6768c8ed1360 100644
--- a/net/rude/Makefile
+++ b/net/rude/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Rude is a Real-time UDP Data Emitter and Collector (crude)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/DOC/COPYING
 
-RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	--with-debug-lvl=3
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 077fa362d5dd..6b3862e927c0 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -99,16 +99,16 @@ CONFIGURE_ENV+=		ac_cv_header_sys_mount_h=yes
 # XXX: readdir test fails on ZFS, bringing unusable replacement code
 CONFIGURE_ENV+=		libreplace_cv_READDIR_NEEDED=no
 # tdb
-BUILD_DEPENDS+=		tdb>=1.2.6:${PORTSDIR}/databases/tdb
-RUN_DEPENDS+=		tdb>=1.2.6:${PORTSDIR}/databases/tdb
+BUILD_DEPENDS+=		tdb>=1.2.6:databases/tdb
+RUN_DEPENDS+=		tdb>=1.2.6:databases/tdb
 CONFIGURE_ARGS+=	--without-libtdb --enable-external-libtdb
 # talloc
-BUILD_DEPENDS+=		talloc>=2.0.1:${PORTSDIR}/devel/talloc
-RUN_DEPENDS+=		talloc>=2.0.1:${PORTSDIR}/devel/talloc
+BUILD_DEPENDS+=		talloc>=2.0.1:devel/talloc
+RUN_DEPENDS+=		talloc>=2.0.1:devel/talloc
 CONFIGURE_ARGS+=	--without-libtalloc --enable-external-libtalloc
 # tevent
-BUILD_DEPENDS+=		tevent>=0.9.11:${PORTSDIR}/devel/tevent
-RUN_DEPENDS+=		tevent>=0.9.11:${PORTSDIR}/devel/tevent
+BUILD_DEPENDS+=		tevent>=0.9.11:devel/tevent
+RUN_DEPENDS+=		tevent>=0.9.11:devel/tevent
 CONFIGURE_ARGS+=	--without-libtevent --enable-external-libtevent
 # These options are common for all (sub)ports
 CONFIGURE_ARGS+=	${ICONV_CONFIGURE_BASE} \
@@ -195,7 +195,7 @@ SAMBA_WANT_LDAP=	yes
 .endif
 
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=		libcups.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 SUB_LIST+=		CUPS=""
 .else
@@ -206,7 +206,7 @@ SUB_LIST+=		CUPS="@comment "
 .if ${PORT_OPTIONS:MMAX_DEBUG}
 CPPFLAGS+=		-g
 LDFLAGS+=		-g
-LIB_DEPENDS+=		libdmalloc.so:${PORTSDIR}/devel/dmalloc
+LIB_DEPENDS+=		libdmalloc.so:devel/dmalloc
 CONFIGURE_ARGS+=	--enable-debug
 #			--enable-socket-wrapper --enable-nss-wrapper \
 #			--enable-developer --enable-krb5developer \
@@ -279,7 +279,7 @@ CONFIGURE_ARGS+=	--disable-fam
 .if ${PORT_OPTIONS:MACL_SUPPORT}
 CONFIGURE_ARGS+=	--with-acl-support
 WANT_EXP_MODULES+=	vfs_zfsacl
-LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/sysutils/libsunacl
+LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 .else
 CONFIGURE_ARGS+=	--without-acl-support
 .endif
@@ -302,7 +302,7 @@ PLIST_SUB+=		SMBPASS="@comment "
 .	if ! ${PORT_OPTIONS:MADS}
 IGNORE=			dynamic DNS updates require ADS support. Disable DNSUPDATE support
 .	endif
-LIB_DEPENDS+=		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS+=		libuuid.so:misc/e2fsprogs-libuuid
 CONFIGURE_ARGS+=	--with-dnsupdate
 .else
 CONFIGURE_ARGS+=	--without-dnsupdate
@@ -311,7 +311,7 @@ CONFIGURE_ARGS+=	--without-dnsupdate
 .if ${PORT_OPTIONS:MAVAHI}
 CPPFLAGS+=		`pkg-config --cflags avahi-client`
 CONFIGURE_ENV+=		DNSSD_LIBS="`pkg-config --libs avahi-client`"
-LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 CONFIGURE_ARGS+=	--enable-avahi
 .else
 CONFIGURE_ARGS+=	--disable-avahi
@@ -324,7 +324,7 @@ CONFIGURE_ARGS+=	--disable-pthreadpool
 .endif
 
 .if ${PORT_OPTIONS:MPOPT}
-LIB_DEPENDS+=		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS+=		libpopt.so:devel/popt
 CONFIGURE_ARGS+=	--without-included-popt
 .else
 CONFIGURE_ARGS+=	--with-included-popt
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index 054974e22d60..b2a3b95fa962 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -74,42 +74,42 @@ PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 # XXX: Unconditional dependencies which can't be switched off (if present
 # in the system)
 # popt
-LIB_DEPENDS+=		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS+=		libpopt.so:devel/popt
 # inotify
-LIB_DEPENDS+=		libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS+=		libinotify.so:devel/libinotify
 # SASL
-LIB_DEPENDS+=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 # GNUTLS
-LIB_DEPENDS+=		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		libgcrypt.so:security/libgcrypt
+LIB_DEPENDS+=		libgnutls.so:security/gnutls
 # NFS4 ACL glue
-LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/sysutils/libsunacl
+LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 # External Samba dependencies
 # IDL compiler
-BUILD_DEPENDS+=		p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl
+BUILD_DEPENDS+=		p5-Parse-Pidl>=4.0.0:devel/p5-Parse-Pidl
 #
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 PLIST_SUB+=		PY_DNSPYTHON="@comment "
 # ntdb
-BUILD_DEPENDS+=		ntdb>=1.0:${PORTSDIR}/databases/ntdb
-RUN_DEPENDS+=		ntdb>=1.0:${PORTSDIR}/databases/ntdb
+BUILD_DEPENDS+=		ntdb>=1.0:databases/ntdb
+RUN_DEPENDS+=		ntdb>=1.0:databases/ntdb
 SAMBA4_BUNDLED_LIBS+=	!ntdb
 # talloc
-BUILD_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc
-RUN_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc
+BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc
+RUN_DEPENDS+=		talloc>=2.1.5:devel/talloc
 SAMBA4_BUNDLED_LIBS+=	!talloc
 # tevent
-BUILD_DEPENDS+=		tevent>=0.9.25:${PORTSDIR}/devel/tevent
-RUN_DEPENDS+=		tevent>=0.9.25:${PORTSDIR}/devel/tevent
+BUILD_DEPENDS+=		tevent>=0.9.25:devel/tevent
+RUN_DEPENDS+=		tevent>=0.9.25:devel/tevent
 SAMBA4_BUNDLED_LIBS+=	!tevent
 # tdb
-BUILD_DEPENDS+=		tdb>=1.3.8:${PORTSDIR}/databases/tdb
-RUN_DEPENDS+=		tdb>=1.3.8:${PORTSDIR}/databases/tdb
+BUILD_DEPENDS+=		tdb>=1.3.8:databases/tdb
+RUN_DEPENDS+=		tdb>=1.3.8:databases/tdb
 SAMBA4_BUNDLED_LIBS+=	!tdb
 # ldb
-BUILD_DEPENDS+=		ldb>=1.1.24:${PORTSDIR}/databases/ldb
-RUN_DEPENDS+=		ldb>=1.1.24:${PORTSDIR}/databases/ldb
+BUILD_DEPENDS+=		ldb>=1.1.24:databases/ldb
+RUN_DEPENDS+=		ldb>=1.1.24:databases/ldb
 SAMBA4_BUNDLED_LIBS+=	!ldb
 # Don't use external libcom_err
 SAMBA4_BUNDLED_LIBS+=	com_err
@@ -166,13 +166,13 @@ CFLAGS+=		-fno-omit-frame-pointer
 .endif
 
 .if ${PORT_OPTIONS:MBIND99}
-RUN_DEPENDS+=		bind99>=9.9.0.0:${PORTSDIR}/dns/bind99
+RUN_DEPENDS+=		bind99>=9.9.0.0:dns/bind99
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MBIND910}
-RUN_DEPENDS+=		bind910>=9.10.0.0:${PORTSDIR}/dns/bind910
+RUN_DEPENDS+=		bind910>=9.10.0.0:dns/bind910
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MNSUPDATE}
-RUN_DEPENDS+=		samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate
+RUN_DEPENDS+=		samba-nsupdate:dns/samba-nsupdate
 SUB_LIST+=		NSUPDATE=""
 .endif
 
@@ -189,8 +189,8 @@ CONFIGURE_ARGS+=	--enable-debug
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046
 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then.
 GDB_CMD?=		${LOCALBASE}/bin/gdb
-BUILD_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
-RUN_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
+BUILD_DEPENDS+=		${GDB_CMD}:devel/gdb
+RUN_DEPENDS+=		${GDB_CMD}:devel/gdb
 SAMBA4_MODULES+=	auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
 CONFIGURE_ARGS+=	--enable-developer --enable-socket-wrapper --enable-nss-wrapper --enable-selftest
 PLIST_SUB+=		DEVELOPER=""
@@ -228,7 +228,7 @@ WANT_EXP_MODULES=	vfs_cacheprime gpext_scripts gpext_security gpext_registry
 .endif
 
 .if ${PORT_OPTIONS:MACL_SUPPORT}
-LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/sysutils/libsunacl
+LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 WANT_EXP_MODULES+=	vfs_zfsacl
 SAMBA4_MODULES+=	vfs_zfsacl
 CONFIGURE_ARGS+=	--with-acl-support
@@ -259,21 +259,21 @@ CONFIGURE_ARGS+=	--without-aio-support
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 CONFIGURE_ARGS+=	--enable-avahi
 .else
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
-LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
 CONFIGURE_ARGS+=	--enable-dnssd
 .else
 CONFIGURE_ARGS+=	--disable-dnssd
 .endif
 
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=		libcups.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 .else
 CONFIGURE_ARGS+=	--disable-cups --disable-iprint
@@ -352,8 +352,8 @@ PLIST_SUB+=		LDAP="@comment "
 .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
 
 .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
diff --git a/net/samba42/Makefile b/net/samba42/Makefile
index 8fe314d9dd32..81e913ce2296 100644
--- a/net/samba42/Makefile
+++ b/net/samba42/Makefile
@@ -72,45 +72,45 @@ PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 # XXX: Unconditional dependencies which can't be switched off(if present
 # in the system)
 # popt
-LIB_DEPENDS+=		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS+=		libpopt.so:devel/popt
 # inotify
-LIB_DEPENDS+=		libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS+=		libinotify.so:devel/libinotify
 # SASL
-LIB_DEPENDS+=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 # GNUTLS
-LIB_DEPENDS+=		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		libgcrypt.so:security/libgcrypt
+LIB_DEPENDS+=		libgnutls.so:security/gnutls
 # NFS4 ACL glue
-LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/sysutils/libsunacl
+LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 # Libarchive
-BUILD_DEPENDS+=		libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive
-RUN_DEPENDS+=		libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive
+BUILD_DEPENDS+=		libarchive>=3.1.2:archivers/libarchive
+RUN_DEPENDS+=		libarchive>=3.1.2:archivers/libarchive
 # External Samba dependencies
 # IDL compiler
-BUILD_DEPENDS+=		p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl
+BUILD_DEPENDS+=		p5-Parse-Pidl>=4.0.0:devel/p5-Parse-Pidl
 #
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 PLIST_SUB+=		PY_DNSPYTHON="@comment "
 # talloc
-BUILD_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc
-RUN_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc
+BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc
+RUN_DEPENDS+=		talloc>=2.1.5:devel/talloc
 SAMBA4_BUNDLED_LIBS+=	!talloc
 # tevent
-BUILD_DEPENDS+=		tevent>=0.9.25:${PORTSDIR}/devel/tevent
-RUN_DEPENDS+=		tevent>=0.9.25:${PORTSDIR}/devel/tevent
+BUILD_DEPENDS+=		tevent>=0.9.25:devel/tevent
+RUN_DEPENDS+=		tevent>=0.9.25:devel/tevent
 SAMBA4_BUNDLED_LIBS+=	!tevent
 # tdb
-BUILD_DEPENDS+=		tdb>=1.3.8:${PORTSDIR}/databases/tdb
-RUN_DEPENDS+=		tdb>=1.3.8:${PORTSDIR}/databases/tdb
+BUILD_DEPENDS+=		tdb>=1.3.8:databases/tdb
+RUN_DEPENDS+=		tdb>=1.3.8:databases/tdb
 SAMBA4_BUNDLED_LIBS+=	!tdb
 # ntdb
-BUILD_DEPENDS+=		ntdb>=1.0:${PORTSDIR}/databases/ntdb
-RUN_DEPENDS+=		ntdb>=1.0:${PORTSDIR}/databases/ntdb
+BUILD_DEPENDS+=		ntdb>=1.0:databases/ntdb
+RUN_DEPENDS+=		ntdb>=1.0:databases/ntdb
 SAMBA4_BUNDLED_LIBS+=	!ntdb
 # ldb
-BUILD_DEPENDS+=		ldb>=1.1.24:${PORTSDIR}/databases/ldb
-RUN_DEPENDS+=		ldb>=1.1.24:${PORTSDIR}/databases/ldb
+BUILD_DEPENDS+=		ldb>=1.1.24:databases/ldb
+RUN_DEPENDS+=		ldb>=1.1.24:databases/ldb
 SAMBA4_BUNDLED_LIBS+=	!ldb
 # Don't use external libcom_err
 SAMBA4_BUNDLED_LIBS+=	com_err
@@ -168,13 +168,13 @@ CFLAGS+=		-fno-omit-frame-pointer
 .endif
 
 .if ${PORT_OPTIONS:MBIND99}
-RUN_DEPENDS+=		bind99>=9.9.0.0:${PORTSDIR}/dns/bind99
+RUN_DEPENDS+=		bind99>=9.9.0.0:dns/bind99
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MBIND910}
-RUN_DEPENDS+=		bind910>=9.10.0.0:${PORTSDIR}/dns/bind910
+RUN_DEPENDS+=		bind910>=9.10.0.0:dns/bind910
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MNSUPDATE}
-RUN_DEPENDS+=		samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate
+RUN_DEPENDS+=		samba-nsupdate:dns/samba-nsupdate
 SUB_LIST+=		NSUPDATE=""
 .else
 SUB_LIST+=		NSUPDATE="@comment "
@@ -193,8 +193,8 @@ CONFIGURE_ARGS+=	--enable-debug
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046
 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then.
 GDB_CMD?=		${LOCALBASE}/bin/gdb
-BUILD_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
-RUN_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
+BUILD_DEPENDS+=		${GDB_CMD}:devel/gdb
+RUN_DEPENDS+=		${GDB_CMD}:devel/gdb
 SAMBA4_MODULES+=	auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
 CONFIGURE_ARGS+=	--enable-developer --enable-selftest
 PLIST_SUB+=		DEVELOPER=""
@@ -232,7 +232,7 @@ WANT_EXP_MODULES=	vfs_cacheprime gpext_scripts gpext_security gpext_registry
 .endif
 
 .if ${PORT_OPTIONS:MACL_SUPPORT}
-LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/sysutils/libsunacl
+LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 WANT_EXP_MODULES+=	vfs_zfsacl
 SAMBA4_MODULES+=	vfs_zfsacl
 CONFIGURE_ARGS+=	--with-acl-support
@@ -265,21 +265,21 @@ CONFIGURE_ARGS+=	--without-aio-support
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 CONFIGURE_ARGS+=	--enable-avahi
 .else
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
-LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
 CONFIGURE_ARGS+=	--enable-dnssd
 .else
 CONFIGURE_ARGS+=	--disable-dnssd
 .endif
 
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=		libcups.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 .else
 CONFIGURE_ARGS+=	--disable-cups --disable-iprint
@@ -358,8 +358,8 @@ PLIST_SUB+=		LDAP="@comment "
 .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
 
 .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
diff --git a/net/samba43/Makefile b/net/samba43/Makefile
index 6ba4f003839d..881dc0c82c46 100644
--- a/net/samba43/Makefile
+++ b/net/samba43/Makefile
@@ -72,41 +72,41 @@ PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 # XXX: Unconditional dependencies which can't be switched off(if present
 # in the system)
 # popt
-LIB_DEPENDS+=		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS+=		libpopt.so:devel/popt
 # inotify
-LIB_DEPENDS+=		libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS+=		libinotify.so:devel/libinotify
 # SASL
-LIB_DEPENDS+=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 # GNUTLS
-LIB_DEPENDS+=		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		libgcrypt.so:security/libgcrypt
+LIB_DEPENDS+=		libgnutls.so:security/gnutls
 # NFS4 ACL glue
-LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/sysutils/libsunacl
+LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 # Libarchive
-BUILD_DEPENDS+=		libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive
-RUN_DEPENDS+=		libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive
+BUILD_DEPENDS+=		libarchive>=3.1.2:archivers/libarchive
+RUN_DEPENDS+=		libarchive>=3.1.2:archivers/libarchive
 # External Samba dependencies
 # IDL compiler
-BUILD_DEPENDS+=		p5-Parse-Pidl>=4.3.1:${PORTSDIR}/devel/p5-Parse-Pidl
+BUILD_DEPENDS+=		p5-Parse-Pidl>=4.3.1:devel/p5-Parse-Pidl
 #
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 PLIST_SUB+=		PY_DNSPYTHON="@comment "
 # talloc
-BUILD_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc
-RUN_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc
+BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc
+RUN_DEPENDS+=		talloc>=2.1.5:devel/talloc
 SAMBA4_BUNDLED_LIBS+=	!talloc
 # tevent
-BUILD_DEPENDS+=		tevent>=0.9.25:${PORTSDIR}/devel/tevent
-RUN_DEPENDS+=		tevent>=0.9.25:${PORTSDIR}/devel/tevent
+BUILD_DEPENDS+=		tevent>=0.9.25:devel/tevent
+RUN_DEPENDS+=		tevent>=0.9.25:devel/tevent
 SAMBA4_BUNDLED_LIBS+=	!tevent
 # tdb
-BUILD_DEPENDS+=		tdb>=1.3.8:${PORTSDIR}/databases/tdb
-RUN_DEPENDS+=		tdb>=1.3.8:${PORTSDIR}/databases/tdb
+BUILD_DEPENDS+=		tdb>=1.3.8:databases/tdb
+RUN_DEPENDS+=		tdb>=1.3.8:databases/tdb
 SAMBA4_BUNDLED_LIBS+=	!tdb
 # ldb
-BUILD_DEPENDS+=		ldb>=1.1.24:${PORTSDIR}/databases/ldb
-RUN_DEPENDS+=		ldb>=1.1.24:${PORTSDIR}/databases/ldb
+BUILD_DEPENDS+=		ldb>=1.1.24:databases/ldb
+RUN_DEPENDS+=		ldb>=1.1.24:databases/ldb
 SAMBA4_BUNDLED_LIBS+=	!ldb
 # Don't use external libcom_err
 SAMBA4_BUNDLED_LIBS+=	com_err
@@ -164,13 +164,13 @@ CFLAGS+=		-fno-omit-frame-pointer
 .endif
 
 .if ${PORT_OPTIONS:MBIND99}
-RUN_DEPENDS+=		bind99>=9.9.0.0:${PORTSDIR}/dns/bind99
+RUN_DEPENDS+=		bind99>=9.9.0.0:dns/bind99
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MBIND910}
-RUN_DEPENDS+=		bind910>=9.10.0.0:${PORTSDIR}/dns/bind910
+RUN_DEPENDS+=		bind910>=9.10.0.0:dns/bind910
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MNSUPDATE}
-RUN_DEPENDS+=		samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate
+RUN_DEPENDS+=		samba-nsupdate:dns/samba-nsupdate
 SUB_LIST+=		NSUPDATE=""
 .else
 SUB_LIST+=		NSUPDATE="@comment "
@@ -189,8 +189,8 @@ CONFIGURE_ARGS+=	--enable-debug
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046
 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then.
 GDB_CMD?=		${LOCALBASE}/bin/gdb
-BUILD_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
-RUN_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
+BUILD_DEPENDS+=		${GDB_CMD}:devel/gdb
+RUN_DEPENDS+=		${GDB_CMD}:devel/gdb
 SAMBA4_MODULES+=	auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
 CONFIGURE_ARGS+=	--enable-developer --enable-selftest
 PLIST_SUB+=		DEVELOPER=""
@@ -228,7 +228,7 @@ WANT_EXP_MODULES=	vfs_cacheprime gpext_scripts gpext_security gpext_registry
 .endif
 
 .if ${PORT_OPTIONS:MACL_SUPPORT}
-LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/sysutils/libsunacl
+LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 WANT_EXP_MODULES+=	vfs_zfsacl
 SAMBA4_MODULES+=	vfs_zfsacl
 CONFIGURE_ARGS+=	--with-acl-support
@@ -261,21 +261,21 @@ CONFIGURE_ARGS+=	--without-aio-support
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 CONFIGURE_ARGS+=	--enable-avahi
 .else
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
-LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
 CONFIGURE_ARGS+=	--enable-dnssd
 .else
 CONFIGURE_ARGS+=	--disable-dnssd
 .endif
 
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=		libcups.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 .else
 CONFIGURE_ARGS+=	--disable-cups --disable-iprint
@@ -354,8 +354,8 @@ PLIST_SUB+=		LDAP="@comment "
 .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
 
 .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 432558312db4..66f8c064c184 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Powerful interactive packet manipulation program in python
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dnet.so:${PORTSDIR}/net/py-libdnet \
-		${PYTHON_SITELIBDIR}/pcap.py:${PORTSDIR}/net/py-pcap
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet \
+		${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -30,16 +30,16 @@ NMAP_DESC=	nmap OS signatures database
 MANUF_DESC=	wireshark's MANUF MAC database
 SOX_DESC=	Support for VoIP
 
-PYX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyx/__init__.py:${PORTSDIR}/graphics/py-PyX12
-PYCRYPTO_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
-PYGNUPLOT_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:${PORTSDIR}/math/py-gnuplot
-GRAPH_RUN_DEPENDS=	${LOCALBASE}/bin/MagickCore-config:${PORTSDIR}/graphics/ImageMagick \
-			${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz
-P0F_BASE_RUN_DEPENDS=	${LOCALBASE}/etc/p0f.fp:${PORTSDIR}/net-mgmt/p0f
-QUESO_BASE_RUN_DEPENDS=	${LOCALBASE}/etc/queso.conf.sample:${PORTSDIR}/net/queso
-NMAP_RUN_DEPENDS=	${LOCALBASE}/share/nmap/nmap-os-db:${PORTSDIR}/security/nmap
-MANUF_RUN_DEPENDS=	${LOCALBASE}/share/wireshark/manuf:${PORTSDIR}/net/wireshark
-SOX_RUN_DEPENDS=	${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox
+PYX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12
+PYCRYPTO_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto
+PYGNUPLOT_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:math/py-gnuplot
+GRAPH_RUN_DEPENDS=	${LOCALBASE}/bin/MagickCore-config:graphics/ImageMagick \
+			${LOCALBASE}/bin/dot:graphics/graphviz
+P0F_BASE_RUN_DEPENDS=	${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f
+QUESO_BASE_RUN_DEPENDS=	${LOCALBASE}/etc/queso.conf.sample:net/queso
+NMAP_RUN_DEPENDS=	${LOCALBASE}/share/nmap/nmap-os-db:security/nmap
+MANUF_RUN_DEPENDS=	${LOCALBASE}/share/wireshark/manuf:net/wireshark
+SOX_RUN_DEPENDS=	${LOCALBASE}/bin/sox:audio/sox
 
 post-patch:
 	@${REINPLACE_CMD} "s,share/man/man1,man/man1," ${WRKSRC}/setup.py
diff --git a/net/scnc/Makefile b/net/scnc/Makefile
index de76fc9414d4..f349d68ce58a 100644
--- a/net/scnc/Makefile
+++ b/net/scnc/Makefile
@@ -11,8 +11,8 @@ COMMENT=	SSL Capable Netcat
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		shebangfix
diff --git a/net/scribe/Makefile b/net/scribe/Makefile
index 28854361c0bf..2260bb23a88f 100644
--- a/net/scribe/Makefile
+++ b/net/scribe/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Aggregating log data streamed in real time
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	fb303>0:${PORTSDIR}/devel/fb303 \
-		thrift:${PORTSDIR}/devel/thrift
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libthrift.so:${PORTSDIR}/devel/thrift-cpp
-RUN_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Thrift>0:${PORTSDIR}/devel/p5-Thrift \
-		${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift
+BUILD_DEPENDS=	fb303>0:devel/fb303 \
+		thrift:devel/thrift
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libevent.so:devel/libevent2 \
+		libthrift.so:devel/thrift-cpp
+RUN_DEPENDS=	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Thrift>0:devel/p5-Thrift \
+		${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebookarchive
diff --git a/net/sendemail/Makefile b/net/sendemail/Makefile
index a032a691149f..53136795bcb1 100644
--- a/net/sendemail/Makefile
+++ b/net/sendemail/Makefile
@@ -23,8 +23,8 @@ PORTDOCS=	CHANGELOG README TODO
 OPTIONS_DEFINE=	SSL DOCS
 SSL_DESC=	SSL/TLS support for communicating with the SMTP server
 
-SSL_RUN_DEPENDS=p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
+SSL_RUN_DEPENDS=p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 43604275b1e0..c1c85a0e0413 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Server framework
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libguile.so:lang/guile
 
 USES=		tar:xz libtool
 GNU_CONFIGURE=	yes
diff --git a/net/serviio/Makefile b/net/serviio/Makefile
index 4854ff4a493c..58ac5e54ee1c 100644
--- a/net/serviio/Makefile
+++ b/net/serviio/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	-linux.tar.gz
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Transcoding DLNA-server implemented in Java
 
-RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 
 NO_BUILD=	yes
 USE_JAVA=	yes
diff --git a/net/shelldap/Makefile b/net/shelldap/Makefile
index a5a93e3ce8f1..8140fde3a854 100644
--- a/net/shelldap/Makefile
+++ b/net/shelldap/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Shell-like environment for LDAP
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Term-Shell>=0:${PORTSDIR}/devel/p5-Term-Shell \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+RUN_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Term-Shell>=0:devel/p5-Term-Shell \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 
 USES=		perl5
 USE_PERL5=	extract build run
diff --git a/net/shmux/Makefile b/net/shmux/Makefile
index 5b253e0bb3d1..7d622d1e76e2 100644
--- a/net/shmux/Makefile
+++ b/net/shmux/Makefile
@@ -26,11 +26,11 @@ FPING_DESC=	Use fping utility
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFPING}
-RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
+RUN_DEPENDS+=	fping:net/fping
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}/lib
 .else
 CONFIGURE_ARGS+=	--with-pcre=no
diff --git a/net/sie-nmsg/Makefile b/net/sie-nmsg/Makefile
index ebf11c31a7cf..bebe0f939682 100644
--- a/net/sie-nmsg/Makefile
+++ b/net/sie-nmsg/Makefile
@@ -11,9 +11,9 @@ COMMENT=	SIE message module plugin for libnmsg
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \
-		libnmsg.so:${PORTSDIR}/net/nmsg \
-		libwdns.so:${PORTSDIR}/dns/wdns
+LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c \
+		libnmsg.so:net/nmsg \
+		libwdns.so:dns/wdns
 
 GNU_CONFIGURE=	yes
 USES=	gmake libtool pathfix pkgconfig
diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index 812f2d2a9dab..c94a142ac4f4 100644
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Proxy/masquerading daemon for the SIP protocol
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libosip2.so:${PORTSDIR}/net/libosip2
+LIB_DEPENDS=	libosip2.so:net/libosip2
 
 # :keepla because port uses lt_dlopen
 USES=		libtool:keepla
diff --git a/net/sixxs-aiccu/Makefile b/net/sixxs-aiccu/Makefile
index 8584dd0a263c..a06af23d5600 100644
--- a/net/sixxs-aiccu/Makefile
+++ b/net/sixxs-aiccu/Makefile
@@ -34,7 +34,7 @@ OPTIONS_DEFAULT+=	GNUTLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 CFLAGS+=	-DAICCU_GNUTLS
 LDFLAGS+=	-lgnutls
 .endif
diff --git a/net/sl2tps/Makefile b/net/sl2tps/Makefile
index 0b98d430b46c..d5f03d708995 100644
--- a/net/sl2tps/Makefile
+++ b/net/sl2tps/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple L2TP server based on libpdel(3) and netgraph(4)
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libpdel.so:${PORTSDIR}/devel/libpdel
+LIB_DEPENDS=	libpdel.so:devel/libpdel
 
 USES=		uidfix
 
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index 18cc69ef2134..5aac8d066c5a 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	smb4k-${PORTVERSION}
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	KDE 4.x SMB Network browser and SMB shares mounting center
 
-RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo \
-		smbstatus:${PORTSDIR}/${SAMBA_PORT}
+RUN_DEPENDS=	sudo:security/sudo \
+		smbstatus:${SAMBA_PORT}
 
 SAMBA_PORT?=	net/samba36
 
diff --git a/net/smbldap-tools/Makefile b/net/smbldap-tools/Makefile
index f8dd15e52e06..4066b0d76074 100644
--- a/net/smbldap-tools/Makefile
+++ b/net/smbldap-tools/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Samba-LDAP management and support tools
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Crypt-SmbHash>=0:${PORTSDIR}/security/p5-Crypt-SmbHash \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Unicode-MapUTF8>=0:${PORTSDIR}/converters/p5-Unicode-MapUTF8
+BUILD_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Crypt-SmbHash>=0:security/p5-Crypt-SmbHash \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Unicode-MapUTF8>=0:converters/p5-Unicode-MapUTF8
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/a//}
diff --git a/net/smm++/Makefile b/net/smm++/Makefile
index 10c77337d9f5..2d5e54324e4a 100644
--- a/net/smm++/Makefile
+++ b/net/smm++/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	smm611
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Graphical mudclient with mapper
 
-RUN_DEPENDS=	iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
-BUILD_DEPENDS=	${LOCALBASE}/lib/libitk.so:${PORTSDIR}/x11-toolkits/itk \
-		${LOCALBASE}/lib/libitcl.so:${PORTSDIR}/lang/itcl
+RUN_DEPENDS=	iwidgets>0:x11-toolkits/iwidgets
+BUILD_DEPENDS=	${LOCALBASE}/lib/libitk.so:x11-toolkits/itk \
+		${LOCALBASE}/lib/libitcl.so:lang/itcl
 
 WRKSRC=		${WRKDIR}/smm/Install.unix
 USES=		gmake tk tar:tgz
diff --git a/net/sntop/Makefile b/net/sntop/Makefile
index 66f2b4683c99..e96e35c7dfb8 100644
--- a/net/sntop/Makefile
+++ b/net/sntop/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		ncurses
-RUN_DEPENDS=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
+RUN_DEPENDS=	${LOCALBASE}/sbin/fping:net/fping
 
 GNU_CONFIGURE=	yes
 PORTDOCS=	COPYING CREDITS ChangeLog INSTALL README TODO
diff --git a/net/sobby/Makefile b/net/sobby/Makefile
index 89f5cfb77fc7..c9a4d8b66b4b 100644
--- a/net/sobby/Makefile
+++ b/net/sobby/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Standalone obby server
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libobby.so:${PORTSDIR}/devel/obby \
-		libnet6.so:${PORTSDIR}/net/net6 \
-		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
+		libobby.so:devel/obby \
+		libnet6.so:net/net6 \
+		libxml++-2.6.so:textproc/libxml++26
 
 USES=		pkgconfig
 USE_GNOME=	glibmm
diff --git a/net/splatd/Makefile b/net/splatd/Makefile
index fceacc56a7ff..7ddd04bccfa4 100644
--- a/net/splatd/Makefile
+++ b/net/splatd/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Splat is the Scalable Periodic LDAP Attribute Transmogrifier
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/zconfig:${PORTSDIR}/devel/py-zconfig \
-		${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:${PORTSDIR}/net/py-ldap
-RUN_DEPENDS=	${LOCALBASE}/bin/zconfig:${PORTSDIR}/devel/py-zconfig \
-		${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:${PORTSDIR}/net/py-ldap
+BUILD_DEPENDS=	${LOCALBASE}/bin/zconfig:devel/py-zconfig \
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap
+RUN_DEPENDS=	${LOCALBASE}/bin/zconfig:devel/py-zconfig \
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap
 
 USES=		python twisted
 USE_PYTHON=	distutils
diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile
index 9ae8f901315c..330380e7cb5b 100644
--- a/net/spread-j/Makefile
+++ b/net/spread-j/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java client library for the Spread Group Communication System
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
+BUILD_DEPENDS=	${ANT}:devel/apache-ant
 
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index a9f3ebd3deba..032f1461615e 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SSL/SSH multiplexer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig
+LIB_DEPENDS=	libconfig.so:devel/libconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yrutschle
diff --git a/net/ssltunnel-client/Makefile b/net/ssltunnel-client/Makefile
index a677744b15dc..6879abb51fcd 100644
--- a/net/ssltunnel-client/Makefile
+++ b/net/ssltunnel-client/Makefile
@@ -26,7 +26,7 @@ USE_OPENSSL=	yes
 .if ${PORT_OPTIONS:MGUI}
 USE_GNOME=	gtk12
 USES+=		perl5
-RUN_DEPENDS=	p5-Gtk>=0:${PORTSDIR}/x11-toolkits/p5-Gtk
+RUN_DEPENDS=	p5-Gtk>=0:x11-toolkits/p5-Gtk
 MAN1+=		gpppclient.1
 PLIST_SUB+=	PERLGTK=""
 .else
diff --git a/net/ssspl/Makefile b/net/ssspl/Makefile
index bd4546d2b639..9899bebeef2d 100644
--- a/net/ssspl/Makefile
+++ b/net/ssspl/Makefile
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.pl
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Simple Socks Server for Perl
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 
 NO_BUILD=	yes
 USES=		shebangfix
diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile
index c465338aad9f..833d96a98614 100644
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel \
-		xterm:${PORTSDIR}/x11/xterm
+RUN_DEPENDS=	stunnel:security/stunnel \
+		xterm:x11/xterm
 
 OPTIONS_DEFINE=	DOCS ULTRAFTP
 ULTRAFTP_DESC=	UltraVNC File Transfer support (Java required)
diff --git a/net/subnetcalc/Makefile b/net/subnetcalc/Makefile
index 99630a11e00b..b4387b9b9702 100644
--- a/net/subnetcalc/Makefile
+++ b/net/subnetcalc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	IPv4/IPv6 Subnet Calculator
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--with-geoip=${LOCALBASE}"
diff --git a/net/syncthing-cli/Makefile b/net/syncthing-cli/Makefile
index 97dfd2513183..e946777acba7 100644
--- a/net/syncthing-cli/Makefile
+++ b/net/syncthing-cli/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	net
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Syncthing CLI
 
-BUILD_DEPENDS=	go>=1.5:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go>=1.5:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing
diff --git a/net/syncthing-discosrv/Makefile b/net/syncthing-discosrv/Makefile
index 83706535b968..b099f3a5b40e 100644
--- a/net/syncthing-discosrv/Makefile
+++ b/net/syncthing-discosrv/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	net
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Discovery server for syncthing
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing
diff --git a/net/syncthing-inotify/Makefile b/net/syncthing-inotify/Makefile
index 86468b5786ff..334fad6a588d 100644
--- a/net/syncthing-inotify/Makefile
+++ b/net/syncthing-inotify/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	net
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Syncthing inotify monitor
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing cenkalti:backoff zillode:notify
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 21267171ef61..ca820b3b3ff5 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	net
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Encrypted file sync tool
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 USE_RC_SUBR=	syncthing
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index 959e3fdbb0fa..b9e9fd1aad6c 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/tapioca-voip/OldFiles
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstraction layer for interprocess communication
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USES=		pathfix pkgconfig gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/net/tclsoap/Makefile b/net/tclsoap/Makefile
index 37a6e4daf8a5..07a7379c3bbc 100644
--- a/net/tclsoap/Makefile
+++ b/net/tclsoap/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SOAP and XML-RPC support for TCL library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${LOCALBASE}/lib/TclxmlConfig.sh:${PORTSDIR}/devel/tclxml
+RUN_DEPENDS=	${LOCALBASE}/lib/TclxmlConfig.sh:devel/tclxml
 
 USES=		tcl:wrapper,build
 USE_AUTOTOOLS=	autoconf:autoconf
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 09f4d1fdb15c..0119f187cbb8 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ubiquitous network traffic analysis tool
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
+LIB_DEPENDS=	libpcap.so:net/libpcap
 
 GNU_CONFIGURE=	yes
 USES=		gmake
@@ -36,7 +36,7 @@ CRYPTO_CONFIGURE_WITH=	crypto
 IPV6_CONFIGURE_ENABLE=	ipv6
 SMB_CONFIGURE_ENABLE=	smb
 SMI_CONFIGURE_WITH=	smi
-SMI_LIB_DEPENDS=	libsmi.so:${PORTSDIR}/net-mgmt/libsmi
+SMI_LIB_DEPENDS=	libsmi.so:net-mgmt/libsmi
 USER_CONFIGURE_ON=	--with-user=${UNPRIV_USER}
 CHROOT_CONFIGURE_ON=	--with-chroot=${CHROOTDIR}
 
diff --git a/net/tcpflow/Makefile b/net/tcpflow/Makefile
index 563bb2a62ee8..87b41d2eb4a3 100644
--- a/net/tcpflow/Makefile
+++ b/net/tcpflow/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Program that captures data transmitted as part of TCP connections
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/icl/interval.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/icl/interval.hpp:devel/boost-libs
+LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/tcpproxy/Makefile b/net/tcpproxy/Makefile
index 9dc44eea4e35..6c2aaaf7ccde 100644
--- a/net/tcpproxy/Makefile
+++ b/net/tcpproxy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple TCP connection proxy for IPv4 and IPv6
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-BUILD_DEPENDS=	ragel:${PORTSDIR}/devel/ragel
+BUILD_DEPENDS=	ragel:devel/ragel
 
 USES=		gmake
 HAS_CONFIGURE=	yes
diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile
index 9925f2297051..c8282b35d7d8 100644
--- a/net/tcptraceroute-devel/Makefile
+++ b/net/tcptraceroute-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Traceroute implementation using TCP packets
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 CONFLICTS=	tcptraceroute-1.4*
 
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 2b9ea9f05857..680b434f5269 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Traceroute implementation using TCP packets
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net/tcpwatch/Makefile b/net/tcpwatch/Makefile
index a02f8d7f28b9..c79117e42b7a 100644
--- a/net/tcpwatch/Makefile
+++ b/net/tcpwatch/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://hathawaymix.org/Software/TCPWatch/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TCP monitoring and logging tool with support for HTTP 1.1
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 6d9fa6170dce..b876e09f2b08 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -13,13 +13,13 @@ COMMENT=	High-performance, platform-neutral implementation of VNC
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENCE.TXT
 
-PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
-BUILD_DEPENDS=	${LOCALBASE}/include/GL/internal/dri_interface.h:${PORTSDIR}/graphics/dri \
-		${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util \
-		bash:${PORTSDIR}/shells/bash
+PATCH_DEPENDS=	${NONEXISTENT}:x11-servers/xorg-server:patch
+BUILD_DEPENDS=	${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/dri \
+		${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util \
+		bash:shells/bash
 # almost equivalent to x11-servers/xorg-server's
-RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
-		xkbcomp:${PORTSDIR}/x11/xkbcomp
+RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
+		xkbcomp:x11/xkbcomp
 
 CONFLICTS=	tridiavnc-[0-9]* \
 		tightvnc-[0-9]* \
@@ -48,10 +48,10 @@ VIEWER_DESC=		Build vncviewer
 CMAKE_ARGS=	-G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX}
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libtasn1.so:${PORTSDIR}/security/libtasn1 \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
-		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libtasn1.so:security/libtasn1 \
+		libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error \
+		libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=	--enable-glx-tls
 CMAKE_ARGS+=	-DENABLE_GNUTLS=1
 .else
@@ -75,10 +75,10 @@ CMAKE_ARGS+=	-DENABLE_PAM=0
 
 .if ${PORT_OPTIONS:MVIEWER}
 CMAKE_ARGS+=	-DBUILD_VIEWER=1
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libfltk.so:x11-toolkits/fltk
 # ImageMagick is required to generate icons during build process
-BUILD_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS+=	${LOCALBASE}/bin/convert:graphics/ImageMagick
 USE_XORG+=	xcursor xfixes xft xinerama
 PLIST_SUB+=	VIEWER=""
 INSTALLS_ICONS=	yes
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 9f67c5acd4de..7846dc0c979b 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Enhanced version of VNC
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENCE.TXT
 
-RUN_DEPENDS=	showrgb:${PORTSDIR}/x11/rgb \
-		xauth:${PORTSDIR}/x11/xauth \
-		xorg-fonts>=7.2:${PORTSDIR}/x11-fonts/xorg-fonts
+RUN_DEPENDS=	showrgb:x11/rgb \
+		xauth:x11/xauth \
+		xorg-fonts>=7.2:x11-fonts/xorg-fonts
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	tridiavnc-[0-9]* vnc-[0-9]*
diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile
index adf356d2cf08..b05975135f84 100644
--- a/net/tintin++/Makefile
+++ b/net/tintin++/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Client program to help playing MUDs
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 OPTIONS_DEFINE=	BIG5 DOCS
 BIG5_DESC=	Big5 support
diff --git a/net/tiny-network-utilities/Makefile b/net/tiny-network-utilities/Makefile
index f3e1c236ec73..cf71004b2d58 100644
--- a/net/tiny-network-utilities/Makefile
+++ b/net/tiny-network-utilities/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Minimalistic DHCP, UDP proxy, etc server implementations
 
 LICENSE=	BSD4CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}hexdump>0:${PORTSDIR}/textproc/py-hexdump
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}hexdump>0:textproc/py-hexdump
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yurivict
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 440106260c18..d598b8483c09 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Popular programmable MUD client, with macro support and more
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-manpage --enable-version --enable-symlink \
diff --git a/net/tinyldap/Makefile b/net/tinyldap/Makefile
index eb19a8f26066..fb8f8baf5b59 100644
--- a/net/tinyldap/Makefile
+++ b/net/tinyldap/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${SNAPSHOT}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Small LDAP implementation
 
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/${LIBOWFAT_PORT}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libowfat.a:${LIBOWFAT_PORT}
 
 LICENSE=	GPLv2
 
diff --git a/net/tn5250j/Makefile b/net/tn5250j/Makefile
index eee952f4311b..e60c8eda1389 100644
--- a/net/tn5250j/Makefile
+++ b/net/tn5250j/Makefile
@@ -11,16 +11,16 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	saper@saper.info
 COMMENT=	5250 terminal emulator for the AS/400 written in Java
 
-BUILD_DEPENDS=	${JAVAJARDIR}/mail.jar:${PORTSDIR}/java/javamail \
-		${JYTHON_JAR}:${PORTSDIR}/lang/jython \
-		${JAVAJARDIR}/jt400.jar:${PORTSDIR}/sysutils/jtopen \
-		${JAVAJARDIR}/itext.jar:${PORTSDIR}/devel/itext \
-		${JAVAJARDIR}/log4j.jar:${PORTSDIR}/devel/log4j
-RUN_DEPENDS=	${JAVAJARDIR}/mail.jar:${PORTSDIR}/java/javamail \
-		${JYTHON_JAR}:${PORTSDIR}/lang/jython \
-		${JAVAJARDIR}/jt400.jar:${PORTSDIR}/sysutils/jtopen \
-		${JAVAJARDIR}/itext.jar:${PORTSDIR}/devel/itext \
-		${JAVAJARDIR}/log4j.jar:${PORTSDIR}/devel/log4j
+BUILD_DEPENDS=	${JAVAJARDIR}/mail.jar:java/javamail \
+		${JYTHON_JAR}:lang/jython \
+		${JAVAJARDIR}/jt400.jar:sysutils/jtopen \
+		${JAVAJARDIR}/itext.jar:devel/itext \
+		${JAVAJARDIR}/log4j.jar:devel/log4j
+RUN_DEPENDS=	${JAVAJARDIR}/mail.jar:java/javamail \
+		${JYTHON_JAR}:lang/jython \
+		${JAVAJARDIR}/jt400.jar:sysutils/jtopen \
+		${JAVAJARDIR}/itext.jar:devel/itext \
+		${JAVAJARDIR}/log4j.jar:devel/log4j
 
 USES=		dos2unix zip
 USE_ANT=	yes
diff --git a/net/traff/Makefile b/net/traff/Makefile
index b22da7ac50c7..16a3f7d98be2 100644
--- a/net/traff/Makefile
+++ b/net/traff/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	daniel@freebsd.ro
 COMMENT=	Libpcab based fast traffic accounting program
 
-BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
+BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:devel/argp-standalone
 
 USE_RC_SUBR=	traff
 USES=		gmake
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile
index 559120d36b4e..e89df5481676 100644
--- a/net/trafshow3/Makefile
+++ b/net/trafshow3/Makefile
@@ -16,7 +16,7 @@ CONFLICTS=	trafshow-[45].*
 
 .if defined(WITH_TRAFSHOW_SLANG) || \
     (exists(${LOCALBASE}/lib/libslang.a) && !defined(WITHOUT_TRAFSHOW_SLANG))
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS=	libslang.so:devel/libslang2
 .endif
 
 USES=		tar:tgz
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index 5ab7630e30b8..cba97490a92d 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Lightweight, portable bandwidth shaper
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index eb3dd1915e34..b98963b51077 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@thepentagon.org
 COMMENT=	GNOME 2 frontend for rdesktop and vncviewer
 
-RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rdesktop
+RUN_DEPENDS=	rdesktop:net/rdesktop
 
 USE_GNOME=	gtk20 intltool
 USES=		gettext gmake libtool pathfix pkgconfig
@@ -28,11 +28,11 @@ XNEST_DESC=	X via Xnest support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTIGHTVNC}
-RUN_DEPENDS+=	vncviewer:${PORTSDIR}/net/tightvnc
+RUN_DEPENDS+=	vncviewer:net/tightvnc
 .endif
 
 .if ${PORT_OPTIONS:MXNEST}
-RUN_DEPENDS+=	Xnest:${PORTSDIR}/x11-servers/xorg-nestserver
+RUN_DEPENDS+=	Xnest:x11-servers/xorg-nestserver
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/net/tucan/Makefile b/net/tucan/Makefile
index ec388eed2094..3d35e67ee3ce 100644
--- a/net/tucan/Makefile
+++ b/net/tucan/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://forja.rediris.es/frs/download.php/2051/ \
 MAINTAINER=	gustau.perez@gmail.com
 COMMENT=	Tucan Manager aids file-sharing with 1-click hosters
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${LOCALBASE}/bin/cntraining:${PORTSDIR}/graphics/tesseract
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${LOCALBASE}/bin/cntraining:graphics/tesseract
 
 NO_BUILD=	yes
 USE_GNOME=	pygtk2 librsvg2
diff --git a/net/turnserver/Makefile b/net/turnserver/Makefile
index 22fe59c38457..cbee82798b8f 100644
--- a/net/turnserver/Makefile
+++ b/net/turnserver/Makefile
@@ -17,7 +17,7 @@ COMMENT=	STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 CONFLICTS=	libevent-1.*
 
@@ -111,7 +111,7 @@ CONFIGURE_ENV+=	TURN_NO_MYSQL=1
 .endif
 
 .if ${PORT_OPTIONS:MREDIS}
-LIB_DEPENDS+=	libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=	libhiredis.so:databases/hiredis
 .else
 CONFIGURE_ENV+=	TURN_NO_HIREDIS=1
 .endif
diff --git a/net/turses/Makefile b/net/turses/Makefile
index 26a160d4d798..63e244d4d6e5 100644
--- a/net/turses/Makefile
+++ b/net/turses/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Python Twitter client for the console
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>0:${PORTSDIR}/devel/py-urwid \
-		${PYTHON_PKGNAMEPREFIX}tweepy>=2.2:${PORTSDIR}/net/py-tweepy
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid \
+		${PYTHON_PKGNAMEPREFIX}tweepy>=2.2:net/py-tweepy
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=		TESTS
 
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index 837e222fbe18..599e4896c3b0 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF
 MAINTAINER=	oz@cyprio.net
 COMMENT=	GNOME client for Twitter
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libsexy.so:${PORTSDIR}/x11-toolkits/libsexy \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libcanberra.so:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libsexy.so:x11-toolkits/libsexy \
+		libnotify.so:devel/libnotify \
+		libcanberra.so:audio/libcanberra
 
 USE_XORG=	x11
 USE_GNOME=	glib20 gtk20 gconf2 intltool libxml2 gnomedocutils
diff --git a/net/uget/Makefile b/net/uget/Makefile
index 7c105de0d05c..df3ad13a7397 100644
--- a/net/uget/Makefile
+++ b/net/uget/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Download manager application
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	curl-config:${PORTSDIR}/ftp/curl
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-	libgnutls.so:${PORTSDIR}/security/gnutls
-RUN_DEPENDS=	aria2c:${PORTSDIR}/www/aria2
+BUILD_DEPENDS=	curl-config:ftp/curl
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+	libgcrypt.so:security/libgcrypt \
+	libgnutls.so:security/gnutls
+RUN_DEPENDS=	aria2c:www/aria2
 
 USES=	compiler:c11 gettext-tools gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/net/uhttpmock/Makefile b/net/uhttpmock/Makefile
index cd96ad4dbe31..6b0c29edb4cf 100644
--- a/net/uhttpmock/Makefile
+++ b/net/uhttpmock/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	HTTP web service mocking library for GNOME
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		vapigen:${PORTSDIR}/lang/vala \
-		gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
+		vapigen:lang/vala \
+		gtkdoc-rebase:textproc/gtk-doc
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk20 introspection:build
diff --git a/net/ulxmlrpcpp/Makefile b/net/ulxmlrpcpp/Makefile
index 36a942c070e3..c8a495a8ad0d 100644
--- a/net/ulxmlrpcpp/Makefile
+++ b/net/ulxmlrpcpp/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ultra lightweight xml-rpc library written in C++
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index b449d01acb0e..91c58dd8771e 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -41,9 +41,9 @@ ALL_TARGET=	unison all
 .if ${PORT_OPTIONS:MX11}
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
-BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
-		icotool:${PORTSDIR}/graphics/icoutils
-RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS+= lablgtk2:x11-toolkits/ocaml-lablgtk2 \
+		icotool:graphics/icoutils
+RUN_DEPENDS+=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 SUB_FILES+=	${PORTNAME}.desktop
 .else
 MAKE_ARGS+=	UISTYLE=text
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 1df7b538b1a3..e4e8c028835d 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -38,9 +38,9 @@ OPTIONS_DEFAULT?=        DOCS X11
 .if ${PORT_OPTIONS:MX11}
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
-BUILD_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
-		icotool:${PORTSDIR}/graphics/icoutils
-RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS+=	lablgtk2:x11-toolkits/ocaml-lablgtk2 \
+		icotool:graphics/icoutils
+RUN_DEPENDS+=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 SUB_FILES+=	${PORTNAME}.desktop
 .else
 MAKE_ARGS+=	UISTYLE=text
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index 73c82531008e..160e7d0729b1 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -39,9 +39,9 @@ OPTIONS_DEFAULT=	DOCS X11
 .if ${PORT_OPTIONS:MX11}
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
-BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
-		icotool:${PORTSDIR}/graphics/icoutils
-RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS+= lablgtk2:x11-toolkits/ocaml-lablgtk2 \
+		icotool:graphics/icoutils
+RUN_DEPENDS+=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 SUB_FILES+=	${PORTNAME}.desktop
 .else
 MAKE_ARGS+=	UISTYLE=text
diff --git a/net/unison240/Makefile b/net/unison240/Makefile
index b5481b5ba044..9a3547e97356 100644
--- a/net/unison240/Makefile
+++ b/net/unison240/Makefile
@@ -39,9 +39,9 @@ OPTIONS_DEFAULT?=        DOCS X11
 .if ${PORT_OPTIONS:MX11}
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
-BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
-		icotool:${PORTSDIR}/graphics/icoutils
-RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS+= lablgtk2:x11-toolkits/ocaml-lablgtk2 \
+		icotool:graphics/icoutils
+RUN_DEPENDS+=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 SUB_FILES+=	${PORTNAME}.desktop
 .else
 MAKE_ARGS+=	UISTYLE=text
diff --git a/net/urlendec/Makefile b/net/urlendec/Makefile
index 8616906321f9..ba398e17beba 100644
--- a/net/urlendec/Makefile
+++ b/net/urlendec/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.whizkidtech.redprince.net/fports/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	URL encoder and decoder
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index e4a2467d358e..1f5486d437a8 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -11,11 +11,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC client for the GNOME Desktop
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc \
-		libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libsecret-1.so:${PORTSDIR}/security/libsecret
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgtk-vnc-2.0.so:net/gtk-vnc \
+		libgdbm.so:databases/gdbm \
+		libsecret-1.so:security/libsecret
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme
 
 PORTSCOUT=	limitw:1,even
 
@@ -34,19 +34,19 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	AVAHI SPICE TELEPATHY RDP DOCS
 OPTIONS_DEFAULT=AVAHI SPICE TELEPATHY RDP
 AVAHI_CONFIGURE_WITH=	avahi
-AVAHI_LIB_DEPENDS=	libavahi-ui-gtk3.so:${PORTSDIR}/net/avahi-gtk3
+AVAHI_LIB_DEPENDS=	libavahi-ui-gtk3.so:net/avahi-gtk3
 SPICE_DESC=	SPICE protocol support
 SPICE_CONFIGURE_ENABLE=	spice
-SPICE_BUILD_DEPENDS=	spice-gtk>=0.30_1:${PORTSDIR}/deskutils/spice-gtk
-SPICE_LIB_DEPENDS=	libspice-client-gtk-3.0.so:${PORTSDIR}/deskutils/spice-gtk
+SPICE_BUILD_DEPENDS=	spice-gtk>=0.30_1:deskutils/spice-gtk
+SPICE_LIB_DEPENDS=	libspice-client-gtk-3.0.so:deskutils/spice-gtk
 TELEPATHY_DESC=	Telepathy integration
 TELEPATHY_CONFIGURE_WITH=	telepathy
-TELEPATHY_LIB_DEPENDS=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-			libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+TELEPATHY_LIB_DEPENDS=	libtelepathy-glib.so:net-im/telepathy-glib \
+			libdbus-glib-1.so:devel/dbus-glib
 RDP_DESC=	MS Windows remote desktop support
 RDP_CONFIGURE_ENABLE=	rdp
-RDP_BUILD_DEPENDS=	xfreerdp:${PORTSDIR}/net/freerdp
-RDP_RUN_DEPENDS=	xfreerdp:${PORTSDIR}/net/freerdp
+RDP_BUILD_DEPENDS=	xfreerdp:net/freerdp
+RDP_RUN_DEPENDS=	xfreerdp:net/freerdp
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/net/vino/Makefile b/net/vino/Makefile
index c04a79a5d48d..81ac0d45c60a 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -11,13 +11,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC server that allows for remote access to your GNOME desktop
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libavahi-glib.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libsecret-1.so:security/libsecret \
+		libsoup-2.4.so:devel/libsoup \
+		libnotify.so:devel/libnotify \
+		libavahi-glib.so:net/avahi-app
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/net/vmware-vsphere-cli/Makefile b/net/vmware-vsphere-cli/Makefile
index 82b839fedd44..c23f42692553 100644
--- a/net/vmware-vsphere-cli/Makefile
+++ b/net/vmware-vsphere-cli/Makefile
@@ -11,18 +11,18 @@ DISTNAME=		VMware-vSphere-Perl-SDK-${PORTVERSION}-${DISTREL}.i386
 MAINTAINER=		zi@FreeBSD.org
 COMMENT=		VMware vSphere SDK for Perl with CLI tools
 
-BUILD_DEPENDS=		p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
-			p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-			p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-			p5-UUID>=0:${PORTSDIR}/devel/p5-UUID \
-			p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-			p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
-RUN_DEPENDS=		p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
-			p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-			p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-			p5-UUID>=0:${PORTSDIR}/devel/p5-UUID \
-			p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-			p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=		p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
+			p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+			p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+			p5-UUID>=0:devel/p5-UUID \
+			p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+			p5-SOAP-Lite>=0:net/p5-SOAP-Lite
+RUN_DEPENDS=		p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
+			p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+			p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+			p5-UUID>=0:devel/p5-UUID \
+			p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+			p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 
 USES=			perl5 shebangfix
 USE_PERL5=		configure
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 60a21681d4ef..2706cccb1a5f 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -13,9 +13,9 @@ DIST_SUBDIR=	xc
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display X and Win32 desktops on remote X/Win32/Java displays
 
-RUN_DEPENDS=	xorg-fonts>=7.2:${PORTSDIR}/x11-fonts/xorg-fonts \
-		showrgb:${PORTSDIR}/x11/rgb \
-		xauth:${PORTSDIR}/x11/xauth
+RUN_DEPENDS=	xorg-fonts>=7.2:x11-fonts/xorg-fonts \
+		showrgb:x11/rgb \
+		xauth:x11/xauth
 
 LICENSE=	GPLv2
 
@@ -53,9 +53,9 @@ MAKE_ENV=	IMAKECPP="${CPP}"
 MAKE_ARGS=	AR='ar rc'
 .endif
 
-RUN_DEPENDS+=	xauth:${PORTSDIR}/x11/xauth \
-		xorg-fonts-miscbitmaps>0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
-		${LOCALBASE}/share/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias
+RUN_DEPENDS+=	xauth:x11/xauth \
+		xorg-fonts-miscbitmaps>0:x11-fonts/xorg-fonts-miscbitmaps \
+		${LOCALBASE}/share/fonts/misc/fonts.alias:x11-fonts/font-alias
 
 EXTRA_PATCHES+=	${WRKSRC}/xc.patch \
 		${PATCHDIR}/vnc.def-patch \
diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 3df780dad1a3..c68b4d401d92 100644
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -41,7 +41,7 @@ GUI_DESC=	Build with graphics/gd dependency
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI}
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	libgd.so:graphics/gd
 PLIST_SUB+=	GUI=""
 .else
 ALL_TARGET="vnstat"
diff --git a/net/vortex/Makefile b/net/vortex/Makefile
index 2865fd9d33a3..e587cf33e778 100644
--- a/net/vortex/Makefile
+++ b/net/vortex/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Network surveillance engine
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:net/libnids
+LIB_DEPENDS=	libnet.so:net/libnet
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.9.0
 USE_GNOME=	glib20
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 3ad2c77d3b13..cc07ce94d4de 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 CFLAGS+=	-ansi -Wno-pointer-sign -I${LOCALBASE}/include
 USE_OPENSSL=	yes
diff --git a/net/wackamole/Makefile b/net/wackamole/Makefile
index a40a79b3bff7..51b0d3049f42 100644
--- a/net/wackamole/Makefile
+++ b/net/wackamole/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://bsdforge.com/projects/source/net/wackamole/ \
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Peer-to-peer high availability cluster
 
-LIB_DEPENDS=	libspread.so:${PORTSDIR}/net/spread
+LIB_DEPENDS=	libspread.so:net/spread
 
 USES=		tar:xz
 GNU_CONFIGURE=	yes
diff --git a/net/wackford-squeers/Makefile b/net/wackford-squeers/Makefile
index 5b01c5381d3e..888fc84d1a24 100644
--- a/net/wackford-squeers/Makefile
+++ b/net/wackford-squeers/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.mammothcheese.ca/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plain text network hypertext server and client
 
-RUN_DEPENDS=	${LOCALBASE}/bin/munger:${PORTSDIR}/lang/munger
+RUN_DEPENDS=	${LOCALBASE}/bin/munger:lang/munger
 
 MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 037ba82ec9c0..e2e387d01a38 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -85,13 +85,13 @@ KRB_BASE_USES=		gssapi
 KRB_HEIMDAL_USES=	gssapi:heimdal
 KRB_MIT_USES=		gssapi:mit
 
-RTP_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
-SNMP_LIB_DEPENDS=	libsmi.so:${PORTSDIR}/net-mgmt/libsmi
-ADNS_LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
-CARES_LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+RTP_LIB_DEPENDS=	libportaudio.so:audio/portaudio
+SNMP_LIB_DEPENDS=	libsmi.so:net-mgmt/libsmi
+ADNS_LIB_DEPENDS=	libadns.so:dns/adns
+CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
diff --git a/net/wizd/Makefile b/net/wizd/Makefile
index 7ec57a7c16d7..a62767956e9f 100644
--- a/net/wizd/Makefile
+++ b/net/wizd/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	wizd_sources_v${PORTVERSION}.zip simplicity_v1-2.zip
 MAINTAINER=	kikuchan@uranus.dti.ne.jp
 COMMENT=	Open-source media server for Syabas-based media players
 
-LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
-RUN_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
+RUN_DEPENDS=	nkf:japanese/nkf
 
 DOS2UNIX_FILES=	Makefile nkfwrap/Makefile nkfwrap/nkfwrap_test.c \
 		wizd_http.c wizd_menu.c
diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile
index ff6244f1b5d3..06ab9651080d 100644
--- a/net/wmlj/Makefile
+++ b/net/wmlj/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockapp that monitors your friends list at LiveJournal.com
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
diff --git a/net/wmnetload/Makefile b/net/wmnetload/Makefile
index 47368ed10626..dd68a1b82623 100644
--- a/net/wmnetload/Makefile
+++ b/net/wmnetload/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://truffula.com/pub/ \
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	Network load monitor dockapp
 
-LIB_DEPENDS=	libdockapp.so:${PORTSDIR}/x11-wm/libdockapp
+LIB_DEPENDS=	libdockapp.so:x11-wm/libdockapp
 
 USES=		tar:bzip2
 USE_XORG=	xpm x11
diff --git a/net/wping/Makefile b/net/wping/Makefile
index dd4124090986..e7a5ca205566 100644
--- a/net/wping/Makefile
+++ b/net/wping/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://freebsdcluster.org/~mich/software/
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Web-based graphical ping log
 
-RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes
 
 USES=		perl5 tar:bzip2 shebangfix
 SHEBANG_FILES=	wping.pl
diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index be2af8c9af75..f853e9562408 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -12,8 +12,8 @@ COMMENT=	VNC server for use with real X displays
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libpthread-stubs.so:devel/libpthread-stubs
 
 USE_XORG=	x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \
 		xdmcp recordproto
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	NLS AVAHI DOCS
 OPTIONS_DEFAULT=NLS AVAHI
 NO_OPTIONS_SORT=yes
 NLS_USES=	gettext
-AVAHI_LIB_DEPENDS=	libavahi-common.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 AVAHI_CONFIGURE_OFF=	--without-avahi
 
 post-patch:
diff --git a/net/x2goclient-cli/Makefile b/net/x2goclient-cli/Makefile
index da6cd11adf27..ec54c9511c1e 100644
--- a/net/x2goclient-cli/Makefile
+++ b/net/x2goclient-cli/Makefile
@@ -14,9 +14,9 @@ COMMENT=	The x2go perl client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Proc-Simple>=0:${PORTSDIR}/devel/p5-Proc-Simple \
-		p5-Term-ReadPassword>=0:${PORTSDIR}/devel/p5-Term-ReadPassword \
-		nxproxy:${PORTSDIR}/net/nxproxy
+RUN_DEPENDS=	p5-Proc-Simple>=0:devel/p5-Proc-Simple \
+		p5-Term-ReadPassword>=0:devel/p5-Term-ReadPassword \
+		nxproxy:net/nxproxy
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	x2goclient-cli
diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index 6476b49162e1..588b2911eea5 100644
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@@ -14,11 +14,11 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # Avoid clash with libssh from base
-BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
-		libssh.so:${PORTSDIR}/security/libssh
-RUN_DEPENDS=	nxproxy:${PORTSDIR}/net/nxproxy \
-		x2goclient-cli:${PORTSDIR}/net/x2goclient-cli
+BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:security/libssh
+LIB_DEPENDS=	libcups.so:print/cups \
+		libssh.so:security/libssh
+RUN_DEPENDS=	nxproxy:net/nxproxy \
+		x2goclient-cli:net/x2goclient-cli
 
 USES=		qmake
 USE_XORG=	xpm
diff --git a/net/xisp/Makefile b/net/xisp/Makefile
index f41cde5a0e0b..3740edb43813 100644
--- a/net/xisp/Makefile
+++ b/net/xisp/Makefile
@@ -12,7 +12,7 @@ PATCH_SITES=	http://www.ml-search.com/xisp/distfiles/
 MAINTAINER=	tm@onepost.net
 COMMENT=	User-friendly X interface to pppd/chat
 
-LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libforms.so:x11-toolkits/xforms
 
 USE_XORG=	xpm
 
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 7fa82d25c35b..d874786d6cc2 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -30,9 +30,9 @@ MAKE_ENV+=	INSTALL_SHLIB="${INSTALL_LIB}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 USE_LDCONFIG=	yes
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ENABLE=	curl-client
-LIBWWW_LIB_DEPENDS=	libwwwcore.so:${PORTSDIR}/www/libwww
+LIBWWW_LIB_DEPENDS=	libwwwcore.so:www/libwww
 LIBWWW_CONFIGURE_ENABLE=libwww-client
 LIBWWW_CONFIGURE_WITH=	libwww-ssl
 CPLUSPLUS_CONFIGURE_ENABLE=	cplusplus
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 61e0bbf303d3..173dc5672ddf 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -25,9 +25,9 @@ MAKE_ARGS=	CFLAGS_COMMON="${CFLAGS}"
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ENABLE=	curl-client
-LIBWWW_LIB_DEPENDS=	libwwwcore.so:${PORTSDIR}/www/libwww
+LIBWWW_LIB_DEPENDS=	libwwwcore.so:www/libwww
 LIBWWW_CONFIGURE_ENABLE=libwww-client
 
 .include <bsd.port.pre.mk>
diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile
index be60a6284703..fe68994c6215 100644
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@@ -13,7 +13,7 @@ COMMENT=	General purpose implementation of the xmlrpc specification in C
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake iconv libtool tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 025663b049dd..62d639f655a1 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -11,8 +11,8 @@ COMMENT=	EXtensible Open Router Platform
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libpcap.so:${PORTSDIR}/net/libpcap
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
+		libpcap.so:net/libpcap
 
 CONFLICTS_INSTALL=	xorp-devel-*
 
diff --git a/net/xpvm/Makefile b/net/xpvm/Makefile
index 78fc2caedac7..c7cbc63b5b34 100644
--- a/net/xpvm/Makefile
+++ b/net/xpvm/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	XPVM.src.${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical console and monitor for PVM
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
+BUILD_DEPENDS=	${LOCALBASE}/lib/libpvm3.a:net/pvm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		tk:84 tar:tgz
diff --git a/net/xrdesktop2/Makefile b/net/xrdesktop2/Makefile
index 6edafd2d7d13..73b3225db698 100644
--- a/net/xrdesktop2/Makefile
+++ b/net/xrdesktop2/Makefile
@@ -11,8 +11,8 @@ COMMENT=	GTK2 frontend for Rdesktop
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rdesktop \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	rdesktop:net/rdesktop \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 CONFLICTS=	xrdesktop-1*
 
diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile
index 032bec3855be..db0a28d98af9 100644
--- a/net/xrdp-devel/Makefile
+++ b/net/xrdp-devel/Makefile
@@ -28,7 +28,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 CONFLICTS=	xrdp-[0-9]*
 # xrdp v0.7 is not compatible with current net/freerdp (1.0.2)
-#BUILD_DEPENDS+=	freerdp>=1.0.2:${PORTSDIR}/net/freerdp
+#BUILD_DEPENDS+=	freerdp>=1.0.2:net/freerdp
 #CONFIGURE_ARGS+=	--enable-freerdp1
 
 OPTIONS_DEFINE=	DEBUG SOUND
@@ -48,16 +48,16 @@ JP106_DESC=	Install Japanese JP106 keymap
 
 # Which Xserver to use
 .if ${PORT_OPTIONS:MREALVNC}
-RUN_DEPENDS=	Xvnc:${PORTSDIR}/net/vnc
+RUN_DEPENDS=	Xvnc:net/vnc
 .endif
 .if ${PORT_OPTIONS:MTIGERVNC}
-RUN_DEPENDS=	Xvnc:${PORTSDIR}/net/tigervnc
+RUN_DEPENDS=	Xvnc:net/tigervnc
 .endif
 .if ${PORT_OPTIONS:MTIGHTVNC}
-RUN_DEPENDS=	Xvnc:${PORTSDIR}/net/tightvnc
+RUN_DEPENDS=	Xvnc:net/tightvnc
 .endif
 .if ${PORT_OPTIONS:MTRIDIAVNC}
-RUN_DEPENDS=	Xvnc:${PORTSDIR}/net/tridiavnc
+RUN_DEPENDS=	Xvnc:net/tridiavnc
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -74,8 +74,8 @@ PLIST_SUB+=	JP106="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSOUND}
-BUILD_DEPENDS+=	${LOCALBASE}/include/pulse/simple.h:${PORTSDIR}/audio/pulseaudio \
-		${LOCALBASE}/include/pulse/error.h:${PORTSDIR}/audio/pulseaudio
+BUILD_DEPENDS+=	${LOCALBASE}/include/pulse/simple.h:audio/pulseaudio \
+		${LOCALBASE}/include/pulse/error.h:audio/pulseaudio
 CONFIGURE_ARGS+=	--enable-simplesound
 .endif
 
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index be4995d69435..60d441b793b7 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -47,12 +47,12 @@ JP106_DESC=	Install Japanese JP106 keymap
 # Debug
 DEBUG_CONFIGURE_ENABLE=	xrdpdebug
 # Xvnc
-REALVNC_RUN_DEPENDS=	Xvnc:${PORTSDIR}/net/vnc
-TIGERVNC_RUN_DEPENDS=	Xvnc:${PORTSDIR}/net/tigervnc
-TIGHTVNC_RUN_DEPENDS=	Xvnc:${PORTSDIR}/net/tightvnc
-TRIDIAVNC_RUN_DEPENDS=	Xvnc:${PORTSDIR}/net/tridiavnc
+REALVNC_RUN_DEPENDS=	Xvnc:net/vnc
+TIGERVNC_RUN_DEPENDS=	Xvnc:net/tigervnc
+TIGHTVNC_RUN_DEPENDS=	Xvnc:net/tightvnc
+TRIDIAVNC_RUN_DEPENDS=	Xvnc:net/tridiavnc
 # X11rdp
-X11RDP_RUN_DEPENDS=	X11rdp:${PORTSDIR}/x11-servers/x11rdp
+X11RDP_RUN_DEPENDS=	X11rdp:x11-servers/x11rdp
 X11RDP_EXTRA_PATCHES=	${FILESDIR}/extra-patch-x11rdp_xrdp.ini
 # JP106 keymap
 JP106_PLIST_SUB=	JP106=""
diff --git a/net/yate/Makefile b/net/yate/Makefile
index 4d1ef6c066d3..423262ff7d4a 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Yet Another Telephony Engine
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libgsm.so:${PORTSDIR}/audio/gsm
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libspeex.so:audio/speex \
+		libgsm.so:audio/gsm
 
 ONLY_FOR_ARCHS=	i386 amd64 sparc64 armv6
 
@@ -54,19 +54,19 @@ SPANDSP_DESC=	Spandsp faxing support
 OPTIONS_SUB=	yes
 
 AMRNB_CONFIGURE_WITH=	amrnb=${LOCALBASE}
-AMRNB_LIB_DEPENDS=	libamrnb.so:${PORTSDIR}/audio/libamrnb
+AMRNB_LIB_DEPENDS=	libamrnb.so:audio/libamrnb
 
 DAHDI_CONFIGURE_ENABLE=	dahdi
-DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
-			${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
-DAHDI_LIB_DEPENDS=	libpri.so:${PORTSDIR}/misc/libpri \
-			libopenr2.so:${PORTSDIR}/misc/openr2
+DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:misc/libpri \
+			${LOCALBASE}/include/dahdi/user.h:misc/dahdi
+DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
+			libopenr2.so:misc/openr2
 
 H323_CONFIGURE_WITH=	openh323=${LOCALBASE}
-H323_LIB_DEPENDS=	libopenh323.so:${PORTSDIR}/net/h323plus
+H323_LIB_DEPENDS=	libopenh323.so:net/h323plus
 
 ILBC_CONFIGURE_ENABLE=	ilbc
-ILBC_LIB_DEPENDS=	libilbc.so:${PORTSDIR}/net/ilbc
+ILBC_LIB_DEPENDS=	libilbc.so:net/ilbc
 
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_USE=		mysql=yes
@@ -79,10 +79,10 @@ PGSQL_USES=		pgsql
 SCTP_CONFIGURE_ENABLE=	sctp
 
 SPANDSP_CONFIGURE_WITH=	spandsp
-SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
+SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 
 SQLITE_CONFIGURE_WITH=	sqlite
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
diff --git a/net/yaz++/Makefile b/net/yaz++/Makefile
index 2f19e97f6050..6fae39136624 100644
--- a/net/yaz++/Makefile
+++ b/net/yaz++/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	yazpp-${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	C++ toolkit for development of Z39.50v3 clients and servers
 
-LIB_DEPENDS=	libyaz.so:${PORTSDIR}/net/yaz
+LIB_DEPENDS=	libyaz.so:net/yaz
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-yaz=${LOCALBASE}/bin
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 42d80bdcb3da..d850d903b404 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Z39.50/SR client and API library
 
-LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicuuc.so:devel/icu
 
 USES=		execinfo iconv libtool pathfix pkgconfig shebangfix tcl
 SHEBANG_FILES=	util/yaz-asncomp
@@ -32,10 +32,10 @@ OPTIONS_DEFINE=	DOCS MEMCACHED REDIS
 
 MEMCACHED_DESC=		Memcached distributed cache system support
 MEMCACHED_CONFIGURE_WITH=	memcached
-MEMCACHED_LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
+MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 REDIS_CONFIGURE_WITH=	redis
-REDIS_LIB_DEPENDS=	libhiredis.so:${PORTSDIR}/databases/hiredis
+REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 
 post-patch:
 	@${REINPLACE_CMD} 's|tclsh |tclsh8.6 |' ${WRKSRC}/configure
diff --git a/net/yazproxy/Makefile b/net/yazproxy/Makefile
index 3e450ce8963f..8ef5602d228b 100644
--- a/net/yazproxy/Makefile
+++ b/net/yazproxy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://ftp.indexdata.dk/pub/yazproxy/
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Powerful general purpose Z39.50/SRW/SRU proxy
 
-LIB_DEPENDS=	libyazpp.so:${PORTSDIR}/net/yaz++
+LIB_DEPENDS=	libyazpp.so:net/yaz++
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile
index f5709873f0ab..621c3b25a377 100644
--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	idzebra-${PORTVERSION}
 MAINTAINER=	ben@gibbed.org
 COMMENT=	Z39.50/SR server software
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libyaz.so:${PORTSDIR}/net/yaz
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libyaz.so:net/yaz
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-yaz=${LOCALBASE}/bin \
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index c3aabefcc225..4447d13b3425 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -53,7 +53,7 @@ NO_OPTIONS_SORT=	yes
 PAM_CONFIGURE_WITH=		pam
 OSPFNSSA_CONFIGURE_ENABLE=	nssa
 SNMP_CONFIGURE_ENABLE=		snmp
-SNMP_LIB_DEPENDS+=		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS+=		libnetsnmp.so:net-mgmt/net-snmp
 TCPZEBRA_CONFIGURE_ENABLE=	tcp-zebra
 BGPD_CONFIGURE_ENABLE=		bgpd
 OSPF6D_CONFIGURE_ENABLE=	ospf6d
diff --git a/news/atp/Makefile b/news/atp/Makefile
index 9bfa3f0278cf..04ef90670650 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	${DISTNAME}-src.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	QWK message packet reader and composer for FreeBSD
 
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS=	zip:archivers/zip \
+		unzip:archivers/unzip
 
 USES=		gmake perl5
 USE_PERL5=	run
diff --git a/news/brag/Makefile b/news/brag/Makefile
index f93ce5a3e70c..ed157f321c5b 100644
--- a/news/brag/Makefile
+++ b/news/brag/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://brag.sourceforge.net/ \
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Download and assemble multipart binaries from newsgroups
 
-RUN_DEPENDS=	uudeview:${PORTSDIR}/converters/uudeview \
-		${TCLSH}:${PORTSDIR}/lang/tcl84
+RUN_DEPENDS=	uudeview:converters/uudeview \
+		${TCLSH}:lang/tcl84
 
 PLIST_FILES=	bin/brag man/man1/brag.1.gz
 PORTDOCS=	CHANGES README
diff --git a/news/c-nocem/Makefile b/news/c-nocem/Makefile
index 6aa613b492b8..ca07f6db2745 100644
--- a/news/c-nocem/Makefile
+++ b/news/c-nocem/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://sites.inka.de/~bigred/sw/ \
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	NoCeM for C News and INN
 
-FETCH_DEPENDS=	${DISTDIR}/c-news/c-news.tar.Z:${PORTSDIR}/${CNEWS_PORT}:checksum
-BUILD_DEPENDS=	${CNEWSWRK}/conf/substitutions:${PORTSDIR}/${CNEWS_PORT}:configure
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/${CNEWS_PORT} \
-		gpgv:${PORTSDIR}/security/gnupg1
+FETCH_DEPENDS=	${DISTDIR}/c-news/c-news.tar.Z:${CNEWS_PORT}:checksum
+BUILD_DEPENDS=	${CNEWSWRK}/conf/substitutions:${CNEWS_PORT}:configure
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcnews.a:${CNEWS_PORT} \
+		gpgv:security/gnupg1
 
 USES=		perl5 gmake
 GNU_CONFIGURE=	yes
diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile
index ab2566928091..0033fb94f161 100644
--- a/news/cleanfeed/Makefile
+++ b/news/cleanfeed/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.mixmin.net/cleanfeed/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Spam filter for Usenet news servers
 
-RUN_DEPENDS=	${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn
+RUN_DEPENDS=	${LOCALBASE}/news/bin/innd:news/inn
 
 NO_BUILD=	yes
 USES=		perl5
diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index ac8bbf89190b..838f0f02cf64 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Comprehensive newsfeeding and newsreading software package
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	xmake:${PORTSDIR}/devel/xmake
+BUILD_DEPENDS=	xmake:devel/xmake
 
 PORTDOCS=	COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
 
diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index 716264d6ca4d..e41c5c569b37 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Nzb downloader and post processor
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	par2:${PORTSDIR}/archivers/par2cmdline \
-		flac:${PORTSDIR}/audio/flac \
-		shorten:${PORTSDIR}/audio/shorten \
-		${PYTHON_PKGNAMEPREFIX}yenc>=0:${PORTSDIR}/news/py-yenc \
-		mac:${PORTSDIR}/audio/mac
+RUN_DEPENDS=	par2:archivers/par2cmdline \
+		flac:audio/flac \
+		shorten:audio/shorten \
+		${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc \
+		mac:audio/mac
 
 USE_PYTHON=	distutils
 USES=		python:2 twisted:run,web
@@ -29,9 +29,9 @@ OPTIONS_DEFINE=	DOCS
 
 # more fully-featured rar needs i386
 .if ${ARCH} == "i386"
-RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
+RUN_DEPENDS+=	rar:archivers/rar
 .else
-RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
+RUN_DEPENDS+=	unrar:archivers/unrar
 .endif
 
 post-install-DOCS-on:
diff --git a/news/husky-areafix/Makefile b/news/husky-areafix/Makefile
index 4c205e9bff28..72dd71f1e714 100644
--- a/news/husky-areafix/Makefile
+++ b/news/husky-areafix/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	husky-areafix
 
 COMMENT=	Husky FTN areafix library
 
-LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf
+LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf
 
 USE_LDCONFIG=	yes
 
diff --git a/news/husky-fidoconf/Makefile b/news/husky-fidoconf/Makefile
index d7ba043dbbad..dd258c6972f7 100644
--- a/news/husky-fidoconf/Makefile
+++ b/news/husky-fidoconf/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	husky-fidoconf
 
 COMMENT=	Husky FTN configuration library
 
-LIB_DEPENDS=	libsmapi.so:${PORTSDIR}/news/husky-smapi
+LIB_DEPENDS=	libsmapi.so:news/husky-smapi
 
 USES+=		perl5 shebangfix
 SHEBANG_FILES=	util/fconf2areasbbs.pl util/fconf2na.pl util/sq2fc.pl
diff --git a/news/husky-hpt/Makefile b/news/husky-hpt/Makefile
index 9243d282f396..2f5b7bc5772b 100644
--- a/news/husky-hpt/Makefile
+++ b/news/husky-hpt/Makefile
@@ -4,8 +4,8 @@ PORTNAME=	husky-hpt
 
 COMMENT=	Husky FTN tosser
 
-LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \
-		libareafix.so:${PORTSDIR}/news/husky-areafix
+LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf \
+		libareafix.so:news/husky-areafix
 
 USES+=		makeinfo
 ALL_TARGET=	all doc
diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile
index 9c34e751ddfa..6a9a8741c6c4 100644
--- a/news/husky-htick/Makefile
+++ b/news/husky-htick/Makefile
@@ -4,8 +4,8 @@ PORTNAME=	husky-htick
 
 COMMENT=	Husky FTN file ticker
 
-LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \
-		libareafix.so:${PORTSDIR}/news/husky-areafix
+LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf \
+		libareafix.so:news/husky-areafix
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install
diff --git a/news/husky-smapi/Makefile b/news/husky-smapi/Makefile
index 69c4209606d9..ce0c0c793134 100644
--- a/news/husky-smapi/Makefile
+++ b/news/husky-smapi/Makefile
@@ -5,7 +5,7 @@ PORTEPOCH=	1
 
 COMMENT=	Husky FTN MSGAPI library
 
-LIB_DEPENDS=    libhusky.so:${PORTSDIR}/news/husky-huskylib
+LIB_DEPENDS=    libhusky.so:news/husky-huskylib
 
 USE_LDCONFIG=	yes
 
diff --git a/news/husky/Makefile b/news/husky/Makefile
index 4b9392d4e484..fcb43dc8d6e0 100644
--- a/news/husky/Makefile
+++ b/news/husky/Makefile
@@ -13,8 +13,8 @@ COMMENT?=	Husky full featured highly portable FTN Tosser
 DISTNAME=	husky-all-1.9-source-20140519
 
 .if ${PORTNAME} == "husky"
-RUN_DEPENDS=	hpt:${PORTSDIR}/news/husky-hpt \
-		htick:${PORTSDIR}/news/husky-htick
+RUN_DEPENDS=	hpt:news/husky-hpt \
+		htick:news/husky-htick
 
 NO_BUILD=	yes
 NO_INSTALL=	yes
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 67b69b367bb7..a797102f3195 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	ISC/${PORTNAME}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	InterNetNews -- the Internet meets Netnews
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--with-bdb=${LOCALBASE} \
 
 .if ${PORT_OPTIONS:MKERBEROS}
 .    if exists(${LOCALBASE}/bin/krb5-config)
-LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=		libgssapi_krb5.so:security/krb5
 CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 .    else
 CONFIGURE_ARGS+=	--with-krb5=/usr
@@ -92,7 +92,7 @@ CONFIGURE_ARGS+=	--enable-keywords
 
 .if ${PORT_OPTIONS:MSASL}
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
-LIB_DEPENDS+=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 .endif
 
 .if ${PORT_OPTIONS:MTAGGED_HASH}
@@ -115,8 +115,8 @@ CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 .if ${PORT_OPTIONS:MGNUPG}
 # Although pgpverify needs gpgv/gpgv2,
 # checking 'gpg' is the shortest way to check any version of GnuPG installed.
-BUILD_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
-RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS+=		gpg:security/gnupg
+RUN_DEPENDS+=		gpg:security/gnupg
 .endif
 
 PORTDOCS=	CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 8100703e7d17..fe2bfb5d4f22 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	LOCAL/dinoex
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Threaded nntp newsreader for X
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libcompface.so:${PORTSDIR}/mail/faces
-RUN_DEPENDS=	newsp:${PORTSDIR}/print/mp-letter
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libcompface.so:mail/faces
+RUN_DEPENDS=	newsp:print/mp-letter
 
 LICENSE=	GPLv2
 
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index f7175d6a3010..69985300b6f2 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF \
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	NNTP package for offline news caching and reading
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		tar:xz
 GNU_CONFIGURE=	yes
diff --git a/news/lusernet/Makefile b/news/lusernet/Makefile
index 9e5f62da4e13..2284684e4961 100644
--- a/news/lusernet/Makefile
+++ b/news/lusernet/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 USES=		gnustep
 USE_GNUSTEP=	back build
-LIB_DEPENDS=	libPantomime.so:${PORTSDIR}/mail/pantomime
+LIB_DEPENDS=	libPantomime.so:mail/pantomime
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/LuserNET.app/LuserNET
diff --git a/news/mail2nntp/Makefile b/news/mail2nntp/Makefile
index b55addc9e095..5143946934bf 100644
--- a/news/mail2nntp/Makefile
+++ b/news/mail2nntp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple mail to news gateway
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-NNTPClient>=0:${PORTSDIR}/news/p5-NNTPClient
+RUN_DEPENDS=	p5-NNTPClient>=0:news/p5-NNTPClient
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/news/mmail/Makefile b/news/mmail/Makefile
index 6c8826d18ff9..69f213bd867e 100644
--- a/news/mmail/Makefile
+++ b/news/mmail/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SF/multimail/MultiMail/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Offline BBS mail packet reader supporting QWK/OMEN/SOUP/OPX/BLUEWAVE
 
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS=	zip:archivers/zip \
+		unzip:archivers/unzip
 
 USES=		gmake ncurses
 MAKE_ARGS=	OPTS="" LIBS="${LDFLAGS} -lncurses"
diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index 10c351ff6686..6c8e339e9e45 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	NewsCache-${PORTVERSION:S/.r./rc/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NewsCache is a free cache server for USENET News
 
-LIB_DEPENDS=	libsocket++.so:${PORTSDIR}/net/libsocket++
+LIB_DEPENDS=	libsocket++.so:net/libsocket++
 
 USES=		autoreconf
 GNU_CONFIGURE=	yes
diff --git a/news/newsgrab/Makefile b/news/newsgrab/Makefile
index b0f7a54c559a..b79f2a96f5c4 100644
--- a/news/newsgrab/Makefile
+++ b/news/newsgrab/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Download and uudecode binary files from USENET using regexps
 
-RUN_DEPENDS=	p5-NNTPClient>=0:${PORTSDIR}/news/p5-NNTPClient \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-News-Newsrc>=0:${PORTSDIR}/news/p5-News-Newsrc \
-		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-NNTPClient>=0:news/p5-NNTPClient \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-News-Newsrc>=0:news/p5-News-Newsrc \
+		p5-Time-modules>=0:devel/p5-Time-modules
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix tar:tgz
diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile
index c09af3a18c13..3cda20e6d0a6 100644
--- a/news/newsstar/Makefile
+++ b/news/newsstar/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Transfer news between a local NNTP server (INN, sn, s-news)
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
-BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
-		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
+BUILD_DEPENDS=	xmlto:textproc/xmlto \
+		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:textproc/docbook-xml
 
 GNU_CONFIGURE=	yes
 USES=		iconv perl5 shebangfix
diff --git a/news/newsx/Makefile b/news/newsx/Makefile
index e41a2e1d7364..113b0a627e11 100644
--- a/news/newsx/Makefile
+++ b/news/newsx/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Program to fetch news from and post news to a remote NNTP server
 LICENSE=	GPLv2
 
 .if defined(WITH_CNEWS)
-BUILD_DEPENDS=	${LOCALBASE}/news/lib/libcnews.a:${PORTSDIR}/news/cnews
+BUILD_DEPENDS=	${LOCALBASE}/news/lib/libcnews.a:news/cnews
 .elif !defined(WITHOUT_INN_2-X)
-BUILD_DEPENDS=	${LOCALBASE}/news/lib/libinn.a:${PORTSDIR}/news/inn
+BUILD_DEPENDS=	${LOCALBASE}/news/lib/libinn.a:news/inn
 .endif
 
 GNU_CONFIGURE=	yes
diff --git a/news/nntp/Makefile b/news/nntp/Makefile
index ecd2538e4fc9..08e6bc93d4d6 100644
--- a/news/nntp/Makefile
+++ b/news/nntp/Makefile
@@ -14,7 +14,7 @@ PATCHFILES=	nntp-patch-y2k
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	NNTP with NOV support
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/news/cnews
+BUILD_DEPENDS=	${LOCALBASE}/lib/libcnews.a:news/cnews
 
 NO_WRKSUBDIR=	yes
 PLIST_SUB+=	VARBASE=${VARBASE}
diff --git a/news/noffle/Makefile b/news/noffle/Makefile
index 723448c6afc9..d0180dc95ff4 100644
--- a/news/noffle/Makefile
+++ b/news/noffle/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28devel%29/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	News server for low speed dial-up connections
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 GNU_CONFIGURE=	yes
 
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index 604839071c4a..5b22fdd15210 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Binary newsreader supporting NZB files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USES=		ncurses pkgconfig shebangfix
 USE_RC_SUBR=	nzbget
@@ -38,11 +38,11 @@ OPTIONS_DEFAULT=	GNUTLS PAR PYTHON RAR 7Z
 PYTHON_DESC=	Support for python post-processing scripts
 RAR_DESC=	Support extraction of rar archives
 
-7Z_RUN_DEPENDS=		7z:${PORTSDIR}/archivers/p7zip
+7Z_RUN_DEPENDS=		7z:archivers/p7zip
 
 PYTHON_USES=		python:run
 
-RAR_RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
+RAR_RUN_DEPENDS=	unrar:archivers/unrar
 
 OPENSSL_CONFIGURE_ON=	--with-tlslib=OpenSSL \
 			--with-openssl-includes=${OPENSSLINC} \
@@ -50,8 +50,8 @@ OPENSSL_CONFIGURE_ON=	--with-tlslib=OpenSSL \
 OPENSSL_USE=		OPENSSL=yes
 
 GNUTLS_CONFIGURE_ON=	--with-tlslib=GnuTLS
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-			libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
+			libgcrypt.so:security/libgcrypt
 
 .include <bsd.port.options.mk>
 
diff --git a/news/nzbperl/Makefile b/news/nzbperl/Makefile
index 2cf50455e303..9fde6c97384f 100644
--- a/news/nzbperl/Makefile
+++ b/news/nzbperl/Makefile
@@ -14,9 +14,9 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@thepentagon.org
 COMMENT=	Perl script for downloading nzb files
 
-RUN_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		uudeview:${PORTSDIR}/converters/uudeview
+RUN_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		uudeview:converters/uudeview
 
 PLIST_FILES=	bin/${PORTNAME}
 NO_BUILD=	yes
@@ -26,7 +26,7 @@ SHEBANG_FILES=	${DISTNAME}
 WRKSRC=		${WRKDIR}
 
 OPTIONS_DEFINE=	SSL
-SSL_RUN_DEPENDS=p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+SSL_RUN_DEPENDS=p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
diff --git a/news/p5-News-Article-NoCeM/Makefile b/news/p5-News-Article-NoCeM/Makefile
index 6c108c113bcd..793ca23dc2ba 100644
--- a/news/p5-News-Article-NoCeM/Makefile
+++ b/news/p5-News-Article-NoCeM/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Module to generate accurate NoCeM notices
 
-RUN_DEPENDS=	p5-News-Article>=0:${PORTSDIR}/news/p5-News-Article \
-		p5-PGP-Sign>=0:${PORTSDIR}/security/p5-PGP-Sign
+RUN_DEPENDS=	p5-News-Article>=0:news/p5-News-Article \
+		p5-PGP-Sign>=0:security/p5-PGP-Sign
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index 5b4f6624689f..92894b854c2a 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object for handling Usenet articles in mail or news form
 
-BUILD_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS=	p5-Net>=0:net/p5-Net
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	PGP_SIGN
 OPTIONS_DEFAULT=PGP_SIGN
 PGP_SIGN_DESC=	PGP::Sign support for header signing
 
-PGP_SIGN_BUILD_DEPENDS=	p5-PGP-Sign>=0:${PORTSDIR}/security/p5-PGP-Sign
-PGP_SIGN_RUN_DEPENDS=	p5-PGP-Sign>=0:${PORTSDIR}/security/p5-PGP-Sign
+PGP_SIGN_BUILD_DEPENDS=	p5-PGP-Sign>=0:security/p5-PGP-Sign
+PGP_SIGN_RUN_DEPENDS=	p5-PGP-Sign>=0:security/p5-PGP-Sign
 
 .include <bsd.port.mk>
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index 880e9cf9e6ea..386addf72159 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Manage newsrc files
 
-BUILD_DEPENDS=	p5-Set-IntSpan>=0:${PORTSDIR}/math/p5-Set-IntSpan
+BUILD_DEPENDS=	p5-Set-IntSpan>=0:math/p5-Set-IntSpan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/news/p5-POE-Component-Client-NNTP/Makefile b/news/p5-POE-Component-Client-NNTP/Makefile
index b95f1162dccc..cd2665a02fba 100644
--- a/news/p5-POE-Component-Client-NNTP/Makefile
+++ b/news/p5-POE-Component-Client-NNTP/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE component for non-blocking NNTP access
 
-BUILD_DEPENDS=	p5-POE>=0.999.9:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Pluggable>=0.03:${PORTSDIR}/devel/p5-POE-Component-Pluggable \
-		p5-Test-POE-Server-TCP>=0:${PORTSDIR}/devel/p5-Test-POE-Server-TCP
-RUN_DEPENDS=	p5-POE>=0.999.9:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Pluggable>=0.03:${PORTSDIR}/devel/p5-POE-Component-Pluggable
+BUILD_DEPENDS=	p5-POE>=0.999.9:devel/p5-POE \
+		p5-POE-Component-Pluggable>=0.03:devel/p5-POE-Component-Pluggable \
+		p5-Test-POE-Server-TCP>=0:devel/p5-Test-POE-Server-TCP
+RUN_DEPENDS=	p5-POE>=0.999.9:devel/p5-POE \
+		p5-POE-Component-Pluggable>=0.03:devel/p5-POE-Component-Pluggable
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/news/p5-POE-Component-Server-NNTP/Makefile b/news/p5-POE-Component-Server-NNTP/Makefile
index df1d15812133..b638a9ae67c7 100644
--- a/news/p5-POE-Component-Server-NNTP/Makefile
+++ b/news/p5-POE-Component-Server-NNTP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Component that provides NNTP server functionality
 
-RUN_DEPENDS=	p5-POE>=0.38:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Pluggable>=0.03:${PORTSDIR}/devel/p5-POE-Component-Pluggable \
-		p5-POE-Component-Client-NNTP>=1.05:${PORTSDIR}/news/p5-POE-Component-Client-NNTP
+RUN_DEPENDS=	p5-POE>=0.38:devel/p5-POE \
+		p5-POE-Component-Pluggable>=0.03:devel/p5-POE-Component-Pluggable \
+		p5-POE-Component-Client-NNTP>=1.05:news/p5-POE-Component-Client-NNTP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/news/pan/Makefile b/news/pan/Makefile
index c66c0d172f3e..f87863e83f54 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Threaded GTK+ newsreader based on Agent for Windows
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgmime-2.6.so:${PORTSDIR}/mail/gmime26
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libgmime-2.6.so:mail/gmime26
 
 USES=		gmake iconv pathfix pkgconfig tar:bzip2
 USE_GNOME=	intlhack
@@ -32,7 +32,7 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFAULT=GTKSPELL GNUTLS GTK2
 GTKSPELL_DESC=	Spell checking support (gtk+2 only)
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES=	pkgconfig
 GNUTLS_CONFIGURE_WITH=	gnutls
 
@@ -41,7 +41,7 @@ GTK3_USE=	gnome=gtk30
 
 GTK2_USE=	gnome=gtk20
 
-GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 GTKSPELL_CONFIGURE_WITH=	gtkspell
 
 GTK3_PREVENTS=	GTKSPELL
diff --git a/news/papercut/Makefile b/news/papercut/Makefile
index e29736560309..1010952b21a5 100644
--- a/news/papercut/Makefile
+++ b/news/papercut/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Papercut is a news server written in Python, using a MySQL backend
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
 
 USES=		python
 NO_BUILD=	yes
diff --git a/news/plor/Makefile b/news/plor/Makefile
index 6357dead4e14..d18943586aff 100644
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SUNSITE/system/bbs/mail
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Alpha-release reader for reading SOUP and QWK packets
 
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS=	zip:archivers/zip
 
 GNU_CONFIGURE=	yes
 USES=		gmake perl5
diff --git a/news/py-pynzb/Makefile b/news/py-pynzb/Makefile
index 28fe44e425e4..da515918bf07 100644
--- a/news/py-pynzb/Makefile
+++ b/news/py-pynzb/Makefile
@@ -18,6 +18,6 @@ USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	LXML
 LXML_DESC=	Add support for py-lxml
-LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:${PORTSDIR}/devel/py-lxml
+LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:devel/py-lxml
 
 .include <bsd.port.mk>
diff --git a/news/rawdog/Makefile b/news/rawdog/Makefile
index 94cb043332af..603afa57bb18 100644
--- a/news/rawdog/Makefile
+++ b/news/rawdog/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple RSS aggregator
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/news/s-news/Makefile b/news/s-news/Makefile
index 575f16914f50..6fa2cd66a12a 100644
--- a/news/s-news/Makefile
+++ b/news/s-news/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.lost.org.uk/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple news server for hosts with one or two users
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 CONFLICTS=	leafnode-[1-9]* nntp-[0-9]*
 
diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index b77b5bce3f48..1061a909a239 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Web-interface based binary newsgrabber in python, with nzb support
 LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah \
-		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	cheetah:devel/py-cheetah \
+		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USES=		gettext python:2.6-2.7
 
@@ -42,12 +42,12 @@ UNRAR_DESC=	Often required for unpacking many downloads
 FEEDPARSER_DESC=	rss-feed support
 YENC_DESC=	yenc support
 
-PAR2CMDLINE_RUN_DEPENDS=	par2repair:${PORTSDIR}/archivers/par2cmdline-tbb
-FEEDPARSER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser
-YENC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yenc>=0:${PORTSDIR}/news/py-yenc
-OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
-UNRAR_RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
-7ZIP_RUN_DEPENDS=	7za:${PORTSDIR}/archivers/p7zip
+PAR2CMDLINE_RUN_DEPENDS=	par2repair:archivers/par2cmdline-tbb
+FEEDPARSER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser
+YENC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc
+OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
+UNRAR_RUN_DEPENDS=	unrar:archivers/unrar
+7ZIP_RUN_DEPENDS=	7za:archivers/p7zip
 
 .include <bsd.port.pre.mk>
 
diff --git a/news/slnr/Makefile b/news/slnr/Makefile
index 40f5ebcc92cf..5eca33ec70e0 100644
--- a/news/slnr/Makefile
+++ b/news/slnr/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simplistic reader for SOUP (HDPF) mail and news packets
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS=	zip:archivers/zip
 
 MAKEFILE=	src/Makefile
 
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index c750c3e79a5c..50fa1bf953e3 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.jedsoft.org/releases/slrn/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	SLang-based newsreader
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS=	libslang.so:devel/libslang2
 
 CONFLICTS_INSTALL=	ja-slrn-[0-9]*
 
@@ -31,7 +31,7 @@ NLS_CONFIGURE_OFF=	--disable-nls
 SSL_USE=		OPENSSL
 SSL_CONFIGURE_WITH=	ssl
 DEVIEW_DESC?=		UUdecode view support
-DEVIEW_LIB_DEPENDS=	libuu.so:${PORTSDIR}/converters/uulib
+DEVIEW_LIB_DEPENDS=	libuu.so:converters/uulib
 DEVIEW_CONFIGURE_WITH=	uulib
 DOCS_CONFIGURE_OFF=	--with-docdir=${WRKSRC}/dummy
 
diff --git a/news/slrnconf/Makefile b/news/slrnconf/Makefile
index 1d3639b2aebf..d148a4085271 100644
--- a/news/slrnconf/Makefile
+++ b/news/slrnconf/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://home.arcor.de/kaffeetisch/downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical configuration utility for the newsreader slrn
 
-BUILD_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 
 USES=		perl5 shebangfix tar:bzip2
 SHEBANG_FILES=	slrnconf.in
diff --git a/news/slrnface/Makefile b/news/slrnface/Makefile
index 9ee4d5c6cfb0..f87cf8a05394 100644
--- a/news/slrnface/Makefile
+++ b/news/slrnface/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shows X-Faces from slrn in X11 terminal emulator
 
-LIB_DEPENDS=	libcompface.so:${PORTSDIR}/mail/faces
+LIB_DEPENDS=	libcompface.so:mail/faces
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 ALL_TARGET=	slrnface
diff --git a/news/sn/Makefile b/news/sn/Makefile
index 2030e3e6ab3f..4eb12c334693 100644
--- a/news/sn/Makefile
+++ b/news/sn/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Small news system for small sites serving
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake tar:bzip2
 MAKE_ARGS+=	PREFIX="${PREFIX}" LD="${CC}" CC="${CC}"
diff --git a/news/suck/Makefile b/news/suck/Makefile
index 39b22774c80e..a741a1e226c9 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -43,7 +43,7 @@ CNEWS_SUFFIX=	-cnews
 MAKE_ENV+=	DB_TYPE=-DUSE_DBZ DB_LIB=-lcnews
 MAKE_ENV+=	DB_LIB_LOC=-L${LOCALBASE}/lib
 MAKE_ENV+=	INCDIR2=-I${LOCALBASE}/include
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/${CNEWS_PORT}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcnews.a:${CNEWS_PORT}
 CONFLICTS+=	suck-4.*
 .endif
 
@@ -54,7 +54,7 @@ MAKE_ENV+=	DB_LIB="-linn -lstorage -linnhist"
 MAKE_ENV+=	DB_LIB_LOC=-L${LOCALBASE}/news/lib
 MAKE_ENV+=	DB_INC_LOC="-I${LOCALBASE}/news/include -I${LOCALBASE}/news/include/inn"
 MAKE_ENV+=	INCDIR2=-I${LOCALBASE}/include
-BUILD_DEPENDS+=	${LOCALBASE}/news/lib/libinn.a:${PORTSDIR}/news/inn
+BUILD_DEPENDS+=	${LOCALBASE}/news/lib/libinn.a:news/inn
 CONFLICTS+=	suck-cnews-4.*
 .endif
 
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 46b153f70ef9..5c140fbdf7c6 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -20,9 +20,9 @@ MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \
 MAINTAINER?=	johans@FreeBSD.org
 COMMENT=	Easy-to-use threaded newsreader with NOV/NNTP support
 
-LIB_DEPENDS=	libuu.so:${PORTSDIR}/converters/uulib \
-		libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+LIB_DEPENDS=	libuu.so:converters/uulib \
+		libpcre.so:devel/pcre
+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 USES=		gmake iconv ncurses shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
@@ -36,13 +36,13 @@ OPTIONS_DEFAULT=	GNUPG ISPELL METAMAIL
 OPTIONS_SUB=		yes
 NNTP_ONLY_DESC=		Only read news via NNTP (no spool dir support)
 NNTP_ONLY_CONFIGURE_ENABLE=nntp-only
-GNUPG_RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+GNUPG_RUN_DEPENDS=	gpg:security/gnupg
 GNUPG_CONFIGURE_ON=	--with-gpg=${PREFIX}/bin/gpg \
 			--without-pgp --without-pgpk
 GNUPG_CONFIGURE_OFF=	--disable-pgp-gpg
-ISPELL_RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_CONFIGURE_ARGS=	--with-ispell=${PREFIX}/bin/ispell
-METAMAIL_RUN_DEPENDS=	metamail:${PORTSDIR}/mail/metamail
+METAMAIL_RUN_DEPENDS=	metamail:mail/metamail
 METAMAIL_CONFIGURE_ARGS=--with-metamail=${PREFIX}/bin/metamail
 CANLOCK_DESC=		Enable Cancel-Lock key support via libcanlock
 CANLOCK_CONFIGURE_ENABLE=cancel-locks
diff --git a/news/trn/Makefile b/news/trn/Makefile
index e9115af2b34e..025570965d43 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/ \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Threaded Read News newsreader
 
-RUN_DEPENDS=	munpack:${PORTSDIR}/converters/mpack
+RUN_DEPENDS=	munpack:converters/mpack
 
 CONFLICTS_INSTALL=trn-4.[0-9]*
 
diff --git a/news/ubh/Makefile b/news/ubh/Makefile
index 9f2a0b4e8801..0c119fa7eda2 100644
--- a/news/ubh/Makefile
+++ b/news/ubh/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	john@zoner.org
 COMMENT=	Perl script to download and decode binaries posted to Usenet
 
 RUN_DEPENDS=	\
-	p5-News-Newsrc>=0:${PORTSDIR}/news/p5-News-Newsrc \
-	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-	p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32
+	p5-News-Newsrc>=0:news/p5-News-Newsrc \
+	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+	p5-String-CRC32>=0:devel/p5-String-CRC32
 
 NO_BUILD=	YES
 USES=		perl5 shebangfix
diff --git a/news/xpn/Makefile b/news/xpn/Makefile
index a1f8d52fe999..cc71fb851338 100644
--- a/news/xpn/Makefile
+++ b/news/xpn/Makefile
@@ -12,8 +12,8 @@ COMMENT=	X Python Newsreader
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>=2.24.0:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.9:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>=2.24.0:x11-toolkits/py-gtk2 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.9:databases/py-sqlite3
 
 NO_BUILD=	yes
 
diff --git a/palm/imgvtopgm/Makefile b/palm/imgvtopgm/Makefile
index f7539f8be805..b4f82235b97b 100644
--- a/palm/imgvtopgm/Makefile
+++ b/palm/imgvtopgm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Palm Pilot Image Viewer to PGM Converter
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 
 GNU_CONFIGURE=	yes
 
diff --git a/palm/jpilot-picsnvideos/Makefile b/palm/jpilot-picsnvideos/Makefile
index 5c42d620f471..49b1b4fe9649 100644
--- a/palm/jpilot-picsnvideos/Makefile
+++ b/palm/jpilot-picsnvideos/Makefile
@@ -14,9 +14,9 @@ COMMENT=	JPilot plugin to download photos and videos
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	jpilot:${PORTSDIR}/palm/jpilot
-BUILD_DEPENDS=	jpilot:${PORTSDIR}/palm/jpilot
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+RUN_DEPENDS=	jpilot:palm/jpilot
+BUILD_DEPENDS=	jpilot:palm/jpilot
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index eff6c98bfd5a..332610d9a7bd 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Desktop Organizer Software for the Palm Pilot
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpisock.so:${PORTSDIR}/palm/pilot-link
+LIB_DEPENDS=	libpisock.so:palm/pilot-link
 
 USE_GCC=	any
 USES=		pkgconfig gmake libtool
diff --git a/palm/libmal/Makefile b/palm/libmal/Makefile
index 6a3ad0f3c429..f6ff147b1718 100644
--- a/palm/libmal/Makefile
+++ b/palm/libmal/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library encapsulating malsync
 LICENSE=	MPL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpisock.so:${PORTSDIR}/palm/pilot-link
+LIB_DEPENDS=	libpisock.so:palm/pilot-link
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 144982b0fa1b..f46aaf75cb18 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Suite of tools to connect and sync your Palm handheld
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${WRKSRC}/popt -I${LOCALBASE}/include
@@ -42,7 +42,7 @@ IGNORE=		cannot be built: USB support requires THREADS turned on.  Please reconf
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 CONFIGURE_ARGS+=	--with-libpng=${PREFIX}
 .else
 CONFIGURE_ARGS+=	--disable-png
diff --git a/palm/ppmtoTbmp/Makefile b/palm/ppmtoTbmp/Makefile
index a3bd39c98dd9..cd2e87589104 100644
--- a/palm/ppmtoTbmp/Makefile
+++ b/palm/ppmtoTbmp/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.isaac.cs.berkeley.edu/pilot/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PPM to Pilot bitmap converter
 
-LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDLIBS=-lnetpbm
diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index 69273e5ba999..eecaea035d2b 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	synce-
 MAINTAINER=	webmaster@kibab.com
 COMMENT=	Library to support communication with WinCE devices
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libhal.so:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libhal.so:sysutils/hal
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/polish/ekg/Makefile b/polish/ekg/Makefile
index 93da86834421..a6540451b00d 100644
--- a/polish/ekg/Makefile
+++ b/polish/ekg/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://ekg.chmurka.net/
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Text-mode Gadu-Gadu client
 
-LIB_DEPENDS=	libgadu.so:${PORTSDIR}/polish/libgadu
+LIB_DEPENDS=	libgadu.so:polish/libgadu
 
 GNU_CONFIGURE=	yes
 USES=		execinfo gmake ncurses pathfix pkgconfig
@@ -28,8 +28,8 @@ OPTIONS_DEFINE=		ASPELL OPENSSL
 OPTIONS_DEFAULT=	OPENSSL
 
 ASPELL_CONFIGURE_ON=	--enable-aspell
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
-ASPELL_RUN_DEPENDS=	pl-aspell>0:${PORTSDIR}/polish/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
+ASPELL_RUN_DEPENDS=	pl-aspell>0:polish/aspell
 
 OPENSSL_CONFIGURE_OFF=	--without-openssl
 
diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index af27f758e917..dbac047d0d9e 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	http://pl.ekg2.org/
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Text-mode Gadu-Gadu, Jabber, and IRC client
 
-LIB_DEPENDS=	libgadu.so:${PORTSDIR}/polish/libgadu \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libgadu.so:polish/libgadu \
+		libgnutls.so:security/gnutls \
+		libexpat.so:textproc/expat2
 
 LICENSE=	GPLv2
 
@@ -49,16 +49,16 @@ UNICODE_DESC=	Unicode support (experimental)
 XOSD_DESC=	Xosd plugin
 
 ASPELL_CONFIGURE_WITH=	aspell
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
-ASPELL_RUN_DEPENDS=	${LOCALBASE}/share/aspell/pl.rws:${PORTSDIR}/polish/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
+ASPELL_RUN_DEPENDS=	${LOCALBASE}/share/aspell/pl.rws:polish/aspell
 
 GPG_CONFIGURE_WITH=	gpg
-GPG_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-			libgpg-error.so:${PORTSDIR}/security/libgpg-error
-GPG_RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+GPG_LIB_DEPENDS=	libgpgme.so:security/gpgme \
+			libgpg-error.so:security/libgpg-error
+GPG_RUN_DEPENDS=	gpg:security/gnupg
 
 GSM_CONFIGURE_WITH=	libgsm
-GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 
 GTK2_CONFIGURE_WITH=	gtk
 GTK2_USE=		GNOME=gtk2
@@ -74,12 +74,12 @@ PYTHON_USES=		python shebangfix
 SHEBANG_FILES=		contrib/python/notify-bubble.py
 
 SQLITE_CONFIGURE_WITH=	sqlite3
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 UNICODE_CONFIGURE_ENABLE=	unicode
 
 XOSD_CONFIGURE_WITH=	libxosd
-XOSD_LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+XOSD_LIB_DEPENDS=	libxosd.so:misc/xosd
 
 post-patch:
 # needs newer headers for O_NOFOLLOW flag
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 58cf2d6727a1..da72c8137719 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	gg2-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gadu-Gadu IM network client
 
-LIB_DEPENDS=	libgadu.so:${PORTSDIR}/polish/libgadu \
-		libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS=	libgadu.so:polish/libgadu \
+		libaudiofile.so:audio/libaudiofile
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -55,27 +55,27 @@ GTKSPELL_DESC=	Enable GTKSpell checker
 TLEN_DESC=	Enable Tlen.pl network plugin
 XOSD_DESC=	Enable On-Screen-Display messages
 
-TLEN_LIB_DEPENDS=	libtlen.so:${PORTSDIR}/polish/libtlen
+TLEN_LIB_DEPENDS=	libtlen.so:polish/libtlen
 TLEN_CONFIGURE_WITH=	tlen
 
-JABBER_LIB_DEPENDS=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
+JABBER_LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth
 JABBER_CONFIGURE_WITH=	jabber
 
 DOCKLET_CONFIGURE_WITH=	docklet-system-tray
 
 DOCKAPP_CONFIGURE_WITH=	docklet_dockapp
 
-GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 GTKSPELL_CONFIGURE_WITH=	gtkspell
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
 DBUS_CONFIGURE_ON=	--with-dbus-dir=${PREFIX}/share/dbus-1/services
 
 ESOUND_USE=	GNOME=esound
 ESOUND_CONFIGURE_WITH=	esd
 
-XOSD_LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+XOSD_LIB_DEPENDS=	libxosd.so:misc/xosd
 XOSD_CONFIGURE_WITH=	xosd
 
 post-patch:
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 6b6e5dc6202e..072d2ae84673 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -18,16 +18,16 @@ COMMENT=	Internet communicator supporting Gadu-Gadu and Jabber/XMPP
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		pl-libgadu>=1.12.1:${PORTSDIR}/polish/libgadu
-LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libinjeqt.so:${PORTSDIR}/devel/injeqt \
-		libqca-qt5.so:${PORTSDIR}/devel/qca-qt5 \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libgadu.so:${PORTSDIR}/polish/libgadu \
-		libotr.so.5:${PORTSDIR}/security/libotr \
-		libenchant.so:${PORTSDIR}/textproc/enchant
+BUILD_DEPENDS=	bash:shells/bash \
+		pl-libgadu>=1.12.1:polish/libgadu
+LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
+		libsndfile.so:audio/libsndfile \
+		libinjeqt.so:devel/injeqt \
+		libqca-qt5.so:devel/qca-qt5 \
+		libidn.so:dns/libidn \
+		libgadu.so:polish/libgadu \
+		libotr.so.5:security/libotr \
+		libenchant.so:textproc/enchant
 # TODO ntrack and ntrack-qt (needs porting) ?
 # TODO separate ports for plugins and themes (possible starting with 0.10)
 
diff --git a/polish/libgadu/Makefile b/polish/libgadu/Makefile
index b25db57f2088..af23abb0b1d5 100644
--- a/polish/libgadu/Makefile
+++ b/polish/libgadu/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Instant messaging library for Gadu-Gadu protocol
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c
 
 CONFLICTS=	pl-ekg-1.[0-6]*
 
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 3c4a8a25b3b8..06448d54be53 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Qt5 based subtitle downloader
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-BUILD_DEPENDS=	qt-maybe>0:${PORTSDIR}/devel/qt-maybe \
-		libmaia>0:${PORTSDIR}/net/libmaia
-LIB_DEPENDS=	libmediainfo.so:${PORTSDIR}/multimedia/libmediainfo
-RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
+BUILD_DEPENDS=	qt-maybe>0:devel/qt-maybe \
+		libmaia>0:net/libmaia
+LIB_DEPENDS=	libmediainfo.so:multimedia/libmediainfo
+RUN_DEPENDS=	7z:archivers/p7zip
 
 USE_GITHUB=	yes
 
diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile
index b4d71d3156ec..3bdd1a85d755 100644
--- a/polish/tleenx2/Makefile
+++ b/polish/tleenx2/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	TleenX2-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Client for polish IM service called Tlen.pl
 
-LIB_DEPENDS=	libtlen.so:${PORTSDIR}/polish/libtlen
+LIB_DEPENDS=	libtlen.so:polish/libtlen
 
 USES=		pkgconfig
 USE_GNOME=	gtk20
diff --git a/ports-mgmt/chucky/Makefile b/ports-mgmt/chucky/Makefile
index 747f57127c9e..7a8d76471910 100644
--- a/ports-mgmt/chucky/Makefile
+++ b/ports-mgmt/chucky/Makefile
@@ -14,8 +14,8 @@ LICENSE_NAME=	CHUCKY BSD LICENSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpkg.so:${PORTSDIR}/${PKG_ORIGIN} \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libpkg.so:${PKG_ORIGIN} \
+		libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	waitman
diff --git a/ports-mgmt/distilator/Makefile b/ports-mgmt/distilator/Makefile
index 2df6c07fa9c6..f0774544b863 100644
--- a/ports-mgmt/distilator/Makefile
+++ b/ports-mgmt/distilator/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Command-line script to check the availability of a ports distfiles
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-URI>=1.56:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-URI>=1.56:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/ports-mgmt/fbsdmon/Makefile b/ports-mgmt/fbsdmon/Makefile
index 0ee7c24ca812..b3d2e1206c5c 100644
--- a/ports-mgmt/fbsdmon/Makefile
+++ b/ports-mgmt/fbsdmon/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/gblach/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Submit system and ports statistics to fbsdmon.org
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libjansson.so:${PORTSDIR}/devel/jansson
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libjansson.so:devel/jansson
 
 SUB_FILES=	600.fbsdmon pkg-message
 USE_RC_SUBR=	fbsdmon
diff --git a/ports-mgmt/freebsd-bugzilla-cli/Makefile b/ports-mgmt/freebsd-bugzilla-cli/Makefile
index a59d424a387c..b1b4046463fe 100644
--- a/ports-mgmt/freebsd-bugzilla-cli/Makefile
+++ b/ports-mgmt/freebsd-bugzilla-cli/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Interact with the FreeBSD bugzilla instance
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 OPTIONS_GROUP=	BACKEND
 OPTIONS_GROUP_BACKEND=	PYBUGZ
@@ -19,7 +19,7 @@ OPTIONS_DEFAULT=	PYBUGZ
 OPTIONS_SUB=	yes
 
 PYBUGZ_DESC=	use devel/pybugz for bugzilla interface
-PYBUGZ_RUN_DEPENDS=	bugz:${PORTSDIR}/devel/pybugz
+PYBUGZ_RUN_DEPENDS=	bugz:devel/pybugz
 
 DATADIR=	${PREFIX}/share/bz
 
diff --git a/ports-mgmt/kpackagekit/Makefile b/ports-mgmt/kpackagekit/Makefile
index e8899383a4df..7d44c5ba96dc 100644
--- a/ports-mgmt/kpackagekit/Makefile
+++ b/ports-mgmt/kpackagekit/Makefile
@@ -13,7 +13,7 @@ COMMENT=	KDE interface for PackageKit
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpackagekit-qt.so:${PORTSDIR}/ports-mgmt/packagekit-qt4
+LIB_DEPENDS=	libpackagekit-qt.so:ports-mgmt/packagekit-qt4
 
 USE_KDE4=	automoc4 kdelibs kdeprefix
 USE_QT4=	moc_build qmake_build rcc_build uic_build
diff --git a/ports-mgmt/lsknobs/Makefile b/ports-mgmt/lsknobs/Makefile
index 12e04045cc61..1e7d71e7cdcc 100644
--- a/ports-mgmt/lsknobs/Makefile
+++ b/ports-mgmt/lsknobs/Makefile
@@ -11,7 +11,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	linder.gabriel@gmail.com
 COMMENT=	Simple script to help configure ports knobs and options
 
-RUN_DEPENDS=	${LOCALBASE}/libexec/portconf:${PORTSDIR}/ports-mgmt/portconf
+RUN_DEPENDS=	${LOCALBASE}/libexec/portconf:ports-mgmt/portconf
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message ${PORTNAME}.sh
diff --git a/ports-mgmt/p5-FreeBSD-Portindex/Makefile b/ports-mgmt/p5-FreeBSD-Portindex/Makefile
index 9ccb80eecf11..4c3f701837b9 100644
--- a/ports-mgmt/p5-FreeBSD-Portindex/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Portindex/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Incremental FreeBSD ports INDEX file generation
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	p5-BerkeleyDB>0:${PORTSDIR}/databases/p5-BerkeleyDB
+BUILD_DEPENDS=	p5-BerkeleyDB>0:databases/p5-BerkeleyDB
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tar:xz
@@ -36,7 +36,7 @@ PLIST_SUB+=	CACHE_DIR=${CACHE_DIR} \
 # machine.
 OPTIONS_DEFINE=	GRAPHVIZ
 GRAPHVIZ_DESC=	Add GraphViz run-time dependency
-GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
 
 post-install:
 	${MKDIR} ${STAGEDIR}${CACHE_DIR}
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index f77070239adb..aadc14a8a2ed 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -11,12 +11,12 @@ MASTER_SITES=	http://www.packagekit.org/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	DBUS packaging abstraction layer
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-		libck-connector.so:${PORTSDIR}/sysutils/consolekit
-RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2man:textproc/docbook-utils
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libpolkit-gobject-1.so:sysutils/polkit \
+		libck-connector.so:sysutils/consolekit
+RUN_DEPENDS=	lsof:sysutils/lsof \
+		bash:shells/bash
 
 IGNORE=		does not build with new polkit
 
@@ -52,9 +52,9 @@ PORTS_DESC=Use portupgrade for management, dummy if disabled
 .include <bsd.port.options.mk>
 
 . if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS+=	docbook-sgml>0:textproc/docbook-sgml \
+		xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 PLIST_SUB+=	MAN=''
 . else
 CONFIGURE_ARGS+=--disable-man-pages
@@ -62,7 +62,7 @@ PLIST_SUB+=	MAN='@comment '
 . endif
 
 . if ${PORT_OPTIONS:MPORTS}
-RUN_DEPENDS+=	${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
+RUN_DEPENDS+=	${LOCALBASE}/sbin/portupgrade:ports-mgmt/portupgrade
 USE_RUBY=	yes
 CONFIGURE_ARGS+=--enable-ports --with-default-backend=ports
 PLIST_SUB+=	PORTS=""
@@ -77,10 +77,10 @@ PLIST_SUB+=	GTK="@comment "
 CONFIGURE_ARGS+=--disable-qt
 
 .elif defined(${SLAVEPORT}) && ${SLAVEPORT}=="qt4"
-LIB_DEPENDS+=	libpackagekit-glib2.so:${PORTSDIR}/ports-mgmt/packagekit
+LIB_DEPENDS+=	libpackagekit-glib2.so:ports-mgmt/packagekit
 
 CONFIGURE_ARGS+=--enable-qt
-LIB_DEPENDS+=	libcppunit.so:${PORTSDIR}/devel/cppunit
+LIB_DEPENDS+=	libcppunit.so:devel/cppunit
 USE_QT4+=	dbus gui xml sql moc_build
 #.include "${PORTSDIR}/Mk/bsd.qt.mk"
 .endif
diff --git a/ports-mgmt/pkgcompare/Makefile b/ports-mgmt/pkgcompare/Makefile
index 4236526cc173..a64140a34403 100644
--- a/ports-mgmt/pkgcompare/Makefile
+++ b/ports-mgmt/pkgcompare/Makefile
@@ -13,8 +13,8 @@ LICENSE_NAME=	PKG-COMPARE BSD LICENSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpkg.so:${PORTSDIR}/${PKG_ORIGIN} \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libpkg.so:${PKG_ORIGIN} \
+		libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	waitman
diff --git a/ports-mgmt/port-authoring-tools/Makefile b/ports-mgmt/port-authoring-tools/Makefile
index efe77986c216..5895f6e35613 100644
--- a/ports-mgmt/port-authoring-tools/Makefile
+++ b/ports-mgmt/port-authoring-tools/Makefile
@@ -11,8 +11,8 @@ COMMENT=	"meta-port" for tools to test and submit changes to ports
 USES=	metaport
 # note: portlint is brought in by porttools
 RUN_DEPENDS=	\
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
-		${LOCALBASE}/sbin/libchk:${PORTSDIR}/sysutils/libchk \
-		${LOCALBASE}/bin/port:${PORTSDIR}/ports-mgmt/porttools
+		${LOCALBASE}/bin/svn:devel/subversion \
+		${LOCALBASE}/sbin/libchk:sysutils/libchk \
+		${LOCALBASE}/bin/port:ports-mgmt/porttools
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/port-maintenance-tools/Makefile b/ports-mgmt/port-maintenance-tools/Makefile
index c6176f70f042..08073ee0549a 100644
--- a/ports-mgmt/port-maintenance-tools/Makefile
+++ b/ports-mgmt/port-maintenance-tools/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Meta-port for administrative tools to maintain ports
 USES=	metaport
 
 RUN_DEPENDS=	\
-		${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade \
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
-		${LOCALBASE}/sbin/pkg_cutleaves:${PORTSDIR}/ports-mgmt/pkg_cutleaves \
-		${LOCALBASE}/bin/pkg_tree:${PORTSDIR}/ports-mgmt/pkg_tree \
-		${LOCALBASE}/sbin/portdowngrade:${PORTSDIR}/ports-mgmt/portdowngrade
+		${LOCALBASE}/sbin/portupgrade:ports-mgmt/portupgrade \
+		${LOCALBASE}/bin/svn:devel/subversion \
+		${LOCALBASE}/sbin/pkg_cutleaves:ports-mgmt/pkg_cutleaves \
+		${LOCALBASE}/bin/pkg_tree:ports-mgmt/pkg_tree \
+		${LOCALBASE}/sbin/portdowngrade:ports-mgmt/portdowngrade
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portdowngrade/Makefile b/ports-mgmt/portdowngrade/Makefile
index 5ca139597357..450363493ab2 100644
--- a/ports-mgmt/portdowngrade/Makefile
+++ b/ports-mgmt/portdowngrade/Makefile
@@ -10,7 +10,7 @@ DISTFILES=	# none
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Sets a port back to a previous version
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion${WITH_SUBVERSION_VER}
+RUN_DEPENDS=	svn:devel/subversion${WITH_SUBVERSION_VER}
 
 NO_BUILD=	yes
 PLIST_FILES=	sbin/portdowngrade
diff --git a/ports-mgmt/portell/Makefile b/ports-mgmt/portell/Makefile
index 5e36919e963a..44dd756ffbc2 100644
--- a/ports-mgmt/portell/Makefile
+++ b/ports-mgmt/portell/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.freebsdcluster.org/~mich/software/
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Quick display of FreeBSD port descriptions
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb
 
 USES=		python zip
 NO_BUILD=	yes
diff --git a/ports-mgmt/portest/Makefile b/ports-mgmt/portest/Makefile
index 076139822ac1..af4cdfe0e46d 100644
--- a/ports-mgmt/portest/Makefile
+++ b/ports-mgmt/portest/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Patch file automation for FreeBSD-ports
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	portlint:${PORTSDIR}/ports-mgmt/portlint
+RUN_DEPENDS=	portlint:ports-mgmt/portlint
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ultima1252
@@ -23,14 +23,14 @@ OPTIONS_DEFINE=		GIT PORTTOOLS POUDRIERE
 OPTIONS_DEFAULT=	GIT PORTTOOLS POUDRIERE
 
 GIT_DESC=		Git support
-GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+GIT_RUN_DEPENDS=	git:devel/git
 
 PORTTOOLS_DESC=		Porttools support
-PORTTOOLS_RUN_DEPENDS=	port:${PORTSDIR}/ports-mgmt/porttools
+PORTTOOLS_RUN_DEPENDS=	port:ports-mgmt/porttools
 
 POUDRIERE_DESC=		Poudriere and parallel build support
-POUDRIERE_RUN_DEPENDS=	poudriere:${PORTSDIR}/ports-mgmt/poudriere \
-			tmux:${PORTSDIR}/sysutils/tmux
+POUDRIERE_RUN_DEPENDS=	poudriere:ports-mgmt/poudriere \
+			tmux:sysutils/tmux
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/portest ${STAGEDIR}${PREFIX}/sbin/portest
diff --git a/ports-mgmt/portfind/Makefile b/ports-mgmt/portfind/Makefile
index 0270ae941d77..699651dd5d36 100644
--- a/ports-mgmt/portfind/Makefile
+++ b/ports-mgmt/portfind/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Search the ports tree
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS=	sqlite3:databases/sqlite3
+RUN_DEPENDS=	sqlite3:databases/sqlite3
 
 USES=		perl5
 USE_PERL5=	build
diff --git a/ports-mgmt/portless/Makefile b/ports-mgmt/portless/Makefile
index 80d4cb8e19e7..1026173c2f84 100644
--- a/ports-mgmt/portless/Makefile
+++ b/ports-mgmt/portless/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	# none
 MAINTAINER=	mkamm@gmx.net
 COMMENT=	Quick display of files inside the FreeBSD ports tree
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		shebangfix
 NO_WRKSUBDIR=	yes
diff --git a/ports-mgmt/portscout/Makefile b/ports-mgmt/portscout/Makefile
index ee6e9c8ad215..477f4346f907 100644
--- a/ports-mgmt/portscout/Makefile
+++ b/ports-mgmt/portscout/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Tool to scan for new versions of FreeBSD ports
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Proc-Queue>=0:${PORTSDIR}/devel/p5-Proc-Queue \
-		p5-Net>=0:${PORTSDIR}/net/p5-Net \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Proc-Queue>=0:devel/p5-Proc-Queue \
+		p5-Net>=0:net/p5-Net \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-libwww>=0:www/p5-libwww \
+		p5-JSON>0:converters/p5-JSON
 
 OPTIONS_DEFINE=		DOCS HTTPS
 OPTIONS_DEFAULT=	HTTPS PGSQL
@@ -37,13 +37,13 @@ SHEBANG_FILES=	${WRKSRC}/portscout.pl
 
 PORTDOCS=	UPDATING portscout-portconfig.txt xml-datasrc-example.xml
 
-HTTPS_RUN_DEPENDS=	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https
+HTTPS_RUN_DEPENDS=	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
 
 SQLITE_USES=		sqlite
-SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 PGSQL_USES=		pgsql
-PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 
 .include <bsd.port.options.mk>
 
diff --git a/ports-mgmt/portshaker-config/Makefile b/ports-mgmt/portshaker-config/Makefile
index 3e535d00550d..5580daaaef61 100644
--- a/ports-mgmt/portshaker-config/Makefile
+++ b/ports-mgmt/portshaker-config/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	ports-mgmt
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Simple configuration manager for portshaker
 
-BUILD_DEPENDS=	portshaker:${PORTSDIR}/ports-mgmt/portshaker
+BUILD_DEPENDS=	portshaker:ports-mgmt/portshaker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MASTERDIR=	${.CURDIR}/../portshaker
diff --git a/ports-mgmt/portshaker/Makefile b/ports-mgmt/portshaker/Makefile
index c6dc273f83fd..a2f6e9a2bd4f 100644
--- a/ports-mgmt/portshaker/Makefile
+++ b/ports-mgmt/portshaker/Makefile
@@ -21,14 +21,14 @@ OPTIONS_DEFAULT=	RSYNC SVN
 RSYNC_DESC=	rsync support
 GIT_DESC=	git support
 HG_DESC=	mercurial support
-RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RSYNC_RUN_DEPENDS=	rsync:net/rsync
 .if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
-SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion18
+SVN_RUN_DEPENDS=	svn:devel/subversion18
 .else
-SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+SVN_RUN_DEPENDS=	svn:devel/subversion
 .endif
-GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
-HG_RUN_DEPENDS=		hg:${PORTSDIR}/devel/mercurial
+GIT_RUN_DEPENDS=	git:devel/git
+HG_RUN_DEPENDS=		hg:devel/mercurial
 .else
 OPTIONS_DEFINE=	BSDSHARP ENLIGHTENMENT GECKO HASKELL MARCUSCOM TEXLIVE XORG
 OPTIONS_DEFAULT=	BSDSHARP
diff --git a/ports-mgmt/porttools/Makefile b/ports-mgmt/porttools/Makefile
index 83c0a33212f5..661c27762e7e 100644
--- a/ports-mgmt/porttools/Makefile
+++ b/ports-mgmt/porttools/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Tools for testing and submitting port updates and new ports
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	portlint:${PORTSDIR}/ports-mgmt/portlint \
-		cdiff:${PORTSDIR}/textproc/cdiff \
-		sudo:${PORTSDIR}/security/sudo \
-		svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	portlint:ports-mgmt/portlint \
+		cdiff:textproc/cdiff \
+		sudo:security/sudo \
+		svn:devel/subversion
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	skreuzer
diff --git a/ports-mgmt/porttree/Makefile b/ports-mgmt/porttree/Makefile
index 252cd934bc84..2356c79b2e1c 100644
--- a/ports-mgmt/porttree/Makefile
+++ b/ports-mgmt/porttree/Makefile
@@ -13,10 +13,10 @@ LICENSE=	MIT
 
 USES=		python tar:bzip2
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}networkx>=1.5:${PORTSDIR}/math/py-networkx
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}networkx>=1.5:math/py-networkx
 
 .if target(gen-dist)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 .endif
 
 SVNROOT?=	http://porttree.googlecode.com/svn/trunk/
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index e512e0812c3e..db3712580d96 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -43,7 +43,7 @@ INSTALL_TARGET+=	install-doc
 .endif
 
 # For PKG_DBDRIVER={bdb_btree,bdb_hash}
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb
 
 regression-test: patch
 	cd ${WRKSRC} && ${MAKE} test
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 52e7fd635df2..a08e28b15956 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -43,7 +43,7 @@ INSTALL_TARGET+=	install-doc
 .endif
 
 # For PKG_DBDRIVER={bdb_btree,bdb_hash}
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index 173c9e87b14b..e1e3a60395ef 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFAULT=ZSH
 OPTIONS_SUB=	yes
 
 QEMU_DESC=	Add qemu-user-static to compile ports for non-x86 architectures
-QEMU_RUN_DEPENDS=	qemu-user-static>0:${PORTSDIR}/emulators/qemu-user-static
+QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile
index 7b2f56037793..a86c311b8b53 100644
--- a/ports-mgmt/poudriere/Makefile
+++ b/ports-mgmt/poudriere/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=ZSH
 OPTIONS_SUB=	yes
 
 QEMU_DESC=	Add qemu-user-static to compile ports for non-x86 architectures
-QEMU_RUN_DEPENDS=	qemu-user-static>0:${PORTSDIR}/emulators/qemu-user-static
+QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
diff --git a/ports-mgmt/py-pytoport/Makefile b/ports-mgmt/py-pytoport/Makefile
index df438f5e56b2..140c9005ffd2 100644
--- a/ports-mgmt/py-pytoport/Makefile
+++ b/ports-mgmt/py-pytoport/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Generate FreeBSD ports from Python modules on PyPI
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}spdx-lookup>=0.3.0:${PORTSDIR}/misc/py-spdx-lookup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}spdx-lookup>=0.3.0:misc/py-spdx-lookup
 
 USES=		python:3.3+
 USE_PYTHON=	autoplist distutils
diff --git a/ports-mgmt/redports-node/Makefile b/ports-mgmt/redports-node/Makefile
index ec2abadfa791..42d2f2e97d50 100644
--- a/ports-mgmt/redports-node/Makefile
+++ b/ports-mgmt/redports-node/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Redports building node
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
-		poudriere:${PORTSDIR}/ports-mgmt/poudriere \
-		${LOCALBASE}/bin/ccache:${PORTSDIR}/devel/ccache
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
+		poudriere:ports-mgmt/poudriere \
+		${LOCALBASE}/bin/ccache:devel/ccache
 
 NO_BUILD=	yes
 USE_PHP=	curl hash json openssl pcntl phar
diff --git a/ports-mgmt/synth/Makefile b/ports-mgmt/synth/Makefile
index e5c1b83dd081..93ac0a0953f3 100644
--- a/ports-mgmt/synth/Makefile
+++ b/ports-mgmt/synth/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Custom package repository builder for FreeBSD and DragonFly
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-#BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/${IFM}.gpr:${PORTSDIR}/misc/${IFM} \
-#		${LOCALBASE}/lib/gnat/${AC}.gpr:${PORTSDIR}/devel/${AC}
+#BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/${IFM}.gpr:misc/${IFM} \
+#		${LOCALBASE}/lib/gnat/${AC}.gpr:devel/${AC}
 
 USES=		ada:6 ncurses:port
 USE_GITHUB=	yes
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index d5b4daf7892e..9aabd48bc506 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
-RUN_DEPENDS=	dialog4ports-static:${PORTSDIR}/ports-mgmt/dialog4ports-static
+RUN_DEPENDS=	dialog4ports-static:ports-mgmt/dialog4ports-static
 
 CONFLICTS=	tinderbox-devel-[0-9]*
 
@@ -61,7 +61,7 @@ USES+=		pgsql
 .if defined(WEBUI)
 USE_PHP+=	pgsql pdo_pgsql
 .endif
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
@@ -69,36 +69,36 @@ RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 USE_PHP+=	mysql pdo_mysql
 .endif
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 .if defined(WEBUI)
 USE_PHP+=	sqlite3 pdo_sqlite
 .endif
-RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+RUN_DEPENDS+=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
 .elif ${PORT_OPTIONS:MLIGHTTPD}
-RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
+RUN_DEPENDS+=	lighttpd:www/lighttpd
 .elif ${PORT_OPTIONS:MHIAWATHA}
-RUN_DEPENDS+=	hiawatha:${PORTSDIR}/www/hiawatha
+RUN_DEPENDS+=	hiawatha:www/hiawatha
 .elif ${PORT_OPTIONS:MNGINX}
-RUN_DEPENDS+=	nginx:${PORTSDIR}/www/nginx
+RUN_DEPENDS+=	nginx:www/nginx
 .endif
 
 .if ${PORT_OPTIONS:MEMAILS}
-RUN_DEPENDS+=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS+=	p5-Net>=0:net/p5-Net
 .endif
 
 .if ${PORT_OPTIONS:MLSOF}
-RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof
+RUN_DEPENDS+=	lsof:sysutils/lsof
 .endif
 
 .if ${PORT_OPTIONS:MLOG_COMPRESS}
-RUN_DEPENDS+=	p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2
+RUN_DEPENDS+=	p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2
 .endif
 
 post-patch:
diff --git a/ports-mgmt/wanted-ports/files/wanted-ports.in b/ports-mgmt/wanted-ports/files/wanted-ports.in
index 3be93c465421..c8b792cc89f1 100644
--- a/ports-mgmt/wanted-ports/files/wanted-ports.in
+++ b/ports-mgmt/wanted-ports/files/wanted-ports.in
@@ -116,7 +116,7 @@ EOF
 # it.  Since we have no way of knowing what files are significant from
 # among whatever the port installs (and the port may not even be
 # installed yet) use the form
-# "pkgname>=n.nn:${PORTSDIR}/category/portname" where n.nn is the
+# "pkgname>=n.nn:category/portname" where n.nn is the
 # currently available version of the port.  Requires the INDEX to have
 # been installed.  This can return any number of dependency lines,
 # including none.
diff --git a/print/R-cran-knitr/Makefile b/print/R-cran-knitr/Makefile
index 0e60d5794a91..b1429799111f 100644
--- a/print/R-cran-knitr/Makefile
+++ b/print/R-cran-knitr/Makefile
@@ -11,13 +11,13 @@ COMMENT=	General-Purpose Package for Dynamic Report Generation in R
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-evaluate>=0.8:${PORTSDIR}/devel/R-cran-evaluate \
-		R-cran-digest>0:${PORTSDIR}/security/R-cran-digest \
-		R-cran-formatR>0:${PORTSDIR}/textproc/R-cran-formatR \
-		R-cran-highr>0:${PORTSDIR}/textproc/R-cran-highr \
-		R-cran-markdown>0:${PORTSDIR}/textproc/R-cran-markdown \
-		R-cran-stringr>=0.6:${PORTSDIR}/textproc/R-cran-stringr \
-		R-cran-yaml>=2.1.5:${PORTSDIR}/textproc/R-cran-yaml
+RUN_DEPENDS=	R-cran-evaluate>=0.8:devel/R-cran-evaluate \
+		R-cran-digest>0:security/R-cran-digest \
+		R-cran-formatR>0:textproc/R-cran-formatR \
+		R-cran-highr>0:textproc/R-cran-highr \
+		R-cran-markdown>0:textproc/R-cran-markdown \
+		R-cran-stringr>=0.6:textproc/R-cran-stringr \
+		R-cran-yaml>=2.1.5:textproc/R-cran-yaml
 
 USES=	cran:auto-plist
 
diff --git a/print/a2pdf/Makefile b/print/a2pdf/Makefile
index 35c1d6d40246..a0bc3cb5250f 100644
--- a/print/a2pdf/Makefile
+++ b/print/a2pdf/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Text to PDF converter
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-PDF-API2>=0:${PORTSDIR}/textproc/p5-PDF-API2 \
+BUILD_DEPENDS=	p5-PDF-API2>=0:textproc/p5-PDF-API2 \
 		p5-Switch>=0:lang/p5-Switch \
-		perltidy:${PORTSDIR}/devel/p5-Perl-Tidy \
-		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-File-Type>=0:${PORTSDIR}/devel/p5-File-Type
+		perltidy:devel/p5-Perl-Tidy \
+		p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-File-Type>=0:devel/p5-File-Type
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 3df6a629c568..90b8ede6f8fd 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Formats an ASCII file for printing on a postscript printer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIB_DEPENDS=	libpaper.so:print/libpaper
 
 PORTSCOUT=	skipv:4.14
 
@@ -32,7 +32,7 @@ LIBS+=		-L${LOCALBASE}/lib
 
 PAPERSIZE?=
 .if ${PAPERSIZE:tl} == a4
-RUN_DEPENDS+=	${LOCALBASE}/etc/papersize:${PORTSDIR}/print/papersize-default-a4
+RUN_DEPENDS+=	${LOCALBASE}/etc/papersize:print/papersize-default-a4
 .endif
 
 OPTIONS_DEFINE=NLS I18N EMACS
diff --git a/print/abc2mtex/Makefile b/print/abc2mtex/Makefile
index 4021d84ed0a7..23a92979e77f 100644
--- a/print/abc2mtex/Makefile
+++ b/print/abc2mtex/Makefile
@@ -10,7 +10,7 @@ DISTNAME=		${PORTNAME}${PORTVERSION}
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Music TeX converter from "abc" to MusiXTeX format
 
-RUN_DEPENDS=		musixtex:${PORTSDIR}/print/musixtex
+RUN_DEPENDS=		musixtex:print/musixtex
 
 USE_GCC=	any
 
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index bc9bd5bafea7..85e5222b4c3f 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -16,8 +16,8 @@ LICENSE_NAME=	Postcard License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		hpijs:${PORTSDIR}/print/hpijs
+RUN_DEPENDS=	bash:shells/bash \
+		hpijs:print/hpijs
 
 USES=		tar:bzip2
 USE_SUBMAKE=	yes
@@ -77,42 +77,42 @@ PSUFX=	-letter
 PSUFX=	-letterdj
 .endif
 
-_DEPENDS_ASCII=	a2ps:${PORTSDIR}/print/a2ps \
-		enscript:${PORTSDIR}/print/enscript${PSUFX} \
-		mpage:${PORTSDIR}/print/mpage \
-		recode:${PORTSDIR}/converters/recode
+_DEPENDS_ASCII=	a2ps:print/a2ps \
+		enscript:print/enscript${PSUFX} \
+		mpage:print/mpage \
+		recode:converters/recode
 _DEPENDS_COMPRESS= \
-		melt:${PORTSDIR}/archivers/freeze \
-		lzop:${PORTSDIR}/archivers/lzop \
-		arc:${PORTSDIR}/archivers/arc \
-		cabextract:${PORTSDIR}/archivers/cabextract \
-		lha:${PORTSDIR}/archivers/lha \
-		rar:${PORTSDIR}/archivers/rar \
-		rpm:${PORTSDIR}/archivers/rpm4 \
-		unarj:${PORTSDIR}/archivers/unarj \
-		unzip:${PORTSDIR}/archivers/unzip \
-		zoo:${PORTSDIR}/archivers/zoo
+		melt:archivers/freeze \
+		lzop:archivers/lzop \
+		arc:archivers/arc \
+		cabextract:archivers/cabextract \
+		lha:archivers/lha \
+		rar:archivers/rar \
+		rpm:archivers/rpm4 \
+		unarj:archivers/unarj \
+		unzip:archivers/unzip \
+		zoo:archivers/zoo
 _DEPENDS_PSUTILS= \
-		psnup:${PORTSDIR}/print/psutils \
-		fitstopnm:${PORTSDIR}/graphics/netpbm \
-		htmldoc:${PORTSDIR}/textproc/htmldoc
+		psnup:print/psutils \
+		fitstopnm:graphics/netpbm \
+		htmldoc:textproc/htmldoc
 _DEPENDS_CONVERT= \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		wmf2eps:${PORTSDIR}/graphics/libwmf \
-		tgif:${PORTSDIR}/graphics/tgif \
-		transfig:${PORTSDIR}/print/transfig
+		convert:graphics/ImageMagick \
+		wmf2eps:graphics/libwmf \
+		tgif:graphics/tgif \
+		transfig:print/transfig
 # XXX: recent versions of skencil do not include sk2ps.
-#		sk2ps:${PORTSDIR}/graphics/skencil
-_DEPENDS_DVIPS=	dvips:${PORTSDIR}/print/dvipsk-tetex
+#		sk2ps:graphics/skencil
+_DEPENDS_DVIPS=	dvips:print/dvipsk-tetex
 _DEPENDS_FIG2DEV= \
-		fig2dev:${PORTSDIR}/print/transfig
+		fig2dev:print/transfig
 _DEPENDS_HTML2PS= \
-		html2ps:${PORTSDIR}/print/html2ps
-_DEPENDS_ATALK=	pap:${PORTSDIR}/net/netatalk
-_DEPENDS_SAMBA= smbclient:${PORTSDIR}/net/samba36
-_DEPENDS_MP3=	mpg321:${PORTSDIR}/audio/mpg321
-_DEPENDS_OGG=	ogg123:${PORTSDIR}/audio/vorbis-tools
-_DEPENDS_WAV=	wavplay:${PORTSDIR}/audio/wavplay
+		html2ps:print/html2ps
+_DEPENDS_ATALK=	pap:net/netatalk
+_DEPENDS_SAMBA= smbclient:net/samba36
+_DEPENDS_MP3=	mpg321:audio/mpg321
+_DEPENDS_OGG=	ogg123:audio/vorbis-tools
+_DEPENDS_WAV=	wavplay:audio/wavplay
 
 .for D in ${OPTIONS_DEFINE:NCONVERT}
 .if (!empty(PORT_OPTIONS:M$D) || \
diff --git a/print/axpoint/Makefile b/print/axpoint/Makefile
index bb0dff774761..41b4153d2884 100644
--- a/print/axpoint/Makefile
+++ b/print/axpoint/Makefile
@@ -12,12 +12,12 @@ DISTNAME=	XML-Handler-AxPoint-${PORTVERSION:S/0$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XML Based Presentations
 
-BUILD_DEPENDS=	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \
-		p5-Time-Piece>=1.08:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-XML-Filter-XSLT>=0:${PORTSDIR}/textproc/p5-XML-Filter-XSLT \
-		p5-XML-SAX>=0.09:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Writer>=0.39:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-		p5-PDFLib>=0.14:${PORTSDIR}/print/p5-PDFLib
+BUILD_DEPENDS=	p5-Text-Iconv>=0:converters/p5-Text-Iconv \
+		p5-Time-Piece>=1.08:devel/p5-Time-Piece \
+		p5-XML-Filter-XSLT>=0:textproc/p5-XML-Filter-XSLT \
+		p5-XML-SAX>=0.09:textproc/p5-XML-SAX \
+		p5-XML-SAX-Writer>=0.39:textproc/p5-XML-SAX-Writer \
+		p5-PDFLib>=0.14:print/p5-PDFLib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/print/c2ps/Makefile b/print/c2ps/Makefile
index ad83e2a10f68..d4ddc0241cb1 100644
--- a/print/c2ps/Makefile
+++ b/print/c2ps/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.cs.technion.ac.il/users/c2ps/
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	PostScript pretty-printer for C source
 
-LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIB_DEPENDS=	libpaper.so:print/libpaper
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/print/cloudprint/Makefile b/print/cloudprint/Makefile
index 0487973b7ec8..d70cbc8f9941 100644
--- a/print/cloudprint/Makefile
+++ b/print/cloudprint/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Google Cloud Print proxy for local CUPS printers
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycups>=0:${PORTSDIR}/print/py-pycups \
-		${PYTHON_PKGNAMEPREFIX}daemon>0:${PORTSDIR}/devel/py-daemon
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups \
+		${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	armooo
diff --git a/print/cups-bjnp/Makefile b/print/cups-bjnp/Makefile
index 6900f687d483..214137d75a18 100644
--- a/print/cups-bjnp/Makefile
+++ b/print/cups-bjnp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	CUPS backend for Canon USB over IP protocol
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS=	libcups.so:print/cups
 
 GNU_CONFIGURE=	yes
 # Just to avoid a tautological pointer compare in bjnp-commands.c:187
diff --git a/print/cups-cloud-print/Makefile b/print/cups-cloud-print/Makefile
index 8494a5a86d89..cb8c9b132875 100644
--- a/print/cups-cloud-print/Makefile
+++ b/print/cups-cloud-print/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Print using Google Cloud Print
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups
-RUN_DEPENDS=	cancel:${PORTSDIR}/print/cups \
-		${PYTHON_PKGNAMEPREFIX}pycups>0:${PORTSDIR}/print/py-pycups \
-		bash:${PORTSDIR}/shells/bash \
-		${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2
+BUILD_DEPENDS=	cups-config:print/cups
+RUN_DEPENDS=	cancel:print/cups \
+		${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups \
+		bash:shells/bash \
+		${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/print/cups-connector/Makefile b/print/cups-connector/Makefile
index 24a39f982812..a458bfd140bd 100644
--- a/print/cups-connector/Makefile
+++ b/print/cups-connector/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Share CUPS printers via Google Cloud Print
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go \
-		cups>=0:${PORTSDIR}/print/cups \
-		avahi-app>=0:${PORTSDIR}/net/avahi-app
+BUILD_DEPENDS=	go:lang/go \
+		cups>=0:print/cups \
+		avahi-app>=0:net/avahi-app
 
 USES=		compiler pkgconfig
 USE_GITHUB=	yes
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index e962b909ffba..51f764640f31 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -8,12 +8,12 @@ MASTER_SITES=	http://www.openprinting.org/download/cups-filters/
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Additional backends, filters and other software for CUPS
 
-LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libqpdf.so:${PORTSDIR}/print/qpdf \
-		libcupsimage.so:${PORTSDIR}/print/cups \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libpoppler.so:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
+		libqpdf.so:print/qpdf \
+		libcupsimage.so:print/cups \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libpoppler.so:graphics/poppler
 
 CONFLICTS=	cups-pstoraster-[0-9]* foomatic-filters-[0-9]*
 
@@ -47,26 +47,26 @@ OPTIONS_SUB=			yes
 
 BRAILLE_CONFIGURE_ENABLE=	braille
 BRAILLE_DESC=			Braille embosser support
-BRAILLE_LIB_DEPENDS=		liblouis.so:${PORTSDIR}/devel/liblouis \
-#				liblouisutdml.so:${PORTSDIR}/devel/liblouisutdml
-BRAILLE_RUN_DEPENDS=		convert:${PORTSDIR}/graphics/ImageMagick \
-				pdftotext:${PORTSDIR}/graphics/poppler-utils \
-				bash:${PORTSDIR}/shells/bash
+BRAILLE_LIB_DEPENDS=		liblouis.so:devel/liblouis \
+#				liblouisutdml.so:devel/liblouisutdml
+BRAILLE_RUN_DEPENDS=		convert:graphics/ImageMagick \
+				pdftotext:graphics/poppler-utils \
+				bash:shells/bash
 
 COLORD_CONFIGURE_ENABLE=	dbus
 COLORD_DESC=			Get ICC color profiles from colord (via D-Bus)
-COLORD_LIB_DEPENDS=		libdbus-1.so:${PORTSDIR}/devel/dbus
-COLORD_RUN_DEPENDS=		colord>0:${PORTSDIR}/graphics/colord
+COLORD_LIB_DEPENDS=		libdbus-1.so:devel/dbus
+COLORD_RUN_DEPENDS=		colord>0:graphics/colord
 
 IJS_CONFIGURE_ENABLE=		ijs
 IJS_DESC=			Support PPD files that use pdftoijs
-IJS_LIB_DEPENDS=		libijs.so:${PORTSDIR}/print/libijs
+IJS_LIB_DEPENDS=		libijs.so:print/libijs
 
 IMAGEFILTERS_CONFIGURE_ENABLE=	imagefilters
 IMAGEFILTERS_CONFIGURE_WITH=	jpeg png tiff
 IMAGEFILTERS_DESC=		Support printing image files
-IMAGEFILTERS_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-				libpng.so:${PORTSDIR}/graphics/png
+IMAGEFILTERS_LIB_DEPENDS=	libtiff.so:graphics/tiff \
+				libpng.so:graphics/png
 IMAGEFILTERS_USES=		jpeg
 
 # cups-browsed(8) options
@@ -74,7 +74,7 @@ IMAGEFILTERS_USES=		jpeg
 AVAHI_CONFIGURE_ENABLE=		avahi
 AVAHI_CONFIGURE_OFF=		--with-browseremoteprotocols=cups
 AVAHI_CONFIGURE_ON=		--with-browseremoteprotocols="dnssd cups"
-AVAHI_LIB_DEPENDS=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
 AVAHI_SUB_LIST=			AVAHI_DAEMON=avahi_daemon
 AVAHI_SUB_LIST_OFF=		AVAHI_DAEMON=
 
@@ -88,13 +88,13 @@ LDAP_USE=			OPENLDAP=yes
 GS_CONFIGURE_ON=		--with-pdftops=gs
 GS_DESC=			Ghostscript gs(1)
 
-HYBRID_BUILD_DEPENDS=		pdftops:${PORTSDIR}/graphics/poppler-utils
-HYBRID_RUN_DEPENDS=		pdftops:${PORTSDIR}/graphics/poppler-utils
+HYBRID_BUILD_DEPENDS=		pdftops:graphics/poppler-utils
+HYBRID_RUN_DEPENDS=		pdftops:graphics/poppler-utils
 HYBRID_CONFIGURE_ON=		--with-pdftops=hybrid
 HYBRID_DESC=			Ghostscript or Poppler depending on printer
 
-PDFTOPS_BUILD_DEPENDS=		pdftops:${PORTSDIR}/graphics/poppler-utils
-PDFTOPS_RUN_DEPENDS=		pdftops:${PORTSDIR}/graphics/poppler-utils
+PDFTOPS_BUILD_DEPENDS=		pdftops:graphics/poppler-utils
+PDFTOPS_RUN_DEPENDS=		pdftops:graphics/poppler-utils
 PDFTOPS_CONFIGURE_ON=		--with-pdftops=pdftops
 PDFTOPS_DESC=			Poppler pdftops(1)
 
diff --git a/print/cups-fxlinuxprint/Makefile b/print/cups-fxlinuxprint/Makefile
index a00d1f62f362..6e8935e2fb61 100644
--- a/print/cups-fxlinuxprint/Makefile
+++ b/print/cups-fxlinuxprint/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fuji Xerox Printer Driver
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS=	libcups.so:print/cups
 
 USES=		dos2unix ghostscript:run
 DOS2UNIX_FILES=	fxlinuxprint.ppd
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index 8f817204464a..d07b172b9e62 100644
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Virtual printer for CUPS to produce PDF files
 LICENSE=GPLv2
 LICENSE_FILE=${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups
+RUN_DEPENDS=	${LOCALBASE}/sbin/cupsd:print/cups
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index e5ac4defaa8c..99c40e985aba 100644
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Helper that makes system-config-printer use PolicyKit
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libcups.so:print/cups \
+		libpolkit-gobject-1.so:sysutils/polkit
 
 USE_GNOME=	glib20 intltool
 USES=		cpe gettext gmake pkgconfig tar:xz
diff --git a/print/cups-smb-backend/Makefile b/print/cups-smb-backend/Makefile
index 167c9aef47c7..ca688f85e8f8 100644
--- a/print/cups-smb-backend/Makefile
+++ b/print/cups-smb-backend/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CUPS backend for printing to Windows servers
 
-RUN_DEPENDS=	smbspool:${PORTSDIR}/net/${SAMBA_PORT} \
-		${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups
+RUN_DEPENDS=	smbspool:net/${SAMBA_PORT} \
+		${LOCALBASE}/sbin/cupsd:print/cups
 
 NO_BUILD=	yes
 PLIST_FILES=	libexec/cups/backend/smb
diff --git a/print/cups/Makefile b/print/cups/Makefile
index bbc641da89b5..328526529c11 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -51,28 +51,28 @@ OPTIONS_DEFINE=		AVAHI DBUS DOCS GNUTLS IPPTOOL LIBPAPER NLS X11
 OPTIONS_DEFAULT=	AVAHI DBUS GNUTLS LIBPAPER
 OPTIONS_SUB=		yes
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 AVAHI_SUB_LIST=		AVAHI_DAEMON=avahi_daemon
 AVAHI_SUB_LIST_OFF=	AVAHI_DAEMON=
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_ENABLE=	dbus
 DBUS_SUB_LIST=		DBUS_DAEMON=dbus
 DBUS_SUB_LIST_OFF=	DBUS_DAEMON=
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--enable-gnutls
 GNUTLS_CONFIGURE_OFF=	--disable-ssl
 
 IPPTOOL_DESC=		Internet Printing Protocol testing tool
 
-LIBPAPER_LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
 LIBPAPER_CONFIGURE_ENABLE=libpaper
 
 X11_DESC=		Install desktop menu item
-X11_BUILD_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
-X11_RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+X11_BUILD_DEPENDS=	xdg-open:devel/xdg-utils
+X11_RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 .if defined(CUPS_OVERWRITE_BASE)
 PLIST_SUB+=	OVERWRITE=""
diff --git a/print/deforaos-pdfviewer/Makefile b/print/deforaos-pdfviewer/Makefile
index 7f1756b609e0..ed229a80669f 100644
--- a/print/deforaos-pdfviewer/Makefile
+++ b/print/deforaos-pdfviewer/Makefile
@@ -14,9 +14,9 @@ COMMENT=	DeforaOS desktop PDF viewer
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
-		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop \
+		libpoppler-glib.so:graphics/poppler-glib
 
 MAKE_ARGS+=	PREFIX=${PREFIX}
 USES=		desktop-file-utils pkgconfig
diff --git a/print/dot2tex/Makefile b/print/dot2tex/Makefile
index 71321856fd4f..bc0dcaf9ab9e 100644
--- a/print/dot2tex/Makefile
+++ b/print/dot2tex/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Graphviz to LaTeX converter
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:${PORTSDIR}/devel/py-pyparsing \
-		dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
+		dot:graphics/graphviz
 
 # The .tar.gz sucks!
 USES=		python zip
diff --git a/print/dymo-cups-drivers/Makefile b/print/dymo-cups-drivers/Makefile
index 51d9a8766fe6..7f1f86d6cdc4 100644
--- a/print/dymo-cups-drivers/Makefile
+++ b/print/dymo-cups-drivers/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Open source DYMO CUPS driver
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups
+LIB_DEPENDS=	libcupsimage.so:print/cups
 
 WRKSRC=		${WRKDIR}/dymo-cups-drivers-1.4.0.5
 
diff --git a/print/easylatex/Makefile b/print/easylatex/Makefile
index 8a6621f574b6..a555e1c55e7a 100644
--- a/print/easylatex/Makefile
+++ b/print/easylatex/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Perl script which transforms "pseudo-LaTeX" into proper LaTeX
 
-RUN_DEPENDS=	p5-Getopt-Declare>=0:${PORTSDIR}/devel/p5-Getopt-Declare
+RUN_DEPENDS=	p5-Getopt-Declare>=0:devel/p5-Getopt-Declare
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/print/enscriptfonts/Makefile b/print/enscriptfonts/Makefile
index db86d6433eb9..b8e8514de20d 100644
--- a/print/enscriptfonts/Makefile
+++ b/print/enscriptfonts/Makefile
@@ -20,7 +20,7 @@ NO_BUILD=	YES
 SUB_FILES+=	pkg-message
 
 # user should choose their own version
-#RUN_DEPENDS=	enscript:${PORTSDIR}/print/enscript-letter
+#RUN_DEPENDS=	enscript:print/enscript-letter
 
 do-install:
 	@${MKDIR} -p ${STAGEDIR}${PREFIX}/share/enscript/xenscript
diff --git a/print/epson-inkjet-printer-escpr/Makefile b/print/epson-inkjet-printer-escpr/Makefile
index dda26294e035..1f1449858fbd 100644
--- a/print/epson-inkjet-printer-escpr/Makefile
+++ b/print/epson-inkjet-printer-escpr/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Epson Inkjet Printer Driver (ESC/P-R) for Linux
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups
+LIB_DEPENDS=	libcupsimage.so:print/cups
 
 USES=		autoreconf dos2unix gmake libtool
 USE_LDCONFIG=	yes
diff --git a/print/epsonepl/Makefile b/print/epsonepl/Makefile
index 06bc7e6024b5..a38951346c89 100644
--- a/print/epsonepl/Makefile
+++ b/print/epsonepl/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}ijs-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Printer filter for EPSON EPL-5700L etc
 
-LIB_DEPENDS=	libijs.so:${PORTSDIR}/print/libijs
+LIB_DEPENDS=	libijs.so:print/libijs
 
 USES=		ghostscript:run uidfix tar:tgz
 
diff --git a/print/flpsed/Makefile b/print/flpsed/Makefile
index 2a7d40e683b1..200dda4c470c 100644
--- a/print/flpsed/Makefile
+++ b/print/flpsed/Makefile
@@ -12,7 +12,7 @@ COMMENT=	WYSIWYG Postscript annotator
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS+=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS+=	libfltk.so:x11-toolkits/fltk
 
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils ghostscript:x11 gmake
diff --git a/print/font2svg/Makefile b/print/font2svg/Makefile
index a8b2f2a19a45..a15d17d88d01 100644
--- a/print/font2svg/Makefile
+++ b/print/font2svg/Makefile
@@ -12,7 +12,7 @@ COMMENT=	All fonts to svg-font converter
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		ghostscript:run
 NO_BUILD=	yes
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 6b67a3fc16ac..eef63e336895 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:${PORTSDIR}/devel/uthash \
-		${LOCALBASE}/bin/gnulib-tool:${PORTSDIR}/devel/gnulib
-LIB_DEPENDS=	libuninameslist.so:${PORTSDIR}/textproc/libuninameslist \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libspiro.so:${PORTSDIR}/graphics/libspiro \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libltdl.so:${PORTSDIR}/devel/libltdl
+BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash \
+		${LOCALBASE}/bin/gnulib-tool:devel/gnulib
+LIB_DEPENDS=	libuninameslist.so:textproc/libuninameslist \
+		libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libgif.so:graphics/giflib \
+		libspiro.so:graphics/libspiro \
+		libfreetype.so:print/freetype2 \
+		libltdl.so:devel/libltdl
 
 USE_GITHUB=	yes
 
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index 42fa2b2c0020..61a704b38be1 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Driver for printers that use the ZjStream wire protocol
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
-RUN_DEPENDS=	${LOCALBASE}/share/foomatic/db/oldprinterids:${PORTSDIR}/print/foomatic-db \
-		foomatic-rip:${PORTSDIR}/print/foomatic-filters \
-		gsed:${PORTSDIR}/textproc/gsed
+LIB_DEPENDS=	libcups.so:print/cups
+RUN_DEPENDS=	${LOCALBASE}/share/foomatic/db/oldprinterids:print/foomatic-db \
+		foomatic-rip:print/foomatic-filters \
+		gsed:textproc/gsed
 
 PROJECTHOST=	bsdistfiles
 USES=		ghostscript gmake shebangfix
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index 70737b5ab0f5..16f45b0cf3e0 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Foomatic database engine
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_GNOME=	libxml2
 USES=		gmake perl5
diff --git a/print/foomatic-db-hpijs/Makefile b/print/foomatic-db-hpijs/Makefile
index 68989616efa8..6df4868de623 100644
--- a/print/foomatic-db-hpijs/Makefile
+++ b/print/foomatic-db-hpijs/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Foomatic data for the HPIJS printer drivers
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/share/foomatic/db/oldprinterids:${PORTSDIR}/print/foomatic-db
-RUN_DEPENDS=	${LOCALBASE}/share/foomatic/db/oldprinterids:${PORTSDIR}/print/foomatic-db
+BUILD_DEPENDS=	${LOCALBASE}/share/foomatic/db/oldprinterids:print/foomatic-db
+RUN_DEPENDS=	${LOCALBASE}/share/foomatic/db/oldprinterids:print/foomatic-db
 
 GNU_CONFIGURE=	yes
 USES=		gmake perl5
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index cb6d81cd3eae..b4a8d53c8ec2 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Foomatic wrapper scripts
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 CONFLICTS=	cups-filters-[0-9]*
 
@@ -48,27 +48,27 @@ MPAGE_DESC=		Print multiple pages per sheet of paper
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCUPS_IMAGE}
-RUN_DEPENDS+=	${LOCALBASE}/lib/libcupsimage.so:${PORTSDIR}/print/cups
+RUN_DEPENDS+=	${LOCALBASE}/lib/libcupsimage.so:print/cups
 .endif
 
 .if ${PORT_OPTIONS:MA2PS}
-RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps
+RUN_DEPENDS+=	a2ps:print/a2ps
 .endif
 
 .if ${PORT_OPTIONS:MENSCRIPT_A4}
-RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-a4
+RUN_DEPENDS+=	enscript:print/enscript-a4
 .endif
 
 .if ${PORT_OPTIONS:MENSCRIPT_LETTER}
-RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-letter
+RUN_DEPENDS+=	enscript:print/enscript-letter
 .endif
 
 .if ${PORT_OPTIONS:MENSCRIPT_LETTERDJ}
-RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-letterdj
+RUN_DEPENDS+=	enscript:print/enscript-letterdj
 .endif
 
 .if ${PORT_OPTIONS:MMPAGE}
-RUN_DEPENDS+=	mpage:${PORTSDIR}/print/mpage
+RUN_DEPENDS+=	mpage:print/mpage
 .endif
 
 post-patch:
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index b0cb9a016448..96586c93e932 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -32,7 +32,7 @@ PNG_DESC=		Png compressed OpenType embedded bitmaps support
 
 LCD_FILTERING_CFLAGS=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_OFF=	--without-png
 
 pre-patch:
diff --git a/print/frescobaldi/Makefile b/print/frescobaldi/Makefile
index 9bc2fbba113c..ad8cf1cdc626 100644
--- a/print/frescobaldi/Makefile
+++ b/print/frescobaldi/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Music score editor for lilypond
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	lilypond:${PORTSDIR}/print/lilypond \
-		${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:${PORTSDIR}/graphics/py-poppler-qt4
+RUN_DEPENDS=	lilypond:print/lilypond \
+		${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4
 
 USES=		gettext python
 INSTALLS_ICONS=	yes
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index 7c9d1f322bc6..c45765747b65 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Demo programs for FreeType2
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${FREETYPE_WRKSRC}/config.mk:${PORTSDIR}/print/freetype2:build
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	${FREETYPE_WRKSRC}/config.mk:print/freetype2:build
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		gmake tar:bzip2
 USE_XORG=	x11
diff --git a/print/ghostscript7-base/Makefile b/print/ghostscript7-base/Makefile
index e2f7aae275c0..cfcc584be465 100644
--- a/print/ghostscript7-base/Makefile
+++ b/print/ghostscript7-base/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Ghostscript 7.x PostScript interpreter
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+LIB_DEPENDS=	libpng.so:graphics/png
+RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:print/gsfonts
 
 CONFLICTS_INSTALL= \
 		gambc-[0-9]* \
diff --git a/print/ghostscript7-base/files/Makefile.drivers_post b/print/ghostscript7-base/files/Makefile.drivers_post
index 46742ccbc4a9..7133119260e4 100644
--- a/print/ghostscript7-base/files/Makefile.drivers_post
+++ b/print/ghostscript7-base/files/Makefile.drivers_post
@@ -31,7 +31,7 @@ OPTIONS_UNSET+=	${PORT_OPTIONS:MGS_${D}}
 .endfor
 
 .if defined(_VGA_DEVS)
-LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvga.so:graphics/svgalib
 .endif
 
 .if ${PORT_OPTIONS:MGS_cdj670} || \
diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile
index 3847c1cfbf76..9923d9c846b9 100644
--- a/print/ghostscript7-commfont/Makefile
+++ b/print/ghostscript7-commfont/Makefile
@@ -12,8 +12,8 @@ DISTFILES=	# empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Common files for Ghostscript 7.x CJK font support
 
-BUILD_DEPENDS=	${CMAPDIR}/ac15/cid2code.txt:${PORTSDIR}/print/adobe-cmaps
-RUN_DEPENDS=	${CMAPDIR}/ac15/cid2code.txt:${PORTSDIR}/print/adobe-cmaps
+BUILD_DEPENDS=	${CMAPDIR}/ac15/cid2code.txt:print/adobe-cmaps
+RUN_DEPENDS=	${CMAPDIR}/ac15/cid2code.txt:print/adobe-cmaps
 
 NO_WRKSUBDIR=	yes
 SUB_FILES=	pkg-message \
diff --git a/print/ghostscript7-jpnfont/Makefile b/print/ghostscript7-jpnfont/Makefile
index d5f37a03e2f1..349548927a48 100644
--- a/print/ghostscript7-jpnfont/Makefile
+++ b/print/ghostscript7-jpnfont/Makefile
@@ -10,8 +10,8 @@ PKGNAMESUFFIX=	7-jpnfont
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanese font support for Ghostscript 7.x
 
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light.gs7:${PORTSDIR}/japanese/font-std \
-		${LOCALBASE}/share/ghostscript/Resource/CIDFont/Ryumin-Light:${PORTSDIR}/print/ghostscript7-commfont
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light.gs7:japanese/font-std \
+		${LOCALBASE}/share/ghostscript/Resource/CIDFont/Ryumin-Light:print/ghostscript7-commfont
 
 USES=		metaport ghostscript:7,run
 
diff --git a/print/ghostscript7-korfont/Makefile b/print/ghostscript7-korfont/Makefile
index 3cafc6e9086d..952b10006606 100644
--- a/print/ghostscript7-korfont/Makefile
+++ b/print/ghostscript7-korfont/Makefile
@@ -10,8 +10,8 @@ PKGNAMESUFFIX=	7-korfont
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Korean font support for Ghostscript 7.x
 
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/CIDFont/Munhwa-Regular:${PORTSDIR}/korean/munhwafonts-cid \
-		${LOCALBASE}/share/ghostscript/Resource/CIDFont/HYSMyeongJo-Medium:${PORTSDIR}/print/ghostscript7-commfont
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/CIDFont/Munhwa-Regular:korean/munhwafonts-cid \
+		${LOCALBASE}/share/ghostscript/Resource/CIDFont/HYSMyeongJo-Medium:print/ghostscript7-commfont
 
 USES=		ghostscript:7,run metaport
 
diff --git a/print/ghostscript8-base/Makefile b/print/ghostscript8-base/Makefile
index 25e17f556cfa..8f43eb428f9c 100644
--- a/print/ghostscript8-base/Makefile
+++ b/print/ghostscript8-base/Makefile
@@ -18,14 +18,14 @@ COMMENT=	Ghostscript 8.x PostScript interpreter, base part
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \
-		libpaper.so:${PORTSDIR}/print/libpaper \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libfreetype.so:print/freetype2 \
+		libjasper.so:graphics/jasper \
+		libjbig2dec.so:graphics/jbig2dec \
+		libpaper.so:print/libpaper \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
+RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:print/gsfonts
 
 CONFLICTS_INSTALL= \
 		gambc-[0-9]* \
@@ -75,7 +75,7 @@ OPTIONS_DEFINE=	DOCS CAIRO CUPS FONTCONFIG ICONV
 OPTIONS_DEFAULT=DOCS CAIRO CUPS FONTCONFIG ICONV
 OPTIONS_SUB=	yes
 FONTCONFIG_DESC=Enable fontconfig support
-FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_ENABLE=	fontconfig
 NO_OPTIONS_SORT=yes
 
diff --git a/print/ghostscript8-base/files/Makefile.drivers_post b/print/ghostscript8-base/files/Makefile.drivers_post
index 6f44682dcc6b..02c9ad22425d 100644
--- a/print/ghostscript8-base/files/Makefile.drivers_post
+++ b/print/ghostscript8-base/files/Makefile.drivers_post
@@ -40,7 +40,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endfor
 
 .if defined(_CUPS_DEVS)
-LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=	libcupsimage.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
@@ -61,7 +61,7 @@ OPTIONS_UNSET+=	${PORT_OPTIONS:MGS_${D}}
 .endfor
 
 .if defined(_VGA_DEVS)
-LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvga.so:graphics/svgalib
 .endif
 
 # iconv specific
@@ -93,7 +93,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endfor
 
 .if defined(_CAIRO_DEVS)
-LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	libcairo.so:graphics/cairo
 CONFIGURE_ARGS+=	--enable-cairo
 .else
 CONFIGURE_ARGS+=	--disable-cairo
diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile
index 0b3ddcdb1491..f7c68617b48c 100644
--- a/print/ghostscript9-agpl-base/Makefile
+++ b/print/ghostscript9-agpl-base/Makefile
@@ -18,15 +18,15 @@ COMMENT=	Ghostscript 9.x PostScript interpreter, base part
 
 LICENSE=	AGPLv3
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libpaper.so:${PORTSDIR}/print/libpaper \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libfreetype.so:print/freetype2 \
+		libidn.so:dns/libidn \
+		libjbig2dec.so:graphics/jbig2dec \
+		liblcms2.so:graphics/lcms2 \
+		libpaper.so:print/libpaper \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
+RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:print/gsfonts
 
 CONFLICTS_INSTALL= \
 		gambc-[0-9]* \
@@ -75,7 +75,7 @@ OPTIONS_DEFINE=	DOCS CUPS FONTCONFIG ICONV
 OPTIONS_DEFAULT=DOCS CUPS FONTCONFIG ICONV
 OPTIONS_SUB=	yes
 FONTCONFIG_DESC=Enable fontconfig support
-FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_ENABLE=	fontconfig
 NO_OPTIONS_SORT=yes
 
diff --git a/print/ghostscript9-agpl-base/files/Makefile.drivers_post b/print/ghostscript9-agpl-base/files/Makefile.drivers_post
index e02dc786adb0..ab2a2fbedcc5 100644
--- a/print/ghostscript9-agpl-base/files/Makefile.drivers_post
+++ b/print/ghostscript9-agpl-base/files/Makefile.drivers_post
@@ -41,7 +41,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endfor
 
 .if defined(_CUPS_DEVS)
-LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=	libcupsimage.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
@@ -62,7 +62,7 @@ OPTIONS_UNSET+=	${PORT_OPTIONS:MGS_${D}}
 .endfor
 
 .if defined(_VGA_DEVS)
-LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvga.so:graphics/svgalib
 .endif
 
 # iconv specific
diff --git a/print/ghostscript9-base/Makefile b/print/ghostscript9-base/Makefile
index f505f8c3e5cb..de31d85d7088 100644
--- a/print/ghostscript9-base/Makefile
+++ b/print/ghostscript9-base/Makefile
@@ -17,15 +17,15 @@ COMMENT=	Ghostscript 9.x PostScript interpreter, base part
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libpaper.so:${PORTSDIR}/print/libpaper \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libfreetype.so:print/freetype2 \
+		libidn.so:dns/libidn \
+		libjbig2dec.so:graphics/jbig2dec \
+		liblcms2.so:graphics/lcms2 \
+		libpaper.so:print/libpaper \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
+RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:print/gsfonts
 
 CONFLICTS_INSTALL= \
 		gambc-[0-9]* \
@@ -76,7 +76,7 @@ OPTIONS_DEFINE=	DOCS CUPS FONTCONFIG ICONV
 OPTIONS_DEFAULT=DOCS CUPS FONTCONFIG ICONV
 OPTIONS_SUB=	yes
 FONTCONFIG_DESC=Enable fontconfig support
-FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_ENABLE=	fontconfig
 NO_OPTIONS_SORT=yes
 
diff --git a/print/ghostscript9-base/files/Makefile.drivers_post b/print/ghostscript9-base/files/Makefile.drivers_post
index 63c98d11afdc..b2b01388b689 100644
--- a/print/ghostscript9-base/files/Makefile.drivers_post
+++ b/print/ghostscript9-base/files/Makefile.drivers_post
@@ -40,7 +40,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endfor
 
 .if defined(_CUPS_DEVS)
-LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=	libcupsimage.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
@@ -61,7 +61,7 @@ OPTIONS_UNSET+=	${PORT_OPTIONS:MGS_${D}}
 .endfor
 
 .if defined(_VGA_DEVS)
-LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvga.so:graphics/svgalib
 .endif
 
 # iconv specific
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index d9ff17a2829c..668bb662a593 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Administration tool for cups
 
-LIB_DEPENDS=	libgnomecups-1.0.so:${PORTSDIR}/print/libgnomecups
-RUN_DEPENDS=	gnomesu:${PORTSDIR}/security/libgnomesu
+LIB_DEPENDS=	libgnomecups-1.0.so:print/libgnomecups
+RUN_DEPENDS=	gnomesu:security/libgnomesu
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix intlhack libgnomeprintui libgnomeui
diff --git a/print/gsview/Makefile b/print/gsview/Makefile
index 0218179f7492..ad9571df8d21 100644
--- a/print/gsview/Makefile
+++ b/print/gsview/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME=	Aladdin Free Public Licence
 LICENSE_FILE=	${WRKSRC}/LICENCE
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-RUN_DEPENDS+=	epstool:${PORTSDIR}/graphics/epstool \
-		pstotext:${PORTSDIR}/print/pstotext
+RUN_DEPENDS+=	epstool:graphics/epstool \
+		pstotext:print/pstotext
 
 USES=		cpe ghostscript
 USE_GNOME=	gtk12
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 538aeb17e603..88ce4af3f9f3 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GTK interface to cups
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS=	libcups.so:print/cups
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index d2b7c13eba1f..c509199e4596 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
 .endif
 
 GTK2_CONFIGURE_ENABLE=	libgutenprintui2
-GTK2_LIB_DEPENDS=	libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
+GTK2_LIB_DEPENDS=	libgtk-x11-2.0.so:x11-toolkits/gtk20
 
 .include <bsd.port.options.mk>
 
@@ -39,13 +39,13 @@ INSTALL_TARGET=	install-strip
 .include <bsd.port.pre.mk>
 
 .if ${SLAVE_PORT}=="yes"
-LIB_DEPENDS+=	libgutenprint.so:${PORTSDIR}/print/gutenprint-base
+LIB_DEPENDS+=	libgutenprint.so:print/gutenprint-base
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2`
 .endif
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
-LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS+=	libgimp-2.0.so:graphics/gimp-app
 CONFIGURE_ARGS+=--with-gimp2=yes # Override CONFIGURE_ARGS
 BUILD_WRKSRC=	${WRKSRC}/src/gimp2
 INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
@@ -56,8 +56,8 @@ INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
 PLIST_FILES+=	libexec/cups/backend/gutenprint52+usb \
 		share/cups/usb/net.sf.gimp-print.usb-quirks
 .endif
-LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups
-RUN_DEPENDS+=	${LOCALBASE}/libexec/cups/filter/gstoraster:${PORTSDIR}/print/cups-filters
+LIB_DEPENDS+=	libcupsimage.so:print/cups
+RUN_DEPENDS+=	${LOCALBASE}/libexec/cups/filter/gstoraster:print/cups-filters
 CONFIGURE_ARGS+=	--with-cups=${PREFIX} \
 			--enable-cups-ppds \
 			--enable-cups-level3-ppds
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--without-cups
 .endif
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="ijs"
-LIB_DEPENDS+=	libijs.so:${PORTSDIR}/print/libijs
+LIB_DEPENDS+=	libijs.so:print/libijs
 CONFIGURE_ARGS+=--with-ijs=yes
 BUILD_WRKSRC=	${WRKSRC}/src/ghost
 INSTALL_WRKSRC=	${WRKSRC}/src/ghost
@@ -77,9 +77,9 @@ CONFIGURE_ARGS+=--without-ghostscript
 .endif
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="foomatic"
-BUILD_DEPENDS+=	foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine
-RUN_DEPENDS+=	foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine \
-		${LOCALBASE}/share/cups/model/foomatic-db-ppds:${PORTSDIR}/print/foomatic-db
+BUILD_DEPENDS+=	foomatic-combo-xml:print/foomatic-db-engine
+RUN_DEPENDS+=	foomatic-combo-xml:print/foomatic-db-engine \
+		${LOCALBASE}/share/cups/model/foomatic-db-ppds:print/foomatic-db
 CONFIGURE_ARGS+=--with-foomatic=yes --with-foomatic3=yes
 BUILD_WRKSRC=	${WRKSRC}/src/foomatic
 INSTALL_WRKSRC=	${WRKSRC}/src/foomatic
diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index bda1c1ac6194..092c8e7db6e2 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	print
 MAINTAINER=	cmt@burggraben.net
 COMMENT=	The "meta-port" for GutenPrint
 
-RUN_DEPENDS=	gutenprint-base>0:${PORTSDIR}/print/gutenprint-base
+RUN_DEPENDS=	gutenprint-base>0:print/gutenprint-base
 
 USES=		metaport
 
@@ -19,9 +19,9 @@ CUPS_DESC=		GutenPrint (gimp-print) Cups Drivers
 GIMP_DESC=		GIMP Gutenprint printing plugin
 IJS_DESC=		IJS GhostScript Drivers
 FOOMATIC_DESC=		Foomatic data files
-CUPS_RUN_DEPENDS=	gutenprint-cups>0:${PORTSDIR}/print/gutenprint-cups
-GIMP_RUN_DEPENDS=	gimp-gutenprint>0:${PORTSDIR}/print/gimp-gutenprint
-IJS_RUN_DEPENDS=	gutenprint-ijs>0:${PORTSDIR}/print/gutenprint-ijs
-FOOMATIC_RUN_DEPENDS+=	gutenprint-foomatic>0:${PORTSDIR}/print/gutenprint-foomatic
+CUPS_RUN_DEPENDS=	gutenprint-cups>0:print/gutenprint-cups
+GIMP_RUN_DEPENDS=	gimp-gutenprint>0:print/gimp-gutenprint
+IJS_RUN_DEPENDS=	gutenprint-ijs>0:print/gutenprint-ijs
+FOOMATIC_RUN_DEPENDS+=	gutenprint-foomatic>0:print/gutenprint-foomatic
 
 .include <bsd.port.mk>
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 746cc8540f8c..e2649b5a8a06 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNU/${PORTNAME}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	PostScript and PDF previewer
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 USE_XORG=	xpm ice sm xext xmu x11
 USES=		cpe ghostscript:x11 iconv gmake perl5 shebangfix
diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile
index fe66b5971702..92707a5b961c 100644
--- a/print/harfbuzz/Makefile
+++ b/print/harfbuzz/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	OpenType text shaping engine
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libicudata.so:${PORTSDIR}/devel/icu \
-		libgraphite2.so:${PORTSDIR}/graphics/graphite2
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libicudata.so:devel/icu \
+		libgraphite2.so:graphics/graphite2
 
 USE_LDCONFIG=	yes
 USES=		gmake libtool pathfix pkgconfig tar:bzip2
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index ff85a1e2778b..f32ad2acd3d1 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -12,8 +12,8 @@ COMMENT=	HPGL to vector and raster formats converter and previewer for X11
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 WRKSRC_SUBDIR=	sources
 
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 27c48d5d1884..c53a23c33884 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	CUPS DOCS
 OPTIONS_DEFAULT=CUPS
 OPTIONS_SUB=	yes
 
-CUPS_RUN_DEPENDS=	foomatic-rip:${PORTSDIR}/print/cups-filters
+CUPS_RUN_DEPENDS=	foomatic-rip:print/cups-filters
 CUPS_USES_OFF=		ghostscript:run perl5
 
 post-patch:
diff --git a/print/hplip-plugin/Makefile b/print/hplip-plugin/Makefile
index 4820a634c6d5..73ef6e521d5c 100644
--- a/print/hplip-plugin/Makefile
+++ b/print/hplip-plugin/Makefile
@@ -17,7 +17,7 @@ LICENSE_NAME=	HPLIP Driver Plug-in License
 LICENSE_PERMS=	none
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-RUN_DEPENDS=	hp-plugin:${PORTSDIR}/print/hplip
+RUN_DEPENDS=	hp-plugin:print/hplip
 
 RESTRICTED=	License agreement is required
 
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index cbd6ce4a8845..716bc8579073 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Drivers and utilities for HP Printers and All-in-One devices
 
-LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups \
-		libdbus-1.so:${PORTSDIR}/devel/dbus
-RUN_DEPENDS=	${LOCALBASE}/libexec/cups/filter/gstoraster:${PORTSDIR}/print/cups-filters \
-		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+LIB_DEPENDS=	libcupsimage.so:print/cups \
+		libdbus-1.so:devel/dbus
+RUN_DEPENDS=	${LOCALBASE}/libexec/cups/filter/gstoraster:print/cups-filters \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
 
 CONFLICTS_INSTALL=	hpijs-[0-9]*
 
@@ -67,27 +67,27 @@ OPTIONS_DEFAULT=SNMP SCAN X11
 OPTIONS_SUB=	yes # FAX SCAN X11
 
 FAX_DESC=	PC Send Fax support
-FAX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2
+FAX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:print/py-reportlab2
 FAX_CONFIGURE_ENABLE=	fax-build
 
 SNMP_DESC=	Network/JetDirect support
 SNMP_USE=	OPENSSL=yes
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ENABLE=	network-build
 
 SCAN_DESC=	Scanning support
-SCAN_LIB_DEPENDS=	libsane.so:${PORTSDIR}/graphics/sane-backends
-SCAN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+SCAN_LIB_DEPENDS=	libsane.so:graphics/sane-backends
+SCAN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 SCAN_CONFIGURE_ENABLE=	scan-build
 
 X11_DESC=	Graphical User Interface (Qt 4)
-X11_RUN_DEPENDS=${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbussupport
+X11_RUN_DEPENDS=${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:devel/py-qt4-dbussupport
 X11_CONFIGURE_ENABLE=	qt4 gui-build
 
 XSANE_DESC=	Install XSane for scanning (requires SCAN)
 XSANE_IMPLIES=	SCAN
-XSANE_RUN_DEPENDS=	xsane:${PORTSDIR}/graphics/xsane
+XSANE_RUN_DEPENDS=	xsane:graphics/xsane
 
 DOCS_CONFIGURE_ENABLE=	doc-build
 
diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index 51f94e82a5cc..f0832e2419eb 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -15,10 +15,10 @@ COMMENT=	HTML to PostScript converter
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	mogrify:${PORTSDIR}/graphics/ImageMagick \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		weblint++:${PORTSDIR}/www/weblint++ \
-		paperconf:${PORTSDIR}/print/libpaper
+RUN_DEPENDS=	mogrify:graphics/ImageMagick \
+		p5-libwww>=0:www/p5-libwww \
+		weblint++:www/weblint++ \
+		paperconf:print/libpaper
 
 NO_BUILD=	yes
 USES=		ghostscript:run perl5
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index 22ce5a0c1afa..897198fb1e60 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce HTML and printed documents from LaTeX source
 
-RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	ppmtogif:graphics/netpbm
 
 USE_TEX=	latex
 USE_EMACS=	yes
diff --git a/print/kde4-print-manager/Makefile b/print/kde4-print-manager/Makefile
index f9d212437f48..d9cb799864eb 100644
--- a/print/kde4-print-manager/Makefile
+++ b/print/kde4-print-manager/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Printer manager for KDE 4
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS=	libcups.so:print/cups
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	kdelibs kdeprefix automoc4
diff --git a/print/kover/Makefile b/print/kover/Makefile
index 49b48491727d..89f28525fa9f 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -13,8 +13,8 @@ COMMENT=	WYSIWYG CD cover printer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb \
-		libcdio.so:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS=	libcddb.so:audio/libcddb \
+		libcdio.so:sysutils/libcdio
 
 USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT4=	corelib dbus gui network svg xml \
diff --git a/print/kpdftool/Makefile b/print/kpdftool/Makefile
index 2bfb01b3ed69..d75ec9b0c294 100644
--- a/print/kpdftool/Makefile
+++ b/print/kpdftool/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	33194-${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Simple utility to manipulate PS and PDF files
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 USE_QT4=	qt3support moc_build porting_build uic3_build
 USES=		ghostscript:run qmake zip
diff --git a/print/latex-biber/Makefile b/print/latex-biber/Makefile
index ea8160f1f0bb..86b30aa57b33 100644
--- a/print/latex-biber/Makefile
+++ b/print/latex-biber/Makefile
@@ -15,34 +15,34 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 __DEPENDS= \
-	ja-p5-Encode-EUCJPASCII>0:${PORTSDIR}/japanese/p5-Encode-EUCJPASCII \
-	p5-Business-ISBN>0:${PORTSDIR}/misc/p5-Business-ISBN \
-	p5-Business-ISMN>0:${PORTSDIR}/misc/p5-Business-ISMN \
-	p5-Business-ISSN>0:${PORTSDIR}/misc/p5-Business-ISSN \
-	p5-Config-AutoConf>0:${PORTSDIR}/devel/p5-Config-AutoConf \
-	p5-Data-Compare>0:${PORTSDIR}/devel/p5-Data-Compare \
-	p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
-	p5-Date-Simple>0:${PORTSDIR}/devel/p5-Date-Simple \
-	p5-Encode-HanExtra>0:${PORTSDIR}/chinese/p5-Encode-HanExtra \
-	p5-Encode-JIS2K>0:${PORTSDIR}/converters/p5-Encode-JIS2K \
-	p5-ExtUtils-LibBuilder>0:${PORTSDIR}/devel/p5-ExtUtils-LibBuilder \
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-IPC-Cmd>0:${PORTSDIR}/devel/p5-IPC-Cmd \
-	p5-IPC-Run3>0:${PORTSDIR}/devel/p5-IPC-Run3 \
-	p5-List-AllUtils>0:${PORTSDIR}/devel/p5-List-AllUtils \
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl \
-	p5-Module-Build>=0.4206:${PORTSDIR}/devel/p5-Module-Build \
-	p5-Mozilla-CA>0:${PORTSDIR}/www/p5-Mozilla-CA \
-	p5-Regexp-Common>0:${PORTSDIR}/textproc/p5-Regexp-Common \
-	p5-Text-BibTeX>0:${PORTSDIR}/textproc/p5-Text-BibTeX \
-	p5-Text-Roman>0:${PORTSDIR}/textproc/p5-Text-Roman \
-	p5-Unicode-Collate>0:${PORTSDIR}/textproc/p5-Unicode-Collate \
-	p5-Unicode-LineBreak>0:${PORTSDIR}/textproc/p5-Unicode-LineBreak \
-	p5-XML-LibXML-Simple>0:${PORTSDIR}/textproc/p5-XML-LibXML-Simple \
-	p5-XML-LibXSLT>0:${PORTSDIR}/textproc/p5-XML-LibXSLT \
-	p5-XML-Writer>0:${PORTSDIR}/textproc/p5-XML-Writer \
-	p5-autovivification>0:${PORTSDIR}/devel/p5-autovivification
+	ja-p5-Encode-EUCJPASCII>0:japanese/p5-Encode-EUCJPASCII \
+	p5-Business-ISBN>0:misc/p5-Business-ISBN \
+	p5-Business-ISMN>0:misc/p5-Business-ISMN \
+	p5-Business-ISSN>0:misc/p5-Business-ISSN \
+	p5-Config-AutoConf>0:devel/p5-Config-AutoConf \
+	p5-Data-Compare>0:devel/p5-Data-Compare \
+	p5-Data-Dump>0:devel/p5-Data-Dump \
+	p5-Date-Simple>0:devel/p5-Date-Simple \
+	p5-Encode-HanExtra>0:chinese/p5-Encode-HanExtra \
+	p5-Encode-JIS2K>0:converters/p5-Encode-JIS2K \
+	p5-ExtUtils-LibBuilder>0:devel/p5-ExtUtils-LibBuilder \
+	p5-File-Slurp>0:devel/p5-File-Slurp \
+	p5-IPC-Cmd>0:devel/p5-IPC-Cmd \
+	p5-IPC-Run3>0:devel/p5-IPC-Run3 \
+	p5-List-AllUtils>0:devel/p5-List-AllUtils \
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-Log-Log4perl>0:devel/p5-Log-Log4perl \
+	p5-Module-Build>=0.4206:devel/p5-Module-Build \
+	p5-Mozilla-CA>0:www/p5-Mozilla-CA \
+	p5-Regexp-Common>0:textproc/p5-Regexp-Common \
+	p5-Text-BibTeX>0:textproc/p5-Text-BibTeX \
+	p5-Text-Roman>0:textproc/p5-Text-Roman \
+	p5-Unicode-Collate>0:textproc/p5-Unicode-Collate \
+	p5-Unicode-LineBreak>0:textproc/p5-Unicode-LineBreak \
+	p5-XML-LibXML-Simple>0:textproc/p5-XML-LibXML-Simple \
+	p5-XML-LibXSLT>0:textproc/p5-XML-LibXSLT \
+	p5-XML-Writer>0:textproc/p5-XML-Writer \
+	p5-autovivification>0:devel/p5-autovivification
 BUILD_DEPENDS=	${__DEPENDS}
 RUN_DEPENDS=	${__DEPENDS}
 
diff --git a/print/latex2rtf/Makefile b/print/latex2rtf/Makefile
index f371a909dcc7..a7a9e7a5f3f8 100644
--- a/print/latex2rtf/Makefile
+++ b/print/latex2rtf/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE= LATEX2PNG
 LATEX2PNG_DESC= Install latex2png utility
 OPTIONS_SUB=    yes
 
-LATEX2PNG_RUN_DEPENDS=  convert:${PORTSDIR}/graphics/ImageMagick
+LATEX2PNG_RUN_DEPENDS=  convert:graphics/ImageMagick
 
 MAKE_ARGS+=	MANDIR=${PREFIX}/man/man1 CFGDIR=${DATADIR}/cfg \
 		BINDIR=${PREFIX}/bin
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 9727a1a415ce..424ec38c3293 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Support library for gnome cups administration
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS=	libcups.so:print/cups
 
 USES=		pkgconfig pathfix gettext gmake libtool:keepla tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index ffddaaf0977f..d0abac45c9dc 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -16,7 +16,7 @@ USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 
 GNU_CONFIGURE=	yes
 USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig
@@ -35,7 +35,7 @@ OPTIONS_DEFAULT=CUPS
 
 .if ${PORT_OPTIONS:MCUPS}
 CONFIGURE_ARGS+=	--with-cups
-LIB_DEPENDS+=		libgnomecups-1.0.so:${PORTSDIR}/print/libgnomecups
+LIB_DEPENDS+=		libgnomecups-1.0.so:print/libgnomecups
 PLIST_SUB+=		CUPS:=""
 .else
 CONFIGURE_ARGS+=	--without-cups
diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index 61189f744ef3..4eaae08666d5 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ bindings for the GNOME print support library
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix libgnomeprint
diff --git a/print/libharu/Makefile b/print/libharu/Makefile
index 2aa51fa4c883..f2b8657d4a70 100644
--- a/print/libharu/Makefile
+++ b/print/libharu/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	print
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Haru Free PDF Library
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/print/libmspub01/Makefile b/print/libmspub01/Makefile
index c2ce77ed399a..6ad508501d35 100644
--- a/print/libmspub01/Makefile
+++ b/print/libmspub01/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Library and tools for parsing Microsoft Publisher file format
 LICENSE=	LGPL21 MPL GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/ptr_container/ptr_map.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu \
-		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/ptr_container/ptr_map.hpp:devel/boost-libs
+LIB_DEPENDS=	libicui18n.so:devel/icu \
+		librevenge-0.0.so:textproc/librevenge
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index b24872476190..58afd1eafe3f 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SAVANNAH/m17n
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Library for handling OpenType fonts
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		pathfix pkgconfig libtool:keepla
 USE_XORG=	x11 xt xaw xmu
diff --git a/print/libpagemaker/Makefile b/print/libpagemaker/Makefile
index c7b9b7107b6d..6182fe8aee19 100644
--- a/print/libpagemaker/Makefile
+++ b/print/libpagemaker/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Library and tools for parsing Aldus/Adobe PageMaker documents
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:devel/boost-libs
+LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 169a98cd2d57..424984cf147e 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -13,23 +13,23 @@ COMMENT=	GNU music typesetter
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	pdftexi2dvi:${PORTSDIR}/print/texinfo \
-		t1ascii:${PORTSDIR}/print/t1utils \
-		bash:${PORTSDIR}/shells/bash \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		dblatex:${PORTSDIR}/textproc/dblatex \
-		fontforge:${PORTSDIR}/print/fontforge \
-		help2man:${PORTSDIR}/misc/help2man \
-		pngtopnm:${PORTSDIR}/graphics/netpbm \
-		rsync:${PORTSDIR}/net/rsync \
-		texi2html:${PORTSDIR}/textproc/texi2html \
-		zip:${PORTSDIR}/archivers/zip \
-		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts
-RUN_DEPENDS=	mftrace:${PORTSDIR}/print/mftrace \
-		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	pdftexi2dvi:print/texinfo \
+		t1ascii:print/t1utils \
+		bash:shells/bash \
+		convert:graphics/ImageMagick \
+		dblatex:textproc/dblatex \
+		fontforge:print/fontforge \
+		help2man:misc/help2man \
+		pngtopnm:graphics/netpbm \
+		rsync:net/rsync \
+		texi2html:textproc/texi2html \
+		zip:archivers/zip \
+		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:print/gsfonts
+RUN_DEPENDS=	mftrace:print/mftrace \
+		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
+LIB_DEPENDS=	libguile.so:lang/guile \
+		libgmp.so:math/gmp \
+		libfreetype.so:print/freetype2
 
 BROKEN_FreeBSD_9=	does not build on FreeBSD < 10.x
 
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 430b4229ca04..26944c776fbf 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -14,25 +14,25 @@ LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	NLS
 
-BUILD_DEPENDS=	pdftexi2dvi:${PORTSDIR}/print/texinfo \
-		t1ascii:${PORTSDIR}/print/t1utils \
-		bash:${PORTSDIR}/shells/bash \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		dblatex:${PORTSDIR}/textproc/dblatex \
-		fontforge:${PORTSDIR}/print/fontforge \
-		help2man:${PORTSDIR}/misc/help2man \
-		pngtopnm:${PORTSDIR}/graphics/netpbm \
-		rsync:${PORTSDIR}/net/rsync \
-		zip:${PORTSDIR}/archivers/zip \
-		texi2html:${PORTSDIR}/textproc/texi2html \
-		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts
-
-RUN_DEPENDS=	mftrace:${PORTSDIR}/print/mftrace \
-		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu
-
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	pdftexi2dvi:print/texinfo \
+		t1ascii:print/t1utils \
+		bash:shells/bash \
+		convert:graphics/ImageMagick \
+		dblatex:textproc/dblatex \
+		fontforge:print/fontforge \
+		help2man:misc/help2man \
+		pngtopnm:graphics/netpbm \
+		rsync:net/rsync \
+		zip:archivers/zip \
+		texi2html:textproc/texi2html \
+		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:print/gsfonts
+
+RUN_DEPENDS=	mftrace:print/mftrace \
+		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
+
+LIB_DEPENDS=	libguile.so:lang/guile \
+		libgmp.so:math/gmp \
+		libfreetype.so:print/freetype2
 
 INFO=		internals \
 		lilypond-changes \
diff --git a/print/lpr-wrapper/Makefile b/print/lpr-wrapper/Makefile
index a7209e95d843..abdfd8862791 100644
--- a/print/lpr-wrapper/Makefile
+++ b/print/lpr-wrapper/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	http://www.mathstat.dal.ca/~selinger/lpr-wrapper/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	User level printer frontend
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		ppdfilt:${PORTSDIR}/print/libppd \
-		psdim:${PORTSDIR}/print/psdim \
-		mpage:${PORTSDIR}/print/mpage \
-		pstops:${PORTSDIR}/print/psutils
+RUN_DEPENDS=	bash:shells/bash \
+		ppdfilt:print/libppd \
+		psdim:print/psdim \
+		mpage:print/mpage \
+		pstops:print/psutils
 
 USES=		ghostscript:run shebangfix
 SHEBANG_FILES=	lpr-wrapper.in lpr-wrapper-cups.in lpr-wrapper-features
diff --git a/print/lprps/Makefile b/print/lprps/Makefile
index e4594c8676be..944b7136ca6f 100644
--- a/print/lprps/Makefile
+++ b/print/lprps/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	PostScript printer filter supporting a bidirectional serial channel
 
-LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIB_DEPENDS=	libpaper.so:print/libpaper
 
 PORTDOCS=	INSTALL
 
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 3adef479f8ba..a0c44d26425a 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libmythes-1.2.so:${PORTSDIR}/textproc/mythes
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
+		libmythes-1.2.so:textproc/mythes
 
 MAJOR_VERSION=	2.1
 MINOR_VERSION=	4
@@ -36,11 +36,11 @@ OPTIONS_SUB=		yes
 ENCHANT_DESC=		Spell checking using Enchant
 
 ASPELL_CONFIGURE_OFF=	--without-aspell
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ENCHANT_CONFIGURE_OFF=	--without-enchant
-ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 HUNSPELL_CONFIGURE_OFF=	--without-hunspell
-HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext
 
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index cc6e875dcc91..1d842444a4d9 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 
 .if exists(${LOCALBASE}/lib/libmagic.so)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libmagic.so:${PORTSDIR}/sysutils/file
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libmagic.so:sysutils/file
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 .endif
 
diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile
index f1bd238cedb3..36219cdeb615 100644
--- a/print/mftrace/Makefile
+++ b/print/mftrace/Makefile
@@ -11,15 +11,15 @@ MASTER_SITES=	http://lilypond.org/download/sources/mftrace/ \
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Scalable PostScript (Type1) Fonts for MetaFont
 
-RUN_DEPENDS=	t1asm:${PORTSDIR}/print/t1utils \
-		fontforge:${PORTSDIR}/print/fontforge
+RUN_DEPENDS=	t1asm:print/t1utils \
+		fontforge:print/fontforge
 
 .if defined(WITH_AUTOTRACE)
-BUILD_DEPENDS+=	autotrace:${PORTSDIR}/graphics/autotrace
-RUN_DEPENDS+=	autotrace:${PORTSDIR}/graphics/autotrace
+BUILD_DEPENDS+=	autotrace:graphics/autotrace
+RUN_DEPENDS+=	autotrace:graphics/autotrace
 .else
-BUILD_DEPENDS+=	potrace:${PORTSDIR}/graphics/potrace
-RUN_DEPENDS+=	potrace:${PORTSDIR}/graphics/potrace
+BUILD_DEPENDS+=	potrace:graphics/potrace
+RUN_DEPENDS+=	potrace:graphics/potrace
 .endif
 
 # Python3 ready
diff --git a/print/musixtex/Makefile b/print/musixtex/Makefile
index d3a6117bdaa5..ba91e1dc2588 100644
--- a/print/musixtex/Makefile
+++ b/print/musixtex/Makefile
@@ -12,8 +12,8 @@ DISTFILES=	musixtex-${PORTVERSION}.tar.gz \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of TeX macros to typeset music
 
-BUILD_DEPENDS=	initex:${PORTSDIR}/print/tex
-RUN_DEPENDS=	initex:${PORTSDIR}/print/tex
+BUILD_DEPENDS=	initex:print/tex
+RUN_DEPENDS=	initex:print/tex
 
 EXAMPLE_VERSION=	T112
 
diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index 0b693e5b7a7f..047f6b8de71e 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Utility to print mail for most any mail client
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	docbook2pdf:${PORTSDIR}/textproc/docbook-utils \
-		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
-RUN_DEPENDS=	psnup:${PORTSDIR}/print/psutils \
-		uncompface:${PORTSDIR}/mail/faces \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
+BUILD_DEPENDS=	docbook2pdf:textproc/docbook-utils \
+		docbook-sgml>0:textproc/docbook-sgml
+RUN_DEPENDS=	psnup:print/psutils \
+		uncompface:mail/faces \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Text-Iconv>=0:converters/p5-Text-Iconv
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake perl5
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=		CUPS X11
 OPTIONS_DEFAULT=	X11
 X11_DESC=		graphics/ImageMagick[-nox11] dependency
 
-CUPS_RUN_DEPENDS=	lpr-cups:${PORTSDIR}/print/cups
+CUPS_RUN_DEPENDS=	lpr-cups:print/cups
 
 .if !defined(PAPERSIZE)
 PAPERSIZE=	letter
@@ -45,9 +45,9 @@ PRINT_COMMAND=lpr -P$$PRINTER
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .else
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick-nox11
+RUN_DEPENDS+=	convert:graphics/ImageMagick-nox11
 .endif
 
 pre-everything::
diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile
index 4060fda3c92d..edf46ebbd74a 100644
--- a/print/openprinting/Makefile
+++ b/print/openprinting/Makefile
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=--without-apache
 .endif
 
 .if defined(WITH_PSM_CUPS)
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=	libcups.so:print/cups
 CONFIGURE_ARGS+=--with-cups=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-cups
diff --git a/print/p5-Font-FreeType/Makefile b/print/p5-Font-FreeType/Makefile
index aa007ae098e8..a37e2daf078f 100644
--- a/print/p5-Font-FreeType/Makefile
+++ b/print/p5-Font-FreeType/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to read font files and render glyphs using FreeType2
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		pkgconfig perl5
 USE_PERL5=	configure
diff --git a/print/p5-Net-CUPS/Makefile b/print/p5-Net-CUPS/Makefile
index 44d84d2bcf9a..f98c6104fc42 100644
--- a/print/p5-Net-CUPS/Makefile
+++ b/print/p5-Net-CUPS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Interface to the CUPS API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups \
-		libcupsfilters.so:${PORTSDIR}/print/cups-filters
+LIB_DEPENDS=	libcupsimage.so:print/cups \
+		libcupsfilters.so:print/cups-filters
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/print/p5-PDF-Template/Makefile b/print/p5-PDF-Template/Makefile
index 0ffea07514f1..c642ba4c7a61 100644
--- a/print/p5-PDF-Template/Makefile
+++ b/print/p5-PDF-Template/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	yaizawa@2004.jukuin.keio.ac.jp
 COMMENT=	PDF layout system that uses the same data structures as HTML::Template
 
-BUILD_DEPENDS+=	pdflib-perl>=0:${PORTSDIR}/print/pdflib-perl \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS+=	pdflib-perl>=0:print/pdflib-perl \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/print/p5-PDFLib/Makefile b/print/p5-PDFLib/Makefile
index 774dda0d09be..c3cd87ddda12 100644
--- a/print/p5-PDFLib/Makefile
+++ b/print/p5-PDFLib/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	More OO interface to pdflib_pl.pm
 
-BUILD_DEPENDS=	pdflib-perl>=0:${PORTSDIR}/print/pdflib-perl
+BUILD_DEPENDS=	pdflib-perl>=0:print/pdflib-perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/print/p5-PostScript-PPD/Makefile b/print/p5-PostScript-PPD/Makefile
index b8fe8fe0397e..66e02e3cc80e 100644
--- a/print/p5-PostScript-PPD/Makefile
+++ b/print/p5-PostScript-PPD/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Read PostScript Printer Definition files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/print/p5-XML-ApacheFOP/Makefile b/print/p5-XML-ApacheFOP/Makefile
index 1630f8bece0a..decee5c5881a 100644
--- a/print/p5-XML-ApacheFOP/Makefile
+++ b/print/p5-XML-ApacheFOP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Access Apache FOP from Perl to create PDF files using XSL-FO
 
-BUILD_DEPENDS=	p5-Java>=0:${PORTSDIR}/devel/p5-Java \
-		${LOCALBASE}/share/java/fop/build/fop.jar:${PORTSDIR}/textproc/fop
+BUILD_DEPENDS=	p5-Java>=0:devel/p5-Java \
+		${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/print/panda/Makefile b/print/panda/Makefile
index fd078b2b35df..7dba2a6d7a1d 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -15,8 +15,8 @@ COMMENT=	PDF generation library
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-berkeley-db
diff --git a/print/papersize-default-a4/Makefile b/print/papersize-default-a4/Makefile
index 005abad93da6..24ca9f6bc604 100644
--- a/print/papersize-default-a4/Makefile
+++ b/print/papersize-default-a4/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	# none
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Default paper size configuration file for libpaper
 
-LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIB_DEPENDS=	libpaper.so:print/libpaper
 
 NO_BUILD=	yes
 
diff --git a/print/pdf4tcl/Makefile b/print/pdf4tcl/Makefile
index 7b6e36f75735..9074bdc8cd06 100644
--- a/print/pdf4tcl/Makefile
+++ b/print/pdf4tcl/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Pure Tcl library to generate PDF files
 
 OPTIONS_DEFINE=	DOCS
 
-BUILD_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
-RUN_DEPENDS=	${LOCALBASE}/lib/tcllib/snit/snit.tcl:${PORTSDIR}/devel/tcllib
+BUILD_DEPENDS=	dtplite:devel/tcllib
+RUN_DEPENDS=	${LOCALBASE}/lib/tcllib/snit/snit.tcl:devel/tcllib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//}
 
diff --git a/print/pdfbox/Makefile b/print/pdfbox/Makefile
index 16af2f2a84b1..ad41f88ed3ef 100644
--- a/print/pdfbox/Makefile
+++ b/print/pdfbox/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Java tool for working with PDF documents
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle	\
-		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVAJARDIR}/bcmail.jar:java/bouncycastle	\
+		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 JAR_NAMES=	pdfbox fontbox jempbox preflight xmpbox
 
diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile
index c30bbb7019b0..91230079a5f5 100644
--- a/print/pdfcube/Makefile
+++ b/print/pdfcube/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://code.100allora.it/releases/pdfcube/
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	OpenGL presentation viewer on a spinning cube
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
-		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libpoppler-glib.so:graphics/poppler-glib \
+		libboost_program_options.so:devel/boost-libs
 
 USES=		pkgconfig
 USE_GL=		glut
diff --git a/print/pecl-haru/Makefile b/print/pecl-haru/Makefile
index 0c7c1e11f65a..fdb6b9289ed6 100644
--- a/print/pecl-haru/Makefile
+++ b/print/pecl-haru/Makefile
@@ -13,8 +13,8 @@ COMMENT=	PECL extension to Haru PDF functions
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/hpdf.h:${PORTSDIR}/print/libharu
-RUN_DEPENDS:=	${LOCALBASE}/include/hpdf.h:${PORTSDIR}/print/libharu
+BUILD_DEPENDS=	${LOCALBASE}/include/hpdf.h:print/libharu
+RUN_DEPENDS:=	${LOCALBASE}/include/hpdf.h:print/libharu
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/print/pecl-pdflib/Makefile b/print/pecl-pdflib/Makefile
index 339e0ebf68e0..ff77e83b03d1 100644
--- a/print/pecl-pdflib/Makefile
+++ b/print/pecl-pdflib/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension to create PDF on the fly
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libpdf.so:${PORTSDIR}/print/pdflib
+LIB_DEPENDS=	libpdf.so:print/pdflib
 
 USE_PHP=	gd
 USE_PHP_BUILD=	yes
diff --git a/print/pecl-ps/Makefile b/print/pecl-ps/Makefile
index ebe8f7685d9b..3155a695728a 100644
--- a/print/pecl-ps/Makefile
+++ b/print/pecl-ps/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PHP extension for pslib to generate postscript
 
 LICENSE=	PHP202
 
-LIB_DEPENDS=	libps.so:${PORTSDIR}/print/pslib
+LIB_DEPENDS=	libps.so:print/pslib
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/print/photoprint/Makefile b/print/photoprint/Makefile
index 9f6365fe3db0..6d731dc0777b 100644
--- a/print/photoprint/Makefile
+++ b/print/photoprint/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Utility to print multiple images per sheet
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
-		libgutenprint.so:${PORTSDIR}/print/gutenprint-base \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libnetpbm.so:${PORTSDIR}/graphics/netpbm \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libcups.so:print/cups \
+		libgutenprint.so:print/gutenprint-base \
+		liblcms.so:graphics/lcms \
+		libnetpbm.so:graphics/netpbm \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gettext jpeg libtool pkgconfig
diff --git a/print/pkpgcounter/Makefile b/print/pkpgcounter/Makefile
index bbaa81272f76..77efeada0cd9 100644
--- a/print/pkpgcounter/Makefile
+++ b/print/pkpgcounter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.pykota.com/software/pkpgcounter/download/tarballs/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Count pages and ink coverage percent
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	GPLv3
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 42e9b1f3ff9b..7a291cdbd49b 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -19,9 +19,9 @@ GNU_CONFIGURE=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(A4) || !empty(PORT_OPTIONS:MA4SIZE)
-RUN_DEPENDS=	enscript:${PORTSDIR}/print/enscript-a4
+RUN_DEPENDS=	enscript:print/enscript-a4
 .else
-RUN_DEPENDS=	enscript:${PORTSDIR}/print/enscript-letter
+RUN_DEPENDS=	enscript:print/enscript-letter
 .endif
 
 post-patch:
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index 6e81a1c26781..330f5685a657 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -12,8 +12,8 @@ COMMENT=	C-library for generating multi page PostScript documents
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USES=		gettext gmake jpeg libtool pathfix pkgconfig
 USE_GNOME=	intlhack
@@ -35,8 +35,8 @@ DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} ${EX_NAME}${EXTRACT_SUFX}
 .endif
 
 .if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
-		${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/docbook-to-man:textproc/docbook-to-man \
+		${LOCALBASE}/bin/docbook2man:textproc/docbook-utils
 .else
 # Avoid building the manpages.
 CONFIGURE_ENV+=	ac_cv_prog_DOC_TO_MAN=""
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 302d44644fd1..bfdf4bf947e3 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	psutils-p17
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Utilities for manipulating PostScript documents
 
-LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIB_DEPENDS=	libpaper.so:print/libpaper
 
 USES=		perl5
 USE_PERL5=	build
diff --git a/print/py-pollyreports/Makefile b/print/py-pollyreports/Makefile
index cc6efc536a6f..dc493d245647 100644
--- a/print/py-pollyreports/Makefile
+++ b/print/py-pollyreports/Makefile
@@ -19,6 +19,6 @@ USE_PYTHON=	autoplist distutils
 OPTIONS_DEFINE=	REPORTLAB
 
 REPORTLAB_DESC=	Install Reportlab
-REPORTLAB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:${PORTSDIR}/print/py-reportlab
+REPORTLAB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab
 
 .include <bsd.port.mk>
diff --git a/print/py-pycups/Makefile b/print/py-pycups/Makefile
index 756bc8a8776c..6e82a0a86b42 100644
--- a/print/py-pycups/Makefile
+++ b/print/py-pycups/Makefile
@@ -14,7 +14,7 @@ COMMENT=	CUPS bindings for Python
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS=	libcups.so:print/cups
 
 USE_PYTHON=	autoplist concurrent distutils
 USES=		iconv localbase python tar:bzip2
diff --git a/print/py-qt5-printsupport/Makefile b/print/py-qt5-printsupport/Makefile
index 951ee7ef926d..7a96ab523939 100644
--- a/print/py-qt5-printsupport/Makefile
+++ b/print/py-qt5-printsupport/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtPrintsupport 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/print/py-relatorio/Makefile b/print/py-relatorio/Makefile
index 67fc8bd363ea..e0d239e5e118 100644
--- a/print/py-relatorio/Makefile
+++ b/print/py-relatorio/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Templating library able to output odt and pdf files
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \
-		${PYTHON_PKGNAMEPREFIX}lxml>=2.2:${PORTSDIR}/devel/py-lxml
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycha>=0.5.0:${PORTSDIR}/graphics/py-pycha \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.07:${PORTSDIR}/devel/py-yaml
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi \
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycha>=0.5.0:graphics/py-pycha \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.07:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 2b5c96a004ae..1900c0f661a0 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Library to create PDF documents using the Python language
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -38,8 +38,8 @@ PORTDOCS=	reportlab-userguide.pdf
 OPTIONS_DEFINE=	CJK FREETYPE DOCS
 OPTIONS_DEFAULT=	CJK FREETYPE
 CJK_DESC=	Adobe CMaps
-CJK_RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/ac15/cid2code.txt:${PORTSDIR}/print/adobe-cmaps
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+CJK_RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/ac15/cid2code.txt:print/adobe-cmaps
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 .include <bsd.port.options.mk>
 
diff --git a/print/py-reportlab2/Makefile b/print/py-reportlab2/Makefile
index ad27116d2395..d2353ff248fb 100644
--- a/print/py-reportlab2/Makefile
+++ b/print/py-reportlab2/Makefile
@@ -21,7 +21,7 @@ BROKEN=		is not compatible with the current version of pillow
 DEPRECATED=	no longer supported - use reportlab 3.x (py-reportlab) instead
 EXPIRATION_DATE=2016-05-02
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/print/py-trml2pdf/Makefile b/print/py-trml2pdf/Makefile
index ab52e0c2bd84..c088af5ff3f7 100644
--- a/print/py-trml2pdf/Makefile
+++ b/print/py-trml2pdf/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Tiny RML2PDF easily creates PDF documents
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/print/qpdf/Makefile b/print/qpdf/Makefile
index 1ce678e3d944..59715632989d 100644
--- a/print/qpdf/Makefile
+++ b/print/qpdf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Command-line tools for transforming and inspecting PDF documents
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/Artistic-2.0
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile
index 650ea8c04b69..768483302131 100644
--- a/print/qpdfview/Makefile
+++ b/print/qpdfview/Makefile
@@ -29,18 +29,18 @@ OPTIONS_DEFAULT=	QT4 CUPS PS
 OPTIONS_SUB=	yes
 
 CUPS_QMAKE_OFF=	"CONFIG+=without_cups"
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
-DJVU_LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
+DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 DJVU_QMAKE_OFF=	"CONFIG+=without_djvu"
 
 QT4_USE=	qt4=dbus,gui,linguisttools,moc_build,rcc_build,sql,sql-sqlite3,svg,xml
-QT4_LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+QT4_LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
 
 QT5_USE=	qt5=buildtools_build,concurrent,linguisttools,printsupport,sql,sql-sqlite3,svg,xml
-QT5_LIB_DEPENDS=	libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5
+QT5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
 
-PS_LIB_DEPENDS=	libspectre.so:${PORTSDIR}/print/libspectre
+PS_LIB_DEPENDS=	libspectre.so:print/libspectre
 PS_QMAKE_OFF=	"CONFIG+=without_ps"
 
 pre-configure:
diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile
index 9a1e4e6bcce8..4078e3d0b43f 100644
--- a/print/qt5-printsupport/Makefile
+++ b/print/qt5-printsupport/Makefile
@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
 
 CUPS_CONFIGURE_ON=	-cups
 CUPS_CONFIGURE_OFF=	-no-cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 .include <bsd.port.options.mk>
 
diff --git a/print/rubygem-pdf-reader/Makefile b/print/rubygem-pdf-reader/Makefile
index 1d502ba07a49..e0af5759e2b4 100644
--- a/print/rubygem-pdf-reader/Makefile
+++ b/print/rubygem-pdf-reader/Makefile
@@ -12,11 +12,11 @@ COMMENT=	PDF parser conforming as much as possible to the PDF specification
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-afm>=0.2.1:${PORTSDIR}/print/rubygem-afm \
-		rubygem-ascii85>=1.0.0:${PORTSDIR}/devel/rubygem-ascii85 \
-		rubygem-hashery>=2.0:${PORTSDIR}/devel/rubygem-hashery \
-		rubygem-ruby-rc4>=0:${PORTSDIR}/security/rubygem-ruby-rc4 \
-		rubygem-ttfunk>=0:${PORTSDIR}/print/rubygem-ttfunk
+RUN_DEPENDS=	rubygem-afm>=0.2.1:print/rubygem-afm \
+		rubygem-ascii85>=1.0.0:devel/rubygem-ascii85 \
+		rubygem-hashery>=2.0:devel/rubygem-hashery \
+		rubygem-ruby-rc4>=0:security/rubygem-ruby-rc4 \
+		rubygem-ttfunk>=0:print/rubygem-ttfunk
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/print/rubygem-pdf-writer/Makefile b/print/rubygem-pdf-writer/Makefile
index 977f466ec01e..e61d23cc3fb6 100644
--- a/print/rubygem-pdf-writer/Makefile
+++ b/print/rubygem-pdf-writer/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Pure Ruby PDF document creation library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-color>=1.4.0:${PORTSDIR}/print/rubygem-color \
-		rubygem-transaction-simple>=1.3:${PORTSDIR}/devel/rubygem-transaction-simple
+RUN_DEPENDS=	rubygem-color>=1.4.0:print/rubygem-color \
+		rubygem-transaction-simple>=1.3:devel/rubygem-transaction-simple
 
 NO_ARCH=	yes
 
diff --git a/print/rubygem-prawn-format/Makefile b/print/rubygem-prawn-format/Makefile
index 34a0e708da91..09d14ffdbbd2 100644
--- a/print/rubygem-prawn-format/Makefile
+++ b/print/rubygem-prawn-format/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extension of Prawn that allows inline formatting
 LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-prawn-core>=0:${PORTSDIR}/print/rubygem-prawn-core
+RUN_DEPENDS=	rubygem-prawn-core>=0:print/rubygem-prawn-core
 
 NO_ARCH=	yes
 
diff --git a/print/rubygem-prawn-graph/Makefile b/print/rubygem-prawn-graph/Makefile
index 7f5e2d46a0ba..b9bd54496294 100644
--- a/print/rubygem-prawn-graph/Makefile
+++ b/print/rubygem-prawn-graph/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Draw basic graphs and charts natively in your PDFs
 LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-prawn>=0:${PORTSDIR}/print/rubygem-prawn
+RUN_DEPENDS=	rubygem-prawn>=0:print/rubygem-prawn
 
 NO_ARCH=	yes
 
diff --git a/print/rubygem-prawn-js/Makefile b/print/rubygem-prawn-js/Makefile
index f29bc57f1bf0..ef75fb70b47f 100644
--- a/print/rubygem-prawn-js/Makefile
+++ b/print/rubygem-prawn-js/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Simplifies embedding JavaScript in your PDF files
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-prawn-core>=0.6.1:${PORTSDIR}/print/rubygem-prawn-core
+RUN_DEPENDS=	rubygem-prawn-core>=0.6.1:print/rubygem-prawn-core
 
 NO_ARCH=	yes
 
diff --git a/print/rubygem-prawn-svg/Makefile b/print/rubygem-prawn-svg/Makefile
index 9d320a41129e..fe73cfc53a9a 100644
--- a/print/rubygem-prawn-svg/Makefile
+++ b/print/rubygem-prawn-svg/Makefile
@@ -11,8 +11,8 @@ COMMENT=	SVG renderer for Prawn PDF library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-css_parser>=1.3:${PORTSDIR}/textproc/rubygem-css_parser \
-		rubygem-prawn>=0.11.1:${PORTSDIR}/print/rubygem-prawn
+RUN_DEPENDS=	rubygem-css_parser>=1.3:textproc/rubygem-css_parser \
+		rubygem-prawn>=0.11.1:print/rubygem-prawn
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/print/rubygem-prawn/Makefile b/print/rubygem-prawn/Makefile
index aa0b49826d41..3b09c9c57634 100644
--- a/print/rubygem-prawn/Makefile
+++ b/print/rubygem-prawn/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/GPLv2
 LICENSE_FILE_GPLv3=	${WRKSRC}/GPLv3
 LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-pdf-core>=0.6.1:${PORTSDIR}/print/rubygem-pdf-core \
-		rubygem-ttfunk>=1.4.0:${PORTSDIR}/print/rubygem-ttfunk
+RUN_DEPENDS=	rubygem-pdf-core>=0.6.1:print/rubygem-pdf-core \
+		rubygem-ttfunk>=1.4.0:print/rubygem-ttfunk
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/print/rubygem-rbpdf/Makefile b/print/rubygem-rbpdf/Makefile
index 6f2c34ffe99f..7cd7248c6303 100644
--- a/print/rubygem-rbpdf/Makefile
+++ b/print/rubygem-rbpdf/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby library for creating ERB enabled PDF templates
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-RUN_DEPENDS=	rubygem-htmlentities>=4.3.1:${PORTSDIR}/textproc/rubygem-htmlentities \
-		rubygem-rbpdf-font>=${PORTVERSION}:${PORTSDIR}/print/rubygem-rbpdf-font
+RUN_DEPENDS=	rubygem-htmlentities>=4.3.1:textproc/rubygem-htmlentities \
+		rubygem-rbpdf-font>=${PORTVERSION}:print/rubygem-rbpdf-font
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 0204bfc0ad08..57de30eab797 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -11,19 +11,19 @@ MASTER_SITES=	SF \
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Comprehensive desktop publishing program
 
-LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libcups.so:${PORTSDIR}/print/cups \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpodofo.so:${PORTSDIR}/graphics/podofo \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libhyphen.so:${PORTSDIR}/textproc/hyphen \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-pillow
+LIB_DEPENDS=	liblcms.so:graphics/lcms \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libcups.so:print/cups \
+		libfreetype.so:print/freetype2 \
+		libpodofo.so:graphics/podofo \
+		libboost_thread.so:devel/boost-libs \
+		libhunspell-1.3.so:textproc/hunspell \
+		libcairo.so:graphics/cairo \
+		libhyphen.so:textproc/hyphen \
+		libfontconfig.so:x11-fonts/fontconfig
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+		${PYTHON_SITELIBDIR}/PIL/_imaging.so:graphics/py-pillow
 
 USE_QT4=	gui linguist_build moc_build qmake_build rcc_build uic_build xml network
 USE_GNOME=	libartlgpl2 libxml2
diff --git a/print/splix/Makefile b/print/splix/Makefile
index 3c43c4ba97d1..fbf555ebc98d 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CUPS printer drivers for Samsung Printer Language printers
 
-LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups
+LIB_DEPENDS=	libcupsimage.so:print/cups
 
 USES=		gmake tar:bzip2
 
@@ -45,7 +45,7 @@ OPTIONS_DEFAULT=	JBIG BLACKOPTIM
 .if ${PORT_OPTIONS:MJBIG}
 PPD_SAMSUNG+=	${PPD_SAMSUNG_JBIG}
 PPD_XEROX+=	${PPD_XEROX_JBIG}
-LIB_DEPENDS+=	libjbig.so:${PORTSDIR}/graphics/jbigkit
+LIB_DEPENDS+=	libjbig.so:graphics/jbigkit
 .else
 MAKE_ARGS+=	DISABLE_JBIG=1
 .endif
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index f9dcb1b820cf..74a0e3621ea8 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CUPS configuration Gtk+2.0 GUI
 
-BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-pycups \
-		${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-pycurl \
-		${LOCALBASE}/libexec/cups-pk-helper-mechanism:${PORTSDIR}/print/cups-pk-helper
+BUILD_DEPENDS=	xmlto:textproc/xmlto \
+		docbook-xml>0:textproc/docbook-xml
+LIB_DEPENDS=	libcups.so:print/cups
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:print/py-pycups \
+		${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl \
+		${LOCALBASE}/libexec/cups-pk-helper-mechanism:print/cups-pk-helper
 
 # 1.5 series is python3 ignore them for now.
 PORTSCOUT=	limitw:1,even
diff --git a/print/tex-aleph/Makefile b/print/tex-aleph/Makefile
index c8abbdd206af..78505c1d6bbd 100644
--- a/print/tex-aleph/Makefile
+++ b/print/tex-aleph/Makefile
@@ -15,8 +15,8 @@ EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source${EXTRACT_SUFX}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX Engine including Omega and e-TeX features
 
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libmpfr.so:math/mpfr \
+		libpng.so:graphics/png
 
 USES=		tar:xz pkgconfig
 USE_TEX=	kpathsea web2c texmf formats fmtutil
diff --git a/print/tex-basic-engines/Makefile b/print/tex-basic-engines/Makefile
index 23a62a923582..9bd0d042e705 100644
--- a/print/tex-basic-engines/Makefile
+++ b/print/tex-basic-engines/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	TeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Basic TeX Engines
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		pkgconfig libtool tar:xz
 USE_TEX=	kpathsea web2c>=20150521_1
diff --git a/print/tex-dvipdfmx/Makefile b/print/tex-dvipdfmx/Makefile
index a506032b2d85..935ea86fd042 100644
--- a/print/tex-dvipdfmx/Makefile
+++ b/print/tex-dvipdfmx/Makefile
@@ -18,9 +18,9 @@ COMMENT=	DVI Previewer(kpathsearch) for X
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libpaper.so:${PORTSDIR}/print/libpaper
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libpaper.so:print/libpaper
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/ai0/CMap/Identity-H:print/adobe-cmaps
 
 USES=		pkgconfig tar:xz
 USE_TEX=	kpathsea web2c texmf dvipsk luatex texhash
diff --git a/print/tex-dvipsk/Makefile b/print/tex-dvipsk/Makefile
index e3afec7aca40..9eea1f77acab 100644
--- a/print/tex-dvipsk/Makefile
+++ b/print/tex-dvipsk/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Convert a TeX DVI file to PostScript
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIB_DEPENDS=	libpaper.so:print/libpaper
 
 USES=		gmake tar:xz pkgconfig
 USE_TEX=	kpathsea web2c texmf texhash
diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index 308c35936a45..c8b24c64608a 100644
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@@ -15,10 +15,10 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Extended version of pdfTeX using Lua
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libpoppler.so:${PORTSDIR}/graphics/poppler \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libzzip.so:${PORTSDIR}/devel/zziplib
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libpoppler.so:graphics/poppler \
+		libmpfr.so:math/mpfr \
+		libzzip.so:devel/zziplib
 
 USE_TEX=	kpathsea web2c texmf formats texlua texluajit fmtutil
 USE_XORG=	pixman
diff --git a/print/tex-xdvik/Makefile b/print/tex-xdvik/Makefile
index bf0559ddc2e6..44f1cc826e7b 100644
--- a/print/tex-xdvik/Makefile
+++ b/print/tex-xdvik/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	TeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DVI Previewer(kpathsearch) for X
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpaper.so:${PORTSDIR}/print/libpaper
-RUN_DEPENDS=	tex-dvipsk>=5.995:${PORTSDIR}/print/tex-dvipsk
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpaper.so:print/libpaper
+RUN_DEPENDS=	tex-dvipsk>=5.995:print/tex-dvipsk
 
 USES=		iconv motif
 USE_TEX=	web2c kpathsea texmf texhash
diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile
index 06f3b17aebd7..83d667a342a6 100644
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@@ -15,13 +15,13 @@ EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source${EXTRACT_SUFX}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX System with Unicode and Modern Font Technologies
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
-		libicuio.so:${PORTSDIR}/devel/icu \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libpoppler.so:${PORTSDIR}/graphics/poppler \
-		libTECkit.so:${PORTSDIR}/textproc/teckit
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libgraphite2.so:graphics/graphite2 \
+		libicuio.so:devel/icu \
+		libharfbuzz.so:print/harfbuzz \
+		libpng.so:graphics/png \
+		libpoppler.so:graphics/poppler \
+		libTECkit.so:textproc/teckit
 
 USES=		pkgconfig tar:xz
 USE_TEX=	kpathsea web2c texmf formats fmtutil
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index a80b4382695c..21e4d2ee0478 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Typeset documentation system with multiple format output
 
-BUILD_DEPENDS+=	help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS+=	help2man:misc/help2man
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index 0f0aef9788a3..f207ad80139a 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -12,18 +12,18 @@ DIST_SUBDIR=	TeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, base binaries
 
-RUN_DEPENDS=	psbook:${PORTSDIR}/print/psutils
-LIB_DEPENDS=	libicuio.so:${PORTSDIR}/devel/icu \
-		libt1.so:${PORTSDIR}/devel/t1lib \
-		libTECkit.so:${PORTSDIR}/textproc/teckit \
-		libgd.so:${PORTSDIR}/graphics/gd \
-		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libzzip.so:${PORTSDIR}/devel/zziplib \
-		libpoppler.so:${PORTSDIR}/graphics/poppler \
-		libpotrace.so:${PORTSDIR}/graphics/libpotrace
+RUN_DEPENDS=	psbook:print/psutils
+LIB_DEPENDS=	libicuio.so:devel/icu \
+		libt1.so:devel/t1lib \
+		libTECkit.so:textproc/teckit \
+		libgd.so:graphics/gd \
+		libgraphite2.so:graphics/graphite2 \
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
+		libpng.so:graphics/png \
+		libzzip.so:devel/zziplib \
+		libpoppler.so:graphics/poppler \
+		libpotrace.so:graphics/libpotrace
 
 CONFLICTS_INSTALL=	texlive-texmf-201[234]*
 
diff --git a/print/texlive-tlmgr/Makefile b/print/texlive-tlmgr/Makefile
index 823ba9cfb4ab..f4e6909029bf 100644
--- a/print/texlive-tlmgr/Makefile
+++ b/print/texlive-tlmgr/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeXLive manager modules
 
-RUN_DEPENDS=	tex-kpathsea>=6.2.1_1:${PORTSDIR}/devel/tex-kpathsea
+RUN_DEPENDS=	tex-kpathsea>=6.2.1_1:devel/tex-kpathsea
 
 CONFLICTS=	texlive-infra-[0-9]* texlive-base-20150521_[12345]
 
diff --git a/print/texvc/Makefile b/print/texvc/Makefile
index a8516c15ebfd..593d0984ba44 100644
--- a/print/texvc/Makefile
+++ b/print/texvc/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
 RASTER_DESC=	rasterization support
 RASTER_USES=	ghostscript:run
 RASTER_USE=	TEX=latex,dvipsk
-RASTER_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RASTER_RUN_DEPENDS=	convert:graphics/ImageMagick
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 148b6a24db0c..c391ca4c4eda 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Tools to convert Xfig .fig files
 
-RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	ppmtogif:graphics/netpbm
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		alias ghostscript:run imake
 CFLAGS+=	-Wno-return-type
diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile
index 8e3b8427c591..1f8f9d03d8bb 100644
--- a/print/ttf2pt1/Makefile
+++ b/print/ttf2pt1/Makefile
@@ -13,8 +13,8 @@ COMMENT=	True Type Font to Postscript Type 1 Converter
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	t1asm:${PORTSDIR}/print/t1utils
+LIB_DEPENDS=	libfreetype.so:print/freetype2
+RUN_DEPENDS=	t1asm:print/t1utils
 
 USES=		pkgconfig shebangfix perl5 uidfix tar:tgz
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LIBS}" \
diff --git a/print/ttfquery/Makefile b/print/ttfquery/Makefile
index 12d3a2d06dcc..85f8ece9b342 100644
--- a/print/ttfquery/Makefile
+++ b/print/ttfquery/Makefile
@@ -14,7 +14,7 @@ COMMENT=	FontTools-based package for querying system fonts
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fonttools>0:${PORTSDIR}/print/py-fonttools \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fonttools>0:print/py-fonttools \
 		${PYNUMPY}
 
 USES=		python
diff --git a/print/ttftot42/Makefile b/print/ttftot42/Makefile
index 15548af8a5b7..cbc983ea109a 100644
--- a/print/ttftot42/Makefile
+++ b/print/ttftot42/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.nih.at/ttftot42/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TrueType to Type42 font converter
 
-LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	libttf.so:print/freetype
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/ttftot42
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index bc6c0aee4743..d9c2253f363e 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Print system support for the Xfce Desktop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	a2ps:${PORTSDIR}/print/a2ps
-RUN_DEPENDS=	a2ps:${PORTSDIR}/print/a2ps
+BUILD_DEPENDS=	a2ps:print/a2ps
+RUN_DEPENDS=	a2ps:print/a2ps
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -30,7 +30,7 @@ OPTIONS_SINGLE=	PRINTMETHOD
 OPTIONS_SINGLE_PRINTMETHOD=	LPR CUPS
 LETTER_DESC=	Use letter paper format instead of A4
 LPR_DESC=	LPR printing system support
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CONFIGURE_ENABLE=	cups
 LPR_CONFIGURE_ENABLE=	bsdlpr
 LPR_CONFIGURE_WITH=	printcap=/etc/printcap
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index ae409c029df9..3211ee638ba5 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/cups/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	X11-based printer manager for CUPS
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
-		libfltk.so.1:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libcups.so:print/cups \
+		libfltk.so.1:x11-toolkits/fltk
 
 USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes