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