Remove ${PORTSDIR}/ from dependencies, categories v, w, x, y, and z.

With hat:	portmgr
Sponsored by:	Absolight

1585 files changed, 7432 insertions, 7432 deletions

diff --git a/www/R-cran-RgoogleMaps/Makefile b/www/R-cran-RgoogleMaps/Makefile
index e9a0e4830131..d8cbd38e9376 100644
--- a/www/R-cran-RgoogleMaps/Makefile
+++ b/www/R-cran-RgoogleMaps/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Overlays on Google map tiles in R
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-png>0:${PORTSDIR}/graphics/R-cran-png \
-		R-cran-RJSONIO>0:${PORTSDIR}/converters/R-cran-RJSONIO
+RUN_DEPENDS=	R-cran-png>0:graphics/R-cran-png \
+		R-cran-RJSONIO>0:converters/R-cran-RJSONIO
 
 USES=	cran:auto-plist
 
diff --git a/www/R-cran-htmlwidgets/Makefile b/www/R-cran-htmlwidgets/Makefile
index 9061a417907a..7c2099af5831 100644
--- a/www/R-cran-htmlwidgets/Makefile
+++ b/www/R-cran-htmlwidgets/Makefile
@@ -11,9 +11,9 @@ COMMENT=	HTML Widgets for R
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-htmltools>=0.3:${PORTSDIR}/textproc/R-cran-htmltools \
-		R-cran-jsonlite>=0.9.16:${PORTSDIR}/converters/R-cran-jsonlite \
-		R-cran-yaml>0:${PORTSDIR}/textproc/R-cran-yaml
+RUN_DEPENDS=	R-cran-htmltools>=0.3:textproc/R-cran-htmltools \
+		R-cran-jsonlite>=0.9.16:converters/R-cran-jsonlite \
+		R-cran-yaml>0:textproc/R-cran-yaml
 
 USES=	cran:auto-plist
 
diff --git a/www/R-cran-httpuv/Makefile b/www/R-cran-httpuv/Makefile
index 35e886c8fb2b..28b05bf61751 100644
--- a/www/R-cran-httpuv/Makefile
+++ b/www/R-cran-httpuv/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME_NODE=	Node's license
 LICENSE_FILE_NODE=	${WRKSRC}/LICENSE
 LICENSE_PERMS_NODE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp
 
 MAKE_ENV=	MAKE=${MAKE_CMD}
 USES=		cran:auto-plist gmake
diff --git a/www/R-cran-httr/Makefile b/www/R-cran-httr/Makefile
index 5b3e05a3fb62..14e486addb7a 100644
--- a/www/R-cran-httr/Makefile
+++ b/www/R-cran-httr/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Tools for Working with URLs and HTTP
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-jsonlite>0:${PORTSDIR}/converters/R-cran-jsonlite \
-		R-cran-mime>0:${PORTSDIR}/misc/R-cran-mime \
-		R-cran-curl>=0.9.1:${PORTSDIR}/ftp/R-cran-curl \
-		R-cran-openssl>=0.8:${PORTSDIR}/security/R-cran-openssl \
-		R-cran-R6>0:${PORTSDIR}/devel/R-cran-R6
+RUN_DEPENDS=	R-cran-jsonlite>0:converters/R-cran-jsonlite \
+		R-cran-mime>0:misc/R-cran-mime \
+		R-cran-curl>=0.9.1:ftp/R-cran-curl \
+		R-cran-openssl>=0.8:security/R-cran-openssl \
+		R-cran-R6>0:devel/R-cran-R6
 
 USES=	cran:auto-plist
 
diff --git a/www/R-cran-rvest/Makefile b/www/R-cran-rvest/Makefile
index 8504f8efc63d..167dfe287964 100644
--- a/www/R-cran-rvest/Makefile
+++ b/www/R-cran-rvest/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Easily Harvest (Scrape) Web Pages
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	R-cran-xml2>0:${PORTSDIR}/textproc/R-cran-xml2 \
-		R-cran-httr>=0.5:${PORTSDIR}/www/R-cran-httr \
-		R-cran-selectr>0:${PORTSDIR}/www/R-cran-selectr \
-		R-cran-magrittr>0:${PORTSDIR}/devel/R-cran-magrittr
+RUN_DEPENDS=	R-cran-xml2>0:textproc/R-cran-xml2 \
+		R-cran-httr>=0.5:www/R-cran-httr \
+		R-cran-selectr>0:www/R-cran-selectr \
+		R-cran-magrittr>0:devel/R-cran-magrittr
 
 USES=	cran:auto-plist
 
diff --git a/www/R-cran-scrapeR/Makefile b/www/R-cran-scrapeR/Makefile
index 7810a3236930..abba832bdb53 100644
--- a/www/R-cran-scrapeR/Makefile
+++ b/www/R-cran-scrapeR/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools for Scraping Data from HTML and XML Documents
 
-RUN_DEPENDS=	R-cran-XML>0:${PORTSDIR}/textproc/R-cran-XML \
-		R-cran-RCurl>0:${PORTSDIR}/ftp/R-cran-RCurl
+RUN_DEPENDS=	R-cran-XML>0:textproc/R-cran-XML \
+		R-cran-RCurl>0:ftp/R-cran-RCurl
 
 USES=	cran:auto-plist
 
diff --git a/www/R-cran-selectr/Makefile b/www/R-cran-selectr/Makefile
index 2b377ccd5db5..631b4cc18fe8 100644
--- a/www/R-cran-selectr/Makefile
+++ b/www/R-cran-selectr/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Translate CSS Selectors to XPath Expressions
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	R-cran-XML>0:${PORTSDIR}/textproc/R-cran-XML \
-		R-cran-stringr>0:${PORTSDIR}/textproc/R-cran-stringr
+RUN_DEPENDS=	R-cran-XML>0:textproc/R-cran-XML \
+		R-cran-stringr>0:textproc/R-cran-stringr
 
 USES=	cran:auto-plist
 
diff --git a/www/R-cran-shiny/Makefile b/www/R-cran-shiny/Makefile
index cfdf50450a37..1fe54f0e1ebc 100644
--- a/www/R-cran-shiny/Makefile
+++ b/www/R-cran-shiny/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Web Application Framework for R
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	R-cran-httpuv>=1.3.3:${PORTSDIR}/www/R-cran-httpuv \
-		R-cran-mime>=0.3:${PORTSDIR}/misc/R-cran-mime \
-		R-cran-jsonlite>=0.9.16:${PORTSDIR}/converters/R-cran-jsonlite \
-		R-cran-xtable>0:${PORTSDIR}/textproc/R-cran-xtable \
-		R-cran-digest>0:${PORTSDIR}/security/R-cran-digest \
-		R-cran-htmltools>=0.3:${PORTSDIR}/textproc/R-cran-htmltools \
-		R-cran-R6>=2.0:${PORTSDIR}/devel/R-cran-R6
+RUN_DEPENDS=	R-cran-httpuv>=1.3.3:www/R-cran-httpuv \
+		R-cran-mime>=0.3:misc/R-cran-mime \
+		R-cran-jsonlite>=0.9.16:converters/R-cran-jsonlite \
+		R-cran-xtable>0:textproc/R-cran-xtable \
+		R-cran-digest>0:security/R-cran-digest \
+		R-cran-htmltools>=0.3:textproc/R-cran-htmltools \
+		R-cran-R6>=2.0:devel/R-cran-R6
 
 USES=	cran:auto-plist
 
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 7f91abc2ff21..5c754d5b14c7 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Image Web Generator - recursively build HTMLs, imagemaps, thumbnails
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
-RUN_DEPENDS=	p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally
+LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
+RUN_DEPENDS=	p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally
 
 USES=		shebangfix perl5 autoreconf
 GNU_CONFIGURE=	yes
@@ -36,8 +36,8 @@ SHEBANG_FILES=	utils/aub \
 		utils/make_dir_index.pl
 
 OPTIONS_DEFINE=		X11
-X11_BUILD_DEPENDS=	xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts
-X11_RUN_DEPENDS=	xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts
+X11_BUILD_DEPENDS=	xlsfonts:x11-fonts/xlsfonts
+X11_RUN_DEPENDS=	xlsfonts:x11-fonts/xlsfonts
 X11_CONFIGURE_ENV_OFF=	with_x=no
 
 .include <bsd.port.pre.mk>
diff --git a/www/alef-webfont/Makefile b/www/alef-webfont/Makefile
index d8d356d674bf..4e339590f15d 100644
--- a/www/alef-webfont/Makefile
+++ b/www/alef-webfont/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Free multi-lingual font designed for screens
 LICENSE=	OFL11
 LICENSE_FILE=	${WRKDIR}/OFL-license.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:x11-fonts/mkfontdir \
+		${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/www/amphetadesk/Makefile b/www/amphetadesk/Makefile
index 5ba6fa697179..94d572475d75 100644
--- a/www/amphetadesk/Makefile
+++ b/www/amphetadesk/Makefile
@@ -17,13 +17,13 @@ LICENSE_FILE=	${WRKSRC}/docs/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	\
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
+		p5-libwww>=0:www/p5-libwww \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	run
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 814b34ee95e5..d687ee6747ee 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Fast program for analysing WWW logfiles
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/Licence.txt
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libpng.so:graphics/png
 
 USES=		jpeg
 BUILD_WRKSRC=	${WRKSRC}/src
diff --git a/www/anyremote2html/Makefile b/www/anyremote2html/Makefile
index a7b109c15786..8724c10aa473 100644
--- a/www/anyremote2html/Makefile
+++ b/www/anyremote2html/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/anyremote/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web interface for anyRemote
 
-RUN_DEPENDS=	anyremote:${PORTSDIR}/comms/anyremote
+RUN_DEPENDS=	anyremote:comms/anyremote
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/www/anyterm/Makefile b/www/anyterm/Makefile
index 518669cd5220..aab563a5d252 100644
--- a/www/anyterm/Makefile
+++ b/www/anyterm/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Terminal emulator on a Web page
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
 
 USE_RC_SUBR=	anytermd
 USES=		gmake iconv localbase tar:tbz2
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index c95a951ac00c..c996f10e302d 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -11,9 +11,9 @@ DIST_SUBDIR=	apache22
 MAINTAINER?=	apache@FreeBSD.org
 COMMENT?=	Version 2.2.x of Apache web server with ${WITH_MPM} MPM.
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libapr-1.so:devel/apr1 \
+		libpcre.so:devel/pcre
 
 CONFLICTS_INSTALL=	caudium14-1.* \
 		apache-*-2.2.* apache22-*-2.2.* \
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 9ab36b65264f..60a5c24efc5c 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	apache24
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Version 2.4.x of Apache web server
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libapr-1.so:devel/apr1 \
+		libpcre.so:devel/pcre
 
 CONFLICTS_INSTALL=	caudium14-1.* \
 			apache-*-2.2.* apache22-*
@@ -60,13 +60,13 @@ IPV4_MAPPED_CONFIGURE_ENABLE=	v4-mapped
 LDAP_CONFIGURE_ON=		--enable-ldap=shared
 
 HTTP2_CONFIGURE_ON=		--with-nghttp2=${LOCALBASE}
-HTTP2_LIB_DEPENDS=		libnghttp2.so:${PORTSDIR}/www/nghttp2
-LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:${PORTSDIR}/lang/luajit
+HTTP2_LIB_DEPENDS=		libnghttp2.so:www/nghttp2
+LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
 LUA_CONFIGURE_WITH=		lua
 LUA_USES=			lua
 
 SOCACHE_DC_CONFIGURE_ON=	--with-distcache=${LOCALBASE}
-SOCACHE_DC_LIB_DEPENDS=		libdistcache.so:${PORTSDIR}/security/distcache
+SOCACHE_DC_LIB_DEPENDS=		libdistcache.so:security/distcache
 
 # Note:
 # OpenSSL version (base/ports) depends how devel/apr1 was build
diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index 9134d6027d92..12c9d6d60727 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -43,7 +43,7 @@ PORTDOCS=	*
 
 CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle
 CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 NLS_CONFIGURE_OFF=	--disable-nls --without-libintl-prefix
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 NLS_LDFLAGS=		-lintl
diff --git a/www/aria2fe/Makefile b/www/aria2fe/Makefile
index fde91fcabf55..a33b31721072 100644
--- a/www/aria2fe/Makefile
+++ b/www/aria2fe/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Aria2 Qt front-end
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	aria2c:${PORTSDIR}/www/aria2 \
-		xterm:${PORTSDIR}/x11/xterm
+RUN_DEPENDS=	aria2c:www/aria2 \
+		xterm:x11/xterm
 
 USES=		tar:bzip2 qmake
 USE_QT4=	gui moc_build rcc_build uic_build
diff --git a/www/asql/Makefile b/www/asql/Makefile
index ddaec1176e03..ad667a5b2eb4 100644
--- a/www/asql/Makefile
+++ b/www/asql/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://www.steve.org.uk/Software/asql/ \
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Query Apache logfiles via SQL
 
-RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl
+RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/asql
diff --git a/www/asterisk-stat/Makefile b/www/asterisk-stat/Makefile
index c04dbaa153ef..a8965523cecd 100644
--- a/www/asterisk-stat/Makefile
+++ b/www/asterisk-stat/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}
 MAINTAINER=	jfkimura@yahoo.co.jp
 COMMENT=	ASTERISK call detail records analyzer
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 NO_BUILD=	yes
 USE_PHP=	session gd pcre
diff --git a/www/august/Makefile b/www/august/Makefile
index b11a21b98587..47d3cfe41b47 100644
--- a/www/august/Makefile
+++ b/www/august/Makefile
@@ -18,8 +18,8 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	DOCS
 
 USES+=		tk
-RUN_DEPENDS=	identify:${PORTSDIR}/graphics/ImageMagick \
-		weblint:${PORTSDIR}/www/weblint
+RUN_DEPENDS=	identify:graphics/ImageMagick \
+		weblint:www/weblint
 
 NO_BUILD=	yes
 
diff --git a/www/awffull/Makefile b/www/awffull/Makefile
index dc9ab8bd3c9d..39df51a22131 100644
--- a/www/awffull/Makefile
+++ b/www/awffull/Makefile
@@ -15,10 +15,10 @@ BROKEN=		unfetchable
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:x11-fonts/bitstream-vera
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libpng.so:graphics/png \
+		libpcre.so:devel/pcre
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS?=	ja-awffull-[0-9]*
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--with-font-default=${FONTDEFAULT} \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 GEOIP_CONFIGURE_ENABLE=	geoip
 
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile
index 945de385e9a5..38c7b307a149 100644
--- a/www/aws-demos/Makefile
+++ b/www/aws-demos/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Adacore Ada Web Server demos
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
-		xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
-		aws>=3.1:${PORTSDIR}/www/aws
+BUILD_DEPENDS=	gprbuild:devel/gprbuild \
+		xmlada>=4.4:textproc/xmlada \
+		aws>=3.1:www/aws
 
 USES=		ada gmake tar:bzip2
 
diff --git a/www/aws/Makefile b/www/aws/Makefile
index 42364fcc5dac..47331e017772 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Adacore Ada Web Server and framework
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
-		templates_parser>11:${PORTSDIR}/textproc/templates_parser \
-		xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
-		asis>=2013:${PORTSDIR}/lang/asis \
-		gnatpython>=20101207:${PORTSDIR}/devel/gnatpython
-RUN_DEPENDS=	templates_parser>11:${PORTSDIR}/textproc/templates_parser \
-		xmlada>=4.4:${PORTSDIR}/textproc/xmlada
+BUILD_DEPENDS=	gprbuild:devel/gprbuild \
+		templates_parser>11:textproc/templates_parser \
+		xmlada>=4.4:textproc/xmlada \
+		asis>=2013:lang/asis \
+		gnatpython>=20101207:devel/gnatpython
+RUN_DEPENDS=	templates_parser>11:textproc/templates_parser \
+		xmlada>=4.4:textproc/xmlada
 
 GNU_CONFIGURE=	yes
 NO_MTREE=	yes
@@ -40,7 +40,7 @@ OPTIONS_DEFINE=		IP6 DEBUG LDAP SHARED DOCS
 OPTIONS_DEFAULT=	SSL SHARED
 OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 OPTIONS_SINGLE_Secure-Socket-Layer= SSL GNUTLS NOSSL
 
 NOSSL_DESC=		Disable SSL support
@@ -74,7 +74,7 @@ LINK_SSL=
 .endif
 .if ${PORT_OPTIONS:MGNUTLS}
 CONF_ARGS+=	SOCKET=gnutls
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 LINK_TLS=
 .endif
 .if ${PORT_OPTIONS:MNOSSL}
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index df6ed0d2b4d6..e8e92e7d62c8 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/docs/LICENSE.TXT
 
-RUN_DEPENDS=	p5-Net-XWhois>=0:${PORTSDIR}/net/p5-Net-XWhois
+RUN_DEPENDS=	p5-Net-XWhois>=0:net/p5-Net-XWhois
 
 USES=		cpe dos2unix perl5 shebangfix
 CPE_VENDOR=	laurent_destailleur
@@ -39,8 +39,8 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS IPV6
 
-IPV6_RUN_DEPENDS=	p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-			p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+IPV6_RUN_DEPENDS=	p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+			p5-Net-DNS>=0:dns/p5-Net-DNS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
diff --git a/www/axis/Makefile b/www/axis/Makefile
index cdd928048055..a60ea613c41e 100644
--- a/www/axis/Makefile
+++ b/www/axis/Makefile
@@ -24,12 +24,12 @@ CPE_VENDOR=	apache
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 WEBAPPDIR=	${PREFIX}/apache-tomcat-6.0/webapps
-RUN_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+RUN_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 WEBAPPDIR=	${PREFIX}/apache-tomcat-7.0/webapps
-RUN_DEPENDS+=	${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+RUN_DEPENDS+=	${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:www/tomcat7
 .endif
 
 NO_BUILD=	yes
diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index 16be557906b8..25013bae82d2 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -26,14 +26,14 @@ OPTIONS_DEFINE=	EXAMPLES
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 APPHOME=	${LOCALBASE}/apache-tomcat-6.0
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 APPHOME=	${LOCALBASE}/apache-tomcat-7.0
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 USE_JAVA=	yes
diff --git a/www/b2evolution/Makefile b/www/b2evolution/Makefile
index ee8be2d3db54..344ccd5b0275 100644
--- a/www/b2evolution/Makefile
+++ b/www/b2evolution/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/evocms/${PORTNAME}/b2evo%20${PORTVERSION}-stable
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multilingual, multiuser, multi-blog engine
 
-PATCH_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+PATCH_DEPENDS=	unzip:archivers/unzip
 
 USES=		cpe dos2unix zip
 
diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index 0957859bc4cd..9a184de8da5d 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -43,7 +43,7 @@ USE_PHP+=	pdo_pgsql
 .endif
 
 .if ${PORT_OPTIONS:MZENDFRAMEWORK}
-RUN_DEPENDS=	${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:${PORTSDIR}/www/zend-framework
+RUN_DEPENDS=	${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:www/zend-framework
 .endif
 
 post-extract:
diff --git a/www/bblog/Makefile b/www/bblog/Makefile
index 3c221e8b8ead..64b0ab1b0b22 100644
--- a/www/bblog/Makefile
+++ b/www/bblog/Makefile
@@ -31,11 +31,11 @@ IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGD}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/gd.so:${PORTSDIR}/${gd_DEPENDS}
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/gd.so:${gd_DEPENDS}
 .endif
 
 .if ${PORT_OPTIONS:MIMAGICK}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/${imagick_DEPENDS}
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${imagick_DEPENDS}
 .endif
 
 .if empty(PORT_OPTIONS:MGD) && empty(PORT_OPTIONS:MIMAGICK)
diff --git a/www/bigbluebutton/Makefile b/www/bigbluebutton/Makefile
index 234e5764b3ba..956bc2831688 100644
--- a/www/bigbluebutton/Makefile
+++ b/www/bigbluebutton/Makefile
@@ -17,12 +17,12 @@ EXTRACT_ONLY=	bigbluebutton.tar.gz red5-0.9.1.tar.gz freeswitch-config.tar.gz
 MAINTAINER=	alex.deiter@gmail.com
 COMMENT=	Web conferencing system for distance education
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/pdf2swf:${PORTSDIR}/graphics/swftools \
-		${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick \
-		${LOCALBASE}/etc/rc.d/activemq:${PORTSDIR}/net/activemq \
-		${LOCALBASE}/sbin/nginx:${PORTSDIR}/www/nginx \
-		${LOCALBASE}/etc/rc.d/tomcat6:${PORTSDIR}/www/tomcat6 \
-		${LOCALBASE}/etc/rc.d/red5:${PORTSDIR}/www/red5
+BUILD_DEPENDS=	${LOCALBASE}/bin/pdf2swf:graphics/swftools \
+		${LOCALBASE}/bin/convert:graphics/ImageMagick \
+		${LOCALBASE}/etc/rc.d/activemq:net/activemq \
+		${LOCALBASE}/sbin/nginx:www/nginx \
+		${LOCALBASE}/etc/rc.d/tomcat6:www/tomcat6 \
+		${LOCALBASE}/etc/rc.d/red5:www/red5
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MANUAL_PACKAGE_BUILD=	requires www/tomcat6 with HTTP_PORT=8080
@@ -82,19 +82,19 @@ SUB_FILES=	pkg-message openoffice nginx.conf-dist bbb-conf
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMEETME} || ${PORT_OPTIONS:MKONFERENCE}
-BUILD_DEPENDS+=${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk
+BUILD_DEPENDS+=${LOCALBASE}/sbin/asterisk:net/asterisk
 .if  ${PORT_OPTIONS:MMEETME}
 .if !exists(${LOCALBASE}/lib/asterisk/modules/app_meetme.so)
 IGNORE=Option meetme requires app_meetme.so from asterisk port. Rebuild net/asterisk with DAHDI option selected
 .endif
 .endif
 .if  ${PORT_OPTIONS:MKONFERENCE}
-BUILD_DEPENDS+=${LOCALBASE}/lib/asterisk/modules/app_konference.so:${PORTSDIR}/net/appkonference
+BUILD_DEPENDS+=${LOCALBASE}/lib/asterisk/modules/app_konference.so:net/appkonference
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MOPENOFFICE}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/openoffice-4.0.1:${PORTSDIR}/editors/openoffice-4
+BUILD_DEPENDS+=	${LOCALBASE}/bin/openoffice-4.0.1:editors/openoffice-4
 .endif
 
 post-extract:
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 829e9c18af59..548df991a0fb 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -11,20 +11,20 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to generate HTML photo albums with XML support
 
 RUN_DEPENDS=	\
-	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-	convert:${PORTSDIR}/graphics/ImageMagick \
-	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \
-	p5-Text-Unaccent>=0:${PORTSDIR}/textproc/p5-Text-Unaccent \
-	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-	p5-HTML-Clean>0:${PORTSDIR}/www/p5-HTML-Clean \
-	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-	p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info \
-	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-	p5-XML-Grove>=0:${PORTSDIR}/textproc/p5-XML-Grove \
-	p5-XML-Handler-YAWriter>=0:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter \
-	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml
+	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+	convert:graphics/ImageMagick \
+	p5-Text-Iconv>=0:converters/p5-Text-Iconv \
+	p5-Text-Unaccent>=0:textproc/p5-Text-Unaccent \
+	p5-TimeDate>=0:devel/p5-TimeDate \
+	p5-HTML-Clean>0:www/p5-HTML-Clean \
+	p5-HTML-Template>=0:www/p5-HTML-Template \
+	p5-IO-String>=0:devel/p5-IO-String \
+	p5-Image-Info>=0:graphics/p5-Image-Info \
+	p5-Image-Size>=0:graphics/p5-Image-Size \
+	p5-URI>=0:net/p5-URI \
+	p5-XML-Grove>=0:textproc/p5-XML-Grove \
+	p5-XML-Handler-YAWriter>=0:textproc/p5-XML-Handler-YAWriter \
+	p5-libxml>=0:textproc/p5-libxml
 
 USES=		tar:bzip2 perl5
 USE_PERL5=	run
@@ -76,7 +76,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-install.sh
 
 # localization support
 .if ${PORT_OPTIONS:MI18N}
-RUN_DEPENDS+=	p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+RUN_DEPENDS+=	p5-Locale-gettext>=0:devel/p5-Locale-gettext
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/blastbeat/Makefile b/www/blastbeat/Makefile
index e99663eaf57e..60f571af2fb1 100644
--- a/www/blastbeat/Makefile
+++ b/www/blastbeat/Makefile
@@ -14,9 +14,9 @@ LICENSE_NAME=	UNBIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	auto-accept
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libzmq.so:${PORTSDIR}/net/libzmq2
+LIB_DEPENDS=	libev.so:devel/libev \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libzmq.so:net/libzmq2
 
 USES=		gmake
 USE_OPENSSL=	yes
diff --git a/www/blogsum/Makefile b/www/blogsum/Makefile
index ebca5d762254..68a06879b8fd 100644
--- a/www/blogsum/Makefile
+++ b/www/blogsum/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES=	http://www.dixongroup.net/
 MAINTAINER=	jhuldtgren@gmail.com
 COMMENT=	Simple weblog
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-HTTP-Lite>=0:${PORTSDIR}/www/p5-HTTP-Lite \
-		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-XML-RSS>=0:textproc/p5-XML-RSS \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-HTTP-Lite>=0:www/p5-HTTP-Lite \
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 5decf7c6e196..a585c1479522 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -13,8 +13,8 @@ COMMENT=	HTML editor designed for the experienced web designer
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libenchant.so:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libenchant.so:textproc/enchant
 
 USES=		desktop-file-utils gettext gmake libtool pkgconfig python \
 		shared-mime-info tar:bzip2
@@ -42,9 +42,9 @@ DEBUG_CONFIGURE_ENABLE=	debugging-output
 GTK2_USE=		gnome=gtk20
 GTK2_CONFIGURE_ON=	--with-gtk2=yes
 GTK2_CONFIGURE_OFF=	--with-gtk2=no
-GTK3_LIB_DEPENDS=	libgucharmap_2_90.so:${PORTSDIR}/deskutils/gucharmap
+GTK3_LIB_DEPENDS=	libgucharmap_2_90.so:deskutils/gucharmap
 GTK3_USE=		gnome=gtk30
-TIDY_RUN_DEPENDS=	tidy4:${PORTSDIR}/www/tidy
-WEBLINT_RUN_DEPENDS=	weblint:${PORTSDIR}/www/weblint
+TIDY_RUN_DEPENDS=	tidy4:www/tidy
+WEBLINT_RUN_DEPENDS=	weblint:www/weblint
 
 .include <bsd.port.mk>
diff --git a/www/c-icap-modules/Makefile b/www/c-icap-modules/Makefile
index cf03b93a8e7d..3f16353ba991 100644
--- a/www/c-icap-modules/Makefile
+++ b/www/c-icap-modules/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Modules for c-icap: virus_scan and srv_url_check
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS+=	libicapapi.so:${PORTSDIR}/www/c-icap \
-		libclamav.so:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	libicapapi.so:www/c-icap \
+		libclamav.so:security/clamav
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index e93823199ec9..917c61a897fe 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.webdav.org/cadaver/ \
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Commandline client for DAV
 
-LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libneon.so:www/neon
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-netrc
diff --git a/www/calendarserver/Makefile b/www/calendarserver/Makefile
index f2410897d665..382bd50fbeeb 100644
--- a/www/calendarserver/Makefile
+++ b/www/calendarserver/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Calendar and Contacts Server from Apple (RFC 4791, RFC 6352)
 
 LICENSE=	APACHE20
 
-FETCH_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS=	svn:devel/subversion
 BUILD_DEPENDS=	${FETCH_DEPENDS}
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		memcached:${PORTSDIR}/databases/memcached \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}psutil121>=1.2:${PORTSDIR}/sysutils/py-psutil121 \
-		${PYTHON_PKGNAMEPREFIX}PyGreSQL>=4.1:${PORTSDIR}/databases/py-PyGreSQL \
-		${PYTHON_PKGNAMEPREFIX}service_identity>=14.0.0:${PORTSDIR}/security/py-service_identity \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1:${PORTSDIR}/databases/py-sqlparse \
-		${PYTHON_PKGNAMEPREFIX}xattr>=0.6:${PORTSDIR}/devel/py-xattr \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	bash:shells/bash \
+		memcached:databases/memcached \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}psutil121>=1.2:sysutils/py-psutil121 \
+		${PYTHON_PKGNAMEPREFIX}PyGreSQL>=4.1:databases/py-PyGreSQL \
+		${PYTHON_PKGNAMEPREFIX}service_identity>=14.0.0:security/py-service_identity \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1:databases/py-sqlparse \
+		${PYTHON_PKGNAMEPREFIX}xattr>=0.6:devel/py-xattr \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8:devel/py-zope.interface
 
 OPTIONS_DEFINE=	EXAMPLES DOCS
 EXAMPLES_DESC=	Install configuration examples
diff --git a/www/castget/Makefile b/www/castget/Makefile
index 275400f7538f..93ad9bf127a5 100644
--- a/www/castget/Makefile
+++ b/www/castget/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Command-line podcast downloader
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libid3.so:audio/id3lib \
+		libcurl.so:ftp/curl
 
 USE_LDCONFIG=	yes
 USES=		libtool pkgconfig tar:bzip2
diff --git a/www/caudium14/Makefile b/www/caudium14/Makefile
index 489547920285..69e6990e9af8 100644
--- a/www/caudium14/Makefile
+++ b/www/caudium14/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	Caudium-${DISTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Free webserver based on the Roxen Challenger 1.3 code base
 
-BUILD_DEPENDS=	pike78:${PORTSDIR}/lang/pike78
-LIB_DEPENDS=	libsablot.so:${PORTSDIR}/textproc/sablotron
-RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
+BUILD_DEPENDS=	pike78:lang/pike78
+LIB_DEPENDS=	libsablot.so:textproc/sablotron
+RUN_DEPENDS=	lsof:sysutils/lsof
 
 USES=		gmake tar:bzip2
 
diff --git a/www/cblog/Makefile b/www/cblog/Makefile
index 015afae344a3..68998f8cc84e 100644
--- a/www/cblog/Makefile
+++ b/www/cblog/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	http://files.etoilebsd.net/cblog/
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Simple weblog in C using markdown
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libneo_cs.a:${PORTSDIR}/www/clearsilver
-LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi \
-		libcdb.so:${PORTSDIR}/databases/tinycdb
+BUILD_DEPENDS=	${LOCALBASE}/lib/libneo_cs.a:www/clearsilver
+LIB_DEPENDS=	libfcgi.so:www/fcgi \
+		libcdb.so:databases/tinycdb
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index ca545271cfa8..3b2fc8c36760 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -24,7 +24,7 @@ CXXFLAGS+=	-Wno-unknown-pragmas
 
 PORTDOCS=	*
 
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CONFIGURE_ENV_OFF=	ac_cv_prog_DOXYGEN="${ECHO_CMD}"
 
 post-patch:
diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile
index d3da8e60d2cc..159023994e64 100644
--- a/www/cgiparse/Makefile
+++ b/www/cgiparse/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://resnet.uoregon.edu/~gurney_j/jmpc/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library to parse CGI Forms
 
-LIB_DEPENDS=	libmime.so:${PORTSDIR}/devel/mime
+LIB_DEPENDS=	libmime.so:devel/mime
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index 7705aa79fd88..8d304b96ee7c 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -10,16 +10,16 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Checkbot%20${PORTVERSION}
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	WWW link verifier, similar to momspider
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Time-Duration>=0:${PORTSDIR}/devel/p5-Time-Duration
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Time-Duration>=0:${PORTSDIR}/devel/p5-Time-Duration
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-Time-Duration>=0:devel/p5-Time-Duration
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-Time-Duration>=0:devel/p5-Time-Duration
 
 USES=		cpe perl5
 CPE_VENDOR=	degraaff
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 417589dbbb32..5565c05302f2 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -59,14 +59,14 @@ OPTIONS_SUB=		yes
 ADMIN_DESC=		Build the Admin Interface
 ADMIN_USES=		python:2,run
 ADMIN_CONFIGURE_OFF=	--disable-admin
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--with-ffmpeg=yes
 FFMPEG_CONFIGURE_OFF=	--with-ffmpeg=no
-GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 GEOIP_CONFIGURE_ON=	--with-geoip=yes
 GEOIP_CONFIGURE_OFF=	--with-geoip=no
 INTPCRE_DESC=		Use internal PCRE library
-INTPCRE_LIB_DEPENDS_OFF=libpcre.so:${PORTSDIR}/devel/pcre
+INTPCRE_LIB_DEPENDS_OFF=libpcre.so:devel/pcre
 INTPCRE_CONFIGURE_ON=	--enable-internal-pcre
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 LDAP_USE=		openldap=yes
@@ -76,9 +76,9 @@ MYSQL_USE=		mysql=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
 MYSQL_CONFIGURE_OFF=	--with-mysql=no
 RRDTOOL_DESC=		Usage graphs support
-RRDTOOL_RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
+RRDTOOL_RUN_DEPENDS=	rrdtool:databases/rrdtool
 UWSGI_DESC=		uWSGI support
-UWSGI_RUN_DEPENDS=	uwsgi:${PORTSDIR}/www/uwsgi
+UWSGI_RUN_DEPENDS=	uwsgi:www/uwsgi
 
 .include <bsd.port.options.mk>
 
diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index 57eecc5ce28d..fd096b45abc6 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -13,9 +13,9 @@ COMMENT=	KDE micro-blogging client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson \
-		libqoauth.so:${PORTSDIR}/net/qoauth \
-		libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4
+LIB_DEPENDS=	libqjson.so:devel/qjson \
+		libqoauth.so:net/qoauth \
+		libtelepathy-qt4.so:net-im/telepathy-qt4
 
 USE_KDE4=	attica automoc4 kdelibs kdeprefix
 USE_QT4=	gui imageformats_run network \
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 818220f97111..828344f79a11 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -16,45 +16,45 @@ LICENSE_COMB=	multi
 
 CFLAGS+=	-isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		bash:${PORTSDIR}/shells/bash \
-		yasm:${PORTSDIR}/devel/yasm \
-		flock:${PORTSDIR}/sysutils/flock \
-		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
-		${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}ply>0:${PORTSDIR}/devel/py-ply \
-		${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib
-
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libcups.so:${PORTSDIR}/print/cups \
-		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libpci.so:${PORTSDIR}/devel/libpci \
-		libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libicuuc.so:${PORTSDIR}/devel/icu \
-		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \
-		libnspr4.so:${PORTSDIR}/devel/nspr \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libre2.so:${PORTSDIR}/devel/re2 \
-		libsnappy.so:${PORTSDIR}/archivers/snappy \
-		libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libwebp.so:${PORTSDIR}/graphics/webp
-
-RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \
-		droid-fonts-ttf>0:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
-		xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:devel/gperf \
+		bash:shells/bash \
+		yasm:devel/yasm \
+		flock:sysutils/flock \
+		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
+		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
+		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
+
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libasound.so:audio/alsa-lib \
+		libfreetype.so:print/freetype2 \
+		libnss3.so:security/nss \
+		libFLAC.so:audio/flac \
+		libgnome-keyring.so:security/libgnome-keyring \
+		libharfbuzz.so:print/harfbuzz \
+		libcups.so:print/cups \
+		libevent.so:devel/libevent2 \
+		libexif.so:graphics/libexif \
+		libgcrypt.so:security/libgcrypt \
+		libpci.so:devel/libpci \
+		libdrm.so:graphics/libdrm \
+		libicuuc.so:devel/icu \
+		libjsoncpp.so:devel/jsoncpp \
+		libnspr4.so:devel/nspr \
+		libpng.so:graphics/png \
+		libre2.so:devel/re2 \
+		libsnappy.so:archivers/snappy \
+		libspeechd.so:accessibility/speech-dispatcher \
+		libspeex.so:audio/speex \
+		libxml2.so:textproc/libxml2 \
+		libwebp.so:graphics/webp
+
+RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
+		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
+		xdg-open:devel/xdg-utils
 
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		bison compiler:c++14-lang cpe desktop-file-utils execinfo jpeg \
@@ -139,7 +139,7 @@ OPTIONS_DEFAULT=	CODECS GCONF KERBEROS
 OPTIONS_SUB=	yes
 
 GCONF_USE=	GNOME=gconf2
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 DRIVER_MAKE_ARGS=chromedriver
 TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
 
diff --git a/www/chtml/Makefile b/www/chtml/Makefile
index be1298aa3d59..cdd354e7e1e7 100644
--- a/www/chtml/Makefile
+++ b/www/chtml/Makefile
@@ -15,7 +15,7 @@ BROKEN=		unfetchable
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/csiod:${PORTSDIR}/lang/siod
+BUILD_DEPENDS=	${LOCALBASE}/bin/csiod:lang/siod
 
 USES=		perl5 tar:tgz
 USE_PERL5=	run
diff --git a/www/cl-lml-sbcl/Makefile b/www/cl-lml-sbcl/Makefile
index 135a4e249d74..219b92905fd7 100644
--- a/www/cl-lml-sbcl/Makefile
+++ b/www/cl-lml-sbcl/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Lisp Markup Language
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:${PORTSDIR}/www/cl-lml
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:${PORTSDIR}/www/cl-lml
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:www/cl-lml
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:www/cl-lml
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/www/closure-linter/Makefile b/www/closure-linter/Makefile
index 923baa30ee7c..bb3a29b6cf59 100644
--- a/www/closure-linter/Makefile
+++ b/www/closure-linter/Makefile
@@ -13,7 +13,7 @@ COMMENT=	JavaScript linter
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gflags>=0:${PORTSDIR}/devel/py-gflags
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gflags>=0:devel/py-gflags
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile
index 00135a35328a..8b7444f9dea0 100644
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv3
 OPTIONS_DEFINE=	DOCS IMAGEMAGICK
 IMAGEMAGICK_DESC=	Use ImageMagick instead of PHP GD extension
 
-IMAGEMAGICK_RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_RUN_DEPENDS+=	convert:graphics/ImageMagick
 
 USE_PHP=	mysql pcre ctype
 USES=		zip
diff --git a/www/cplanet/Makefile b/www/cplanet/Makefile
index b540cb8e02bf..1e48d853dacd 100644
--- a/www/cplanet/Makefile
+++ b/www/cplanet/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	http://files.etoilebsd.net/cplanet/
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	RSS Feed Aggregator that generate static html
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libneo_cs.a:${PORTSDIR}/www/clearsilver
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	${LOCALBASE}/lib/libneo_cs.a:www/clearsilver
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libcurl.so:ftp/curl
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/www/cppcms/Makefile b/www/cppcms/Makefile
index 374da5d7a84b..100dd5097a93 100644
--- a/www/cppcms/Makefile
+++ b/www/cppcms/Makefile
@@ -13,7 +13,7 @@ LICENSE=	LGPL3
 
 BROKEN_FreeBSD_9=	does not build on 9.x
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		cmake python:2 tar:bzip2
 USE_OPENSSL=	yes
@@ -26,7 +26,7 @@ ICU_DESC=		ICU unicode support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICU}
-LIB_DEPENDS+=	libicuuc.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicuuc.so:devel/icu
 CMAKE_ARGS+=	-DDISABLE_ICONV:BOOL=ON
 .else
 USES+=		iconv
@@ -34,7 +34,7 @@ CMAKE_ARGS+=	-DDISABLE_ICU_LOCALE:BOOL=ON
 .endif
 
 .if ${PORT_OPTIONS:MGCRYPT}
-LIB_DEPENDS+=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	libgcrypt.so:security/libgcrypt
 CMAKE_ARGS+=	-DDISABLE_GCRYPT:BOOL=OFF
 .else
 CMAKE_ARGS+=	-DDISABLE_GCRYPT:BOOL=ON
diff --git a/www/crawl/Makefile b/www/crawl/Makefile
index d66212b2834b..bee8adaefaea 100644
--- a/www/crawl/Makefile
+++ b/www/crawl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small, efficient web crawler with advanced features
 
 LICENSE=	BSD4CLAUSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		pkgconfig
 
diff --git a/www/csso/Makefile b/www/csso/Makefile
index 4971cb31c4c3..c49044134c29 100644
--- a/www/csso/Makefile
+++ b/www/csso/Makefile
@@ -13,7 +13,7 @@ COMMENT=	CSS optimizer
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	node:${PORTSDIR}/www/node
+RUN_DEPENDS=	node:www/node
 
 GH_ACCOUNT=	css
 
diff --git a/www/dalbum/Makefile b/www/dalbum/Makefile
index f354c1eb5170..b9a8f1c90f53 100644
--- a/www/dalbum/Makefile
+++ b/www/dalbum/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/}
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Free, highly customizable PHP photo album
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 USES=		cpe
 CPE_VERSION=	${PORTVERSION:C/^([0-9])([0-9][0-9]).*/\1.\2/}
diff --git a/www/davical/Makefile b/www/davical/Makefile
index b069ab846905..999fd776daf0 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -14,11 +14,11 @@ LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
-		${LOCALBASE}/bin/pwgen:${PORTSDIR}/sysutils/pwgen \
-		php-libawl>=0.54:${PORTSDIR}/devel/php-libawl
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-DBD-Pg>=0:databases/p5-DBD-Pg \
+		${LOCALBASE}/bin/pwgen:sysutils/pwgen \
+		php-libawl>=0.54:devel/php-libawl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DAViCal
diff --git a/www/deforaos-surfer/Makefile b/www/deforaos-surfer/Makefile
index aab47f7c6ccf..5704f4e7d1ac 100644
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@@ -15,11 +15,11 @@ COMMENT=	DeforaOS desktop web browser
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
-		libgnet-2.0.so:${PORTSDIR}/net/gnet2 \
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop \
+		libgnet-2.0.so:net/gnet2 \
+		libwebkitgtk-1.0.so:www/webkit-gtk2
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USE_GNOME=	gtk20
 USES=		desktop-file-utils pkgconfig
@@ -31,8 +31,8 @@ MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
-DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} 's|= data doc|= data|' \
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index d687fd3a292d..cc7525fc954d 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Fast, small graphical Web browser built upon fltk
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
+RUN_DEPENDS=	wget:ftp/wget
 
 USES=		gmake iconv pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/www/domoticz/Makefile b/www/domoticz/Makefile
index 43458da8959b..153378649f55 100644
--- a/www/domoticz/Makefile
+++ b/www/domoticz/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Home Automation System
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libtelldus-core.so:${PORTSDIR}/comms/telldus-core
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libboost_system.so:devel/boost-libs \
+		libboost_python.so:devel/boost-python-libs \
+		libtelldus-core.so:comms/telldus-core
 
 # This hack is to get rid of dependency of git while building
 # the package.
diff --git a/www/drood/Makefile b/www/drood/Makefile
index fb13fca5cd8b..a4e4d2291936 100644
--- a/www/drood/Makefile
+++ b/www/drood/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lightweight kqueue-based http/1.1 server
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libserver.so:${PORTSDIR}/devel/libserver
+LIB_DEPENDS=	libserver.so:devel/libserver
 
 USE_LDCONFIG=	yes
 
diff --git a/www/drraw/Makefile b/www/drraw/Makefile
index 0ecb75b1ba64..9de46d6d8e29 100644
--- a/www/drraw/Makefile
+++ b/www/drraw/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://web.taranis.org/drraw/dist/ \
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Simple web-based presentation front-end for RRDtool
 
-RUN_DEPENDS+=	rrdtool>=0:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS+=	rrdtool>=0:databases/rrdtool
 
 OPTIONS_DEFINE=	ZOOM_PATCH DOCS
 ZOOM_PATCH_DESC=	Zoom support using jQuery via external patch
diff --git a/www/drupal6-geshifilter/Makefile b/www/drupal6-geshifilter/Makefile
index e2ef701b2d8f..2d0feb36d55e 100644
--- a/www/drupal6-geshifilter/Makefile
+++ b/www/drupal6-geshifilter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Drupal 6 module for syntax highlighting
 
-RUN_DEPENDS=	${LOCALBASE}/lib/php/geshi/geshi.php:${PORTSDIR}/devel/php5-geshi
+RUN_DEPENDS=	${LOCALBASE}/lib/php/geshi/geshi.php:devel/php5-geshi
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
diff --git a/www/drupal6-page_title/Makefile b/www/drupal6-page_title/Makefile
index 07f94295383e..c10425379306 100644
--- a/www/drupal6-page_title/Makefile
+++ b/www/drupal6-page_title/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	www
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drupal module to provide fine-grained control of page titles
 
-RUN_DEPENDS=	drupal6-token>=0:${PORTSDIR}/www/drupal6-token
+RUN_DEPENDS=	drupal6-token>=0:www/drupal6-token
 
 USES=		drupal:6,module
 MODULE_FILES=	page_title-admin-settings-form.tpl.php page_title.install page_title.views.inc \
diff --git a/www/drupal6-pathauto/Makefile b/www/drupal6-pathauto/Makefile
index 81834df599cb..50418f02a2b7 100644
--- a/www/drupal6-pathauto/Makefile
+++ b/www/drupal6-pathauto/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	www
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically generates URLs for Drupal content
 
-RUN_DEPENDS=	drupal6-token>=0:${PORTSDIR}/www/drupal6-token
+RUN_DEPENDS=	drupal6-token>=0:www/drupal6-token
 
 USES=		drupal:6,module
 MODULE_FILES=	pathauto.admin.inc pathauto.inc pathauto.install pathauto.module \
diff --git a/www/drupal6-wysiwyg/Makefile b/www/drupal6-wysiwyg/Makefile
index 1da8bd5002bb..ce4e5205dff7 100644
--- a/www/drupal6-wysiwyg/Makefile
+++ b/www/drupal6-wysiwyg/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows implementation of WYSIWYG editors for editing Drupal content
 TINYMCEDIR=	www/tinymce
 
 # we support either tinymce2 or tinymce3
-RUN_DEPENDS+=	${LOCALBASE}/${TINYMCEDIR}/changelog.txt:${PORTSDIR}/www/tinymce3
+RUN_DEPENDS+=	${LOCALBASE}/${TINYMCEDIR}/changelog.txt:www/tinymce3
 
 PLIST_FILES+=	${DRUPAL_MODDIR}/tinymce
 
diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile
index 722261909d73..7ea4a69a7d5c 100644
--- a/www/drupal6/Makefile
+++ b/www/drupal6/Makefile
@@ -41,7 +41,7 @@ USE_PHP+=	mysql
 USE_PHP+=	mysqli
 .endif
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
 USE_PHP+=	pgsql
 .endif
 
diff --git a/www/drupal7-wysiwyg/Makefile b/www/drupal7-wysiwyg/Makefile
index e86865cd2b0e..609c0068d34b 100644
--- a/www/drupal7-wysiwyg/Makefile
+++ b/www/drupal7-wysiwyg/Makefile
@@ -21,17 +21,17 @@ YUI_DESC=	Install Yahoo UI Editor
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTINYMCE3}
-RUN_DEPENDS+=	${LOCALBASE}/www/tinymce:${PORTSDIR}/www/tinymce3
+RUN_DEPENDS+=	${LOCALBASE}/www/tinymce:www/tinymce3
 PLIST_FILES+=	${DRUPAL_MODLIB}/tinymce
 .endif
 
 .if ${PORT_OPTIONS:MCKEDITOR}
-RUN_DEPENDS+=	${LOCALBASE}/www/ckeditor:${PORTSDIR}/www/ckeditor
+RUN_DEPENDS+=	${LOCALBASE}/www/ckeditor:www/ckeditor
 PLIST_FILES+=	${DRUPAL_MODLIB}/ckeditor
 .endif
 
 .if ${PORT_OPTIONS:MYUI}
-RUN_DEPENDS+=	${LOCALBASE}/www/yui:${PORTSDIR}/www/yahoo-ui
+RUN_DEPENDS+=	${LOCALBASE}/www/yui:www/yahoo-ui
 PLIST_FILES+=	${DRUPAL_MODLIB}/yui
 .endif
 
diff --git a/www/drush/Makefile b/www/drush/Makefile
index 4bf282cce578..6c90d298cd66 100644
--- a/www/drush/Makefile
+++ b/www/drush/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Drupal command line and scripting interface
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	pear-Console_Table>0:${PORTSDIR}/devel/pear-Console_Table
+RUN_DEPENDS=	pear-Console_Table>0:devel/pear-Console_Table
 
 NO_BUILD=	yes
 
diff --git a/www/dtse/Makefile b/www/dtse/Makefile
index 939693de956c..672b343aee9b 100644
--- a/www/dtse/Makefile
+++ b/www/dtse/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Indexing search engine for use on small websites
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_gnu_make.m4:${PORTSDIR}/devel/autoconf-archive
+BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_gnu_make.m4:devel/autoconf-archive
 
 .if defined(WITH_OPENSSL)
 USE_OPENSSL=	yes
diff --git a/www/e2guardian/Makefile b/www/e2guardian/Makefile
index dba078c94ed0..e95b194292b7 100644
--- a/www/e2guardian/Makefile
+++ b/www/e2guardian/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Dansguardian fork with many improvements and bug fixes
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	rst2man:textproc/py-docutils
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 USES=		autoreconf libtool iconv pkgconfig
@@ -55,11 +55,11 @@ APACHE_USE=			APACHE_RUN=22+
 TRICKLE_CONFIGURE_ENABLE=	trickledm
 CLISCAN_CONFIGURE_ENABLE=	commandline
 CLAMD_CONFIGURE_ENABLE=		clamd=yes
-CLAMD_RUN_DEPENDS=		${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
+CLAMD_RUN_DEPENDS=		${LOCALBASE}/sbin/clamd:security/clamav
 ICAP_CONFIGURE_ENABLE=		icap
 KAV_CONFIGURE_ENABLE=		kavd
 NTLM_CONFIGURE_ENABLE=		ntlm
-NTLM_RUN_DEPENDS=		${LOCALBASE}/bin/iconv:${PORTSDIR}/converters/libiconv
+NTLM_RUN_DEPENDS=		${LOCALBASE}/bin/iconv:converters/libiconv
 NTLM_USES=			iconv
 DNS_CONFIGURE_ENABLE=		dnsauth
 EMAIL_CONFIGURE_ENABLE=		email
diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile
index e8383a974d42..38c2b405ba7e 100644
--- a/www/edbrowse/Makefile
+++ b/www/edbrowse/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Line-oriented Web browser and text editor
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	${UNZIP_CMD}:archivers/unzip
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libmozjs-24.so:lang/spidermonkey24 \
+		libcurl.so:ftp/curl
 
 USE_OPENSSL=	yes
 USES=		compiler:c11 readline zip
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index b41a146859d8..4d2bf659872d 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -40,7 +40,7 @@ FASTMEM_DESC=		Fast memory allocation functions
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
-GUILE_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+GUILE_LIB_DEPENDS=	libguile.so:lang/guile
 GUILE_CONFIGURE_WITH=	guile
 
 LUA_USES=		lua:51
@@ -53,7 +53,7 @@ PERL_CONFIGURE_WITH=	perl
 
 FASTMEM_CONFIGURE_ON=	--enable-fastmem
 
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_WITH=	idn
 
 NOROOT_CONFIGURE_ON=	--enable-no-root
@@ -62,12 +62,12 @@ HIGHLIGHT_CONFIGURE_ON=	--enable-html-highlight
 
 EXMODE_CONFIGURE_ON=	--enable-exmode
 
-SMB_RUN_DEPENDS=	smbclient:${PORTSDIR}/${SAMBA_PORT}
-SMB_BUILD_DEPENDS=	smbclient:${PORTSDIR}/${SAMBA_PORT}
+SMB_RUN_DEPENDS=	smbclient:${SAMBA_PORT}
+SMB_BUILD_DEPENDS=	smbclient:${SAMBA_PORT}
 SMB_CONFIGURE_ENABLE=	smb
 
-FSP_RUN_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:${PORTSDIR}/net/fsplib
-FSP_BUILD_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:${PORTSDIR}/net/fsplib
+FSP_RUN_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
+FSP_BUILD_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
 FSP_CONFIGURE_ENABLE=	fsp
 
 FTP_CONFIGURE_ENABLE=	ftp
@@ -84,7 +84,7 @@ FINGER_CONFIGURE_ENABLE=	finger
 
 LOCAL_CGI_CONFIGURE_ENABLE=	cgi
 
-XBELMARKS_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+XBELMARKS_LIB_DEPENDS=	libexpat.so:textproc/expat2
 XBELMARKS_CONFIGURE_ON=	--enable-xbel --with-expat
 XBELNARKS_CONFIGURE_OFF=--disable-xbel
 
@@ -92,9 +92,9 @@ XBELNARKS_CONFIGURE_OFF=--disable-xbel
 
 88COLORS_CONFIGURE_ON=	--enable-88-colors
 
-SPIDERMONKEY_BUILD_DEPENDS=	${LOCALBASE}/lib/libjs.so:${PORTSDIR}/lang/spidermonkey17
-SPIDERMONKEY_RUN_DEPENDS=	js:${PORTSDIR}/lang/spidermonkey17
-SPIDERMONKEY_LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr
+SPIDERMONKEY_BUILD_DEPENDS=	${LOCALBASE}/lib/libjs.so:lang/spidermonkey17
+SPIDERMONKEY_RUN_DEPENDS=	js:lang/spidermonkey17
+SPIDERMONKEY_LIB_DEPENDS=	libnspr4.so:devel/nspr
 SPIDERMONKEY_CFLAGS=		-I${LOCALBASE}/include/nspr
 SPIDERMONKEY_LDFLAGS=		-lnspr4 -pthread -lpthread -lm
 SPIDERMONKEY_CONFIGURE_ON=	--enable-sm-scripting --with-spidermonkey
diff --git a/www/elixir-phoenix/Makefile b/www/elixir-phoenix/Makefile
index dc424bd2dfd5..36b0e11f4d5a 100644
--- a/www/elixir-phoenix/Makefile
+++ b/www/elixir-phoenix/Makefile
@@ -18,8 +18,8 @@ GH_ACCOUNT=	phoenixframework
 OPTIONS_DEFINE=	COWBOY
 COWBOY_DESC=	Use Cowboy library
 
-COWBOY_BUILD_DEPENDS=	erlang-cowboy>=0:${PORTSDIR}/www/erlang-cowboy
-COWBOY_RUN_DEPENDS=	erlang-cowboy>=0:${PORTSDIR}/www/erlang-cowboy
+COWBOY_BUILD_DEPENDS=	erlang-cowboy>=0:www/erlang-cowboy
+COWBOY_RUN_DEPENDS=	erlang-cowboy>=0:www/erlang-cowboy
 
 .include <bsd.port.options.mk>
 
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 09c81f9362a9..81f874453eb7 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -91,16 +91,16 @@ SEMI_PORT?=	${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}
 MULE_UCS_PORT?=	${PORTSDIR}/converters/mule-ucs-${EMACS_PORT_NAME}
 MULE_UCS_ELISP_FILE=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs/un-define.el
 
-BUILD_DEPENDS+=	w3m:${PORTSDIR}/www/w3m
-RUN_DEPENDS+=	w3m:${PORTSDIR}/www/w3m
+BUILD_DEPENDS+=	w3m:www/w3m
+RUN_DEPENDS+=	w3m:www/w3m
 .if ${PORT_OPTIONS:MSHIMBUN}
 BUILD_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
 RUN_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
 .endif
 .if ${PORT_OPTIONS:MOCTET_VIEWER}
 RUN_DEPENDS+=	${SEMI_COOKIE}:${SEMI_PORT} \
-		wvHtml:${PORTSDIR}/textproc/wv \
-		xlhtml:${PORTSDIR}/textproc/xlhtml
+		wvHtml:textproc/wv \
+		xlhtml:textproc/xlhtml
 PLIST_SUB+=	OCTET_VIEWER=""
 .else
 PLIST_SUB+=	OCTET_VIEWER="@comment "
diff --git a/www/ephemera/Makefile b/www/ephemera/Makefile
index c13890c96d94..1061577dc065 100644
--- a/www/ephemera/Makefile
+++ b/www/ephemera/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Blog server
 LICENSE=	BSD3CLAUSE
 
 USES=		sqlite
-RUN_DEPENDS=	munger:${PORTSDIR}/lang/munger
+RUN_DEPENDS=	munger:lang/munger
 
 DATADIR=	${PREFIX}/share/ephemera
 
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index f7083c1d72e6..e5fc8dbf71fe 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -11,21 +11,21 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Extremely lightweight and simple web browser for GNOME 3
 
-BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		itstool:${PORTSDIR}/textproc/itstool \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 \
-		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libavahi-gobject.so:${PORTSDIR}/net/avahi-app \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libsecret-1.so:${PORTSDIR}/security/libsecret
-RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
-		gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		itstool:textproc/itstool \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libgcr-3.so:security/gcr \
+		libstartup-notification-1.so:x11/startup-notification \
+		libnss3.so:security/nss \
+		libavahi-gobject.so:net/avahi-app \
+		libnotify.so:devel/libnotify \
+		libsecret-1.so:security/libsecret
+RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \
+		gnome-icon-theme>=0:misc/gnome-icon-theme
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/www/fcgiwrap/Makefile b/www/fcgiwrap/Makefile
index 846e53aa17f1..15f50719530d 100644
--- a/www/fcgiwrap/Makefile
+++ b/www/fcgiwrap/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple FastCGI wrapper for CGI scripts
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
+LIB_DEPENDS=	libfcgi.so:www/fcgi
 
 USES=		autoreconf gmake pkgconfig
 
diff --git a/www/feedjack/Makefile b/www/feedjack/Makefile
index c645e43dc86c..fe393931a131 100644
--- a/www/feedjack/Makefile
+++ b/www/feedjack/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	Feedjack-${PORTVERSION}
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Feed aggregator written in Python using the Django framework
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser \
-		django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser \
+		django-admin.py:www/py-django18
 
 DIST_SUBDIR=	python
 USES=		python
diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile
index b0bea2069e7c..23daa1486d5a 100644
--- a/www/firefox-esr-i18n/Makefile
+++ b/www/firefox-esr-i18n/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	xpi/${DISTNAME}
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Localized interface for Firefox
 
-EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+EXTRACT_DEPENDS=	zip:archivers/zip
 
 USES=		zip:infozip gecko:firefox,build
 USE_XPI=	firefox
@@ -33,7 +33,7 @@ PLISTF?=	${WRKDIR}/plist_files
 .include <bsd.port.pre.mk>
 
 .ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
+RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:www/xpi-quick-locale-switcher
 .endif
 
 .include "${.CURDIR}/Makefile.lang"
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index b573e2370baa..4b39ae22a900 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -14,23 +14,23 @@ PKGNAMESUFFIX=	-esr
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.10.10:${PORTSDIR}/devel/nspr \
-		nss>=3.19.2.1:${PORTSDIR}/security/nss \
-		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
-		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
-		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
-		libvorbis>=1.3.5,3:${PORTSDIR}/audio/libvorbis \
-		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
-		sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
-		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
-		zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
-#		opus>=1.1:${PORTSDIR}/audio/opus \
-
-LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS=	nspr>=4.10.10:devel/nspr \
+		nss>=3.19.2.1:security/nss \
+		libevent2>=2.0.21_2:devel/libevent2 \
+		soundtouch>=1.8.0:audio/soundtouch \
+		harfbuzz>=0.9.34:print/harfbuzz \
+		graphite2>=1.2.4:graphics/graphite2 \
+		libvorbis>=1.3.5,3:audio/libvorbis \
+		libvpx>=1.3.0:multimedia/libvpx \
+		sqlite3>=3.8.9:databases/sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		v4l_compat>0:multimedia/v4l_compat \
+		autoconf-2.13:devel/autoconf213 \
+		zip:archivers/zip \
+		unzip:archivers/unzip
+#		opus>=1.1:audio/opus \
+
+LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
index dcec1fc7ceac..2e95f76023d9 100644
--- a/www/firefox-i18n/Makefile
+++ b/www/firefox-i18n/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	xpi/${DISTNAME}
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Localized interface for Firefox
 
-EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+EXTRACT_DEPENDS=	zip:archivers/zip
 
 USES=		zip:infozip gecko:firefox,45,build
 USE_XPI=	firefox linux-firefox
@@ -32,7 +32,7 @@ PLISTF?=	${WRKDIR}/plist_files
 .include <bsd.port.pre.mk>
 
 .ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
+RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:www/xpi-quick-locale-switcher
 .endif
 
 .include "${.CURDIR}/Makefile.lang"
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index bce785892a04..1b284de9850a 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -13,24 +13,24 @@ MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.12:${PORTSDIR}/devel/nspr \
-		nss>=3.21.1:${PORTSDIR}/security/nss \
-		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		soundtouch>=1.9.0:${PORTSDIR}/audio/soundtouch \
-		harfbuzz>=1.1.0:${PORTSDIR}/print/harfbuzz \
-		graphite2>=1.3.6:${PORTSDIR}/graphics/graphite2 \
-		png>=1.6.19:${PORTSDIR}/graphics/png \
-		libvorbis>=1.3.5,3:${PORTSDIR}/audio/libvorbis \
-		libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \
-		sqlite3>=3.9.1:${PORTSDIR}/databases/sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
-		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
-		yasm:${PORTSDIR}/devel/yasm \
-		zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
-
-LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS=	nspr>=4.12:devel/nspr \
+		nss>=3.21.1:security/nss \
+		libevent2>=2.0.21_2:devel/libevent2 \
+		soundtouch>=1.9.0:audio/soundtouch \
+		harfbuzz>=1.1.0:print/harfbuzz \
+		graphite2>=1.3.6:graphics/graphite2 \
+		png>=1.6.19:graphics/png \
+		libvorbis>=1.3.5,3:audio/libvorbis \
+		libvpx>=1.5.0:multimedia/libvpx \
+		sqlite3>=3.9.1:databases/sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		v4l_compat>0:multimedia/v4l_compat \
+		autoconf-2.13:devel/autoconf213 \
+		yasm:devel/yasm \
+		zip:archivers/zip \
+		unzip:archivers/unzip
+
+LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.*
diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index 2fd2e310439a..23cc007ad995 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	C library for the Flickr API
 LICENSE=	APACHE20 GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 OPTIONS_DEFINE=	RAPTOR DOCS
 OPTIONS_RADIO=	WEBSERVICE
@@ -33,7 +33,7 @@ OFFLINE_CONFIGURE_ON=		--enable-offline
 OFFLINE_CONFIGURE_OFF=		offline=no
 CAPTURE_CONFIGURE_ON=		--enable-capture
 CAPTURE_CONFIGURE_OFF=		capture=no
-RAPTOR_LIB_DEPENDS=		libraptor2.so:${PORTSDIR}/textproc/raptor2
+RAPTOR_LIB_DEPENDS=		libraptor2.so:textproc/raptor2
 RAPTOR_CONFIGURE_ON=		--with-raptor=2
 RAPTOR_CONFIGURE_OFF=		--with-raptor=no
 
diff --git a/www/flood/Makefile b/www/flood/Makefile
index d1dab73d3f30..3bf9ab90cd17 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	httpd-test_20041105052051
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Profile-driven HTTP load tester
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libapr-1.so:devel/apr1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apr=${LOCALBASE}/bin/apr-1-config \
diff --git a/www/fnord/Makefile b/www/fnord/Makefile
index 893f017758d1..36906af3753f 100644
--- a/www/fnord/Makefile
+++ b/www/fnord/Makefile
@@ -27,8 +27,8 @@ DIR_LIST_DESC=		Enable directory listing
 SYSTEM_SYMLINK_DEREF_DESC=	Enable system symlink (needs DIR_LIST)
 OLD_STYLE_REDIRECT_DESC= Enable old style redirection
 
-DAEMONTOOLS_RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools
-TCPSERVER_RUN_DEPENDS=		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+DAEMONTOOLS_RUN_DEPENDS=	setuidgid:sysutils/daemontools
+TCPSERVER_RUN_DEPENDS=		tcpserver:sysutils/ucspi-tcp
 
 MAKE_ARGS+=	DIET="" CC="${CC}" CXX="${CXX}"
 
diff --git a/www/foswiki/Makefile b/www/foswiki/Makefile
index c8a6a26a4a23..7abc498206fb 100644
--- a/www/foswiki/Makefile
+++ b/www/foswiki/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Free and open source enterprise wiki
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Error>=0.15:${PORTSDIR}/lang/p5-Error \
-		p5-Algorithm-Diff>=1.1901:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-Text-Diff>=0.35:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-Sort-Maker>=0.06:${PORTSDIR}/devel/p5-Sort-Maker
+RUN_DEPENDS=	p5-Error>=0.15:lang/p5-Error \
+		p5-Algorithm-Diff>=1.1901:devel/p5-Algorithm-Diff \
+		p5-Text-Diff>=0.35:textproc/p5-Text-Diff \
+		p5-Sort-Maker>=0.06:devel/p5-Sort-Maker
 
 USES=		cpe perl5 tar:tgz
 NO_BUILD=	yes
@@ -28,18 +28,18 @@ OPTINT_DESC=	Perl modules for intl character support
 OPTOTH_DESC=	Other optional Perl modules
 APACHE_DESC=	Apache web server and sample config file
 
-OPTINT_RUN_DEPENDS=	p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon
-OPTOTH_RUN_DEPENDS=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
-		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-CGI-Session>=4.40:${PORTSDIR}/www/p5-CGI-Session \
-		p5-CSS-Minifier-XS>=0:${PORTSDIR}/textproc/p5-CSS-Minifier-XS \
-		p5-JavaScript-Minifier-XS>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier-XS \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Lingua-EN-Sentence>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Sentence \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-HTML-Tree>=3.23:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Net>=1.19:${PORTSDIR}/net/p5-Net
+OPTINT_RUN_DEPENDS=	p5-Locale-Maketext-Lexicon>=0:devel/p5-Locale-Maketext-Lexicon
+OPTOTH_RUN_DEPENDS=	p5-Apache-Htpasswd>=0:security/p5-Apache-Htpasswd \
+		p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-CGI-Session>=4.40:www/p5-CGI-Session \
+		p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
+		p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Lingua-EN-Sentence>=0:textproc/p5-Lingua-EN-Sentence \
+		p5-libwww>=0:www/p5-libwww \
+		p5-HTML-Tree>=3.23:www/p5-HTML-Tree \
+		p5-Net>=1.19:net/p5-Net
 APACHE_USE=	APACHE_RUN=22+
 APACHE_SUB_FILES=	pkg-message-apache
 APACHE_SUB_LIST=	FOSCONFDIR=${CONFDIR}
diff --git a/www/foswiki/bsd.foswiki.mk b/www/foswiki/bsd.foswiki.mk
index 74733eb6a423..83db1c6e1ab3 100644
--- a/www/foswiki/bsd.foswiki.mk
+++ b/www/foswiki/bsd.foswiki.mk
@@ -24,7 +24,7 @@ FWDIR?=		${WWWDIR}
 PKGNAMEPREFIX?=	foswiki-
 PNAME=		${PORTNAME}
 FILESDIR?=	${.CURDIR}/../foswiki/files
-BUILD_DEPENDS+=	foswiki>=0:${PORTSDIR}/www/foswiki
+BUILD_DEPENDS+=	foswiki>=0:www/foswiki
 FWDIR?=		${WWWDIR}
 .endif
 
@@ -92,7 +92,7 @@ make-port:
 	echo >> Makefile &&\
 	echo 'COMMENT=	' >> Makefile &&\
 	echo >> Makefile &&\
-	echo 'BUILD_DEPENDS=	foswiki>=0:${PORTSDIR}/www/foswiki' >> Makefile &&\
+	echo 'BUILD_DEPENDS=	foswiki>=0:www/foswiki' >> Makefile &&\
 	echo >> Makefile &&\
 	echo '.include "$${.CURDIR}/../foswiki/bsd.foswiki.mk"' >> Makefile &&\
 	echo '.include <bsd.port.mk>' >> Makefile &&\
diff --git a/www/fswiki/Makefile b/www/fswiki/Makefile
index 7e8a4854a75c..de2a40eb9931 100644
--- a/www/fswiki/Makefile
+++ b/www/fswiki/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	wiki${PORTVERSION:S|.|_|g}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	FreeStyle Wiki (perl based wiki clone)
 
-RUN_DEPENDS=	ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
+RUN_DEPENDS=	ja-p5-Jcode>=0:japanese/p5-Jcode \
+		p5-HTML-Template>=0:www/p5-HTML-Template
 
 USES=		perl5 shebangfix zip
 SHEBANG_FILES=	wiki.cgi
diff --git a/www/g-gcl/Makefile b/www/g-gcl/Makefile
index 2eabd7ba5a11..1ecb20211562 100644
--- a/www/g-gcl/Makefile
+++ b/www/g-gcl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.whizkidtech.redprince.net/gcl/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sample counter scripts for Graphic Counter Language
 
-RUN_DEPENDS=	gracula:${PORTSDIR}/graphics/gracula
+RUN_DEPENDS=	gracula:graphics/gracula
 
 NO_BUILD= 	yes
 
diff --git a/www/gaeo/Makefile b/www/gaeo/Makefile
index 4a50c2de1d4b..e954c8122688 100644
--- a/www/gaeo/Makefile
+++ b/www/gaeo/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Open-source web framework running on Google App Engine
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	google-appengine>=1.1.0:${PORTSDIR}/www/google-appengine \
-		${PYTHON_PKGNAMEPREFIX}simplejson>1.9:${PORTSDIR}/devel/py-simplejson
+RUN_DEPENDS=	google-appengine>=1.1.0:www/google-appengine \
+		${PYTHON_PKGNAMEPREFIX}simplejson>1.9:devel/py-simplejson
 
 PROJECTHOST=	google-app-engine-oil
 
diff --git a/www/gaeutilities/Makefile b/www/gaeutilities/Makefile
index 93ee10866d36..cae8d279bedd 100644
--- a/www/gaeutilities/Makefile
+++ b/www/gaeutilities/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility classes to make working with Google App Engine easier
 
-RUN_DEPENDS=	google-appengine>=1.2.4_1:${PORTSDIR}/www/google-appengine
+RUN_DEPENDS=	google-appengine>=1.2.4_1:www/google-appengine
 
 USES=		python:2 # same as www/google-appengine
 USE_GITHUB=	yes
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index 7460c7e0452a..cec5d89dbf56 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -28,19 +28,19 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 SUB_FILES=	pkg-message
 
-DCRAW_RUN_DEPENDS=	dcraw:${PORTSDIR}/graphics/dcraw
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-GD_RUN_DEPENDS=		pngtogd:${PORTSDIR}/graphics/gd
+DCRAW_RUN_DEPENDS=	dcraw:graphics/dcraw
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+GD_RUN_DEPENDS=		pngtogd:graphics/gd
 GD_USE=			PHP=gd
-GRAPHMAGICK_RUN_DEPENDS=gm:${PORTSDIR}/graphics/GraphicsMagick
-IMAGEMAGICK_RUN_DEPENDS=convert:${PORTSDIR}/graphics/ImageMagick
-JHEAD_RUN_DEPENDS=	jhead:${PORTSDIR}/graphics/jhead
+GRAPHMAGICK_RUN_DEPENDS=gm:graphics/GraphicsMagick
+IMAGEMAGICK_RUN_DEPENDS=convert:graphics/ImageMagick
+JHEAD_RUN_DEPENDS=	jhead:graphics/jhead
 MYSQL_USE=		PHP=mysqli
-NETPBM_RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
+NETPBM_RUN_DEPENDS=	giftopnm:graphics/netpbm
 NLS_USE=		PHP=gettext
 NLS_USES=		gettext
 PGSQL_USE=		PHP=pgsql
-UNZIP_RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+UNZIP_RUN_DEPENDS=	unzip:archivers/unzip
 
 do-install:
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index 6d3138156420..20b18df226d6 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -35,36 +35,36 @@ WWWDIR=		${GALLERY3DIR}
 .endif
 
 .if ${PORT_OPTIONS:MDCRAW}
-RUN_DEPENDS+=	dcraw:${PORTSDIR}/graphics/dcraw
+RUN_DEPENDS+=	dcraw:graphics/dcraw
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MGD}
 USE_PHP+=	gd
-RUN_DEPENDS+=	pngtogd:${PORTSDIR}/graphics/gd
+RUN_DEPENDS+=	pngtogd:graphics/gd
 .endif
 
 .if ${PORT_OPTIONS:MGRAPHMAGICK}
-RUN_DEPENDS+=	gm:${PORTSDIR}/graphics/GraphicsMagick
+RUN_DEPENDS+=	gm:graphics/GraphicsMagick
 .endif
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
 .if ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .else
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick-nox11
+RUN_DEPENDS+=	convert:graphics/ImageMagick-nox11
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MJHEAD}
-RUN_DEPENDS+=	jhead:${PORTSDIR}/graphics/jhead
+RUN_DEPENDS+=	jhead:graphics/jhead
 .endif
 
 .if ${PORT_OPTIONS:MNETPBM}
-RUN_DEPENDS+=	giftopnm:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS+=	giftopnm:graphics/netpbm
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
@@ -73,7 +73,7 @@ USES+=		gettext
 .endif
 
 .if ${PORT_OPTIONS:MUNZIP}
-RUN_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS+=	unzip:archivers/unzip
 .endif
 
 do-install:
diff --git a/www/gatling/Makefile b/www/gatling/Makefile
index ad559507faef..05aa81f28d90 100644
--- a/www/gatling/Makefile
+++ b/www/gatling/Makefile
@@ -11,7 +11,7 @@ COMMENT=	High performance webserver with scalability benchmark tools
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	libowfat>=0.29:${PORTSDIR}/devel/libowfat
+BUILD_DEPENDS=	libowfat>=0.29:devel/libowfat
 
 USES=		gmake tar:bzip2
 USE_OPENSSL=	yes
diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile
index 206c234a56bc..bd06d14e48f1 100644
--- a/www/gecko-mediaplayer/Makefile
+++ b/www/gecko-mediaplayer/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Multimedia browser plugin for Gecko based browsers
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libnspr4.so:${PORTSDIR}/devel/nspr \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libgmlib.so:${PORTSDIR}/multimedia/gmtk
-RUN_DEPENDS=	gnome-mplayer:${PORTSDIR}/multimedia/gnome-mplayer
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libnspr4.so:devel/nspr \
+		libcurl.so:ftp/curl \
+		libgmlib.so:multimedia/gmtk
+RUN_DEPENDS=	gnome-mplayer:multimedia/gnome-mplayer
 
 USES=		compiler:c++11-lang gecko gettext pkgconfig webplugin:native
 USE_GNOME=	glib20
diff --git a/www/geeknote/Makefile b/www/geeknote/Makefile
index c87862840cd1..7870e2b6728b 100644
--- a/www/geeknote/Makefile
+++ b/www/geeknote/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Command line client for Evernote
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}evernote>=1.17:${PORTSDIR}/www/py-evernote \
-		${PYTHON_PKGNAMEPREFIX}html2text>0:${PORTSDIR}/textproc/py-html2text \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}markdown2>0:${PORTSDIR}/textproc/py-markdown2 \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}evernote>=1.17:www/py-evernote \
+		${PYTHON_PKGNAMEPREFIX}html2text>0:textproc/py-html2text \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}markdown2>0:textproc/py-markdown2 \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift
 
 USES=		python:-2.7
 USE_GITHUB=	yes
diff --git a/www/geneweb/Makefile b/www/geneweb/Makefile
index 264474d5beb6..68d30d84db9a 100644
--- a/www/geneweb/Makefile
+++ b/www/geneweb/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Advanced genealogy software
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		camlp5:${PORTSDIR}/devel/ocaml-camlp5
+BUILD_DEPENDS=	ocamlc:lang/ocaml \
+		camlp5:devel/ocaml-camlp5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	geneanet
diff --git a/www/get_flash_videos/Makefile b/www/get_flash_videos/Makefile
index 5b790ab31a46..f1fa4d483910 100644
--- a/www/get_flash_videos/Makefile
+++ b/www/get_flash_videos/Makefile
@@ -15,15 +15,15 @@ COMMENT=	Download videos from various Flash-based video hosting sites
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-		p5-Crypt-Blowfish_PP>=0:${PORTSDIR}/security/p5-Crypt-Blowfish_PP \
-		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-Data-AMF>=0:${PORTSDIR}/converters/p5-Data-AMF \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		rtmpdump>=2.4.0:${PORTSDIR}/multimedia/rtmpdump
+		p5-Crypt-Blowfish_PP>=0:security/p5-Crypt-Blowfish_PP \
+		p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+		p5-Data-AMF>=0:converters/p5-Data-AMF \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-IO-Compress>=0:archivers/p5-IO-Compress \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		rtmpdump>=2.4.0:multimedia/rtmpdump
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/www/getleft/Makefile b/www/getleft/Makefile
index 73a1481f0ddb..4dc5662cf568 100644
--- a/www/getleft/Makefile
+++ b/www/getleft/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	Getleft-v${PORTVERSION}
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Web site downloader
 
-RUN_DEPENDS=	${LOCALBASE}/lib/Tktable2.10/libTktable2.10.so:${PORTSDIR}/x11-toolkits/tktable \
-		${LOCALBASE}/lib/libttkstub.a:${PORTSDIR}/x11-toolkits/tile
+RUN_DEPENDS=	${LOCALBASE}/lib/Tktable2.10/libTktable2.10.so:x11-toolkits/tktable \
+		${LOCALBASE}/lib/libttkstub.a:x11-toolkits/tile
 
 USES=		tk
 PORTSCOUT=	ignore:1
diff --git a/www/gist/Makefile b/www/gist/Makefile
index 449b9449c31a..ad6984680576 100644
--- a/www/gist/Makefile
+++ b/www/gist/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Gist pastebin posting command
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.MIT
 
-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
 
 CONFLICTS=	p5-App-gist-[0-9]*
 
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 1576aa7ddc83..c550439aac27 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Smart reverse proxy for GitLab
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go>=1.5.3:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go>=1.5.3:lang/go
 
 PLIST_FILES=	bin/gitlab-workhorse \
 		bin/gitlab-zip-cat \
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 14e056cce5ce..f9e860b43072 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -11,133 +11,133 @@ COMMENT=	Web GUI for managing git repositories
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	ruby>=2.1.8:${PORTSDIR}/lang/ruby21 \
-	gem:${PORTSDIR}/devel/ruby-gems
-RUN_DEPENDS=	git>=2.4.3:${PORTSDIR}/devel/git \
-	gitlab-shell>=2.6.10:${PORTSDIR}/devel/gitlab-shell\
-	gitlab-workhorse>=0.6.4:${PORTSDIR}/www/gitlab-workhorse \
-	redis>=2.8.23:${PORTSDIR}/databases/redis \
-	rubygem-rails4>=4.2.5.2:${PORTSDIR}/www/rubygem-rails4 \
-	rubygem-rails-deprecated_sanitizer>=1.0.3:${PORTSDIR}/devel/rubygem-rails-deprecated_sanitizer \
-	rubygem-responders>=2.0:${PORTSDIR}/www/rubygem-responders \
-	rubygem-sprockets>=2.12.3:${PORTSDIR}/devel/rubygem-sprockets \
-	rubygem-default_value_for>=3.0.1:${PORTSDIR}/devel/rubygem-default_value_for \
-	rubygem-pg>=0.18.2:${PORTSDIR}/databases/rubygem-pg \
-	rubygem-devise-rails4>=3.5.4:${PORTSDIR}/devel/rubygem-devise-rails4 \
-	rubygem-devise-async-rails4>=0.9.0:${PORTSDIR}/devel/rubygem-devise-async-rails4 \
-	rubygem-doorkeeper>=2.2.0:${PORTSDIR}/security/rubygem-doorkeeper \
-	rubygem-omniauth>=1.3.1:${PORTSDIR}/security/rubygem-omniauth \
-	rubygem-omniauth-azure-oauth2>=0.0.6:${PORTSDIR}/net/rubygem-omniauth-azure-oauth2 \
-	rubygem-omniauth-bitbucket>=0.0.2:${PORTSDIR}/security/rubygem-omniauth-bitbucket \
-	rubygem-omniauth-cas3>=1.1.2:${PORTSDIR}/security/rubygem-omniauth-cas3 \
-	rubygem-omniauth-facebook>=3.0.0:${PORTSDIR}/net/rubygem-omniauth-facebook \
-	rubygem-omniauth-github>=1.1.1:${PORTSDIR}/net/rubygem-omniauth-github \
-	rubygem-omniauth-gitlab>=1.0.0:${PORTSDIR}/security/rubygem-omniauth-gitlab \
-	rubygem-omniauth-google-oauth2>=0.2.0:${PORTSDIR}/net/rubygem-omniauth-google-oauth2 \
-	rubygem-omniauth-saml>=1.4.2:${PORTSDIR}/security/rubygem-omniauth-saml \
-	rubygem-omniauth-shibboleth>=1.2.0:${PORTSDIR}/security/rubygem-omniauth-shibboleth \
-	rubygem-omniauth-twitter>=1.2.0:${PORTSDIR}/net/rubygem-omniauth-twitter \
-	rubygem-omniauth_crowd>=2.2.0:${PORTSDIR}/devel/rubygem-omniauth_crowd \
-	rubygem-rack-oauth2>=1.2.1:${PORTSDIR}/security/rubygem-rack-oauth2 \
-	rubygem-recaptcha>=0:${PORTSDIR}/devel/rubygem-recaptcha \
-	rubygem-akismet>=2.0:${PORTSDIR}/devel/rubygem-akismet \
-	rubygem-devise-two-factor>=2.0.0:${PORTSDIR}/security/rubygem-devise-two-factor \
-	rubygem-rqrcode-rails3>=0.1.7:${PORTSDIR}/www/rubygem-rqrcode-rails3 \
-	rubygem-attr_encrypted>=1.3.4:${PORTSDIR}/security/rubygem-attr_encrypted \
-	rubygem-browser>=1.0.0:${PORTSDIR}/www/rubygem-browser \
-	rubygem-gitlab_git>=8.2:${PORTSDIR}/devel/rubygem-gitlab_git \
-	rubygem-gitlab_omniauth-ldap>=1.2.1:${PORTSDIR}/net/rubygem-gitlab_omniauth-ldap \
-	rubygem-gollum-lib>=4.1.0:${PORTSDIR}/www/rubygem-gollum-lib \
-	rubygem-github-linguist>=4.7.0:${PORTSDIR}/textproc/rubygem-github-linguist \
-	rubygem-grape>=0.13.0:${PORTSDIR}/devel/rubygem-grape \
-	rubygem-grape-entity>=0.4.2:${PORTSDIR}/devel/rubygem-grape-entity \
-	rubygem-rack-cors>=0.4.0:${PORTSDIR}/www/rubygem-rack-cors \
-	rubygem-kaminari-rails4>=0.16.3:${PORTSDIR}/www/rubygem-kaminari-rails4 \
-	rubygem-haml-rails-rails4>=0.9.0:${PORTSDIR}/www/rubygem-haml-rails-rails4 \
-	rubygem-carrierwave>=0.9.0:${PORTSDIR}/www/rubygem-carrierwave \
-	rubygem-dropzonejs-rails>=0.7.1:${PORTSDIR}/www/rubygem-dropzonejs-rails \
-	rubygem-fog>=1.36:${PORTSDIR}/devel/rubygem-fog \
-	rubygem-unf>=0.1.4:${PORTSDIR}/textproc/rubygem-unf \
-	rubygem-six>=0.2.0:${PORTSDIR}/security/rubygem-six \
-	rubygem-seed-fu>=2.3.5:${PORTSDIR}/databases/rubygem-seed-fu \
-	rubygem-html-pipeline1>=1.11.0:${PORTSDIR}/textproc/rubygem-html-pipeline1 \
-	rubygem-task_list>=1.0.2:${PORTSDIR}/www/rubygem-task_list \
-	rubygem-github-markup>=1.3.1:${PORTSDIR}/textproc/rubygem-github-markup \
-	rubygem-redcarpet>=3.3.3:${PORTSDIR}/textproc/rubygem-redcarpet \
-	rubygem-redcloth>=4.2.9:${PORTSDIR}/www/rubygem-redcloth \
-	rubygem-rdoc>=3.6:${PORTSDIR}/devel/rubygem-rdoc \
-	rubygem-org-ruby>=0.9.12:${PORTSDIR}/textproc/rubygem-org-ruby \
-	rubygem-creole>=0.5.0:${PORTSDIR}/textproc/rubygem-creole \
-	rubygem-wikicloth>=0.8.1:${PORTSDIR}/textproc/rubygem-wikicloth \
-	rubygem-asciidoctor>=1.5.2:${PORTSDIR}/textproc/rubygem-asciidoctor \
-	rubygem-rouge>=1.10.1:${PORTSDIR}/textproc/rubygem-rouge \
-	rubygem-nokogiri>=1.6.7.2:${PORTSDIR}/textproc/rubygem-nokogiri  \
-	rubygem-diffy>=3.0.3:${PORTSDIR}/textproc/rubygem-diffy \
-	rubygem-unicorn>=4.8.2:${PORTSDIR}/www/rubygem-unicorn \
-	rubygem-unicorn-worker-killer>=0.4.2:${PORTSDIR}/www/rubygem-unicorn-worker-killer \
-	rubygem-state_machines-activerecord>=0.3.0:${PORTSDIR}/databases/rubygem-state_machines-activerecord \
-	rubygem-after_commit_queue>=0:${PORTSDIR}/databases/rubygem-after_commit_queue \
-	rubygem-acts-as-taggable-on3>=3.4.0:${PORTSDIR}/www/rubygem-acts-as-taggable-on3 \
-	rubygem-sinatra>=1.4.4:${PORTSDIR}/www/rubygem-sinatra \
-	rubygem-sidekiq>=4.0:${PORTSDIR}/devel/rubygem-sidekiq \
-	rubygem-sidekiq-cron>=0.4.0:${PORTSDIR}/devel/rubygem-sidekiq-cron \
-	rubygem-redis-namespace>=0:${PORTSDIR}/databases/rubygem-redis-namespace \
-	rubygem-httparty>=0.13.3:${PORTSDIR}/www/rubygem-httparty \
-	rubygem-colorize>=0.7.0:${PORTSDIR}/devel/rubygem-colorize \
-	rubygem-settingslogic>=2.0.9:${PORTSDIR}/devel/rubygem-settingslogic \
-	rubygem-version_sorter>=2.0.0:${PORTSDIR}/textproc/rubygem-version_sorter \
-	rubygem-redis-rails>=4.0.0:${PORTSDIR}/www/rubygem-redis-rails \
-	rubygem-tinder>=1.10.0:${PORTSDIR}/net-im/rubygem-tinder \
-	rubygem-hipchat>=1.5.0:${PORTSDIR}/net-im/rubygem-hipchat \
-	rubygem-gitlab-flowdock-git-hook>=1.0.1:${PORTSDIR}/www/rubygem-gitlab-flowdock-git-hook \
-	rubygem-gemnasium-gitlab-service>=0.2:${PORTSDIR}/devel/rubygem-gemnasium-gitlab-service \
-	rubygem-slack-notifier>=1.2.0:${PORTSDIR}/devel/rubygem-slack-notifier \
-	rubygem-asana>=0.4.0:${PORTSDIR}/www/rubygem-asana \
-	rubygem-ruby-fogbugz>=0.2.1:${PORTSDIR}/devel/rubygem-ruby-fogbugz \
-	rubygem-d3_rails-rails4>=3.5.0:${PORTSDIR}/www/rubygem-d3_rails-rails4 \
-	rubygem-cal-heatmap-rails-rails4>=3.5.0:${PORTSDIR}/www/rubygem-cal-heatmap-rails-rails4 \
-	rubygem-underscore-rails>=1.8.0:${PORTSDIR}/www/rubygem-underscore-rails \
-	rubygem-sanitize>=2.0:${PORTSDIR}/textproc/rubygem-sanitize \
-	rubygem-babosa>=1.0.2:${PORTSDIR}/textproc/rubygem-babosa \
-	rubygem-loofah>=2.0.3:${PORTSDIR}/textproc/rubygem-loofah \
-	rubygem-rack-attack>=4.3.1:${PORTSDIR}/www/rubygem-rack-attack \
-	rubygem-ace-rails-ap>=2.0.1:${PORTSDIR}/www/rubygem-ace-rails-ap \
-	rubygem-mousetrap-rails>=1.4.6:${PORTSDIR}/www/rubygem-mousetrap-rails \
-	rubygem-charlock_holmes>=0.7.3:${PORTSDIR}/textproc/rubygem-charlock_holmes \
-	rubygem-sass-rails5>=5.0.0:${PORTSDIR}/textproc/rubygem-sass-rails5 \
-	rubygem-coffee-rails4>=4.1.0:${PORTSDIR}/devel/rubygem-coffee-rails4 \
-	rubygem-uglifier>=2.7.2:${PORTSDIR}/www/rubygem-uglifier \
-	rubygem-turbolinks>=2.5.0:${PORTSDIR}/www/rubygem-turbolinks \
-	rubygem-jquery-turbolinks>=2.1.0:${PORTSDIR}/www/rubygem-jquery-turbolinks \
-	rubygem-addressable>=2.3.8:${PORTSDIR}/www/rubygem-addressable \
-	rubygem-bootstrap-sass>=3.3.0:${PORTSDIR}/www/rubygem-bootstrap-sass \
-	rubygem-font-awesome-rails-rails4>=4.2:${PORTSDIR}/devel/rubygem-font-awesome-rails-rails4 \
-	rubygem-gitlab_emoji>=0.3:${PORTSDIR}/graphics/rubygem-gitlab_emoji \
-	rubygem-gon>=6.0.1:${PORTSDIR}/www/rubygem-gon \
-	rubygem-jquery-atwho-rails-rails4>=1.3.2:${PORTSDIR}/www/rubygem-jquery-atwho-rails-rails4 \
-	rubygem-jquery-rails4>=4.0.0:${PORTSDIR}/www/rubygem-jquery-rails4 \
-	rubygem-jquery-scrollto-rails>=1.4.3:${PORTSDIR}/www/rubygem-jquery-scrollto-rails \
-	rubygem-jquery-ui-rails-rails4>=5.0.0:${PORTSDIR}/www/rubygem-jquery-ui-rails-rails4 \
-	rubygem-nprogress-rails>=0.1.6.7:${PORTSDIR}/devel/rubygem-nprogress-rails \
-	rubygem-raphael-rails>=2.1.2:${PORTSDIR}/www/rubygem-raphael-rails \
-	rubygem-request_store>=1.2.0:${PORTSDIR}/devel/rubygem-request_store \
-	rubygem-select2-rails>=3.5.9:${PORTSDIR}/www/rubygem-select2-rails \
-	rubygem-virtus>=1.0.1:${PORTSDIR}/devel/rubygem-virtus \
-	rubygem-net-ssh>=3.0.1:${PORTSDIR}/security/rubygem-net-ssh \
-	rubygem-sentry-raven>=0.15.4:${PORTSDIR}/devel/rubygem-sentry-raven \
-	rubygem-gitlab_meta>=7.0:${PORTSDIR}/devel/rubygem-gitlab_meta \
-	rubygem-newrelic_rpm>=3.9.4.245:${PORTSDIR}/devel/rubygem-newrelic_rpm \
-	rubygem-newrelic-grape>=0:${PORTSDIR}/devel/rubygem-newrelic-grape \
-	rubygem-newrelic_rpm>=3.14:${PORTSDIR}/devel/rubygem-newrelic_rpm \
-	rubygem-octokit>=3.8.0:${PORTSDIR}/net/rubygem-octokit \
-	rubygem-mail_room>=0.6.1:${PORTSDIR}/mail/rubygem-mail_room \
-	rubygem-email_reply_parser>=0.5.8:${PORTSDIR}/mail/rubygem-email_reply_parser \
-	rubygem-activerecord-deprecated_finders>=1.0.3:${PORTSDIR}/devel/rubygem-activerecord-deprecated_finders \
-	rubygem-activerecord-session_store>=0.1.0:${PORTSDIR}/databases/rubygem-activerecord-session_store \
-	rubygem-nested_form>=0.3.2:${PORTSDIR}/www/rubygem-nested_form \
-	rubygem-oauth2>=1.0.0:${PORTSDIR}/net/rubygem-oauth2 \
-	rubygem-paranoia>=2.0:${PORTSDIR}/databases/rubygem-paranoia \
-	rubygem-rinku>=1.7.3:${PORTSDIR}/www/rubygem-rinku
+BUILD_DEPENDS=	ruby>=2.1.8:lang/ruby21 \
+	gem:devel/ruby-gems
+RUN_DEPENDS=	git>=2.4.3:devel/git \
+	gitlab-shell>=2.6.10:devel/gitlab-shell\
+	gitlab-workhorse>=0.6.4:www/gitlab-workhorse \
+	redis>=2.8.23:databases/redis \
+	rubygem-rails4>=4.2.5.2:www/rubygem-rails4 \
+	rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \
+	rubygem-responders>=2.0:www/rubygem-responders \
+	rubygem-sprockets>=2.12.3:devel/rubygem-sprockets \
+	rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \
+	rubygem-pg>=0.18.2:databases/rubygem-pg \
+	rubygem-devise-rails4>=3.5.4:devel/rubygem-devise-rails4 \
+	rubygem-devise-async-rails4>=0.9.0:devel/rubygem-devise-async-rails4 \
+	rubygem-doorkeeper>=2.2.0:security/rubygem-doorkeeper \
+	rubygem-omniauth>=1.3.1:security/rubygem-omniauth \
+	rubygem-omniauth-azure-oauth2>=0.0.6:net/rubygem-omniauth-azure-oauth2 \
+	rubygem-omniauth-bitbucket>=0.0.2:security/rubygem-omniauth-bitbucket \
+	rubygem-omniauth-cas3>=1.1.2:security/rubygem-omniauth-cas3 \
+	rubygem-omniauth-facebook>=3.0.0:net/rubygem-omniauth-facebook \
+	rubygem-omniauth-github>=1.1.1:net/rubygem-omniauth-github \
+	rubygem-omniauth-gitlab>=1.0.0:security/rubygem-omniauth-gitlab \
+	rubygem-omniauth-google-oauth2>=0.2.0:net/rubygem-omniauth-google-oauth2 \
+	rubygem-omniauth-saml>=1.4.2:security/rubygem-omniauth-saml \
+	rubygem-omniauth-shibboleth>=1.2.0:security/rubygem-omniauth-shibboleth \
+	rubygem-omniauth-twitter>=1.2.0:net/rubygem-omniauth-twitter \
+	rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \
+	rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \
+	rubygem-recaptcha>=0:devel/rubygem-recaptcha \
+	rubygem-akismet>=2.0:devel/rubygem-akismet \
+	rubygem-devise-two-factor>=2.0.0:security/rubygem-devise-two-factor \
+	rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \
+	rubygem-attr_encrypted>=1.3.4:security/rubygem-attr_encrypted \
+	rubygem-browser>=1.0.0:www/rubygem-browser \
+	rubygem-gitlab_git>=8.2:devel/rubygem-gitlab_git \
+	rubygem-gitlab_omniauth-ldap>=1.2.1:net/rubygem-gitlab_omniauth-ldap \
+	rubygem-gollum-lib>=4.1.0:www/rubygem-gollum-lib \
+	rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
+	rubygem-grape>=0.13.0:devel/rubygem-grape \
+	rubygem-grape-entity>=0.4.2:devel/rubygem-grape-entity \
+	rubygem-rack-cors>=0.4.0:www/rubygem-rack-cors \
+	rubygem-kaminari-rails4>=0.16.3:www/rubygem-kaminari-rails4 \
+	rubygem-haml-rails-rails4>=0.9.0:www/rubygem-haml-rails-rails4 \
+	rubygem-carrierwave>=0.9.0:www/rubygem-carrierwave \
+	rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \
+	rubygem-fog>=1.36:devel/rubygem-fog \
+	rubygem-unf>=0.1.4:textproc/rubygem-unf \
+	rubygem-six>=0.2.0:security/rubygem-six \
+	rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \
+	rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \
+	rubygem-task_list>=1.0.2:www/rubygem-task_list \
+	rubygem-github-markup>=1.3.1:textproc/rubygem-github-markup \
+	rubygem-redcarpet>=3.3.3:textproc/rubygem-redcarpet \
+	rubygem-redcloth>=4.2.9:www/rubygem-redcloth \
+	rubygem-rdoc>=3.6:devel/rubygem-rdoc \
+	rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \
+	rubygem-creole>=0.5.0:textproc/rubygem-creole \
+	rubygem-wikicloth>=0.8.1:textproc/rubygem-wikicloth \
+	rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \
+	rubygem-rouge>=1.10.1:textproc/rubygem-rouge \
+	rubygem-nokogiri>=1.6.7.2:textproc/rubygem-nokogiri  \
+	rubygem-diffy>=3.0.3:textproc/rubygem-diffy \
+	rubygem-unicorn>=4.8.2:www/rubygem-unicorn \
+	rubygem-unicorn-worker-killer>=0.4.2:www/rubygem-unicorn-worker-killer \
+	rubygem-state_machines-activerecord>=0.3.0:databases/rubygem-state_machines-activerecord \
+	rubygem-after_commit_queue>=0:databases/rubygem-after_commit_queue \
+	rubygem-acts-as-taggable-on3>=3.4.0:www/rubygem-acts-as-taggable-on3 \
+	rubygem-sinatra>=1.4.4:www/rubygem-sinatra \
+	rubygem-sidekiq>=4.0:devel/rubygem-sidekiq \
+	rubygem-sidekiq-cron>=0.4.0:devel/rubygem-sidekiq-cron \
+	rubygem-redis-namespace>=0:databases/rubygem-redis-namespace \
+	rubygem-httparty>=0.13.3:www/rubygem-httparty \
+	rubygem-colorize>=0.7.0:devel/rubygem-colorize \
+	rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \
+	rubygem-version_sorter>=2.0.0:textproc/rubygem-version_sorter \
+	rubygem-redis-rails>=4.0.0:www/rubygem-redis-rails \
+	rubygem-tinder>=1.10.0:net-im/rubygem-tinder \
+	rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \
+	rubygem-gitlab-flowdock-git-hook>=1.0.1:www/rubygem-gitlab-flowdock-git-hook \
+	rubygem-gemnasium-gitlab-service>=0.2:devel/rubygem-gemnasium-gitlab-service \
+	rubygem-slack-notifier>=1.2.0:devel/rubygem-slack-notifier \
+	rubygem-asana>=0.4.0:www/rubygem-asana \
+	rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \
+	rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \
+	rubygem-cal-heatmap-rails-rails4>=3.5.0:www/rubygem-cal-heatmap-rails-rails4 \
+	rubygem-underscore-rails>=1.8.0:www/rubygem-underscore-rails \
+	rubygem-sanitize>=2.0:textproc/rubygem-sanitize \
+	rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
+	rubygem-loofah>=2.0.3:textproc/rubygem-loofah \
+	rubygem-rack-attack>=4.3.1:www/rubygem-rack-attack \
+	rubygem-ace-rails-ap>=2.0.1:www/rubygem-ace-rails-ap \
+	rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \
+	rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
+	rubygem-sass-rails5>=5.0.0:textproc/rubygem-sass-rails5 \
+	rubygem-coffee-rails4>=4.1.0:devel/rubygem-coffee-rails4 \
+	rubygem-uglifier>=2.7.2:www/rubygem-uglifier \
+	rubygem-turbolinks>=2.5.0:www/rubygem-turbolinks \
+	rubygem-jquery-turbolinks>=2.1.0:www/rubygem-jquery-turbolinks \
+	rubygem-addressable>=2.3.8:www/rubygem-addressable \
+	rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \
+	rubygem-font-awesome-rails-rails4>=4.2:devel/rubygem-font-awesome-rails-rails4 \
+	rubygem-gitlab_emoji>=0.3:graphics/rubygem-gitlab_emoji \
+	rubygem-gon>=6.0.1:www/rubygem-gon \
+	rubygem-jquery-atwho-rails-rails4>=1.3.2:www/rubygem-jquery-atwho-rails-rails4 \
+	rubygem-jquery-rails4>=4.0.0:www/rubygem-jquery-rails4 \
+	rubygem-jquery-scrollto-rails>=1.4.3:www/rubygem-jquery-scrollto-rails \
+	rubygem-jquery-ui-rails-rails4>=5.0.0:www/rubygem-jquery-ui-rails-rails4 \
+	rubygem-nprogress-rails>=0.1.6.7:devel/rubygem-nprogress-rails \
+	rubygem-raphael-rails>=2.1.2:www/rubygem-raphael-rails \
+	rubygem-request_store>=1.2.0:devel/rubygem-request_store \
+	rubygem-select2-rails>=3.5.9:www/rubygem-select2-rails \
+	rubygem-virtus>=1.0.1:devel/rubygem-virtus \
+	rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \
+	rubygem-sentry-raven>=0.15.4:devel/rubygem-sentry-raven \
+	rubygem-gitlab_meta>=7.0:devel/rubygem-gitlab_meta \
+	rubygem-newrelic_rpm>=3.9.4.245:devel/rubygem-newrelic_rpm \
+	rubygem-newrelic-grape>=0:devel/rubygem-newrelic-grape \
+	rubygem-newrelic_rpm>=3.14:devel/rubygem-newrelic_rpm \
+	rubygem-octokit>=3.8.0:net/rubygem-octokit \
+	rubygem-mail_room>=0.6.1:mail/rubygem-mail_room \
+	rubygem-email_reply_parser>=0.5.8:mail/rubygem-email_reply_parser \
+	rubygem-activerecord-deprecated_finders>=1.0.3:devel/rubygem-activerecord-deprecated_finders \
+	rubygem-activerecord-session_store>=0.1.0:databases/rubygem-activerecord-session_store \
+	rubygem-nested_form>=0.3.2:www/rubygem-nested_form \
+	rubygem-oauth2>=1.0.0:net/rubygem-oauth2 \
+	rubygem-paranoia>=2.0:databases/rubygem-paranoia \
+	rubygem-rinku>=1.7.3:www/rubygem-rinku
 
 USE=	pgsql=yes
 WANT=	pgsql=9.1+
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 001e1e1e59f3..a2ad444673fd 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -12,13 +12,13 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Personal file-sharing service for the GNOME Desktop
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
-RUN_DEPENDS=	ap*-mod_dnssd>=0:${PORTSDIR}/www/mod_dnssd \
-		console-kit-daemon:${PORTSDIR}/sysutils/consolekit
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
+		libnotify.so:devel/libnotify \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libunique-1.0.so:x11-toolkits/unique
+RUN_DEPENDS=	ap*-mod_dnssd>=0:www/mod_dnssd \
+		console-kit-daemon:sysutils/consolekit
 
 USES=		gettext gmake libtool pkgconfig tar:xz
 USE_APACHE=	22+
diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index b606e8f7438e..3f5507d34df2 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tool to generate full-size image files and thumbnails
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 USE_GNOME=	gconf2 gnomeprefix intltool
 USES=		gettext gmake pathfix pkgconfig tar:xz
diff --git a/www/google-appengine/Makefile b/www/google-appengine/Makefile
index a423647c3ef1..29ef37f76190 100644
--- a/www/google-appengine/Makefile
+++ b/www/google-appengine/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Development tools for Google App Engine (SDK)
 LICENSE=	APACHE20 BSD3CLAUSE GPLv2 LGPL21 MIT MPL PSFL
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto
 
 NO_BUILD=	yes
 
@@ -43,7 +43,7 @@ GAESCRIPTS=	_php_runtime.py _python_runtime.py api_server.py appcfg.py \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb
 .endif
 .if ${PORT_OPTIONS:MPHP}
 GAEDATADIR+=	php
diff --git a/www/googlebook_dl/Makefile b/www/googlebook_dl/Makefile
index 59863636b3ba..eeae0f182fdc 100644
--- a/www/googlebook_dl/Makefile
+++ b/www/googlebook_dl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Command-line utility for downloading books from Google Books
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/www/goose/Makefile b/www/goose/Makefile
index d5d46358739f..c649eb12eab5 100644
--- a/www/goose/Makefile
+++ b/www/goose/Makefile
@@ -11,12 +11,12 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command line Google search utility
 
-RUN_DEPENDS=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format \
-		p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig \
-		p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
-		urlview:${PORTSDIR}/textproc/urlview
+RUN_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-HTML-Format>=0:textproc/p5-HTML-Format \
+		p5-AppConfig>=0:devel/p5-AppConfig \
+		p5-Curses>=0:devel/p5-Curses \
+		urlview:textproc/urlview
 
 USES=		perl5
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/www/gpx2map/Makefile b/www/gpx2map/Makefile
index 258662c927cf..9d0e72aa06dc 100644
--- a/www/gpx2map/Makefile
+++ b/www/gpx2map/Makefile
@@ -9,9 +9,9 @@ COMMENT=	Put GPX track on Google Map or OpenStreetMap
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Geo-Distance>=0:${PORTSDIR}/math/p5-Geo-Distance
+RUN_DEPENDS=	p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Geo-Distance>=0:math/p5-Geo-Distance
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sd2k9
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/gpx2map \
 OPTIONS_DEFINE=	GNUPLOT
 
 GNUPLOT_DESC=	Enable draw track profiles
-GNUPLOT_RUN_DEPENDS=	p5-Chart-Gnuplot>=0:${PORTSDIR}/graphics/p5-Chart-Gnuplot
+GNUPLOT_RUN_DEPENDS=	p5-Chart-Gnuplot>=0:graphics/p5-Chart-Gnuplot
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|gpx2map.google.template|${DATADIR}/gpx2map.google.template|" \
diff --git a/www/grafana2/Makefile b/www/grafana2/Makefile
index 989f69c61146..26f18c7f8bee 100644
--- a/www/grafana2/Makefile
+++ b/www/grafana2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/www/graylog-web-interface/Makefile b/www/graylog-web-interface/Makefile
index 92b437a8280c..538a9ff3483d 100644
--- a/www/graylog-web-interface/Makefile
+++ b/www/graylog-web-interface/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Web Interface for Graylog
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		tar:tgz
 USE_JAVA=	yes
diff --git a/www/groupoffice/Makefile b/www/groupoffice/Makefile
index b7c811ef4790..03a27bc14a78 100644
--- a/www/groupoffice/Makefile
+++ b/www/groupoffice/Makefile
@@ -43,7 +43,7 @@ WBXML_DESC=	Synchronization Support
 CALENDAR_USE=		PHP=calendar
 GD_USE=			PHP=gd
 IMAP_USE=		PHP=iconv imap
-WBXML_LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
+WBXML_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/www/grr/Makefile b/www/grr/Makefile
index d7bfd4fadf2d..be8b50789245 100644
--- a/www/grr/Makefile
+++ b/www/grr/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Rss reader for GNUstep
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libRSSKit.so:${PORTSDIR}/www/rsskit
+LIB_DEPENDS=	libRSSKit.so:www/rsskit
 
 USES=		gnustep
 USE_GNUSTEP=	back build
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 93358488f422..faaaa0a48c6d 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -13,12 +13,12 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libenchant.so:${PORTSDIR}/textproc/enchant
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
+		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libenchant.so:textproc/enchant
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
+		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme
 
 PORTSCOUT=	ignore:1
 
diff --git a/www/gtkhtml4/Makefile b/www/gtkhtml4/Makefile
index 598458e3203a..82be732d010d 100644
--- a/www/gtkhtml4/Makefile
+++ b/www/gtkhtml4/Makefile
@@ -11,10 +11,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libenchant.so:${PORTSDIR}/textproc/enchant
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libenchant.so:textproc/enchant
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage xproto
diff --git a/www/guacamole-client/Makefile b/www/guacamole-client/Makefile
index d05e6e82ebee..e7ffad3f1dec 100644
--- a/www/guacamole-client/Makefile
+++ b/www/guacamole-client/Makefile
@@ -17,7 +17,7 @@ COMMENT=	HTML5 Clientless Remote Desktop
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven33/bin/mvn:${PORTSDIR}/devel/maven33
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glyptodon
@@ -31,10 +31,10 @@ OPTIONS_DEFINE=		MK_LINK SERVER TOMCAT
 OPTIONS_DEFAULT=	MK_LINK SERVER TOMCAT
 OPTIONS_SUB=		yes
 MK_LINK_DESC=		Make sybolic links
-TOMCAT_RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-8.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8
+TOMCAT_RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-8.0/bin/bootstrap.jar:www/tomcat8
 TOMCAT_DESC=		Use Tomcat as your servlet
 
-SERVER_RUN_DEPENDS=	guacd:${PORTSDIR}/net/guacamole-server
+SERVER_RUN_DEPENDS=	guacd:net/guacamole-server
 SERVER_DESC=		Include Guacamole Server
 
 GUACAMOLE_CONF=	${PREFIX}/etc/guacamole
diff --git a/www/guile-www/Makefile b/www/guile-www/Makefile
index 2ad65464df7a..f95544effe51 100644
--- a/www/guile-www/Makefile
+++ b/www/guile-www/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNU/guile
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Guile modules for WWW interaction
 
-RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
+RUN_DEPENDS=	guile:lang/guile
 
 GNU_CONFIGURE=	yes
 INFO=		guile-www
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 7942778ec7bc..630261c73811 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Gnome program to check a page/website for broken links
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
+LIB_DEPENDS=	libgnet-2.0.so:net/gnet2
 
 OPTIONS_DEFINE=	CROCO TIDY CLAMAV GNUTLS
 OPTIONS_DEFAULT=CLAMAV GNUTLS
@@ -38,25 +38,25 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCROCO}
-LIB_DEPENDS+=	libcroco-0.6.so:${PORTSDIR}/textproc/libcroco
+LIB_DEPENDS+=	libcroco-0.6.so:textproc/libcroco
 .else
 CONFIGURE_ARGS+=	--disable-croco
 .endif
 
 .if ${PORT_OPTIONS:MTIDY}
-LIB_DEPENDS+=	libtidy.so:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS+=	libtidy.so:www/tidy-lib
 .else
 CONFIGURE_ARGS+=	--disable-tidy
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
-LIB_DEPENDS+=	libclamav.so:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	libclamav.so:security/clamav
 .else
 CONFIGURE_ARGS+=	--disable-clamav
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 .else
 CONFIGURE_ARGS+=	--disable-gnutls
 .endif
diff --git a/www/hastymail2-devel/Makefile b/www/hastymail2-devel/Makefile
index d4599230a123..a77cddc9a7db 100644
--- a/www/hastymail2-devel/Makefile
+++ b/www/hastymail2-devel/Makefile
@@ -38,19 +38,19 @@ DB_DESC=	Use older pear DB (instead of MDB2)
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 .if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=	pgsql
 .if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDB} && (${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL}}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
 .endif
 
 post-patch:
diff --git a/www/hastymail2/Makefile b/www/hastymail2/Makefile
index dd6aff6706f0..82bac6c8e468 100644
--- a/www/hastymail2/Makefile
+++ b/www/hastymail2/Makefile
@@ -39,19 +39,19 @@ MBSTRING_DESC=	Support multi-byte character sets
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 .if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=	pgsql
 .if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDB} && (${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL})
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
diff --git a/www/havp/Makefile b/www/havp/Makefile
index 13d25ff0ecd5..0a96fb05d23c 100644
--- a/www/havp/Makefile
+++ b/www/havp/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.server-side.de/download/ \
 MAINTAINER=	ayu@commun.jp
 COMMENT=	HTTP Antivirus Proxy
 
-LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	libclamav.so:security/clamav
 
 USES=		gmake perl5
 GNU_CONFIGURE=	yes
diff --git a/www/helma/Makefile b/www/helma/Makefile
index 5e0060d0149b..908c47193626 100644
--- a/www/helma/Makefile
+++ b/www/helma/Makefile
@@ -41,7 +41,7 @@ OPTIONS_DEFINE=	MYSQL DOCS
 OPTIONS_SUB=	yes
 OPTIONS_DESC=	Install MySQL Connector for Java
 
-MYSQL_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
+MYSQL_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|JAVA_HOME=/usr/lib/j2sdk1.5-sun|JAVA_HOME=${JAVA_HOME}|' \
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index a12a8f7ba5d9..a964b4dfc473 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Application Framework
 
-RUN_DEPENDS=	${PEARDIR}/Net/DNS2.php:${PORTSDIR}/dns/pear-Net_DNS2
+RUN_DEPENDS=	${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2
 
 OPTIONS_DEFAULT=	ICONV
 OPTIONS_DEFINE=	FACEBOOK ICONV TWITTER WEATHER
diff --git a/www/horde-wicked/Makefile b/www/horde-wicked/Makefile
index 4fc578675fea..8e75a9dd9617 100644
--- a/www/horde-wicked/Makefile
+++ b/www/horde-wicked/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde Wiki Application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	${PEARDIR}/Text/Wiki.php:${PORTSDIR}/www/pear-Text_Wiki
+RUN_DEPENDS+=	${PEARDIR}/Text/Wiki.php:www/pear-Text_Wiki
 
 USES=	horde cpe
 USE_PHP=	gettext
diff --git a/www/hotcrp/Makefile b/www/hotcrp/Makefile
index 43e1a5ee5df0..529e1f519416 100644
--- a/www/hotcrp/Makefile
+++ b/www/hotcrp/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.read.seas.harvard.edu/~kohler/hotcrp/
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Web based conference management software
 
-RUN_DEPENDS=	pdftohtml:${PORTSDIR}/graphics/poppler-utils \
-		zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS=	pdftohtml:graphics/poppler-utils \
+		zip:archivers/zip
 
 USE_PHP=	mysqli gd session ctype
 USE_MYSQL=	server
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 117feee72682..d98522711384 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	cgi>=3000.0.0
 
-LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
+LIB_DEPENDS=	libfcgi.so:www/fcgi
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index 2a7d0d79a56a..9fbd65136e33 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -12,7 +12,7 @@ LICENSE=	LGPL21
 USES=		pkgconfig
 USE_CABAL=	cairo>=0.13.0.0 glib>=0.13.1.0 gtk>=0.13.0.0 mtl \
 		pango>=0.13.0.0 text>=1.0.0.0
-LIB_DEPENDS+=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/www/htdigest/Makefile b/www/htdigest/Makefile
index 9d6f3e901882..c168e8a84226 100644
--- a/www/htdigest/Makefile
+++ b/www/htdigest/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Utility from the Apache distribution for creating htdigest files
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libaprutil-1.so:${PORTSDIR}/devel/apr1 \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libaprutil-1.so:devel/apr1 \
+		libexpat.so:textproc/expat2
 
 USES=		iconv
 
diff --git a/www/html2wml/Makefile b/www/html2wml/Makefile
index 9337578fbb73..f0b6ef31ebf0 100644
--- a/www/html2wml/Makefile
+++ b/www/html2wml/Makefile
@@ -13,9 +13,9 @@ COMMENT=	CGI that can do on-the-fly HTML to WML conversion
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Text-Template>0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Text-Template>0:textproc/p5-Text-Template \
+		p5-XML-Parser>0:textproc/p5-XML-Parser \
+		p5-libwww>0:www/p5-libwww
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	html2wml.cgi
diff --git a/www/httest/Makefile b/www/httest/Makefile
index 7df637660b22..b66b68cc9afd 100644
--- a/www/httest/Makefile
+++ b/www/httest/Makefile
@@ -11,8 +11,8 @@ COMMENT=	HTTP Test Tool
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libapr-1.so:devel/apr1 \
+		libpcre.so:devel/pcre
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index afd8b1608e6a..96f1a1415b2f 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -15,7 +15,7 @@ PATCHFILES=	patch04.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast Log-Analyzer for web servers
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:R}
 
diff --git a/www/httpasyncclient/Makefile b/www/httpasyncclient/Makefile
index 8c73bf055bc0..2ad6c963980c 100644
--- a/www/httpasyncclient/Makefile
+++ b/www/httpasyncclient/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Java components implementing an asynchronous HTTP client
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${JAVAJARDIR}/httpclient.jar:${PORTSDIR}/www/httpclient
+RUN_DEPENDS=	${JAVAJARDIR}/httpclient.jar:www/httpclient
 
 USES=		cpe
 CPE_VENDOR=	apache
diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile
index eaf856d26816..1c19502f19bb 100644
--- a/www/httpclient/Makefile
+++ b/www/httpclient/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 USES+=	cpe
 CPE_PRODUCT=	commons-httpclient
 CPE_VENDOR=	apache
-RUN_DEPENDS=	${JAVAJARDIR}/httpcore.jar:${PORTSDIR}/www/httpcore \
-		${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec
+RUN_DEPENDS=	${JAVAJARDIR}/httpcore.jar:www/httpcore \
+		${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging \
+		${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 USE_JAVA=	yes
diff --git a/www/httpie/Makefile b/www/httpie/Makefile
index d81a00d39a80..93c209ca893b 100644
--- a/www/httpie/Makefile
+++ b/www/httpie/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Command line HTTP client
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jakubroztocil
diff --git a/www/httpsqs/Makefile b/www/httpsqs/Makefile
index d2d2a1efbb48..a42aa5e9b1cb 100644
--- a/www/httpsqs/Makefile
+++ b/www/httpsqs/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple Queue Service based on HTTP GET/POST protocol
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS+=	libtokyocabinet.so:databases/tokyocabinet \
+		libevent.so:devel/libevent2
 
 USES=		pkgconfig
 
diff --git a/www/hydra/Makefile b/www/hydra/Makefile
index cfa483163b2f..edd76c6ee749 100644
--- a/www/hydra/Makefile
+++ b/www/hydra/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	-web
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High performance multi-threaded web server
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 BROKEN=		Needs to be ported to GnuTLS 3.4; abandoned upstream
 
diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile
index 0f2b72b5dfdc..88a71464e656 100644
--- a/www/hypermail/Makefile
+++ b/www/hypermail/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Program to generate a cross-referenced HTML mail archive
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm \
+		libpcre.so:devel/pcre
 
 USES=		desthack
 
diff --git a/www/igal2/Makefile b/www/igal2/Makefile
index 761966e018b1..008acd9b6dce 100644
--- a/www/igal2/Makefile
+++ b/www/igal2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple CLI image gallery generator
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 OPTIONS_DEFINE=	EXIF
 EXIF_DESC=	Support EXIF data (-e option)
@@ -24,7 +24,7 @@ MAKE_ENV+=	DESTDIR=${STAGEDIR}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXIF}
-RUN_DEPENDS+=	 p5-Image-ExifTool>=7.0:${PORTSDIR}/graphics/p5-Image-ExifTool
+RUN_DEPENDS+=	 p5-Image-ExifTool>=7.0:graphics/p5-Image-ExifTool
 .endif
 
 post-patch:
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 276327a40ca3..29a6151df472 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -13,24 +13,24 @@ COMMENT=	Wiki compiler
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-CGI-FormBuilder>=0:${PORTSDIR}/www/p5-CGI-FormBuilder \
-		p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		p5-Text-Markdown>=0:${PORTSDIR}/textproc/p5-Text-Markdown \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		p5-CGI-FormBuilder>=0:www/p5-CGI-FormBuilder \
+		p5-CGI-Session>=0:www/p5-CGI-Session \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber \
+		p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-Mail-Sendmail>=0:mail/p5-Mail-Sendmail \
+		p5-Text-Markdown>=0:textproc/p5-Text-Markdown \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \
-		p5-XML-Feed>=0:${PORTSDIR}/textproc/p5-XML-Feed \
-		p5-Authen-Passphrase>=0:${PORTSDIR}/security/p5-Authen-Passphrase
+		p5-File-MimeInfo>=0:devel/p5-File-MimeInfo \
+		p5-RPC-XML>=0:net/p5-RPC-XML \
+		p5-XML-Feed>=0:textproc/p5-XML-Feed \
+		p5-Authen-Passphrase>=0:security/p5-Authen-Passphrase
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -50,12 +50,12 @@ SEARCH_DESC=	Install search backend
 W3M_DESC=	Install w3m CGI wrapper
 MULTI_DESC=	Install Text::MultiMarkdown
 
-PO4A_RUN_DEPENDS=	po4a>=0.39:${PORTSDIR}/textproc/po4a
-PO4A_BUILD_DEPENDS=	po4a>=0.39:${PORTSDIR}/textproc/po4a
-SEARCH_RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Search-Xapian>=0:${PORTSDIR}/databases/p5-Search-Xapian \
-		${LOCALBASE}/www/xapian-omega/cgi-bin/omega:${PORTSDIR}/www/xapian-omega
-MULTI_RUN_DEPENDS=	p5-Text-MultiMarkdown>=0:${PORTSDIR}/textproc/p5-Text-MultiMarkdown
+PO4A_RUN_DEPENDS=	po4a>=0.39:textproc/po4a
+PO4A_BUILD_DEPENDS=	po4a>=0.39:textproc/po4a
+SEARCH_RUN_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Search-Xapian>=0:databases/p5-Search-Xapian \
+		${LOCALBASE}/www/xapian-omega/cgi-bin/omega:www/xapian-omega
+MULTI_RUN_DEPENDS=	p5-Text-MultiMarkdown>=0:textproc/p5-Text-MultiMarkdown
 
 PORTDOCS=	CHANGELOG NEWS README
 PORTEXAMPLES=	*
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index 85c90159e4d6..2852185c26bf 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Powerful, dynamic, PHP and MySQL based e-learning platform
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
-		zip:${PORTSDIR}/archivers/zip \
-		${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
-		${LOCALBASE}/share/pear/PEAR.php:${PORTSDIR}/devel/pear \
-		${LOCALBASE}/share/pear/Auth/Auth.php:${PORTSDIR}/security/pear-Auth \
-		${LOCALBASE}/share/pear/MDB2.php:${PORTSDIR}/databases/pear-MDB2 \
-		${LOCALBASE}/share/pear/HTML/Template/IT.php:${PORTSDIR}/devel/pear-HTML_Template_IT
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	convert:graphics/ImageMagick \
+		zip:archivers/zip \
+		${UNZIP_CMD}:archivers/unzip \
+		${LOCALBASE}/share/pear/PEAR.php:devel/pear \
+		${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth \
+		${LOCALBASE}/share/pear/MDB2.php:databases/pear-MDB2 \
+		${LOCALBASE}/share/pear/HTML/Template/IT.php:devel/pear-HTML_Template_IT
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ILIAS-eLearning
@@ -38,8 +38,8 @@ SUB_LIST=	ILIASDATADIR=${ILIASDATADIR}
 
 OPTIONS_DEFINE=		SCORM2004 Checker Mail
 SCORM2004_USE=		php=json
-Checker_RUN_DEPENDS=	${LOCALBASE}/share/pear/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-Mail_RUN_DEPENDS=	${LOCALBASE}/share/pear/Mail.php:${PORTSDIR}/mail/pear-Mail
+Checker_RUN_DEPENDS=	${LOCALBASE}/share/pear/HTTP/Request.php:www/pear-HTTP_Request
+Mail_RUN_DEPENDS=	${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail
 
 pre-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
diff --git a/www/imgsizer/Makefile b/www/imgsizer/Makefile
index c06b53fffb56..7e7efe3858dd 100644
--- a/www/imgsizer/Makefile
+++ b/www/imgsizer/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool to autogenerate WIDTH and HEIGHT for IMG HTML tags
 
 LICENSE=	BSD4CLAUSE
 
-RUN_DEPENDS=	identify:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	identify:graphics/ImageMagick
 
 USES=		jpeg:run python
 NO_BUILD=	yes
diff --git a/www/interchange/Makefile b/www/interchange/Makefile
index 050b76e16036..604b159edd7d 100644
--- a/www/interchange/Makefile
+++ b/www/interchange/Makefile
@@ -12,11 +12,11 @@ COMMENT=	RedHat's database-enabled e-commerce server
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Safe-Hole>=0.10:${PORTSDIR}/security/p5-Safe-Hole \
-		p5-URI>=1.37:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=5.810:${PORTSDIR}/www/p5-libwww \
-		p5-Set-Crontab>=1.00:${PORTSDIR}/devel/p5-Set-Crontab \
-		p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-Safe-Hole>=0.10:security/p5-Safe-Hole \
+		p5-URI>=1.37:net/p5-URI \
+		p5-libwww>=5.810:www/p5-libwww \
+		p5-Set-Crontab>=1.00:devel/p5-Set-Crontab \
+		p5-Digest-SHA1>=2.11:security/p5-Digest-SHA1
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix tar:bzip2
@@ -31,8 +31,8 @@ NO_ARCH=	yes
 
 OPTIONS_DEFINE=		MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
-MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
+PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 
 GROUPS=		interch
 USERS=		interch
diff --git a/www/itop/Makefile b/www/itop/Makefile
index 6c5fbd4bf293..3bdf743ec377 100644
--- a/www/itop/Makefile
+++ b/www/itop/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple, web based IT Service Management tool
 
 LICENSE=	AGPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	${LOCALBASE}/bin/dot:graphics/graphviz
 
 USES=		cpe shebangfix zip
 SHEBANG_FILES=	lib/tcpdf/tools/tcpdf_addfont.php setup/install/install.sh
diff --git a/www/jdresolve/Makefile b/www/jdresolve/Makefile
index 6f6869a1965d..9b861d701c7e 100644
--- a/www/jdresolve/Makefile
+++ b/www/jdresolve/Makefile
@@ -12,7 +12,7 @@ PATCHFILES=	patch-0.6.2b1.diff
 MAINTAINER=	christophe@labouisse.org
 COMMENT=	IP addresse to hostname program for httpd log files
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/www/jetty8/Makefile b/www/jetty8/Makefile
index 80fd2455ae87..0dbfb54e5e63 100644
--- a/www/jetty8/Makefile
+++ b/www/jetty8/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Full-featured web server implemented entirely in Java
 LICENSE=	APACHE20 EPL
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 CONFLICTS=	jetty-9.*
 
diff --git a/www/jetty9/Makefile b/www/jetty9/Makefile
index 564ecbb9f4e4..5d001fbcc46f 100644
--- a/www/jetty9/Makefile
+++ b/www/jetty9/Makefile
@@ -14,7 +14,7 @@ LICENSE=	APACHE20 EPL
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/license-eplv10-aslv20.html
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 CONFLICTS=	jetty-8.*
 
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index 03bba8b5b3a5..45554cf1dfb7 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -14,31 +14,31 @@ LICENSE=	APACHE20
 # These are JAR-files installed by other ports. The list should keep
 # growing until all Java applications install just their own JARs -- not
 # the 3rd-party ones:
-RUN_DEPENDS=	${JAVAJARDIR}/activation.jar:${PORTSDIR}/java/jaf	\
-		${JAVAJARDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework	\
-		${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec	\
-		${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections	\
-		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient	\
-		${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
-		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang	\
-		${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging	\
-		${JAVAJARDIR}/commons-net.jar:${PORTSDIR}/net/jakarta-commons-net	\
-		${JAVAJARDIR}/httpclient.jar:${PORTSDIR}/www/httpclient	\
-		${JAVAJARDIR}/httpcore.jar:${PORTSDIR}/www/httpcore	\
-		${JAVAJARDIR}/httpmime.jar:${PORTSDIR}/www/httpclient	\
-		${JAVAJARDIR}/jakarta-oro.jar:${PORTSDIR}/java/jakarta-oro	\
-		${JAVAJARDIR}/jdom.jar:${PORTSDIR}/java/jdom	\
-		${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit	\
-		${JAVAJARDIR}/mail.jar:${PORTSDIR}/java/javamail	\
-		${JAVAJARDIR}/serializer.jar:${PORTSDIR}/textproc/xalan-j	\
-		${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j	\
-		${LOCALBASE}/share/slf4j/slf4j-nop.jar:${PORTSDIR}/devel/slf4j	\
-		${JAVAJARDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j	\
-		${JAVAJARDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j	\
-		${JAVAJARDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j	\
-		${JAVAJARDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons	\
-		${JAVAJARDIR}/xstream.jar:${PORTSDIR}/textproc/xstream	\
-		${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
+RUN_DEPENDS=	${JAVAJARDIR}/activation.jar:java/jaf	\
+		${JAVAJARDIR}/avalon-framework.jar:devel/avalon-framework	\
+		${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec	\
+		${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections	\
+		${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient	\
+		${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \
+		${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang	\
+		${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging	\
+		${JAVAJARDIR}/commons-net.jar:net/jakarta-commons-net	\
+		${JAVAJARDIR}/httpclient.jar:www/httpclient	\
+		${JAVAJARDIR}/httpcore.jar:www/httpcore	\
+		${JAVAJARDIR}/httpmime.jar:www/httpclient	\
+		${JAVAJARDIR}/jakarta-oro.jar:java/jakarta-oro	\
+		${JAVAJARDIR}/jdom.jar:java/jdom	\
+		${JAVAJARDIR}/junit.jar:java/junit	\
+		${JAVAJARDIR}/mail.jar:java/javamail	\
+		${JAVAJARDIR}/serializer.jar:textproc/xalan-j	\
+		${JAVAJARDIR}/slf4j-api.jar:devel/slf4j	\
+		${LOCALBASE}/share/slf4j/slf4j-nop.jar:devel/slf4j	\
+		${JAVAJARDIR}/xalan.jar:textproc/xalan-j	\
+		${JAVAJARDIR}/xercesImpl.jar:textproc/xerces-j	\
+		${JAVAJARDIR}/xml-apis.jar:textproc/xerces-j	\
+		${JAVAJARDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons	\
+		${JAVAJARDIR}/xstream.jar:textproc/xstream	\
+		${JAVASHAREDIR}/rhino/rhino.jar:lang/rhino
 
 USES=		tar:tgz
 USE_JAVA=	yes
diff --git a/www/jspwiki/Makefile b/www/jspwiki/Makefile
index 593d0bd2d510..9c43d05aceee 100644
--- a/www/jspwiki/Makefile
+++ b/www/jspwiki/Makefile
@@ -35,12 +35,12 @@ OPTIONS_DEFAULT=	TOMCAT6
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
diff --git a/www/jtoolkit/Makefile b/www/jtoolkit/Makefile
index 2e121c647b66..331db0d64195 100644
--- a/www/jtoolkit/Makefile
+++ b/www/jtoolkit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Webapp framework with modpython-based and stand-alone modes
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}kid>=0.9.5:${PORTSDIR}/devel/py-kid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}kid>=0.9.5:devel/py-kid
 # Has optional dependencies on database engines
 # Can optionally use py-lucene (on i386)
 
diff --git a/www/kannel-sqlbox/Makefile b/www/kannel-sqlbox/Makefile
index 739d79e40b72..5a8343e12b38 100644
--- a/www/kannel-sqlbox/Makefile
+++ b/www/kannel-sqlbox/Makefile
@@ -13,8 +13,8 @@ LICENSE_NAME=	The Kannel Software License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/KannelLICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/kannel/gw-config.h:${PORTSDIR}/www/kannel
-RUN_DEPENDS=	${LOCALBASE}/sbin/bearerbox:${PORTSDIR}/www/kannel
+BUILD_DEPENDS=	${LOCALBASE}/include/kannel/gw-config.h:www/kannel
+RUN_DEPENDS=	${LOCALBASE}/sbin/bearerbox:www/kannel
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dbaio
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 61c179c00919..8dc4a12e91e9 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -17,7 +17,7 @@ LICENSE_NAME=	The Kannel Software License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USERS=		kannel
 GROUPS=		kannel
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index d8fbe597d0bf..40e6cf60447f 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Comprehensive html/website development environment
 
-LIB_DEPENDS=	libtidy.so:${PORTSDIR}/www/tidy-lib \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libtidy.so:www/tidy-lib \
+		libboost_thread.so:devel/boost-libs
 
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdelibs pimlibs kdeprefix automoc4
diff --git a/www/kplaylist/Makefile b/www/kplaylist/Makefile
index d1bbd4539bd2..fb90639c6cde 100644
--- a/www/kplaylist/Makefile
+++ b/www/kplaylist/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	PHP based music database
 
-RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS=	lame:audio/lame \
+		oggenc:audio/vorbis-tools \
+		zip:archivers/zip
 
 USE_PHP=	curl mysql session iconv
 
diff --git a/www/larbin/Makefile b/www/larbin/Makefile
index 9060228eea7d..3f25321e70c6 100644
--- a/www/larbin/Makefile
+++ b/www/larbin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	HTTP crawler with an easy interface
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		makedepend:${PORTSDIR}/devel/makedepend
+BUILD_DEPENDS=	bash:shells/bash \
+		makedepend:devel/makedepend
 
 USES=		gmake shebangfix
 SHEBANG_FILES=	configure
diff --git a/www/lessc/Makefile b/www/lessc/Makefile
index efdf0566c7bc..4ec068c7e940 100644
--- a/www/lessc/Makefile
+++ b/www/lessc/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Javascript CSS pre-processor
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	npm>=0:${PORTSDIR}/www/npm
-RUN_DEPENDS=	npm>=0:${PORTSDIR}/www/npm
+BUILD_DEPENDS=	npm>=0:www/npm
+RUN_DEPENDS=	npm>=0:www/npm
 
 NO_BUILD=	yes
 USE_GITHUB=	yes
diff --git a/www/libdom/Makefile b/www/libdom/Makefile
index 0340949e4e81..0c063b1a76c9 100644
--- a/www/libdom/Makefile
+++ b/www/libdom/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Document Object Model library
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem
-LIB_DEPENDS=	libwapcaplet.so:${PORTSDIR}/textproc/libwapcaplet \
-	libparserutils.so:${PORTSDIR}/devel/libparserutils \
-	libhubbub.so:${PORTSDIR}/www/libhubbub \
-	libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
+LIB_DEPENDS=	libwapcaplet.so:textproc/libwapcaplet \
+	libparserutils.so:devel/libparserutils \
+	libhubbub.so:www/libhubbub \
+	libexpat.so:textproc/expat2
 
 USES=	gmake localbase pkgconfig
 USE_LDCONFIG=	yes
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index 2f8e9c8aff0b..ab8abbc97d41 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	The Easy Publish and Consume library
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libavahi-ui-gtk3.so:${PORTSDIR}/net/avahi-gtk3
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		libsoup-2.4.so:devel/libsoup \
+		libgnutls.so:security/gnutls \
+		libavahi-ui-gtk3.so:net/avahi-gtk3
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk30 intltool
diff --git a/www/libevhtp/Makefile b/www/libevhtp/Makefile
index 09764a772cf2..5e14f667e642 100644
--- a/www/libevhtp/Makefile
+++ b/www/libevhtp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Flexible replacement for libevent httpd API
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ellzey
diff --git a/www/libhpack/Makefile b/www/libhpack/Makefile
index 345ed409d6b9..6fb7676d20bb 100644
--- a/www/libhpack/Makefile
+++ b/www/libhpack/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Implementation of HPACK (Header compression for HTTP/2.0)
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libcheck.so:${PORTSDIR}/devel/libcheck
+LIB_DEPENDS=	libcheck.so:devel/libcheck
 
 CMAKE_ARGS=	-DBUILD_DOCS=OFF \
 		-DBUILD_TESTS=OFF \
diff --git a/www/libhubbub/Makefile b/www/libhubbub/Makefile
index 692ee1ee51a9..d6fa54ce4a27 100644
--- a/www/libhubbub/Makefile
+++ b/www/libhubbub/Makefile
@@ -12,8 +12,8 @@ COMMENT=	HTML5 parser library
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem
-LIB_DEPENDS=	libparserutils.so:${PORTSDIR}/devel/libparserutils
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
+LIB_DEPENDS=	libparserutils.so:devel/libparserutils
 
 USES=	gmake iconv:wchar_t localbase pkgconfig
 USE_LDCONFIG=	yes
diff --git a/www/libmicrohttpd/Makefile b/www/libmicrohttpd/Makefile
index 398e66048228..df0c583c6568 100644
--- a/www/libmicrohttpd/Makefile
+++ b/www/libmicrohttpd/Makefile
@@ -23,8 +23,8 @@ CPE_VENDOR=	gnu
 
 OPTIONS_DEFINE=	GNUTLS
 
-GNUTLS_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-			libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+			libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	libgcrypt-prefix=${LOCALBASE} gnutls=${LOCALBASE}
 GNUTLS_CONFIGURE_ENABLE=https
 
diff --git a/www/libsocialweb/Makefile b/www/libsocialweb/Makefile
index d88a98859905..74dee5cbb5ed 100644
--- a/www/libsocialweb/Makefile
+++ b/www/libsocialweb/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Personal social data server
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	librest-0.7.so:${PORTSDIR}/devel/librest \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
-		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	librest-0.7.so:devel/librest \
+		libgnome-keyring.so:security/libgnome-keyring \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libjson-glib-1.0.so:devel/json-glib
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gconf2 glib20 intlhack introspection:build \
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index b34550bbf98d..aed7797bb209 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -12,23 +12,23 @@ DISTNAME=	firefox-${DISTVERSION}esr.source
 MAINTAINER?=	gecko@FreeBSD.org
 COMMENT?=	Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
 
-BUILD_DEPENDS=	nspr>=4.10.10:${PORTSDIR}/devel/nspr \
-		nss>=3.19.2.1:${PORTSDIR}/security/nss \
-		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
-		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
-		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
-		libvorbis>=1.3.5,3:${PORTSDIR}/audio/libvorbis \
-		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
-		sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
-		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
-		zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
-#		opus>=1.1:${PORTSDIR}/audio/opus \
+BUILD_DEPENDS=	nspr>=4.10.10:devel/nspr \
+		nss>=3.19.2.1:security/nss \
+		libevent2>=2.0.21_2:devel/libevent2 \
+		soundtouch>=1.8.0:audio/soundtouch \
+		harfbuzz>=0.9.34:print/harfbuzz \
+		graphite2>=1.2.4:graphics/graphite2 \
+		libvorbis>=1.3.5,3:audio/libvorbis \
+		libvpx>=1.3.0:multimedia/libvpx \
+		sqlite3>=3.8.9:databases/sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		v4l_compat>0:multimedia/v4l_compat \
+		autoconf-2.13:devel/autoconf213 \
+		zip:archivers/zip \
+		unzip:archivers/unzip
+#		opus>=1.1:audio/opus \
 
-LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 WRKSRC=		${WRKDIR}/mozilla-esr38
 CONFLICTS_INSTALL=	libxul-1.9.*
diff --git a/www/lightsquid/Makefile b/www/lightsquid/Makefile
index 4ef21e5f981d..d28567b3bf3c 100644
--- a/www/lightsquid/Makefile
+++ b/www/lightsquid/Makefile
@@ -33,7 +33,7 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=		GD DOCS
 OPTIONS_DEFAULT=	GD
 
-GD_RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+GD_RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD
 DOCS_SUB_LIST=	NOTEWORK="Read ${DOCSDIR}/readme.txt."
 DOCS_SUB_LIST_OFF=NOTEWORK=
 
diff --git a/www/lighttpd-mod_geoip/Makefile b/www/lighttpd-mod_geoip/Makefile
index 2371092cf87e..6cc51a99f0df 100644
--- a/www/lighttpd-mod_geoip/Makefile
+++ b/www/lighttpd-mod_geoip/Makefile
@@ -8,9 +8,9 @@ DISTNAME=	lighttpd-${PORTVERSION}
 
 COMMENT=	GeoIP module for lighttpd
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
-BUILD_DEPENDS=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
-RUN_DEPENDS=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
+BUILD_DEPENDS=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
+RUN_DEPENDS=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
 
 MASTERDIR=	${.CURDIR}/../lighttpd
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/www/lighttpd-mod_h264_streaming/Makefile b/www/lighttpd-mod_h264_streaming/Makefile
index c4fc09aaf5a4..675b881f1b51 100644
--- a/www/lighttpd-mod_h264_streaming/Makefile
+++ b/www/lighttpd-mod_h264_streaming/Makefile
@@ -8,8 +8,8 @@ DISTNAME=	lighttpd-${PORTVERSION}
 
 COMMENT=	H264 streaming module for lighttpd
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
-RUN_DEPENDS=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
+BUILD_DEPENDS=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
+RUN_DEPENDS=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
 
 LICENSE=	CCPL.BY-NC-SA.30
 LICENSE_NAME=	Creative Commons Attribution-NonCommercial-ShareAlike 3.0 \
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 4714ba672432..3c2ab5bcaf35 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 .endif
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool pkgconfig tar:xz
@@ -57,20 +57,20 @@ BZIP2_CONFIGURE_WITH=	bzip2
 FAM_USES=		fam
 FAM_CONFIGURE_ON=	--with-fam
 FAM_CONFIGURE_ENV=	FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_WITH=	gdbm
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 LIBEV_CONFIGURE_WITH=	libev=${LOCALBASE}
-LIBEV_LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIBEV_LIB_DEPENDS=	libev.so:devel/libev
 LUA_USES=		lua:51+
 LUA_CONFIGURE_WITH=	lua
 LUA_CONFIGURE_ENV=	LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
-MEMCACHE_LIB_DEPENDS=	libmemcache.so:${PORTSDIR}/databases/libmemcache
+MEMCACHE_LIB_DEPENDS=	libmemcache.so:databases/libmemcache
 MEMCACHE_CONFIGURE_WITH=memcache
 MYSQLAUTH_IMPLIES=	MYSQL
-SPAWNFCGI_RUN_DEPENDS=	spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
-VALGRIND_BUILD_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind
-VALGRIND_RUN_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind
+SPAWNFCGI_RUN_DEPENDS=	spawn-fcgi:www/spawn-fcgi
+VALGRIND_BUILD_DEPENDS=	valgrind:devel/valgrind
+VALGRIND_RUN_DEPENDS=	valgrind:devel/valgrind
 VALGRIND_CONFIGURE_WITH=valgrind
 
 LIGHTTPD_CONF_FILES=	lighttpd.conf modules.conf
@@ -142,8 +142,8 @@ _REQUIRE+=		slapd
 
 .if ${PORT_OPTIONS:MWEBDAV}
 USE_GNOME+=		libxml2
-LIB_DEPENDS+=		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-			libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=		libuuid.so:misc/e2fsprogs-libuuid \
+			libsqlite3.so:databases/sqlite3
 CONFIGURE_ARGS+=	--with-webdav-props --with-webdav-locks
 .endif
 
diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index 5e51140e6510..d47950802bd3 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Check HTML documents for broken links
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}requests>=2:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
@@ -30,24 +30,24 @@ OPTIONS_DEFAULT=	SQLITE3 SYNTAX
 OPTIONS_SUB=		yes
 
 CLAMAV_DESC=		Clam Antivirus
-CLAMAV_RUN_DEPENDS=	clamscan:${PORTSDIR}/security/clamav
-GEOIP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}GeoIP>0:${PORTSDIR}/net/py-GeoIP
+CLAMAV_RUN_DEPENDS=	clamscan:security/clamav
+GEOIP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}GeoIP>0:net/py-GeoIP
 GTK2_USE=		gnome=pygtk2
 LOGIN_DESC=		Login form submission
-LOGIN_RUN_DEPENDS=	twill>=0:${PORTSDIR}/www/twill
+LOGIN_RUN_DEPENDS=	twill>=0:www/twill
 NLS_USES=		gettext
 QT4_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-noqt-setup.py
 QT4_RUN_DEPENDS=\
-		${PYTHON_PKGNAMEPREFIX}qt4-sql>=${PYQT_VERSION}:${PORTSDIR}/databases/py-qt4-sql \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-help>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-help \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=${QSCI2_VERSION}:${PORTSDIR}/devel/py-qt4-qscintilla2
-SQLITE3_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+		${PYTHON_PKGNAMEPREFIX}qt4-sql>=${PYQT_VERSION}:databases/py-qt4-sql \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-help>=${PYQT4_VERSION}:devel/py-qt4-help \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=${QSCI2_VERSION}:devel/py-qt4-qscintilla2
+SQLITE3_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 SYNTAX_DESC=		HTML/CSS syntax check
 SYNTAX_RUN_DEPENDS=\
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:${PORTSDIR}/www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}utidy>=0.2:${PORTSDIR}/www/py-utidy
+		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}utidy>=0.2:www/py-utidy
 
 .include <bsd.port.options.mk>
 
diff --git a/www/links-hacked/Makefile b/www/links-hacked/Makefile
index 3eed5abebfa0..53394e329a5b 100644
--- a/www/links-hacked/Makefile
+++ b/www/links-hacked/Makefile
@@ -32,16 +32,16 @@ OPTIONS_RADIO_GRAPHICS=	DIRECTFB SVGALIB X11
 OPTIONS_DEFAULT=	FORMSAVE FREETYPE JS X11
 
 DIRECTFB_DESC=		DirectFB driver support
-DIRECTFB_LIB_DEPENDS=	libdirectfb-1.4.so:${PORTSDIR}/devel/directfb
+DIRECTFB_LIB_DEPENDS=	libdirectfb-1.4.so:devel/directfb
 DIRECTFB_CONFIGURE_WITH=	directfb
 FORMSAVE_DESC=		Form saving/loading support
-FORMSAVE_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+FORMSAVE_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 FORMSAVE_CONFIGURE_ENABLE=	form-saving
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_WITH=	freetype
 JS_DESC=		Javascript interpreter support (very basic)
 JS_CONFIGURE_ENABLE=	javascript
-SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_WITH=	svgalib
 X11_USE=		xorg=x11,xproto
 X11_CONFIGURE_WITH=	x
@@ -49,8 +49,8 @@ X11_CONFIGURE_WITH=	x
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 USES+=		jpeg
 CONFIGURE_ARGS+=	--enable-graphics
 .else
diff --git a/www/links/Makefile b/www/links/Makefile
index e613aeb92d46..6c1493447552 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -38,12 +38,12 @@ OPTIONS_DEFAULT=	IPV6 UTF8 X11
 
 PLIST_FILES=	bin/links man/man1/links.1.gz
 
-DIRECTFB_LIB_DEPENDS=	libdirectfb.so:${PORTSDIR}/devel/directfb
+DIRECTFB_LIB_DEPENDS=	libdirectfb.so:devel/directfb
 DIRECTFB_CONFIGURE_WITH=directfb
 
 IPV6_CONFIGURE_WITH=	ipv6
 
-SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_WITH=	svgalib
 
 THREADS_CFLAGS=	-DHAVE_PTHREADS
@@ -63,8 +63,8 @@ X11_PLIST_FILES=	share/pixmaps/links.xpm
 CIPHERSTRING?=	HIGH:!SSLv2:!aNULL:!eNULL:@STRENGTH
 
 .if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 USES+=		jpeg
 CONFIGURE_ARGS+=	--enable-graphics
 .else
diff --git a/www/linux-c6-flashplugin11/Makefile b/www/linux-c6-flashplugin11/Makefile
index bda4166b5729..0ca900962e2e 100644
--- a/www/linux-c6-flashplugin11/Makefile
+++ b/www/linux-c6-flashplugin11/Makefile
@@ -35,7 +35,7 @@ OPTIONS_DEFINE=	ALSA GNOME
 OPTIONS_SUB=	yes
 
 ALSA_DESC=	ALSA audio output (broken, needs lemul)
-ALSA_RUN_DEPENDS?=	linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib
+ALSA_RUN_DEPENDS?=	linux-${USE_LINUX}-alsa-lib>=1.0.22_2:audio/linux-c6-alsa-lib
 ALSA_DISTFILES_OFF=	linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
 ALSA_PLIST_SUB_OFF=	LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}"
 
diff --git a/www/linux-f10-flashplugin11/Makefile b/www/linux-f10-flashplugin11/Makefile
index 40a335c67ac4..58bb4b08f1ef 100644
--- a/www/linux-f10-flashplugin11/Makefile
+++ b/www/linux-f10-flashplugin11/Makefile
@@ -3,7 +3,7 @@
 
 DISTFILES:=	install_flash_player_11_linux.i386.tar.gz:plugin
 USE_LINUX=		f10
-ALSA_RUN_DEPENDS=	linux-${USE_LINUX}-alsa-lib>=1.0.21_5:${PORTSDIR}/audio/linux-f10-alsa-lib
+ALSA_RUN_DEPENDS=	linux-${USE_LINUX}-alsa-lib>=1.0.21_5:audio/linux-f10-alsa-lib
 USE_LINUX_APPS=		curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap
 MASTERDIR=		${.CURDIR}/../linux-c6-flashplugin11
 LINUX_RPM_ARCH=		i686
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index ae2cf8c26bbe..b4c7a6572711 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Blazingly fast, full-featured, standards-compliant browser
 
-RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
+RUN_DEPENDS=	update-mime-database:misc/shared-mime-info
 
 USE_LINUX=	yes
 USE_LINUX_APPS=	gtk2 naslibs png sqlite3 xorglibs
diff --git a/www/litmus/Makefile b/www/litmus/Makefile
index 74ed2ec3d25c..4d0940d8795d 100644
--- a/www/litmus/Makefile
+++ b/www/litmus/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.webdav.org/neon/litmus/
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	WebDAV server protocol compliance test suite
 
-LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon \
-		libk5crypto.so:${PORTSDIR}/security/krb5
+LIB_DEPENDS=	libneon.so:www/neon \
+		libk5crypto.so:security/krb5
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-ssl --with-neon=/usr/local
diff --git a/www/ljdeps/Makefile b/www/ljdeps/Makefile
index e20db4eec977..5f60197632b9 100644
--- a/www/ljdeps/Makefile
+++ b/www/ljdeps/Makefile
@@ -9,23 +9,23 @@ CATEGORIES=	www perl5
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Meta-port to install all the perl modules used by LiveJournal
 
-RUN_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil \
-		p5-Data-ShowTable>=0:${PORTSDIR}/devel/p5-Data-ShowTable \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-Unicode-MapUTF8>=0:${PORTSDIR}/converters/p5-Unicode-MapUTF8
+RUN_DEPENDS=	p5-Net-Telnet>=0:net/p5-Net-Telnet \
+		p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-URI>=0:net/p5-URI \
+		p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Time-modules>=0:devel/p5-Time-modules \
+		p5-GD>=0:graphics/p5-GD \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \
+		p5-Data-ShowTable>=0:devel/p5-Data-ShowTable \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-Unicode-MapUTF8>=0:converters/p5-Unicode-MapUTF8
 
 USES=		metaport perl5
 
diff --git a/www/llgal/Makefile b/www/llgal/Makefile
index 84c9bfb2802f..d767cce9fbfe 100644
--- a/www/llgal/Makefile
+++ b/www/llgal/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Command-line online gallery generator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool
-RUN_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		convert:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS=	p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-URI>=0:net/p5-URI \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
+RUN_DEPENDS=	p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-URI>=0:net/p5-URI \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \
+		convert:graphics/ImageMagick
 
 USES=		gettext perl5 gmake tar:bzip2 shebangfix
 SHEBANG_FILES=	llgal.in
diff --git a/www/luakit/Makefile b/www/luakit/Makefile
index a343bce7652b..9cc67d20496d 100644
--- a/www/luakit/Makefile
+++ b/www/luakit/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Fast, small, webkit based browser framework extensible by Lua
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.GPLv3
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
-RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}luafilesystem>=0:${PORTSDIR}/devel/luafilesystem-51
+BUILD_DEPENDS=	help2man:misc/help2man
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libsqlite3.so:databases/sqlite3 \
+		libwebkitgtk-1.0.so:www/webkit-gtk2 \
+		libunique-1.0.so:x11-toolkits/unique
+RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem-51
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mason-larobina
@@ -37,7 +37,7 @@ BROKEN=		Does not install on sparc64
 .endif
 
 .if ${PORT_OPTIONS:MLUAJIT}
-LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
 MAKE_ARGS+=	USE_LUAJIT=1
 .else
 MAKE_ARGS+=	USE_LUAJIT=0
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 80dcdbaec771..2138ca3a2439 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/p/pre./:S/d/dev./}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Non-graphical, text-based World-Wide Web client
 
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 CONFLICTS_INSTALL=	lynx-2.8.[0-8].* ja-lynx-[0-9]*
 
@@ -53,7 +53,7 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_ENABLE=	idna
 
 post-patch:
diff --git a/www/madsonic-standalone/Makefile b/www/madsonic-standalone/Makefile
index cc9a8049fb9c..2910f916a204 100644
--- a/www/madsonic-standalone/Makefile
+++ b/www/madsonic-standalone/Makefile
@@ -31,15 +31,15 @@ APE_DESC=	Depend on mac for Monkey's Audio transcoding #'
 OPTIONS_DEFAULT=	FFMPEG
 OPTIONS_SUB=	yes
 
-FFMPEG_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
-FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
-FAAD_RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad
-XMP_RUN_DEPENDS=	xmp:${PORTSDIR}/audio/xmp
-MPC_RUN_DEPENDS=	mpcdec:${PORTSDIR}/audio/musepack
-APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
+FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
+FLAC_RUN_DEPENDS=	flac:audio/flac
+LAME_RUN_DEPENDS=	lame:audio/lame
+VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools
+FAAC_RUN_DEPENDS=	faac:audio/faac
+FAAD_RUN_DEPENDS=	faad:audio/faad
+XMP_RUN_DEPENDS=	xmp:audio/xmp
+MPC_RUN_DEPENDS=	mpcdec:audio/musepack
+APE_RUN_DEPENDS=	mac:audio/mac
 
 .include <bsd.port.options.mk>
 
diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile
index 4b304efcd46a..82e3f7359cdf 100644
--- a/www/madsonic/Makefile
+++ b/www/madsonic/Makefile
@@ -38,27 +38,27 @@ APE_DESC=	Depend on mac for Monkey's Audio transcoding #'
 OPTIONS_DEFAULT=	FFMPEG JETTY
 OPTIONS_SUB=	yes
 
-RUN_DEPENDS+=	${JAVAJARDIR}/servlet-api.jar:${PORTSDIR}/www/servlet-api \
-	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
-TOMCAT8_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8
-TOMCAT8_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8
-TOMCAT7_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-TOMCAT7_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-TOMCAT6_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-TOMCAT6_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-JETTY_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:${PORTSDIR}/www/jetty8
-JETTY_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:${PORTSDIR}/www/jetty8
-RESIN3_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:${PORTSDIR}/www/resin3
-RESIN3_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:${PORTSDIR}/www/resin3
-FFMPEG_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
-FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
-FAAD_RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad
-XMP_RUN_DEPENDS=	xmp:${PORTSDIR}/audio/xmp
-MPC_RUN_DEPENDS=	mpcdec:${PORTSDIR}/audio/musepack
-APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
+RUN_DEPENDS+=	${JAVAJARDIR}/servlet-api.jar:www/servlet-api \
+	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
+TOMCAT8_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
+TOMCAT8_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
+TOMCAT7_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
+TOMCAT7_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
+TOMCAT6_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6
+TOMCAT6_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6
+JETTY_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
+JETTY_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
+RESIN3_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:www/resin3
+RESIN3_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:www/resin3
+FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
+FLAC_RUN_DEPENDS=	flac:audio/flac
+LAME_RUN_DEPENDS=	lame:audio/lame
+VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools
+FAAC_RUN_DEPENDS=	faac:audio/faac
+FAAD_RUN_DEPENDS=	faad:audio/faad
+XMP_RUN_DEPENDS=	xmp:audio/xmp
+MPC_RUN_DEPENDS=	mpcdec:audio/musepack
+APE_RUN_DEPENDS=	mac:audio/mac
 
 .include <bsd.port.options.mk>
 
diff --git a/www/magento/Makefile b/www/magento/Makefile
index 2e359039c6e9..ac45ae2d6e6f 100644
--- a/www/magento/Makefile
+++ b/www/magento/Makefile
@@ -26,14 +26,14 @@ MAGENTODIR?=	www/magento
 
 .include <bsd.port.options.mk>
 .if !empty(${PORT_OPTIONS:MOAUTH})
-RUN_DEPENDS+=	pecl-oauth>=1.2.3:${PORTSDIR}/net/pecl-oauth
+RUN_DEPENDS+=	pecl-oauth>=1.2.3:net/pecl-oauth
 .endif
 .if !empty(${PORT_OPTIONS:MREDIS})
-RUN_DEPENDS+=	php56-redis>=2.2.0:${PORTSDIR}/databases/php56-redis
+RUN_DEPENDS+=	php56-redis>=2.2.0:databases/php56-redis
 .endif
 # First need to submit the port
 #.if ${PORT_OPTIONS:MSNAPPY}
-#RUN_DEPENDS+=	php5-snappy>=0.0.2:${PORTSDIR}/archivers/php5-snappy
+#RUN_DEPENDS+=	php5-snappy>=0.0.2:archivers/php5-snappy
 #.endif
 
 .include <bsd.port.pre.mk>
diff --git a/www/mediawiki123/Makefile b/www/mediawiki123/Makefile
index 9fb3cfa074a9..fff3edc582c5 100644
--- a/www/mediawiki123/Makefile
+++ b/www/mediawiki123/Makefile
@@ -62,17 +62,17 @@ USE_PHP+=	ldap
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
-RUN_DEPENDS=	memcached:${PORTSDIR}/databases/memcached
+RUN_DEPENDS=	memcached:databases/memcached
 .endif
 
 .if ${PORT_OPTIONS:MIMAGICK}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
 .endif
 
 .if ${PORT_OPTIONS:MAPC}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC
 .elif ${PORT_OPTIONS:MXCACHE}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
 .endif
 
 .if ${PORT_OPTIONS:MSOCKETS}
diff --git a/www/mediawiki124/Makefile b/www/mediawiki124/Makefile
index 553cca77d783..add0a8ce2727 100644
--- a/www/mediawiki124/Makefile
+++ b/www/mediawiki124/Makefile
@@ -62,17 +62,17 @@ USE_PHP+=	ldap
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
-RUN_DEPENDS=	memcached:${PORTSDIR}/databases/memcached
+RUN_DEPENDS=	memcached:databases/memcached
 .endif
 
 .if ${PORT_OPTIONS:MIMAGICK}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
 .endif
 
 .if ${PORT_OPTIONS:MAPC}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC
 .elif ${PORT_OPTIONS:MXCACHE}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
 .endif
 
 .if ${PORT_OPTIONS:MSOCKETS}
diff --git a/www/mediawiki125/Makefile b/www/mediawiki125/Makefile
index 9e3d2bc9d007..090aeb36f789 100644
--- a/www/mediawiki125/Makefile
+++ b/www/mediawiki125/Makefile
@@ -55,10 +55,10 @@ SQLITE_USE=	php=sqlite3
 LDAP_USE=	php=ldap
 SOCKETS_USE=	php=sockets
 
-MEMCACHED_RUN_DEPENDS=	memcached:${PORTSDIR}/databases/memcached
-IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
-APC_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
-XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
+MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
+IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+APC_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC
+XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
 
 pre-install:
 	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
diff --git a/www/mediawiki126/Makefile b/www/mediawiki126/Makefile
index e0acbc12fb84..16ffa54f9670 100644
--- a/www/mediawiki126/Makefile
+++ b/www/mediawiki126/Makefile
@@ -54,10 +54,10 @@ SQLITE_USE=	php=sqlite3
 LDAP_USE=	php=ldap
 SOCKETS_USE=	php=sockets
 
-MEMCACHED_RUN_DEPENDS=	memcached:${PORTSDIR}/databases/memcached
-IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
-APC_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
-XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
+MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
+IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+APC_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC
+XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
 
 pre-install:
 	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
diff --git a/www/mgstat/Makefile b/www/mgstat/Makefile
index cc4aa5bf6737..798d3f373504 100644
--- a/www/mgstat/Makefile
+++ b/www/mgstat/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://wizard.ae.krakow.pl/~mike/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce graphs from mod_gzip log files
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 GNU_CONFIGURE=	yes
 
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 37ae76da3e2e..e1245c355967 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Lightweight web browser using WebKit browser engine
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
-		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		libgcr-3.so:${PORTSDIR}/security/gcr
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	rsvg-convert:graphics/librsvg2 \
+		valac:lang/vala
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libgcr-3.so:security/gcr
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -40,14 +40,14 @@ OPTIONS_SUB=	yes
 GIR_PREVENTS=	GTK3
 GIR_USE=	gnome=introspection:build
 GIR_CMAKE_ON=	-DUSE_GIR:BOOL=ON
-GTK3_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+GTK3_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 GTK3_USE=	gnome=gtk30
 GTK3_CMAKE_ON=	-DUSE_GTK3:BOOL=ON \
 	-DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF
-GTK3_LIB_DEPENDS_OFF=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+GTK3_LIB_DEPENDS_OFF=	libwebkitgtk-1.0.so:www/webkit-gtk2
 GTK3_USE_OFF=	gnome=gtk20
 GTK3_CMAKE_OFF=	-DUSE_GTK3:BOOL=OFF
-ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:${PORTSDIR}/sysutils/zeitgeist
+ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
 ZEITGEIST_CMAKE_OFF=	-DUSE_ZEITGEIST:BOOL=OFF
 GIR_DESC=	Install GObject Introspection Reference manual
 ZEITGEIST_DESC=	User logs activities
diff --git a/www/mitmproxy/Makefile b/www/mitmproxy/Makefile
index 85f393cbff40..64794f987b06 100644
--- a/www/mitmproxy/Makefile
+++ b/www/mitmproxy/Makefile
@@ -12,13 +12,13 @@ COMMENT=	SSL-capable man-in-the-middle proxy
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}Flask>0:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}netlib>0:${PORTSDIR}/net/py-netlib \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pillow>=2.3.0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}urwid>0:${PORTSDIR}/devel/py-urwid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}netlib>0:net/py-netlib \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pillow>=2.3.0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/mknmz-wwwoffle/Makefile b/www/mknmz-wwwoffle/Makefile
index 2c5b2ea90f47..b57217aa4948 100644
--- a/www/mknmz-wwwoffle/Makefile
+++ b/www/mknmz-wwwoffle/Makefile
@@ -13,8 +13,8 @@ COMMENT=	WWWOFFLE cache indexer for full-text search system Namazu
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/wwwoffle:${PORTSDIR}/www/wwwoffle
-BUILD_DEPENDS=	${LOCALBASE}/bin/mknmz:${PORTSDIR}/databases/namazu2
+RUN_DEPENDS=	${LOCALBASE}/bin/wwwoffle:www/wwwoffle
+BUILD_DEPENDS=	${LOCALBASE}/bin/mknmz:databases/namazu2
 
 USES=		perl5
 HAS_CONFIGURE=	yes
diff --git a/www/mod_amazon_proxy/Makefile b/www/mod_amazon_proxy/Makefile
index 4e92f81eac09..28d93b40d6b2 100644
--- a/www/mod_amazon_proxy/Makefile
+++ b/www/mod_amazon_proxy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/tota/${PORTNAME}
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Amazon Auth Proxy for Product Advertising API
 
-LIB_DEPENDS=	libapreq2.so:${PORTSDIR}/www/libapreq2
+LIB_DEPENDS=	libapreq2.so:www/libapreq2
 
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
diff --git a/www/mod_asn/Makefile b/www/mod_asn/Makefile
index 8677c782731d..c2cfdddf1d12 100644
--- a/www/mod_asn/Makefile
+++ b/www/mod_asn/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Look up the AS and network prefix of IP address
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS=	libapr-1.so:devel/apr1
 
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
diff --git a/www/mod_auth_cas/Makefile b/www/mod_auth_cas/Makefile
index f6825842b596..c4c524778357 100644
--- a/www/mod_auth_cas/Makefile
+++ b/www/mod_auth_cas/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Apache 2.x module that supports the CASv1 and CASv2 protocols
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jasig
diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile
index 929d782300d2..fed7049ad9a6 100644
--- a/www/mod_auth_openid/Makefile
+++ b/www/mod_auth_openid/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Authentication module for the Apache 2 webserver with OpenID
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libopkele.so:${PORTSDIR}/devel/libopkele \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libopkele.so:devel/libopkele \
+		libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bmuller
diff --git a/www/mod_authn_sasl/Makefile b/www/mod_authn_sasl/Makefile
index 835947051abb..a5ce6109a02a 100644
--- a/www/mod_authn_sasl/Makefile
+++ b/www/mod_authn_sasl/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Allows user authentication based on libsasl2 mechanisms on apache 2.2
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 OPTIONS_DEFINE=	SASLAUTHD
 SASLAUTHD_DESC=	cyrus-sasl2-saslauthd support
 
-SASLAUTHD_RUN_DEPENDS=	saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
+SASLAUTHD_RUN_DEPENDS=	saslauthd:security/cyrus-sasl2-saslauthd
 .include <bsd.port.options.mk>
 
 USES=		tar:bzip2
diff --git a/www/mod_authnz_crowd/Makefile b/www/mod_authnz_crowd/Makefile
index ca777eb656a0..791d1adf7254 100644
--- a/www/mod_authnz_crowd/Makefile
+++ b/www/mod_authnz_crowd/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Apache 2.2+ module to use Atlassian Crowd for authentication
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion \
-		libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_dav_svn.so:${PORTSDIR}/www/mod_dav_svn
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion \
+		libcurl.so:ftp/curl
+RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_dav_svn.so:www/mod_dav_svn
 
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 60992a63512b..21e3ee024b24 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 .include <bsd.port.options.mk>
 
 CLAMAV_PORT=	security/clamav
-LIB_DEPENDS+=	libclamav.so:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	libclamav.so:security/clamav
 
 CONFIGURE_ARGS=	--with-apxs=${APXS} \
 		--libdir=${PREFIX}/lib/apache2
diff --git a/www/mod_dnssd/Makefile b/www/mod_dnssd/Makefile
index 3ac3d4396f82..959e715e3d72 100644
--- a/www/mod_dnssd/Makefile
+++ b/www/mod_dnssd/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Apache module that provides DNS-SD capabilities
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
 USES=		gmake pkgconfig
 USE_APACHE=	22+
diff --git a/www/mod_flickr/Makefile b/www/mod_flickr/Makefile
index 2ed06a4e7303..5bd0027b3921 100644
--- a/www/mod_flickr/Makefile
+++ b/www/mod_flickr/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.vshank.com/modcode/
 MAINTAINER=	venkyshankar@yahoo.com
 COMMENT=	Apache module for Flickr API access
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 XTRA_FLAGS=	-lcurl
 
diff --git a/www/mod_geoip2/Makefile b/www/mod_geoip2/Makefile
index 0f8df548eb2b..d42d8eefd9f8 100644
--- a/www/mod_geoip2/Makefile
+++ b/www/mod_geoip2/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Apache module that provides the country code of the client IP
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
-RUN_DEPENDS=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
+BUILD_DEPENDS=	GeoIP>=1.4.4:net/GeoIP
+RUN_DEPENDS=	GeoIP>=1.4.4:net/GeoIP
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
diff --git a/www/mod_http2-devel/Makefile b/www/mod_http2-devel/Makefile
index 977068326655..7f5da7c17017 100644
--- a/www/mod_http2-devel/Makefile
+++ b/www/mod_http2-devel/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Early experience HTTP/2 module for Apache httpd
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	nghttp2>=1.2:${PORTSDIR}/www/nghttp2
-LIB_DEPENDS=	libnghttp2.so:${PORTSDIR}/www/nghttp2
+BUILD_DEPENDS=	nghttp2>=1.2:www/nghttp2
+LIB_DEPENDS=	libnghttp2.so:www/nghttp2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icing
diff --git a/www/mod_log_mysql/Makefile b/www/mod_log_mysql/Makefile
index 874b6d3e3c2c..b8520fb7c2b6 100644
--- a/www/mod_log_mysql/Makefile
+++ b/www/mod_log_mysql/Makefile
@@ -15,7 +15,7 @@ LICENSE=	PD APACHE11
 LICENSE_COMB=	multi
 
 USES=		tar:xz
-RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:${PORTSDIR}/www/mod_log_config-st
+RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:www/mod_log_config-st
 
 USE_APACHE=	22
 AP_FAST_BUILD=	yes
diff --git a/www/mod_log_sql2-dtc/Makefile b/www/mod_log_sql2-dtc/Makefile
index 03759ed90406..bd3f471bc76e 100644
--- a/www/mod_log_sql2-dtc/Makefile
+++ b/www/mod_log_sql2-dtc/Makefile
@@ -18,7 +18,7 @@ DBI_DESC=	depend on databases/libdbi
 OPTIONS_SUB=		yes
 DBI_CONFIGURE_ON=	--with-dbi=${LOCALBASE}
 DBI_CONFIGURE_OFF=	--without-dbi
-DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
+DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 
 GNU_CONFIGURE=	yes
 USES=		gmake tar:bzip2
diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index cdd83593367a..f990c132e892 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	DBI DOCS
 
 DBI_CONFIGURE_WITH=	dbi=${LOCALBASE}
-DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
+DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 
 DBI_DESC=	depend on databases/libdbi
 PORTDOCS=	manual.html manual.xml
diff --git a/www/mod_memcache_block/Makefile b/www/mod_memcache_block/Makefile
index 1c4a41649f6d..d49334d961d1 100644
--- a/www/mod_memcache_block/Makefile
+++ b/www/mod_memcache_block/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Apache 2.2 module to block IPs from lists stored in memcache
 
-LIB_DEPENDS+=	libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS+=	libmemcached.so:databases/libmemcached
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	netik
diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile
index 276c08283adb..71840b0a3609 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Apache module for serving ASP.NET applications
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono \
-		xsp:${PORTSDIR}/www/xsp
-RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono \
-		xsp:${PORTSDIR}/www/xsp
+BUILD_DEPENDS=	mono:lang/mono \
+		xsp:www/xsp
+RUN_DEPENDS=	mono:lang/mono \
+		xsp:www/xsp
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --man=${PREFIX}/man
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index d92ad47b9fdf..89d6d0ee299c 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -26,20 +26,20 @@ MYSQLCACHE_DESC=	MySQL caching support
 OPTIONS_SUB=			yes
 FILECACHE_CONFIGURE_ENABLE=	filecache
 FLAC_CONFIGURE_ENABLE=		flac
-FLAC_LIB_DEPENDS=		libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=		libFLAC.so:audio/flac
 LIBARCHIVE_CONFIGURE_ENABLE=	archive
 MP3_CONFIGURE_ENABLE=		mp3
-MP3_LIB_DEPENDS=		libid3tag.so:${PORTSDIR}/audio/libid3tag \
-				libmad.so:${PORTSDIR}/audio/libmad
+MP3_LIB_DEPENDS=		libid3tag.so:audio/libid3tag \
+				libmad.so:audio/libmad
 MP4_CONFIGURE_ENABLE=		mp4
-MP4_LIB_DEPENDS=		libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+MP4_LIB_DEPENDS=		libmp4v2.so:multimedia/mp4v2
 MYSQLCACHE_CONFIGURE_ENABLE=	mysqlcache
 MYSQLCACHE_USE=			MYSQL=yes
 NLS_CFLAGS=			-lintl
 NLS_CONFIGURE_ENABLE=		nls
 NLS_USES=			gettext
 VORBIS_CONFIGURE_ENABLE=	vorbis
-VORBIS_LIB_DEPENDS=		libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=		libvorbis.so:audio/libvorbis
 
 .include <bsd.port.options.mk>
 
diff --git a/www/mod_ntlm2/Makefile b/www/mod_ntlm2/Makefile
index 422d3b04ca58..07fee445a7c5 100644
--- a/www/mod_ntlm2/Makefile
+++ b/www/mod_ntlm2/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NTLM authentication module for the Apache2 webserver
 
-BUILD_DEPENDS=	smbclient:${PORTSDIR}/${SAMBA_PORT}
+BUILD_DEPENDS=	smbclient:${SAMBA_PORT}
 
 SAMBA_PORT?=	net/samba36
 
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 1d1ba992a05c..494dec7aa219 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Embeds a Perl interpreter in the Apache server
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource
+BUILD_DEPENDS=	p5-BSD-Resource>=0:devel/p5-BSD-Resource
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CGI>=4.15:${PORTSDIR}/www/p5-CGI \
-		p5-libwww>=6.13:${PORTSDIR}/www/p5-libwww
+TEST_DEPENDS=	p5-CGI>=4.15:www/p5-CGI \
+		p5-libwww>=6.13:www/p5-libwww
 
 SUB_FILES=	pkg-message ${APMOD_FILE}
 SUB_LIST=	APACHEMODDIR=${APACHEMODDIR}
diff --git a/www/mod_proxy_html/Makefile b/www/mod_proxy_html/Makefile
index 96be3d431730..42638d7df877 100644
--- a/www/mod_proxy_html/Makefile
+++ b/www/mod_proxy_html/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Apache module for rewriting HTML links in proxied content
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:${PORTSDIR}/www/mod_xml2enc
+RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:www/mod_xml2enc
 
 SUB_FILES=	pkg-message
 USE_APACHE=	22
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index cf4803d18b2f..73d1e1905d3b 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Embeds a Tcl interpreter in the Apache server
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libitcl.so:${PORTSDIR}/lang/itcl
+LIB_DEPENDS=	libitcl.so:lang/itcl
 
 GNU_CONFIGURE=	yes
 USE_APACHE=	22+
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index c21c436d0095..f5d275c3083e 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Intrusion detection and prevention engine
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libyajl.so:${PORTSDIR}/devel/yajl \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		libapr-1.so:devel/apr1 \
+		libyajl.so:devel/yajl \
+		libcurl.so:ftp/curl
 
 USE_APACHE=	22+
 USE_GNOME=	libxml2
@@ -54,7 +54,7 @@ MLOGC_CONFIGURE_OFF=	--disable-mlogc
 FUZZYHASH_DESC=		Allow matching contents using fuzzy hashes with ssdeep
 FUZZYHASH_CONFIGURE_ON=	--with-ssdeep=${LOCALBASE}
 FUZZYHASH_CONFIGURE_OFF=--without-ssdeep
-FUZZYHASH_LIB_DEPENDS=	libfuzzy.so:${PORTSDIR}/security/ssdeep
+FUZZYHASH_LIB_DEPENDS=	libfuzzy.so:security/ssdeep
 
 ETCDIR=		${PREFIX}/etc/modsecurity
 
diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile
index 37451cbdd4f4..d3f38796dd43 100644
--- a/www/mod_spdy/Makefile
+++ b/www/mod_spdy/Makefile
@@ -17,12 +17,12 @@ COMMENT=	SPDY module for the Apache HTTP server v2.2
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
-		greadlink:${PORTSDIR}/sysutils/coreutils \
-		flock:${PORTSDIR}/sysutils/flock \
-		svn:${PORTSDIR}/devel/subversion \
-		curl:${PORTSDIR}/ftp/curl \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	python:lang/python \
+		greadlink:sysutils/coreutils \
+		flock:sysutils/flock \
+		svn:devel/subversion \
+		curl:ftp/curl \
+		bash:shells/bash
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_OPENSSL=	yes
@@ -50,7 +50,7 @@ OPTIONS_DEFINE=	GCC DEBUG
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGCC}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
diff --git a/www/mod_tidy/Makefile b/www/mod_tidy/Makefile
index 172bee88cc66..c04df45d85ca 100644
--- a/www/mod_tidy/Makefile
+++ b/www/mod_tidy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Validates the HTML output of your apache2 webserver
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libtidy.so:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS=	libtidy.so:www/tidy-lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 USE_APACHE=	22+
diff --git a/www/mod_webauth/Makefile b/www/mod_webauth/Makefile
index e1800195f3a2..930317474087 100644
--- a/www/mod_webauth/Makefile
+++ b/www/mod_webauth/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	webauth-${PORTVERSION}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for authenticating users with Kerberos v5
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libsasl2.so:security/cyrus-sasl2
 
 USES=		libtool pkgconfig
 USE_APACHE=	22+
diff --git a/www/mohawk/Makefile b/www/mohawk/Makefile
index 100a08266919..bf0e3a2ba9f8 100644
--- a/www/mohawk/Makefile
+++ b/www/mohawk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple and lightweight HTTP daemon
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 PLIST_FILES+=	bin/mhtpasswd \
 		man/man5/mohawk.conf.5.gz \
diff --git a/www/mongrel2/Makefile b/www/mongrel2/Makefile
index 0b35a2bbc4b7..364637638492 100644
--- a/www/mongrel2/Makefile
+++ b/www/mongrel2/Makefile
@@ -17,8 +17,8 @@ BROKEN_armv6=	does not build
 BROKEN_mips=	does not build (tests segfault)
 BROKEN_mips64=	does not build (tests segfault)
 
-LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq2 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libzmq.so:net/libzmq2 \
+		libsqlite3.so:databases/sqlite3
 
 USES=		gmake tar:bzip2
 MAKE_FLAGS=	freebsd
diff --git a/www/moodle28/Makefile b/www/moodle28/Makefile
index 339c3338dcaa..90e127c27b77 100644
--- a/www/moodle28/Makefile
+++ b/www/moodle28/Makefile
@@ -44,7 +44,7 @@ USE_PHP+=	ldap
 .endif
 
 .if ${PORT_OPTIONS:MMIMETEX}
-RUN_DEPENDS+=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex
+RUN_DEPENDS+=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:www/mimetex
 .endif
 
 NO_BUILD=	yes
diff --git a/www/moodle29/Makefile b/www/moodle29/Makefile
index 9be92dbbe92a..1503963a2747 100644
--- a/www/moodle29/Makefile
+++ b/www/moodle29/Makefile
@@ -44,7 +44,7 @@ USE_PHP+=	ldap
 .endif
 
 .if ${PORT_OPTIONS:MMIMETEX}
-RUN_DEPENDS+=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex
+RUN_DEPENDS+=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:www/mimetex
 .endif
 
 NO_BUILD=	yes
diff --git a/www/moodle30/Makefile b/www/moodle30/Makefile
index 984d2c948cb1..02930462ab10 100644
--- a/www/moodle30/Makefile
+++ b/www/moodle30/Makefile
@@ -30,7 +30,7 @@ MYSQL_USE=	mysql=client php=mysqli
 PGSQL_USE=	php=pgsql
 MSSQL_USE=	php=mssql
 LDAP_USE=	php=ldap
-MIMETEX_RUN_DEPENDS=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex
+MIMETEX_RUN_DEPENDS=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:www/mimetex
 
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
diff --git a/www/multiwatch/Makefile b/www/multiwatch/Makefile
index 4a06561cbfe9..118d2d721348 100644
--- a/www/multiwatch/Makefile
+++ b/www/multiwatch/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Spawn-fcgi helper for forking multiple workers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 GNU_CONFIGURE=	yes
 
diff --git a/www/mysar/Makefile b/www/mysar/Makefile
index b7dc42bcab4f..d8e8d5e266db 100644
--- a/www/mysar/Makefile
+++ b/www/mysar/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	MySQL Squid Access Report
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 WRKROOT=	${WRKDIR}/${PORTNAME:tl}
 WRKSRC=		${WRKROOT}/bin/mysar-binary-importer/
diff --git a/www/mythplugin-mythweb/Makefile b/www/mythplugin-mythweb/Makefile
index c2fa542c03fe..3b92668746b4 100644
--- a/www/mythplugin-mythweb/Makefile
+++ b/www/mythplugin-mythweb/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	mythplugin-
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Frontend for scheduling and managing recordings on your MythTV Box
 
-RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
@@ -24,7 +24,7 @@ PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 OPTIONS_DEFINE=	APACHE LIGHTTPD
 OPTIONS_DEFAULT=	APACHE
 
-LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
+LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 
 .include <bsd.port.options.mk>
 
diff --git a/www/nanoblogger-extra/Makefile b/www/nanoblogger-extra/Makefile
index 328138f9924f..eb42d47256a9 100644
--- a/www/nanoblogger-extra/Makefile
+++ b/www/nanoblogger-extra/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Extras for nanoblogger, a small weblog engine
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	nb:${PORTSDIR}/www/nanoblogger
+RUN_DEPENDS=	nb:www/nanoblogger
 
 WRKSRC=		${WRKDIR}/nanoblogger-${PORTVERSION}
 DATADIR=	${PREFIX}/share/nanoblogger
diff --git a/www/nanoblogger/Makefile b/www/nanoblogger/Makefile
index bfe66aa40887..16e1a60a4931 100644
--- a/www/nanoblogger/Makefile
+++ b/www/nanoblogger/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small weblog engine written in Bash for the command line
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 NO_BUILD=	yes
 
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 6f5f6a662748..1ca0f8ac0fd0 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -27,9 +27,9 @@ PROXY_DESC=		libproxy support
 XML_DESC=		XML parser library
 
 CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 EXPAT_CONFIGURE_WITH=	expat
-EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 GSSAPI_CONFIGURE_WITH=	gssapi
 LIBXML_CONFIGURE_WITH=	libxml2
 LIBXML_USE=		GNOME=libxml2
@@ -38,7 +38,7 @@ NLS_USES=		gettext
 OPENSSL_CONFIGURE_WITH=	ssl
 OPENSSL_USE=		OPENSSL=yes
 PROXY_CONFIGURE_WITH=	libproxy
-PROXY_LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
+PROXY_LIB_DEPENDS=	libproxy.so:net/libproxy
 
 .include <bsd.port.options.mk>
 
diff --git a/www/netrik/Makefile b/www/netrik/Makefile
index 5b43621e0c47..d528b5be36a9 100644
--- a/www/netrik/Makefile
+++ b/www/netrik/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/stable/${PORTVERSION}%20%28beta%29
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Text web browser, ambitious, in active development
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 USES=		gmake ncurses
 GNU_CONFIGURE=	yes
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 3b52147fe162..63b2cdb11679 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Lightweight web browser
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	duk:${PORTSDIR}/lang/duktape \
-		nsgenbind:${PORTSDIR}/devel/nsgenbind \
-		p5-HTML-Parser>=3.72:${PORTSDIR}/www/p5-HTML-Parser
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libnsutils.so:${PORTSDIR}/devel/libnsutils \
-		libutf8proc.so:${PORTSDIR}/textproc/libutf8proc \
-		libnsgif.so:${PORTSDIR}/graphics/libnsgif \
-		libnsbmp.so:${PORTSDIR}/graphics/libnsbmp \
-		libdom.so:${PORTSDIR}/www/libdom \
-		libcss.so:${PORTSDIR}/textproc/libcss
+BUILD_DEPENDS=	duk:lang/duktape \
+		nsgenbind:devel/nsgenbind \
+		p5-HTML-Parser>=3.72:www/p5-HTML-Parser
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpng.so:graphics/png \
+		libnsutils.so:devel/libnsutils \
+		libutf8proc.so:textproc/libutf8proc \
+		libnsgif.so:graphics/libnsgif \
+		libnsbmp.so:graphics/libnsbmp \
+		libdom.so:www/libdom \
+		libcss.so:textproc/libcss
 
 ALL_TARGET=	#empty
 LDFLAGS+=	-lssl -lcrypto -L${LOCALBASE}/lib ${ICONV_LIB}
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index f98518c7234c..bc5eabc7b22a 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -13,9 +13,9 @@ COMMENT=	RSS feed reader for the text console
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libstfl.so:${PORTSDIR}/devel/stfl \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	libstfl.so:devel/stfl \
+		libcurl.so:ftp/curl \
+		libjson-c.so:devel/json-c
 
 OPTIONS_DEFINE=	PODCAST
 OPTIONS_DEFAULT=PODCAST
diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
index f57843f32064..b2adabf6164e 100644
--- a/www/nghttp2/Makefile
+++ b/www/nghttp2/Makefile
@@ -12,12 +12,12 @@ COMMENT=	HTTP/2.0 C Library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	libev>=4.15:${PORTSDIR}/devel/libev \
-		libevent2>=2.0.8:${PORTSDIR}/devel/libevent2 \
-		spdylay>=1.3.0:${PORTSDIR}/www/spdylay
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev \
-		libevent_openssl.so:${PORTSDIR}/devel/libevent2 \
-		libspdylay.so:${PORTSDIR}/www/spdylay
+BUILD_DEPENDS=	libev>=4.15:devel/libev \
+		libevent2>=2.0.8:devel/libevent2 \
+		spdylay>=1.3.0:www/spdylay
+LIB_DEPENDS=	libev.so:devel/libev \
+		libevent_openssl.so:devel/libevent2 \
+		libspdylay.so:www/spdylay
 
 OPTIONS_DEFINE=	ASIO DOCS HPACK
 OPTIONS_DEFAULT=HPACK
@@ -45,13 +45,13 @@ USES=		autoreconf compiler:c++11-lib gmake libtool localbase pathfix pkgconfig
 PORTDATA=	fetch-ocsp-response
 PORTDOCS=	*
 
-ASIO_BUILD_DEPENDS=	boost-libs>=1.54.0:${PORTSDIR}/devel/boost-libs
+ASIO_BUILD_DEPENDS=	boost-libs>=1.54.0:devel/boost-libs
 ASIO_CONFIGURE_OFF=	--with-boost=no
 ASIO_CONFIGURE_ON=	--enable-asio-lib --with-boost-asio --with-boost-system --with-boost-thread
-ASIO_LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
-ASIO_RUN_DEPENDS=	boost-libs>=1.54.0:${PORTSDIR}/devel/boost-libs
+ASIO_LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
+ASIO_RUN_DEPENDS=	boost-libs>=1.54.0:devel/boost-libs
 HPACK_CONFIGURE_ENABLE=	hpack-tools
-HPACK_LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson
+HPACK_LIB_DEPENDS=	libjansson.so:devel/jansson
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index f2e362f572ac..940d5592e3c3 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -284,7 +284,7 @@ CATEGORIES+=	ipv6
 .endif
 
 .if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS}
-LIB_DEPENDS+=	libprofiler.so:${PORTSDIR}/devel/google-perftools
+LIB_DEPENDS+=	libprofiler.so:devel/google-perftools
 CONFIGURE_ARGS+=--with-google_perftools_module
 .endif
 
@@ -423,7 +423,7 @@ CONFIGURE_ARGS+=--with-http_dav_module
 
 .if ${PORT_OPTIONS:MHTTP_DAV_EXT}
 USE_HTTP_DAV=	yes
-LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	libexpat.so:textproc/expat2
 NGINX_DAV_EXT_VERSION=	0.0.3
 GH_ACCOUNT+=	arut:dav_ext
 GH_PROJECT+=	nginx-dav-ext-module:dav_ext
@@ -469,7 +469,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_json_status}
 
 .if ${PORT_OPTIONS:MHTTP_GEOIP}
 CONFIGURE_ARGS+=--with-http_geoip_module=dynamic
-LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_GZIP_STATIC}
@@ -481,7 +481,7 @@ CONFIGURE_ARGS+=--with-http_gunzip_module
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_IMAGE_FILTER}
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	libgd.so:graphics/gd
 CONFIGURE_ARGS+=--with-http_image_filter_module=dynamic
 .endif
 
@@ -567,8 +567,8 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_TARANTOOL}
-LIB_DEPENDS+=	libmsgpuck.so:${PORTSDIR}/devel/msgpuck \
-		libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS+=	libmsgpuck.so:devel/msgpuck \
+		libyajl.so:devel/yajl
 GH_ACCOUNT+=	tarantool:nginx_tarantool
 GH_PROJECT+=	nginx_upstream_module:nginx_tarantool
 GH_TAGNAME+=	966f2f5:nginx_tarantool
@@ -626,12 +626,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-c825
 
 .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR}
 NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.7.0
-LIB_DEPENDS+= 	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libavutil.so:${PORTSDIR}/multimedia/ffmpeg \
-		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+= 	libjpeg.so:graphics/jpeg \
+		libavformat.so:multimedia/ffmpeg \
+		libavcodec.so:multimedia/ffmpeg \
+		libavutil.so:multimedia/ffmpeg \
+		libswscale.so:multimedia/ffmpeg \
+		libMagickWand-6.so:graphics/ImageMagick
 GH_ACCOUNT+=	wandenberg:vte
 GH_PROJECT+=	nginx-video-thumbextractor-module:vte
 GH_TAGNAME+=	${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte
@@ -652,7 +652,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
 .endif
 
 .if ${PORT_OPTIONS:MDRIZZLE}
-LIB_DEPENDS+=	libdrizzle.so:${PORTSDIR}/databases/libdrizzle
+LIB_DEPENDS+=	libdrizzle.so:databases/libdrizzle
 NGINX_DRIZZLE_VERSION=	0.1.9
 GH_ACCOUNT+=	openresty:drizzle
 GH_PROJECT+=	drizzle-nginx-module:drizzle
@@ -703,7 +703,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
-LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
 CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 NGINX_LUA_VERSION=	7410339
@@ -723,11 +723,11 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
 
 .if ${PORT_OPTIONS:MMODSECURITY}
 NGINX_MODSECURITY_VERSION=	2.9.1
-LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS+=	libapr-1.so:devel/apr1 \
+		libcurl.so:ftp/curl \
+		libluajit-5.1.so:lang/luajit \
+		libpcre.so:devel/pcre \
+		libyajl.so:devel/yajl
 USE_APACHE=	22+
 USE_GNOME+=	libxml2
 MASTER_SITES+=	http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity
@@ -745,7 +745,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 CONFIGURE_ARGS+=--with-pcre
 .else
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nopcre
@@ -843,9 +843,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VER
 
 .if ${PORT_OPTIONS:MSMALL_LIGHT}
 NGINX_SMALL_LIGHT_VERSION=	0.6.15
-LIB_DEPENDS+=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libMagickCore-6.so:graphics/ImageMagick \
+		libMagickWand-6.so:graphics/ImageMagick \
+		libpcre.so:devel/pcre
 GH_ACCOUNT+=	cubicdaiya:small_light
 GH_PROJECT+=	ngx_small_light:small_light
 GH_TAGNAME+=	v${NGINX_SMALL_LIGHT_VERSION}:small_light
@@ -962,8 +962,8 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_arrayvar}
 
 .if ${PORT_OPTIONS:MBROTLI}
 NGINX_BROTLI_VERSION=	86998c6
-LIB_DEPENDS+=	libbrotlidec.so:${PORTSDIR}/devel/libbrotli \
-		libbrotlienc.so:${PORTSDIR}/devel/libbrotli
+LIB_DEPENDS+=	libbrotlidec.so:devel/libbrotli \
+		libbrotlienc.so:devel/libbrotli
 GH_ACCOUNT+=	google:brotli
 GH_PROJECT+=	ngx_brotli:brotli
 GH_TAGNAME+=	${NGINX_BROTLI_VERSION}:brotli
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 25ae814b7028..94a9fb30d299 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -273,7 +273,7 @@ CATEGORIES+=	ipv6
 .endif
 
 .if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS}
-LIB_DEPENDS+=	libprofiler.so:${PORTSDIR}/devel/google-perftools
+LIB_DEPENDS+=	libprofiler.so:devel/google-perftools
 CONFIGURE_ARGS+=--with-google_perftools_module
 .endif
 
@@ -412,7 +412,7 @@ CONFIGURE_ARGS+=--with-http_dav_module
 
 .if ${PORT_OPTIONS:MHTTP_DAV_EXT}
 USE_HTTP_DAV=	yes
-LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	libexpat.so:textproc/expat2
 NGINX_DAV_EXT_VERSION=	0.0.3
 GH_ACCOUNT+=	arut:dav_ext
 GH_PROJECT+=	nginx-dav-ext-module:dav_ext
@@ -458,7 +458,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_json_status}
 
 .if ${PORT_OPTIONS:MHTTP_GEOIP}
 CONFIGURE_ARGS+=--with-http_geoip_module
-LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_GZIP_STATIC}
@@ -470,7 +470,7 @@ CONFIGURE_ARGS+=--with-http_gunzip_module
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_IMAGE_FILTER}
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	libgd.so:graphics/gd
 CONFIGURE_ARGS+=--with-http_image_filter_module
 .endif
 
@@ -556,8 +556,8 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_TARANTOOL}
-LIB_DEPENDS+=	libmsgpuck.so:${PORTSDIR}/devel/msgpuck \
-		libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS+=	libmsgpuck.so:devel/msgpuck \
+		libyajl.so:devel/yajl
 GH_ACCOUNT+=	tarantool:nginx_tarantool
 GH_PROJECT+=	nginx_upstream_module:nginx_tarantool
 GH_TAGNAME+=	966f2f5:nginx_tarantool
@@ -611,12 +611,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-c825
 
 .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR}
 NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.7.0
-LIB_DEPENDS+= 	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libavutil.so:${PORTSDIR}/multimedia/ffmpeg \
-		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+= 	libjpeg.so:graphics/jpeg \
+		libavformat.so:multimedia/ffmpeg \
+		libavcodec.so:multimedia/ffmpeg \
+		libavutil.so:multimedia/ffmpeg \
+		libswscale.so:multimedia/ffmpeg \
+		libMagickWand-6.so:graphics/ImageMagick
 GH_ACCOUNT+=	wandenberg:vte
 GH_PROJECT+=	nginx-video-thumbextractor-module:vte
 GH_TAGNAME+=	${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte
@@ -637,7 +637,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
 .endif
 
 .if ${PORT_OPTIONS:MDRIZZLE}
-LIB_DEPENDS+=	libdrizzle.so:${PORTSDIR}/databases/libdrizzle
+LIB_DEPENDS+=	libdrizzle.so:databases/libdrizzle
 NGINX_DRIZZLE_VERSION=	0.1.9
 GH_ACCOUNT+=	openresty:drizzle
 GH_PROJECT+=	drizzle-nginx-module:drizzle
@@ -680,7 +680,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
-LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
 CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 NGINX_LUA_VERSION=	7410339
@@ -700,11 +700,11 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
 
 .if ${PORT_OPTIONS:MMODSECURITY}
 NGINX_MODSECURITY_VERSION=	2.9.1
-LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS+=	libapr-1.so:devel/apr1 \
+		libcurl.so:ftp/curl \
+		libluajit-5.1.so:lang/luajit \
+		libpcre.so:devel/pcre \
+		libyajl.so:devel/yajl
 USE_APACHE=	22+
 USE_GNOME+=	libxml2
 MASTER_SITES+=	http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity
@@ -722,7 +722,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 CONFIGURE_ARGS+=--with-pcre
 .else
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nopcre
@@ -819,9 +819,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VER
 
 .if ${PORT_OPTIONS:MSMALL_LIGHT}
 NGINX_SMALL_LIGHT_VERSION=	0.6.15
-LIB_DEPENDS+=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libMagickCore-6.so:graphics/ImageMagick \
+		libMagickWand-6.so:graphics/ImageMagick \
+		libpcre.so:devel/pcre
 GH_ACCOUNT+=	cubicdaiya:small_light
 GH_PROJECT+=	ngx_small_light:small_light
 GH_TAGNAME+=	v${NGINX_SMALL_LIGHT_VERSION}:small_light
@@ -921,8 +921,8 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_arrayvar}
 
 .if ${PORT_OPTIONS:MBROTLI}
 NGINX_BROTLI_VERSION=	86998c6
-LIB_DEPENDS+=	libbrotlidec.so:${PORTSDIR}/devel/libbrotli \
-		libbrotlienc.so:${PORTSDIR}/devel/libbrotli
+LIB_DEPENDS+=	libbrotlidec.so:devel/libbrotli \
+		libbrotlienc.so:devel/libbrotli
 GH_ACCOUNT+=	google:brotli
 GH_PROJECT+=	ngx_brotli:brotli
 GH_TAGNAME+=	${NGINX_BROTLI_VERSION}:brotli
diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile
index f4cdc567cc95..f0be167e3b90 100644
--- a/www/nibbleblog/Makefile
+++ b/www/nibbleblog/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	nibbleblogv302
 MAINTAINER=	marekholienka@gmail.com
 COMMENT=	Lightweight blog system for general use
 
-RUN_DEPENDS=	pear:${PORTSDIR}/devel/pear
+RUN_DEPENDS=	pear:devel/pear
 
 USES=		cpe zip
 NO_BUILD=	yes
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	APACHE LIGHTTPD
 OPTIONS_DEFAULT=	APACHE
 
 APACHE_USE=		APACHE_RUN=22+
-LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
+LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/www/npapi-vlc/Makefile b/www/npapi-vlc/Makefile
index 57dc5033d1e8..a5d274d8122a 100644
--- a/www/npapi-vlc/Makefile
+++ b/www/npapi-vlc/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc-webplugins/${PORTVER
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embeds vlc-player in web-browsers
 
-LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc \
-		libxul.so:${PORTSDIR}/www/libxul
+LIB_DEPENDS=	libvlc.so:multimedia/vlc \
+		libxul.so:www/libxul
 
 USES=		libtool pkgconfig tar:xz webplugin:native
 USE_GNOME=	gtk20
diff --git a/www/npapi-xine/Makefile b/www/npapi-xine/Makefile
index 325f0ec33cb9..03a11afbbeb0 100644
--- a/www/npapi-xine/Makefile
+++ b/www/npapi-xine/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	npapi-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embed Xine player into browser
 
-LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS=	libxine.so:multimedia/libxine
 
 USES=		pkgconfig webplugin:native tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/www/npm/Makefile b/www/npm/Makefile
index d50a23c3a09e..b0312de1cb75 100644
--- a/www/npm/Makefile
+++ b/www/npm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Node package manager
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
+RUN_DEPENDS=	gmake:devel/gmake
 
 OPTIONS_SINGLE=	BACKEND
 OPTIONS_SINGLE_BACKEND=	NODE NODE_DEVEL NODE010 NODE012 NODE4
@@ -41,11 +41,11 @@ SHEBANG_FILES=	lib/utils/completion.sh \
 		scripts/relocate.sh \
 		test/update-test.sh
 
-NODE_DEVEL_RUN_DEPENDS=	node-devel>=0.8.0:${PORTSDIR}/www/node-devel
-NODE_RUN_DEPENDS=	node>=0.8.0:${PORTSDIR}/www/node
-NODE010_RUN_DEPENDS=	node010>=0.8.0:${PORTSDIR}/www/node010
-NODE012_RUN_DEPENDS=	node012>=0.8.0:${PORTSDIR}/www/node012
-NODE4_RUN_DEPENDS=	node4>=0.8.0:${PORTSDIR}/www/node4
+NODE_DEVEL_RUN_DEPENDS=	node-devel>=0.8.0:www/node-devel
+NODE_RUN_DEPENDS=	node>=0.8.0:www/node
+NODE010_RUN_DEPENDS=	node010>=0.8.0:www/node010
+NODE012_RUN_DEPENDS=	node012>=0.8.0:www/node012
+NODE4_RUN_DEPENDS=	node4>=0.8.0:www/node4
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/npm012/Makefile b/www/npm012/Makefile
index 25ede1abbd0d..1afccd86499a 100644
--- a/www/npm012/Makefile
+++ b/www/npm012/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Node package manager
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	node012>=0.12.0:${PORTSDIR}/www/node012
+RUN_DEPENDS=	node012>=0.12.0:www/node012
 
 MAKE_ARGS=	npm_config_prefix=${STAGEDIR}${PREFIX}
 MANPREFIX=	${PREFIX}/lib/node_modules/npm
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index 3ff4ff45e2a9..81651f2e38b7 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Compatibility plugin for Mozilla NPAPI plugins
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 CONFLICTS=	nspluginwrapper-1.3.*
 
diff --git a/www/ocaml-net/Makefile b/www/ocaml-net/Makefile
index 632915048621..11e5d95be3fc 100644
--- a/www/ocaml-net/Makefile
+++ b/www/ocaml-net/Makefile
@@ -14,8 +14,8 @@ COMMENT=	OCaml modules for Internet applications
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
-RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
+BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
+RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
 
 CONFLICTS=	ocaml-equeue-2* ocaml-netclient-0*
 
@@ -54,16 +54,16 @@ ZIP_DESC=	Compression support
 APACHE_DESC=	Apache mod connector (experimental)
 GNUTLS_DESC=	SSL/TLS support via GnuTLS
 
-GTK2_BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-GTK2_RUN_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-ZIP_BUILD_DEPENDS=	${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip
-ZIP_RUN_DEPENDS=	${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip
+GTK2_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
+GTK2_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
+ZIP_BUILD_DEPENDS=	${SA_DIR}/zip/zip.a:archivers/ocaml-zip
+ZIP_RUN_DEPENDS=	${SA_DIR}/zip/zip.a:archivers/ocaml-zip
 NETHTTPD_CONFIGURE_ON=	-with-nethttpd
 NETHTTPD_VARS=		OCAML_PKGDIRS+=nethttpd
 GTK2_CONFIGURE_ON=	-enable-gtk2
 GTK2_VARS=		OCAML_PKGDIRS+=equeue-gtk2
 GNUTLS_USES=		pkgconfig
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	-enable-gnutls
 GNUTLS_VARS=		OCAML_PKGDIRS+=nettls-gnutls
 APACHE_BROKEN=		does not build with APACHE option enabled
diff --git a/www/offline-npm/Makefile b/www/offline-npm/Makefile
index 45bd3cf1f361..98fc540fdd88 100644
--- a/www/offline-npm/Makefile
+++ b/www/offline-npm/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Offline installation with npm install
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	npm>0:${PORTSDIR}/www/npm
-RUN_DEPENDS=	npm>0:${PORTSDIR}/www/npm
+BUILD_DEPENDS=	npm>0:www/npm
+RUN_DEPENDS=	npm>0:www/npm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	commenthol
diff --git a/www/opera-linuxplugins/Makefile b/www/opera-linuxplugins/Makefile
index 29b866f4f2eb..476d4d2c5243 100644
--- a/www/opera-linuxplugins/Makefile
+++ b/www/opera-linuxplugins/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux plugin support for the native Opera browser
 
-RUN_DEPENDS=	${LOCALBASE}/lib/opera/pluginwrapper/operapluginwrapper:${PORTSDIR}/${PKGCATEGORY}/opera
+RUN_DEPENDS=	${LOCALBASE}/lib/opera/pluginwrapper/operapluginwrapper:${PKGCATEGORY}/opera
 
 OPERA_VER?=	12.16
 OPERA_BUILD?=	1860
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 2014854cc190..eca0f1cad32d 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -16,10 +16,10 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.${ARCH}.freebsd
 MAINTAINER=	ak@FreeBSD.org
 COMMENT=	Blazingly fast, full-featured, standards-compliant browser
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-BUILD_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
-RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
+BUILD_DEPENDS=	${LOCALBASE}/bin/update-mime-database:misc/shared-mime-info
+RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:misc/shared-mime-info
 
 BUNDLE_LIBS=	yes
 
@@ -42,7 +42,7 @@ NO_OPTIONS_SORT=yes
 CUPS_DESC=	support for printing (requires CUPS)
 VIDEO_DESC=	support for HTML5 video (requires GStreamer)
 
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 VIDEO_USE=	gstreamer=vorbis,ogg,theora,vp8,good
 GTK2_USE=	gnome=gtk20,libxml2
@@ -68,7 +68,7 @@ INSTALLS_ICONS=	yes
 OPERA_ARCH=	${ARCH:S,i386,intel,}
 
 .if ${OSVERSION} >= 1000054
-BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
+BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
 PLIST_SUB+=	LIBSTDC=""
 .else
 PLIST_SUB+=	LIBSTDC="@comment "
diff --git a/www/otrs/Makefile b/www/otrs/Makefile
index e4e008959b1f..cbf275c6ef76 100644
--- a/www/otrs/Makefile
+++ b/www/otrs/Makefile
@@ -15,38 +15,38 @@ COMMENT=	Open Ticket Request System
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Crypt-Eksblowfish>=0:${PORTSDIR}/security/p5-Crypt-Eksblowfish \
-		p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA \
-		p5-MIME-Tools>=5.427:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Net-DNS>=0.66:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-CSS-Minifier-XS>=0:${PORTSDIR}/textproc/p5-CSS-Minifier-XS \
-		p5-JavaScript-Minifier-XS>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier-XS \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Sys-Hostname-Long>=0:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
-		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-IO-Interactive>=0:${PORTSDIR}/devel/p5-IO-Interactive \
-		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Date-Pcalc>=0:${PORTSDIR}/devel/p5-Date-Pcalc \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-XML-FeedPP>=0:${PORTSDIR}/textproc/p5-XML-FeedPP \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML \
-		p5-JavaScript-Minifier>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier \
-		p5-CSS-Minifier>=0:${PORTSDIR}/textproc/p5-CSS-Minifier \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Mozilla-CA>=0:${PORTSDIR}/www/p5-Mozilla-CA \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Schedule-Cron-Events>=1.94:${PORTSDIR}/sysutils/p5-Schedule-Cron-Events
+BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish \
+		p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
+		p5-Digest-SHA>=0:security/p5-Digest-SHA \
+		p5-MIME-Tools>=5.427:mail/p5-MIME-Tools \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Net-DNS>=0.66:dns/p5-Net-DNS \
+		p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
+		p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \
+		p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+		p5-IO-Interactive>=0:devel/p5-IO-Interactive \
+		p5-Email-Valid>=0:mail/p5-Email-Valid \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-Date-Pcalc>=0:devel/p5-Date-Pcalc \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-XML-FeedPP>=0:textproc/p5-XML-FeedPP \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML \
+		p5-JavaScript-Minifier>=0:textproc/p5-JavaScript-Minifier \
+		p5-CSS-Minifier>=0:textproc/p5-CSS-Minifier \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Schedule-Cron-Events>=1.94:sysutils/p5-Schedule-Cron-Events
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -92,38 +92,38 @@ CLEAN_FILES=	scripts/suse* scripts/redhat* \
 
 PLIST_SUB+=	VER_CKEDITOR="4.4.5" OTRS_USER=${USERS} WWWOWN=${WWWOWN}
 
-PGSQL_RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+PGSQL_RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 PGSQL_USES=		pgsql
 
-MYSQL_RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+MYSQL_RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
-SSL_RUN_DEPENDS+=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
+SSL_RUN_DEPENDS+=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 
-APACHE_RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:${PORTSDIR}/www/mod_perl2 \
-			p5-Apache-DBI>0:${PORTSDIR}/www/p5-Apache-DBI
+APACHE_RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2 \
+			p5-Apache-DBI>0:www/p5-Apache-DBI
 
-REPORTS_RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-			p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-			p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
+REPORTS_RUN_DEPENDS+=	p5-GD>=0:graphics/p5-GD \
+			p5-GD-Graph>=0:graphics/p5-GD-Graph \
+			p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil
 
-SMTP_RUN_DEPENDS+=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-			p5-Net-SSLGlue>=0:${PORTSDIR}/security/p5-Net-SSLGlue
+SMTP_RUN_DEPENDS+=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+			p5-Net-SSLGlue>=0:security/p5-Net-SSLGlue
 
-POP3_RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-			p5-Net-SSLGlue>=0:${PORTSDIR}/security/p5-Net-SSLGlue
+POP3_RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+			p5-Net-SSLGlue>=0:security/p5-Net-SSLGlue
 
-IMAP_RUN_DEPENDS+=	p5-Mail-IMAPClient>=0:${PORTSDIR}/mail/p5-Mail-IMAPClient \
-			p5-Net-IMAP-Simple>=0:${PORTSDIR}/mail/p5-Net-IMAP-Simple
+IMAP_RUN_DEPENDS+=	p5-Mail-IMAPClient>=0:mail/p5-Mail-IMAPClient \
+			p5-Net-IMAP-Simple>=0:mail/p5-Net-IMAP-Simple
 
-LDAP_RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+LDAP_RUN_DEPENDS+=	p5-perl-ldap>=0:net/p5-perl-ldap
 
-PDF_RUN_DEPENDS+=	p5-PDF-API2>=0.57:${PORTSDIR}/textproc/p5-PDF-API2
+PDF_RUN_DEPENDS+=	p5-PDF-API2>=0.57:textproc/p5-PDF-API2
 
-ISPELL_RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
+ISPELL_RUN_DEPENDS+=	ispell:textproc/aspell-ispell
 
-ASPELL_RUN_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
+ASPELL_RUN_DEPENDS+=	aspell:textproc/aspell
 
-GNUPG_RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg1
+GNUPG_RUN_DEPENDS+=	gpg:security/gnupg1
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/owncloud/Makefile b/www/owncloud/Makefile
index 332ed9e18b0b..7f85ef6e921b 100644
--- a/www/owncloud/Makefile
+++ b/www/owncloud/Makefile
@@ -39,7 +39,7 @@ MP3INFO_DESC=	MP3 ID3 tags support
 
 EXIF_USE=	PHP=exif
 LDAP_USE=	PHP=ldap
-MP3INFO_BUILD_DEPENDS=	mp3info:${PORTSDIR}/audio/mp3info
+MP3INFO_BUILD_DEPENDS=	mp3info:audio/mp3info
 MP3INFO_RUN_DEPENDS=	${MP3INFO_BUILD_DEPENDS}
 MYSQL_USE=	MYSQL=client PHP=pdo_mysql
 PGSQL_USES=	pgsql
diff --git a/www/p5-AMF-Perl/Makefile b/www/p5-AMF-Perl/Makefile
index 634c02f86713..65bce9d45730 100644
--- a/www/p5-AMF-Perl/Makefile
+++ b/www/p5-AMF-Perl/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Flash Remoting in Perl
 
-RUN_DEPENDS=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure patch
diff --git a/www/p5-Amon2-Lite/Makefile b/www/p5-Amon2-Lite/Makefile
index fd01d0f52807..2f3710a35af5 100644
--- a/www/p5-Amon2-Lite/Makefile
+++ b/www/p5-Amon2-Lite/Makefile
@@ -11,18 +11,18 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Sinatra-ish framework on Amon2!
 
 RUN_DEPENDS=	\
-	p5-Amon2>=3.25:${PORTSDIR}/www/p5-Amon2 \
-	p5-Data-Section-Simple>=0.03:${PORTSDIR}/devel/p5-Data-Section-Simple \
-	p5-Router-Simple>=0.13:${PORTSDIR}/www/p5-Router-Simple \
-	p5-Text-Xslate-Bridge-TT2Like>=0.00010:${PORTSDIR}/textproc/p5-Text-Xslate-Bridge-TT2Like
+	p5-Amon2>=3.25:www/p5-Amon2 \
+	p5-Data-Section-Simple>=0.03:devel/p5-Data-Section-Simple \
+	p5-Router-Simple>=0.13:www/p5-Router-Simple \
+	p5-Text-Xslate-Bridge-TT2Like>=0.00010:textproc/p5-Text-Xslate-Bridge-TT2Like
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-	p5-Text-MicroTemplate>0:${PORTSDIR}/textproc/p5-Text-MicroTemplate \
-	p5-Test-WWW-Mechanize-PSGI>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-PSGI \
-	p5-Tiffany>0:${PORTSDIR}/textproc/p5-Tiffany \
-	p5-Plack-Middleware-ReverseProxy>0:${PORTSDIR}/www/p5-Plack-Middleware-ReverseProxy
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-JSON>0:converters/p5-JSON \
+	p5-Text-MicroTemplate>0:textproc/p5-Text-MicroTemplate \
+	p5-Test-WWW-Mechanize-PSGI>0:devel/p5-Test-WWW-Mechanize-PSGI \
+	p5-Tiffany>0:textproc/p5-Tiffany \
+	p5-Plack-Middleware-ReverseProxy>0:www/p5-Plack-Middleware-ReverseProxy
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Amon2-Plugin-LogDispatch/Makefile b/www/p5-Amon2-Plugin-LogDispatch/Makefile
index 60e7f25bb396..3a81ab886e68 100644
--- a/www/p5-Amon2-Plugin-LogDispatch/Makefile
+++ b/www/p5-Amon2-Plugin-LogDispatch/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of Log::Dispatch glue for Amon2
 
 RUN_DEPENDS=	\
-	p5-Amon2>=2.33:${PORTSDIR}/www/p5-Amon2 \
-	p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch
+	p5-Amon2>=2.33:www/p5-Amon2 \
+	p5-Log-Dispatch>0:devel/p5-Log-Dispatch
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+	p5-Test-Requires>0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile b/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile
index b00420c1825d..b4243d5170dd 100644
--- a/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile
+++ b/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Amon2>0:${PORTSDIR}/www/p5-Amon2
+	p5-Amon2>0:www/p5-Amon2
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile b/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile
index b3c260162fb3..708e2b93892d 100644
--- a/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile
+++ b/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile
@@ -11,24 +11,24 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of HTTP::MobileAgent plugin for Amon2
 
 RUN_DEPENDS=	\
-	p5-Amon2>=3.66:${PORTSDIR}/www/p5-Amon2 \
-	ja-p5-Encode-JP-Mobile>=0.29:${PORTSDIR}/japanese/p5-Encode-JP-Mobile \
-	p5-HTTP-MobileAgent>0:${PORTSDIR}/www/p5-HTTP-MobileAgent \
-	p5-HTTP-MobileAgent-Plugin-Charset>0:${PORTSDIR}/www/p5-HTTP-MobileAgent-Plugin-Charset \
-	ja-p5-Lingua-JA-Regular-Unicode>0:${PORTSDIR}/japanese/p5-Lingua-JA-Regular-Unicode
+	p5-Amon2>=3.66:www/p5-Amon2 \
+	ja-p5-Encode-JP-Mobile>=0.29:japanese/p5-Encode-JP-Mobile \
+	p5-HTTP-MobileAgent>0:www/p5-HTTP-MobileAgent \
+	p5-HTTP-MobileAgent-Plugin-Charset>0:www/p5-HTTP-MobileAgent-Plugin-Charset \
+	ja-p5-Lingua-JA-Regular-Unicode>0:japanese/p5-Lingua-JA-Regular-Unicode
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Tiffany>0:${PORTSDIR}/textproc/p5-Tiffany \
-	p5-Amon2-DBI>0:${PORTSDIR}/databases/p5-Amon2-DBI \
-	p5-LWP-Protocol-PSGI>0:${PORTSDIR}/www/p5-LWP-Protocol-PSGI \
-	p5-HTML-FillInForm-Lite>0:${PORTSDIR}/www/p5-HTML-FillInForm-Lite \
-	p5-HTTP-Session>0:${PORTSDIR}/www/p5-HTTP-Session \
-	p5-Plack-Middleware-ReverseProxy>0:${PORTSDIR}/www/p5-Plack-Middleware-ReverseProxy \
-	p5-Test-WWW-Mechanize-PSGI>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-PSGI \
-	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-String-CamelCase>0:${PORTSDIR}/textproc/p5-String-CamelCase \
-	p5-Module-Find>0:${PORTSDIR}/devel/p5-Module-Find
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Tiffany>0:textproc/p5-Tiffany \
+	p5-Amon2-DBI>0:databases/p5-Amon2-DBI \
+	p5-LWP-Protocol-PSGI>0:www/p5-LWP-Protocol-PSGI \
+	p5-HTML-FillInForm-Lite>0:www/p5-HTML-FillInForm-Lite \
+	p5-HTTP-Session>0:www/p5-HTTP-Session \
+	p5-Plack-Middleware-ReverseProxy>0:www/p5-Plack-Middleware-ReverseProxy \
+	p5-Test-WWW-Mechanize-PSGI>0:devel/p5-Test-WWW-Mechanize-PSGI \
+	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+	p5-String-CamelCase>0:textproc/p5-String-CamelCase \
+	p5-Module-Find>0:devel/p5-Module-Find
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Amon2/Makefile b/www/p5-Amon2/Makefile
index d2d41a22117b..3cdd36fc3ca8 100644
--- a/www/p5-Amon2/Makefile
+++ b/www/p5-Amon2/Makefile
@@ -14,21 +14,21 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-	p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
-	p5-HTML-FillInForm-Lite>0:${PORTSDIR}/www/p5-HTML-FillInForm-Lite \
-	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
-	p5-HTTP-Session2>0:${PORTSDIR}/www/p5-HTTP-Session2 \
-	p5-Hash-MultiValue>0:${PORTSDIR}/devel/p5-Hash-MultiValue \
-	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-	p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat \
-	p5-Module-CPANfile>=0.9020:${PORTSDIR}/devel/p5-Module-CPANfile \
-	p5-Plack>=0.9982:${PORTSDIR}/www/p5-Plack \
-	p5-Plack-Middleware-Session>0:${PORTSDIR}/www/p5-Plack-Middleware-Session \
-	p5-Router-Boom>=0.07:${PORTSDIR}/www/p5-Router-Boom \
-	p5-Text-Xslate>=2.0010:${PORTSDIR}/textproc/p5-Text-Xslate \
-	p5-Try-Tiny>=0.06:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-URI>=1.54:${PORTSDIR}/net/p5-URI
+	p5-File-Copy-Recursive>0:devel/p5-File-Copy-Recursive \
+	p5-File-ShareDir>0:devel/p5-File-ShareDir \
+	p5-HTML-FillInForm-Lite>0:www/p5-HTML-FillInForm-Lite \
+	p5-HTTP-Message>0:www/p5-HTTP-Message \
+	p5-HTTP-Session2>0:www/p5-HTTP-Session2 \
+	p5-Hash-MultiValue>0:devel/p5-Hash-MultiValue \
+	p5-JSON>=2:converters/p5-JSON \
+	p5-MRO-Compat>0:devel/p5-MRO-Compat \
+	p5-Module-CPANfile>=0.9020:devel/p5-Module-CPANfile \
+	p5-Plack>=0.9982:www/p5-Plack \
+	p5-Plack-Middleware-Session>0:www/p5-Plack-Middleware-Session \
+	p5-Router-Boom>=0.07:www/p5-Router-Boom \
+	p5-Text-Xslate>=2.0010:textproc/p5-Text-Xslate \
+	p5-Try-Tiny>=0.06:lang/p5-Try-Tiny \
+	p5-URI>=1.54:net/p5-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=	perl5
diff --git a/www/p5-Any-Template/Makefile b/www/p5-Any-Template/Makefile
index a0f71b7a2b96..4962e37d03e5 100644
--- a/www/p5-Any-Template/Makefile
+++ b/www/p5-Any-Template/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provide a consistent interface to a wide array of templating languages
 
-BUILD_DEPENDS=	p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace
-RUN_DEPENDS=	p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace
-TEST_DEPENDS=	p5-Test-Assertions>0:${PORTSDIR}/devel/p5-Test-Assertions
+BUILD_DEPENDS=	p5-Log-Trace>0:devel/p5-Log-Trace
+RUN_DEPENDS=	p5-Log-Trace>0:devel/p5-Log-Trace
+TEST_DEPENDS=	p5-Test-Assertions>0:devel/p5-Test-Assertions
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Any-URI-Escape/Makefile b/www/p5-Any-URI-Escape/Makefile
index 2c77ac4ffc08..66dc7f415dfa 100644
--- a/www/p5-Any-URI-Escape/Makefile
+++ b/www/p5-Any-URI-Escape/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Load URI::Escape::XS preferentially over URI::Escape
 
-RUN_DEPENDS:=	p5-URI-Escape-XS>=0:${PORTSDIR}/www/p5-URI-Escape-XS
+RUN_DEPENDS:=	p5-URI-Escape-XS>=0:www/p5-URI-Escape-XS
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
diff --git a/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile b/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile
index 3e0dd8af00c1..4dfc2576090f 100644
--- a/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile
+++ b/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for LWP::UserAgent interface using AnyEvent::HTTP
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-AnyEvent-HTTP>=2.1:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-libwww>=5.815:${PORTSDIR}/www/p5-libwww
+	p5-AnyEvent>=5:devel/p5-AnyEvent \
+	p5-AnyEvent-HTTP>=2.1:www/p5-AnyEvent-HTTP \
+	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+	p5-libwww>0:www/p5-libwww \
+	p5-libwww>=5.815:www/p5-libwww
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-AnyEvent-HTTP/Makefile b/www/p5-AnyEvent-HTTP/Makefile
index 84abd2f302a0..c78359514d35 100644
--- a/www/p5-AnyEvent-HTTP/Makefile
+++ b/www/p5-AnyEvent-HTTP/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Simple but non-blocking HTTP/HTTPS client
 
-BUILD_DEPENDS=	p5-AnyEvent>=5.33:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-common-sense>=3.3:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-AnyEvent>=5.33:devel/p5-AnyEvent \
+		p5-common-sense>=3.3:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-AnyEvent-HTTPD/Makefile b/www/p5-AnyEvent-HTTPD/Makefile
index 07d927ec11c2..4244e4f6ef29 100644
--- a/www/p5-AnyEvent-HTTPD/Makefile
+++ b/www/p5-AnyEvent-HTTPD/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mons@cpan.org
 COMMENT=	Simple lightweight event based web server
 
-RUN_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Object-Event>=1.21:${PORTSDIR}/devel/p5-Object-Event \
-		p5-common-sense>=2.0:${PORTSDIR}/devel/p5-common-sense \
-		p5-URI>=1.40:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Object-Event>=1.21:devel/p5-Object-Event \
+		p5-common-sense>=2.0:devel/p5-common-sense \
+		p5-URI>=1.40:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-AnyEvent-Mojo/Makefile b/www/p5-AnyEvent-Mojo/Makefile
index bdd905ea4faf..92e6b65c7cb4 100644
--- a/www/p5-AnyEvent-Mojo/Makefile
+++ b/www/p5-AnyEvent-Mojo/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to start async Mojo servers easily
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>=5.201:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-AnyEvent-HTTP>=1.43:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-	p5-Mojolicious>=0.991251:${PORTSDIR}/www/p5-Mojolicious
-#	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-#	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+	p5-AnyEvent>=5.201:devel/p5-AnyEvent \
+	p5-AnyEvent-HTTP>=1.43:www/p5-AnyEvent-HTTP \
+	p5-Mojolicious>=0.991251:www/p5-Mojolicious
+#	p5-Test-Deep>0:devel/p5-Test-Deep \
+#	p5-Test-Exception>0:devel/p5-Test-Exception
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-AnyEvent-ReverseHTTP/Makefile b/www/p5-AnyEvent-ReverseHTTP/Makefile
index 4ce739d0c080..2cb78b8b157e 100644
--- a/www/p5-AnyEvent-ReverseHTTP/Makefile
+++ b/www/p5-AnyEvent-ReverseHTTP/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of reversehttp for AnyEvent
 
 RUN_DEPENDS=	\
-	p5-Any-Moose>0:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-AnyEvent-HTTP>0:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Any-Moose>0:devel/p5-Any-Moose \
+	p5-AnyEvent>0:devel/p5-AnyEvent \
+	p5-AnyEvent-HTTP>0:www/p5-AnyEvent-HTTP \
+	p5-libwww>0:www/p5-libwww \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-AnyEvent-SCGI/Makefile b/www/p5-AnyEvent-SCGI/Makefile
index d5c7b4753ecf..a7e7f20940be 100644
--- a/www/p5-AnyEvent-SCGI/Makefile
+++ b/www/p5-AnyEvent-SCGI/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Event based SCGI server
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>=5.2:${PORTSDIR}/devel/p5-AnyEvent
+	p5-AnyEvent>=5.2:devel/p5-AnyEvent
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index b8cbf8e702c4..c328fd1e9232 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Active Server Pages for Apache
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-HTML-Clean>=0:${PORTSDIR}/www/p5-HTML-Clean \
-		p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm \
-		p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM \
-		p5-MLDBM-Sync>=0.25:${PORTSDIR}/databases/p5-MLDBM-Sync \
-		p5-Tie-Cache>=0:${PORTSDIR}/devel/p5-Tie-Cache \
-		p5-XML-LibXSLT>=0:${PORTSDIR}/textproc/p5-XML-LibXSLT
+BUILD_DEPENDS=	p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-HTML-Clean>=0:www/p5-HTML-Clean \
+		p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
+		p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-MLDBM>=0:databases/p5-MLDBM \
+		p5-MLDBM-Sync>=0.25:databases/p5-MLDBM-Sync \
+		p5-Tie-Cache>=0:devel/p5-Tie-Cache \
+		p5-XML-LibXSLT>=0:textproc/p5-XML-LibXSLT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 # XXX not tested with mod_perl2, but mod_perl was removed ...
 #.if !defined(WITHOUT_MODPERL)
-#RUN_DEPENDS+=	ap13-mod_perl>=0:${PORTSDIR}/www/mod_perl \
-#		p5-Apache-Filter>=0:${PORTSDIR}/www/p5-Apache-Filter \
-#		p5-Apache-SSI>=0:${PORTSDIR}/www/p5-Apache-SSI
+#RUN_DEPENDS+=	ap13-mod_perl>=0:www/mod_perl \
+#		p5-Apache-Filter>=0:www/p5-Apache-Filter \
+#		p5-Apache-SSI>=0:www/p5-Apache-SSI
 #MODPERL_SUFFIX?=+mod_perl
 #.endif
 
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index 7d2789460cd6..d5e3a459baf4 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl module to provide custom forms for reauthentication
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=1.39:${PORTSDIR}/www/mod_perl2 \
-		p5-Class-Load>=0.03:${PORTSDIR}/devel/p5-Class-Load \
-		p5-autobox>=1.10:${PORTSDIR}/devel/p5-autobox
+BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=1.39:www/mod_perl2 \
+		p5-Class-Load>=0.03:devel/p5-Class-Load \
+		p5-autobox>=1.10:devel/p5-autobox
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 663d05f082da..4191f9d7687f 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl modules that implement a cookie-based authentication system
 
-BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
-RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-CGI>=3.12:${PORTSDIR}/www/p5-CGI \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-ModPerl-VersionUtil>=0:${PORTSDIR}/www/p5-ModPerl-VersionUtil \
-		p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract
+BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
+RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+		p5-CGI>=3.12:www/p5-CGI \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-ModPerl-VersionUtil>=0:www/p5-ModPerl-VersionUtil \
+		p5-SQL-Abstract>=0:databases/p5-SQL-Abstract
 
 USE_APACHE=	22+
 USES=		perl5
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index 6cfc2c1cada9..74415a2ad321 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mod_perl interface into HTML::Clean
 
-BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-HTML-Clean>=0.8:${PORTSDIR}/www/p5-HTML-Clean
+BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+		p5-HTML-Clean>=0.8:www/p5-HTML-Clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-ConfigParser/Makefile b/www/p5-Apache-ConfigParser/Makefile
index b975c270efb5..1541da1ab200 100644
--- a/www/p5-Apache-ConfigParser/Makefile
+++ b/www/p5-Apache-ConfigParser/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Load Apache configuration files
 
-BUILD_DEPENDS=	p5-File-FnMatch>=0:${PORTSDIR}/devel/p5-File-FnMatch \
-		p5-Tree-DAG_Node>=0:${PORTSDIR}/devel/p5-Tree-DAG_Node
+BUILD_DEPENDS=	p5-File-FnMatch>=0:devel/p5-File-FnMatch \
+		p5-Tree-DAG_Node>=0:devel/p5-Tree-DAG_Node
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile
index 58d071ebb246..52fa12f6e37b 100644
--- a/www/p5-Apache-DB/Makefile
+++ b/www/p5-Apache-DB/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Debugging and profiling tools for mod_perl
 
-RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index 340aee9a5e33..a76fcebb7058 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -14,8 +14,8 @@ COMMENT=	DBI persistent connection, authentication and authorization
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-Apache-DBI-mp[12]*
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 5ca211cbd6ac..53eda447507a 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Apache::Gallery - mod_perl handler to create an image gallery
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info \
-		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-Image-Imlib2>=0:${PORTSDIR}/graphics/p5-Image-Imlib2 \
-		p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-Image-Info>=0:graphics/p5-Image-Info \
+		p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-Image-Imlib2>=0:graphics/p5-Image-Imlib2 \
+		p5-libapreq2>=0:www/p5-libapreq2 \
+		p5-CGI>=0:www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-LogFormat-Compiler/Makefile b/www/p5-Apache-LogFormat-Compiler/Makefile
index c80c5c00c86e..739108844a32 100644
--- a/www/p5-Apache-LogFormat-Compiler/Makefile
+++ b/www/p5-Apache-LogFormat-Compiler/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-POSIX-strftime-Compiler>=0.30:${PORTSDIR}/devel/p5-POSIX-strftime-Compiler
+	p5-POSIX-strftime-Compiler>=0.30:devel/p5-POSIX-strftime-Compiler
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index c1ceb20a2960..7c4bced4e925 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	MP3 browsing and streaming under mod_perl and Apache
 
-BUILD_DEPENDS=	p5-Audio-Wav>=0:${PORTSDIR}/audio/p5-Audio-Wav \
-		p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
-		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
-		p5-Ogg-Vorbis-Header>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \
-		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+BUILD_DEPENDS=	p5-Audio-Wav>=0:audio/p5-Audio-Wav \
+		p5-CGI-Session>=0:www/p5-CGI-Session \
+		p5-MP3-Info>=0:audio/p5-MP3-Info \
+		p5-Ogg-Vorbis-Header>=0:audio/p5-Ogg-Vorbis-Header \
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-ParseFormData/Makefile b/www/p5-Apache-ParseFormData/Makefile
index 1abf6aaa034f..029b2ca12d80 100644
--- a/www/p5-Apache-ParseFormData/Makefile
+++ b/www/p5-Apache-ParseFormData/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	nistor@snickers.org
 COMMENT=	Module allows you to easily decode/parse form and query data
 
-BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-Profiler/Makefile b/www/p5-Apache-Profiler/Makefile
index fb0854e23d63..ebfd1d59a3af 100644
--- a/www/p5-Apache-Profiler/Makefile
+++ b/www/p5-Apache-Profiler/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Profiles time seconds needed for every request
 
-BUILD_DEPENDS=	mp2bug:${PORTSDIR}/www/mod_perl2
+BUILD_DEPENDS=	mp2bug:www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-Session-PHP/Makefile b/www/p5-Apache-Session-PHP/Makefile
index e74c2d91316d..29af4848e066 100644
--- a/www/p5-Apache-Session-PHP/Makefile
+++ b/www/p5-Apache-Session-PHP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Glue Apache::Session with PHP::Session
 
-BUILD_DEPENDS=	p5-PHP-Session>=0:${PORTSDIR}/www/p5-PHP-Session \
-		p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session
+BUILD_DEPENDS=	p5-PHP-Session>=0:www/p5-PHP-Session \
+		p5-Apache-Session>=0:www/p5-Apache-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-Session-SQLite3/Makefile b/www/p5-Apache-Session-SQLite3/Makefile
index ded28991245d..5e7bd216d923 100644
--- a/www/p5-Apache-Session-SQLite3/Makefile
+++ b/www/p5-Apache-Session-SQLite3/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Use DBD::SQLite 1.x for Apache::Session storage
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+BUILD_DEPENDS=	p5-Apache-Session>=0:www/p5-Apache-Session \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-Session-SharedMem/Makefile b/www/p5-Apache-Session-SharedMem/Makefile
index 6c49c028317b..450bc1983c11 100644
--- a/www/p5-Apache-Session-SharedMem/Makefile
+++ b/www/p5-Apache-Session-SharedMem/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Apache::Session extension that store session in shared memory
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IPC-Cache>=0:${PORTSDIR}/devel/p5-IPC-Cache \
-		p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session
+BUILD_DEPENDS=	p5-IPC-Cache>=0:devel/p5-IPC-Cache \
+		p5-Apache-Session>=0:www/p5-Apache-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index 3f6faa3f3364..e7e0469b8973 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple wrapper around Apache::Session
 
-BUILD_DEPENDS=	p5-Class-Container>=0:${PORTSDIR}/devel/p5-Class-Container \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session
+BUILD_DEPENDS=	p5-Class-Container>=0:devel/p5-Class-Container \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Apache-Session>=0:www/p5-Apache-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index d8c5607efec9..c30b7928ec4c 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Persistence framework for session data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS+=	p5-Test-Deep>=0.082:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Database>=0:${PORTSDIR}/databases/p5-Test-Database
+TEST_DEPENDS+=	p5-Test-Deep>=0.082:devel/p5-Test-Deep \
+		p5-Test-Exception>=0.15:devel/p5-Test-Exception \
+		p5-Test-Database>=0:databases/p5-Test-Database
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Apache-SessionX/Makefile b/www/p5-Apache-SessionX/Makefile
index 8ba696390782..4a3eb87a3537 100644
--- a/www/p5-Apache-SessionX/Makefile
+++ b/www/p5-Apache-SessionX/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extented persistence framework for session data
 
-BUILD_DEPENDS=	p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session
+BUILD_DEPENDS=	p5-Apache-Session>=0:www/p5-Apache-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Apache-Singleton/Makefile b/www/p5-Apache-Singleton/Makefile
index 53a7e5532aeb..69e68ca6b146 100644
--- a/www/p5-Apache-Singleton/Makefile
+++ b/www/p5-Apache-Singleton/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Singleton class for mod_perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Class-Singleton>=0:${PORTSDIR}/devel/p5-Class-Singleton
+RUN_DEPENDS=	p5-Class-Singleton>=0:devel/p5-Class-Singleton
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Apache2-SiteControl/Makefile b/www/p5-Apache2-SiteControl/Makefile
index 05c2f546fad0..e65b889ac136 100644
--- a/www/p5-Apache2-SiteControl/Makefile
+++ b/www/p5-Apache2-SiteControl/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	nick@foobar.org
 COMMENT=	Perl web site authentication/authorization system
 
-BUILD_DEPENDS=	p5-Apache-AuthCookie>=3.08:${PORTSDIR}/www/p5-Apache-AuthCookie \
-		p5-Apache-Session>=1.54:${PORTSDIR}/www/p5-Apache-Session \
-		p5-Crypt-CAST5>=0.04:${PORTSDIR}/security/p5-Crypt-CAST5 \
-		p5-Crypt-CBC>=2.14:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-libapreq2>=2.05:${PORTSDIR}/www/p5-libapreq2
-RUN_DEPENDS=	p5-Apache-AuthCookie>=3.08:${PORTSDIR}/www/p5-Apache-AuthCookie \
-		p5-Apache-Session>=1.54:${PORTSDIR}/www/p5-Apache-Session \
-		p5-Crypt-CAST5>=0.04:${PORTSDIR}/security/p5-Crypt-CAST5 \
-		p5-Crypt-CBC>=2.14:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-libapreq2>=2.05:${PORTSDIR}/www/p5-libapreq2
+BUILD_DEPENDS=	p5-Apache-AuthCookie>=3.08:www/p5-Apache-AuthCookie \
+		p5-Apache-Session>=1.54:www/p5-Apache-Session \
+		p5-Crypt-CAST5>=0.04:security/p5-Crypt-CAST5 \
+		p5-Crypt-CBC>=2.14:security/p5-Crypt-CBC \
+		p5-libapreq2>=2.05:www/p5-libapreq2
+RUN_DEPENDS=	p5-Apache-AuthCookie>=3.08:www/p5-Apache-AuthCookie \
+		p5-Apache-Session>=1.54:www/p5-Apache-Session \
+		p5-Crypt-CAST5>=0.04:security/p5-Crypt-CAST5 \
+		p5-Crypt-CBC>=2.14:security/p5-Crypt-CBC \
+		p5-libapreq2>=2.05:www/p5-libapreq2
 
 OPTIONS_DEFINE=		RADIUS
 OPTIONS_DEFAULT=	RADIUS
@@ -31,7 +31,7 @@ USE_PERL5=	configure
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MRADIUS}
-RUN_DEPENDS+=	p5-Authen-Radius>=0.10:${PORTSDIR}/security/p5-Authen-Radius
+RUN_DEPENDS+=	p5-Authen-Radius>=0.10:security/p5-Authen-Radius
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-ApacheBench/Makefile b/www/p5-ApacheBench/Makefile
index 0b78edef72cc..95e3ba52f731 100644
--- a/www/p5-ApacheBench/Makefile
+++ b/www/p5-ApacheBench/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for HTTP benchmarking
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Net-HTTP>=0:${PORTSDIR}/net/p5-Net-HTTP
+TEST_DEPENDS=	p5-Net-HTTP>=0:net/p5-Net-HTTP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-App-Nopaste/Makefile b/www/p5-App-Nopaste/Makefile
index 79baa33cd93d..bc05fb085bf2 100644
--- a/www/p5-App-Nopaste/Makefile
+++ b/www/p5-App-Nopaste/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Easy access to any pastebin
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Browser-Open>=0:${PORTSDIR}/www/p5-Browser-Open \
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Getopt-Long-Descriptive>=0:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-Browser-Open>=0:www/p5-Browser-Open \
+		p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Getopt-Long-Descriptive>=0:devel/p5-Getopt-Long-Descriptive \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-libwww>=0:www/p5-libwww
 
 CONFLICTS=	p5-WebService-NoPaste-[0-9]*
 
@@ -34,11 +34,11 @@ PASTEBIN_DESC=	Support pastebin.com
 USES=		perl5
 USE_PERL5=	configure
 
-CLIPBOARD_BUILD_DEPENDS=p5-Clipboard>=0:${PORTSDIR}/x11/p5-Clipboard
-CLIPBOARD_RUN_DEPENDS=	p5-Clipboard>=0:${PORTSDIR}/x11/p5-Clipboard
-GITHUB_BUILD_DEPENDS=	p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike
-GITHUB_RUN_DEPENDS=	p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike
-PASTEBIN_BUILD_DEPENDS=	p5-WWW-Pastebin-PastebinCom-Create>=0:${PORTSDIR}/www/p5-WWW-Pastebin-PastebinCom-Create
-PASTEBIN_RUN_DEPENDS=	p5-WWW-Pastebin-PastebinCom-Create>=0:${PORTSDIR}/www/p5-WWW-Pastebin-PastebinCom-Create
+CLIPBOARD_BUILD_DEPENDS=p5-Clipboard>=0:x11/p5-Clipboard
+CLIPBOARD_RUN_DEPENDS=	p5-Clipboard>=0:x11/p5-Clipboard
+GITHUB_BUILD_DEPENDS=	p5-Config-GitLike>=0:devel/p5-Config-GitLike
+GITHUB_RUN_DEPENDS=	p5-Config-GitLike>=0:devel/p5-Config-GitLike
+PASTEBIN_BUILD_DEPENDS=	p5-WWW-Pastebin-PastebinCom-Create>=0:www/p5-WWW-Pastebin-PastebinCom-Create
+PASTEBIN_RUN_DEPENDS=	p5-WWW-Pastebin-PastebinCom-Create>=0:www/p5-WWW-Pastebin-PastebinCom-Create
 
 .include <bsd.port.mk>
diff --git a/www/p5-App-gist/Makefile b/www/p5-App-gist/Makefile
index c8f91c51855d..df1754f1b05a 100644
--- a/www/p5-App-gist/Makefile
+++ b/www/p5-App-gist/Makefile
@@ -15,11 +15,11 @@ COMMENT=	GitHub Gist creator
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Pithub>=0:${PORTSDIR}/devel/p5-Pithub \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-App-Cmd>=0:devel/p5-App-Cmd \
+		p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Pithub>=0:devel/p5-Pithub \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	gist-[0-9]*
diff --git a/www/p5-Ark/Makefile b/www/p5-Ark/Makefile
index 111b3de17112..fc90d76c9def 100644
--- a/www/p5-Ark/Makefile
+++ b/www/p5-Ark/Makefile
@@ -13,23 +13,23 @@ COMMENT=	Perl web application framework
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
-	p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-	p5-Class-Method-Modifiers-Fast>0:${PORTSDIR}/devel/p5-Class-Method-Modifiers-Fast \
-	p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \
-	p5-Data-Util>0:${PORTSDIR}/devel/p5-Data-Util \
-	p5-Devel-StackTrace>0:${PORTSDIR}/devel/p5-Devel-StackTrace \
-	p5-Digest-SHA1>0:${PORTSDIR}/security/p5-Digest-SHA1 \
-	p5-FindBin-libs>0:${PORTSDIR}/devel/p5-FindBin-libs \
-	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-HTTP-Engine>=0.1.8:${PORTSDIR}/www/p5-HTTP-Engine \
-	p5-HTTP-Engine-Middleware>=0.13:${PORTSDIR}/www/p5-HTTP-Engine-Middleware \
-	p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-	p5-Module-Setup>0:${PORTSDIR}/devel/p5-Module-Setup \
-	p5-Mouse>=0.21:${PORTSDIR}/devel/p5-Mouse \
-	p5-MouseX-Types-Path-Class>0:${PORTSDIR}/devel/p5-MouseX-Types-Path-Class \
-	p5-Path-Class>=0.16:${PORTSDIR}/devel/p5-Path-Class \
-	p5-Text-SimpleTable>=0.05:${PORTSDIR}/textproc/p5-Text-SimpleTable \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+	p5-Class-Method-Modifiers-Fast>0:devel/p5-Class-Method-Modifiers-Fast \
+	p5-Data-UUID>0:devel/p5-Data-UUID \
+	p5-Data-Util>0:devel/p5-Data-Util \
+	p5-Devel-StackTrace>0:devel/p5-Devel-StackTrace \
+	p5-Digest-SHA1>0:security/p5-Digest-SHA1 \
+	p5-FindBin-libs>0:devel/p5-FindBin-libs \
+	p5-HTML-Parser>0:www/p5-HTML-Parser \
+	p5-HTTP-Engine>=0.1.8:www/p5-HTTP-Engine \
+	p5-HTTP-Engine-Middleware>=0.13:www/p5-HTTP-Engine-Middleware \
+	p5-MIME-Types>0:mail/p5-MIME-Types \
+	p5-Module-Setup>0:devel/p5-Module-Setup \
+	p5-Mouse>=0.21:devel/p5-Mouse \
+	p5-MouseX-Types-Path-Class>0:devel/p5-MouseX-Types-Path-Class \
+	p5-Path-Class>=0.16:devel/p5-Path-Class \
+	p5-Text-SimpleTable>=0.05:textproc/p5-Text-SimpleTable \
+	p5-URI>0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Bigtop/Makefile b/www/p5-Bigtop/Makefile
index c82bc28ec25e..80a8d5669f02 100644
--- a/www/p5-Bigtop/Makefile
+++ b/www/p5-Bigtop/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Web application data language processor
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-IO-Prompt>=0:${PORTSDIR}/devel/p5-IO-Prompt \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Gantry>=3.38:${PORTSDIR}/www/p5-Gantry \
-		p5-Inline>=0.40:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-TT>=0.06:${PORTSDIR}/devel/p5-Inline-TT \
-		p5-Template-Toolkit>=2.0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-HTTP-Server-Simple>0.27:${PORTSDIR}/www/p5-HTTP-Server-Simple
+BUILD_DEPENDS=	p5-Config-General>=0:devel/p5-Config-General \
+		p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Gantry>=3.38:www/p5-Gantry \
+		p5-Inline>=0.40:devel/p5-Inline \
+		p5-Inline-TT>=0.06:devel/p5-Inline-TT \
+		p5-Template-Toolkit>=2.0:www/p5-Template-Toolkit \
+		p5-HTTP-Server-Simple>0.27:www/p5-HTTP-Server-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Blog-Spam/Makefile b/www/p5-Blog-Spam/Makefile
index 7b6bbfb40f4f..631235693808 100644
--- a/www/p5-Blog-Spam/Makefile
+++ b/www/p5-Blog-Spam/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Blog & Forum SPAM Detection
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-CIDR-Lite>=0:${PORTSDIR}/net/p5-Net-CIDR-Lite \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \
-		p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Net-CIDR-Lite>=0:net/p5-Net-CIDR-Lite \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-RPC-XML>=0:net/p5-RPC-XML \
+		p5-URI-Find>=0:textproc/p5-URI-Find \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Business-PayPal/Makefile b/www/p5-Business-PayPal/Makefile
index 09c9b7ec4ff4..586a2488ba15 100644
--- a/www/p5-Business-PayPal/Makefile
+++ b/www/p5-Business-PayPal/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl extension for automating PayPal transactions
 
-RUN_DEPENDS=	p5-Net-SSLeay>=1.35:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-CGI>=3.49:${PORTSDIR}/www/p5-CGI \
-		p5-Digest-MD5>=2.52:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS=	p5-Net-SSLeay>=1.35:security/p5-Net-SSLeay \
+		p5-CGI>=3.49:www/p5-CGI \
+		p5-Digest-MD5>=2.52:security/p5-Digest-MD5
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Ajax/Makefile b/www/p5-CGI-Ajax/Makefile
index e066e5a558af..254cd598f36c 100644
--- a/www/p5-CGI-Ajax/Makefile
+++ b/www/p5-CGI-Ajax/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Module for writing AJAX/DHTML-based web apps
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Dispatch-Server/Makefile b/www/p5-CGI-Application-Dispatch-Server/Makefile
index dbc737d26d3a..bf775cede2b5 100644
--- a/www/p5-CGI-Application-Dispatch-Server/Makefile
+++ b/www/p5-CGI-Application-Dispatch-Server/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Simple HTTP server for developing with CGI::Application::Dispatch
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture \
-		p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CGI-Application-Dispatch>=0:${PORTSDIR}/www/p5-CGI-Application-Dispatch \
-		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-HTTP-Server-Simple-Static>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple-Static \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-IO-Capture>=0:devel/p5-IO-Capture \
+		p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-CGI-Application-Dispatch>=0:www/p5-CGI-Application-Dispatch \
+		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-HTTP-Server-Simple-Static>=0:www/p5-HTTP-Server-Simple-Static \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Dispatch/Makefile b/www/p5-CGI-Application-Dispatch/Makefile
index 08db6232800c..36446c87c95c 100644
--- a/www/p5-CGI-Application-Dispatch/Makefile
+++ b/www/p5-CGI-Application-Dispatch/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Dispatch requests to CGI::Application based objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=4.50:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CGI-PSGI>=0:${PORTSDIR}/www/p5-CGI-PSGI \
-		p5-Exception-Class>=1.20:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-HTTP-Exception>=0:${PORTSDIR}/www/p5-HTTP-Exception \
-		p5-Plack>=0.9956:${PORTSDIR}/www/p5-Plack \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-CGI-Application>=4.50:www/p5-CGI-Application \
+		p5-CGI-PSGI>=0:www/p5-CGI-PSGI \
+		p5-Exception-Class>=1.20:devel/p5-Exception-Class \
+		p5-HTTP-Exception>=0:www/p5-HTTP-Exception \
+		p5-Plack>=0.9956:www/p5-Plack \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
+TEST_DEPENDS=	p5-Test-LongString>=0:devel/p5-Test-LongString
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-CGI-Application-PSGI/Makefile b/www/p5-CGI-Application-PSGI/Makefile
index 3e9b487d041f..3a97162d4ca5 100644
--- a/www/p5-CGI-Application-PSGI/Makefile
+++ b/www/p5-CGI-Application-PSGI/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of PSGI Adapter for CGI::Application
 
 RUN_DEPENDS=	\
-	p5-CGI-Application>0:${PORTSDIR}/www/p5-CGI-Application \
-	p5-CGI-PSGI>0:${PORTSDIR}/www/p5-CGI-PSGI
+	p5-CGI-Application>0:www/p5-CGI-Application \
+	p5-CGI-PSGI>0:www/p5-CGI-PSGI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
index 1ce117a94b96..1f5beb3f8df8 100644
--- a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
+++ b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Use any templating system in CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application-Plugin-Forward>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Forward \
-		p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Clone>=0.23:${PORTSDIR}/devel/p5-Clone
+BUILD_DEPENDS=	p5-CGI-Application-Plugin-Forward>=0:www/p5-CGI-Application-Plugin-Forward \
+		p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-Clone>=0.23:devel/p5-Clone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-Apache/Makefile b/www/p5-CGI-Application-Plugin-Apache/Makefile
index d72d006d7abd..44e0e5e2a201 100644
--- a/www/p5-CGI-Application-Plugin-Apache/Makefile
+++ b/www/p5-CGI-Application-Plugin-Apache/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides easy access to Apache::* modules for CGI::Application
 
-BUILD_DEPENDS=	p5-CGI-Application>=3.22:${PORTSDIR}/www/p5-CGI-Application \
-		p5-HTML-GenerateUtil>=0:${PORTSDIR}/www/p5-HTML-GenerateUtil \
-		p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2
+BUILD_DEPENDS=	p5-CGI-Application>=3.22:www/p5-CGI-Application \
+		p5-HTML-GenerateUtil>=0:www/p5-HTML-GenerateUtil \
+		p5-libapreq2>=0:www/p5-libapreq2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE_COMB=	dual
diff --git a/www/p5-CGI-Application-Plugin-Authentication/Makefile b/www/p5-CGI-Application-Plugin-Authentication/Makefile
index b1b73895f6c7..3d04179138bf 100644
--- a/www/p5-CGI-Application-Plugin-Authentication/Makefile
+++ b/www/p5-CGI-Application-Plugin-Authentication/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Support for authenticating requests in CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
-		p5-CGI-Application>=4:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Color-Calc>=1.073:${PORTSDIR}/graphics/p5-Color-Calc
+BUILD_DEPENDS=	p5-Apache-Htpasswd>=0:security/p5-Apache-Htpasswd \
+		p5-CGI-Application>=4:www/p5-CGI-Application \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-Color-Calc>=1.073:graphics/p5-Color-Calc
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0.11:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Warn>=0.11:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-CGI-Application-Plugin-Authorization/Makefile b/www/p5-CGI-Application-Plugin-Authorization/Makefile
index 99dd932a09d3..a3356adec905 100644
--- a/www/p5-CGI-Application-Plugin-Authorization/Makefile
+++ b/www/p5-CGI-Application-Plugin-Authorization/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Support for authorization of requests in CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-CGI-Application-Plugin-Authentication>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Authentication \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-Class-ISA>=0:devel/p5-Class-ISA \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-CGI-Application-Plugin-Authentication>=0:www/p5-CGI-Application-Plugin-Authentication \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
index 2cd99076575f..cf21247176ac 100644
--- a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
+++ b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
@@ -14,7 +14,7 @@ COMMENT=	CGI::App plugin to automatically register runmodes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-Config-YAML/Makefile b/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
index 012d693f27c0..f5ba193d7d7a 100644
--- a/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
+++ b/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Add Config::YAML support to CGI::Application
 
-BUILD_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Config-YAML>=0:${PORTSDIR}/devel/p5-Config-YAML
-RUN_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Config-YAML>=0:${PORTSDIR}/devel/p5-Config-YAML
+BUILD_DEPENDS=	p5-CGI-Application>4.01:www/p5-CGI-Application \
+		p5-Config-YAML>=0:devel/p5-Config-YAML
+RUN_DEPENDS=	p5-CGI-Application>4.01:www/p5-CGI-Application \
+		p5-Config-YAML>=0:devel/p5-Config-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Application-Plugin-ConfigAuto/Makefile b/www/p5-CGI-Application-Plugin-ConfigAuto/Makefile
index 8fda8d646045..3e5d71711cd3 100644
--- a/www/p5-CGI-Application-Plugin-ConfigAuto/Makefile
+++ b/www/p5-CGI-Application-Plugin-ConfigAuto/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Plugin that adds Config::Auto support to CGI::Application
 
-RUN_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Config-Auto>=0:${PORTSDIR}/devel/p5-Config-Auto
+RUN_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-Config-Auto>=0:devel/p5-Config-Auto
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-DBH/Makefile b/www/p5-CGI-Application-Plugin-DBH/Makefile
index 6e3e9a51dc4c..f80bfcd28573 100644
--- a/www/p5-CGI-Application-Plugin-DBH/Makefile
+++ b/www/p5-CGI-Application-Plugin-DBH/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Easy DBI access from CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=1.20120301:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=1.20120301:devel/p5-Test-MockObject
 
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
index 1c9612e282a6..8e906a65e2a7 100644
--- a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
+++ b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
@@ -14,11 +14,11 @@ COMMENT=	This plug-in add DebugScreen support to CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-CGI-Application-Plugin-ViewCode>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-ViewCode \
-		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-CGI-Application-Plugin-ViewCode>=0:www/p5-CGI-Application-Plugin-ViewCode \
+		p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-DevPopup/Makefile b/www/p5-CGI-Application-Plugin-DevPopup/Makefile
index 656aaf7f4273..2b338cd5f608 100644
--- a/www/p5-CGI-Application-Plugin-DevPopup/Makefile
+++ b/www/p5-CGI-Application-Plugin-DevPopup/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Runtime cgiapp info in a popup window
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=4.01:${PORTSDIR}/www/p5-CGI-Application \
-		p5-HTML-Template>0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	p5-CGI-Application>=4.01:www/p5-CGI-Application \
+		p5-HTML-Template>0:www/p5-HTML-Template \
+		p5-IO-stringy>0:devel/p5-IO-stringy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-Forward/Makefile b/www/p5-CGI-Application-Plugin-Forward/Makefile
index e69593fa1642..2445dcea8cba 100644
--- a/www/p5-CGI-Application-Plugin-Forward/Makefile
+++ b/www/p5-CGI-Application-Plugin-Forward/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Support for forwarding requests in CGI::Application
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CGI-Application-Plugin-AutoRunmode>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-AutoRunmode
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-CGI-Application-Plugin-AutoRunmode>=0:www/p5-CGI-Application-Plugin-AutoRunmode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-HTDot/Makefile b/www/p5-CGI-Application-Plugin-HTDot/Makefile
index 417707a82839..efb2f66398cd 100644
--- a/www/p5-CGI-Application-Plugin-HTDot/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTDot/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Enable "magic dot" notation in CGI::Application-derived applications
 
-BUILD_DEPENDS=	p5-CGI-Application>=4.0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-HTML-Template-Pluggable>=0:${PORTSDIR}/www/p5-HTML-Template-Pluggable \
-		p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-CGI-Application>=4.0:www/p5-CGI-Application \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-HTML-Template-Pluggable>=0:www/p5-HTML-Template-Pluggable \
+		p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
index f70131833630..3f38ef23656c 100644
--- a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Access to the prototype JavaScript library using HTML::Prototype
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-HTML-Prototype>=0:${PORTSDIR}/www/p5-HTML-Prototype
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-HTML-Prototype>=0:www/p5-HTML-Prototype
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile b/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
index aa8c06977c32..8468a5f489a3 100644
--- a/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
+++ b/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Add HTML::Tidy support to CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CGI-Application-Plugin-DevPopup>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-DevPopup \
-		p5-HTML-Tidy>=1.08:${PORTSDIR}/textproc/p5-HTML-Tidy
+BUILD_DEPENDS=	p5-CGI-Application>4.01:www/p5-CGI-Application \
+		p5-CGI-Application-Plugin-DevPopup>=0:www/p5-CGI-Application-Plugin-DevPopup \
+		p5-HTML-Tidy>=1.08:textproc/p5-HTML-Tidy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-JSON/Makefile b/www/p5-CGI-Application-Plugin-JSON/Makefile
index a490010a76e1..6c59e2e3ff7b 100644
--- a/www/p5-CGI-Application-Plugin-JSON/Makefile
+++ b/www/p5-CGI-Application-Plugin-JSON/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Easy manipulation of JSON headers for CGI::Application
 
-BUILD_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any
-RUN_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any
+BUILD_DEPENDS=	p5-CGI-Application>4.01:www/p5-CGI-Application \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-JSON-Any>=0:converters/p5-JSON-Any
+RUN_DEPENDS=	p5-CGI-Application>4.01:www/p5-CGI-Application \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-JSON-Any>=0:converters/p5-JSON-Any
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
index b486cb45f96f..fde2da0c0f7e 100644
--- a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
+++ b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Make tamper-resistent links in CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-CGI-Application-Plugin-AutoRunmode>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-AutoRunmode
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-URI>=0:net/p5-URI \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-CGI-Application-Plugin-AutoRunmode>=0:www/p5-CGI-Application-Plugin-AutoRunmode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
index f2fc7ae6add2..da9996c28de7 100644
--- a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
+++ b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Plugin that adds Log::Dispatch support to CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-MessageStack/Makefile b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
index 03722e1da8a5..0fc3875a53dc 100644
--- a/www/p5-CGI-Application-Plugin-MessageStack/Makefile
+++ b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Message stack for your CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CGI-Application-Plugin-Session>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Session \
-		p5-CGI-Application-Plugin-TT>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-TT
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-CGI-Application-Plugin-Session>=0:www/p5-CGI-Application-Plugin-Session \
+		p5-CGI-Application-Plugin-TT>=0:www/p5-CGI-Application-Plugin-TT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-Redirect/Makefile b/www/p5-CGI-Application-Plugin-Redirect/Makefile
index a6608540fa12..aba2ece098e8 100644
--- a/www/p5-CGI-Application-Plugin-Redirect/Makefile
+++ b/www/p5-CGI-Application-Plugin-Redirect/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Easy external redirects in CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-Session/Makefile b/www/p5-CGI-Application-Plugin-Session/Makefile
index c8a39fb669b8..15a37a4d9cad 100644
--- a/www/p5-CGI-Application-Plugin-Session/Makefile
+++ b/www/p5-CGI-Application-Plugin-Session/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Plugin that adds session support to CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=3.21:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CGI-Session>=4.48:${PORTSDIR}/www/p5-CGI-Session
+BUILD_DEPENDS=	p5-CGI-Application>=3.21:www/p5-CGI-Application \
+		p5-CGI-Session>=4.48:www/p5-CGI-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Simple>=1.001.002:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-CGI-Simple>=0:www/p5-CGI-Simple \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Application-Plugin-Stream/Makefile b/www/p5-CGI-Application-Plugin-Stream/Makefile
index e6eea3cdb666..1665c2dccc55 100644
--- a/www/p5-CGI-Application-Plugin-Stream/Makefile
+++ b/www/p5-CGI-Application-Plugin-Stream/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Plugin that adds file streaming support to CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-File-MMagic>=0:devel/p5-File-MMagic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-TT/Makefile b/www/p5-CGI-Application-Plugin-TT/Makefile
index 7593822bd3a6..34f38a17ea8c 100644
--- a/www/p5-CGI-Application-Plugin-TT/Makefile
+++ b/www/p5-CGI-Application-Plugin-TT/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Add Template Toolkit support to CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Class-ISA>=0:devel/p5-Class-ISA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -25,7 +25,7 @@ USE_PERL5=	modbuild
 OPTIONS_DEFINE=	DEVPOPUP
 OPTIONS_DEFAULT=DEVPOPUP
 DEVPOPUP_DESC=	Include support for run-time reports
-DEVPOPUP_BUILD_DEPENDS=	p5-CGI-Application-Plugin-DevPopup>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-DevPopup
+DEVPOPUP_BUILD_DEPENDS=	p5-CGI-Application-Plugin-DevPopup>=0:www/p5-CGI-Application-Plugin-DevPopup
 DEVPOPUP_RUN_DEPENDS:=	${DEVPOPUP_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
index df5a9028d519..c9a2499ac882 100644
--- a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
+++ b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Help validate forms with the CGI::Application framework
 
-BUILD_DEPENDS=	p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm \
-		p5-Data-FormValidator>=0:${PORTSDIR}/textproc/p5-Data-FormValidator \
-		p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application
+BUILD_DEPENDS=	p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
+		p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator \
+		p5-CGI-Application>=0:www/p5-CGI-Application
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Plugin-ViewCode/Makefile b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
index d9202c0d183a..76ee6265e8a7 100644
--- a/www/p5-CGI-Application-Plugin-ViewCode/Makefile
+++ b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
@@ -14,11 +14,11 @@ COMMENT=	View the source of the running application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CGI-Application-Plugin-Forward>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Forward \
-		p5-Syntax-Highlight-Perl-Improved>=0:${PORTSDIR}/textproc/p5-Syntax-Highlight-Perl-Improved \
-		p5-Pod-Xhtml>=0:${PORTSDIR}/textproc/p5-Pod-Xhtml \
-		p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-CGI-Application-Plugin-Forward>=0:www/p5-CGI-Application-Plugin-Forward \
+		p5-Syntax-Highlight-Perl-Improved>=0:textproc/p5-Syntax-Highlight-Perl-Improved \
+		p5-Pod-Xhtml>=0:textproc/p5-Pod-Xhtml \
+		p5-Test-LongString>=0:devel/p5-Test-LongString
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Application-Server/Makefile b/www/p5-CGI-Application-Server/Makefile
index de8f7858dfc5..f6e2a8ecaeb6 100644
--- a/www/p5-CGI-Application-Server/Makefile
+++ b/www/p5-CGI-Application-Server/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Simple HTTP server for developing with CGI::Application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>4.21:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CGI-Application-Plugin-Redirect>0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Redirect \
-		p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-HTTP-Server-Simple>=0.18:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-HTTP-Server-Simple-Static>=0.02:${PORTSDIR}/www/p5-HTTP-Server-Simple-Static
+BUILD_DEPENDS=	p5-CGI-Application>4.21:www/p5-CGI-Application \
+		p5-CGI-Application-Plugin-Redirect>0:www/p5-CGI-Application-Plugin-Redirect \
+		p5-HTTP-Message>0:www/p5-HTTP-Message \
+		p5-HTTP-Server-Simple>=0.18:www/p5-HTTP-Server-Simple \
+		p5-HTTP-Server-Simple-Static>=0.02:www/p5-HTTP-Server-Simple-Static
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CGI-Application>0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CGI-Application-Dispatch>0:${PORTSDIR}/www/p5-CGI-Application-Dispatch \
-		p5-CGI-Application-Plugin-Redirect>0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Redirect \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-HTTP-Server-Simple>0:${PORTSDIR}/www/p5-Test-HTTP-Server-Simple \
-		p5-Test-WWW-Mechanize>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+TEST_DEPENDS=	p5-CGI-Application>0:www/p5-CGI-Application \
+		p5-CGI-Application-Dispatch>0:www/p5-CGI-Application-Dispatch \
+		p5-CGI-Application-Plugin-Redirect>0:www/p5-CGI-Application-Plugin-Redirect \
+		p5-Test-Exception>0:devel/p5-Test-Exception \
+		p5-Test-HTTP-Server-Simple>0:www/p5-Test-HTTP-Server-Simple \
+		p5-Test-WWW-Mechanize>0:devel/p5-Test-WWW-Mechanize
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 485aa538834d..57a8193ec7fc 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl module intended to make it easier to create reusable web apps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
+BUILD_DEPENDS=	p5-Class-ISA>=0:devel/p5-Class-ISA \
+		p5-HTML-Template>=0:www/p5-HTML-Template
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CGI-PSGI>=0:${PORTSDIR}/www/p5-CGI-PSGI \
-		p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple
+TEST_DEPENDS=	p5-CGI-PSGI>=0:www/p5-CGI-PSGI \
+		p5-CGI-Simple>=0:www/p5-CGI-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index a2f117c2343a..902d889c34a5 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module implementing a cgi interface to String::Checker
 
-BUILD_DEPENDS=	p5-String-Checker>=0:${PORTSDIR}/devel/p5-String-Checker
+BUILD_DEPENDS=	p5-String-Checker>=0:devel/p5-String-Checker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Builder-TT2/Makefile b/www/p5-CGI-Builder-TT2/Makefile
index 1822b60be21a..4aeace608d9d 100644
--- a/www/p5-CGI-Builder-TT2/Makefile
+++ b/www/p5-CGI-Builder-TT2/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CGI::Builder and Template Toolkit 2 integration
 
-BUILD_DEPENDS=	p5-CGI-Builder>=0:${PORTSDIR}/www/p5-CGI-Builder \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-CGI-Builder>=0:www/p5-CGI-Builder \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Builder/Makefile b/www/p5-CGI-Builder/Makefile
index 52f9196e5ade..5626930f9302 100644
--- a/www/p5-CGI-Builder/Makefile
+++ b/www/p5-CGI-Builder/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl module intended to make it easier to create reusable web apps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Util>=0:${PORTSDIR}/devel/p5-IO-Util \
-		p5-OOTools>=0:${PORTSDIR}/devel/p5-OOTools
+BUILD_DEPENDS=	p5-IO-Util>=0:devel/p5-IO-Util \
+		p5-OOTools>=0:devel/p5-OOTools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Cache/Makefile b/www/p5-CGI-Cache/Makefile
index 1433837a72db..6b561be45767 100644
--- a/www/p5-CGI-Cache/Makefile
+++ b/www/p5-CGI-Cache/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Perl extension to cache output of time-intensive CGI scripts
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache \
-		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Tie-Restore>=0:${PORTSDIR}/devel/p5-Tie-Restore
+BUILD_DEPENDS=	p5-Cache>=0:devel/p5-Cache \
+		p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-Tie-Restore>=0:devel/p5-Tie-Restore
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS+=	p5-URI>=0:net/p5-URI
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Compile/Makefile b/www/p5-CGI-Compile/Makefile
index 1eda078ed332..b0629c7c6494 100644
--- a/www/p5-CGI-Compile/Makefile
+++ b/www/p5-CGI-Compile/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-File-pushd>0:${PORTSDIR}/devel/p5-File-pushd
+	p5-File-pushd>0:devel/p5-File-pushd
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-CGI-Emulate-PSGI>0:${PORTSDIR}/www/p5-CGI-Emulate-PSGI
+	p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings \
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-CGI-Emulate-PSGI>0:www/p5-CGI-Emulate-PSGI
 # Depending on Plack::Test causes cyclic dependencies.
 
 USES=		perl5
diff --git a/www/p5-CGI-Compress-Gzip/Makefile b/www/p5-CGI-Compress-Gzip/Makefile
index 6fadb278d6ca..86ea6d56e633 100644
--- a/www/p5-CGI-Compress-Gzip/Makefile
+++ b/www/p5-CGI-Compress-Gzip/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	CGI::Compress::Gzip - CGI with automatically compressed output
 
-BUILD_DEPENDS=	p5-IO-Zlib>=1.01:${PORTSDIR}/archivers/p5-IO-Zlib
-RUN_DEPENDS=	p5-IO-Zlib>=1.01:${PORTSDIR}/archivers/p5-IO-Zlib
+BUILD_DEPENDS=	p5-IO-Zlib>=1.01:archivers/p5-IO-Zlib
+RUN_DEPENDS=	p5-IO-Zlib>=1.01:archivers/p5-IO-Zlib
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-CGI-Cookie-Splitter/Makefile b/www/p5-CGI-Cookie-Splitter/Makefile
index d9bee40a3abd..1d323eee13e6 100644
--- a/www/p5-CGI-Cookie-Splitter/Makefile
+++ b/www/p5-CGI-Cookie-Splitter/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Split big cookies into smaller ones
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-CGI-Simple>=0:www/p5-CGI-Simple \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-CGI-Cookie-XS/Makefile b/www/p5-CGI-Cookie-XS/Makefile
index 8505aa787138..b908e60efa78 100644
--- a/www/p5-CGI-Cookie-XS/Makefile
+++ b/www/p5-CGI-Cookie-XS/Makefile
@@ -15,7 +15,7 @@ COMMENT=	HTTP Cookie parser in C
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Filter-Simple>=0:${PORTSDIR}/textproc/p5-Filter-Simple
+BUILD_DEPENDS=	p5-Filter-Simple>=0:textproc/p5-Filter-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Emulate-PSGI/Makefile b/www/p5-CGI-Emulate-PSGI/Makefile
index 3ffbc2c47472..dba1864644c0 100644
--- a/www/p5-CGI-Emulate-PSGI/Makefile
+++ b/www/p5-CGI-Emulate-PSGI/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww
+	p5-libwww>0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-EncryptForm/Makefile b/www/p5-CGI-EncryptForm/Makefile
index e9493c473b23..16f409fe7e68 100644
--- a/www/p5-CGI-EncryptForm/Makefile
+++ b/www/p5-CGI-EncryptForm/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Implement trusted stateful CGI Form Data using cryptography
 
-BUILD_DEPENDS=	p5-Crypt-HCE_SHA>=0:${PORTSDIR}/security/p5-Crypt-HCE_SHA \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Crypt-HCE_SHA>=0:security/p5-Crypt-HCE_SHA \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Enurl/Makefile b/www/p5-CGI-Enurl/Makefile
index 58e4815b6694..871bb6d750c6 100644
--- a/www/p5-CGI-Enurl/Makefile
+++ b/www/p5-CGI-Enurl/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Perl module for URL-encoding strings and hashes
 
-RUN_DEPENDS=	p5-CGI>=0:${PORTSDIR}/www/p5-CGI
+RUN_DEPENDS=	p5-CGI>=0:www/p5-CGI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Ex/Makefile b/www/p5-CGI-Ex/Makefile
index a07c7603b9eb..a575f4485630 100644
--- a/www/p5-CGI-Ex/Makefile
+++ b/www/p5-CGI-Ex/Makefile
@@ -13,7 +13,7 @@ COMMENT=	CGI utility suite - makes powerful application writing fun and easy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Template-Alloy>=1.004:${PORTSDIR}/www/p5-Template-Alloy
+BUILD_DEPENDS=	p5-Template-Alloy>=1.004:www/p5-Template-Alloy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/www/p5-CGI-Expand/Makefile b/www/p5-CGI-Expand/Makefile
index aba7413ce4b9..508075abd130 100644
--- a/www/p5-CGI-Expand/Makefile
+++ b/www/p5-CGI-Expand/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Convert flat hash to nested data using TT2 dot convention
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-CGI-ExtDirect/Makefile b/www/p5-CGI-ExtDirect/Makefile
index 8867272cd021..17f7226b4acb 100644
--- a/www/p5-CGI-ExtDirect/Makefile
+++ b/www/p5-CGI-ExtDirect/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Perl extension for creating Ext.Direct remoting in CGI applications
 
-BUILD_DEPENDS=	p5-RPC-ExtDirect>=3.20:${PORTSDIR}/www/p5-RPC-ExtDirect \
-		p5-CGI>4.20:${PORTSDIR}/www/p5-CGI
+BUILD_DEPENDS=	p5-RPC-ExtDirect>=3.20:www/p5-RPC-ExtDirect \
+		p5-CGI>4.20:www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Fast/Makefile b/www/p5-CGI-Fast/Makefile
index d660887dba79..49cf24c6f29e 100644
--- a/www/p5-CGI-Fast/Makefile
+++ b/www/p5-CGI-Fast/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl CGI Interface for FastCGI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI>=4:${PORTSDIR}/www/p5-CGI \
-		p5-FCGI>=0.67:${PORTSDIR}/www/p5-FCGI
+BUILD_DEPENDS=	p5-CGI>=4:www/p5-CGI \
+		p5-FCGI>=0.67:www/p5-FCGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CPAN-Changes>=0:${PORTSDIR}/devel/p5-CPAN-Changes \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-CPAN-Changes>=0:devel/p5-CPAN-Changes \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Test-Deep>=0:devel/p5-Test-Deep
 
 CONFLICTS=	p5-CGI.pm-[1-3]*
 
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index 73b379e15a28..66ae09c5d250 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -28,17 +28,17 @@ HTML_TEMPLATE_DESC=	HTML::Template support
 TEXT_TEMPLATE_DESC=	Text::Template support
 TEMPLATE_DESC=		Template Toolkit support
 
-CGI_FAST_TEMPLATE_BUILD_DEPENDS=p5-CGI-FastTemplate>=1.09:${PORTSDIR}/www/p5-CGI-FastTemplate
-CGI_FAST_TEMPLATE_RUN_DEPENDS=	p5-CGI-FastTemplate>=1.09:${PORTSDIR}/www/p5-CGI-FastTemplate
-CGI_SESSION_BUILD_DEPENDS=	p5-CGI-Session>=3.95:${PORTSDIR}/www/p5-CGI-Session
-CGI_SESSION_RUN_DEPENDS=p5-CGI-Session>=3.95:${PORTSDIR}/www/p5-CGI-Session
-CGI_SSI_BUILD_DEPENDS=	p5-CGI-SSI>=0.92:${PORTSDIR}/www/p5-CGI-SSI
-CGI_SSI_RUN_DEPENDS=	p5-CGI-SSI>=0.92:${PORTSDIR}/www/p5-CGI-SSI
-HTML_TEMPLATE_BUILD_DEPENDS=	p5-HTML-Template>=2.06:${PORTSDIR}/www/p5-HTML-Template
-HTML_TEMPLATE_RUN_DEPENDS=	p5-HTML-Template>=2.06:${PORTSDIR}/www/p5-HTML-Template
-TEXT_TEMPLATE_BUILD_DEPENDS=	p5-Text-Template>=1.43:${PORTSDIR}/textproc/p5-Text-Template
-TEXT_TEMPLATE_RUN_DEPENDS=	p5-Text-Template>=1.43:${PORTSDIR}/textproc/p5-Text-Template
-TEMPLATE_BUILD_DEPENDS=	p5-Template-Toolkit>=2.08:${PORTSDIR}/www/p5-Template-Toolkit
-TEMPLATE_RUN_DEPENDS=	p5-Template-Toolkit>=2.08:${PORTSDIR}/www/p5-Template-Toolkit
+CGI_FAST_TEMPLATE_BUILD_DEPENDS=p5-CGI-FastTemplate>=1.09:www/p5-CGI-FastTemplate
+CGI_FAST_TEMPLATE_RUN_DEPENDS=	p5-CGI-FastTemplate>=1.09:www/p5-CGI-FastTemplate
+CGI_SESSION_BUILD_DEPENDS=	p5-CGI-Session>=3.95:www/p5-CGI-Session
+CGI_SESSION_RUN_DEPENDS=p5-CGI-Session>=3.95:www/p5-CGI-Session
+CGI_SSI_BUILD_DEPENDS=	p5-CGI-SSI>=0.92:www/p5-CGI-SSI
+CGI_SSI_RUN_DEPENDS=	p5-CGI-SSI>=0.92:www/p5-CGI-SSI
+HTML_TEMPLATE_BUILD_DEPENDS=	p5-HTML-Template>=2.06:www/p5-HTML-Template
+HTML_TEMPLATE_RUN_DEPENDS=	p5-HTML-Template>=2.06:www/p5-HTML-Template
+TEXT_TEMPLATE_BUILD_DEPENDS=	p5-Text-Template>=1.43:textproc/p5-Text-Template
+TEXT_TEMPLATE_RUN_DEPENDS=	p5-Text-Template>=1.43:textproc/p5-Text-Template
+TEMPLATE_BUILD_DEPENDS=	p5-Template-Toolkit>=2.08:www/p5-Template-Toolkit
+TEMPLATE_RUN_DEPENDS=	p5-Template-Toolkit>=2.08:www/p5-Template-Toolkit
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Framework/Makefile b/www/p5-CGI-Framework/Makefile
index db26766fb801..5acaca33d584 100644
--- a/www/p5-CGI-Framework/Makefile
+++ b/www/p5-CGI-Framework/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple-to-use, lightweight web CGI framework
 
-BUILD_DEPENDS=	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI
+BUILD_DEPENDS=	p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-CGI-Session>=0:www/p5-CGI-Session \
+		p5-CGI>=0:www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index 637a505a3f1b..f432f8e5f2e2 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Quickie Wiki Package that's not too Tricky
 
-BUILD_DEPENDS=	p5-CGI>=0:${PORTSDIR}/www/p5-CGI
+BUILD_DEPENDS=	p5-CGI>=0:www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-Locale-Maketext>=0:${PORTSDIR}/devel/p5-Locale-Maketext
+		p5-Locale-Maketext>=0:devel/p5-Locale-Maketext
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Pager/Makefile b/www/p5-CGI-Pager/Makefile
index 57d15efcc6c8..17f16dc58da0 100644
--- a/www/p5-CGI-Pager/Makefile
+++ b/www/p5-CGI-Pager/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension to generate HTML pagination linkage easily
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Prototype/Makefile b/www/p5-CGI-Prototype/Makefile
index 54da6279f833..6d6553ad7ff4 100644
--- a/www/p5-CGI-Prototype/Makefile
+++ b/www/p5-CGI-Prototype/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Create a CGI application by subclassing
 
-COMMON_DEPENDS=	p5-Class-Prototyped>0:${PORTSDIR}/devel/p5-Class-Prototyped \
-		p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit
+COMMON_DEPENDS=	p5-Class-Prototyped>0:devel/p5-Class-Prototyped \
+		p5-Template-Toolkit>0:www/p5-Template-Toolkit
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/www/p5-CGI-SSI/Makefile b/www/p5-CGI-SSI/Makefile
index 9636dd847c07..3c80c61cfa53 100644
--- a/www/p5-CGI-SSI/Makefile
+++ b/www/p5-CGI-SSI/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use SSI from CGI scripts
 
-RUN_DEPENDS=	p5-HTML-SimpleParse>=0:${PORTSDIR}/www/p5-HTML-SimpleParse \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-HTML-SimpleParse>=0:www/p5-HTML-SimpleParse \
+		p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI \
+		p5-TimeDate>=0:devel/p5-TimeDate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Session-ExpireSessions/Makefile b/www/p5-CGI-Session-ExpireSessions/Makefile
index d066170e927a..f5535d98a63d 100644
--- a/www/p5-CGI-Session-ExpireSessions/Makefile
+++ b/www/p5-CGI-Session-ExpireSessions/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gerard@seibercom.net
 COMMENT=	Perl module to delete expired CGI::Session-type sessions
 
-RUN_DEPENDS=	p5-CGI-Session>=4.14:${PORTSDIR}/www/p5-CGI-Session
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+RUN_DEPENDS=	p5-CGI-Session>=4.14:www/p5-CGI-Session
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Simple/Makefile b/www/p5-CGI-Simple/Makefile
index 3c4169c44e7e..7687fef18fb2 100644
--- a/www/p5-CGI-Simple/Makefile
+++ b/www/p5-CGI-Simple/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Simple totally OO CGI interface that is CGI.pm compliant
 
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Struct/Makefile b/www/p5-CGI-Struct/Makefile
index 327fdcb5e452..7d3386007c6b 100644
--- a/www/p5-CGI-Struct/Makefile
+++ b/www/p5-CGI-Struct/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Build data structures from CGI request parameters
 
 LICENSE=	BSD2CLAUSE
 
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Untaint-date/Makefile b/www/p5-CGI-Untaint-date/Makefile
index 9062a9bfacf7..6242a786ff98 100644
--- a/www/p5-CGI-Untaint-date/Makefile
+++ b/www/p5-CGI-Untaint-date/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Validate a date
 
-BUILD_DEPENDS=	p5-CGI-Untaint>=0:${PORTSDIR}/www/p5-CGI-Untaint \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Date-Simple>=0:${PORTSDIR}/devel/p5-Date-Simple
+BUILD_DEPENDS=	p5-CGI-Untaint>=0:www/p5-CGI-Untaint \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Date-Simple>=0:devel/p5-Date-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Untaint-email/Makefile b/www/p5-CGI-Untaint-email/Makefile
index 46d475f02021..65f3104b7eb6 100644
--- a/www/p5-CGI-Untaint-email/Makefile
+++ b/www/p5-CGI-Untaint-email/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Validate an email address in a CGI form
 
-RUN_DEPENDS=	p5-CGI-Untaint>=0:${PORTSDIR}/www/p5-CGI-Untaint \
-		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS=	p5-CGI-Untaint>=0:www/p5-CGI-Untaint \
+		p5-Email-Valid>=0:mail/p5-Email-Valid \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Untaint/Makefile b/www/p5-CGI-Untaint/Makefile
index 43067f0e1ba8..3b61c09430ed 100644
--- a/www/p5-CGI-Untaint/Makefile
+++ b/www/p5-CGI-Untaint/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Process CGI input parameters
 
-BUILD_DEPENDS=	p5-UNIVERSAL-require>=0.01:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-UNIVERSAL-require>=0.01:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Upload/Makefile b/www/p5-CGI-Upload/Makefile
index 0f6ead0ec974..aeab9a5bc3b7 100644
--- a/www/p5-CGI-Upload/Makefile
+++ b/www/p5-CGI-Upload/Makefile
@@ -14,9 +14,9 @@ COMMENT=	CGI class for handling browser file uploads
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-BrowserDetect>=0:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
-		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI
+BUILD_DEPENDS=	p5-HTTP-BrowserDetect>=0:www/p5-HTTP-BrowserDetect \
+		p5-File-MMagic>=0:devel/p5-File-MMagic \
+		p5-CGI>=0:www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-XMLApplication/Makefile b/www/p5-CGI-XMLApplication/Makefile
index 1be6cc82b14f..e81862905182 100644
--- a/www/p5-CGI-XMLApplication/Makefile
+++ b/www/p5-CGI-XMLApplication/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object Oriented Interface for CGI Script Applications
 
-BUILD_DEPENDS=	p5-XML-LibXML>=1.1:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-LibXSLT>=1.08:${PORTSDIR}/textproc/p5-XML-LibXSLT
+BUILD_DEPENDS=	p5-XML-LibXML>=1.1:textproc/p5-XML-LibXML \
+		p5-XML-LibXSLT>=1.08:textproc/p5-XML-LibXSLT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/www/p5-CIF-Client/Makefile b/www/p5-CIF-Client/Makefile
index 768b118d8a2d..4c850e4237c4 100644
--- a/www/p5-CIF-Client/Makefile
+++ b/www/p5-CIF-Client/Makefile
@@ -15,24 +15,24 @@ COMMENT=	Extends REST::Client for use with the CI-Framework REST interface
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.31:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Compress-Raw-Zlib>=2.008:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib \
-		p5-Config-Simple>=4.58:${PORTSDIR}/devel/p5-Config-Simple \
-		p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Digest-MD5>=2.36:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-ExtUtils-MakeMaker>=6.4:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-HTML-Table>=2.08:${PORTSDIR}/www/p5-HTML-Table \
-		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-JSON>=2.07:${PORTSDIR}/converters/p5-JSON \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Module-Install>=1.00:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Module-Pluggable>=3.6:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-Parse-Range>=0.96:${PORTSDIR}/math/p5-Parse-Range \
-		p5-Regexp-Common>=2.108:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Regexp-Common-net-CIDR>=0.02:${PORTSDIR}/textproc/p5-Regexp-Common-net-CIDR \
-		p5-REST-Client>=243:${PORTSDIR}/www/p5-REST-Client \
-		p5-Snort-Rule>=1.07:${PORTSDIR}/security/p5-Snort-Rule \
-		p5-Text-Table>=1.114:${PORTSDIR}/textproc/p5-Text-Table
+BUILD_DEPENDS=	p5-Class-Accessor>=0.31:devel/p5-Class-Accessor \
+		p5-Compress-Raw-Zlib>=2.008:archivers/p5-Compress-Raw-Zlib \
+		p5-Config-Simple>=4.58:devel/p5-Config-Simple \
+		p5-Digest-SHA1>=2.11:security/p5-Digest-SHA1 \
+		p5-Digest-MD5>=2.36:security/p5-Digest-MD5 \
+		p5-ExtUtils-MakeMaker>=6.4:devel/p5-ExtUtils-MakeMaker \
+		p5-HTML-Table>=2.08:www/p5-HTML-Table \
+		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-JSON>=2.07:converters/p5-JSON \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Module-Install>=1.00:devel/p5-Module-Install \
+		p5-Module-Pluggable>=3.6:devel/p5-Module-Pluggable \
+		p5-Parse-Range>=0.96:math/p5-Parse-Range \
+		p5-Regexp-Common>=2.108:textproc/p5-Regexp-Common \
+		p5-Regexp-Common-net-CIDR>=0.02:textproc/p5-Regexp-Common-net-CIDR \
+		p5-REST-Client>=243:www/p5-REST-Client \
+		p5-Snort-Rule>=1.07:security/p5-Snort-Rule \
+		p5-Text-Table>=1.114:textproc/p5-Text-Table
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CSS-DOM/Makefile b/www/p5-CSS-DOM/Makefile
index 3f0833664e13..a0c4d38555a0 100644
--- a/www/p5-CSS-DOM/Makefile
+++ b/www/p5-CSS-DOM/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Document Object Model for Cascading Style Sheets
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone>=0.09:${PORTSDIR}/devel/p5-Clone
+BUILD_DEPENDS=	p5-Clone>=0.09:devel/p5-Clone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-CSS-Inliner/Makefile b/www/p5-CSS-Inliner/Makefile
index b2657549ea21..f635c8d53ea2 100644
--- a/www/p5-CSS-Inliner/Makefile
+++ b/www/p5-CSS-Inliner/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Library for converting CSS blocks and files to inline styles
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Query>=0.09:${PORTSDIR}/www/p5-HTML-Query \
-		p5-HTML-Tree>=5.03:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-Query>=0.09:www/p5-HTML-Query \
+		p5-HTML-Tree>=5.03:www/p5-HTML-Tree \
+		p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-Catalyst-Action-REST/Makefile b/www/p5-Catalyst-Action-REST/Makefile
index af359bab4b2e..f4d2f2a15ed7 100644
--- a/www/p5-Catalyst-Action-REST/Makefile
+++ b/www/p5-Catalyst-Action-REST/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Automated REST Method Dispatching for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80030:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Inspector>=1.13:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=1.03:${PORTSDIR}/devel/p5-Moose \
-		p5-Params-Validate>=0.76:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80030:www/p5-Catalyst-Runtime \
+		p5-Class-Inspector>=1.13:devel/p5-Class-Inspector \
+		p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
+		p5-Moose>=1.03:devel/p5-Moose \
+		p5-Params-Validate>=0.76:devel/p5-Params-Validate \
+		p5-URI-Find>=0:textproc/p5-URI-Find \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-libwww>=5:${PORTSDIR}/www/p5-libwww \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-libwww>=5:www/p5-libwww \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 CONFIGURE_ARGS=	--default
@@ -33,8 +33,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502000
-BUILD_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
-RUN_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS+=	p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Action-RenderView/Makefile b/www/p5-Catalyst-Action-RenderView/Makefile
index a78b8d54ccd9..f71d0d7a0e41 100644
--- a/www/p5-Catalyst-Action-RenderView/Makefile
+++ b/www/p5-Catalyst-Action-RenderView/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Sensible default end action for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.70:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Data-Visitor>=0.24:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.70:www/p5-Catalyst-Runtime \
+		p5-Data-Visitor>=0.24:devel/p5-Data-Visitor \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile b/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile
index 6cad25aeda12..f4b792b960d2 100644
--- a/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile
+++ b/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile
@@ -14,10 +14,10 @@ COMMENT=	XML::Hash::LX serializer for Catalyst::Action::Serialize
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-XML-Hash-LX>=0.06:${PORTSDIR}/textproc/p5-XML-Hash-LX
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-XML-Hash-LX>=0.06:textproc/p5-XML-Hash-LX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+TEST_DEPENDS=	p5-lib-abs>=0.90:devel/p5-lib-abs
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/www/p5-Catalyst-ActionRole-ACL/Makefile b/www/p5-Catalyst-ActionRole-ACL/Makefile
index 7b33a9240da1..7aa55e643e7f 100644
--- a/www/p5-Catalyst-ActionRole-ACL/Makefile
+++ b/www/p5-Catalyst-ActionRole-ACL/Makefile
@@ -15,10 +15,10 @@ COMMENT=	User role-based authorization action class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Controller-ActionRole>=0:${PORTSDIR}/www/p5-Catalyst-Controller-ActionRole \
-		p5-Catalyst-Runtime>=5.90013:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Controller-ActionRole>=0:www/p5-Catalyst-Controller-ActionRole \
+		p5-Catalyst-Runtime>=5.90013:www/p5-Catalyst-Runtime \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
index c17eb13aaabf..4a849913217f 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
@@ -14,15 +14,15 @@ COMMENT=	HTTP plain and digest authentication plugin for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0.10005:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Data-UUID>=0.11:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-String-Escape>0:${PORTSDIR}/textproc/p5-String-Escape \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0.10005:www/p5-Catalyst-Plugin-Authentication \
+		p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Data-UUID>=0.11:devel/p5-Data-UUID \
+		p5-String-Escape>0:textproc/p5-String-Escape \
+		p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile b/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile
index ac609bf848cd..a4aab67fa16d 100644
--- a/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile
@@ -14,10 +14,10 @@ COMMENT=	OpenID credential for Catalyst::Plugin::Authentication framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Net-OpenID-Consumer>=1.03:${PORTSDIR}/net/p5-Net-OpenID-Consumer \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Net-OpenID-Consumer>=1.03:net/p5-Net-OpenID-Consumer \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
index c3244152eb46..8eff51c0d493 100644
--- a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Storage class for Catalyst Authentication using DBIx::Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Model-DBIC-Schema>=0.18:${PORTSDIR}/www/p5-Catalyst-Model-DBIC-Schema \
-		p5-Catalyst-Plugin-Authentication>=0.10008:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-Catalyst-Runtime>=5.8:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-DBIx-Class>=0.08:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Model-DBIC-Schema>=0.18:www/p5-Catalyst-Model-DBIC-Schema \
+		p5-Catalyst-Plugin-Authentication>=0.10008:www/p5-Catalyst-Plugin-Authentication \
+		p5-Catalyst-Runtime>=5.8:www/p5-Catalyst-Runtime \
+		p5-DBIx-Class>=0.08:databases/p5-DBIx-Class \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Authentication-Store-LDAP/Makefile b/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
index e4a11c7333c7..96fd3da0d5c8 100644
--- a/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Authentication from an LDAP Directory for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0.10003:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0.10003:www/p5-Catalyst-Plugin-Authentication \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Net-LDAP-Server-Test>=0:${PORTSDIR}/net/p5-Net-LDAP-Server-Test \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Catalyst-Model-LDAP>=0:${PORTSDIR}/www/p5-Catalyst-Model-LDAP \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Net-LDAP-Server-Test>=0:net/p5-Net-LDAP-Server-Test \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Catalyst-Model-LDAP>=0:www/p5-Catalyst-Model-LDAP \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
index 3e851803529b..e771436fec2c 100644
--- a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
+++ b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Make the Catalyst request context available in Models and Views
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Devel-Cycle>=0:${PORTSDIR}/devel/p5-Devel-Cycle
+TEST_DEPENDS=	p5-Devel-Cycle>=0:devel/p5-Devel-Cycle
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Component-InstancePerContext/Makefile b/www/p5-Catalyst-Component-InstancePerContext/Makefile
index 32526b7a30de..08dca06b9307 100644
--- a/www/p5-Catalyst-Component-InstancePerContext/Makefile
+++ b/www/p5-Catalyst-Component-InstancePerContext/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	oleg@mamontov.net
 COMMENT=	Return a new instance a component on each request
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime	\
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime	\
+		p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Controller-ActionRole/Makefile b/www/p5-Catalyst-Controller-ActionRole/Makefile
index 06f85ac1c105..52bfcc825c40 100644
--- a/www/p5-Catalyst-Controller-ActionRole/Makefile
+++ b/www/p5-Catalyst-Controller-ActionRole/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mons@cpan.org
 COMMENT=	Apply roles to action instances
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.71001:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-String-RewritePrefix>=0.004:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-String-RewritePrefix>=0.004:textproc/p5-String-RewritePrefix \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Controller-BindLex/Makefile b/www/p5-Catalyst-Controller-BindLex/Makefile
index 0c94bc3f2039..73e1d83df9f3 100644
--- a/www/p5-Catalyst-Controller-BindLex/Makefile
+++ b/www/p5-Catalyst-Controller-BindLex/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Stash your lexical goodness
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Array-RefElem>=0:${PORTSDIR}/misc/p5-Array-RefElem \
-		p5-Devel-Caller>=0:${PORTSDIR}/devel/p5-Devel-Caller \
-		p5-Devel-LexAlias>=0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Array-RefElem>=0:misc/p5-Array-RefElem \
+		p5-Devel-Caller>=0:devel/p5-Devel-Caller \
+		p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
+		p5-PadWalker>=0:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -28,7 +28,7 @@ USE_PERL5=	modbuild
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Controller-FormBuilder/Makefile b/www/p5-Catalyst-Controller-FormBuilder/Makefile
index 4621afcb0ffc..1f949a1aa440 100644
--- a/www/p5-Catalyst-Controller-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Controller-FormBuilder/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Catalyst FormBuilder Base Controller
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-CGI-FormBuilder>=3.02:${PORTSDIR}/www/p5-CGI-FormBuilder \
-		p5-Catalyst-Runtime>=5.7:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0.04:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Inspector>=1.13:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Tie-IxHash>=1.21:${PORTSDIR}/devel/p5-Tie-IxHash
+RUN_DEPENDS=	p5-CGI-FormBuilder>=3.02:www/p5-CGI-FormBuilder \
+		p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0.04:devel/p5-Class-Data-Inheritable \
+		p5-Class-Inspector>=1.13:devel/p5-Class-Inspector \
+		p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Tie-IxHash>=1.21:devel/p5-Tie-IxHash
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0.37:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0.37:devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
index 2bf36ff00720..c20b3b62a656 100644
--- a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
+++ b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
@@ -14,25 +14,25 @@ COMMENT=	Catalyst FormFu Base Controller
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Component-InstancePerContext>=0:${PORTSDIR}/www/p5-Catalyst-Component-InstancePerContext \
-		p5-Catalyst-Runtime>=5.71001:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-HTML-FormFu>=1:${PORTSDIR}/www/p5-HTML-FormFu \
-		p5-Moose>=1:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Attribute-Chained>=1.0.1:${PORTSDIR}/devel/p5-MooseX-Attribute-Chained \
-		p5-Regexp-Assemble>=0:${PORTSDIR}/devel/p5-Regexp-Assemble \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Component-InstancePerContext>=0:www/p5-Catalyst-Component-InstancePerContext \
+		p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-HTML-FormFu>=1:www/p5-HTML-FormFu \
+		p5-Moose>=1:devel/p5-Moose \
+		p5-MooseX-Attribute-Chained>=1.0.1:devel/p5-MooseX-Attribute-Chained \
+		p5-Regexp-Assemble>=0:devel/p5-Regexp-Assemble \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Catalyst-Action-RenderView>=0:${PORTSDIR}/www/p5-Catalyst-Action-RenderView \
-		p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Plugin-Session-State-Cookie>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-State-Cookie \
-		p5-Catalyst-Plugin-Session-Store-File>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-Store-File \
-		p5-Catalyst-View-TT>=0:${PORTSDIR}/www/p5-Catalyst-View-TT \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Test-Aggregate>=0.371:${PORTSDIR}/devel/p5-Test-Aggregate \
-		p5-Test-WWW-Mechanize>=1.16:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
+		p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
+		p5-Catalyst-Plugin-Session-Store-File>=0:www/p5-Catalyst-Plugin-Session-Store-File \
+		p5-Catalyst-View-TT>=0:www/p5-Catalyst-View-TT \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Test-Aggregate>=0.371:devel/p5-Test-Aggregate \
+		p5-Test-WWW-Mechanize>=1.16:devel/p5-Test-WWW-Mechanize \
+		p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Controller-RateLimit/Makefile b/www/p5-Catalyst-Controller-RateLimit/Makefile
index 2d1a29c87c7a..f7c8ce83cf14 100644
--- a/www/p5-Catalyst-Controller-RateLimit/Makefile
+++ b/www/p5-Catalyst-Controller-RateLimit/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Protect your site from robots
 
-BUILD_DEPENDS=	p5-Algorithm-FloodControl>=1.91:${PORTSDIR}/devel/p5-Algorithm-FloodControl \
-		p5-Catalyst-Plugin-Cache-FastMmap>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Cache-FastMmap \
-		p5-Catalyst-Plugin-ConfigLoader>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-ConfigLoader \
-		p5-Catalyst-Runtime>=5.7002:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Algorithm-FloodControl>=1.91:devel/p5-Algorithm-FloodControl \
+		p5-Catalyst-Plugin-Cache-FastMmap>=0:www/p5-Catalyst-Plugin-Cache-FastMmap \
+		p5-Catalyst-Plugin-ConfigLoader>=0:www/p5-Catalyst-Plugin-ConfigLoader \
+		p5-Catalyst-Runtime>=5.7002:www/p5-Catalyst-Runtime \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
 
 USES=		perl5
 USE_PERL5=	configure
@@ -26,7 +26,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Controller-RequestToken/Makefile b/www/p5-Catalyst-Controller-RequestToken/Makefile
index 54478467bab9..215b67f8b23a 100644
--- a/www/p5-Catalyst-Controller-RequestToken/Makefile
+++ b/www/p5-Catalyst-Controller-RequestToken/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bill.brinzer@gmail.com
 COMMENT=	Generate and validate unique tokens across HTTP requests (anti-CSRF)
 
-BUILD_DEPENDS=	p5-Catalyst-Action-RenderView>=0:${PORTSDIR}/www/p5-Catalyst-Action-RenderView \
-		p5-Catalyst-Plugin-Session-State-Cookie>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-State-Cookie \
-		p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
+		p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
+		p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Controller-SOAP/Makefile b/www/p5-Catalyst-Controller-SOAP/Makefile
index 72e5ef550345..2001ae118846 100644
--- a/www/p5-Catalyst-Controller-SOAP/Makefile
+++ b/www/p5-Catalyst-Controller-SOAP/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Catalyst SOAP Controller
 LICENSE=	ARTPERL10
 
 BUILD_DEPENDS=	\
-		p5-Catalyst-Runtime>=5.90017:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=0.9:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-XML-Compile-SOAP>=2.35:${PORTSDIR}/net/p5-XML-Compile-SOAP \
-		p5-XML-Compile-WSDL11>=0:${PORTSDIR}/net/p5-XML-Compile-WSDL11 \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+		p5-Catalyst-Runtime>=5.90017:www/p5-Catalyst-Runtime \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Moose>=0.9:devel/p5-MRO-Compat \
+		p5-XML-Compile-SOAP>=2.35:net/p5-XML-Compile-SOAP \
+		p5-XML-Compile-WSDL11>=0:net/p5-XML-Compile-WSDL11 \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Devel/Makefile b/www/p5-Catalyst-Devel/Makefile
index 415c652d1eb5..003f0902c446 100644
--- a/www/p5-Catalyst-Devel/Makefile
+++ b/www/p5-Catalyst-Devel/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Catalyst Development Tools
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Action-RenderView>=0.10:${PORTSDIR}/www/p5-Catalyst-Action-RenderView \
-		p5-Catalyst-Plugin-ConfigLoader>=0.30:${PORTSDIR}/www/p5-Catalyst-Plugin-ConfigLoader \
-		p5-Catalyst-Plugin-Static-Simple>=0.28:${PORTSDIR}/www/p5-Catalyst-Plugin-Static-Simple \
-		p5-Catalyst-Runtime>=5.90001:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Config-General>=2.42:${PORTSDIR}/devel/p5-Config-General \
-		p5-File-ChangeNotify>=0.07:${PORTSDIR}/devel/p5-File-ChangeNotify \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Emulate-Class-Accessor-Fast>=0:${PORTSDIR}/devel/p5-MooseX-Emulate-Class-Accessor-Fast \
-		p5-Path-Class>=0.09:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Template-Toolkit>=2.14:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-YAML-Tiny>=0:${PORTSDIR}/textproc/p5-YAML-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Catalyst-Action-RenderView>=0.10:www/p5-Catalyst-Action-RenderView \
+		p5-Catalyst-Plugin-ConfigLoader>=0.30:www/p5-Catalyst-Plugin-ConfigLoader \
+		p5-Catalyst-Plugin-Static-Simple>=0.28:www/p5-Catalyst-Plugin-Static-Simple \
+		p5-Catalyst-Runtime>=5.90001:www/p5-Catalyst-Runtime \
+		p5-Config-General>=2.42:devel/p5-Config-General \
+		p5-File-ChangeNotify>=0.07:devel/p5-File-ChangeNotify \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Emulate-Class-Accessor-Fast>=0:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
+		p5-Path-Class>=0.09:devel/p5-Path-Class \
+		p5-Template-Toolkit>=2.14:www/p5-Template-Toolkit \
+		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-Module-Install>=1.02:${PORTSDIR}/devel/p5-Module-Install
-TEST_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+BUILD_DEPENDS+=	p5-Module-Install>=1.02:devel/p5-Module-Install
+TEST_DEPENDS=	p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-DispatchType-Regex/Makefile b/www/p5-Catalyst-DispatchType-Regex/Makefile
index 203a93ce86fe..2b854eb4ff8f 100644
--- a/www/p5-Catalyst-DispatchType-Regex/Makefile
+++ b/www/p5-Catalyst-DispatchType-Regex/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Regex DispatchType
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.90060:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced \
-		p5-Text-SimpleTable>=0:${PORTSDIR}/textproc/p5-Text-SimpleTable
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.90060:www/p5-Catalyst-Runtime \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Text-Balanced>=0:textproc/p5-Text-Balanced \
+		p5-Text-SimpleTable>=0:textproc/p5-Text-SimpleTable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/www/p5-Catalyst-Engine-Apache/Makefile b/www/p5-Catalyst-Engine-Apache/Makefile
index 810f98a8c9d7..8001507d2dd4 100644
--- a/www/p5-Catalyst-Engine-Apache/Makefile
+++ b/www/p5-Catalyst-Engine-Apache/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Catalyst Apache Engines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80:${PORTSDIR}/www/p5-Catalyst-Runtime
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.80:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80:www/p5-Catalyst-Runtime
+RUN_DEPENDS=	p5-Catalyst-Runtime>=5.80:www/p5-Catalyst-Runtime
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile b/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
index 6d2ced14c837..6ca0aecee7e2 100644
--- a/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
+++ b/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	High-performance pre-forking Catalyst engine
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7012:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Net-Server>=0.97:${PORTSDIR}/net/p5-Net-Server \
-		p5-HTTP-HeaderParser-XS>=0:${PORTSDIR}/www/p5-HTTP-HeaderParser-XS \
-		p5-CGI-Cookie-XS>=0:${PORTSDIR}/www/p5-CGI-Cookie-XS \
-		p5-HTTP-Body>=0:${PORTSDIR}/www/p5-HTTP-Body
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7012:www/p5-Catalyst-Runtime \
+		p5-Net-Server>=0.97:net/p5-Net-Server \
+		p5-HTTP-HeaderParser-XS>=0:www/p5-HTTP-HeaderParser-XS \
+		p5-CGI-Cookie-XS>=0:www/p5-CGI-Cookie-XS \
+		p5-HTTP-Body>=0:www/p5-HTTP-Body
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Engine-PSGI/Makefile b/www/p5-Catalyst-Engine-PSGI/Makefile
index 7740d9755382..c465964b132c 100644
--- a/www/p5-Catalyst-Engine-PSGI/Makefile
+++ b/www/p5-Catalyst-Engine-PSGI/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Catalyst-Runtime>=5.80007:${PORTSDIR}/www/p5-Catalyst-Runtime \
-	p5-Catalyst-Action-RenderView>0:${PORTSDIR}/www/p5-Catalyst-Action-RenderView
+	p5-Catalyst-Runtime>=5.80007:www/p5-Catalyst-Runtime \
+	p5-Catalyst-Action-RenderView>0:www/p5-Catalyst-Action-RenderView
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Enzyme/Makefile b/www/p5-Catalyst-Enzyme/Makefile
index 0ed663d3cc25..8984857acedc 100644
--- a/www/p5-Catalyst-Enzyme/Makefile
+++ b/www/p5-Catalyst-Enzyme/Makefile
@@ -11,24 +11,24 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CRUD framework for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-Catalyst-Model-CDBI>=0.1:${PORTSDIR}/www/p5-Catalyst-Model-CDBI \
-		p5-Catalyst-Plugin-DefaultEnd>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-DefaultEnd \
-		p5-Catalyst-Plugin-FormValidator>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-FormValidator \
-		p5-Catalyst-View-TT-ControllerLocal>=0:${PORTSDIR}/www/p5-Catalyst-View-TT-ControllerLocal \
-		p5-Class-DBI>=0.96:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-Class-DBI-AsForm>=2.42:${PORTSDIR}/databases/p5-Class-DBI-AsForm \
-		p5-Class-DBI-FromForm>=0.03:${PORTSDIR}/www/p5-Class-DBI-FromForm \
-		p5-Class-DBI-Pager>=0:${PORTSDIR}/databases/p5-Class-DBI-Pager \
-		p5-Class-DBI-Plugin-Type>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type \
-		p5-Class-DBI-SQLite>=0.09:${PORTSDIR}/databases/p5-Class-DBI-SQLite \
-		p5-Data-FormValidator>=4.02:${PORTSDIR}/textproc/p5-Data-FormValidator \
-		p5-DBI-Shell>=0:${PORTSDIR}/databases/p5-DBI-Shell \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
+		p5-Catalyst-Model-CDBI>=0.1:www/p5-Catalyst-Model-CDBI \
+		p5-Catalyst-Plugin-DefaultEnd>=0:www/p5-Catalyst-Plugin-DefaultEnd \
+		p5-Catalyst-Plugin-FormValidator>=0:www/p5-Catalyst-Plugin-FormValidator \
+		p5-Catalyst-View-TT-ControllerLocal>=0:www/p5-Catalyst-View-TT-ControllerLocal \
+		p5-Class-DBI>=0.96:databases/p5-Class-DBI \
+		p5-Class-DBI-AsForm>=2.42:databases/p5-Class-DBI-AsForm \
+		p5-Class-DBI-FromForm>=0.03:www/p5-Class-DBI-FromForm \
+		p5-Class-DBI-Pager>=0:databases/p5-Class-DBI-Pager \
+		p5-Class-DBI-Plugin-Type>=0.02:databases/p5-Class-DBI-Plugin-Type \
+		p5-Class-DBI-SQLite>=0.09:databases/p5-Class-DBI-SQLite \
+		p5-Data-FormValidator>=4.02:textproc/p5-Data-FormValidator \
+		p5-DBI-Shell>=0:databases/p5-DBI-Shell \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
index 97944d09048e..9a2ab59a25ad 100644
--- a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
+++ b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst helper for Scaffolding
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-Catalyst-Plugin-FormValidator>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-FormValidator \
-		p5-Catalyst-View-TT>=0:${PORTSDIR}/www/p5-Catalyst-View-TT \
-		p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-Class-DBI-AsForm>=0:${PORTSDIR}/databases/p5-Class-DBI-AsForm \
-		p5-Class-DBI-FromForm>=0:${PORTSDIR}/www/p5-Class-DBI-FromForm \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Template-Plugin-Class>=0:${PORTSDIR}/www/p5-Template-Plugin-Class
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
+		p5-Catalyst-Plugin-FormValidator>=0:www/p5-Catalyst-Plugin-FormValidator \
+		p5-Catalyst-View-TT>=0:www/p5-Catalyst-View-TT \
+		p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-Class-DBI-AsForm>=0:databases/p5-Class-DBI-AsForm \
+		p5-Class-DBI-FromForm>=0:www/p5-Class-DBI-FromForm \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Template-Plugin-Class>=0:www/p5-Template-Plugin-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Model-Adaptor/Makefile b/www/p5-Catalyst-Model-Adaptor/Makefile
index fd3cd4b66cbd..b1a273848f55 100644
--- a/www/p5-Catalyst-Model-Adaptor/Makefile
+++ b/www/p5-Catalyst-Model-Adaptor/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Use a plain class as a Catalyst model
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+RUN_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure
@@ -22,7 +22,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Model-CDBI-Plain/Makefile b/www/p5-Catalyst-Model-CDBI-Plain/Makefile
index 295201e5ecb6..5f30b5ef2ec1 100644
--- a/www/p5-Catalyst-Model-CDBI-Plain/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Plain/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Catalyst plain base class for Class::DBI models
 
-BUILD_DEPENDS=	p5-Class-DBI>0:${PORTSDIR}/databases/p5-Class-DBI \
+BUILD_DEPENDS=	p5-Class-DBI>0:databases/p5-Class-DBI \
 		${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>0:${PORTSDIR}/www/p5-Catalyst-Devel
+RUN_DEPENDS=	p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>0:www/p5-Catalyst-Devel
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
index ad8dff3c5d6b..2439c253df33 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CDBI model class for Catalyst that makes things sweeter
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-DBI-Sweet>=0:${PORTSDIR}/databases/p5-Class-DBI-Sweet
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Class-DBI-Sweet>=0:databases/p5-Class-DBI-Sweet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Model-CDBI/Makefile b/www/p5-Catalyst-Model-CDBI/Makefile
index 25ce672069ef..22fecced7362 100644
--- a/www/p5-Catalyst-Model-CDBI/Makefile
+++ b/www/p5-Catalyst-Model-CDBI/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CDBI model class for Catalyst
 
-BUILD_DEPENDS=	p5-Class-DBI-Loader>=0:${PORTSDIR}/databases/p5-Class-DBI-Loader \
-		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+BUILD_DEPENDS=	p5-Class-DBI-Loader>=0:databases/p5-Class-DBI-Loader \
+		p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
+		p5-Class-DBI>=0:databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-MRO-Compat>=0.11:${PORTSDIR}/devel/p5-MRO-Compat
+		p5-MRO-Compat>=0.11:devel/p5-MRO-Compat
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/Makefile b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
index dd23f579d7fe..d24d2cc887ad 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBIx::Class model class for Catalyst, without loader
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-DBIx-Class>=0.01:${PORTSDIR}/databases/p5-DBIx-Class
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
+		p5-DBIx-Class>=0.01:databases/p5-DBIx-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Model-DBIC-Schema/Makefile b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
index 753c9e27dc9c..c75fc81c18f6 100644
--- a/www/p5-Catalyst-Model-DBIC-Schema/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
@@ -13,30 +13,30 @@ COMMENT=	DBIx::Class::Schema Model Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Catalyst-Component-InstancePerContext>=0:${PORTSDIR}/www/p5-Catalyst-Component-InstancePerContext \
-		p5-Catalyst-Devel>=1.0:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-Catalyst-Runtime>=5.80005:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-CatalystX-Component-Traits>=0.14:${PORTSDIR}/www/p5-CatalystX-Component-Traits \
-		p5-DBIx-Class>=0.08114:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBIx-Class-Cursor-Cached>=0:${PORTSDIR}/databases/p5-DBIx-Class-Cursor-Cached \
-		p5-DBIx-Class-Schema-Loader>=0.04005:${PORTSDIR}/databases/p5-DBIx-Class-Schema-Loader \
-		p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=1.12:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-MarkAsMethods>=0.13:${PORTSDIR}/devel/p5-MooseX-MarkAsMethods \
-		p5-MooseX-NonMoose>=0.16:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-LoadableClass>=0.009:${PORTSDIR}/devel/p5-MooseX-Types-LoadableClass \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-autoclean>=0.09:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+		p5-Catalyst-Component-InstancePerContext>=0:www/p5-Catalyst-Component-InstancePerContext \
+		p5-Catalyst-Devel>=1.0:www/p5-Catalyst-Devel \
+		p5-Catalyst-Runtime>=5.80005:www/p5-Catalyst-Runtime \
+		p5-CatalystX-Component-Traits>=0.14:www/p5-CatalystX-Component-Traits \
+		p5-DBIx-Class>=0.08114:databases/p5-DBIx-Class \
+		p5-DBIx-Class-Cursor-Cached>=0:databases/p5-DBIx-Class-Cursor-Cached \
+		p5-DBIx-Class-Schema-Loader>=0.04005:databases/p5-DBIx-Class-Schema-Loader \
+		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Moose>=1.12:devel/p5-Moose \
+		p5-MooseX-MarkAsMethods>=0.13:devel/p5-MooseX-MarkAsMethods \
+		p5-MooseX-NonMoose>=0.16:devel/p5-MooseX-NonMoose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-MooseX-Types-LoadableClass>=0.009:devel/p5-MooseX-Types-LoadableClass \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
index 034251029732..27f8e4a11ee6 100644
--- a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
+++ b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dynamically load adaptor modules
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Module-Recursive-Require>=0:${PORTSDIR}/devel/p5-Module-Recursive-Require \
-		p5-Test-Spelling>=0:${PORTSDIR}/devel/p5-Test-Spelling
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Module-Recursive-Require>=0:devel/p5-Module-Recursive-Require \
+		p5-Test-Spelling>=0:devel/p5-Test-Spelling
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Model-LDAP/Makefile b/www/p5-Catalyst-Model-LDAP/Makefile
index 93560069eac3..5bd00e7a3d2f 100644
--- a/www/p5-Catalyst-Model-LDAP/Makefile
+++ b/www/p5-Catalyst-Model-LDAP/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	LDAP model class for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Data-Page>0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-MRO-Compat>0:devel/p5-MRO-Compat \
+		p5-Data-Page>0:databases/p5-Data-Page \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Model-Memcached/Makefile b/www/p5-Catalyst-Model-Memcached/Makefile
index f0715e7d942c..ca12245316e4 100644
--- a/www/p5-Catalyst-Model-Memcached/Makefile
+++ b/www/p5-Catalyst-Model-Memcached/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Wrapper for memcached imitating Catalyst models
 
-RUN_DEPENDS=	p5-Cache-Memcached-Fast>=0.17:${PORTSDIR}/databases/p5-Cache-Memcached-Fast \
-		p5-Catalyst-Runtime>=5.8:${PORTSDIR}/www/p5-Catalyst-Runtime
+RUN_DEPENDS=	p5-Cache-Memcached-Fast>=0.17:databases/p5-Cache-Memcached-Fast \
+		p5-Catalyst-Runtime>=5.8:www/p5-Catalyst-Runtime
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 tar:tgz
diff --git a/www/p5-Catalyst-Model-Oryx/Makefile b/www/p5-Catalyst-Model-Oryx/Makefile
index 6c932ccca2cc..7465357fc318 100644
--- a/www/p5-Catalyst-Model-Oryx/Makefile
+++ b/www/p5-Catalyst-Model-Oryx/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Oryx model component for Catalyst
 
-BUILD_DEPENDS=	p5-Oryx>=0:${PORTSDIR}/databases/p5-Oryx \
-		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel
+BUILD_DEPENDS=	p5-Oryx>=0:databases/p5-Oryx \
+		p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Model-Tarantool/Makefile b/www/p5-Catalyst-Model-Tarantool/Makefile
index c6991cc47c6e..ca26aaf3a4ef 100644
--- a/www/p5-Catalyst-Model-Tarantool/Makefile
+++ b/www/p5-Catalyst-Model-Tarantool/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Tarantool interface for Catalyst based application
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.90001:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-MR-Tarantool>=0.0.24:${PORTSDIR}/databases/p5-MR-Tarantool
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.90001:www/p5-Catalyst-Runtime \
+		p5-MR-Tarantool>=0.0.24:databases/p5-MR-Tarantool
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Model-XML-Feed/Makefile b/www/p5-Catalyst-Model-XML-Feed/Makefile
index edc2baa79232..44b30ec26145 100644
--- a/www/p5-Catalyst-Model-XML-Feed/Makefile
+++ b/www/p5-Catalyst-Model-XML-Feed/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use RSS/Atom feeds as a Catalyst Model
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-XML-Feed>=0.11:${PORTSDIR}/textproc/p5-XML-Feed \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-XML-Feed>=0.11:textproc/p5-XML-Feed \
+		p5-URI>=1.35:net/p5-URI \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Model-Xapian/Makefile b/www/p5-Catalyst-Model-Xapian/Makefile
index ae7ad89b64dc..9907778b1f01 100644
--- a/www/p5-Catalyst-Model-Xapian/Makefile
+++ b/www/p5-Catalyst-Model-Xapian/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst model for Search::Xapian
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.30:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-Data-Page>=0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-Search-Xapian>=1.2.7.0:${PORTSDIR}/databases/p5-Search-Xapian
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.30:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
+		p5-Data-Page>=0:databases/p5-Data-Page \
+		p5-Search-Xapian>=1.2.7.0:databases/p5-Search-Xapian
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/www/p5-Catalyst-Model-Xapian10/Makefile b/www/p5-Catalyst-Model-Xapian10/Makefile
index 39f345460adf..5508f31d4390 100644
--- a/www/p5-Catalyst-Model-Xapian10/Makefile
+++ b/www/p5-Catalyst-Model-Xapian10/Makefile
@@ -13,10 +13,10 @@ DISTNAME=	${PORTNAME:S/10$//}-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst model for Search::Xapian
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.30:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-Data-Page>=0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-Search-Xapian10>=0.9.2.4:${PORTSDIR}/databases/p5-Search-Xapian10
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.30:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
+		p5-Data-Page>=0:databases/p5-Data-Page \
+		p5-Search-Xapian10>=0.9.2.4:databases/p5-Search-Xapian10
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/www/p5-Catalyst-Plugin-AtomServer/Makefile b/www/p5-Catalyst-Plugin-AtomServer/Makefile
index e80539f7c2e4..d88c661e2438 100644
--- a/www/p5-Catalyst-Plugin-AtomServer/Makefile
+++ b/www/p5-Catalyst-Plugin-AtomServer/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	oleg@mamontov.net
 COMMENT=	Atom API server for Catalyst applications
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime	\
-		p5-Catalyst-Plugin-Authentication>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication	\
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1		\
-		p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom
-RUN_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime	\
-		p5-Catalyst-Plugin-Authentication>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication	\
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1		\
-		p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime	\
+		p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication	\
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1		\
+		p5-XML-Atom>=0:textproc/p5-XML-Atom
+RUN_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime	\
+		p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication	\
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1		\
+		p5-XML-Atom>=0:textproc/p5-XML-Atom
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
index 9d9b1154f17f..4ae6c43d3b49 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CDBI Authentication for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Model-CDBI>=0:${PORTSDIR}/www/p5-Catalyst-Model-CDBI \
-		p5-Catalyst-Plugin-Session-FastMmap>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-FastMmap
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Model-CDBI>=0:www/p5-Catalyst-Model-CDBI \
+		p5-Catalyst-Plugin-Session-FastMmap>=0:www/p5-Catalyst-Plugin-Session-FastMmap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile b/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
index 26e1a600ad91..2f32089fbdd5 100644
--- a/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
@@ -14,9 +14,9 @@ COMMENT=	OpenID Authentication
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-LWPx-ParanoidAgent>=0:${PORTSDIR}/www/p5-LWPx-ParanoidAgent \
-		p5-Net-OpenID-Consumer>=0:${PORTSDIR}/net/p5-Net-OpenID-Consumer
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-LWPx-ParanoidAgent>=0:www/p5-LWPx-ParanoidAgent \
+		p5-Net-OpenID-Consumer>=0:net/p5-Net-OpenID-Consumer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
index d3e33a1c99e5..3f77eb26ae74 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-0.02
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use .htpasswd with Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0.01:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-Authen-Htpasswd>=0.13:${PORTSDIR}/security/p5-Authen-Htpasswd
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0.01:www/p5-Catalyst-Plugin-Authentication \
+		p5-Authen-Htpasswd>=0.13:security/p5-Authen-Htpasswd
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Authentication/Makefile b/www/p5-Catalyst-Plugin-Authentication/Makefile
index f6a6e938ac5c..00d4d6fd03c0 100644
--- a/www/p5-Catalyst-Plugin-Authentication/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication/Makefile
@@ -12,21 +12,21 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Infrastructure plugin for the Catalyst authentication framework
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.10:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Emulate-Class-Accessor-Fast>=0:${PORTSDIR}/devel/p5-MooseX-Emulate-Class-Accessor-Fast \
-		p5-String-RewritePrefix>=0:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.10:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Emulate-Class-Accessor-Fast>=0:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
+		p5-String-RewritePrefix>=0:textproc/p5-String-RewritePrefix \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Plugin-Session-State-Cookie>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-State-Cookie \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
 
 PORTSCOUT=	skipv:0.100091,0.100092
 
diff --git a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
index f32df0a1a273..76d61d92629b 100644
--- a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
@@ -13,19 +13,19 @@ COMMENT=	ACL support for Catalyst applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-Catalyst-Plugin-Authorization-Roles>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Authorization-Roles \
-		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Throwable>=0:${PORTSDIR}/devel/p5-Class-Throwable \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Tree-Simple>=0:${PORTSDIR}/devel/p5-Tree-Simple \
-		p5-Tree-Simple-VisitorFactory>=0:${PORTSDIR}/devel/p5-Tree-Simple-VisitorFactory \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication \
+		p5-Catalyst-Plugin-Authorization-Roles>=0:www/p5-Catalyst-Plugin-Authorization-Roles \
+		p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Class-Throwable>=0:devel/p5-Class-Throwable \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Tree-Simple>=0:devel/p5-Tree-Simple \
+		p5-Tree-Simple-VisitorFactory>=0:devel/p5-Tree-Simple-VisitorFactory \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Plugin-Session-State-Cookie>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-State-Cookie \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
+		p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
index 1a8bd2a8e4a4..adf54aeecfc1 100644
--- a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Role based authorization for Catalyst
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Plugin-Authentication>=0.10003:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-Set-Object>=1.14:${PORTSDIR}/devel/p5-Set-Object \
-		p5-UNIVERSAL-isa>=0.05:${PORTSDIR}/devel/p5-UNIVERSAL-isa
+RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Plugin-Authentication>=0.10003:www/p5-Catalyst-Plugin-Authentication \
+		p5-Set-Object>=1.14:devel/p5-Set-Object \
+		p5-UNIVERSAL-isa>=0.05:devel/p5-UNIVERSAL-isa
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-AutoCRUD/Makefile b/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
index e95c335f395f..4d5627803732 100644
--- a/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
+++ b/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
@@ -12,24 +12,24 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Instant AJAX web front-end for DBIx::Class
 
-BUILD_DEPENDS=	p5-Catalyst-Action-RenderView>=0:${PORTSDIR}/www/p5-Catalyst-Action-RenderView \
-		p5-Catalyst-Model-DBIC-Schema>=0:${PORTSDIR}/www/p5-Catalyst-Model-DBIC-Schema \
-		p5-Catalyst-Plugin-ConfigLoader>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-ConfigLoader \
-		p5-Catalyst-Runtime>=5.70000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-View-JSON>=0:${PORTSDIR}/www/p5-Catalyst-View-JSON \
-		p5-Catalyst-View-TT>=0:${PORTSDIR}/www/p5-Catalyst-View-TT \
-		p5-DBIx-Class-Schema-Loader>=0:${PORTSDIR}/databases/p5-DBIx-Class-Schema-Loader \
-		p5-Data-Page>=0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Lingua-EN-Inflect-Number>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator
+BUILD_DEPENDS=	p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
+		p5-Catalyst-Model-DBIC-Schema>=0:www/p5-Catalyst-Model-DBIC-Schema \
+		p5-Catalyst-Plugin-ConfigLoader>=0:www/p5-Catalyst-Plugin-ConfigLoader \
+		p5-Catalyst-Runtime>=5.70000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-View-JSON>=0:www/p5-Catalyst-View-JSON \
+		p5-Catalyst-View-TT>=0:www/p5-Catalyst-View-TT \
+		p5-DBIx-Class-Schema-Loader>=0:databases/p5-DBIx-Class-Schema-Loader \
+		p5-Data-Page>=0:databases/p5-Data-Page \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Browser/Makefile b/www/p5-Catalyst-Plugin-Browser/Makefile
index 9d719257c056..5144a54a8262 100644
--- a/www/p5-Catalyst-Plugin-Browser/Makefile
+++ b/www/p5-Catalyst-Plugin-Browser/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Browser Detection for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-TraitFor-Request-BrowserDetect>=0:${PORTSDIR}/www/p5-Catalyst-TraitFor-Request-BrowserDetect
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Catalyst-TraitFor-Request-BrowserDetect>=0:www/p5-Catalyst-TraitFor-Request-BrowserDetect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-C3/Makefile b/www/p5-Catalyst-Plugin-C3/Makefile
index b0e3804e81ac..a8caecc651dd 100644
--- a/www/p5-Catalyst-Plugin-C3/Makefile
+++ b/www/p5-Catalyst-Plugin-C3/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst Plugin to subvert NEXT to use Class::C3
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7006:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-C3>=0.19:${PORTSDIR}/devel/p5-Class-C3
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7006:www/p5-Catalyst-Runtime \
+		p5-Class-C3>=0.19:devel/p5-Class-C3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
index d0d56841b4aa..28a0f85d364c 100644
--- a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Mmap cache for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-FastMmap>=0:${PORTSDIR}/devel/p5-Cache-FastMmap \
-		p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap \
+		p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
index d8d03b2b9e69..f474ea52d6e9 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Catalyst Plugin for Cache::Memcached::Fast
 
-BUILD_DEPENDS=	p5-Cache-Memcached-Fast>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Fast \
-		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
+		p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
index 3b5420522cd1..d15cd8dbdffb 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Distributed cache for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Cache/Makefile b/www/p5-Catalyst-Plugin-Cache/Makefile
index cab5b50cd48f..e5fe4ce23cad 100644
--- a/www/p5-Catalyst-Plugin-Cache/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Flexible caching support for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.8000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.8000:www/p5-Catalyst-Runtime \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure patch
diff --git a/www/p5-Catalyst-Plugin-Captcha/Makefile b/www/p5-Catalyst-Plugin-Captcha/Makefile
index 576d0069888e..70ba7fba7a41 100644
--- a/www/p5-Catalyst-Plugin-Captcha/Makefile
+++ b/www/p5-Catalyst-Plugin-Captcha/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create and validate Captcha for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-GD-SecurityImage>=0:${PORTSDIR}/security/p5-GD-SecurityImage
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+		p5-libwww>=0:www/p5-libwww \
+		p5-GD-SecurityImage>=0:security/p5-GD-SecurityImage
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader-Environment/Makefile b/www/p5-Catalyst-Plugin-ConfigLoader-Environment/Makefile
index 7f3d470b299e..18fda1d8b373 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader-Environment/Makefile
+++ b/www/p5-Catalyst-Plugin-ConfigLoader-Environment/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Configure your application with environment variables
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-JSON-Any>=0:converters/p5-JSON-Any \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
index ab274a5cc1f2..a9c78e41636a 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
+++ b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Load config files of various types
 LICENSE= ART10 GPLv1
 LICENSE_COMB= dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7008:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Data-Visitor>=0.24:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-Config-Any>=0.20:${PORTSDIR}/devel/p5-Config-Any \
-		p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7008:www/p5-Catalyst-Runtime \
+		p5-Data-Visitor>=0.24:devel/p5-Data-Visitor \
+		p5-Config-Any>=0.20:devel/p5-Config-Any \
+		p5-MRO-Compat>=0.09:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-CookiedSession/Makefile b/www/p5-Catalyst-Plugin-CookiedSession/Makefile
index 5050155f99b4..32ff83ad1dc9 100644
--- a/www/p5-Catalyst-Plugin-CookiedSession/Makefile
+++ b/www/p5-Catalyst-Plugin-CookiedSession/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Catalyst Plugin for storing sessions in a browser cookie
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-JSON-XS-VersionOneAndTwo>=0:${PORTSDIR}/converters/p5-JSON-XS-VersionOneAndTwo \
-		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+		p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+		p5-JSON-XS-VersionOneAndTwo>=0:converters/p5-JSON-XS-VersionOneAndTwo \
+		p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-DateTime/Makefile b/www/p5-Catalyst-Plugin-DateTime/Makefile
index 9fccb4f75a79..49eaeedddb8e 100644
--- a/www/p5-Catalyst-Plugin-DateTime/Makefile
+++ b/www/p5-Catalyst-Plugin-DateTime/Makefile
@@ -14,8 +14,8 @@ COMMENT=	DateTime support for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-DateTime>=0:devel/p5-DateTime
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5 tar:tgz
diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
index 255626066556..c2a5ee1ebb33 100644
--- a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
+++ b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Sensible default end action
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.2000:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.2000:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Email/Makefile b/www/p5-Catalyst-Plugin-Email/Makefile
index 44e385edab7a..6566eacb0fd4 100644
--- a/www/p5-Catalyst-Plugin-Email/Makefile
+++ b/www/p5-Catalyst-Plugin-Email/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Send emails with Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Email-MIME>=0:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Send>=0:${PORTSDIR}/mail/p5-Email-Send
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Email-MIME>=0:mail/p5-Email-MIME \
+		p5-Email-Send>=0:mail/p5-Email-Send
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile b/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
index aabae1491ef3..25133ed70659 100644
--- a/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
+++ b/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
@@ -14,30 +14,30 @@ COMMENT=	Catch application errors and emit them somewhere
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-File-Type>=0:${PORTSDIR}/devel/p5-File-Type \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-File-Type>=0:devel/p5-File-Type \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0.10010:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-Catalyst-Plugin-ConfigLoader>=0.22:${PORTSDIR}/www/p5-Catalyst-Plugin-ConfigLoader \
-		p5-Catalyst-Plugin-Session-State-Cookie>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-State-Cookie \
-		p5-Catalyst-Plugin-Session-Store-File>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-Store-File \
-		p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Plugin-StackTrace>=0.10:${PORTSDIR}/www/p5-Catalyst-Plugin-StackTrace \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-FindBin-libs>=0:${PORTSDIR}/devel/p5-FindBin-libs \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-NoTabs>=0:${PORTSDIR}/devel/p5-Test-NoTabs \
-		p5-Test-UseAllModules>=0:${PORTSDIR}/devel/p5-Test-UseAllModules \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0.10010:www/p5-Catalyst-Plugin-Authentication \
+		p5-Catalyst-Plugin-ConfigLoader>=0.22:www/p5-Catalyst-Plugin-ConfigLoader \
+		p5-Catalyst-Plugin-Session-State-Cookie>=0:www/p5-Catalyst-Plugin-Session-State-Cookie \
+		p5-Catalyst-Plugin-Session-Store-File>=0:www/p5-Catalyst-Plugin-Session-Store-File \
+		p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Plugin-StackTrace>=0.10:www/p5-Catalyst-Plugin-StackTrace \
+		p5-Config-General>=0:devel/p5-Config-General \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-FindBin-libs>=0:devel/p5-FindBin-libs \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-NoTabs>=0:devel/p5-Test-NoTabs \
+		p5-Test-UseAllModules>=0:devel/p5-Test-UseAllModules \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-FillInForm/Makefile b/www/p5-Catalyst-Plugin-FillInForm/Makefile
index 1e85c18574d3..7c29082c155a 100644
--- a/www/p5-Catalyst-Plugin-FillInForm/Makefile
+++ b/www/p5-Catalyst-Plugin-FillInForm/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Automatically fill in forms in Catalyst using HTML::FillInForms
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm \
-		p5-Catalyst-Action-RenderView>=0:${PORTSDIR}/www/p5-Catalyst-Action-RenderView
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
+		p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-FormBuilder/Makefile b/www/p5-Catalyst-Plugin-FormBuilder/Makefile
index 241961b7e28b..616d581d96f1 100644
--- a/www/p5-Catalyst-Plugin-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Plugin-FormBuilder/Makefile
@@ -14,8 +14,8 @@ COMMENT=	FormBuilder for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-CGI-FormBuilder>=3.02:${PORTSDIR}/www/p5-CGI-FormBuilder
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime \
+		p5-CGI-FormBuilder>=3.02:www/p5-CGI-FormBuilder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tar:tgz
diff --git a/www/p5-Catalyst-Plugin-FormValidator/Makefile b/www/p5-Catalyst-Plugin-FormValidator/Makefile
index befa00fb6d67..70fc5534ae8e 100644
--- a/www/p5-Catalyst-Plugin-FormValidator/Makefile
+++ b/www/p5-Catalyst-Plugin-FormValidator/Makefile
@@ -14,10 +14,10 @@ COMMENT=	FormValidator for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80001:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Data-FormValidator>=0:${PORTSDIR}/textproc/p5-Data-FormValidator \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80001:www/p5-Catalyst-Runtime \
+		p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Moose>=0.93:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-I18N/Makefile b/www/p5-Catalyst-Plugin-I18N/Makefile
index d962b4d019d7..251e93d66c7c 100644
--- a/www/p5-Catalyst-Plugin-I18N/Makefile
+++ b/www/p5-Catalyst-Plugin-I18N/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	I18N for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-Locale-Maketext-Simple>=0.19:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
-		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Locale-Maketext-Lexicon>=0:devel/p5-Locale-Maketext-Lexicon \
+		p5-Locale-Maketext-Simple>=0.19:devel/p5-Locale-Maketext-Simple \
+		p5-MRO-Compat>=0.10:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile b/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile
index aebfb2cf4c8d..c2481f107794 100644
--- a/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile
+++ b/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	oleg@mamontov.net
 COMMENT=	Log module of Catalyst that uses Log::Dispatch
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=2.13:${PORTSDIR}/devel/p5-Log-Dispatch		\
-		p5-Log-Dispatch-Config>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Config	\
-		p5-Catalyst-Runtime>=5.65:${PORTSDIR}/www/p5-Catalyst-Runtime	\
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Log-Dispatch>=2.13:devel/p5-Log-Dispatch		\
+		p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config	\
+		p5-Catalyst-Runtime>=5.65:www/p5-Catalyst-Runtime	\
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Log-Handler/Makefile b/www/p5-Catalyst-Plugin-Log-Handler/Makefile
index 792f637db45d..0cdba3a1e404 100644
--- a/www/p5-Catalyst-Plugin-Log-Handler/Makefile
+++ b/www/p5-Catalyst-Plugin-Log-Handler/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst log handler
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Log-Handler>=0:${PORTSDIR}/devel/p5-Log-Handler \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Log-Handler>=0:devel/p5-Log-Handler \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-LogWarnings/Makefile b/www/p5-Catalyst-Plugin-LogWarnings/Makefile
index bc2b00efe997..1d742ef1265f 100644
--- a/www/p5-Catalyst-Plugin-LogWarnings/Makefile
+++ b/www/p5-Catalyst-Plugin-LogWarnings/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log perl warnings to your Catalyst log object
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7001:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7001:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-MRO-Compat>=0.11:${PORTSDIR}/devel/p5-MRO-Compat
+		p5-MRO-Compat>=0.11:devel/p5-MRO-Compat
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-PageCache/Makefile b/www/p5-Catalyst-Plugin-PageCache/Makefile
index c6916d590a44..bee259f07604 100644
--- a/www/p5-Catalyst-Plugin-PageCache/Makefile
+++ b/www/p5-Catalyst-Plugin-PageCache/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Cache the output of entire pages
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Catalyst-Plugin-Cache>=0.08:${PORTSDIR}/www/p5-Catalyst-Plugin-Cache
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
+		p5-Catalyst-Plugin-Cache>=0.08:www/p5-Catalyst-Plugin-Cache
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
+TEST_DEPENDS=	p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Params-Nested/Makefile b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
index a3c35533eec3..7d222d227260 100644
--- a/www/p5-Catalyst-Plugin-Params-Nested/Makefile
+++ b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Nested params (ala Ruby on Rails or PHP-style param arrays)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Expand>=1.06:${PORTSDIR}/www/p5-CGI-Expand \
-		p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-CGI-Expand>=1.06:www/p5-CGI-Expand \
+		p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Pluggable/Makefile b/www/p5-Catalyst-Plugin-Pluggable/Makefile
index 71d67c8e2cc7..75f8fd686c6c 100644
--- a/www/p5-Catalyst-Plugin-Pluggable/Makefile
+++ b/www/p5-Catalyst-Plugin-Pluggable/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Plugin for pluggable Catalyst applications
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Prototype/Makefile b/www/p5-Catalyst-Plugin-Prototype/Makefile
index 0b435eda1bc9..694c813727a0 100644
--- a/www/p5-Catalyst-Plugin-Prototype/Makefile
+++ b/www/p5-Catalyst-Plugin-Prototype/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst plugin for Prototype
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7006:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-HTML-Prototype>=1.48:${PORTSDIR}/www/p5-HTML-Prototype
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7006:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-HTML-Prototype>=1.48:www/p5-HTML-Prototype
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile b/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile
index 7571449ed30e..288599ce05a3 100644
--- a/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile
+++ b/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Run code after the response has been sent
 
-BUILD_DEPENDS=	p5-Catalyst-Component-InstancePerContext>=0:${PORTSDIR}/www/p5-Catalyst-Component-InstancePerContext \
-		p5-Catalyst-Runtime>=5.80004:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Component-InstancePerContext>=0:www/p5-Catalyst-Component-InstancePerContext \
+		p5-Catalyst-Runtime>=5.80004:www/p5-Catalyst-Runtime \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS+=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS+=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Find>=0:devel/p5-Module-Find \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Scheduler/Makefile b/www/p5-Catalyst-Plugin-Scheduler/Makefile
index d3f6f1082993..86541e5342eb 100644
--- a/www/p5-Catalyst-Plugin-Scheduler/Makefile
+++ b/www/p5-Catalyst-Plugin-Scheduler/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Schedule events to run in a cron-like manner
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-DateTime-Event-Cron>=0:${PORTSDIR}/devel/p5-DateTime-Event-Cron \
-		p5-Set-Scalar>=0:${PORTSDIR}/devel/p5-Set-Scalar \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-DateTime-Event-Cron>=0:devel/p5-DateTime-Event-Cron \
+		p5-Set-Scalar>=0:devel/p5-Set-Scalar \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Server/Makefile b/www/p5-Catalyst-Plugin-Server/Makefile
index 911ca9bee7db..c9da7418b097 100644
--- a/www/p5-Catalyst-Plugin-Server/Makefile
+++ b/www/p5-Catalyst-Plugin-Server/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Catalyst Server Plugin: Base & XMLRPC
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.90:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-DispatchType-Regex>=5.90000:${PORTSDIR}/www/p5-Catalyst-DispatchType-Regex \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Clone-Fast>=0:${PORTSDIR}/devel/p5-Clone-Fast \
-		p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.90:www/p5-Catalyst-Runtime \
+		p5-Catalyst-DispatchType-Regex>=5.90000:www/p5-Catalyst-DispatchType-Regex \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Clone-Fast>=0:devel/p5-Clone-Fast \
+		p5-RPC-XML>=0:net/p5-RPC-XML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
index c1e1b7385ece..7ec4a8b63d15 100644
--- a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	FastMmap sessions for Catalyst
 
-BUILD_DEPENDS=	p5-Cache-FastMmap>0:${PORTSDIR}/devel/p5-Cache-FastMmap \
-		p5-Catalyst-Runtime>2.99:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-URI-Find>0:${PORTSDIR}/textproc/p5-URI-Find \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Cache-FastMmap>0:devel/p5-Cache-FastMmap \
+		p5-Catalyst-Runtime>2.99:www/p5-Catalyst-Runtime \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+		p5-MRO-Compat>0:devel/p5-MRO-Compat \
+		p5-URI-Find>0:textproc/p5-URI-Find \
+		p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Session-PerUser/Makefile b/www/p5-Catalyst-Plugin-Session-PerUser/Makefile
index 4c7f2867000f..3935e4c9af41 100644
--- a/www/p5-Catalyst-Plugin-Session-PerUser/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-PerUser/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Per user sessions (instead of per browser sessions)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-Catalyst-Plugin-Session>=0.06:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Object-Signature>=0:${PORTSDIR}/devel/p5-Object-Signature \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication \
+		p5-Catalyst-Plugin-Session>=0.06:www/p5-Catalyst-Plugin-Session \
+		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Object-Signature>=0:devel/p5-Object-Signature \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
index 11603990bc17..c20333e3dff6 100644
--- a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Stores a Catalyst Session in a Cookie
 
 RUN_DEPENDS=	\
-	p5-Catalyst-Runtime>=5.80005:${PORTSDIR}/www/p5-Catalyst-Runtime \
-	p5-Catalyst-Plugin-Session>=0.27:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-	p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-namespace-autoclean>0:${PORTSDIR}/devel/p5-namespace-autoclean
+	p5-Catalyst-Runtime>=5.80005:www/p5-Catalyst-Runtime \
+	p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
+	p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+	p5-Moose>0:devel/p5-Moose \
+	p5-namespace-autoclean>0:devel/p5-namespace-autoclean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
index a5f82658629c..78ca3c2ec5c4 100644
--- a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
@@ -11,18 +11,18 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Saves Catalyst Session IDs by rewriting URIs
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.27:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-HTML-TokeParser-Simple>=0:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
-		p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Emulate-Class-Accessor-Fast>=0:${PORTSDIR}/devel/p5-MooseX-Emulate-Class-Accessor-Fast \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \
+		p5-MIME-Types>=0:mail/p5-MIME-Types \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Emulate-Class-Accessor-Fast>=0:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
+		p5-URI>=0:net/p5-URI \
+		p5-URI-Find>=0:textproc/p5-URI-Find \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=1.01:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=1.01:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
index 45a3b7536cf2..04b61159a254 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store sessions using a Catalyst::Plugin::Cache
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.06:${PORTSDIR}/www/p5-Catalyst-Plugin-Session
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.06:www/p5-Catalyst-Plugin-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
index d03b4a1882cc..1249c4428ef3 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store your sessions in a database
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Runtime>=5.49:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Runtime>=5.49:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
index 2ab49cc468ea..55734f98ff18 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Store your sessions via DBIx::Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Plugin-Session-Store-Delegate>=0.05:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-Store-Delegate \
-		p5-DBIx-Class>=0.0700:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Plugin-Session-Store-Delegate>=0.05:www/p5-Catalyst-Plugin-Session-Store-Delegate \
+		p5-DBIx-Class>=0.0700:databases/p5-DBIx-Class \
+		p5-MRO-Compat>0:devel/p5-MRO-Compat \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
index ea29d225087e..c2b00c9d8a02 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Delegate session storage to an application model object
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.27:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
+		p5-MRO-Compat>0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
index 1d18a688446a..728246de8adf 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	FastMmap session storage backend
 
-BUILD_DEPENDS=	p5-Cache-FastMmap>=1.29:${PORTSDIR}/devel/p5-Cache-FastMmap \
-		p5-Catalyst-Plugin-Session>=0.27:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Runtime>=5.80000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-MooseX-Emulate-Class-Accessor-Fast>=0:${PORTSDIR}/devel/p5-MooseX-Emulate-Class-Accessor-Fast \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Cache-FastMmap>=1.29:devel/p5-Cache-FastMmap \
+		p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-MooseX-Emulate-Class-Accessor-Fast>=0:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
+		p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
index 93c6870f651a..09fd291b7354 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
@@ -14,11 +14,11 @@ COMMENT=	File storage backend for session data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Cache-Cache>=1.02:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Catalyst-Plugin-Session>=0.27:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Class-Data-Inheritable>=0.04:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Cache-Cache>=1.02:devel/p5-Cache-Cache \
+		p5-Catalyst-Plugin-Session>=0.27:www/p5-Catalyst-Plugin-Session \
+		p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
+		p5-Class-Data-Inheritable>=0.04:devel/p5-Class-Data-Inheritable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile
index eb01d6d6f75c..8e5c0bfee8ea 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Memcached storage backend for session data
 
-BUILD_DEPENDS=	p5-Cache-Memcached-Fast>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Fast \
-		p5-Catalyst-Plugin-Session>=0.01:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
+		p5-Catalyst-Plugin-Session>=0.01:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
index bff9948b467b..9feec630f706 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Memcached storage backend for session data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-Memcached-Managed>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Managed \
-		p5-Catalyst-Plugin-Session>=0.26:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Emulate-Class-Accessor-Fast>=0:${PORTSDIR}/devel/p5-MooseX-Emulate-Class-Accessor-Fast \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Cache-Memcached-Managed>=0:databases/p5-Cache-Memcached-Managed \
+		p5-Catalyst-Plugin-Session>=0.26:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Emulate-Class-Accessor-Fast>=0:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Session/Makefile b/www/p5-Catalyst-Plugin-Session/Makefile
index 3a26c1fa22bb..e81a4efe5ba3 100644
--- a/www/p5-Catalyst-Plugin-Session/Makefile
+++ b/www/p5-Catalyst-Plugin-Session/Makefile
@@ -14,16 +14,16 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 # Do not add p5-Catalyst-Plugin-Session-State-Cookie to TEST_DEPENDS to avoid cyclic dependency
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.71001:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Moose>=0.76:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Emulate-Class-Accessor-Fast>=0.00801:${PORTSDIR}/devel/p5-MooseX-Emulate-Class-Accessor-Fast \
-		p5-Object-Signature>=0:${PORTSDIR}/devel/p5-Object-Signature \
-		p5-namespace-clean>=0.10:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Moose>=0.76:devel/p5-Moose \
+		p5-MooseX-Emulate-Class-Accessor-Fast>=0.00801:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
+		p5-Object-Signature>=0:devel/p5-Object-Signature \
+		p5-namespace-clean>=0.10:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-WWW-Mechanize-PSGI>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-PSGI
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-WWW-Mechanize-PSGI>=0:devel/p5-Test-WWW-Mechanize-PSGI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-Plugin-Setenv/Makefile b/www/p5-Catalyst-Plugin-Setenv/Makefile
index 3fc30e975137..72b8898146eb 100644
--- a/www/p5-Catalyst-Plugin-Setenv/Makefile
+++ b/www/p5-Catalyst-Plugin-Setenv/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Set up the environment from Catalyst's config file
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Singleton/Makefile b/www/p5-Catalyst-Plugin-Singleton/Makefile
index 912d82699d6a..513b4d536d27 100644
--- a/www/p5-Catalyst-Plugin-Singleton/Makefile
+++ b/www/p5-Catalyst-Plugin-Singleton/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Singleton accessors to context
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-SmartURI/Makefile b/www/p5-Catalyst-Plugin-SmartURI/Makefile
index 5aafbe9d81a0..26ebea07b5e7 100644
--- a/www/p5-Catalyst-Plugin-SmartURI/Makefile
+++ b/www/p5-Catalyst-Plugin-SmartURI/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Configurable URIs for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime	\
-		p5-Class-C3-Componentised>=0:${PORTSDIR}/devel/p5-Class-C3-Componentised	\
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load		\
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose 				\
-		p5-URI-SmartURI>=0:${PORTSDIR}/net/p5-URI-SmartURI
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime	\
+		p5-Class-C3-Componentised>=0:devel/p5-Class-C3-Componentised	\
+		p5-Class-Load>=0:devel/p5-Class-Load		\
+		p5-Moose>=0:devel/p5-Moose 				\
+		p5-URI-SmartURI>=0:net/p5-URI-SmartURI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Catalyst-Plugin-StackTrace/Makefile b/www/p5-Catalyst-Plugin-StackTrace/Makefile
index 8b72ca442a5e..c146513e73cb 100644
--- a/www/p5-Catalyst-Plugin-StackTrace/Makefile
+++ b/www/p5-Catalyst-Plugin-StackTrace/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Display a stack trace on the debug screen
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
+		p5-MRO-Compat>=0.10:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Static-Simple/Makefile b/www/p5-Catalyst-Plugin-Static-Simple/Makefile
index 1cbbdcfb37b9..5f515300e81e 100644
--- a/www/p5-Catalyst-Plugin-Static-Simple/Makefile
+++ b/www/p5-Catalyst-Plugin-Static-Simple/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Make serving static pages painless
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80008:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-MIME-Types>=2.03:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80008:www/p5-Catalyst-Runtime \
+		p5-MIME-Types>=2.03:mail/p5-MIME-Types \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Static/Makefile b/www/p5-Catalyst-Plugin-Static/Makefile
index 86f8914ae8d3..a23baed932a3 100644
--- a/www/p5-Catalyst-Plugin-Static/Makefile
+++ b/www/p5-Catalyst-Plugin-Static/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Serve static files with Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=2.99:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-File-MimeInfo>=0.11:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=2.99:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-File-MimeInfo>=0.11:devel/p5-File-MimeInfo \
+		p5-File-Slurp>0:devel/p5-File-Slurp \
+		p5-MRO-Compat>0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-StatusMessage/Makefile b/www/p5-Catalyst-Plugin-StatusMessage/Makefile
index 95c002bfe660..0449db74ab31 100644
--- a/www/p5-Catalyst-Plugin-StatusMessage/Makefile
+++ b/www/p5-Catalyst-Plugin-StatusMessage/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fw@moov.de
 COMMENT=	Handle passing of status (success and error) messages
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-SubRequest/Makefile b/www/p5-Catalyst-Plugin-SubRequest/Makefile
index 45f21f8d0a54..89150c42b584 100644
--- a/www/p5-Catalyst-Plugin-SubRequest/Makefile
+++ b/www/p5-Catalyst-Plugin-SubRequest/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Make subrequests to actions in Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.90000:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.90000:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Textile/Makefile b/www/p5-Catalyst-Plugin-Textile/Makefile
index bc8b45227608..b0d2481afa61 100644
--- a/www/p5-Catalyst-Plugin-Textile/Makefile
+++ b/www/p5-Catalyst-Plugin-Textile/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Textile for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Text-Textile>=0:${PORTSDIR}/textproc/p5-Text-Textile
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Text-Textile>=0:textproc/p5-Text-Textile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Plugin-Unicode/Makefile b/www/p5-Catalyst-Plugin-Unicode/Makefile
index eb8bb42d41ab..ba3cf385769b 100644
--- a/www/p5-Catalyst-Plugin-Unicode/Makefile
+++ b/www/p5-Catalyst-Plugin-Unicode/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Unicode aware Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-MRO-Compat>=0.10:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure
@@ -26,7 +26,7 @@ post-extract:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Plugin-XMLRPC/Makefile b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
index 37c9da56080c..d4bd44620128 100644
--- a/www/p5-Catalyst-Plugin-XMLRPC/Makefile
+++ b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Dispatch XMLRPC methods with Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-RPC-XML>=0:net/p5-RPC-XML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile
index 5849fa95022a..176caf6e0f47 100644
--- a/www/p5-Catalyst-Runtime/Makefile
+++ b/www/p5-Catalyst-Runtime/Makefile
@@ -17,55 +17,55 @@ LICENSE_COMB=	dual
 # - devel/p5-Test-WWW-Mechanize-Catalyst
 # - www/p5-Catalyst-Engine-PSGI
 # - www/p5-CatalystX-LeakChecker
-BUILD_DEPENDS=	p5-CGI-Simple>=1.109:${PORTSDIR}/www/p5-CGI-Simple \
-		p5-CGI-Struct>=0:${PORTSDIR}/www/p5-CGI-Struct \
-		p5-Class-C3-Adopt-NEXT>=0.07:${PORTSDIR}/devel/p5-Class-C3-Adopt-NEXT \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Load>=0.12:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Body>=1.22:${PORTSDIR}/www/p5-HTTP-Body \
-		p5-HTTP-Message>=5.814:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-HTTP-Request-AsCGI>=1.0:${PORTSDIR}/www/p5-HTTP-Request-AsCGI \
-		p5-Hash-MultiValue>=0:${PORTSDIR}/devel/p5-Hash-MultiValue \
-		p5-JSON-MaybeXS>=1:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Module-Pluggable>=4.7:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Emulate-Class-Accessor-Fast>=0.00903:${PORTSDIR}/devel/p5-MooseX-Emulate-Class-Accessor-Fast \
-		p5-MooseX-Getopt>=0.48:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-MethodAttributes>=0.24:${PORTSDIR}/devel/p5-MooseX-MethodAttributes \
-		p5-MooseX-Role-WithOverloading>=0.09:${PORTSDIR}/devel/p5-MooseX-Role-WithOverloading \
-		p5-Path-Class>=0.09:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Plack>=0.9991:${PORTSDIR}/www/p5-Plack \
-		p5-Plack-Middleware-FixMissingBodyInRedirect>=0.09:${PORTSDIR}/www/p5-Plack-Middleware-FixMissingBodyInRedirect \
-		p5-Plack-Middleware-MethodOverride>=0.12:${PORTSDIR}/www/p5-Plack-Middleware-MethodOverride \
-		p5-Plack-Middleware-RemoveRedundantBody>=0.03:${PORTSDIR}/www/p5-Plack-Middleware-RemoveRedundantBody \
-		p5-Plack-Middleware-ReverseProxy>=0.04:${PORTSDIR}/www/p5-Plack-Middleware-ReverseProxy \
-		p5-Plack-Test-ExternalServer>=0:${PORTSDIR}/www/p5-Plack-Test-ExternalServer \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Stream-Buffered>=0:${PORTSDIR}/devel/p5-Stream-Buffered \
-		p5-String-RewritePrefix>=0.004:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Text-SimpleTable>=0.03:${PORTSDIR}/textproc/p5-Text-SimpleTable \
-		p5-Tree-Simple>=1.15:${PORTSDIR}/devel/p5-Tree-Simple \
-		p5-Tree-Simple-VisitorFactory>=0:${PORTSDIR}/devel/p5-Tree-Simple-VisitorFactory \
-		p5-Try-Tiny>=0.17:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI>=1.65:${PORTSDIR}/net/p5-URI \
-		p5-URI-ws>=0.03:${PORTSDIR}/net/p5-URI-ws \
-		p5-libwww>=5.837:${PORTSDIR}/www/p5-libwww \
-		p5-namespace-autoclean>=0.28:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0.23:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-CGI-Simple>=1.109:www/p5-CGI-Simple \
+		p5-CGI-Struct>=0:www/p5-CGI-Struct \
+		p5-Class-C3-Adopt-NEXT>=0.07:devel/p5-Class-C3-Adopt-NEXT \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Load>=0.12:devel/p5-Class-Load \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Data-OptList>=0:devel/p5-Data-OptList \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTTP-Body>=1.22:www/p5-HTTP-Body \
+		p5-HTTP-Message>=5.814:www/p5-HTTP-Message \
+		p5-HTTP-Request-AsCGI>=1.0:www/p5-HTTP-Request-AsCGI \
+		p5-Hash-MultiValue>=0:devel/p5-Hash-MultiValue \
+		p5-JSON-MaybeXS>=1:converters/p5-JSON-MaybeXS \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Module-Pluggable>=4.7:devel/p5-Module-Pluggable \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Emulate-Class-Accessor-Fast>=0.00903:devel/p5-MooseX-Emulate-Class-Accessor-Fast \
+		p5-MooseX-Getopt>=0.48:devel/p5-MooseX-Getopt \
+		p5-MooseX-MethodAttributes>=0.24:devel/p5-MooseX-MethodAttributes \
+		p5-MooseX-Role-WithOverloading>=0.09:devel/p5-MooseX-Role-WithOverloading \
+		p5-Path-Class>=0.09:devel/p5-Path-Class \
+		p5-Plack>=0.9991:www/p5-Plack \
+		p5-Plack-Middleware-FixMissingBodyInRedirect>=0.09:www/p5-Plack-Middleware-FixMissingBodyInRedirect \
+		p5-Plack-Middleware-MethodOverride>=0.12:www/p5-Plack-Middleware-MethodOverride \
+		p5-Plack-Middleware-RemoveRedundantBody>=0.03:www/p5-Plack-Middleware-RemoveRedundantBody \
+		p5-Plack-Middleware-ReverseProxy>=0.04:www/p5-Plack-Middleware-ReverseProxy \
+		p5-Plack-Test-ExternalServer>=0:www/p5-Plack-Test-ExternalServer \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Stream-Buffered>=0:devel/p5-Stream-Buffered \
+		p5-String-RewritePrefix>=0.004:textproc/p5-String-RewritePrefix \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Text-SimpleTable>=0.03:textproc/p5-Text-SimpleTable \
+		p5-Tree-Simple>=1.15:devel/p5-Tree-Simple \
+		p5-Tree-Simple-VisitorFactory>=0:devel/p5-Tree-Simple-VisitorFactory \
+		p5-Try-Tiny>=0.17:lang/p5-Try-Tiny \
+		p5-URI>=1.65:net/p5-URI \
+		p5-URI-ws>=0.03:net/p5-URI-ws \
+		p5-libwww>=5.837:www/p5-libwww \
+		p5-namespace-autoclean>=0.28:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0.23:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Term-Size-Any>=0:${PORTSDIR}/devel/p5-Term-Size-Any \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module \
-		p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Term-Size-Any>=0:devel/p5-Term-Size-Any \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module \
+		p5-Type-Tiny>=0:devel/p5-Type-Tiny \
+		p5-YAML>=0:textproc/p5-YAML
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
diff --git a/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile b/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile
index 233947d528ff..430b319c2777 100644
--- a/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile
+++ b/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	Alex.Bakhtin@gmail.com
 COMMENT=	Helps you paginate, search, sort, and more easily using DBIx::Class
 
-BUILD_DEPENDS=	p5-Catalyst-Model-DBIC-Schema>=0.29:${PORTSDIR}/www/p5-Catalyst-Model-DBIC-Schema \
-		p5-Catalyst-Runtime>=5.80000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-DBIx-Class>=0.08108:${PORTSDIR}/databases/p5-DBIx-Class
+BUILD_DEPENDS=	p5-Catalyst-Model-DBIC-Schema>=0.29:www/p5-Catalyst-Model-DBIC-Schema \
+		p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
+		p5-DBIx-Class>=0.08108:databases/p5-DBIx-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Catalyst-View-JSON>=0:${PORTSDIR}/www/p5-Catalyst-View-JSON \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Catalyst-View-JSON>=0:www/p5-Catalyst-View-JSON \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator \
+		p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
index 574446540c13..2ff7ece7dc0f 100644
--- a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
+++ b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Browser detection for Catalyst::Requests
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-CatalystX-RoleApplicator>=0:${PORTSDIR}/www/p5-CatalystX-RoleApplicator \
-		p5-HTTP-BrowserDetect>=0:${PORTSDIR}/www/p5-HTTP-BrowserDetect
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-CatalystX-RoleApplicator>=0:www/p5-CatalystX-RoleApplicator \
+		p5-HTTP-BrowserDetect>=0:www/p5-HTTP-BrowserDetect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-ClearSilver/Makefile b/www/p5-Catalyst-View-ClearSilver/Makefile
index 752e9564dbc0..27233c24b6a2 100644
--- a/www/p5-Catalyst-View-ClearSilver/Makefile
+++ b/www/p5-Catalyst-View-ClearSilver/Makefile
@@ -15,13 +15,13 @@ COMMENT=	ClearSilver view class for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ClearSilver>=0:${PORTSDIR}/www/p5-ClearSilver \
-		p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Data-Structure-Util>=0:${PORTSDIR}/devel/p5-Data-Structure-Util \
-		p5-Class-C3>=0:${PORTSDIR}/devel/p5-Class-C3 \
-		p5-Catalyst-View-Templated>=0:${PORTSDIR}/www/p5-Catalyst-View-Templated
+BUILD_DEPENDS=	p5-ClearSilver>=0:www/p5-ClearSilver \
+		p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util \
+		p5-Class-C3>=0:devel/p5-Class-C3 \
+		p5-Catalyst-View-Templated>=0:www/p5-Catalyst-View-Templated
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Catalyst-View-Template-Declare>=0:${PORTSDIR}/www/p5-Catalyst-View-Template-Declare
+TEST_DEPENDS=	p5-Catalyst-View-Template-Declare>=0:www/p5-Catalyst-View-Template-Declare
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-View-Email/Makefile b/www/p5-Catalyst-View-Email/Makefile
index bdad7056acbb..7ae521d05762 100644
--- a/www/p5-Catalyst-View-Email/Makefile
+++ b/www/p5-Catalyst-View-Email/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Catalyst View for Email
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Authen-SASL>=2.13:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Catalyst-Runtime>=5.70000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Email-MIME>=1.859:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Sender>=0.100110:${PORTSDIR}/mail/p5-Email-Sender \
-		p5-Module-Runtime>=0.014:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Authen-SASL>=2.13:security/p5-Authen-SASL \
+		p5-Catalyst-Runtime>=5.70000:www/p5-Catalyst-Runtime \
+		p5-Email-MIME>=1.859:mail/p5-Email-MIME \
+		p5-Email-Sender>=0.100110:mail/p5-Email-Sender \
+		p5-Module-Runtime>=0.014:devel/p5-Module-Runtime \
+		p5-Moose>=0.93:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Catalyst-View-Mason>=0.18:${PORTSDIR}/www/p5-Catalyst-View-Mason \
-		p5-Catalyst-View-TT>=0.31:${PORTSDIR}/www/p5-Catalyst-View-TT \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Catalyst-View-Mason>=0.18:www/p5-Catalyst-View-Mason \
+		p5-Catalyst-View-TT>=0.31:www/p5-Catalyst-View-TT \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-Catalyst-View-GraphViz/Makefile b/www/p5-Catalyst-View-GraphViz/Makefile
index 81e8370d31fc..6ea2237eebd6 100644
--- a/www/p5-Catalyst-View-GraphViz/Makefile
+++ b/www/p5-Catalyst-View-GraphViz/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst::View::GraphViz - GraphViz View Class
 
-BUILD_DEPENDS=	p5-Catalyst-Plugin-SubRequest>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-SubRequest \
-		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
+BUILD_DEPENDS=	p5-Catalyst-Plugin-SubRequest>=0:www/p5-Catalyst-Plugin-SubRequest \
+		p5-GraphViz>=0:graphics/p5-GraphViz
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
index 65bfd7fb7362..ff4683c191c3 100644
--- a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTML::Template::Compiled View Class
 
-BUILD_DEPENDS=	p5-HTML-Template-Compiled>=0.74:${PORTSDIR}/www/p5-HTML-Template-Compiled \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel
+BUILD_DEPENDS=	p5-HTML-Template-Compiled>=0.74:www/p5-HTML-Template-Compiled \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-HTML-Template/Makefile b/www/p5-Catalyst-View-HTML-Template/Makefile
index bb8da201d890..2209d0e18549 100644
--- a/www/p5-Catalyst-View-HTML-Template/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kiki@bsdro.org
 COMMENT=	HTML::Template view class for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-HTML-Template>0:${PORTSDIR}/www/p5-HTML-Template
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
+		p5-HTML-Template>0:www/p5-HTML-Template
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-JSON/Makefile b/www/p5-Catalyst-View-JSON/Makefile
index 293c969974a8..4168ff903d3d 100644
--- a/www/p5-Catalyst-View-JSON/Makefile
+++ b/www/p5-Catalyst-View-JSON/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Catalyst View handler that returns stash data in JSON format
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.6000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-JSON-Any>=1.15:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.6000:www/p5-Catalyst-Runtime \
+		p5-JSON-Any>=1.15:converters/p5-JSON-Any \
+		p5-MRO-Compat>0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-Jemplate/Makefile b/www/p5-Catalyst-View-Jemplate/Makefile
index 45e88951eb4a..8cf6a5e4575e 100644
--- a/www/p5-Catalyst-View-Jemplate/Makefile
+++ b/www/p5-Catalyst-View-Jemplate/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Jemplate files server
 
-RUN_DEPENDS=	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Catalyst-Runtime>=5.50:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Jemplate>=0.19:${PORTSDIR}/www/p5-Jemplate
+RUN_DEPENDS=	p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+		p5-Catalyst-Runtime>=5.50:www/p5-Catalyst-Runtime \
+		p5-Jemplate>=0.19:www/p5-Jemplate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-Mason/Makefile b/www/p5-Catalyst-View-Mason/Makefile
index 8d63c9bf9174..092140c240d3 100644
--- a/www/p5-Catalyst-View-Mason/Makefile
+++ b/www/p5-Catalyst-View-Mason/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Mason view class for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.5000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.5000:www/p5-Catalyst-Runtime \
+		p5-HTML-Mason>=0:www/p5-HTML-Mason \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Catalyst-Devel>=0:${PORTSDIR}/www/p5-Catalyst-Devel
+TEST_DEPENDS=	p5-Catalyst-Devel>=0:www/p5-Catalyst-Devel
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-View-REST-XML/Makefile b/www/p5-Catalyst-View-REST-XML/Makefile
index 42a41d34d0b8..79f496950353 100644
--- a/www/p5-Catalyst-View-REST-XML/Makefile
+++ b/www/p5-Catalyst-View-REST-XML/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Catalyst XML View Class
 
 RUN_DEPENDS=	\
-	p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-	p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+	p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
+	p5-XML-Simple>0:textproc/p5-XML-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-RRDGraph/Makefile b/www/p5-Catalyst-View-RRDGraph/Makefile
index f8bd3beae899..6c79b923a93e 100644
--- a/www/p5-Catalyst-View-RRDGraph/Makefile
+++ b/www/p5-Catalyst-View-RRDGraph/Makefile
@@ -13,12 +13,12 @@ COMMENT=	RRD graph view class for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Plugin-Static-Simple>=0.17:${PORTSDIR}/www/p5-Catalyst-Plugin-Static-Simple \
-		rrdtool>=0:${PORTSDIR}/databases/rrdtool \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Plugin-Static-Simple>=0.17:www/p5-Catalyst-Plugin-Static-Simple \
+		rrdtool>=0:databases/rrdtool \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=1.07:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=1.07:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
index 57b75f5f51a4..712544f29ffd 100644
--- a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
+++ b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Catalyst TT View with template names relative to the Controller
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-Catalyst-View-TT>=0:${PORTSDIR}/www/p5-Catalyst-View-TT
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
+		p5-Catalyst-View-TT>=0:www/p5-Catalyst-View-TT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-TT/Makefile b/www/p5-Catalyst-View-TT/Makefile
index a67757c2fcd9..5cf211e24c5d 100644
--- a/www/p5-Catalyst-View-TT/Makefile
+++ b/www/p5-Catalyst-View-TT/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Template Toolkit view class for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Template-Timer>=0:${PORTSDIR}/www/p5-Template-Timer \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Template-Timer>=0:www/p5-Template-Timer \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Catalyst-View-Template-Declare/Makefile b/www/p5-Catalyst-View-Template-Declare/Makefile
index 5da780385095..1f49a4c2e2ec 100644
--- a/www/p5-Catalyst-View-Template-Declare/Makefile
+++ b/www/p5-Catalyst-View-Template-Declare/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to use Template::Declare with Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-View-Templated>=0:${PORTSDIR}/www/p5-Catalyst-View-Templated \
-		p5-Class-C3>=0:${PORTSDIR}/devel/p5-Class-C3 \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Template-Declare>=0.26:${PORTSDIR}/textproc/p5-Template-Declare
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-View-Templated>=0:www/p5-Catalyst-View-Templated \
+		p5-Class-C3>=0:devel/p5-Class-C3 \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Template-Declare>=0.26:textproc/p5-Template-Declare
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-Templated/Makefile b/www/p5-Catalyst-View-Templated/Makefile
index 9fe0c57b5747..d343e02ec0da 100644
--- a/www/p5-Catalyst-View-Templated/Makefile
+++ b/www/p5-Catalyst-View-Templated/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generic base class for template-based views
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-Component-ACCEPT_CONTEXT>=0:${PORTSDIR}/www/p5-Catalyst-Component-ACCEPT_CONTEXT \
-		p5-Class-C3>=0:${PORTSDIR}/devel/p5-Class-C3
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-Catalyst-Component-ACCEPT_CONTEXT>=0:www/p5-Catalyst-Component-ACCEPT_CONTEXT \
+		p5-Class-C3>=0:devel/p5-Class-C3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure
@@ -25,7 +25,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-View-XML-Feed/Makefile b/www/p5-Catalyst-View-XML-Feed/Makefile
index eb2a3da225c3..b59946129d9f 100644
--- a/www/p5-Catalyst-View-XML-Feed/Makefile
+++ b/www/p5-Catalyst-View-XML-Feed/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perl extension for Catalyst view for RSS, Atom, or other XML feeds
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-XML-Feed>=0:${PORTSDIR}/textproc/p5-XML-Feed \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
+		p5-XML-Feed>=0:textproc/p5-XML-Feed \
+		p5-TimeDate>=0:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Catalyst-View-XML-Simple/Makefile b/www/p5-Catalyst-View-XML-Simple/Makefile
index f30ea4b06722..13257193d8a7 100644
--- a/www/p5-Catalyst-View-XML-Simple/Makefile
+++ b/www/p5-Catalyst-View-XML-Simple/Makefile
@@ -11,14 +11,14 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Catalyst XML View Class
 
 RUN_DEPENDS=	\
-	p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-	p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+	p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
+	p5-XML-Simple>0:textproc/p5-XML-Simple
 BUILD_DEPENDS=	\
-	p5-File-Remove>0:${PORTSDIR}/devel/p5-File-Remove \
-	p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install \
-	p5-Module-Install-TestBase>0:${PORTSDIR}/devel/p5-Module-Install-TestBase \
-	p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-	p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+	p5-File-Remove>0:devel/p5-File-Remove \
+	p5-Module-Install>0:devel/p5-Module-Install \
+	p5-Module-Install-TestBase>0:devel/p5-Module-Install-TestBase \
+	p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
+	p5-XML-Simple>0:textproc/p5-XML-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Catalyst-View-XSLT/Makefile b/www/p5-Catalyst-View-XSLT/Makefile
index cbae5ea94839..aaa7d7ce4d23 100644
--- a/www/p5-Catalyst-View-XSLT/Makefile
+++ b/www/p5-Catalyst-View-XSLT/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XSLT view class for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-XML-LibXSLT>=1.52:${PORTSDIR}/textproc/p5-XML-LibXSLT \
-		p5-Path-Class>=0.12:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime \
+		p5-XML-LibXSLT>=1.52:textproc/p5-XML-LibXSLT \
+		p5-Path-Class>=0.12:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CatalystX-Component-Traits/Makefile b/www/p5-CatalystX-Component-Traits/Makefile
index dcc2d9d7f963..c540d24a59ca 100644
--- a/www/p5-CatalystX-Component-Traits/Makefile
+++ b/www/p5-CatalystX-Component-Traits/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Automatic Trait Loading and Resolution for Catalyst Components
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.80005:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MooseX-Traits-Pluggable>=0.08:${PORTSDIR}/devel/p5-MooseX-Traits-Pluggable \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+RUN_DEPENDS=	p5-Catalyst-Runtime>=5.80005:www/p5-Catalyst-Runtime \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-MooseX-Traits-Pluggable>=0.08:devel/p5-MooseX-Traits-Pluggable \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-CatalystX-InjectComponent/Makefile b/www/p5-CatalystX-InjectComponent/Makefile
index b8ca8535e92b..0648d382d9a0 100644
--- a/www/p5-CatalystX-InjectComponent/Makefile
+++ b/www/p5-CatalystX-InjectComponent/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Inject components into your Catalyst application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80000:www/p5-Catalyst-Runtime \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CatalystX-LeakChecker/Makefile b/www/p5-CatalystX-LeakChecker/Makefile
index 0b97eceda980..cc36499acdc9 100644
--- a/www/p5-CatalystX-LeakChecker/Makefile
+++ b/www/p5-CatalystX-LeakChecker/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Debug memory leaks in Catalyst applications
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Devel-Cycle>0:${PORTSDIR}/devel/p5-Devel-Cycle \
-		p5-PadWalker>0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime \
+		p5-Devel-Cycle>0:devel/p5-Devel-Cycle \
+		p5-PadWalker>0:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CatalystX-Profile/Makefile b/www/p5-CatalystX-Profile/Makefile
index 8ab815e911e8..a9bf9edc1faf 100644
--- a/www/p5-CatalystX-Profile/Makefile
+++ b/www/p5-CatalystX-Profile/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Profile your Catalyst application with Devel::NYTProf
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80020:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-CatalystX-InjectComponent>=0.024:${PORTSDIR}/www/p5-CatalystX-InjectComponent \
-		devel/p5-Devel-NYTProf>=3.01:${PORTSDIR}/devel/p5-Devel-NYTProf \
-		p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80020:www/p5-Catalyst-Runtime \
+		p5-CatalystX-InjectComponent>=0.024:www/p5-CatalystX-InjectComponent \
+		devel/p5-Devel-NYTProf>=3.01:devel/p5-Devel-NYTProf \
+		p5-Moose>=0.93:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CatalystX-REPL/Makefile b/www/p5-CatalystX-REPL/Makefile
index 7e9a54dd98b9..755d2cb7ad2a 100644
--- a/www/p5-CatalystX-REPL/Makefile
+++ b/www/p5-CatalystX-REPL/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Read-Eval-Print-Loop for debugging your Catalyst application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-REPL>=0:${PORTSDIR}/devel/p5-Carp-REPL \
-		p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
-RUN_DEPENDS=	p5-Carp-REPL>=0:${PORTSDIR}/devel/p5-Carp-REPL \
-		p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
-TEST_DEPENDS=	p5-Test-Expect>=0:${PORTSDIR}/devel/p5-Test-Expect
+BUILD_DEPENDS=	p5-Carp-REPL>=0:devel/p5-Carp-REPL \
+		p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
+RUN_DEPENDS=	p5-Carp-REPL>=0:devel/p5-Carp-REPL \
+		p5-Catalyst-Runtime>0:www/p5-Catalyst-Runtime \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Test-Expect>=0:devel/p5-Test-Expect
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CatalystX-RoleApplicator/Makefile b/www/p5-CatalystX-RoleApplicator/Makefile
index 59672c710877..6a886ff21c90 100644
--- a/www/p5-CatalystX-RoleApplicator/Makefile
+++ b/www/p5-CatalystX-RoleApplicator/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Apply roles to your Catalyst application-related classes
 
-BUILD_DEPENDS=	p5-MooseX-RelatedClassRoles>=0.003:${PORTSDIR}/devel/p5-MooseX-RelatedClassRoles \
-		p5-Catalyst-Runtime>=5.7:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-MooseX-RelatedClassRoles>=0.003:devel/p5-MooseX-RelatedClassRoles \
+		p5-Catalyst-Runtime>=5.7:www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CatalystX-SimpleLogin/Makefile b/www/p5-CatalystX-SimpleLogin/Makefile
index 2facba1de7a6..7e916c785f3f 100644
--- a/www/p5-CatalystX-SimpleLogin/Makefile
+++ b/www/p5-CatalystX-SimpleLogin/Makefile
@@ -15,29 +15,29 @@ COMMENT=	Provide a simple Login controller which can be reused
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Action-REST>=0.74:${PORTSDIR}/www/p5-Catalyst-Action-REST \
-		p5-Catalyst-Action-RenderView>=0:${PORTSDIR}/www/p5-Catalyst-Action-RenderView \
-		p5-Catalyst-ActionRole-ACL>=0:${PORTSDIR}/www/p5-Catalyst-ActionRole-ACL \
-		p5-Catalyst-Plugin-Authentication>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Plugin-Session-State-Cookie>=0.17:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-State-Cookie \
-		p5-Catalyst-Plugin-Session-Store-File>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-Store-File \
-		p5-Catalyst-Runtime>=5.80:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-View-TT>=0:${PORTSDIR}/www/p5-Catalyst-View-TT \
-		p5-CatalystX-Component-Traits>=0.13:${PORTSDIR}/www/p5-CatalystX-Component-Traits \
-		p5-CatalystX-InjectComponent>=0:${PORTSDIR}/www/p5-CatalystX-InjectComponent \
-		p5-HTML-FormHandler>=0.28001:${PORTSDIR}/www/p5-HTML-FormHandler \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Moose-Autobox>=0:${PORTSDIR}/devel/p5-Moose-Autobox \
-		p5-MooseX-MethodAttributes>=0.18:${PORTSDIR}/devel/p5-MooseX-MethodAttributes \
-		p5-MooseX-RelatedClassRoles>=0:${PORTSDIR}/devel/p5-MooseX-RelatedClassRoles \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Common>=0:${PORTSDIR}/devel/p5-MooseX-Types-Common \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Catalyst-Action-REST>=0.74:www/p5-Catalyst-Action-REST \
+		p5-Catalyst-Action-RenderView>=0:www/p5-Catalyst-Action-RenderView \
+		p5-Catalyst-ActionRole-ACL>=0:www/p5-Catalyst-ActionRole-ACL \
+		p5-Catalyst-Plugin-Authentication>=0:www/p5-Catalyst-Plugin-Authentication \
+		p5-Catalyst-Plugin-Session>=0:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Plugin-Session-State-Cookie>=0.17:www/p5-Catalyst-Plugin-Session-State-Cookie \
+		p5-Catalyst-Plugin-Session-Store-File>=0:www/p5-Catalyst-Plugin-Session-Store-File \
+		p5-Catalyst-Runtime>=5.80:www/p5-Catalyst-Runtime \
+		p5-Catalyst-View-TT>=0:www/p5-Catalyst-View-TT \
+		p5-CatalystX-Component-Traits>=0.13:www/p5-CatalystX-Component-Traits \
+		p5-CatalystX-InjectComponent>=0:www/p5-CatalystX-InjectComponent \
+		p5-HTML-FormHandler>=0.28001:www/p5-HTML-FormHandler \
+		p5-libwww>0:www/p5-libwww \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Moose-Autobox>=0:devel/p5-Moose-Autobox \
+		p5-MooseX-MethodAttributes>=0.18:devel/p5-MooseX-MethodAttributes \
+		p5-MooseX-RelatedClassRoles>=0:devel/p5-MooseX-RelatedClassRoles \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Common>=0:devel/p5-MooseX-Types-Common \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Class-DBI-FromForm/Makefile b/www/p5-Class-DBI-FromForm/Makefile
index 341dadccab7e..ce7f35ef14ee 100644
--- a/www/p5-Class-DBI-FromForm/Makefile
+++ b/www/p5-Class-DBI-FromForm/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Update Class::DBI using Data::FormValidator or HTML::Widget
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-Data-FormValidator>=0:${PORTSDIR}/textproc/p5-Data-FormValidator
+BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-ClearSilver/Makefile b/www/p5-ClearSilver/Makefile
index 57a46529dfe6..9af08859acf4 100644
--- a/www/p5-ClearSilver/Makefile
+++ b/www/p5-ClearSilver/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl bindings for fast and powerful template system
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libneo_cs.a:${PORTSDIR}/www/clearsilver
+BUILD_DEPENDS=	${LOCALBASE}/lib/libneo_cs.a:www/clearsilver
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Continuity/Makefile b/www/p5-Continuity/Makefile
index 1e1b09d6105b..ca11f92f67e9 100644
--- a/www/p5-Continuity/Makefile
+++ b/www/p5-Continuity/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Stateful Web applications in Perl
 
-COMMON_DEPENDS=	p5-Event>0:${PORTSDIR}/devel/p5-Event \
-		p5-HTTP-Daemon>=1.36:${PORTSDIR}/www/p5-HTTP-Daemon \
-		p5-Coro>=4.37:${PORTSDIR}/devel/p5-Coro \
-		p5-PSGI>=0:${PORTSDIR}/www/p5-PSGI \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+COMMON_DEPENDS=	p5-Event>0:devel/p5-Event \
+		p5-HTTP-Daemon>=1.36:www/p5-HTTP-Daemon \
+		p5-Coro>=4.37:devel/p5-Coro \
+		p5-PSGI>=0:www/p5-PSGI \
+		p5-libwww>0:www/p5-libwww
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/www/p5-Cookie-Baker/Makefile b/www/p5-Cookie-Baker/Makefile
index 6e148d740b46..70663134f2d7 100644
--- a/www/p5-Cookie-Baker/Makefile
+++ b/www/p5-Cookie-Baker/Makefile
@@ -13,7 +13,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Corona/Makefile b/www/p5-Corona/Makefile
index 5457043e5069..75c4df771592 100644
--- a/www/p5-Corona/Makefile
+++ b/www/p5-Corona/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Coro based PSGI web server
 
 RUN_DEPENDS=	\
-	p5-Coro>0:${PORTSDIR}/devel/p5-Coro \
-	p5-Net-Server-Coro>=0.5:${PORTSDIR}/net/p5-Net-Server-Coro \
-	p5-Plack>=0.99:${PORTSDIR}/www/p5-Plack
+	p5-Coro>0:devel/p5-Coro \
+	p5-Net-Server-Coro>=0.5:net/p5-Net-Server-Coro \
+	p5-Plack>=0.99:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Dancer-Logger-Log4perl/Makefile b/www/p5-Dancer-Logger-Log4perl/Makefile
index 9386dbb827bd..ec34b7181d09 100644
--- a/www/p5-Dancer-Logger-Log4perl/Makefile
+++ b/www/p5-Dancer-Logger-Log4perl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Dancer logging adapter for Log::Log4perl
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Dancer>=1.2001:${PORTSDIR}/www/p5-Dancer \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Dancer>=1.2001:www/p5-Dancer \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer-Plugin-ExtDirect/Makefile b/www/p5-Dancer-Plugin-ExtDirect/Makefile
index 81ee3c9f0141..95d6684caab5 100644
--- a/www/p5-Dancer-Plugin-ExtDirect/Makefile
+++ b/www/p5-Dancer-Plugin-ExtDirect/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Dancer plugin for implementing ExtDirect APIs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer>=1.2001:${PORTSDIR}/www/p5-Dancer \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+BUILD_DEPENDS=	p5-Dancer>=1.2001:www/p5-Dancer \
+		p5-JSON>=0:converters/p5-JSON
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer-Plugin-Feed/Makefile b/www/p5-Dancer-Plugin-Feed/Makefile
index 0944f8f72941..17d412a16914 100644
--- a/www/p5-Dancer-Plugin-Feed/Makefile
+++ b/www/p5-Dancer-Plugin-Feed/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Dancer plugin for generating RSS or Atom feeds
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer>=1.2001:${PORTSDIR}/www/p5-Dancer \
-		p5-XML-Feed>=0:${PORTSDIR}/textproc/p5-XML-Feed
+BUILD_DEPENDS=	p5-Dancer>=1.2001:www/p5-Dancer \
+		p5-XML-Feed>=0:textproc/p5-XML-Feed
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer-Plugin-FlashMessage/Makefile b/www/p5-Dancer-Plugin-FlashMessage/Makefile
index 2d541a05bf01..cfcca4553d0d 100644
--- a/www/p5-Dancer-Plugin-FlashMessage/Makefile
+++ b/www/p5-Dancer-Plugin-FlashMessage/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Dancer plugin for implementing Flash Messages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer>=1.2001:${PORTSDIR}/www/p5-Dancer
+BUILD_DEPENDS=	p5-Dancer>=1.2001:www/p5-Dancer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer-Plugin-Lexicon/Makefile b/www/p5-Dancer-Plugin-Lexicon/Makefile
index bb5f6c517eaa..dfe4a86cc48c 100644
--- a/www/p5-Dancer-Plugin-Lexicon/Makefile
+++ b/www/p5-Dancer-Plugin-Lexicon/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Flexible I18N using Locale::Maketext::Lexicon for Dancer apps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Dancer>=1.3118:${PORTSDIR}/www/p5-Dancer \
-		p5-Locale-Maketext-Lexicon>0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-Package-Stash>0:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-PathTools>0:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	p5-Dancer>=1.3118:www/p5-Dancer \
+		p5-Locale-Maketext-Lexicon>0:devel/p5-Locale-Maketext-Lexicon \
+		p5-Package-Stash>0:devel/p5-Package-Stash \
+		p5-PathTools>0:devel/p5-PathTools
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer-Plugin-Memcached/Makefile b/www/p5-Dancer-Plugin-Memcached/Makefile
index dbc857c5468e..8a768cc466b4 100644
--- a/www/p5-Dancer-Plugin-Memcached/Makefile
+++ b/www/p5-Dancer-Plugin-Memcached/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Cache response content to memcached
 
-RUN_DEPENDS=	p5-Dancer>0:${PORTSDIR}/www/p5-Dancer
+RUN_DEPENDS=	p5-Dancer>0:www/p5-Dancer
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer-Plugin-REST/Makefile b/www/p5-Dancer-Plugin-REST/Makefile
index b43e0d07c6f8..731ce3a28481 100644
--- a/www/p5-Dancer-Plugin-REST/Makefile
+++ b/www/p5-Dancer-Plugin-REST/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dancer plugin for writing RESTful apps
 
-RUN_DEPENDS=	p5-Dancer>0:${PORTSDIR}/www/p5-Dancer
+RUN_DEPENDS=	p5-Dancer>0:www/p5-Dancer
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer-Plugin-SiteMap/Makefile b/www/p5-Dancer-Plugin-SiteMap/Makefile
index 34a983230692..0498afefc0c3 100644
--- a/www/p5-Dancer-Plugin-SiteMap/Makefile
+++ b/www/p5-Dancer-Plugin-SiteMap/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Automated site map for the Dancer web framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer>=1.175:${PORTSDIR}/www/p5-Dancer \
-		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
-RUN_DEPENDS=	p5-Dancer>=1.175:${PORTSDIR}/www/p5-Dancer \
-		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-Dancer>=1.175:www/p5-Dancer \
+		p5-XML-Simple>0:textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-Dancer>=1.175:www/p5-Dancer \
+		p5-XML-Simple>0:textproc/p5-XML-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Dancer-Plugin-ValidationClass/Makefile b/www/p5-Dancer-Plugin-ValidationClass/Makefile
index a93b08e291e5..5503f79f6c2e 100644
--- a/www/p5-Dancer-Plugin-ValidationClass/Makefile
+++ b/www/p5-Dancer-Plugin-ValidationClass/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for centralized input validation for Dancer
 
 RUN_DEPENDS=	\
-	p5-Dancer>0:${PORTSDIR}/www/p5-Dancer \
-	p5-Validation-Class>0:${PORTSDIR}/devel/p5-Validation-Class
+	p5-Dancer>0:www/p5-Dancer \
+	p5-Validation-Class>0:devel/p5-Validation-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer-Session-Cookie/Makefile b/www/p5-Dancer-Session-Cookie/Makefile
index 497b92f625fc..7df9829ad00e 100644
--- a/www/p5-Dancer-Session-Cookie/Makefile
+++ b/www/p5-Dancer-Session-Cookie/Makefile
@@ -11,17 +11,17 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for encrypted cookie-based session backend for Dancer
 
 RUN_DEPENDS=	\
-	p5-Crypt-CBC>0:${PORTSDIR}/security/p5-Crypt-CBC \
-	p5-Crypt-Rijndael>0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-	p5-Dancer>=1.3113:${PORTSDIR}/www/p5-Dancer \
-	p5-HTTP-Date>0:${PORTSDIR}/www/p5-HTTP-Date \
-	p5-Session-Storage-Secure>=0.007:${PORTSDIR}/www/p5-Session-Storage-Secure \
-	p5-String-CRC32>0:${PORTSDIR}/devel/p5-String-CRC32 \
-	p5-Time-Duration-Parse>0:${PORTSDIR}/devel/p5-Time-Duration-Parse
+	p5-Crypt-CBC>0:security/p5-Crypt-CBC \
+	p5-Crypt-Rijndael>0:security/p5-Crypt-Rijndael \
+	p5-Dancer>=1.3113:www/p5-Dancer \
+	p5-HTTP-Date>0:www/p5-HTTP-Date \
+	p5-Session-Storage-Secure>=0.007:www/p5-Session-Storage-Secure \
+	p5-String-CRC32>0:devel/p5-String-CRC32 \
+	p5-Time-Duration-Parse>0:devel/p5-Time-Duration-Parse
 TEST_DEPENDS=	\
-	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+	p5-Test-Exception>0:devel/p5-Test-Exception \
+	p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings \
+	p5-Test-TCP>0:devel/p5-Test-TCP
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=	perl5
diff --git a/www/p5-Dancer-Template-Xslate/Makefile b/www/p5-Dancer-Template-Xslate/Makefile
index 039806676785..07d2e86a1804 100644
--- a/www/p5-Dancer-Template-Xslate/Makefile
+++ b/www/p5-Dancer-Template-Xslate/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Text::Xslate wrapper for Dancer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Dancer>0:${PORTSDIR}/www/p5-Dancer \
-		p5-Text-Xslate>0:${PORTSDIR}/textproc/p5-Text-Xslate
+RUN_DEPENDS=	p5-Dancer>0:www/p5-Dancer \
+		p5-Text-Xslate>0:textproc/p5-Text-Xslate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer/Makefile b/www/p5-Dancer/Makefile
index e22b145827ac..4b024ac8ecc5 100644
--- a/www/p5-Dancer/Makefile
+++ b/www/p5-Dancer/Makefile
@@ -14,16 +14,16 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-HTTP-Body>0:${PORTSDIR}/www/p5-HTTP-Body \
-	p5-HTTP-Date>0:${PORTSDIR}/www/p5-HTTP-Date \
-	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
-	p5-HTTP-Server-Simple-PSGI>0:${PORTSDIR}/www/p5-HTTP-Server-Simple-PSGI \
-	p5-Hash-Merge-Simple>0:${PORTSDIR}/devel/p5-Hash-Merge-Simple \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-	p5-Module-Runtime>0:${PORTSDIR}/devel/p5-Module-Runtime \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-HTTP-Body>0:www/p5-HTTP-Body \
+	p5-HTTP-Date>0:www/p5-HTTP-Date \
+	p5-HTTP-Message>0:www/p5-HTTP-Message \
+	p5-HTTP-Server-Simple-PSGI>0:www/p5-HTTP-Server-Simple-PSGI \
+	p5-Hash-Merge-Simple>0:devel/p5-Hash-Merge-Simple \
+	p5-libwww>0:www/p5-libwww \
+	p5-MIME-Types>0:mail/p5-MIME-Types \
+	p5-Module-Runtime>0:devel/p5-Module-Runtime \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 OPTIONS_DEFINE=	YAML
@@ -32,7 +32,7 @@ OPTIONS_DEFAULT=	YAML
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MYAML}
-RUN_DEPENDS+=	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS+=	p5-YAML>0:textproc/p5-YAML
 .endif
 
 USES=	perl5
diff --git a/www/p5-Dancer2-Plugin-Ajax/Makefile b/www/p5-Dancer2-Plugin-Ajax/Makefile
index e7646d24e5e6..ca98e99a027e 100644
--- a/www/p5-Dancer2-Plugin-Ajax/Makefile
+++ b/www/p5-Dancer2-Plugin-Ajax/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ajax handling for Dancer2 applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Dancer2>=0.155000:${PORTSDIR}/www/p5-Dancer2
+RUN_DEPENDS=	p5-Dancer2>=0.155000:www/p5-Dancer2
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Dancer2-Plugin-Deferred/Makefile b/www/p5-Dancer2-Plugin-Deferred/Makefile
index 453e405afbca..537b88e63ebe 100644
--- a/www/p5-Dancer2-Plugin-Deferred/Makefile
+++ b/www/p5-Dancer2-Plugin-Deferred/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dancer2 plugin to defer messages or data across redirections
 
-BUILD_DEPENDS=	p5-Dancer2>=0:${PORTSDIR}/www/p5-Dancer2 \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Dancer2>=0:www/p5-Dancer2 \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer2-Plugin-Path-Class/Makefile b/www/p5-Dancer2-Plugin-Path-Class/Makefile
index fc519812d20f..6f669c739c0c 100644
--- a/www/p5-Dancer2-Plugin-Path-Class/Makefile
+++ b/www/p5-Dancer2-Plugin-Path-Class/Makefile
@@ -13,9 +13,9 @@ COMMENT=	List a directory using Path::Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer2>=0.166000:${PORTSDIR}/www/p5-Dancer2 \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Format-Human-Bytes>=0:${PORTSDIR}/converters/p5-Format-Human-Bytes
+BUILD_DEPENDS=	p5-Dancer2>=0.166000:www/p5-Dancer2 \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Format-Human-Bytes>=0:converters/p5-Format-Human-Bytes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Dancer2/Makefile b/www/p5-Dancer2/Makefile
index ff4979fc3dd6..a895ad1b8fde 100644
--- a/www/p5-Dancer2/Makefile
+++ b/www/p5-Dancer2/Makefile
@@ -13,48 +13,48 @@ COMMENT=	Lightweight yet powerful web application framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Capture-Tiny>=0.12:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Crypt-URandom>=0:${PORTSDIR}/security/p5-Crypt-URandom \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-File-ShareDir-Install>=0:${PORTSDIR}/devel/p5-File-ShareDir-Install \
-		p5-Hash-Merge-Simple>=0:${PORTSDIR}/devel/p5-Hash-Merge-Simple \
-		p5-HTTP-Body>=0:${PORTSDIR}/www/p5-HTTP-Body \
-		p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-HTTP-Headers-Fast>=0:${PORTSDIR}/www/p5-HTTP-Headers-Fast \
-		p5-Import-Into>=0:${PORTSDIR}/devel/p5-Import-Into \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moo>=2.000000:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-Types-MooseLike>=0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-		p5-Plack>=1.0035:${PORTSDIR}/www/p5-Plack \
-		p5-Plack-Middleware-FixMissingBodyInRedirect>=0:${PORTSDIR}/www/p5-Plack-Middleware-FixMissingBodyInRedirect \
-		p5-Plack-Middleware-RemoveRedundantBody>=0:${PORTSDIR}/www/p5-Plack-Middleware-RemoveRedundantBody \
-		p5-Return-MultiLevel>=0:${PORTSDIR}/devel/p5-Return-MultiLevel \
-		p5-Role-Tiny>=2.000000:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Template-Tiny>=0:${PORTSDIR}/textproc/p5-Template-Tiny \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-App-Cmd>=0:devel/p5-App-Cmd \
+		p5-Capture-Tiny>=0.12:devel/p5-Capture-Tiny \
+		p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Crypt-URandom>=0:security/p5-Crypt-URandom \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install \
+		p5-Hash-Merge-Simple>=0:devel/p5-Hash-Merge-Simple \
+		p5-HTTP-Body>=0:www/p5-HTTP-Body \
+		p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-HTTP-Headers-Fast>=0:www/p5-HTTP-Headers-Fast \
+		p5-Import-Into>=0:devel/p5-Import-Into \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Moo>=2.000000:devel/p5-Moo \
+		p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
+		p5-Plack>=1.0035:www/p5-Plack \
+		p5-Plack-Middleware-FixMissingBodyInRedirect>=0:www/p5-Plack-Middleware-FixMissingBodyInRedirect \
+		p5-Plack-Middleware-RemoveRedundantBody>=0:www/p5-Plack-Middleware-RemoveRedundantBody \
+		p5-Return-MultiLevel>=0:devel/p5-Return-MultiLevel \
+		p5-Role-Tiny>=2.000000:devel/p5-Role-Tiny \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Template-Tiny>=0:textproc/p5-Template-Tiny \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-LWP-Protocol-PSGI>=0.06:${PORTSDIR}/www/p5-LWP-Protocol-PSGI \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime \
-		p5-YAML>=0.86:${PORTSDIR}/textproc/p5-YAML \
+TEST_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-LWP-Protocol-PSGI>=0.06:www/p5-LWP-Protocol-PSGI \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-MockTime>=0:devel/p5-Test-MockTime \
+		p5-YAML>=0.86:textproc/p5-YAML \
 		${XS_BUILD_DEPENDS}
 
 OPTIONS_DEFINE=		XS
 
-XS_BUILD_DEPENDS=	p5-CGI-Deurl-XS>=0:${PORTSDIR}/www/p5-CGI-Deurl-XS \
-			p5-Class-Load-XS>=0:${PORTSDIR}/devel/p5-Class-Load-XS \
-			p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-			p5-Scope-Upper>=0:${PORTSDIR}/devel/p5-Scope-Upper \
-			p5-URL-Encode-XS>=0:${PORTSDIR}/www/p5-URL-Encode-XS \
-			p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
+XS_BUILD_DEPENDS=	p5-CGI-Deurl-XS>=0:www/p5-CGI-Deurl-XS \
+			p5-Class-Load-XS>=0:devel/p5-Class-Load-XS \
+			p5-JSON-XS>=0:converters/p5-JSON-XS \
+			p5-Scope-Upper>=0:devel/p5-Scope-Upper \
+			p5-URL-Encode-XS>=0:www/p5-URL-Encode-XS \
+			p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
 XS_RUN_DEPENDS=		${XS_BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile b/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
index 01dd91c9697c..01b74d82cb6f 100644
--- a/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
+++ b/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
@@ -14,7 +14,7 @@ COMMENT=	DHTML renderer for Data::TreeDumper
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper
+BUILD_DEPENDS=	p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Data-Validate-URI/Makefile b/www/p5-Data-Validate-URI/Makefile
index 8e3c25d0631c..88cfdec12581 100644
--- a/www/p5-Data-Validate-URI/Makefile
+++ b/www/p5-Data-Validate-URI/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	freebsd-ports@t-b-o-h.net
 COMMENT=	Common data validation methods for URIs
 
-BUILD_DEPENDS=	p5-Data-Validate-Domain>=0:${PORTSDIR}/dns/p5-Data-Validate-Domain \
-		p5-Data-Validate-IP>=0:${PORTSDIR}/net-mgmt/p5-Data-Validate-IP
-RUN_DEPENDS=	p5-Data-Validate-Domain>=0:${PORTSDIR}/dns/p5-Data-Validate-Domain \
-		p5-Data-Validate-IP>=0:${PORTSDIR}/net-mgmt/p5-Data-Validate-IP
+BUILD_DEPENDS=	p5-Data-Validate-Domain>=0:dns/p5-Data-Validate-Domain \
+		p5-Data-Validate-IP>=0:net-mgmt/p5-Data-Validate-IP
+RUN_DEPENDS=	p5-Data-Validate-Domain>=0:dns/p5-Data-Validate-Domain \
+		p5-Data-Validate-IP>=0:net-mgmt/p5-Data-Validate-IP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Emplacken/Makefile b/www/p5-Emplacken/Makefile
index 4732847ddc3f..c0c057564226 100644
--- a/www/p5-Emplacken/Makefile
+++ b/www/p5-Emplacken/Makefile
@@ -14,19 +14,19 @@ COMMENT=	Manage multiple plack apps with a directory of config files
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-File-Pid>=0:${PORTSDIR}/devel/p5-File-Pid \
-		p5-List-AllUtils>=0:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-MooseX-Types-Perl>=0:${PORTSDIR}/devel/p5-MooseX-Types-Perl \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-autodie>=0:${PORTSDIR}/devel/p5-autodie \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-File-Pid>=0:devel/p5-File-Pid \
+		p5-List-AllUtils>=0:devel/p5-List-AllUtils \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-MooseX-Types-Perl>=0:devel/p5-MooseX-Types-Perl \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-autodie>=0:devel/p5-autodie \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-FCGI-Async/Makefile b/www/p5-FCGI-Async/Makefile
index ec87042107f8..289cdfd9ac3a 100644
--- a/www/p5-FCGI-Async/Makefile
+++ b/www/p5-FCGI-Async/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Module to allow use of FastCGI asynchronously
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Async>=0:${PORTSDIR}/devel/p5-IO-Async \
-		p5-Net-Async-FastCGI>=0:${PORTSDIR}/www/p5-Net-Async-FastCGI \
-		p5-Net-FastCGI>=0:${PORTSDIR}/www/p5-Net-FastCGI
+BUILD_DEPENDS=	p5-IO-Async>=0:devel/p5-IO-Async \
+		p5-Net-Async-FastCGI>=0:www/p5-Net-Async-FastCGI \
+		p5-Net-FastCGI>=0:www/p5-Net-FastCGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Identity>=0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-HexString>=0:${PORTSDIR}/devel/p5-Test-HexString \
-		p5-Test-Refcount>0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-Identity>=0:devel/p5-Test-Identity \
+		p5-Test-HexString>=0:devel/p5-Test-HexString \
+		p5-Test-Refcount>0:devel/p5-Test-Refcount
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-FCGI-Client/Makefile b/www/p5-FCGI-Client/Makefile
index f75b73c04d9d..a2754328d429 100644
--- a/www/p5-FCGI-Client/Makefile
+++ b/www/p5-FCGI-Client/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for fastcgi protocol client library
 
 RUN_DEPENDS=	\
-	p5-Any-Moose>=0.1:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Any-Moose>=0.1:devel/p5-Any-Moose \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-FCGI-Engine/Makefile b/www/p5-FCGI-Engine/Makefile
index 9f5ed20573c1..fb09b7da68c9 100644
--- a/www/p5-FCGI-Engine/Makefile
+++ b/www/p5-FCGI-Engine/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Flexible engine for running FCGI-based applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple \
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Declare-Constraints-Simple>=0:${PORTSDIR}/devel/p5-Declare-Constraints-Simple \
-		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI \
-		p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Daemonize>=0.09:${PORTSDIR}/devel/p5-MooseX-Daemonize \
-		p5-MooseX-Getopt>=0.26:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class
+BUILD_DEPENDS=	p5-CGI-Simple>=0:www/p5-CGI-Simple \
+		p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-Declare-Constraints-Simple>=0:devel/p5-Declare-Constraints-Simple \
+		p5-FCGI>=0:www/p5-FCGI \
+		p5-Moose>=0.93:devel/p5-Moose \
+		p5-MooseX-Daemonize>=0.09:devel/p5-MooseX-Daemonize \
+		p5-MooseX-Getopt>=0.26:devel/p5-MooseX-Getopt \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-FCGI-Spawn/Makefile b/www/p5-FCGI-Spawn/Makefile
index 534125d9fef9..d30987d29183 100644
--- a/www/p5-FCGI-Spawn/Makefile
+++ b/www/p5-FCGI-Spawn/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	peter@vereshagin.org
 COMMENT=	FastCGI server for CGI-like applications multiprocessing
 
-BUILD_DEPENDS=	p5-Const-Fast>0:${PORTSDIR}/devel/p5-Const-Fast \
-		p5-FCGI>0:${PORTSDIR}/www/p5-FCGI \
-		p5-FCGI-ProcManager>0:${PORTSDIR}/www/p5-FCGI-ProcManager
+BUILD_DEPENDS=	p5-Const-Fast>0:devel/p5-Const-Fast \
+		p5-FCGI>0:www/p5-FCGI \
+		p5-FCGI-ProcManager>0:www/p5-FCGI-ProcManager
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-Strict>0:${PORTSDIR}/devel/p5-Test-Strict
+TEST_DEPENDS=	p5-Test-Most>0:devel/p5-Test-Most \
+		p5-Test-Strict>0:devel/p5-Test-Strict
 
 USES=		perl5
 USE_PERL5=	configure
@@ -30,14 +30,14 @@ PGSQL_DESC=	PgSQL dependency to run on RC start
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-# 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
 .	else
 SUB_LIST+=	MYSQL=
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-# 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
 .	else
 SUB_LIST+=	PGSQL=
diff --git a/www/p5-FEAR-API/Makefile b/www/p5-FEAR-API/Makefile
index e08b38125d1f..175560f62a4e 100644
--- a/www/p5-FEAR-API/Makefile
+++ b/www/p5-FEAR-API/Makefile
@@ -14,33 +14,33 @@ COMMENT=	Web Scraping Zen
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Email-Find>=0:${PORTSDIR}/mail/p5-Email-Find \
-		p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-HTML-Encoding>=0:${PORTSDIR}/www/p5-HTML-Encoding \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-LinkExtractor>=0:${PORTSDIR}/www/p5-HTML-LinkExtractor \
-		p5-HTTP-Proxy>=0:${PORTSDIR}/www/p5-HTTP-Proxy \
-		p5-HTTP-Recorder>=0:${PORTSDIR}/www/p5-HTTP-Recorder \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-Files>=0:${PORTSDIR}/devel/p5-Inline-Files \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-Regexp-Bind>=0:${PORTSDIR}/devel/p5-Regexp-Bind \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Sort-Versions>=0:${PORTSDIR}/devel/p5-Sort-Versions \
-		p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Template-Extract>=0:${PORTSDIR}/textproc/p5-Template-Extract \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-XML-RSS-SimpleGen>=0:${PORTSDIR}/textproc/p5-XML-RSS-SimpleGen \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Email-Find>=0:mail/p5-Email-Find \
+		p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
+		p5-File-MMagic>=0:devel/p5-File-MMagic \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-HTML-Encoding>=0:www/p5-HTML-Encoding \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-LinkExtractor>=0:www/p5-HTML-LinkExtractor \
+		p5-HTTP-Proxy>=0:www/p5-HTTP-Proxy \
+		p5-HTTP-Recorder>=0:www/p5-HTTP-Recorder \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Inline>=0:devel/p5-Inline \
+		p5-Inline-Files>=0:devel/p5-Inline-Files \
+		p5-Net-Server>=0:net/p5-Net-Server \
+		p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
+		p5-Regexp-Bind>=0:devel/p5-Regexp-Bind \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Sort-Versions>=0:devel/p5-Sort-Versions \
+		p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Template-Extract>=0:textproc/p5-Template-Extract \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-Text-Iconv>=0:converters/p5-Text-Iconv \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-XML-RSS-SimpleGen>=0:textproc/p5-XML-RSS-SimpleGen \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Facebook-Graph/Makefile b/www/p5-Facebook-Graph/Makefile
index eb819ed3c6e7..5c6b375d7794 100644
--- a/www/p5-Facebook-Graph/Makefile
+++ b/www/p5-Facebook-Graph/Makefile
@@ -15,14 +15,14 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Any-Moose>=0.13:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-AnyEvent-HTTP-LWP-UserAgent>=0.08:${PORTSDIR}/www/p5-AnyEvent-HTTP-LWP-UserAgent \
-	p5-DateTime>=0.61:${PORTSDIR}/devel/p5-DateTime \
-	p5-DateTime-Format-Strptime>=1.4000:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-	p5-JSON>=2.16:${PORTSDIR}/converters/p5-JSON \
-	p5-MIME-Base64-URLSafe>=0.01:${PORTSDIR}/converters/p5-MIME-Base64-URLSafe \
-	p5-Ouch>=0.0400:${PORTSDIR}/devel/p5-Ouch \
-	p5-URI>=1.54:${PORTSDIR}/net/p5-URI
+	p5-Any-Moose>=0.13:devel/p5-Any-Moose \
+	p5-AnyEvent-HTTP-LWP-UserAgent>=0.08:www/p5-AnyEvent-HTTP-LWP-UserAgent \
+	p5-DateTime>=0.61:devel/p5-DateTime \
+	p5-DateTime-Format-Strptime>=1.4000:devel/p5-DateTime-Format-Strptime \
+	p5-JSON>=2.16:converters/p5-JSON \
+	p5-MIME-Base64-URLSafe>=0.01:converters/p5-MIME-Base64-URLSafe \
+	p5-Ouch>=0.0400:devel/p5-Ouch \
+	p5-URI>=1.54:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Feed-Find/Makefile b/www/p5-Feed-Find/Makefile
index 82f6e53934dd..4a2a3cdc1234 100644
--- a/www/p5-Feed-Find/Makefile
+++ b/www/p5-Feed-Find/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Syndication feed auto-discovery
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Feersum/Makefile b/www/p5-Feersum/Makefile
index 1c432e4954e5..fa88d4b83263 100644
--- a/www/p5-Feersum/Makefile
+++ b/www/p5-Feersum/Makefile
@@ -14,16 +14,16 @@ COMMENT=	PSGI engine for Perl based on EV/libev
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-EV>=4.0:${PORTSDIR}/devel/p5-EV \
-		p5-Plack>=0.9950:${PORTSDIR}/www/p5-Plack
-RUN_DEPENDS=	p5-EV>=4.0:${PORTSDIR}/devel/p5-EV \
-		p5-Plack>=0.9950:${PORTSDIR}/www/p5-Plack
-TEST_DEPENDS=	p5-AnyEvent>=5.26.1:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Guard>=1.012:${PORTSDIR}/devel/p5-Guard \
-		p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-LeakTrace>=0.13:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-TCP>=1.12:${PORTSDIR}/devel/p5-Test-TCP
+BUILD_DEPENDS=	p5-EV>=4.0:devel/p5-EV \
+		p5-Plack>=0.9950:www/p5-Plack
+RUN_DEPENDS=	p5-EV>=4.0:devel/p5-EV \
+		p5-Plack>=0.9950:www/p5-Plack
+TEST_DEPENDS=	p5-AnyEvent>=5.26.1:devel/p5-AnyEvent \
+		p5-Guard>=1.012:devel/p5-Guard \
+		p5-JSON-XS>=2:converters/p5-JSON-XS \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal \
+		p5-Test-LeakTrace>=0.13:devel/p5-Test-LeakTrace \
+		p5-Test-TCP>=1.12:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-File-Mork/Makefile b/www/p5-File-Mork/Makefile
index a2115796c6a1..fd4f4273f0b5 100644
--- a/www/p5-File-Mork/Makefile
+++ b/www/p5-File-Mork/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Module to read Mozilla URL history files
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Flea/Makefile b/www/p5-Flea/Makefile
index 0bbe12d008a8..f6cc2777eb90 100644
--- a/www/p5-Flea/Makefile
+++ b/www/p5-Flea/Makefile
@@ -12,14 +12,14 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for minimalistic sugar for your Plack
 
 RUN_DEPENDS=	\
-	p5-Devel-Declare-Parser>0:${PORTSDIR}/devel/p5-Devel-Declare-Parser \
-	p5-Exception-Class>0:${PORTSDIR}/devel/p5-Exception-Class \
-	p5-Exporter-Declare>=0.100:${PORTSDIR}/devel/p5-Exporter-Declare \
-	p5-HTTP-Exception>0:${PORTSDIR}/www/p5-HTTP-Exception \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Devel-Declare-Parser>0:devel/p5-Devel-Declare-Parser \
+	p5-Exception-Class>0:devel/p5-Exception-Class \
+	p5-Exporter-Declare>=0.100:devel/p5-Exporter-Declare \
+	p5-HTTP-Exception>0:www/p5-HTTP-Exception \
+	p5-JSON>0:converters/p5-JSON \
+	p5-Plack>0:www/p5-Plack \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Flickr-API/Makefile b/www/p5-Flickr-API/Makefile
index 1e05406fab21..4ac38a2c13fc 100644
--- a/www/p5-Flickr-API/Makefile
+++ b/www/p5-Flickr-API/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl interface to the Flickr API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=1.56:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Net-OAuth>=0:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-URI>=1.18:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML-Simple>=0:${PORTSDIR}/textproc/p5-XML-LibXML-Simple \
-		p5-XML-Parser-Lite-Tree>=0.06:${PORTSDIR}/textproc/p5-XML-Parser-Lite-Tree \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=1.56:www/p5-HTTP-Message \
+		p5-Net-OAuth>=0:net/p5-Net-OAuth \
+		p5-URI>=1.18:net/p5-URI \
+		p5-XML-LibXML-Simple>=0:textproc/p5-XML-LibXML-Simple \
+		p5-XML-Parser-Lite-Tree>=0.06:textproc/p5-XML-Parser-Lite-Tree \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Script>=0:${PORTSDIR}/devel/p5-Test-Script
+TEST_DEPENDS=	p5-Test-Script>=0:devel/p5-Test-Script
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-Flickr-Upload/Makefile b/www/p5-Flickr-Upload/Makefile
index 2e7d2a3bcae7..e89e3ab2a91d 100644
--- a/www/p5-Flickr-Upload/Makefile
+++ b/www/p5-Flickr-Upload/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Upload images to flickr.com
 
-BUILD_DEPENDS=	p5-Flickr-API>=0:${PORTSDIR}/www/p5-Flickr-API \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-Parser-Lite-Tree>=0:${PORTSDIR}/textproc/p5-XML-Parser-Lite-Tree
+BUILD_DEPENDS=	p5-Flickr-API>=0:www/p5-Flickr-API \
+		p5-libwww>=0:www/p5-libwww \
+		p5-XML-Parser-Lite-Tree>=0:textproc/p5-XML-Parser-Lite-Tree
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Fliggy/Makefile b/www/p5-Fliggy/Makefile
index f564569eea40..2c09ee60494b 100644
--- a/www/p5-Fliggy/Makefile
+++ b/www/p5-Fliggy/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Fliggy: Twiggy with inlined flash policy server
 
 RUN_DEPENDS=	\
-	p5-Twiggy>0:${PORTSDIR}/www/p5-Twiggy
+	p5-Twiggy>0:www/p5-Twiggy
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Furl/Makefile b/www/p5-Furl/Makefile
index 9374f33941c4..f19ec4141a9c 100644
--- a/www/p5-Furl/Makefile
+++ b/www/p5-Furl/Makefile
@@ -14,18 +14,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-HTTP-Parser-XS>=0.11:${PORTSDIR}/www/p5-HTTP-Parser-XS \
-	p5-Mozilla-CA>0:${PORTSDIR}/www/p5-Mozilla-CA
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-HTTP-Parser-XS>=0.11:www/p5-HTTP-Parser-XS \
+	p5-Mozilla-CA>0:www/p5-Mozilla-CA
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-TCP>=2.11:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-		p5-HTTP-Proxy>0:${PORTSDIR}/www/p5-HTTP-Proxy \
-		p5-Plack-Middleware-Deflater>0:${PORTSDIR}/www/p5-Plack-Middleware-Deflater \
-		p5-IO-Callback>0:${PORTSDIR}/devel/p5-IO-Callback \
-		p5-Starlet>0:${PORTSDIR}/www/p5-Starlet \
-		p5-Net-IDN-Encode>0:${PORTSDIR}/textproc/p5-Net-IDN-Encode
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-TCP>=2.11:devel/p5-Test-TCP \
+		p5-Plack>0:www/p5-Plack \
+		p5-HTTP-Proxy>0:www/p5-HTTP-Proxy \
+		p5-Plack-Middleware-Deflater>0:www/p5-Plack-Middleware-Deflater \
+		p5-IO-Callback>0:devel/p5-IO-Callback \
+		p5-Starlet>0:www/p5-Starlet \
+		p5-Net-IDN-Encode>0:textproc/p5-Net-IDN-Encode
 
 USES=	perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-FurlX-Coro/Makefile b/www/p5-FurlX-Coro/Makefile
index 99e01c87d5ea..125e6196f9d3 100644
--- a/www/p5-FurlX-Coro/Makefile
+++ b/www/p5-FurlX-Coro/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for multiple HTTP requests with Coro
 
 RUN_DEPENDS=	\
-	p5-Coro>0:${PORTSDIR}/devel/p5-Coro \
-	p5-Furl>0:${PORTSDIR}/www/p5-Furl
+	p5-Coro>0:devel/p5-Coro \
+	p5-Furl>0:www/p5-Furl
 BUILD_DEPENDS=	\
 	${RUN_DEPENDS} \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+	p5-Test-Requires>0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Gantry/Makefile b/www/p5-Gantry/Makefile
index c6572c1e8a11..a694db48f2df 100644
--- a/www/p5-Gantry/Makefile
+++ b/www/p5-Gantry/Makefile
@@ -11,25 +11,25 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Web application framework for mod_perl, cgi, etc
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple \
-		p5-Data-FormValidator>=0:${PORTSDIR}/textproc/p5-Data-FormValidator \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-HTML-Prototype>=0:${PORTSDIR}/www/p5-HTML-Prototype \
-		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-Sub-Install>0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Mail-RFC822-Address>0:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
-		p5-Config-General>0:${PORTSDIR}/devel/p5-Config-General \
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-		p5-Template-Toolkit>=2.0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Template-Plugin-HTML-SuperForm>0:${PORTSDIR}/textproc/p5-Template-Plugin-HTML-SuperForm
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Data-UUID>=0:devel/p5-Data-UUID \
+		p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-CGI-Simple>=0:www/p5-CGI-Simple \
+		p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+		p5-HTML-Prototype>=0:www/p5-HTML-Prototype \
+		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-URI>=0:net/p5-URI \
+		p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+		p5-Sub-Install>0:devel/p5-Sub-Install \
+		p5-Mail-RFC822-Address>0:mail/p5-Mail-RFC822-Address \
+		p5-Config-General>0:devel/p5-Config-General \
+		p5-JSON>0:converters/p5-JSON \
+		p5-Template-Toolkit>=2.0:www/p5-Template-Toolkit \
+		p5-Template-Plugin-HTML-SuperForm>0:textproc/p5-Template-Plugin-HTML-SuperForm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Geo-Caching/Makefile b/www/p5-Geo-Caching/Makefile
index 00586921d78a..c266eedd230a 100644
--- a/www/p5-Geo-Caching/Makefile
+++ b/www/p5-Geo-Caching/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Object interface for querying Geocaching.com website
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Geo-Cache>=0:${PORTSDIR}/misc/p5-Geo-Cache \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Geo-Gpx>=0:${PORTSDIR}/graphics/p5-Geo-Gpx
+BUILD_DEPENDS=	p5-Geo-Cache>=0:misc/p5-Geo-Cache \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-Geo-Gpx>=0:graphics/p5-Geo-Gpx
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Google-Search/Makefile b/www/p5-Google-Search/Makefile
index a535f88b8d2a..a6a4481c9695 100644
--- a/www/p5-Google-Search/Makefile
+++ b/www/p5-Google-Search/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Interface to the Google AJAX Search API and suggestion API
 
-RUN_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-JSON>=2.16:${PORTSDIR}/converters/p5-JSON \
-		p5-Carp-Clan-Share>=0:${PORTSDIR}/devel/p5-Carp-Clan-Share \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-Try-Tiny>=0.07:${PORTSDIR}/lang/p5-Try-Tiny
+RUN_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-JSON>=2.16:converters/p5-JSON \
+		p5-Carp-Clan-Share>=0:devel/p5-Carp-Clan-Share \
+		p5-Test-Most>=0:devel/p5-Test-Most \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>0:www/p5-libwww \
+		p5-Try-Tiny>=0.07:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Gtk2-WebKit/Makefile b/www/p5-Gtk2-WebKit/Makefile
index c8e1cd19deba..60f818c25603 100644
--- a/www/p5-Gtk2-WebKit/Makefile
+++ b/www/p5-Gtk2-WebKit/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Web content engine library for Gtk2
 
-BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Cairo>=0:graphics/p5-Cairo \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:www/webkit-gtk2
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/www/p5-Gungho/Makefile b/www/p5-Gungho/Makefile
index 04c4f8ee34ef..57b5cc0cb21f 100644
--- a/www/p5-Gungho/Makefile
+++ b/www/p5-Gungho/Makefile
@@ -13,37 +13,37 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Event Based High Performance Web Crawler Framework
 
-BUILD_DEPENDS=	p5-Best>=0:${PORTSDIR}/devel/p5-Best \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-C3-Componentised>=0:${PORTSDIR}/devel/p5-Class-C3-Componentised \
-		p5-Class-C3-XS>=0.02:${PORTSDIR}/devel/p5-Class-C3-XS \
-		p5-Class-C3>=0.16:${PORTSDIR}/devel/p5-Class-C3 \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Danga-Socket-Callback>=0:${PORTSDIR}/devel/p5-Danga-Socket-Callback \
-		p5-Danga-Socket>=1.57:${PORTSDIR}/devel/p5-Danga-Socket \
-		p5-Data-Throttler-Memcached>=0.0003:${PORTSDIR}/devel/p5-Data-Throttler-Memcached \
-		p5-Data-Throttler>=0:${PORTSDIR}/devel/p5-Data-Throttler \
-		p5-Event-Notify>=0.00004:${PORTSDIR}/devel/p5-Event-Notify \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-HTML-RobotsMETA>=0:${PORTSDIR}/www/p5-HTML-RobotsMETA \
-		p5-HTTP-Parser>=0:${PORTSDIR}/www/p5-HTTP-Parser \
-		p5-IO-Async>=0:${PORTSDIR}/devel/p5-IO-Async \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-POE-Component-Client-DNS>=0:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \
-		p5-POE-Component-Client-HTTP>=0.81:${PORTSDIR}/www/p5-POE-Component-Client-HTTP \
-		p5-POE-Component-Client-Keepalive>=0:${PORTSDIR}/net/p5-POE-Component-Client-Keepalive \
-		p5-POE>=0.9999:${PORTSDIR}/devel/p5-POE \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-UNIVERSAL-isa>=0.06:${PORTSDIR}/devel/p5-UNIVERSAL-isa \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-RobotRules-Parser>=0:${PORTSDIR}/www/p5-WWW-RobotRules-Parser \
-		p5-Web-Scraper-Config>=0:${PORTSDIR}/www/p5-Web-Scraper-Config \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Best>=0:devel/p5-Best \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-C3-Componentised>=0:devel/p5-Class-C3-Componentised \
+		p5-Class-C3-XS>=0.02:devel/p5-Class-C3-XS \
+		p5-Class-C3>=0.16:devel/p5-Class-C3 \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-Danga-Socket-Callback>=0:devel/p5-Danga-Socket-Callback \
+		p5-Danga-Socket>=1.57:devel/p5-Danga-Socket \
+		p5-Data-Throttler-Memcached>=0.0003:devel/p5-Data-Throttler-Memcached \
+		p5-Data-Throttler>=0:devel/p5-Data-Throttler \
+		p5-Event-Notify>=0.00004:devel/p5-Event-Notify \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-HTML-RobotsMETA>=0:www/p5-HTML-RobotsMETA \
+		p5-HTTP-Parser>=0:www/p5-HTTP-Parser \
+		p5-IO-Async>=0:devel/p5-IO-Async \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS \
+		p5-POE-Component-Client-HTTP>=0.81:www/p5-POE-Component-Client-HTTP \
+		p5-POE-Component-Client-Keepalive>=0:net/p5-POE-Component-Client-Keepalive \
+		p5-POE>=0.9999:devel/p5-POE \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-UNIVERSAL-isa>=0.06:devel/p5-UNIVERSAL-isa \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-RobotRules-Parser>=0:www/p5-WWW-RobotRules-Parser \
+		p5-Web-Scraper-Config>=0:www/p5-Web-Scraper-Config \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/www/p5-GunghoX-FollowLinks/Makefile b/www/p5-GunghoX-FollowLinks/Makefile
index 94c0429fcf25..52ec206bad23 100644
--- a/www/p5-GunghoX-FollowLinks/Makefile
+++ b/www/p5-GunghoX-FollowLinks/Makefile
@@ -12,14 +12,14 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to follow links within responses for Gungho
 
 RUN_DEPENDS=	\
-	p5-Gungho>=0.09.005:${PORTSDIR}/www/p5-Gungho \
-	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-HTML-Tagset>0:${PORTSDIR}/www/p5-HTML-Tagset \
-	p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-	p5-URI-Match>0:${PORTSDIR}/net/p5-URI-Match
+	p5-Gungho>=0.09.005:www/p5-Gungho \
+	p5-HTML-Parser>0:www/p5-HTML-Parser \
+	p5-HTML-Tagset>0:www/p5-HTML-Tagset \
+	p5-MIME-Types>0:mail/p5-MIME-Types \
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+	p5-URI-Match>0:net/p5-URI-Match
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Class-Null>0:${PORTSDIR}/devel/p5-Class-Null
+TEST_DEPENDS=	p5-Class-Null>0:devel/p5-Class-Null
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-Adsense/Makefile b/www/p5-HTML-Adsense/Makefile
index f6b21b4a3376..12af1de90fd0 100644
--- a/www/p5-HTML-Adsense/Makefile
+++ b/www/p5-HTML-Adsense/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Create adsense widgets easily
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTML-CalendarMonthSimple/Makefile b/www/p5-HTML-CalendarMonthSimple/Makefile
index d23b02b7b79c..d046759e1041 100644
--- a/www/p5-HTML-CalendarMonthSimple/Makefile
+++ b/www/p5-HTML-CalendarMonthSimple/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl Module for Generating HTML Calendars
 
-BUILD_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+BUILD_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Chunks/Makefile b/www/p5-HTML-Chunks/Makefile
index 3c0ad7832bb3..9259dd996ba2 100644
--- a/www/p5-HTML-Chunks/Makefile
+++ b/www/p5-HTML-Chunks/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple nested template engine for HTML, XML and XHTML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTML-ContentExtractor/Makefile b/www/p5-HTML-ContentExtractor/Makefile
index 75180a8c892a..412a8f3db6be 100644
--- a/www/p5-HTML-ContentExtractor/Makefile
+++ b/www/p5-HTML-ContentExtractor/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	oleg@mamontov.net
 COMMENT=	Extract text contained within an HTML document
 
-RUN_DEPENDS=	p5-HTML-Tree>=3.13:${PORTSDIR}/www/p5-HTML-Tree			\
-		p5-HTML-TableExtract>=2.10:${PORTSDIR}/www/p5-HTML-TableExtract
+RUN_DEPENDS=	p5-HTML-Tree>=3.13:www/p5-HTML-Tree			\
+		p5-HTML-TableExtract>=2.10:www/p5-HTML-TableExtract
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-DOM/Makefile b/www/p5-HTML-DOM/Makefile
index 599007ec4436..9bdffb78df06 100644
--- a/www/p5-HTML-DOM/Makefile
+++ b/www/p5-HTML-DOM/Makefile
@@ -10,14 +10,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Implementation of the HTML Document Object Model
 
-BUILD_DEPENDS=	p5-CSS-DOM>=0:${PORTSDIR}/www/p5-CSS-DOM \
-		p5-HTML-Element-Library>=0:${PORTSDIR}/www/p5-HTML-Element-Library \
-		p5-HTML-Encoding>=0:${PORTSDIR}/www/p5-HTML-Encoding \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Hash-Util-FieldHash-Compat>=0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-constant-lexical>0:${PORTSDIR}/devel/p5-constant-lexical
+BUILD_DEPENDS=	p5-CSS-DOM>=0:www/p5-CSS-DOM \
+		p5-HTML-Element-Library>=0:www/p5-HTML-Element-Library \
+		p5-HTML-Encoding>=0:www/p5-HTML-Encoding \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Hash-Util-FieldHash-Compat>=0:devel/p5-Hash-Util-FieldHash-Compat \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-URI>=0:net/p5-URI \
+		p5-constant-lexical>0:devel/p5-constant-lexical
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Declare/Makefile b/www/p5-HTML-Declare/Makefile
index ea6a7dbb8eb3..79d96252baff 100644
--- a/www/p5-HTML-Declare/Makefile
+++ b/www/p5-HTML-Declare/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Very simple micro language to generate HTML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTML-Defaultify/Makefile b/www/p5-HTML-Defaultify/Makefile
index 1fe5ebe6f708..61fba3c90c85 100644
--- a/www/p5-HTML-Defaultify/Makefile
+++ b/www/p5-HTML-Defaultify/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	takefu@airport.fm
 COMMENT=	Perl module to populate HTML forms with default values
 
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-Diff/Makefile b/www/p5-HTML-Diff/Makefile
index b504cd28ec95..3d227a940c7d 100644
--- a/www/p5-HTML-Diff/Makefile
+++ b/www/p5-HTML-Diff/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hcoyote@ghostar.org
 COMMENT=	Perl module for finding changes between two strings of HTML
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Display/Makefile b/www/p5-HTML-Display/Makefile
index 475bd9739b0e..0c8268788e0b 100644
--- a/www/p5-HTML-Display/Makefile
+++ b/www/p5-HTML-Display/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Display HTML locally in a browser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-TokeParser-Simple>=2:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=5.69:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-TokeParser-Simple>=2:www/p5-HTML-TokeParser-Simple \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=5.69:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Harness>=2.30:${PORTSDIR}/devel/p5-Test-Harness
+TEST_DEPENDS=	p5-Test-Harness>=2.30:devel/p5-Test-Harness
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-HTML-Element-Extended/Makefile b/www/p5-HTML-Element-Extended/Makefile
index 21d83d5b80b0..ae42b81b280c 100644
--- a/www/p5-HTML-Element-Extended/Makefile
+++ b/www/p5-HTML-Element-Extended/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extended interface to HTML::Tree's HTML::Element class
 
-BUILD_DEPENDS=	p5-HTML-Tree>=3.01:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS=	p5-HTML-Tree>=3.01:www/p5-HTML-Tree
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Element-Library/Makefile b/www/p5-HTML-Element-Library/Makefile
index b677576cda9a..b914d7654bd5 100644
--- a/www/p5-HTML-Element-Library/Makefile
+++ b/www/p5-HTML-Element-Library/Makefile
@@ -12,16 +12,16 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTML::Element convenience functions
 
-BUILD_DEPENDS=	p5-Array-Group>=0:${PORTSDIR}/devel/p5-Array-Group \
-		p5-Data-Rmap>=0:${PORTSDIR}/devel/p5-Data-Rmap \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm \
-		p5-HTML-PrettyPrinter>=0:${PORTSDIR}/www/p5-HTML-PrettyPrinter \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-List-Rotation-Cycle>=0:${PORTSDIR}/devel/p5-List-Rotation-Cycle \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Scalar-Listify>=0:${PORTSDIR}/devel/p5-Scalar-Listify
+BUILD_DEPENDS=	p5-Array-Group>=0:devel/p5-Array-Group \
+		p5-Data-Rmap>=0:devel/p5-Data-Rmap \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
+		p5-HTML-PrettyPrinter>=0:www/p5-HTML-PrettyPrinter \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-List-Rotation-Cycle>=0:devel/p5-List-Rotation-Cycle \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Scalar-Listify>=0:devel/p5-Scalar-Listify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Element-Replacer/Makefile b/www/p5-HTML-Element-Replacer/Makefile
index ddf2a578b819..369cbf37d0fe 100644
--- a/www/p5-HTML-Element-Replacer/Makefile
+++ b/www/p5-HTML-Element-Replacer/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl HTML::Element replacer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Element-Library>=0:${PORTSDIR}/www/p5-HTML-Element-Library \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-HTML-Element-Library>=0:www/p5-HTML-Element-Library \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-HTML-PrettyPrinter>=0:${PORTSDIR}/www/p5-HTML-PrettyPrinter
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-HTML-PrettyPrinter>=0:www/p5-HTML-PrettyPrinter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-Encoding/Makefile b/www/p5-HTML-Encoding/Makefile
index 024da1480e81..1fb7b5c381e9 100644
--- a/www/p5-HTML-Encoding/Makefile
+++ b/www/p5-HTML-Encoding/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Determine the encoding of HTML/XML/XHTML documents
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-ExtractContent/Makefile b/www/p5-HTML-ExtractContent/Makefile
index 43e7433c4c0f..9815475e1010 100644
--- a/www/p5-HTML-ExtractContent/Makefile
+++ b/www/p5-HTML-ExtractContent/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lvalue>0:${PORTSDIR}/devel/p5-Class-Accessor-Lvalue \
-	p5-Exporter-Lite>0:${PORTSDIR}/devel/p5-Exporter-Lite \
-	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser
+	p5-Class-Accessor-Lvalue>0:devel/p5-Class-Accessor-Lvalue \
+	p5-Exporter-Lite>0:devel/p5-Exporter-Lite \
+	p5-HTML-Parser>0:www/p5-HTML-Parser
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-ExtractMain/Makefile b/www/p5-HTML-ExtractMain/Makefile
index 6e246488636b..be03acddf37d 100644
--- a/www/p5-HTML-ExtractMain/Makefile
+++ b/www/p5-HTML-ExtractMain/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl extension to extract main content of a web page
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-HTML-Tree>=3.23:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Object-Destroyer>=2:${PORTSDIR}/devel/p5-Object-Destroyer
+RUN_DEPENDS=	p5-HTML-Tree>=3.23:www/p5-HTML-Tree \
+		p5-Object-Destroyer>=2:devel/p5-Object-Destroyer
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-TEST_DEPENDS=	p5-File-Slurp>=9999.12:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-HTML-Format>=2.04:${PORTSDIR}/textproc/p5-HTML-Format
+TEST_DEPENDS=	p5-File-Slurp>=9999.12:devel/p5-File-Slurp \
+		p5-HTML-Format>=2.04:textproc/p5-HTML-Format
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-FillInForm-ForceUTF8/Makefile b/www/p5-HTML-FillInForm-ForceUTF8/Makefile
index 00a680eb80e9..c469e5e53b4b 100644
--- a/www/p5-HTML-FillInForm-ForceUTF8/Makefile
+++ b/www/p5-HTML-FillInForm-ForceUTF8/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	FillInForm with UTF-8 encoding
 
-RUN_DEPENDS=	p5-HTML-FillInForm>0:${PORTSDIR}/www/p5-HTML-FillInForm
+RUN_DEPENDS=	p5-HTML-FillInForm>0:www/p5-HTML-FillInForm
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-FillInForm/Makefile b/www/p5-HTML-FillInForm/Makefile
index e8068e2788c1..e945f7f16391 100644
--- a/www/p5-HTML-FillInForm/Makefile
+++ b/www/p5-HTML-FillInForm/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl5 module for auto-filling HTML form fields from previous values
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.26:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=3.26:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CGI>=0:${PORTSDIR}/www/p5-CGI
+TEST_DEPENDS=	p5-CGI>=0:www/p5-CGI
 
 INSTALL_TARGET=	pure_install
 USES=		perl5
diff --git a/www/p5-HTML-Form/Makefile b/www/p5-HTML-Form/Makefile
index 3d25f27ee3d8..8e6f8a93542e 100644
--- a/www/p5-HTML-Form/Makefile
+++ b/www/p5-HTML-Form/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Class that represents an HTML form element
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Message>=6.03:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-URI>=1.10:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTTP-Message>=6.03:www/p5-HTTP-Message \
+		p5-URI>=1.10:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-libwww-5*
diff --git a/www/p5-HTML-FormFu-Imager/Makefile b/www/p5-HTML-FormFu-Imager/Makefile
index 51e582bfdac6..e419ff78a458 100644
--- a/www/p5-HTML-FormFu-Imager/Makefile
+++ b/www/p5-HTML-FormFu-Imager/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Imager.pm helpers for HTML::FormFu file uploads
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone>=0.31:${PORTSDIR}/devel/p5-Clone \
-		p5-HTML-FormFu>=1:${PORTSDIR}/www/p5-HTML-FormFu \
-		p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
-		p5-Moose>=1:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Attribute-Chained>=1.0.1:${PORTSDIR}/devel/p5-MooseX-Attribute-Chained
+BUILD_DEPENDS=	p5-Clone>=0.31:devel/p5-Clone \
+		p5-HTML-FormFu>=1:www/p5-HTML-FormFu \
+		p5-Imager>=0:graphics/p5-Imager \
+		p5-Moose>=1:devel/p5-Moose \
+		p5-MooseX-Attribute-Chained>=1.0.1:devel/p5-MooseX-Attribute-Chained
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-FormFu-Model-DBIC/Makefile b/www/p5-HTML-FormFu-Model-DBIC/Makefile
index cfc1e50115b9..fd4418de27d8 100644
--- a/www/p5-HTML-FormFu-Model-DBIC/Makefile
+++ b/www/p5-HTML-FormFu-Model-DBIC/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Integrate HTML::FormFu with DBIx::Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBIx-Class>=0.08108:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-HTML-FormFu>=2.00:${PORTSDIR}/www/p5-HTML-FormFu \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBIx-Class>=0.08108:databases/p5-DBIx-Class \
+		p5-HTML-FormFu>=2.00:www/p5-HTML-FormFu \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DateTime-Format-SQLite>=0:${PORTSDIR}/devel/p5-DateTime-Format-SQLite \
-		p5-Locale-Maketext>=0:${PORTSDIR}/devel/p5-Locale-Maketext \
-		p5-SQL-Translator>=0.11016:${PORTSDIR}/databases/p5-SQL-Translator
+TEST_DEPENDS=	p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite \
+		p5-Locale-Maketext>=0:devel/p5-Locale-Maketext \
+		p5-SQL-Translator>=0.11016:databases/p5-SQL-Translator
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-FormFu/Makefile b/www/p5-HTML-FormFu/Makefile
index 61aa40aa3601..862074ca9252 100644
--- a/www/p5-HTML-FormFu/Makefile
+++ b/www/p5-HTML-FormFu/Makefile
@@ -14,33 +14,33 @@ COMMENT=	HTML Form Creation, Rendering and Validation Framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone>=0.31:${PORTSDIR}/devel/p5-Clone \
-		p5-Config-Any>=0.18:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Data-Visitor>=0.26:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-DateTime>=0.54:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0.79.01:${PORTSDIR}/devel/p5-DateTime-Format-Builder \
-		p5-DateTime-Format-Natural>=0:${PORTSDIR}/devel/p5-DateTime-Format-Natural \
-		p5-DateTime-Format-Strptime>=1.20:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime-Locale>=0.45:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber \
-		p5-HTML-TokeParser-Simple>=3.14:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
-		p5-HTTP-Message>=1.64:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Hash-Flatten>=0:${PORTSDIR}/devel/p5-Hash-Flatten \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Aliases>=0:${PORTSDIR}/devel/p5-MooseX-Aliases \
-		p5-Number-Format>=0:${PORTSDIR}/textproc/p5-Number-Format \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-YAML-LibYAML>=0.32:${PORTSDIR}/textproc/p5-YAML-LibYAML
+BUILD_DEPENDS=	p5-Clone>=0.31:devel/p5-Clone \
+		p5-Config-Any>=0.18:devel/p5-Config-Any \
+		p5-Data-Visitor>=0.26:devel/p5-Data-Visitor \
+		p5-DateTime>=0.54:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0.79.01:devel/p5-DateTime-Format-Builder \
+		p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
+		p5-DateTime-Format-Strptime>=1.20:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime-Locale>=0.45:devel/p5-DateTime-Locale \
+		p5-Email-Valid>=0:mail/p5-Email-Valid \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber \
+		p5-HTML-TokeParser-Simple>=3.14:www/p5-HTML-TokeParser-Simple \
+		p5-HTTP-Message>=1.64:www/p5-HTTP-Message \
+		p5-Hash-Flatten>=0:devel/p5-Hash-Flatten \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Aliases>=0:devel/p5-MooseX-Aliases \
+		p5-Number-Format>=0:textproc/p5-Number-Format \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-YAML-LibYAML>=0.32:textproc/p5-YAML-LibYAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.03:${PORTSDIR}/devel/p5-File-ShareDir-Install
-TEST_DEPENDS=	p5-Test-Aggregate>=0.371:${PORTSDIR}/devel/p5-Test-Aggregate \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install
+TEST_DEPENDS=	p5-Test-Aggregate>=0.371:devel/p5-Test-Aggregate \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-HTML-FormHandler/Makefile b/www/p5-HTML-FormHandler/Makefile
index 113f9bb71ab9..999e4ba2d8ed 100644
--- a/www/p5-HTML-FormHandler/Makefile
+++ b/www/p5-HTML-FormHandler/Makefile
@@ -15,36 +15,36 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Data-Clone>=0:${PORTSDIR}/devel/p5-Data-Clone \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-File-ShareDir-Install>=0.3:${PORTSDIR}/devel/p5-File-ShareDir-Install \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Locale-Maketext>=1.09:${PORTSDIR}/devel/p5-Locale-Maketext \
-		p5-Moose>=2.1403:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0.16:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-Types-Common>=0:${PORTSDIR}/devel/p5-MooseX-Types-Common \
-		p5-MooseX-Types-LoadableClass>=0.006:${PORTSDIR}/devel/p5-MooseX-Types-LoadableClass \
-		p5-MooseX-Types>=0.20:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0.09:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Class-Load>=0.06:devel/p5-Class-Load \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-Data-Clone>=0:devel/p5-Data-Clone \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Email-Valid>=0:mail/p5-Email-Valid \
+		p5-File-ShareDir-Install>=0.3:devel/p5-File-ShareDir-Install \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Locale-Maketext>=1.09:devel/p5-Locale-Maketext \
+		p5-Moose>=2.1403:devel/p5-Moose \
+		p5-MooseX-Getopt>=0.16:devel/p5-MooseX-Getopt \
+		p5-MooseX-Types-Common>=0:devel/p5-MooseX-Types-Common \
+		p5-MooseX-Types-LoadableClass>=0.006:devel/p5-MooseX-Types-LoadableClass \
+		p5-MooseX-Types>=0.20:devel/p5-MooseX-Types \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-namespace-autoclean>=0.09:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Type-Tiny>=0:devel/p5-Type-Tiny \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 
 NO_ARCH=	yes
 USES=		perl5
@@ -53,8 +53,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-HTML-FromANSI/Makefile b/www/p5-HTML-FromANSI/Makefile
index 3e75677763ed..d90742927f75 100644
--- a/www/p5-HTML-FromANSI/Makefile
+++ b/www/p5-HTML-FromANSI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mark up ANSI sequences as HTML
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Term-VT102-Boundless>=0:${PORTSDIR}/devel/p5-Term-VT102-Boundless
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Term-VT102-Boundless>=0:devel/p5-Term-VT102-Boundless
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -21,7 +21,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-HTML-FromText/Makefile b/www/p5-HTML-FromText/Makefile
index d969b69de588..f2c6ba3f82fa 100644
--- a/www/p5-HTML-FromText/Makefile
+++ b/www/p5-HTML-FromText/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Mark up text as HTML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Find>=0.09:${PORTSDIR}/mail/p5-Email-Find \
-		p5-HTML-Parser>=1.26:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-Email-Find>=0.09:mail/p5-Email-Find \
+		p5-HTML-Parser>=1.26:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-GenToc/Makefile b/www/p5-HTML-GenToc/Makefile
index ac1cf22b1ee0..a2456e001e79 100644
--- a/www/p5-HTML-GenToc/Makefile
+++ b/www/p5-HTML-GenToc/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate a Table of Contents for HTML documents
 
-BUILD_DEPENDS=	p5-HTML-LinkList>=0.1501:${PORTSDIR}/www/p5-HTML-LinkList \
-		p5-HTML-SimpleParse>=0.10:${PORTSDIR}/www/p5-HTML-SimpleParse \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Getopt-ArgvFile>=1.09:${PORTSDIR}/devel/p5-Getopt-ArgvFile
+BUILD_DEPENDS=	p5-HTML-LinkList>=0.1501:www/p5-HTML-LinkList \
+		p5-HTML-SimpleParse>=0.10:www/p5-HTML-SimpleParse \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Getopt-ArgvFile>=1.09:devel/p5-Getopt-ArgvFile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-GoogleMaps/Makefile b/www/p5-HTML-GoogleMaps/Makefile
index 214b2030cd72..62f7c4df72c2 100644
--- a/www/p5-HTML-GoogleMaps/Makefile
+++ b/www/p5-HTML-GoogleMaps/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Simple wrapper around the Google Maps API
 
-RUN_DEPENDS=	p5-Geo-Coder-Google>=0.02:${PORTSDIR}/misc/p5-Geo-Coder-Google
+RUN_DEPENDS=	p5-Geo-Coder-Google>=0.02:misc/p5-Geo-Coder-Google
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-LinkExtractor/Makefile b/www/p5-HTML-LinkExtractor/Makefile
index a09eb574aa60..e124fce745a3 100644
--- a/www/p5-HTML-LinkExtractor/Makefile
+++ b/www/p5-HTML-LinkExtractor/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-0.13
 MAINTAINER=	lars.eggert@gmx.net
 COMMENT=	HTML::LinkExtractor is used for extracting links from HTML
 
-BUILD_DEPENDS=	p5-HTML-TokeParser-Simple>=0:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Lint/Makefile b/www/p5-HTML-Lint/Makefile
index 6749232f7687..381ca2505051 100644
--- a/www/p5-HTML-Lint/Makefile
+++ b/www/p5-HTML-Lint/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	HTML::Lint - check for HTML errors in a string or file
 
-BUILD_DEPENDS=	p5-HTML-Tagset>0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Tagset>0:www/p5-HTML-Tagset \
+		p5-libwww>0:www/p5-libwww \
+		p5-HTML-Parser>0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Location/Makefile b/www/p5-HTML-Location/Makefile
index 52b2ddf05923..a1c6abb35dd1 100644
--- a/www/p5-HTML-Location/Makefile
+++ b/www/p5-HTML-Location/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	coryking@mozimedia.com
 COMMENT=	Working with disk to URI file mappings (deprecated: see URI::ToDisk)
 
-BUILD_DEPENDS=	p5-Clone>=0.23:${PORTSDIR}/devel/p5-Clone \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	p5-Clone>=0.23:${PORTSDIR}/devel/p5-Clone \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Clone>=0.23:devel/p5-Clone \
+		p5-URI>=1.35:net/p5-URI
+RUN_DEPENDS=	p5-Clone>=0.23:devel/p5-Clone \
+		p5-URI>=1.35:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-Mason-PSGIHandler/Makefile b/www/p5-HTML-Mason-PSGIHandler/Makefile
index c7e2d1804579..39da36c0b5b1 100644
--- a/www/p5-HTML-Mason-PSGIHandler/Makefile
+++ b/www/p5-HTML-Mason-PSGIHandler/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	PSGI handler for HTML::Mason
 
-BUILD_DEPENDS=	p5-CGI-PSGI>0:${PORTSDIR}/www/p5-CGI-PSGI \
-		p5-HTML-Mason>0:${PORTSDIR}/www/p5-HTML-Mason
+BUILD_DEPENDS=	p5-CGI-PSGI>0:www/p5-CGI-PSGI \
+		p5-HTML-Mason>0:www/p5-HTML-Mason
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Plack>=0:${PORTSDIR}/www/p5-Plack
+TEST_DEPENDS=	p5-Plack>=0:www/p5-Plack
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 7179ffae7abe..093f2ce207da 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -12,24 +12,24 @@ COMMENT=	High-performance, dynamic web site authoring system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-Cache>=1:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Class-Container>=0.07:${PORTSDIR}/devel/p5-Class-Container \
-		p5-Exception-Class>=1.15:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Log-Any>=0.08:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Params-Validate>=0.70:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Cache-Cache>=1:devel/p5-Cache-Cache \
+		p5-Class-Container>=0.07:devel/p5-Class-Container \
+		p5-Exception-Class>=1.15:devel/p5-Exception-Class \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Log-Any>=0.08:devel/p5-Log-Any \
+		p5-Params-Validate>=0.70:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CHI>=0.210:${PORTSDIR}/devel/p5-CHI \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
+TEST_DEPENDS=	p5-CHI>=0.210:devel/p5-CHI \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
 
 OPTIONS_DEFINE=	MODPERL
 
 USES=		perl5
 USE_PERL5=	configure
 
-MODPERL_BUILD_DEPENDS=	p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2
-MODPERL_RUN_DEPENDS=	p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2
+MODPERL_BUILD_DEPENDS=	p5-libapreq2>=0:www/p5-libapreq2
+MODPERL_RUN_DEPENDS=	p5-libapreq2>=0:www/p5-libapreq2
 MODPERL_USE=		APACHE_RUN=22+
 
 post-patch:
diff --git a/www/p5-HTML-MobileConverter/Makefile b/www/p5-HTML-MobileConverter/Makefile
index a2ebb934f3e4..5905e1497f6f 100644
--- a/www/p5-HTML-MobileConverter/Makefile
+++ b/www/p5-HTML-MobileConverter/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dliakh@ukr.net
 COMMENT=	HTML Converter for mobile agent
 
-RUN_DEPENDS=	p5-HTML-Parser>=3.45:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=1.33:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-HTML-Parser>=3.45:www/p5-HTML-Parser \
+		p5-URI>=1.33:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-Pager/Makefile b/www/p5-HTML-Pager/Makefile
index b85b2cd85e75..cf16556ffb77 100644
--- a/www/p5-HTML-Pager/Makefile
+++ b/www/p5-HTML-Pager/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module for handling CGI HTML paging of arbitrary data
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
+BUILD_DEPENDS=	p5-HTML-Template>=0:www/p5-HTML-Template
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Parser-Simple/Makefile b/www/p5-HTML-Parser-Simple/Makefile
index 0ab933c47e71..924223eed79e 100644
--- a/www/p5-HTML-Parser-Simple/Makefile
+++ b/www/p5-HTML-Parser-Simple/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Parse nice HTML files without needing a compiler
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Moo>=1.003001:${PORTSDIR}/devel/p5-Moo \
-		p5-Tree-Simple>=1.22:${PORTSDIR}/devel/p5-Tree-Simple
+BUILD_DEPENDS=	p5-Moo>=1.003001:devel/p5-Moo \
+		p5-Tree-Simple>=1.22:devel/p5-Tree-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index 98cd73c3fc24..d7e6a65f10d8 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Perl5 module for parsing HTML documents
 
-RUN_DEPENDS=	p5-HTML-Tagset>=3:${PORTSDIR}/www/p5-HTML-Tagset
+RUN_DEPENDS=	p5-HTML-Tagset>=3:www/p5-HTML-Tagset
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index b7fe2aa716fd..f9550f315cb8 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Generate nice HTML files from HTML syntax trees
 
-BUILD_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS=	p5-HTML-Tree>=0:www/p5-HTML-Tree
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Prototype/Makefile b/www/p5-HTML-Prototype/Makefile
index 428d8d6a99e4..872b79336e8c 100644
--- a/www/p5-HTML-Prototype/Makefile
+++ b/www/p5-HTML-Prototype/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate HTML and JavaScript for the Prototype library
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Query/Makefile b/www/p5-HTML-Query/Makefile
index 47c33fc9555e..a2e8d8cfdc64 100644
--- a/www/p5-HTML-Query/Makefile
+++ b/www/p5-HTML-Query/Makefile
@@ -14,8 +14,8 @@ COMMENT=	JQuery-like selection queries for HTML::Element
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS+=	p5-Badger>=0.03:${PORTSDIR}/devel/p5-Badger \
-		p5-HTML-Tree>=3.23:${PORTSDIR}/www/p5-HTML-Tree
+RUN_DEPENDS+=	p5-Badger>=0.03:devel/p5-Badger \
+		p5-HTML-Tree>=3.23:www/p5-HTML-Tree
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-RSSAutodiscovery/Makefile b/www/p5-HTML-RSSAutodiscovery/Makefile
index 01742b3aa8ea..b6543e3ea9e5 100644
--- a/www/p5-HTML-RSSAutodiscovery/Makefile
+++ b/www/p5-HTML-RSSAutodiscovery/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Methods for retrieving RSS-ish information from an HTML document
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTML-ResolveLink/Makefile b/www/p5-HTML-ResolveLink/Makefile
index 4e5184ff6c82..b6bd3058c204 100644
--- a/www/p5-HTML-ResolveLink/Makefile
+++ b/www/p5-HTML-ResolveLink/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Resolve relative links in (X)HTML into absolute URI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Restrict/Makefile b/www/p5-HTML-Restrict/Makefile
index d91baa840fba..9afda753e253 100644
--- a/www/p5-HTML-Restrict/Makefile
+++ b/www/p5-HTML-Restrict/Makefile
@@ -13,13 +13,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
-	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Moo>=1.002000:${PORTSDIR}/devel/p5-Moo \
-	p5-Type-Tiny>=1.000001:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-URI>0:${PORTSDIR}/net/p5-URI \
-	p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+	p5-Data-Dump>0:devel/p5-Data-Dump \
+	p5-HTML-Parser>0:www/p5-HTML-Parser \
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-Moo>=1.002000:devel/p5-Moo \
+	p5-Type-Tiny>=1.000001:devel/p5-Type-Tiny \
+	p5-URI>0:net/p5-URI \
+	p5-namespace-clean>0:devel/p5-namespace-clean
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-RobotsMETA/Makefile b/www/p5-HTML-RobotsMETA/Makefile
index 8fa3161197ae..ad6b87df447a 100644
--- a/www/p5-HTML-RobotsMETA/Makefile
+++ b/www/p5-HTML-RobotsMETA/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Parse HTML For Robots Exclusion META Markup
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=3:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Scrubber/Makefile b/www/p5-HTML-Scrubber/Makefile
index c91026e03a47..9349f920f0ce 100644
--- a/www/p5-HTML-Scrubber/Makefile
+++ b/www/p5-HTML-Scrubber/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl extension for scrubbing/sanitizing html
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.47:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=3.47:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-CPAN-Meta>=0:${PORTSDIR}/devel/p5-Test-CPAN-Meta \
-		p5-Test-EOL>=0:${PORTSDIR}/devel/p5-Test-EOL \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-NoTabs>=0:${PORTSDIR}/devel/p5-Test-NoTabs
+TEST_DEPENDS=	p5-Test-CPAN-Meta>=0:devel/p5-Test-CPAN-Meta \
+		p5-Test-EOL>=0:devel/p5-Test-EOL \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-NoTabs>=0:devel/p5-Test-NoTabs
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-HTML-Seamstress/Makefile b/www/p5-HTML-Seamstress/Makefile
index e8540c2978eb..aef47649387f 100644
--- a/www/p5-HTML-Seamstress/Makefile
+++ b/www/p5-HTML-Seamstress/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTML::Tree subclass for HTML templating via tree rewriting
 
-BUILD_DEPENDS=	p5-Class-Prototyped>=0:${PORTSDIR}/devel/p5-Class-Prototyped \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-HTML-Element-Library>=0:${PORTSDIR}/www/p5-HTML-Element-Library \
-		p5-HTML-Element-Replacer>=0:${PORTSDIR}/www/p5-HTML-Element-Replacer \
-		p5-HTML-PrettyPrinter>=0:${PORTSDIR}/www/p5-HTML-PrettyPrinter \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS=	p5-Class-Prototyped>=0:devel/p5-Class-Prototyped \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-HTML-Element-Library>=0:www/p5-HTML-Element-Library \
+		p5-HTML-Element-Replacer>=0:www/p5-HTML-Element-Replacer \
+		p5-HTML-PrettyPrinter>=0:www/p5-HTML-PrettyPrinter \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/www/p5-HTML-Selector-XPath/Makefile b/www/p5-HTML-Selector-XPath/Makefile
index 847123bc34d8..88f18db575ae 100644
--- a/www/p5-HTML-Selector-XPath/Makefile
+++ b/www/p5-HTML-Selector-XPath/Makefile
@@ -14,7 +14,7 @@ COMMENT=	HTML::Selector::XPath - CSS Selector to XPath compiler
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base
+TEST_DEPENDS=	p5-Test-Base>=0:devel/p5-Test-Base
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-Shakan/Makefile b/www/p5-HTML-Shakan/Makefile
index 63b48574785f..31b03ab63e0a 100644
--- a/www/p5-HTML-Shakan/Makefile
+++ b/www/p5-HTML-Shakan/Makefile
@@ -15,19 +15,19 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Email-Valid-Loose>=0.05:${PORTSDIR}/mail/p5-Email-Valid-Loose \
-	p5-FormValidator-Lite>=0.24:${PORTSDIR}/textproc/p5-FormValidator-Lite \
-	p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Mouse>=0.90,1:${PORTSDIR}/devel/p5-Mouse
+	p5-Email-Valid-Loose>=0.05:mail/p5-Email-Valid-Loose \
+	p5-FormValidator-Lite>=0.24:textproc/p5-FormValidator-Lite \
+	p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+	p5-Mouse>=0.90,1:devel/p5-Mouse
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Lingua-JA-Regular-Unicode>0:${PORTSDIR}/japanese/p5-Lingua-JA-Regular-Unicode \
-	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-	p5-DateTime-Format-HTTP>0:${PORTSDIR}/devel/p5-DateTime-Format-HTTP \
-	p5-Data-Model>0:${PORTSDIR}/devel/p5-Data-Model \
-	p5-DBIx-Skinny>0:${PORTSDIR}/databases/p5-DBIx-Skinny \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Lingua-JA-Regular-Unicode>0:japanese/p5-Lingua-JA-Regular-Unicode \
+	p5-DateTime>0:devel/p5-DateTime \
+	p5-DateTime-Format-HTTP>0:devel/p5-DateTime-Format-HTTP \
+	p5-Data-Model>0:devel/p5-Data-Model \
+	p5-DBIx-Skinny>0:databases/p5-DBIx-Skinny \
+	p5-Plack>0:www/p5-Plack
 
 USES=	perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-HTML-SimpleLinkExtor/Makefile b/www/p5-HTML-SimpleLinkExtor/Makefile
index 780678d95230..c2b5e1ee9d00 100644
--- a/www/p5-HTML-SimpleLinkExtor/Makefile
+++ b/www/p5-HTML-SimpleLinkExtor/Makefile
@@ -14,11 +14,11 @@ COMMENT=	This is a simple HTML link extractor
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=1.28:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=1.09:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=1.28:www/p5-HTML-Parser \
+		p5-URI>=1.09:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile b/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
index 5cb07402058c..d4df94422f94 100644
--- a/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
+++ b/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to add guid in query for DoCoMo imode
 
 RUN_DEPENDS=	\
-	p5-HTML-StickyQuery>0:${PORTSDIR}/www/p5-HTML-StickyQuery
+	p5-HTML-StickyQuery>0:www/p5-HTML-StickyQuery
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-StickyQuery/Makefile b/www/p5-HTML-StickyQuery/Makefile
index f338c2c58774..b094f2bca757 100644
--- a/www/p5-HTML-StickyQuery/Makefile
+++ b/www/p5-HTML-StickyQuery/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Add sticky QUERY_STRING to a tag href attributes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Strip/Makefile b/www/p5-HTML-Strip/Makefile
index 9a0a546313b8..c35ef2759600 100644
--- a/www/p5-HTML-Strip/Makefile
+++ b/www/p5-HTML-Strip/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl5 module for strip HTML tag
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-StripScripts-Parser/Makefile b/www/p5-HTML-StripScripts-Parser/Makefile
index e346b817f045..ac48807d9a3b 100644
--- a/www/p5-HTML-StripScripts-Parser/Makefile
+++ b/www/p5-HTML-StripScripts-Parser/Makefile
@@ -14,8 +14,8 @@ COMMENT=	XSS filter using HTML::Parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.56:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-StripScripts>=1.05:${PORTSDIR}/www/p5-HTML-StripScripts
+BUILD_DEPENDS=	p5-HTML-Parser>=3.56:www/p5-HTML-Parser \
+		p5-HTML-StripScripts>=1.05:www/p5-HTML-StripScripts
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Summary/Makefile b/www/p5-HTML-Summary/Makefile
index 30d6231efc9f..bb8f7bf7d93d 100644
--- a/www/p5-HTML-Summary/Makefile
+++ b/www/p5-HTML-Summary/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Produces summaries from the textual content of web pages
 
-BUILD_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		ja-p5-Jcode>=2.06:${PORTSDIR}/japanese/p5-Jcode
-RUN_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		ja-p5-Jcode>=2.06:${PORTSDIR}/japanese/p5-Jcode
+BUILD_DEPENDS=	p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		ja-p5-Jcode>=2.06:japanese/p5-Jcode
+RUN_DEPENDS=	p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		ja-p5-Jcode>=2.06:japanese/p5-Jcode
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-TableContentParser/Makefile b/www/p5-HTML-TableContentParser/Makefile
index a9b9c538b1bb..5fd4cb281f19 100644
--- a/www/p5-HTML-TableContentParser/Makefile
+++ b/www/p5-HTML-TableContentParser/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Do interesting things with the contents of tables
 
-RUN_DEPENDS=	p5-HTML-Parser>=3.68:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS=	p5-HTML-Parser>=3.68:www/p5-HTML-Parser
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index 32ab2a2b6727..ebd43ae5d46d 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Extract text contained in tables within an HTML document
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Element-Extended>=1.17:${PORTSDIR}/www/p5-HTML-Element-Extended \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Element-Extended>=1.17:www/p5-HTML-Element-Extended \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-TableParser/Makefile b/www/p5-HTML-TableParser/Makefile
index 92f1d5c1626a..42845aef9b87 100644
--- a/www/p5-HTML-TableParser/Makefile
+++ b/www/p5-HTML-TableParser/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extract data from an HTML table
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.36:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=3.36:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-TableTiler/Makefile b/www/p5-HTML-TableTiler/Makefile
index 6c84e47afa34..0cf2999d1506 100644
--- a/www/p5-HTML-TableTiler/Makefile
+++ b/www/p5-HTML-TableTiler/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module generate a HTML table from bidimensional array data
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-IO-Util>=0:${PORTSDIR}/devel/p5-IO-Util
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-IO-Util>=0:devel/p5-IO-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-TagCloud-Extended/Makefile b/www/p5-HTML-TagCloud-Extended/Makefile
index 43d3471a2e7e..4ec36842d4a4 100644
--- a/www/p5-HTML-TagCloud-Extended/Makefile
+++ b/www/p5-HTML-TagCloud-Extended/Makefile
@@ -14,9 +14,9 @@ COMMENT=	HTML::TagCloud extension for time-stamp based coloring of tags
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Readonly>=0:devel/p5-Readonly
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Template-Associate/Makefile b/www/p5-HTML-Template-Associate/Makefile
index fcd1f7d8f70a..c780d24ec55b 100644
--- a/www/p5-HTML-Template-Associate/Makefile
+++ b/www/p5-HTML-Template-Associate/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Bridges gap between HTML::Template and other modules
 
-RUN_DEPENDS=	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-Data-FormValidator>=0:${PORTSDIR}/textproc/p5-Data-FormValidator
+RUN_DEPENDS=	p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Template-Compiled/Makefile b/www/p5-HTML-Template-Compiled/Makefile
index 0bd729feecd9..6bd8e6a80576 100644
--- a/www/p5-HTML-Template-Compiled/Makefile
+++ b/www/p5-HTML-Template-Compiled/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Templating system that compiles HTML::Template files to Perl code
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-HTML-Template-Expr/Makefile b/www/p5-HTML-Template-Expr/Makefile
index 9a569e1277e1..53aa7826c125 100644
--- a/www/p5-HTML-Template-Expr/Makefile
+++ b/www/p5-HTML-Template-Expr/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl module to use HTML Templates which allows expressions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=    p5-HTML-Template>=2.4:${PORTSDIR}/www/p5-HTML-Template \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+RUN_DEPENDS=    p5-HTML-Template>=2.4:www/p5-HTML-Template \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 BUILD_DEPENDS=  ${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Template-HashWrapper/Makefile b/www/p5-HTML-Template-HashWrapper/Makefile
index c802db104643..71c23d7bed29 100644
--- a/www/p5-HTML-Template-HashWrapper/Makefile
+++ b/www/p5-HTML-Template-HashWrapper/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy way to use the associate option from HTML::Template
 
-BUILD_DEPENDS=	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
+BUILD_DEPENDS=	p5-HTML-Template>=0:www/p5-HTML-Template
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Template-JIT/Makefile b/www/p5-HTML-Template-JIT/Makefile
index 023953b7387c..29a747e7447d 100644
--- a/www/p5-HTML-Template-JIT/Makefile
+++ b/www/p5-HTML-Template-JIT/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl module to compile HTML Templates with Inline::C
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-HTML-Template>=2.8:${PORTSDIR}/www/p5-HTML-Template \
-		p5-Inline>=0.43:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-HTML-Template>=2.8:www/p5-HTML-Template \
+		p5-Inline>=0.43:devel/p5-Inline \
+		p5-Inline-C>=0:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Template-Pluggable/Makefile b/www/p5-HTML-Template-Pluggable/Makefile
index d33a90cc4428..544a878678c1 100644
--- a/www/p5-HTML-Template-Pluggable/Makefile
+++ b/www/p5-HTML-Template-Pluggable/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Extends HTML::Template with plugin support
 
-BUILD_DEPENDS=	p5-HTML-Template>=2.7:${PORTSDIR}/www/p5-HTML-Template \
-		p5-Test-MockObject>=1:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Class-Trigger>=0:${PORTSDIR}/devel/p5-Class-Trigger
+BUILD_DEPENDS=	p5-HTML-Template>=2.7:www/p5-HTML-Template \
+		p5-Test-MockObject>=1:devel/p5-Test-MockObject \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Class-Trigger>=0:devel/p5-Class-Trigger
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Template-Pro/Makefile b/www/p5-HTML-Template-Pro/Makefile
index 128abab8b5cf..09faf7ec5a6c 100644
--- a/www/p5-HTML-Template-Pro/Makefile
+++ b/www/p5-HTML-Template-Pro/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to use HTML Templates from CGI scripts
 
 RUN_DEPENDS=	\
-	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON
+	p5-JSON>=2:converters/p5-JSON
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Toc/Makefile b/www/p5-HTML-Toc/Makefile
index 9ed50dae725b..82c04b5c4f0d 100644
--- a/www/p5-HTML-Toc/Makefile
+++ b/www/p5-HTML-Toc/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	alex.deiter@gmail.com
 COMMENT=	Generate, insert and update HTML Table of Contents
 
-BUILD_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-TokeParser-Simple/Makefile b/www/p5-HTML-TokeParser-Simple/Makefile
index 48c6da9e593e..4cc8b68fb127 100644
--- a/www/p5-HTML-TokeParser-Simple/Makefile
+++ b/www/p5-HTML-TokeParser-Simple/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Subclass of HTML::TokeParser with easy-to-remember method calls
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Sub-Override>=0:${PORTSDIR}/devel/p5-Sub-Override
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Sub-Override>=0:devel/p5-Sub-Override
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 0aa41c8e8f12..c386589e06fc 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -15,10 +15,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.46:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tagset>=3.02:${PORTSDIR}/www/p5-HTML-Tagset
+BUILD_DEPENDS=	p5-HTML-Parser>=3.46:www/p5-HTML-Parser \
+		p5-HTML-Tagset>=3.02:www/p5-HTML-Tagset
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 #NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-HTML-TreeBuilder-LibXML/Makefile b/www/p5-HTML-TreeBuilder-LibXML/Makefile
index 92486f8f1a1b..191bd4034dde 100644
--- a/www/p5-HTML-TreeBuilder-LibXML/Makefile
+++ b/www/p5-HTML-TreeBuilder-LibXML/Makefile
@@ -15,9 +15,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 # Do not add p5-Web-Query and p5-Web-Scraper to TEST_DEPENDS to avoid cyclic dependency loop
-BUILD_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter \
-		p5-HTML-TreeBuilder-XPath>=0.14:${PORTSDIR}/www/p5-HTML-TreeBuilder-XPath \
-		p5-XML-LibXML>=1.70:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Filter>=0:devel/p5-Filter \
+		p5-HTML-TreeBuilder-XPath>=0.14:www/p5-HTML-TreeBuilder-XPath \
+		p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTML-TreeBuilder-XPath/Makefile b/www/p5-HTML-TreeBuilder-XPath/Makefile
index 17f5255484b6..e23fc761cd54 100644
--- a/www/p5-HTML-TreeBuilder-XPath/Makefile
+++ b/www/p5-HTML-TreeBuilder-XPath/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Add XPath support to HTML::TreeBuilder
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-XML-XPathEngine>=0.12:${PORTSDIR}/textproc/p5-XML-XPathEngine
+BUILD_DEPENDS=	p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-XML-XPathEngine>=0.12:textproc/p5-XML-XPathEngine
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-DokuWiki/Makefile b/www/p5-HTML-WikiConverter-DokuWiki/Makefile
index 78270be5bf44..564553574002 100644
--- a/www/p5-HTML-WikiConverter-DokuWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-DokuWiki/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to DokuWiki markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-GoogleCode/Makefile b/www/p5-HTML-WikiConverter-GoogleCode/Makefile
index d570e0e85329..d89a8813bf7d 100644
--- a/www/p5-HTML-WikiConverter-GoogleCode/Makefile
+++ b/www/p5-HTML-WikiConverter-GoogleCode/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to Google Code wiki markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-Kwiki/Makefile b/www/p5-HTML-WikiConverter-Kwiki/Makefile
index 5cc84147cc9c..c543ba7e5f29 100644
--- a/www/p5-HTML-WikiConverter-Kwiki/Makefile
+++ b/www/p5-HTML-WikiConverter-Kwiki/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert HTML to Kwiki markup
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-Markdown/Makefile b/www/p5-HTML-WikiConverter-Markdown/Makefile
index d46b10503baa..ec829db53664 100644
--- a/www/p5-HTML-WikiConverter-Markdown/Makefile
+++ b/www/p5-HTML-WikiConverter-Markdown/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to Markdown markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.67:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.67:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-MediaWiki/Makefile b/www/p5-HTML-WikiConverter-MediaWiki/Makefile
index 5936e8dbd42e..6ad2dc650ce5 100644
--- a/www/p5-HTML-WikiConverter-MediaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-MediaWiki/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert HTML to MediaWiki markup
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.63:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.63:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-MoinMoin/Makefile b/www/p5-HTML-WikiConverter-MoinMoin/Makefile
index 02942df51ba0..ac3149ad25e8 100644
--- a/www/p5-HTML-WikiConverter-MoinMoin/Makefile
+++ b/www/p5-HTML-WikiConverter-MoinMoin/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to MoinMoin markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-Oddmuse/Makefile b/www/p5-HTML-WikiConverter-Oddmuse/Makefile
index 1a9553e3f2ce..ec91cf0651f6 100644
--- a/www/p5-HTML-WikiConverter-Oddmuse/Makefile
+++ b/www/p5-HTML-WikiConverter-Oddmuse/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert HTML to Oddmuse markup
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-PbWiki/Makefile b/www/p5-HTML-WikiConverter-PbWiki/Makefile
index 9c8ba6c21cc9..ae0e7b805b45 100644
--- a/www/p5-HTML-WikiConverter-PbWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PbWiki/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to PbWiki markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-PhpWiki/Makefile b/www/p5-HTML-WikiConverter-PhpWiki/Makefile
index 9e85cf7ed636..e1b9671b8c3c 100644
--- a/www/p5-HTML-WikiConverter-PhpWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PhpWiki/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert HTML to PhpWiki markup
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-PmWiki/Makefile b/www/p5-HTML-WikiConverter-PmWiki/Makefile
index d30bc9c95083..502b44966cc7 100644
--- a/www/p5-HTML-WikiConverter-PmWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PmWiki/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to PmWiki markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-SnipSnap/Makefile b/www/p5-HTML-WikiConverter-SnipSnap/Makefile
index cf993e627d27..7ada95e130d9 100644
--- a/www/p5-HTML-WikiConverter-SnipSnap/Makefile
+++ b/www/p5-HTML-WikiConverter-SnipSnap/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to SnipSnap markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-Socialtext/Makefile b/www/p5-HTML-WikiConverter-Socialtext/Makefile
index a0cd7b95c43b..63b5f10df6ff 100644
--- a/www/p5-HTML-WikiConverter-Socialtext/Makefile
+++ b/www/p5-HTML-WikiConverter-Socialtext/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert HTML to Socialtext markup
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-TikiWiki/Makefile b/www/p5-HTML-WikiConverter-TikiWiki/Makefile
index a1011e291f5a..8266e83149bf 100644
--- a/www/p5-HTML-WikiConverter-TikiWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-TikiWiki/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to TikiWiki markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-UseMod/Makefile b/www/p5-HTML-WikiConverter-UseMod/Makefile
index b4eacd8dad6f..961025ce41df 100644
--- a/www/p5-HTML-WikiConverter-UseMod/Makefile
+++ b/www/p5-HTML-WikiConverter-UseMod/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to UseMod markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-WakkaWiki/Makefile b/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
index 8b336b772bb6..a61b41b6baf9 100644
--- a/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert HTML to WakkaWiki markup
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter-WikkaWiki/Makefile b/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
index 530fd1eed61a..6c30816273b4 100644
--- a/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert HTML to WikkaWiki markup
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:${PORTSDIR}/www/p5-HTML-WikiConverter \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.54:www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTML-WikiConverter/Makefile b/www/p5-HTML-WikiConverter/Makefile
index f794a8acad2b..e60ad0e88e6b 100644
--- a/www/p5-HTML-WikiConverter/Makefile
+++ b/www/p5-HTML-WikiConverter/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTML to wiki markup converter
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0.02:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Params-Validate>=0.77:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-CSS>=0:${PORTSDIR}/textproc/p5-CSS \
-		p5-HTML-Parser>=3.34:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tagset>=3.04:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-HTML-Tree>=3.18:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable \
+		p5-Params-Validate>=0.77:devel/p5-Params-Validate \
+		p5-CSS>=0:textproc/p5-CSS \
+		p5-HTML-Parser>=3.34:www/p5-HTML-Parser \
+		p5-HTML-Tagset>=3.04:www/p5-HTML-Tagset \
+		p5-HTML-Tree>=3.18:www/p5-HTML-Tree \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Async/Makefile b/www/p5-HTTP-Async/Makefile
index dc8469bda635..da1a0666caf2 100644
--- a/www/p5-HTTP-Async/Makefile
+++ b/www/p5-HTTP-Async/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Process multiple HTTP requests in parallel without blocking
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-Net-HTTPS-NB>=0.13:${PORTSDIR}/net/p5-Net-HTTPS-NB \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-Net-HTTPS-NB>=0.13:net/p5-Net-HTTPS-NB \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-Test-HTTP-Server-Simple \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-HTTP-Server-Simple>=0:www/p5-Test-HTTP-Server-Simple \
+		p5-Test-TCP>=0:devel/p5-Test-TCP
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-HTTP-Body/Makefile b/www/p5-HTTP-Body/Makefile
index 8c3e5c5e0825..2ecc19db2a5f 100644
--- a/www/p5-HTTP-Body/Makefile
+++ b/www/p5-HTTP-Body/Makefile
@@ -14,11 +14,11 @@ COMMENT=	HTTP Body Parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Cache-Transparent/Makefile b/www/p5-HTTP-Cache-Transparent/Makefile
index 8c5da66d8dc1..fcb8a093253c 100644
--- a/www/p5-HTTP-Cache-Transparent/Makefile
+++ b/www/p5-HTTP-Cache-Transparent/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Implementation of http get that keeps a local cache of fetched pages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-CookieJar/Makefile b/www/p5-HTTP-CookieJar/Makefile
index 8f89f2560eea..27a19dec2ce4 100644
--- a/www/p5-HTTP-CookieJar/Makefile
+++ b/www/p5-HTTP-CookieJar/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Minimalist HTTP user agent cookie jar
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date
+BUILD_DEPENDS=	p5-HTTP-Date>=0:www/p5-HTTP-Date
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Mozilla-PublicSuffix>=0:${PORTSDIR}/dns/p5-Mozilla-PublicSuffix \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Mozilla-PublicSuffix>=0:dns/p5-Mozilla-PublicSuffix \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-CookieMonster/Makefile b/www/p5-HTTP-CookieMonster/Makefile
index 67aba21fef4b..3377dba66d98 100644
--- a/www/p5-HTTP-CookieMonster/Makefile
+++ b/www/p5-HTTP-CookieMonster/Makefile
@@ -17,11 +17,11 @@ DEPRECATED=	Broken for more than 6 months
 EXPIRATION_DATE=	2016-04-15
 
 RUN_DEPENDS=	\
-	p5-HTTP-Cookies>0:${PORTSDIR}/www/p5-HTTP-Cookies \
-	p5-Moo>=1.000003:${PORTSDIR}/devel/p5-Moo \
-	p5-Safe-Isa>0:${PORTSDIR}/devel/p5-Safe-Isa \
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-	p5-URI>0:${PORTSDIR}/net/p5-Net
+	p5-HTTP-Cookies>0:www/p5-HTTP-Cookies \
+	p5-Moo>=1.000003:devel/p5-Moo \
+	p5-Safe-Isa>0:devel/p5-Safe-Isa \
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+	p5-URI>0:net/p5-Net
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Cookies-Mozilla/Makefile b/www/p5-HTTP-Cookies-Mozilla/Makefile
index 817150c8c23b..8c856de39d24 100644
--- a/www/p5-HTTP-Cookies-Mozilla/Makefile
+++ b/www/p5-HTTP-Cookies-Mozilla/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Cookie storage and management for Mozilla
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Cookies>=0:${PORTSDIR}/www/p5-HTTP-Cookies
+BUILD_DEPENDS=	p5-HTTP-Cookies>=0:www/p5-HTTP-Cookies
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		sqlite3:${PORTSDIR}/databases/sqlite3
+TEST_DEPENDS=	p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		sqlite3:databases/sqlite3
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Cookies-iCab/Makefile b/www/p5-HTTP-Cookies-iCab/Makefile
index b482f22bff69..eac2183a2998 100644
--- a/www/p5-HTTP-Cookies-iCab/Makefile
+++ b/www/p5-HTTP-Cookies-iCab/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Cookie storage and management for iCab
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Cookies>=0:${PORTSDIR}/www/p5-HTTP-Cookies
+BUILD_DEPENDS=	p5-HTTP-Cookies>=0:www/p5-HTTP-Cookies
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff
+TEST_DEPENDS=	p5-Text-Diff>=0:textproc/p5-Text-Diff
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Cookies-w3m/Makefile b/www/p5-HTTP-Cookies-w3m/Makefile
index 9c1379e87e1a..0768a508124b 100644
--- a/www/p5-HTTP-Cookies-w3m/Makefile
+++ b/www/p5-HTTP-Cookies-w3m/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Cookie storage and management for w3m
 
-BUILD_DEPENDS=	p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-Module-Install>=0:devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Cookies/Makefile b/www/p5-HTTP-Cookies/Makefile
index 0fb92f78a190..c3a43c4d7130 100644
--- a/www/p5-HTTP-Cookies/Makefile
+++ b/www/p5-HTTP-Cookies/Makefile
@@ -14,8 +14,8 @@ COMMENT=	HTTP Cookie jars
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Date>=6:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-HTTP-Message>=6:${PORTSDIR}/www/p5-HTTP-Message
+BUILD_DEPENDS=	p5-HTTP-Date>=6:www/p5-HTTP-Date \
+		p5-HTTP-Message>=6:www/p5-HTTP-Message
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-libwww-5*
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 337aa4cf3e4a..4c8a35d69710 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -13,9 +13,9 @@ COMMENT=	WebDAV client library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-XML-DOM>0:${PORTSDIR}/textproc/p5-XML-DOM \
-		p5-libwww>=5.48:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>0:net/p5-URI \
+		p5-XML-DOM>0:textproc/p5-XML-DOM \
+		p5-libwww>=5.48:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Daemon-SSL/Makefile b/www/p5-HTTP-Daemon-SSL/Makefile
index 82adfa525171..eb6ae13b13dd 100644
--- a/www/p5-HTTP-Daemon-SSL/Makefile
+++ b/www/p5-HTTP-Daemon-SSL/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	delgod@portaone.com
 COMMENT=	Simple http server class with SSL support
 
-RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Daemon/Makefile b/www/p5-HTTP-Daemon/Makefile
index 194c28b7d318..20186764d897 100644
--- a/www/p5-HTTP-Daemon/Makefile
+++ b/www/p5-HTTP-Daemon/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Simple HTTP server class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Date>=6:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-HTTP-Message>=6:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-LWP-MediaTypes>=6:${PORTSDIR}/www/p5-LWP-MediaTypes
+BUILD_DEPENDS=	p5-HTTP-Date>=6:www/p5-HTTP-Date \
+		p5-HTTP-Message>=6:www/p5-HTTP-Message \
+		p5-LWP-MediaTypes>=6:www/p5-LWP-MediaTypes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-libwww-5*
diff --git a/www/p5-HTTP-Engine-Middleware/Makefile b/www/p5-HTTP-Engine-Middleware/Makefile
index 500e45abc596..ddcd94212f10 100644
--- a/www/p5-HTTP-Engine-Middleware/Makefile
+++ b/www/p5-HTTP-Engine-Middleware/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Perl extension for official distribution of HTTP::Engine
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
-	p5-Any-Moose>=0.09:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-Mouse>=0.23:${PORTSDIR}/devel/p5-Mouse \
-	p5-Filter>0:${PORTSDIR}/devel/p5-Filter \
-	p5-HTTP-Engine>=0.03004:${PORTSDIR}/www/p5-HTTP-Engine \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime
+	p5-Any-Moose>=0.09:devel/p5-Any-Moose \
+	p5-Mouse>=0.23:devel/p5-Mouse \
+	p5-Filter>0:devel/p5-Filter \
+	p5-HTTP-Engine>=0.03004:www/p5-HTTP-Engine \
+	p5-libwww>0:www/p5-libwww \
+	p5-DateTime>0:devel/p5-DateTime
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Engine/Makefile b/www/p5-HTTP-Engine/Makefile
index c991b851fd6e..e29f68d62a09 100644
--- a/www/p5-HTTP-Engine/Makefile
+++ b/www/p5-HTTP-Engine/Makefile
@@ -11,20 +11,20 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for HTTP Server Engine Drivers
 
 BUILD_DEPENDS=	\
-	p5-Any-Moose>=0.13:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-CGI-Simple>=1.103:${PORTSDIR}/www/p5-CGI-Simple \
-	p5-Filter>0:${PORTSDIR}/devel/p5-Filter \
-	p5-HTTP-Body>=1.05:${PORTSDIR}/www/p5-HTTP-Body \
-	p5-HTTP-Headers-Fast>=0.11:${PORTSDIR}/www/p5-HTTP-Headers-Fast \
-	p5-HTTP-Server-Simple>=0.35:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-	p5-Mouse>=0.62:${PORTSDIR}/devel/p5-Mouse \
-	p5-URI>=1.36:${PORTSDIR}/net/p5-URI
+	p5-Any-Moose>=0.13:devel/p5-Any-Moose \
+	p5-CGI-Simple>=1.103:www/p5-CGI-Simple \
+	p5-Filter>0:devel/p5-Filter \
+	p5-HTTP-Body>=1.05:www/p5-HTTP-Body \
+	p5-HTTP-Headers-Fast>=0.11:www/p5-HTTP-Headers-Fast \
+	p5-HTTP-Server-Simple>=0.35:www/p5-HTTP-Server-Simple \
+	p5-Mouse>=0.62:devel/p5-Mouse \
+	p5-URI>=1.36:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	\
-	p5-HTTP-Request-AsCGI>0:${PORTSDIR}/www/p5-HTTP-Request-AsCGI \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML \
-	p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-MouseX-Types>=0.05:${PORTSDIR}/devel/p5-MouseX-Types
+	p5-HTTP-Request-AsCGI>0:www/p5-HTTP-Request-AsCGI \
+	p5-YAML>0:textproc/p5-YAML \
+	p5-IO-stringy>0:devel/p5-IO-stringy \
+	p5-MouseX-Types>=0.05:devel/p5-MouseX-Types
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Exception/Makefile b/www/p5-HTTP-Exception/Makefile
index 55c871293c8d..22c54de63be0 100644
--- a/www/p5-HTTP-Exception/Makefile
+++ b/www/p5-HTTP-Exception/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Exception-Class>=1.29:${PORTSDIR}/devel/p5-Exception-Class \
-	p5-HTTP-Message>=5.817:${PORTSDIR}/www/p5-HTTP-Message
+	p5-Exception-Class>=1.29:devel/p5-Exception-Class \
+	p5-HTTP-Message>=5.817:www/p5-HTTP-Message
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Exception>=0.29:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Test-NoWarnings>=1.04:${PORTSDIR}/devel/p5-Test-NoWarnings
+	p5-Test-Exception>=0.29:devel/p5-Test-Exception \
+	p5-Test-NoWarnings>=1.04:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Headers-Fast/Makefile b/www/p5-HTTP-Headers-Fast/Makefile
index a1498d4989b7..e90d2a99a818 100644
--- a/www/p5-HTTP-Headers-Fast/Makefile
+++ b/www/p5-HTTP-Headers-Fast/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for faster implementation of HTTP::Headers
 
-RUN_DEPENDS=	p5-HTTP-Date>0:${PORTSDIR}/www/p5-HTTP-Date
+RUN_DEPENDS=	p5-HTTP-Date>0:www/p5-HTTP-Date
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-HTTP-Link-Parser/Makefile b/www/p5-HTTP-Link-Parser/Makefile
index 3d40aa83bd60..d25a5aa46a7a 100644
--- a/www/p5-HTTP-Link-Parser/Makefile
+++ b/www/p5-HTTP-Link-Parser/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Parse HTTP Link headers
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-URI>=1.30:${PORTSDIR}/net/p5-URI \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-RDF-Trine>=0:${PORTSDIR}/textproc/p5-RDF-Trine
+BUILD_DEPENDS=	p5-URI>=1.30:net/p5-URI \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-RDF-Trine>=0:textproc/p5-RDF-Trine
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Message/Makefile b/www/p5-HTTP-Message/Makefile
index 5fdcd8c08f41..bed208ad05df 100644
--- a/www/p5-HTTP-Message/Makefile
+++ b/www/p5-HTTP-Message/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Representation of HTTP style messages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Encode-Locale>=1:${PORTSDIR}/converters/p5-Encode-Locale \
-		p5-HTTP-Date>=6:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-IO-HTML>=0:${PORTSDIR}/devel/p5-IO-HTML \
-		p5-LWP-MediaTypes>=6:${PORTSDIR}/www/p5-LWP-MediaTypes \
-		p5-URI>=1.10:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Encode-Locale>=1:converters/p5-Encode-Locale \
+		p5-HTTP-Date>=6:www/p5-HTTP-Date \
+		p5-IO-HTML>=0:devel/p5-IO-HTML \
+		p5-LWP-MediaTypes>=6:www/p5-LWP-MediaTypes \
+		p5-URI>=1.10:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
index 391801c99c6e..e42ca826fce3 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
+++ b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to plugin Encode::JP::Mobile for HTTP::MobileAgent
 
 RUN_DEPENDS=	\
-	p5-HTTP-MobileAgent>=0.26:${PORTSDIR}/www/p5-HTTP-MobileAgent
+	p5-HTTP-MobileAgent>=0.26:www/p5-HTTP-MobileAgent
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile b/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile
index 4b5eff795653..be18208035e5 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile
+++ b/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile
@@ -11,13 +11,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Mobile location information plugin for p5-HTTP-MobileAgent
 
 RUN_DEPENDS=	\
-	p5-Geo-Coordinates-Converter>=0.10:${PORTSDIR}/science/p5-Geo-Coordinates-Converter \
-	p5-Geo-Coordinates-Converter-iArea>=0.11:${PORTSDIR}/science/p5-Geo-Coordinates-Converter-iArea \
-	p5-HTTP-MobileAgent>=0.31:${PORTSDIR}/www/p5-HTTP-MobileAgent \
-	p5-UNIVERSAL-can>0:${PORTSDIR}/devel/p5-UNIVERSAL-can \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+	p5-Geo-Coordinates-Converter>=0.10:science/p5-Geo-Coordinates-Converter \
+	p5-Geo-Coordinates-Converter-iArea>=0.11:science/p5-Geo-Coordinates-Converter-iArea \
+	p5-HTTP-MobileAgent>=0.31:www/p5-HTTP-MobileAgent \
+	p5-UNIVERSAL-can>0:devel/p5-UNIVERSAL-can \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-MobileAgent/Makefile b/www/p5-HTTP-MobileAgent/Makefile
index c03cc47bfcc1..8cdf5de85b4a 100644
--- a/www/p5-HTTP-MobileAgent/Makefile
+++ b/www/p5-HTTP-MobileAgent/Makefile
@@ -15,11 +15,11 @@ COMMENT=	HTTP mobile user agent string parser for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter \
-		p5-HTTP-Message>=1.43:${PORTSDIR}/www/p5-HTTP-Message \
-		ja-p5-WWW-MobileCarrierJP>=0.04:${PORTSDIR}/japanese/p5-WWW-MobileCarrierJP \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-Filter>=0:devel/p5-Filter \
+		p5-HTTP-Message>=1.43:www/p5-HTTP-Message \
+		ja-p5-WWW-MobileCarrierJP>=0.04:japanese/p5-WWW-MobileCarrierJP \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-YAML>0:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Negotiate/Makefile b/www/p5-HTTP-Negotiate/Makefile
index 3039cf6b8dde..3cba87204463 100644
--- a/www/p5-HTTP-Negotiate/Makefile
+++ b/www/p5-HTTP-Negotiate/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Implementation of the HTTP content negotiation algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=6:${PORTSDIR}/www/p5-HTTP-Message
+BUILD_DEPENDS=	p5-HTTP-Message>=6:www/p5-HTTP-Message
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS_INSTALL=	p5-libwww-5*
diff --git a/www/p5-HTTP-Parser/Makefile b/www/p5-HTTP-Parser/Makefile
index c39972b33b8f..8c15d1ad167f 100644
--- a/www/p5-HTTP-Parser/Makefile
+++ b/www/p5-HTTP-Parser/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Parse HTTP/1.1 request into HTTP::Request/Response object
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Proxy/Makefile b/www/p5-HTTP-Proxy/Makefile
index df22ab7bdd1f..85a79be79e72 100644
--- a/www/p5-HTTP-Proxy/Makefile
+++ b/www/p5-HTTP-Proxy/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Pure Perl HTTP proxy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Daemon>=1.25:${PORTSDIR}/www/p5-HTTP-Daemon \
-		p5-HTML-Parser>=3:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=6:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Daemon>=1.25:www/p5-HTTP-Daemon \
+		p5-HTML-Parser>=3:www/p5-HTML-Parser \
+		p5-libwww>=6:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTTP-Recorder/Makefile b/www/p5-HTTP-Recorder/Makefile
index 1f8fc6f1b711..ec4dd3454c3f 100644
--- a/www/p5-HTTP-Recorder/Makefile
+++ b/www/p5-HTTP-Recorder/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Record interaction with websites
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Proxy>=0:${PORTSDIR}/www/p5-HTTP-Proxy \
-		p5-HTTP-Request-Params>=0:${PORTSDIR}/www/p5-HTTP-Request-Params \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTTP-Proxy>=0:www/p5-HTTP-Proxy \
+		p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 dos2unix
diff --git a/www/p5-HTTP-Request-AsCGI/Makefile b/www/p5-HTTP-Request-AsCGI/Makefile
index 6e3a17625034..58d66542e6d0 100644
--- a/www/p5-HTTP-Request-AsCGI/Makefile
+++ b/www/p5-HTTP-Request-AsCGI/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Setup a CGI environment from a HTTP::Request
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-libwww>=5.805:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Request-Params/Makefile b/www/p5-HTTP-Request-Params/Makefile
index 39896e66d59e..7789ac2a13ea 100644
--- a/www/p5-HTTP-Request-Params/Makefile
+++ b/www/p5-HTTP-Request-Params/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Retrieve GET/POST Parameters from HTTP Requests
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.19:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Email-MIME-ContentType>=1:${PORTSDIR}/mail/p5-Email-MIME-ContentType \
-		p5-Email-MIME>=1.420:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-HTTP-Message>=1.40:${PORTSDIR}/www/p5-HTTP-Message
+BUILD_DEPENDS=	p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
+		p5-Email-MIME-ContentType>=1:mail/p5-Email-MIME-ContentType \
+		p5-Email-MIME>=1.420:mail/p5-Email-MIME \
+		p5-HTTP-Message>=1.40:www/p5-HTTP-Message
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -26,8 +26,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502200
-BUILD_DEPENDS+=	p5-CGI>=3:${PORTSDIR}/www/p5-CGI
-RUN_DEPENDS+=	p5-CGI>=3:${PORTSDIR}/www/p5-CGI
+BUILD_DEPENDS+=	p5-CGI>=3:www/p5-CGI
+RUN_DEPENDS+=	p5-CGI>=3:www/p5-CGI
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-HTTP-Response-Encoding/Makefile b/www/p5-HTTP-Response-Encoding/Makefile
index 73590015fd88..177f0ec452ca 100644
--- a/www/p5-HTTP-Response-Encoding/Makefile
+++ b/www/p5-HTTP-Response-Encoding/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Adds encoding() to HTTP::Response
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Encode>=2.0:${PORTSDIR}/converters/p5-Encode
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Encode>=2.0:converters/p5-Encode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Router/Makefile b/www/p5-HTTP-Router/Makefile
index 03e8209a9733..98527bc2e23b 100644
--- a/www/p5-HTTP-Router/Makefile
+++ b/www/p5-HTTP-Router/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of Yet Another Path Router for HTTP
 
 BUILD_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-	p5-Devel-Caller-Perl>0:${PORTSDIR}/devel/p5-Devel-Caller-Perl \
-	p5-Filter>0:${PORTSDIR}/devel/p5-Filter \
-	p5-Hash-AsObject>0:${PORTSDIR}/devel/p5-Hash-AsObject \
-	p5-Lingua-EN-Inflect-Number>0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-String-CamelCase>0:${PORTSDIR}/textproc/p5-String-CamelCase \
-	p5-Text-SimpleTable>=0:${PORTSDIR}/textproc/p5-Text-SimpleTable \
-	p5-Text-SimpleTemplate>0:${PORTSDIR}/textproc/p5-Text-SimpleTemplate \
-	p5-URI-Template-Restrict>=0.05:${PORTSDIR}/net/p5-URI-Template-Restrict
+	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+	p5-Devel-Caller-Perl>0:devel/p5-Devel-Caller-Perl \
+	p5-Filter>0:devel/p5-Filter \
+	p5-Hash-AsObject>0:devel/p5-Hash-AsObject \
+	p5-Lingua-EN-Inflect-Number>0:textproc/p5-Lingua-EN-Inflect-Number \
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-String-CamelCase>0:textproc/p5-String-CamelCase \
+	p5-Text-SimpleTable>=0:textproc/p5-Text-SimpleTable \
+	p5-Text-SimpleTemplate>0:textproc/p5-Text-SimpleTemplate \
+	p5-URI-Template-Restrict>=0.05:net/p5-URI-Template-Restrict
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Server-Simple-Authen/Makefile b/www/p5-HTTP-Server-Simple-Authen/Makefile
index 1db3e4ec2383..a5c7615c7da0 100644
--- a/www/p5-HTTP-Server-Simple-Authen/Makefile
+++ b/www/p5-HTTP-Server-Simple-Authen/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Authentication plugin for HTTP::Server::Simple
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0.4:${PORTSDIR}/security/p5-Authen-Simple \
-		p5-HTTP-Server-Simple>=0.16:${PORTSDIR}/www/p5-HTTP-Server-Simple
+BUILD_DEPENDS=	p5-Authen-Simple>=0.4:security/p5-Authen-Simple \
+		p5-HTTP-Server-Simple>=0.16:www/p5-HTTP-Server-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTTP-Server-Simple-Mason/Makefile b/www/p5-HTTP-Server-Simple-Mason/Makefile
index 967d0b4d5cd5..5dfac6804235 100644
--- a/www/p5-HTTP-Server-Simple-Mason/Makefile
+++ b/www/p5-HTTP-Server-Simple-Mason/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Abstract baseclass for a standalone mason server
 
-BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason \
-		p5-Hook-LexWrap>=0:${PORTSDIR}/devel/p5-Hook-LexWrap
+BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-HTML-Mason>=0:www/p5-HTML-Mason \
+		p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Server-Simple-PSGI/Makefile b/www/p5-HTTP-Server-Simple-PSGI/Makefile
index dbe25b326c6c..384261fe9c06 100644
--- a/www/p5-HTTP-Server-Simple-PSGI/Makefile
+++ b/www/p5-HTTP-Server-Simple-PSGI/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PSGI handler for HTTP::Server::Simple
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0.42:${PORTSDIR}/www/p5-HTTP-Server-Simple
+BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0.42:www/p5-HTTP-Server-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTTP-Server-Simple-Recorder/Makefile b/www/p5-HTTP-Server-Simple-Recorder/Makefile
index acb87622d84a..40db978eab29 100644
--- a/www/p5-HTTP-Server-Simple-Recorder/Makefile
+++ b/www/p5-HTTP-Server-Simple-Recorder/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Mixin to record HTTP::Server::Simple's sockets
 
-BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-Test-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-Test-HTTP-Server-Simple \
-		p5-IO-Tee>=0:${PORTSDIR}/devel/p5-IO-Tee
+BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-Test-HTTP-Server-Simple>=0:www/p5-Test-HTTP-Server-Simple \
+		p5-IO-Tee>=0:devel/p5-IO-Tee
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Server-Simple-Static/Makefile b/www/p5-HTTP-Server-Simple-Static/Makefile
index 552bd6823976..9f2378dac629 100644
--- a/www/p5-HTTP-Server-Simple-Static/Makefile
+++ b/www/p5-HTTP-Server-Simple-Static/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Serve static files with HTTP::Server::Simple
 
-RUN_DEPENDS=	p5-File-LibMagic>=0:${PORTSDIR}/devel/p5-File-LibMagic \
-		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-File-LibMagic>=0:devel/p5-File-LibMagic \
+		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-URI>=0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Session-State-MobileAgentID/Makefile b/www/p5-HTTP-Session-State-MobileAgentID/Makefile
index f3459107974c..b55bbb89259d 100644
--- a/www/p5-HTTP-Session-State-MobileAgentID/Makefile
+++ b/www/p5-HTTP-Session-State-MobileAgentID/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to maintain session IDs using mobile phone unique id
 
 RUN_DEPENDS=	\
-	p5-HTTP-MobileAgent>=0.28:${PORTSDIR}/www/p5-HTTP-MobileAgent \
-	p5-HTTP-Session>=0.38:${PORTSDIR}/www/p5-HTTP-Session \
-	p5-Net-CIDR-MobileJP>=0.20:${PORTSDIR}/net/p5-Net-CIDR-MobileJP
+	p5-HTTP-MobileAgent>=0.28:www/p5-HTTP-MobileAgent \
+	p5-HTTP-Session>=0.38:www/p5-HTTP-Session \
+	p5-Net-CIDR-MobileJP>=0.20:net/p5-Net-CIDR-MobileJP
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Session-Store-DBI/Makefile b/www/p5-HTTP-Session-Store-DBI/Makefile
index 9a0c8eab48ae..eab645b8d29f 100644
--- a/www/p5-HTTP-Session-Store-DBI/Makefile
+++ b/www/p5-HTTP-Session-Store-DBI/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to store session data in DBI for HTTP::Session
 
 BUILD_DEPENDS=	\
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-HTTP-Session>=0.26:${PORTSDIR}/www/p5-HTTP-Session \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI
+	p5-Moose>0:devel/p5-Moose \
+	p5-HTTP-Session>=0.26:www/p5-HTTP-Session \
+	p5-DBI>0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Session/Makefile b/www/p5-HTTP-Session/Makefile
index 2fe5d18b3380..02ce748ac9db 100644
--- a/www/p5-HTTP-Session/Makefile
+++ b/www/p5-HTTP-Session/Makefile
@@ -15,18 +15,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor>=0.31:${PORTSDIR}/devel/p5-Class-Accessor \
-	p5-CGI-Simple>=1.103:${PORTSDIR}/www/p5-CGI-Simple \
-	p5-CHI>0:${PORTSDIR}/devel/p5-CHI \
-	p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1 \
-	p5-HTML-StickyQuery>0:${PORTSDIR}/www/p5-HTML-StickyQuery \
-	p5-libwww>=5.818:${PORTSDIR}/www/p5-libwww \
-	p5-Module-Runtime>=0.011:${PORTSDIR}/devel/p5-Module-Runtime \
-	p5-URI>=1.38:${PORTSDIR}/net/p5-URI
+	p5-Class-Accessor>=0.31:devel/p5-Class-Accessor \
+	p5-CGI-Simple>=1.103:www/p5-CGI-Simple \
+	p5-CHI>0:devel/p5-CHI \
+	p5-Digest-SHA1>=2.11:security/p5-Digest-SHA1 \
+	p5-HTML-StickyQuery>0:www/p5-HTML-StickyQuery \
+	p5-libwww>=5.818:www/p5-libwww \
+	p5-Module-Runtime>=0.011:devel/p5-Module-Runtime \
+	p5-URI>=1.38:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-Memory-Cycle>0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-Memory-Cycle>0:devel/p5-Test-Memory-Cycle
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/www/p5-HTTP-Session2/Makefile b/www/p5-HTTP-Session2/Makefile
index 25d0affc4d48..99107045f0a5 100644
--- a/www/p5-HTTP-Session2/Makefile
+++ b/www/p5-HTTP-Session2/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Cookie-Baker>0:${PORTSDIR}/www/p5-Cookie-Baker \
-	p5-Crypt-CBC>0:${PORTSDIR}/security/p5-Crypt-CBC \
-	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
-	p5-Digest-SHA1>0:${PORTSDIR}/security/p5-Digest-SHA1 \
-	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse
+	p5-Cookie-Baker>0:www/p5-Cookie-Baker \
+	p5-Crypt-CBC>0:security/p5-Crypt-CBC \
+	p5-Digest-HMAC>0:security/p5-Digest-HMAC \
+	p5-Digest-SHA1>0:security/p5-Digest-SHA1 \
+	p5-Mouse>0:devel/p5-Mouse
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-SimpleLinkChecker/Makefile b/www/p5-HTTP-SimpleLinkChecker/Makefile
index 0529be232822..860f4c3f4382 100644
--- a/www/p5-HTTP-SimpleLinkChecker/Makefile
+++ b/www/p5-HTTP-SimpleLinkChecker/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-HTTP-Message>=1.28:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-LWP-Protocol-https>=1:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=1.28:www/p5-HTTP-Message \
+		p5-LWP-Protocol-https>=1:www/p5-LWP-Protocol-https \
+		p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTTP-Size/Makefile b/www/p5-HTTP-Size/Makefile
index 00154cd05810..86573a0ca362 100644
--- a/www/p5-HTTP-Size/Makefile
+++ b/www/p5-HTTP-Size/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Get the byte size of an internet resource
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-SimpleLinkExtor>=0:${PORTSDIR}/www/p5-HTML-SimpleLinkExtor \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-SimpleLinkExtor>=0:www/p5-HTML-SimpleLinkExtor \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-HTTP-Thin/Makefile b/www/p5-HTTP-Thin/Makefile
index 11dcc99f2627..56639602b9a1 100644
--- a/www/p5-HTTP-Thin/Makefile
+++ b/www/p5-HTTP-Thin/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Thin Wrapper around HTTP::Tiny to play nice with HTTP::Message
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Class-Method-Modifiers>0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-HTTP-Tiny>=0.056:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Hash-MultiValue>0:${PORTSDIR}/devel/p5-Hash-MultiValue \
-		p5-Safe-Isa>0:${PORTSDIR}/devel/p5-Safe-Isa
+RUN_DEPENDS=	p5-Class-Method-Modifiers>0:devel/p5-Class-Method-Modifiers \
+		p5-HTTP-Tiny>=0.056:www/p5-HTTP-Tiny \
+		p5-HTTP-Message>0:www/p5-HTTP-Message \
+		p5-Hash-MultiValue>0:devel/p5-Hash-MultiValue \
+		p5-Safe-Isa>0:devel/p5-Safe-Isa
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-Tiny-SPDY/Makefile b/www/p5-HTTP-Tiny-SPDY/Makefile
index f40146205365..c646afbd5d4c 100644
--- a/www/p5-HTTP-Tiny-SPDY/Makefile
+++ b/www/p5-HTTP-Tiny-SPDY/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Subclass of HTTP::Tiny with SPDY support
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.560:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-SPDY>=0:${PORTSDIR}/net/p5-Net-SPDY \
-		p5-Net-SSLeay>=1.49:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.560:security/p5-IO-Socket-SSL \
+		p5-Net-SPDY>=0:net/p5-Net-SPDY \
+		p5-Net-SSLeay>=1.49:security/p5-Net-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Mozilla-CA>=0:${PORTSDIR}/www/p5-Mozilla-CA
+TEST_DEPENDS=	p5-Mozilla-CA>=0:www/p5-Mozilla-CA
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-HTTP-Tiny/Makefile b/www/p5-HTTP-Tiny/Makefile
index b891418578ef..957c5f7e6f51 100644
--- a/www/p5-HTTP-Tiny/Makefile
+++ b/www/p5-HTTP-Tiny/Makefile
@@ -23,15 +23,15 @@ NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5
 
-COOKIE_BUILD_DEPENDS=	p5-HTTP-CookieJar>=0.001:${PORTSDIR}/www/p5-HTTP-CookieJar
-COOKIE_RUN_DEPENDS=	p5-HTTP-CookieJar>=0.001:${PORTSDIR}/www/p5-HTTP-CookieJar
-HTTPS_BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.42:${PORTSDIR}/security/p5-IO-Socket-SSL \
-			p5-Mozilla-CA>=20130114:${PORTSDIR}/www/p5-Mozilla-CA \
-			p5-Net-SSLeay>=1.49:${PORTSDIR}/security/p5-Net-SSLeay
-HTTPS_RUN_DEPENDS=	p5-IO-Socket-SSL>=1.42:${PORTSDIR}/security/p5-IO-Socket-SSL \
-			p5-Mozilla-CA>=20130114:${PORTSDIR}/www/p5-Mozilla-CA \
-			p5-Net-SSLeay>=1.49:${PORTSDIR}/security/p5-Net-SSLeay
-IO_SOCKET_IP_BUILD_DEPENDS=	p5-IO-Socket-IP>=0.25:${PORTSDIR}/net/p5-IO-Socket-IP
-IO_SOCKET_IP_RUN_DEPENDS=	p5-IO-Socket-IP>=0.25:${PORTSDIR}/net/p5-IO-Socket-IP
+COOKIE_BUILD_DEPENDS=	p5-HTTP-CookieJar>=0.001:www/p5-HTTP-CookieJar
+COOKIE_RUN_DEPENDS=	p5-HTTP-CookieJar>=0.001:www/p5-HTTP-CookieJar
+HTTPS_BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.42:security/p5-IO-Socket-SSL \
+			p5-Mozilla-CA>=20130114:www/p5-Mozilla-CA \
+			p5-Net-SSLeay>=1.49:security/p5-Net-SSLeay
+HTTPS_RUN_DEPENDS=	p5-IO-Socket-SSL>=1.42:security/p5-IO-Socket-SSL \
+			p5-Mozilla-CA>=20130114:www/p5-Mozilla-CA \
+			p5-Net-SSLeay>=1.49:security/p5-Net-SSLeay
+IO_SOCKET_IP_BUILD_DEPENDS=	p5-IO-Socket-IP>=0.25:net/p5-IO-Socket-IP
+IO_SOCKET_IP_RUN_DEPENDS=	p5-IO-Socket-IP>=0.25:net/p5-IO-Socket-IP
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTTP-WebTest/Makefile b/www/p5-HTTP-WebTest/Makefile
index 22516a55f2fc..4ea74a26c4ed 100644
--- a/www/p5-HTTP-WebTest/Makefile
+++ b/www/p5-HTTP-WebTest/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Tests remote URLs or local web files
 
 BUILD_DEPENDS=	\
-	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
+	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+	p5-libwww>=0:www/p5-libwww \
+	p5-Test-MockObject>=0:devel/p5-Test-MockObject \
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-HTTPD-Log-Filter/Makefile b/www/p5-HTTPD-Log-Filter/Makefile
index d950c24b3198..a6afddf3e3f7 100644
--- a/www/p5-HTTPD-Log-Filter/Makefile
+++ b/www/p5-HTTPD-Log-Filter/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module to filter entries out of an httpd log
 
-BUILD_DEPENDS=	p5-IO-Zlib>=0:${PORTSDIR}/archivers/p5-IO-Zlib
-RUN_DEPENDS=	p5-IO-Zlib>=0:${PORTSDIR}/archivers/p5-IO-Zlib
+BUILD_DEPENDS=	p5-IO-Zlib>=0:archivers/p5-IO-Zlib
+RUN_DEPENDS=	p5-IO-Zlib>=0:archivers/p5-IO-Zlib
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-IMDB-Film/Makefile b/www/p5-IMDB-Film/Makefile
index 3d4d8e973b79..04afe578931b 100644
--- a/www/p5-IMDB-Film/Makefile
+++ b/www/p5-IMDB-Film/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OO Perl interface to the movies database IMDB
 
-BUILD_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-HTML-Parser>=2.28:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Text-Unidecode>=0:${PORTSDIR}/converters/p5-Text-Unidecode \
-		p5-libwww>=1.41:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Error>=0:lang/p5-Error \
+		p5-HTML-Parser>=2.28:www/p5-HTML-Parser \
+		p5-Text-Unidecode>=0:converters/p5-Text-Unidecode \
+		p5-libwww>=1.41:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Image-Delivery/Makefile b/www/p5-Image-Delivery/Makefile
index deb8ecc98d06..9de0bb2459e1 100644
--- a/www/p5-Image-Delivery/Makefile
+++ b/www/p5-Image-Delivery/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	coryking@mozimedia.com
 COMMENT=	Efficient transformation and delivery of web images
 
-BUILD_DEPENDS=	p5-Test-ClassAPI>=1.04:${PORTSDIR}/devel/p5-Test-ClassAPI \
-		p5-Digest-TransformPath>=0.01:${PORTSDIR}/devel/p5-Digest-TransformPath \
-		p5-File-Remove>=0.34:${PORTSDIR}/devel/p5-File-Remove \
-		p5-File-Slurp>=9999.04:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-HTML-Location>=1.00:${PORTSDIR}/www/p5-HTML-Location \
-		p5-Params-Coerce>=0.13:${PORTSDIR}/devel/p5-Params-Coerce
+BUILD_DEPENDS=	p5-Test-ClassAPI>=1.04:devel/p5-Test-ClassAPI \
+		p5-Digest-TransformPath>=0.01:devel/p5-Digest-TransformPath \
+		p5-File-Remove>=0.34:devel/p5-File-Remove \
+		p5-File-Slurp>=9999.04:devel/p5-File-Slurp \
+		p5-HTML-Location>=1.00:www/p5-HTML-Location \
+		p5-Params-Coerce>=0.13:devel/p5-Params-Coerce
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-JE/Makefile b/www/p5-JE/Makefile
index b8fef6693bb3..2c46e47a3468 100644
--- a/www/p5-JE/Makefile
+++ b/www/p5-JE/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Pure-Perl ECMAScript (JavaScript) Engine
 
-RUN_DEPENDS=	p5-TimeDate>0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Tie-RefHash-Weak>0:${PORTSDIR}/devel/p5-Tie-RefHash-Weak
+RUN_DEPENDS=	p5-TimeDate>0:devel/p5-TimeDate \
+		p5-Tie-RefHash-Weak>0:devel/p5-Tie-RefHash-Weak
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Jemplate/Makefile b/www/p5-Jemplate/Makefile
index 5499a1490ae4..d1c02fc6932a 100644
--- a/www/p5-Jemplate/Makefile
+++ b/www/p5-Jemplate/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	Jemplate-0.27
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	JavaScript Templating with Template Toolkit
 
-RUN_DEPENDS=	p5-File-Find-Rule>=0.30:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Template-Toolkit>=2.19:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-File-Find-Rule>=0.30:devel/p5-File-Find-Rule \
+		p5-Template-Toolkit>=2.19:www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Jifty/Makefile b/www/p5-Jifty/Makefile
index 8595b87044c2..9046c8e49fb9 100644
--- a/www/p5-Jifty/Makefile
+++ b/www/p5-Jifty/Makefile
@@ -12,94 +12,94 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Jifty -- Just Do It -- Yet another web framework
 
-BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-App-CLI>=0.03:${PORTSDIR}/devel/p5-App-CLI \
-		p5-CGI-Cookie-Splitter>=0:${PORTSDIR}/www/p5-CGI-Cookie-Splitter \
-		p5-CGI-Emulate-PSGI>=0.06:${PORTSDIR}/www/p5-CGI-Emulate-PSGI \
-		p5-CSS-Squish>=0.05:${PORTSDIR}/textproc/p5-CSS-Squish \
-		p5-Cache-Cache>0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Calendar-Simple>0:${PORTSDIR}/devel/p5-Calendar-Simple \
-		p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Accessor-Named>=0:${PORTSDIR}/devel/p5-Class-Accessor-Named \
-		p5-Class-Container>0:${PORTSDIR}/devel/p5-Class-Container \
-		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Trigger>=0.12:${PORTSDIR}/devel/p5-Class-Trigger \
-		p5-Clone>0:${PORTSDIR}/devel/p5-Clone \
-		p5-Crypt-CBC>0:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-Crypt-Rijndael>0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-DBD-SQLite>=1.11:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Data-Page>0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Date-Manip>0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Devel-Cover>0:${PORTSDIR}/devel/p5-Devel-Cover \
-		p5-Email-Folder>0:${PORTSDIR}/mail/p5-Email-Folder \
-		p5-Email-LocalDelivery>0:${PORTSDIR}/mail/p5-Email-LocalDelivery \
-		p5-Email-MIME>0:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-MIME-CreateHTML>0:${PORTSDIR}/mail/p5-Email-MIME-CreateHTML \
-		p5-Email-MIME-ContentType>0:${PORTSDIR}/mail/p5-Email-MIME-ContentType \
-		p5-Email-Send>=2.00:${PORTSDIR}/mail/p5-Email-Send \
-		p5-Email-Simple>=2.100:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Exporter-Lite>0:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-MMagic>0:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-File-ShareDir>=0.04:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Hash-MultiValue>=0.05:${PORTSDIR}/devel/p5-Hash-MultiValue \
-		p5-HTML-Lint>0:${PORTSDIR}/www/p5-HTML-Lint \
-		p5-HTML-Mason>=1.31.0.1:${PORTSDIR}/www/p5-HTML-Mason \
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Server-Simple-Recorder>0:${PORTSDIR}/www/p5-HTTP-Server-Simple-Recorder \
-		p5-HTTP-Server-Simple>=0.26:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-HTML-TreeBuilder-XPath>=0:${PORTSDIR}/www/p5-HTML-TreeBuilder-XPath \
-		p5-Hash-Merge>0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-Hook-LexWrap>0:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-IO-Handle-Util>=0:${PORTSDIR}/devel/p5-IO-Handle-Util \
-		p5-IPC-PubSub>=0.23:${PORTSDIR}/devel/p5-IPC-PubSub \
-		p5-IPC-Run3>0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Jifty-DBI>=0.57:${PORTSDIR}/databases/p5-Jifty-DBI \
-		p5-JSON-XS>=2.27:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Locale-Maketext-Lexicon>=0.60:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-Log-Log4perl>=1.04:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-Module-Install>=0.50:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Module-Refresh>=0.09:${PORTSDIR}/devel/p5-Module-Refresh \
-		p5-Module-ScanDeps>0:${PORTSDIR}/devel/p5-Module-ScanDeps \
-		p5-Net-Server>0:${PORTSDIR}/net/p5-Net-Server \
-		p5-Object-Declare>=0.13:${PORTSDIR}/devel/p5-Object-Declare \
-		p5-PadWalker>0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-PerlIO-gzip>=0:${PORTSDIR}/archivers/p5-PerlIO-gzip \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Plack-Middleware-Deflater>=0:${PORTSDIR}/www/p5-Plack-Middleware-Deflater \
-		p5-Pod-Simple>0:${PORTSDIR}/textproc/p5-Pod-Simple \
-		p5-Scalar-Defer>=0.10:${PORTSDIR}/devel/p5-Scalar-Defer \
-		p5-Shell-Command>=0:${PORTSDIR}/sysutils/p5-Shell-Command \
-		p5-SQL-ReservedWords>0:${PORTSDIR}/databases/p5-SQL-ReservedWords \
-		p5-String-Koremutake>0:${PORTSDIR}/textproc/p5-String-Koremutake \
-		p5-SUPER>=0:${PORTSDIR}/devel/p5-SUPER \
-		p5-Template-Declare>=0.26:${PORTSDIR}/textproc/p5-Template-Declare \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=1.30:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Writer>0.601:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-XML-XPath>0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-YAML>=0.35:${PORTSDIR}/textproc/p5-YAML \
-		p5-YAML-Syck>=0.71:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-App-CLI>=0.03:devel/p5-App-CLI \
+		p5-CGI-Cookie-Splitter>=0:www/p5-CGI-Cookie-Splitter \
+		p5-CGI-Emulate-PSGI>=0.06:www/p5-CGI-Emulate-PSGI \
+		p5-CSS-Squish>=0.05:textproc/p5-CSS-Squish \
+		p5-Cache-Cache>0:devel/p5-Cache-Cache \
+		p5-Calendar-Simple>0:devel/p5-Calendar-Simple \
+		p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Class-Accessor-Named>=0:devel/p5-Class-Accessor-Named \
+		p5-Class-Container>0:devel/p5-Class-Container \
+		p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Trigger>=0.12:devel/p5-Class-Trigger \
+		p5-Clone>0:devel/p5-Clone \
+		p5-Crypt-CBC>0:security/p5-Crypt-CBC \
+		p5-Crypt-Rijndael>0:security/p5-Crypt-Rijndael \
+		p5-DBD-SQLite>=1.11:databases/p5-DBD-SQLite \
+		p5-Data-Page>0:databases/p5-Data-Page \
+		p5-Data-UUID>0:devel/p5-Data-UUID \
+		p5-Date-Manip>0:devel/p5-Date-Manip \
+		p5-DateTime>0:devel/p5-DateTime \
+		p5-Devel-Cover>0:devel/p5-Devel-Cover \
+		p5-Email-Folder>0:mail/p5-Email-Folder \
+		p5-Email-LocalDelivery>0:mail/p5-Email-LocalDelivery \
+		p5-Email-MIME>0:mail/p5-Email-MIME \
+		p5-Email-MIME-CreateHTML>0:mail/p5-Email-MIME-CreateHTML \
+		p5-Email-MIME-ContentType>0:mail/p5-Email-MIME-ContentType \
+		p5-Email-Send>=2.00:mail/p5-Email-Send \
+		p5-Email-Simple>=2.100:mail/p5-Email-Simple \
+		p5-Exporter-Lite>0:devel/p5-Exporter-Lite \
+		p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+		p5-File-MMagic>0:devel/p5-File-MMagic \
+		p5-File-ShareDir>=0.04:devel/p5-File-ShareDir \
+		p5-Hash-MultiValue>=0.05:devel/p5-Hash-MultiValue \
+		p5-HTML-Lint>0:www/p5-HTML-Lint \
+		p5-HTML-Mason>=1.31.0.1:www/p5-HTML-Mason \
+		p5-HTML-Parser>0:www/p5-HTML-Parser \
+		p5-HTTP-Server-Simple-Recorder>0:www/p5-HTTP-Server-Simple-Recorder \
+		p5-HTTP-Server-Simple>=0.26:www/p5-HTTP-Server-Simple \
+		p5-HTML-TreeBuilder-XPath>=0:www/p5-HTML-TreeBuilder-XPath \
+		p5-Hash-Merge>0:textproc/p5-Hash-Merge \
+		p5-Hook-LexWrap>0:devel/p5-Hook-LexWrap \
+		p5-IO-Handle-Util>=0:devel/p5-IO-Handle-Util \
+		p5-IPC-PubSub>=0.23:devel/p5-IPC-PubSub \
+		p5-IPC-Run3>0:devel/p5-IPC-Run3 \
+		p5-Jifty-DBI>=0.57:databases/p5-Jifty-DBI \
+		p5-JSON-XS>=2.27:converters/p5-JSON-XS \
+		p5-Locale-Maketext-Lexicon>=0.60:devel/p5-Locale-Maketext-Lexicon \
+		p5-Log-Log4perl>=1.04:devel/p5-Log-Log4perl \
+		p5-MIME-Types>0:mail/p5-MIME-Types \
+		p5-Module-Install>=0.50:devel/p5-Module-Install \
+		p5-Module-Refresh>=0.09:devel/p5-Module-Refresh \
+		p5-Module-ScanDeps>0:devel/p5-Module-ScanDeps \
+		p5-Net-Server>0:net/p5-Net-Server \
+		p5-Object-Declare>=0.13:devel/p5-Object-Declare \
+		p5-PadWalker>0:devel/p5-PadWalker \
+		p5-Params-Validate>0:devel/p5-Params-Validate \
+		p5-PerlIO-gzip>=0:archivers/p5-PerlIO-gzip \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Plack-Middleware-Deflater>=0:www/p5-Plack-Middleware-Deflater \
+		p5-Pod-Simple>0:textproc/p5-Pod-Simple \
+		p5-Scalar-Defer>=0.10:devel/p5-Scalar-Defer \
+		p5-Shell-Command>=0:sysutils/p5-Shell-Command \
+		p5-SQL-ReservedWords>0:databases/p5-SQL-ReservedWords \
+		p5-String-Koremutake>0:textproc/p5-String-Koremutake \
+		p5-SUPER>=0:devel/p5-SUPER \
+		p5-Template-Declare>=0.26:textproc/p5-Template-Declare \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+		p5-URI>0:net/p5-URI \
+		p5-WWW-Mechanize>=1.30:www/p5-WWW-Mechanize \
+		p5-XML-Simple>0:textproc/p5-XML-Simple \
+		p5-XML-Writer>0.601:textproc/p5-XML-Writer \
+		p5-XML-XPath>0:textproc/p5-XML-XPath \
+		p5-YAML>=0.35:textproc/p5-YAML \
+		p5-YAML-Syck>=0.71:textproc/p5-YAML-Syck \
+		p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Base>=0.44:${PORTSDIR}/devel/p5-Test-Base \
-		p5-Test-HTTP-Server-Simple>=0.02:${PORTSDIR}/www/p5-Test-HTTP-Server-Simple \
-		p5-Test-Log4perl>0:${PORTSDIR}/devel/p5-Test-Log4perl \
-		p5-Test-MockModule>=0.05:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-Test-MockObject>=1.07:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Script-Run>=0.02:${PORTSDIR}/devel/p5-Test-Script-Run \
-		p5-Test-WWW-Declare>=0:${PORTSDIR}/devel/p5-Test-WWW-Declare \
-		p5-Test-WWW-Mechanize>=1.04:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
-		p5-Test-WWW-Mechanize-PSGI>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-PSGI \
-		p5-Test-WWW-Selenium>=0:${PORTSDIR}/devel/p5-Test-WWW-Selenium
+TEST_DEPENDS=	p5-Test-Base>=0.44:devel/p5-Test-Base \
+		p5-Test-HTTP-Server-Simple>=0.02:www/p5-Test-HTTP-Server-Simple \
+		p5-Test-Log4perl>0:devel/p5-Test-Log4perl \
+		p5-Test-MockModule>=0.05:devel/p5-Test-MockModule \
+		p5-Test-MockObject>=1.07:devel/p5-Test-MockObject \
+		p5-Test-Pod-Coverage>0:devel/p5-Test-Pod-Coverage \
+		p5-Test-Script-Run>=0.02:devel/p5-Test-Script-Run \
+		p5-Test-WWW-Declare>=0:devel/p5-Test-WWW-Declare \
+		p5-Test-WWW-Mechanize>=1.04:devel/p5-Test-WWW-Mechanize \
+		p5-Test-WWW-Mechanize-PSGI>=0:devel/p5-Test-WWW-Mechanize-PSGI \
+		p5-Test-WWW-Selenium>=0:devel/p5-Test-WWW-Selenium
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-LWP-Authen-Negotiate/Makefile b/www/p5-LWP-Authen-Negotiate/Makefile
index 892dc9b0dd80..401310cbb419 100644
--- a/www/p5-LWP-Authen-Negotiate/Makefile
+++ b/www/p5-LWP-Authen-Negotiate/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Perl extension to enable LWP to authenticate using negotiate
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-LWP-Authen-OAuth/Makefile b/www/p5-LWP-Authen-OAuth/Makefile
index 8897454715e1..327ff117b26b 100644
--- a/www/p5-LWP-Authen-OAuth/Makefile
+++ b/www/p5-LWP-Authen-OAuth/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to generate signed OAuth requests
 
 RUN_DEPENDS=	\
-	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-libwww>=0:www/p5-libwww \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-LWP-Authen-Wsse/Makefile b/www/p5-LWP-Authen-Wsse/Makefile
index de1ed7ba955d..72c6494da641 100644
--- a/www/p5-LWP-Authen-Wsse/Makefile
+++ b/www/p5-LWP-Authen-Wsse/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Library for enabling X-WSSE authentication in LWP
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile b/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile
index 657c1a6430d3..6cd1da92c8a0 100644
--- a/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile
+++ b/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Connection cache that enforces a max keep alive limit
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Moose>=0:devel/p5-Moose
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-LWP-ConsoleLogger/Makefile b/www/p5-LWP-ConsoleLogger/Makefile
index 7fe4111611ef..ae615eeaf94c 100644
--- a/www/p5-LWP-ConsoleLogger/Makefile
+++ b/www/p5-LWP-ConsoleLogger/Makefile
@@ -15,25 +15,25 @@ DEPRECATED=	Depends on expiring www/p5-HTTP-CookieMonster
 EXPIRATION_DATE=	2016-04-15
 
 RUN_DEPENDS=	\
-	p5-Data-Printer>0:${PORTSDIR}/devel/p5-Data-Printer \
-	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-	p5-HTML-Restrict>=0:${PORTSDIR}/www/p5-HTML-Restrict \
-	p5-HTTP-Body>0:${PORTSDIR}/www/p5-HTTP-Body \
-	p5-HTTP-CookieMonster>=0:${PORTSDIR}/www/p5-HTTP-CookieMonster \
-	p5-JSON-MaybeXS>0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-	p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch \
-	p5-Moo>0:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-StrictConstructor>0:${PORTSDIR}/devel/p5-MooX-StrictConstructor \
-	p5-Parse-MIME>=0:${PORTSDIR}/mail/p5-Parse-MIME \
-	p5-String-Trim>=0:${PORTSDIR}/textproc/p5-String-Trim \
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-	p5-Term-Size-Any>0:${PORTSDIR}/devel/p5-Term-Size-Any \
-	p5-Text-SimpleTable-AutoWidth>=0.09:${PORTSDIR}/textproc/p5-Text-SimpleTable-AutoWidth \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-Type-Tiny>0:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-URI-Query>0:${PORTSDIR}/net/p5-URI-Query \
-	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-	p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+	p5-Data-Printer>0:devel/p5-Data-Printer \
+	p5-DateTime>0:devel/p5-DateTime \
+	p5-HTML-Restrict>=0:www/p5-HTML-Restrict \
+	p5-HTTP-Body>0:www/p5-HTTP-Body \
+	p5-HTTP-CookieMonster>=0:www/p5-HTTP-CookieMonster \
+	p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS \
+	p5-Log-Dispatch>0:devel/p5-Log-Dispatch \
+	p5-Moo>0:devel/p5-Moo \
+	p5-MooX-StrictConstructor>0:devel/p5-MooX-StrictConstructor \
+	p5-Parse-MIME>=0:mail/p5-Parse-MIME \
+	p5-String-Trim>=0:textproc/p5-String-Trim \
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+	p5-Term-Size-Any>0:devel/p5-Term-Size-Any \
+	p5-Text-SimpleTable-AutoWidth>=0.09:textproc/p5-Text-SimpleTable-AutoWidth \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-Type-Tiny>0:devel/p5-Type-Tiny \
+	p5-URI-Query>0:net/p5-URI-Query \
+	p5-URI>=0:net/p5-URI \
+	p5-XML-Simple>0:textproc/p5-XML-Simple
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-LWP-Online/Makefile b/www/p5-LWP-Online/Makefile
index d7109d51782e..94a1a1ffdaa7 100644
--- a/www/p5-LWP-Online/Makefile
+++ b/www/p5-LWP-Online/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Checks if process has access to the web
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS+=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS+=	p5-libwww>=5.805:www/p5-libwww \
+		p5-URI>=1.35:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-LWP-Protocol-PSGI/Makefile b/www/p5-LWP-Protocol-PSGI/Makefile
index 11a8ff6874af..340b40d660b8 100644
--- a/www/p5-LWP-Protocol-PSGI/Makefile
+++ b/www/p5-LWP-Protocol-PSGI/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Guard>0:${PORTSDIR}/devel/p5-Guard \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-libwww>=5:${PORTSDIR}/www/p5-libwww
+	p5-Guard>0:devel/p5-Guard \
+	p5-Plack>0:www/p5-Plack \
+	p5-libwww>=5:www/p5-libwww
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-LWP-Protocol-https>0:${PORTSDIR}/www/p5-LWP-Protocol-https
+	p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https
 
 USES=	perl5
 USE_PERL5=	modbuildtiny
diff --git a/www/p5-LWP-Protocol-connect/Makefile b/www/p5-LWP-Protocol-connect/Makefile
index d6ee907b97b9..e1e1e220677a 100644
--- a/www/p5-LWP-Protocol-connect/Makefile
+++ b/www/p5-LWP-Protocol-connect/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Provides HTTP/CONNECT proxy support for LWP::UserAgent
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Net-HTTP>=6:${PORTSDIR}/net/p5-Net-HTTP
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-libwww>=0:www/p5-libwww \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-URI>=0:net/p5-URI \
+		p5-Net-HTTP>=6:net/p5-Net-HTTP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/www/p5-LWP-Protocol-http10/Makefile b/www/p5-LWP-Protocol-http10/Makefile
index 29f322842df2..1f13b75b73b4 100644
--- a/www/p5-LWP-Protocol-http10/Makefile
+++ b/www/p5-LWP-Protocol-http10/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Legacy HTTP/1.0 support for LWP
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=6:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-libwww>=6:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=6:www/p5-HTTP-Message \
+		p5-libwww>=6:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-LWP-Protocol-https/Makefile b/www/p5-LWP-Protocol-https/Makefile
index 97634cbe2c25..75149c758a28 100644
--- a/www/p5-LWP-Protocol-https/Makefile
+++ b/www/p5-LWP-Protocol-https/Makefile
@@ -15,9 +15,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 # We remove p5-libwww here to avoid cyclic dependency
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.54:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Mozilla-CA>=20110101:${PORTSDIR}/www/p5-Mozilla-CA \
-		p5-Net-HTTP>=6:${PORTSDIR}/net/p5-Net-HTTP
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.54:security/p5-IO-Socket-SSL \
+		p5-Mozilla-CA>=20110101:www/p5-Mozilla-CA \
+		p5-Net-HTTP>=6:net/p5-Net-HTTP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-LWP-UserAgent-Determined/Makefile b/www/p5-LWP-UserAgent-Determined/Makefile
index cbeb91c0afdc..54d590bdf61a 100644
--- a/www/p5-LWP-UserAgent-Determined/Makefile
+++ b/www/p5-LWP-UserAgent-Determined/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Virtual browser that retries errors
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-LWP-UserAgent-POE/Makefile b/www/p5-LWP-UserAgent-POE/Makefile
index 17712efe87c8..0e6de84ff850 100644
--- a/www/p5-LWP-UserAgent-POE/Makefile
+++ b/www/p5-LWP-UserAgent-POE/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Drop-in LWP::UserAgent replacement in POE environments
 
-BUILD_DEPENDS=	p5-POE>=0.9999:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Client-HTTP>=0.83:${PORTSDIR}/www/p5-POE-Component-Client-HTTP \
-		p5-POE-Component-SSLify>=1.008:${PORTSDIR}/security/p5-POE-Component-SSLify \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Log-Log4perl>=1:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-POE>=0.9999:devel/p5-POE \
+		p5-POE-Component-Client-HTTP>=0.83:www/p5-POE-Component-Client-HTTP \
+		p5-POE-Component-SSLify>=1.008:security/p5-POE-Component-SSLify \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Log-Log4perl>=1:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-LWP-UserAgent-WithCache/Makefile b/www/p5-LWP-UserAgent-WithCache/Makefile
index 0a2b3bdcf557..de1b72eafabf 100644
--- a/www/p5-LWP-UserAgent-WithCache/Makefile
+++ b/www/p5-LWP-UserAgent-WithCache/Makefile
@@ -14,9 +14,9 @@ COMMENT=	LWP::UserAgent extension with local cache
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-LWPx-ParanoidAgent/Makefile b/www/p5-LWPx-ParanoidAgent/Makefile
index 3be0af56c5e9..3bce2df896c0 100644
--- a/www/p5-LWPx-ParanoidAgent/Makefile
+++ b/www/p5-LWPx-ParanoidAgent/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Subclass of LWP::UserAgent that protects you from harm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0.58:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0.58:security/p5-Crypt-SSLeay \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-LWPx-TimedHTTP/Makefile b/www/p5-LWPx-TimedHTTP/Makefile
index 2e04f3da3476..b4dc66be4b2c 100644
--- a/www/p5-LWPx-TimedHTTP/Makefile
+++ b/www/p5-LWPx-TimedHTTP/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Time the different stages of an HTTP request
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Daemon>=0:${PORTSDIR}/www/p5-HTTP-Daemon \
-		p5-libwww>=6:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-libwww>=6:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
+		p5-libwww>=6:www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=6:www/p5-libwww
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/www/p5-Mason/Makefile b/www/p5-Mason/Makefile
index 4f4c989beaf6..8573b78c40c7 100644
--- a/www/p5-Mason/Makefile
+++ b/www/p5-Mason/Makefile
@@ -14,23 +14,23 @@ COMMENT=	High-performance, dynamic web site authoring system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Class-Unload>=0:${PORTSDIR}/devel/p5-Class-Unload \
-		p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Guard>=0:${PORTSDIR}/devel/p5-Guard \
-		p5-IPC-System-Simple>=0:${PORTSDIR}/devel/p5-IPC-System-Simple \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Log-Any>=0.08:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Method-Signatures-Simple>=0:${PORTSDIR}/devel/p5-Method-Signatures-Simple \
-		p5-Moose>=1.15:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-HasDefaults>=0.03:${PORTSDIR}/devel/p5-MooseX-HasDefaults \
-		p5-MooseX-StrictConstructor>=0.13:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Class-Unload>=0:devel/p5-Class-Unload \
+		p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Guard>=0:devel/p5-Guard \
+		p5-IPC-System-Simple>=0:devel/p5-IPC-System-Simple \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Log-Any>=0.08:devel/p5-Log-Any \
+		p5-Method-Signatures-Simple>=0:devel/p5-Method-Signatures-Simple \
+		p5-Moose>=1.15:devel/p5-Moose \
+		p5-MooseX-HasDefaults>=0.03:devel/p5-MooseX-HasDefaults \
+		p5-MooseX-StrictConstructor>=0.13:devel/p5-MooseX-StrictConstructor \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Class-Most>=0:${PORTSDIR}/devel/p5-Test-Class-Most \
-		p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
+TEST_DEPENDS=	p5-Test-Class-Most>=0:devel/p5-Test-Class-Most \
+		p5-Test-LongString>=0:devel/p5-Test-LongString
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-MasonX-Interp-WithCallbacks/Makefile b/www/p5-MasonX-Interp-WithCallbacks/Makefile
index 93bc44071372..12df8057046b 100644
--- a/www/p5-MasonX-Interp-WithCallbacks/Makefile
+++ b/www/p5-MasonX-Interp-WithCallbacks/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mason callback support via Params::CallbackRequest
 
-BUILD_DEPENDS=	p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason \
-		p5-Params-CallbackRequest>=0:${PORTSDIR}/devel/p5-Params-CallbackRequest
+BUILD_DEPENDS=	p5-HTML-Mason>=0:www/p5-HTML-Mason \
+		p5-Params-CallbackRequest>=0:devel/p5-Params-CallbackRequest
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-MasonX-Profiler/Makefile b/www/p5-MasonX-Profiler/Makefile
index 04b4cdb9a971..3e6efaf0f342 100644
--- a/www/p5-MasonX-Profiler/Makefile
+++ b/www/p5-MasonX-Profiler/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mason per-component profiler
 
-BUILD_DEPENDS=	p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason
+BUILD_DEPENDS=	p5-HTML-Mason>=0:www/p5-HTML-Mason
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-MasonX-Request-WithApacheSession/Makefile b/www/p5-MasonX-Request-WithApacheSession/Makefile
index 223a164b4d6f..9fec3f5d67bb 100644
--- a/www/p5-MasonX-Request-WithApacheSession/Makefile
+++ b/www/p5-MasonX-Request-WithApacheSession/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to Apache::Session for HTML::Mason
 
-BUILD_DEPENDS=	p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason \
-		p5-Apache-Session-Wrapper>=0:${PORTSDIR}/www/p5-Apache-Session-Wrapper
+BUILD_DEPENDS=	p5-HTML-Mason>=0:www/p5-HTML-Mason \
+		p5-Apache-Session-Wrapper>=0:www/p5-Apache-Session-Wrapper
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-MasonX-WebApp/Makefile b/www/p5-MasonX-WebApp/Makefile
index 0e4f43de1619..a7e0166a9392 100644
--- a/www/p5-MasonX-WebApp/Makefile
+++ b/www/p5-MasonX-WebApp/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Works with HTML::Mason to do processing before Mason is invoked
 
-BUILD_DEPENDS=	mp2bug:${PORTSDIR}/www/mod_perl2 \
-		p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason \
-		p5-Apache-Session-Wrapper>=0:${PORTSDIR}/www/p5-Apache-Session-Wrapper \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Factory-Util>=0:${PORTSDIR}/devel/p5-Class-Factory-Util \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	mp2bug:www/mod_perl2 \
+		p5-HTML-Mason>=0:www/p5-HTML-Mason \
+		p5-Apache-Session-Wrapper>=0:www/p5-Apache-Session-Wrapper \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Factory-Util>=0:devel/p5-Class-Factory-Util \
+		p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Output>=0:devel/p5-Test-Output
 
 USE_APACHE_RUN=	22+
 USES=		perl5
diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile
index 506ce4a0e8cd..a59706e2c658 100644
--- a/www/p5-Maypole/Makefile
+++ b/www/p5-Maypole/Makefile
@@ -15,30 +15,30 @@ COMMENT=	MVC web application framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple \
-		p5-CGI-Untaint>=1.26:${PORTSDIR}/www/p5-CGI-Untaint \
-		p5-CGI-Untaint-date>=0:${PORTSDIR}/www/p5-CGI-Untaint-date \
-		p5-CGI-Untaint-email>=0:${PORTSDIR}/www/p5-CGI-Untaint-email \
-		p5-Class-DBI>=0.96:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-Class-DBI-AbstractSearch>=0:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \
-		p5-Class-DBI-Loader-Relationship>=0:${PORTSDIR}/databases/p5-Class-DBI-Loader-Relationship \
-		p5-Class-DBI-Loader>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Loader \
-		p5-Class-DBI-Pager>=0:${PORTSDIR}/databases/p5-Class-DBI-Pager \
-		p5-Class-DBI-Plugin-RetrieveAll>=0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-RetrieveAll \
-		p5-Class-DBI-Plugin-Type>=0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type \
-		p5-File-MMagic-XS>=0.08:${PORTSDIR}/devel/p5-File-MMagic-XS \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTTP-Body>=0.5:${PORTSDIR}/www/p5-HTTP-Body \
-		p5-Lingua-EN-Inflect-Number>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
-		p5-Template-Plugin-Class>=0:${PORTSDIR}/www/p5-Template-Plugin-Class \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-UNIVERSAL-moniker>=0:${PORTSDIR}/devel/p5-UNIVERSAL-moniker \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-CGI-Simple>=0:www/p5-CGI-Simple \
+		p5-CGI-Untaint>=1.26:www/p5-CGI-Untaint \
+		p5-CGI-Untaint-date>=0:www/p5-CGI-Untaint-date \
+		p5-CGI-Untaint-email>=0:www/p5-CGI-Untaint-email \
+		p5-Class-DBI>=0.96:databases/p5-Class-DBI \
+		p5-Class-DBI-AbstractSearch>=0:databases/p5-Class-DBI-AbstractSearch \
+		p5-Class-DBI-Loader-Relationship>=0:databases/p5-Class-DBI-Loader-Relationship \
+		p5-Class-DBI-Loader>=0.02:databases/p5-Class-DBI-Loader \
+		p5-Class-DBI-Pager>=0:databases/p5-Class-DBI-Pager \
+		p5-Class-DBI-Plugin-RetrieveAll>=0:databases/p5-Class-DBI-Plugin-RetrieveAll \
+		p5-Class-DBI-Plugin-Type>=0:databases/p5-Class-DBI-Plugin-Type \
+		p5-File-MMagic-XS>=0.08:devel/p5-File-MMagic-XS \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-HTTP-Body>=0.5:www/p5-HTTP-Body \
+		p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number \
+		p5-Template-Plugin-Class>=0:www/p5-Template-Plugin-Class \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-UNIVERSAL-moniker>=0:devel/p5-UNIVERSAL-moniker \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-Test-MockModule>=0:devel/p5-Test-MockModule \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 PORTSCOUT=	skipv:2.111,2.121
 
@@ -64,7 +64,7 @@ PORTDOCS=	*
 PORTEXAMPLES=	*
 
 MODPERL2_USE=		APACHE_RUN=22+
-MODPERL2_BUILD_DEPENDS=	p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2
+MODPERL2_BUILD_DEPENDS=	p5-libapreq2>=0:www/p5-libapreq2
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
diff --git a/www/p5-McBain-WithPSGI/Makefile b/www/p5-McBain-WithPSGI/Makefile
index b8513d9fa2f8..f21d227eddfb 100644
--- a/www/p5-McBain-WithPSGI/Makefile
+++ b/www/p5-McBain-WithPSGI/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Load a McBain API as a RESTful PSGI web service
 LICENSE=	GPLv1 ARTPERL10
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-McBain>=0:${PORTSDIR}/www/p5-McBain \
-		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Plack>=1.0029:${PORTSDIR}/www/p5-Plack
+RUN_DEPENDS=	p5-McBain>=0:www/p5-McBain \
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-Plack>=1.0029:www/p5-Plack
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-McBain/Makefile b/www/p5-McBain/Makefile
index 728db9001b35..1e8738c336fa 100644
--- a/www/p5-McBain/Makefile
+++ b/www/p5-McBain/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Lightweight auto-validating, self-documenting web framework
 LICENSE=	GPLv1 ARTPERL10
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Brannigan>=0:${PORTSDIR}/devel/p5-Brannigan \
-		p5-Getopt-Compact>=0:${PORTSDIR}/devel/p5-Getopt-Compact \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+RUN_DEPENDS=	p5-Brannigan>=0:devel/p5-Brannigan \
+		p5-Getopt-Compact>=0:devel/p5-Getopt-Compact \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-MediaWiki-API/Makefile b/www/p5-MediaWiki-API/Makefile
index a4f86a970d27..09a549994bdd 100644
--- a/www/p5-MediaWiki-API/Makefile
+++ b/www/p5-MediaWiki-API/Makefile
@@ -12,10 +12,10 @@ COMMENT=	OOP MediaWiki engine client
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any
+TEST_DEPENDS=	p5-JSON-Any>=0:converters/p5-JSON-Any
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-MediaWiki/Makefile b/www/p5-MediaWiki/Makefile
index 6bf236e5e4df..11c5c8781006 100644
--- a/www/p5-MediaWiki/Makefile
+++ b/www/p5-MediaWiki/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OOP MediaWiki engine client
 
-BUILD_DEPENDS=	p5-Config-IniHash>=0:${PORTSDIR}/devel/p5-Config-IniHash \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Config-IniHash>=0:devel/p5-Config-IniHash \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Mobile-UserAgent/Makefile b/www/p5-Mobile-UserAgent/Makefile
index 7e988f7d2b85..d9a70ba90b95 100644
--- a/www/p5-Mobile-UserAgent/Makefile
+++ b/www/p5-Mobile-UserAgent/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dliakh@ukr.net
 COMMENT=	Parses a mobile user agent string into its basic constituent parts
 
-RUN_DEPENDS=	p5-Class-Singleton>=0:${PORTSDIR}/devel/p5-Class-Singleton
+RUN_DEPENDS=	p5-Class-Singleton>=0:devel/p5-Class-Singleton
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-ModPerl-VersionUtil/Makefile b/www/p5-ModPerl-VersionUtil/Makefile
index 30cda2962a4a..efc8be598e27 100644
--- a/www/p5-ModPerl-VersionUtil/Makefile
+++ b/www/p5-ModPerl-VersionUtil/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Makes it easier to investigate your mod_perl version
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0.02:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Mojo-Server-FastCGI/Makefile b/www/p5-Mojo-Server-FastCGI/Makefile
index d2e9ac84b69c..8899240a42e8 100644
--- a/www/p5-Mojo-Server-FastCGI/Makefile
+++ b/www/p5-Mojo-Server-FastCGI/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Mojo Server FastCGI
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	p5-Mojolicious>=3.21:${PORTSDIR}/www/p5-Mojolicious
+RUN_DEPENDS=	p5-Mojolicious>=3.21:www/p5-Mojolicious
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-MojoMojo/Makefile b/www/p5-MojoMojo/Makefile
index 1ff606cce470..3b48090cd247 100644
--- a/www/p5-MojoMojo/Makefile
+++ b/www/p5-MojoMojo/Makefile
@@ -16,74 +16,74 @@ LICENSE_COMB=	dual
 
 # Please keep order as in Makefile.PL
 BUILD_DEPENDS=	\
-	p5-Plack>=0.9974:${PORTSDIR}/www/p5-Plack \
-	p5-Algorithm-Diff>=1.1901:${PORTSDIR}/devel/p5-Algorithm-Diff \
-	p5-Algorithm-Merge>=0:${PORTSDIR}/devel/p5-Algorithm-Merge \
-	p5-Archive-Zip>=1.14:${PORTSDIR}/archivers/p5-Archive-Zip \
-	p5-Cache-FastMmap>=1.31:${PORTSDIR}/devel/p5-Cache-FastMmap \
-	p5-Catalyst-Runtime>=5.71001:${PORTSDIR}/www/p5-Catalyst-Runtime \
-	p5-Catalyst-Action-RenderView>=0.07:${PORTSDIR}/www/p5-Catalyst-Action-RenderView \
-	p5-Catalyst-Authentication-Store-DBIx-Class>=0.101:${PORTSDIR}/www/p5-Catalyst-Authentication-Store-DBIx-Class \
-	p5-Catalyst-Controller-HTML-FormFu>=0.03007:${PORTSDIR}/www/p5-Catalyst-Controller-HTML-FormFu \
-	p5-Catalyst-Model-DBIC-Schema>=0.01:${PORTSDIR}/www/p5-Catalyst-Model-DBIC-Schema \
-	p5-Catalyst-Plugin-Authentication>=0.10005:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-	p5-Catalyst-Plugin-Cache>=0.08:${PORTSDIR}/www/p5-Catalyst-Plugin-Cache \
-	p5-Catalyst-Plugin-ConfigLoader>=0.13:${PORTSDIR}/www/p5-Catalyst-Plugin-ConfigLoader \
-	p5-Catalyst-Plugin-I18N>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-I18N \
-	p5-Catalyst-Plugin-SubRequest>=0.13:${PORTSDIR}/www/p5-Catalyst-Plugin-SubRequest \
-	p5-Catalyst-Plugin-Session-State-Cookie>=0.11:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-State-Cookie \
-	p5-Catalyst-Plugin-Session-Store-Cache>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-Store-Cache \
-	p5-Catalyst-Plugin-Setenv>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Setenv \
-	p5-Catalyst-Plugin-Static-Simple>=0.07:${PORTSDIR}/www/p5-Catalyst-Plugin-Static-Simple \
-	p5-Catalyst-Plugin-Unicode>=0.8:${PORTSDIR}/www/p5-Catalyst-Plugin-Unicode \
-	p5-Catalyst-View-TT>=0.23:${PORTSDIR}/www/p5-Catalyst-View-TT \
-	p5-Catalyst-View-JSON>=0.26:${PORTSDIR}/www/p5-Catalyst-View-JSON \
-	p5-Catalyst-View-Email>=0:${PORTSDIR}/www/p5-Catalyst-View-Email \
-	p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-	p5-Config-JFDI>=0:${PORTSDIR}/devel/p5-Config-JFDI \
-	p5-Crypt-CBC>=2.12:${PORTSDIR}/security/p5-Crypt-CBC \
-	p5-Data-Page>=2.00:${PORTSDIR}/databases/p5-Data-Page \
-	p5-DateTime>=0.28:${PORTSDIR}/devel/p5-DateTime \
-	p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-	p5-Directory-Scratch>=0.14:${PORTSDIR}/devel/p5-Directory-Scratch \
-	p5-DBD-SQLite>=1.08:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-DBIx-Class>=0.08:${PORTSDIR}/databases/p5-DBIx-Class \
-	p5-DBIx-Class-DateTime-Epoch>=0.04:${PORTSDIR}/databases/p5-DBIx-Class-DateTime-Epoch \
-	p5-DBIx-Class-EncodedColumn>=0:${PORTSDIR}/databases/p5-DBIx-Class-EncodedColumn \
-	p5-DBIx-Class-TimeStamp>=0.11:${PORTSDIR}/databases/p5-DBIx-Class-TimeStamp \
-	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-	p5-File-MMagic>=1.27:${PORTSDIR}/devel/p5-File-MMagic \
-	p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-HTML-Parser>=3.60:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-HTML-FormFu>=0.02000:${PORTSDIR}/www/p5-HTML-FormFu \
-	p5-HTML-FormFu-Model-DBIC>=0:${PORTSDIR}/www/p5-HTML-FormFu-Model-DBIC \
-	p5-HTML-Strip>=1.04:${PORTSDIR}/www/p5-HTML-Strip \
-	p5-HTML-TagCloud>=0:${PORTSDIR}/www/p5-HTML-TagCloud \
-	p5-HTML-Toc>=0:${PORTSDIR}/www/p5-HTML-Toc \
-	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
-	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
-	p5-Image-Math-Constrain>=0:${PORTSDIR}/graphics/p5-Image-Math-Constrain \
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-KinoSearch1>=1.00:${PORTSDIR}/textproc/p5-KinoSearch1 \
-	p5-Module-Pluggable-Ordered>=1.4:${PORTSDIR}/devel/p5-Module-Pluggable-Ordered \
-	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-	p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
-	p5-Number-Format>=0:${PORTSDIR}/textproc/p5-Number-Format \
-	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-	p5-Template-Plugin-JavaScript>=0:${PORTSDIR}/www/p5-Template-Plugin-JavaScript \
-	p5-Text-Context>=3.5:${PORTSDIR}/textproc/p5-Text-Context \
-	p5-Text-MultiMarkdown>=1.000031:${PORTSDIR}/textproc/p5-Text-MultiMarkdown \
-	p5-Text-Password-Pronounceable>=0:${PORTSDIR}/security/p5-Text-Password-Pronounceable \
-	p5-Text-Textile>=0:${PORTSDIR}/textproc/p5-Text-Textile \
-	p5-URI>=1.37:${PORTSDIR}/net/p5-URI \
-	p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find \
-	p5-WWW-Mechanize>=1.54:${PORTSDIR}/www/p5-WWW-Mechanize \
-	p5-WWW-Mechanize-TreeBuilder>=1.10000:${PORTSDIR}/www/p5-WWW-Mechanize-TreeBuilder \
-	p5-YAML>=0.36:${PORTSDIR}/textproc/p5-YAML \
-	p5-Term-Prompt>=0:${PORTSDIR}/devel/p5-Term-Prompt \
-	p5-Text-Emoticon-MSN>=0:${PORTSDIR}/textproc/p5-Text-Emoticon-MSN
+	p5-Plack>=0.9974:www/p5-Plack \
+	p5-Algorithm-Diff>=1.1901:devel/p5-Algorithm-Diff \
+	p5-Algorithm-Merge>=0:devel/p5-Algorithm-Merge \
+	p5-Archive-Zip>=1.14:archivers/p5-Archive-Zip \
+	p5-Cache-FastMmap>=1.31:devel/p5-Cache-FastMmap \
+	p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \
+	p5-Catalyst-Action-RenderView>=0.07:www/p5-Catalyst-Action-RenderView \
+	p5-Catalyst-Authentication-Store-DBIx-Class>=0.101:www/p5-Catalyst-Authentication-Store-DBIx-Class \
+	p5-Catalyst-Controller-HTML-FormFu>=0.03007:www/p5-Catalyst-Controller-HTML-FormFu \
+	p5-Catalyst-Model-DBIC-Schema>=0.01:www/p5-Catalyst-Model-DBIC-Schema \
+	p5-Catalyst-Plugin-Authentication>=0.10005:www/p5-Catalyst-Plugin-Authentication \
+	p5-Catalyst-Plugin-Cache>=0.08:www/p5-Catalyst-Plugin-Cache \
+	p5-Catalyst-Plugin-ConfigLoader>=0.13:www/p5-Catalyst-Plugin-ConfigLoader \
+	p5-Catalyst-Plugin-I18N>=0:www/p5-Catalyst-Plugin-I18N \
+	p5-Catalyst-Plugin-SubRequest>=0.13:www/p5-Catalyst-Plugin-SubRequest \
+	p5-Catalyst-Plugin-Session-State-Cookie>=0.11:www/p5-Catalyst-Plugin-Session-State-Cookie \
+	p5-Catalyst-Plugin-Session-Store-Cache>=0:www/p5-Catalyst-Plugin-Session-Store-Cache \
+	p5-Catalyst-Plugin-Setenv>=0:www/p5-Catalyst-Plugin-Setenv \
+	p5-Catalyst-Plugin-Static-Simple>=0.07:www/p5-Catalyst-Plugin-Static-Simple \
+	p5-Catalyst-Plugin-Unicode>=0.8:www/p5-Catalyst-Plugin-Unicode \
+	p5-Catalyst-View-TT>=0.23:www/p5-Catalyst-View-TT \
+	p5-Catalyst-View-JSON>=0.26:www/p5-Catalyst-View-JSON \
+	p5-Catalyst-View-Email>=0:www/p5-Catalyst-View-Email \
+	p5-Config-General>=0:devel/p5-Config-General \
+	p5-Config-JFDI>=0:devel/p5-Config-JFDI \
+	p5-Crypt-CBC>=2.12:security/p5-Crypt-CBC \
+	p5-Data-Page>=2.00:databases/p5-Data-Page \
+	p5-DateTime>=0.28:devel/p5-DateTime \
+	p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+	p5-Directory-Scratch>=0.14:devel/p5-Directory-Scratch \
+	p5-DBD-SQLite>=1.08:databases/p5-DBD-SQLite \
+	p5-DBIx-Class>=0.08:databases/p5-DBIx-Class \
+	p5-DBIx-Class-DateTime-Epoch>=0.04:databases/p5-DBIx-Class-DateTime-Epoch \
+	p5-DBIx-Class-EncodedColumn>=0:databases/p5-DBIx-Class-EncodedColumn \
+	p5-DBIx-Class-TimeStamp>=0.11:databases/p5-DBIx-Class-TimeStamp \
+	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+	p5-File-MMagic>=1.27:devel/p5-File-MMagic \
+	p5-File-Slurp>=9999.13:devel/p5-File-Slurp \
+	p5-HTML-Parser>=3.60:www/p5-HTML-Parser \
+	p5-HTML-FormFu>=0.02000:www/p5-HTML-FormFu \
+	p5-HTML-FormFu-Model-DBIC>=0:www/p5-HTML-FormFu-Model-DBIC \
+	p5-HTML-Strip>=1.04:www/p5-HTML-Strip \
+	p5-HTML-TagCloud>=0:www/p5-HTML-TagCloud \
+	p5-HTML-Toc>=0:www/p5-HTML-Toc \
+	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \
+	p5-Imager>=0:graphics/p5-Imager \
+	p5-Image-Math-Constrain>=0:graphics/p5-Image-Math-Constrain \
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-KinoSearch1>=1.00:textproc/p5-KinoSearch1 \
+	p5-Module-Pluggable-Ordered>=1.4:devel/p5-Module-Pluggable-Ordered \
+	p5-Moose>=0:devel/p5-Moose \
+	p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
+	p5-Number-Format>=0:textproc/p5-Number-Format \
+	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+	p5-Template-Plugin-JavaScript>=0:www/p5-Template-Plugin-JavaScript \
+	p5-Text-Context>=3.5:textproc/p5-Text-Context \
+	p5-Text-MultiMarkdown>=1.000031:textproc/p5-Text-MultiMarkdown \
+	p5-Text-Password-Pronounceable>=0:security/p5-Text-Password-Pronounceable \
+	p5-Text-Textile>=0:textproc/p5-Text-Textile \
+	p5-URI>=1.37:net/p5-URI \
+	p5-URI-Find>=0:textproc/p5-URI-Find \
+	p5-WWW-Mechanize>=1.54:www/p5-WWW-Mechanize \
+	p5-WWW-Mechanize-TreeBuilder>=1.10000:www/p5-WWW-Mechanize-TreeBuilder \
+	p5-YAML>=0.36:textproc/p5-YAML \
+	p5-Term-Prompt>=0:devel/p5-Term-Prompt \
+	p5-Text-Emoticon-MSN>=0:textproc/p5-Text-Emoticon-MSN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0:devel/p5-Test-WWW-Mechanize-Catalyst
 
 NO_ARCH=	yes
 USES=		perl5
@@ -101,29 +101,29 @@ POD_FORMATTER_DESC=	POD formatter
 TRANSCLUSION_DESC=	Transclusion support
 AMAZON_DESC=		Amazon boxes
 
-DEPLOY_BUILD_DEPENDS=		p5-SQL-Translator>=0.09006:${PORTSDIR}/databases/p5-SQL-Translator
-DEPLOY_RUN_DEPENDS=		p5-SQL-Translator>=0.09006:${PORTSDIR}/databases/p5-SQL-Translator
-FASTCGI_BUILD_DEPENDS=		p5-FCGI-ProcManager>=0:${PORTSDIR}/www/p5-FCGI-ProcManager
-FASTCGI_RUN_DEPENDS=		p5-FCGI-ProcManager>=0:${PORTSDIR}/www/p5-FCGI-ProcManager
-TOCGEN_BUILD_DEPENDS=		p5-HTML-Toc>=1.10:${PORTSDIR}/www/p5-HTML-Toc
-TOCGEN_RUN_DEPENDS=		p5-HTML-Toc>=1.10:${PORTSDIR}/www/p5-HTML-Toc
-RECAPTCHA_BUILD_DEPENDS=	p5-HTML-FormFu>=0:${PORTSDIR}/www/p5-HTML-FormFu
-RECAPTCHA_RUN_DEPENDS=		p5-HTML-FormFu>=0:${PORTSDIR}/www/p5-HTML-FormFu
-SYNTAX_HIGHLIGHT_BUILD_DEPENDS=	p5-Syntax-Highlight-Engine-Kate>=0:${PORTSDIR}/textproc/p5-Syntax-Highlight-Engine-Kate
-SYNTAX_HIGHLIGHT_RUN_DEPENDS=	p5-Syntax-Highlight-Engine-Kate>=0:${PORTSDIR}/textproc/p5-Syntax-Highlight-Engine-Kate
-RSS_FORMATTER_BUILD_DEPENDS=	p5-XML-Feed>=0:${PORTSDIR}/textproc/p5-XML-Feed
-RSS_FORMATTER_RUN_DEPENDS=	p5-XML-Feed>=0:${PORTSDIR}/textproc/p5-XML-Feed
-DOCBOOK_FORMATTER_BUILD_DEPENDS=p5-XML-LibXML>=1.66:${PORTSDIR}/textproc/p5-XML-LibXML \
-				p5-XML-LibXSLT>=1.66:${PORTSDIR}/textproc/p5-XML-LibXSLT
-DOCBOOK_FORMATTER_RUN_DEPENDS=	p5-XML-LibXML>=1.66:${PORTSDIR}/textproc/p5-XML-LibXML \
-				p5-XML-LibXSLT>=1.66:${PORTSDIR}/textproc/p5-XML-LibXSLT
-POD_FORMATTER_BUILD_DEPENDS=	p5-Pod-Simple>=3.01:${PORTSDIR}/textproc/p5-Pod-Simple
-POD_FORMATTER_RUN_DEPENDS=	p5-Pod-Simple>=3.01:${PORTSDIR}/textproc/p5-Pod-Simple
-TRANSCLUSION_BUILD_DEPENDS=	p5-URI-Fetch>=0:${PORTSDIR}/www/p5-URI-Fetch \
-				p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-TRANSCLUSION_RUN_DEPENDS=	p5-URI-Fetch>=0:${PORTSDIR}/www/p5-URI-Fetch \
-				p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-AMAZON_BUILD_DEPENDS=		p5-Net-Amazon>=0:${PORTSDIR}/net/p5-Net-Amazon
-AMAZON_RUN_DEPENDS=		p5-Net-Amazon>=0:${PORTSDIR}/net/p5-Net-Amazon
+DEPLOY_BUILD_DEPENDS=		p5-SQL-Translator>=0.09006:databases/p5-SQL-Translator
+DEPLOY_RUN_DEPENDS=		p5-SQL-Translator>=0.09006:databases/p5-SQL-Translator
+FASTCGI_BUILD_DEPENDS=		p5-FCGI-ProcManager>=0:www/p5-FCGI-ProcManager
+FASTCGI_RUN_DEPENDS=		p5-FCGI-ProcManager>=0:www/p5-FCGI-ProcManager
+TOCGEN_BUILD_DEPENDS=		p5-HTML-Toc>=1.10:www/p5-HTML-Toc
+TOCGEN_RUN_DEPENDS=		p5-HTML-Toc>=1.10:www/p5-HTML-Toc
+RECAPTCHA_BUILD_DEPENDS=	p5-HTML-FormFu>=0:www/p5-HTML-FormFu
+RECAPTCHA_RUN_DEPENDS=		p5-HTML-FormFu>=0:www/p5-HTML-FormFu
+SYNTAX_HIGHLIGHT_BUILD_DEPENDS=	p5-Syntax-Highlight-Engine-Kate>=0:textproc/p5-Syntax-Highlight-Engine-Kate
+SYNTAX_HIGHLIGHT_RUN_DEPENDS=	p5-Syntax-Highlight-Engine-Kate>=0:textproc/p5-Syntax-Highlight-Engine-Kate
+RSS_FORMATTER_BUILD_DEPENDS=	p5-XML-Feed>=0:textproc/p5-XML-Feed
+RSS_FORMATTER_RUN_DEPENDS=	p5-XML-Feed>=0:textproc/p5-XML-Feed
+DOCBOOK_FORMATTER_BUILD_DEPENDS=p5-XML-LibXML>=1.66:textproc/p5-XML-LibXML \
+				p5-XML-LibXSLT>=1.66:textproc/p5-XML-LibXSLT
+DOCBOOK_FORMATTER_RUN_DEPENDS=	p5-XML-LibXML>=1.66:textproc/p5-XML-LibXML \
+				p5-XML-LibXSLT>=1.66:textproc/p5-XML-LibXSLT
+POD_FORMATTER_BUILD_DEPENDS=	p5-Pod-Simple>=3.01:textproc/p5-Pod-Simple
+POD_FORMATTER_RUN_DEPENDS=	p5-Pod-Simple>=3.01:textproc/p5-Pod-Simple
+TRANSCLUSION_BUILD_DEPENDS=	p5-URI-Fetch>=0:www/p5-URI-Fetch \
+				p5-libwww>=0:www/p5-libwww
+TRANSCLUSION_RUN_DEPENDS=	p5-URI-Fetch>=0:www/p5-URI-Fetch \
+				p5-libwww>=0:www/p5-libwww
+AMAZON_BUILD_DEPENDS=		p5-Net-Amazon>=0:net/p5-Net-Amazon
+AMAZON_RUN_DEPENDS=		p5-Net-Amazon>=0:net/p5-Net-Amazon
 
 .include <bsd.port.mk>
diff --git a/www/p5-MojoX-Log-Dispatch-Simple/Makefile b/www/p5-MojoX-Log-Dispatch-Simple/Makefile
index 8e4186ea56cf..66231455c995 100644
--- a/www/p5-MojoX-Log-Dispatch-Simple/Makefile
+++ b/www/p5-MojoX-Log-Dispatch-Simple/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple Log::Dispatch replacement of Mojo::Log
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Mojolicious>=0:www/p5-Mojolicious
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-MojoX-Renderer-Xslate/Makefile b/www/p5-MojoX-Renderer-Xslate/Makefile
index 71c45d2d5a19..f46982ccade3 100644
--- a/www/p5-MojoX-Renderer-Xslate/Makefile
+++ b/www/p5-MojoX-Renderer-Xslate/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Text::Xslate renderer for for Mojolicious
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mojolicious>=5.81:${PORTSDIR}/www/p5-Mojolicious \
-		p5-Text-Xslate>=0.2013:${PORTSDIR}/textproc/p5-Text-Xslate
+BUILD_DEPENDS=	p5-Mojolicious>=5.81:www/p5-Mojolicious \
+		p5-Text-Xslate>=0.2013:textproc/p5-Text-Xslate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Mojolicious-Plugin-Authentication/Makefile b/www/p5-Mojolicious-Plugin-Authentication/Makefile
index c996a5ddd42e..35f802dfb301 100644
--- a/www/p5-Mojolicious-Plugin-Authentication/Makefile
+++ b/www/p5-Mojolicious-Plugin-Authentication/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mojolicious plugin to make authentication a bit easier
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS=	p5-Mojolicious>=0:www/p5-Mojolicious
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Mojolicious-Plugin-Database/Makefile b/www/p5-Mojolicious-Plugin-Database/Makefile
index 1392f1951b01..e4d1aad443a7 100644
--- a/www/p5-Mojolicious-Plugin-Database/Makefile
+++ b/www/p5-Mojolicious-Plugin-Database/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Handling of DBI based connections in Mojolicious
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Mojolicious>=1:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Mojolicious>=1:www/p5-Mojolicious
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-Mojolicious-Plugin-Mongodb/Makefile b/www/p5-Mojolicious-Plugin-Mongodb/Makefile
index 87290d56c287..8e6d7f7ecf20 100644
--- a/www/p5-Mojolicious-Plugin-Mongodb/Makefile
+++ b/www/p5-Mojolicious-Plugin-Mongodb/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Use MongoDB in Mojolicious
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious \
-		p5-MongoDB>=0:${PORTSDIR}/databases/p5-MongoDB \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS=	p5-Mojolicious>=0:www/p5-Mojolicious \
+		p5-MongoDB>=0:databases/p5-MongoDB \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Mojolicious-Plugin-SetUserGroup/Makefile b/www/p5-Mojolicious-Plugin-SetUserGroup/Makefile
index f370fa99d12e..f50d9fcbf2b5 100644
--- a/www/p5-Mojolicious-Plugin-SetUserGroup/Makefile
+++ b/www/p5-Mojolicious-Plugin-SetUserGroup/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Mojolicious plugin to set unprivileged credentials
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Mojolicious>=6.0:${PORTSDIR}/www/p5-Mojolicious \
-		p5-Unix-Groups>=0:${PORTSDIR}/devel/p5-Unix-Groups
+BUILD_DEPENDS=	p5-Mojolicious>=6.0:www/p5-Mojolicious \
+		p5-Unix-Groups>=0:devel/p5-Unix-Groups
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -25,8 +25,8 @@ USE_PERL5=	modbuildtiny
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Mojolicious-Plugin-TtRenderer/Makefile b/www/p5-Mojolicious-Plugin-TtRenderer/Makefile
index 8300aa7d33dc..9927195b1e3b 100644
--- a/www/p5-Mojolicious-Plugin-TtRenderer/Makefile
+++ b/www/p5-Mojolicious-Plugin-TtRenderer/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Template-toolkit renderer for Mojolicious
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mojolicious>=6.33:${PORTSDIR}/www/p5-Mojolicious \
-		p5-Template-Toolkit>=2.18:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Mojolicious>=6.33:www/p5-Mojolicious \
+		p5-Template-Toolkit>=2.18:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Mojolicious-Plugin-YamlConfig/Makefile b/www/p5-Mojolicious-Plugin-YamlConfig/Makefile
index 01d722d1b1a5..6681be3b7507 100644
--- a/www/p5-Mojolicious-Plugin-YamlConfig/Makefile
+++ b/www/p5-Mojolicious-Plugin-YamlConfig/Makefile
@@ -13,10 +13,10 @@ COMMENT=	YAML Configuration Plugin
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mojolicious>=5.54:${PORTSDIR}/www/p5-Mojolicious \
-		p5-YAML-Tiny>=1.60:${PORTSDIR}/textproc/p5-YAML-Tiny
+BUILD_DEPENDS=	p5-Mojolicious>=5.54:www/p5-Mojolicious \
+		p5-YAML-Tiny>=1.60:textproc/p5-YAML-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Compile>=0:${PORTSDIR}/devel/p5-Test-Compile
+TEST_DEPENDS=	p5-Test-Compile>=0:devel/p5-Test-Compile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Mojolicious/Makefile b/www/p5-Mojolicious/Makefile
index 487cf3b08e42..e6de7c04be81 100644
--- a/www/p5-Mojolicious/Makefile
+++ b/www/p5-Mojolicious/Makefile
@@ -21,14 +21,14 @@ USE_PERL5=	configure
 USES=		perl5
 
 EV_DESC=		High-performance event loop via devel/p5-EV
-EV_BUILD_DEPENDS=	p5-EV>=4:${PORTSDIR}/devel/p5-EV
-EV_RUN_DEPENDS=		p5-EV>=4:${PORTSDIR}/devel/p5-EV
+EV_BUILD_DEPENDS=	p5-EV>=4:devel/p5-EV
+EV_RUN_DEPENDS=		p5-EV>=4:devel/p5-EV
 
 IPV6_CATEGORIES=	ipv6
-IPV6_BUILD_DEPENDS=	p5-IO-Socket-IP>=0.37:${PORTSDIR}/net/p5-IO-Socket-IP
-IPV6_RUN_DEPENDS=	p5-IO-Socket-IP>=0.37:${PORTSDIR}/net/p5-IO-Socket-IP
+IPV6_BUILD_DEPENDS=	p5-IO-Socket-IP>=0.37:net/p5-IO-Socket-IP
+IPV6_RUN_DEPENDS=	p5-IO-Socket-IP>=0.37:net/p5-IO-Socket-IP
 
-TLS_BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.75:${PORTSDIR}/security/p5-IO-Socket-SSL
-TLS_RUN_DEPENDS=	p5-IO-Socket-SSL>=1.75:${PORTSDIR}/security/p5-IO-Socket-SSL
+TLS_BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.75:security/p5-IO-Socket-SSL
+TLS_RUN_DEPENDS=	p5-IO-Socket-SSL>=1.75:security/p5-IO-Socket-SSL
 
 .include <bsd.port.mk>
diff --git a/www/p5-Monoceros/Makefile b/www/p5-Monoceros/Makefile
index 9170bb6e2c61..900227097ce2 100644
--- a/www/p5-Monoceros/Makefile
+++ b/www/p5-Monoceros/Makefile
@@ -15,17 +15,17 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>=7.04:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-IO-FDPass>=1.0:${PORTSDIR}/devel/p5-IO-FDPass \
-	p5-Net-CIDR-Lite>0:${PORTSDIR}/net/p5-Net-CIDR-Lite \
-	p5-POSIX-Socket>0:${PORTSDIR}/net/p5-POSIX-Socket \
-	p5-POSIX-getpeername>0:${PORTSDIR}/net/p5-POSIX-getpeername \
-	p5-Plack>=1.0023:${PORTSDIR}/www/p5-Plack \
-	p5-Starlet>=0.18:${PORTSDIR}/www/p5-Starlet \
-	p5-Sys-Sendfile>=0.11:${PORTSDIR}/devel/p5-Sys-Sendfile
+	p5-AnyEvent>=7.04:devel/p5-AnyEvent \
+	p5-IO-FDPass>=1.0:devel/p5-IO-FDPass \
+	p5-Net-CIDR-Lite>0:net/p5-Net-CIDR-Lite \
+	p5-POSIX-Socket>0:net/p5-POSIX-Socket \
+	p5-POSIX-getpeername>0:net/p5-POSIX-getpeername \
+	p5-Plack>=1.0023:www/p5-Plack \
+	p5-Starlet>=0.18:www/p5-Starlet \
+	p5-Sys-Sendfile>=0.11:devel/p5-Sys-Sendfile
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=	perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Net-Akismet/Makefile b/www/p5-Net-Akismet/Makefile
index 94a374df6414..9cff66bf53c1 100644
--- a/www/p5-Net-Akismet/Makefile
+++ b/www/p5-Net-Akismet/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl interface to the Akismet comment and trackback spam blocker
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=5.09:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=5.09:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Net-Amazon-AWIS/Makefile b/www/p5-Net-Amazon-AWIS/Makefile
index 653399ab9a36..e8bf2be0f633 100644
--- a/www/p5-Net-Amazon-AWIS/Makefile
+++ b/www/p5-Net-Amazon-AWIS/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Use the Amazon Alexa Web Information Service
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-Prompt>=0:${PORTSDIR}/devel/p5-IO-Prompt \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-Net-Async-FastCGI/Makefile b/www/p5-Net-Async-FastCGI/Makefile
index e06053cbcfd4..bdf08495f5ae 100644
--- a/www/p5-Net-Async-FastCGI/Makefile
+++ b/www/p5-Net-Async-FastCGI/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Perl module to use FastCGI with IO::Async
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-Async>=0:${PORTSDIR}/devel/p5-IO-Async \
-		p5-Net-FastCGI>=0:${PORTSDIR}/www/p5-Net-FastCGI
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-Async>=0:devel/p5-IO-Async \
+		p5-Net-FastCGI>=0:www/p5-Net-FastCGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-HexString>=0:${PORTSDIR}/devel/p5-Test-HexString \
-		p5-Test-Refcount>0:${PORTSDIR}/devel/p5-Test-Refcount \
-		p5-Test-Identity>=0:${PORTSDIR}/devel/p5-Test-Identity
+TEST_DEPENDS=	p5-Test-HexString>=0:devel/p5-Test-HexString \
+		p5-Test-Refcount>0:devel/p5-Test-Refcount \
+		p5-Test-Identity>=0:devel/p5-Test-Identity
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Net-Async-HTTP/Makefile b/www/p5-Net-Async-HTTP/Makefile
index cf1af0632098..c234016b761d 100644
--- a/www/p5-Net-Async-HTTP/Makefile
+++ b/www/p5-Net-Async-HTTP/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Use HTTP with IO::Async
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>=0.28:${PORTSDIR}/devel/p5-Future \
-		p5-HTTP-Cookies>=0:${PORTSDIR}/www/p5-HTTP-Cookies \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-Async>=0.59:${PORTSDIR}/devel/p5-IO-Async \
-		p5-Struct-Dumb>=0:${PORTSDIR}/devel/p5-Struct-Dumb \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Future>=0.28:devel/p5-Future \
+		p5-HTTP-Cookies>=0:www/p5-HTTP-Cookies \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-Async>=0.59:devel/p5-IO-Async \
+		p5-Struct-Dumb>=0:devel/p5-Struct-Dumb \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-Async-SSL>=0.12:${PORTSDIR}/security/p5-IO-Async-SSL \
-		p5-Test-Identity>=0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Refcount>=0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-IO-Async-SSL>=0.12:security/p5-IO-Async-SSL \
+		p5-Test-Identity>=0:devel/p5-Test-Identity \
+		p5-Test-Refcount>=0:devel/p5-Test-Refcount
 
 OPTIONS_DEFINE=	SSL
 
@@ -30,14 +30,14 @@ NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5
 
-SSL_BUILD_DEPENDS=	p5-IO-Async-SSL>=0.12:${PORTSDIR}/security/p5-IO-Async-SSL
-SSL_RUN_DEPENDS=	p5-IO-Async-SSL>=0.12:${PORTSDIR}/security/p5-IO-Async-SSL
+SSL_BUILD_DEPENDS=	p5-IO-Async-SSL>=0.12:security/p5-IO-Async-SSL
+SSL_RUN_DEPENDS=	p5-IO-Async-SSL>=0.12:security/p5-IO-Async-SSL
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.29:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.29:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.29:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.29:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Net-FastCGI/Makefile b/www/p5-Net-FastCGI/Makefile
index 81845f4cde24..ade847939dbe 100644
--- a/www/p5-Net-FastCGI/Makefile
+++ b/www/p5-Net-FastCGI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for FastCGI Toolkit
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-HexString>=0:${PORTSDIR}/devel/p5-Test-HexString
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-HexString>=0:devel/p5-Test-HexString
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Net-FireEagle/Makefile b/www/p5-Net-FireEagle/Makefile
index 463cd1e836ff..b84981561242 100644
--- a/www/p5-Net-FireEagle/Makefile
+++ b/www/p5-Net-FireEagle/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Access Yahoo's FireEagle location service
 
-RUN_DEPENDS=	p5-Net-OAuth-Simple>=1.0:${PORTSDIR}/net/p5-Net-OAuth-Simple \
-		p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
-		p5-JSON-Any>=1.15:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-Net-SSLeay>=1.30:${PORTSDIR}/security/p5-Net-SSLeay
+RUN_DEPENDS=	p5-Net-OAuth-Simple>=1.0:net/p5-Net-OAuth-Simple \
+		p5-libwww>=5.805:www/p5-libwww \
+		p5-JSON-Any>=1.15:converters/p5-JSON-Any \
+		p5-Net-SSLeay>=1.30:security/p5-Net-SSLeay
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Net-Flickr-API/Makefile b/www/p5-Net-Flickr-API/Makefile
index 7e115b17d006..c865ea83dd3e 100644
--- a/www/p5-Net-Flickr-API/Makefile
+++ b/www/p5-Net-Flickr-API/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Base API class for Net::Flickr::* libraries
 
-BUILD_DEPENDS=	p5-Config-Simple>=0:${PORTSDIR}/devel/p5-Config-Simple \
-		p5-Flickr-API>=0:${PORTSDIR}/www/p5-Flickr-API \
-		p5-Flickr-Upload>=0:${PORTSDIR}/www/p5-Flickr-Upload \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
+BUILD_DEPENDS=	p5-Config-Simple>=0:devel/p5-Config-Simple \
+		p5-Flickr-API>=0:www/p5-Flickr-API \
+		p5-Flickr-Upload>=0:www/p5-Flickr-Upload \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Net-Flickr-Backup/Makefile b/www/p5-Net-Flickr-Backup/Makefile
index 2035d36f1a19..6e854c1bf51f 100644
--- a/www/p5-Net-Flickr-Backup/Makefile
+++ b/www/p5-Net-Flickr-Backup/Makefile
@@ -14,13 +14,13 @@ COMMENT=	OOP for backing up your Flickr photos locally
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-IO-stringy>=2.101:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Image-MetaData-JPEG>=0.15:${PORTSDIR}/graphics/p5-Image-MetaData-JPEG \
-		p5-Net-Flickr-RDF>=2.2:${PORTSDIR}/www/p5-Net-Flickr-RDF \
-		p5-TimeDate>=1.16:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Text-Unidecode>=0.04:${PORTSDIR}/converters/p5-Text-Unidecode \
-		p5-libwww>=1.38:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-IO-stringy>=2.101:devel/p5-IO-stringy \
+		p5-Image-MetaData-JPEG>=0.15:graphics/p5-Image-MetaData-JPEG \
+		p5-Net-Flickr-RDF>=2.2:www/p5-Net-Flickr-RDF \
+		p5-TimeDate>=1.16:devel/p5-TimeDate \
+		p5-Text-Unidecode>=0.04:converters/p5-Text-Unidecode \
+		p5-libwww>=1.38:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Net-Flickr-RDF/Makefile b/www/p5-Net-Flickr-RDF/Makefile
index 4cd667e867cb..eaec5e982ca1 100644
--- a/www/p5-Net-Flickr-RDF/Makefile
+++ b/www/p5-Net-Flickr-RDF/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Describe Flickr photos as RDF
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-Flickr-API>=1.7:${PORTSDIR}/www/p5-Net-Flickr-API \
-		p5-RDF-Simple>=0.22:${PORTSDIR}/textproc/p5-RDF-Simple \
-		p5-TimeDate>=1.16:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-Net-Flickr-API>=1.7:www/p5-Net-Flickr-API \
+		p5-RDF-Simple>=0.22:textproc/p5-RDF-Simple \
+		p5-TimeDate>=1.16:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Net-FreshBooks-API/Makefile b/www/p5-Net-FreshBooks-API/Makefile
index 9c88dde8f925..ebcf9af595be 100644
--- a/www/p5-Net-FreshBooks-API/Makefile
+++ b/www/p5-Net-FreshBooks-API/Makefile
@@ -13,28 +13,28 @@ COMMENT=	Easy OO access to the FreshBooks.com API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.09:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Net-OAuth-Simple>=0:${PORTSDIR}/net/p5-Net-OAuth-Simple \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-namespace-autoclean>=0.11:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.09:devel/p5-B-Hooks-EndOfScope \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Net-OAuth-Simple>=0:net/p5-Net-OAuth-Simple \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww \
+		p5-namespace-autoclean>=0.11:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Sub-Override>=0:${PORTSDIR}/devel/p5-Sub-Override \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
-		p5-Test-XML>=0:${PORTSDIR}/devel/p5-Test-XML
+TEST_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Sub-Override>=0:devel/p5-Sub-Override \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize \
+		p5-Test-XML>=0:devel/p5-Test-XML
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Net-GeoPlanet/Makefile b/www/p5-Net-GeoPlanet/Makefile
index 06ecc199271e..49096bfb3813 100644
--- a/www/p5-Net-GeoPlanet/Makefile
+++ b/www/p5-Net-GeoPlanet/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Access Yahoo's GeoPlanet location service
 
-RUN_DEPENDS=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI \
-		p5-Test-Simple>=0.74:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-libwww>=5.805:www/p5-libwww \
+		p5-URI>=1.35:net/p5-URI \
+		p5-Test-Simple>=0.74:devel/p5-Test-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Net-Plurk/Makefile b/www/p5-Net-Plurk/Makefile
index 7cfff66f4331..db1b73f9529a 100644
--- a/www/p5-Net-Plurk/Makefile
+++ b/www/p5-Net-Plurk/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Perl interface to Plurk API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent-HTTP>=0:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-HTTP-Lite>=0:${PORTSDIR}/www/p5-HTTP-Lite \
-		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-Math-Base36>=0:${PORTSDIR}/math/p5-Math-Base36 \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Net-OAuth>=0.27:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-HTTP-Lite>=0:www/p5-HTTP-Lite \
+		p5-JSON-Any>=0:converters/p5-JSON-Any \
+		p5-Math-Base36>=0:math/p5-Math-Base36 \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Net-OAuth>=0.27:net/p5-Net-OAuth \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-URI>=0:net/p5-URI \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Net-STF-Client/Makefile b/www/p5-Net-STF-Client/Makefile
index 157607430835..1e92b9f49321 100644
--- a/www/p5-Net-STF-Client/Makefile
+++ b/www/p5-Net-STF-Client/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for STF Client
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-Furl>0:${PORTSDIR}/www/p5-Furl \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-Furl>0:www/p5-Furl \
+	p5-libwww>0:www/p5-libwww \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP \
-	p5-Test-Simple>0:${PORTSDIR}/devel/p5-Test-Simple \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-TCP>0:devel/p5-Test-TCP \
+	p5-Test-Simple>0:devel/p5-Test-Simple \
+	p5-Plack>0:www/p5-Plack
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Net-Trac/Makefile b/www/p5-Net-Trac/Makefile
index f59e4c2a9a73..b25a970e4ce2 100644
--- a/www/p5-Net-Trac/Makefile
+++ b/www/p5-Net-Trac/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Interact with a remote Trac instance
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Lingua-EN-Inflect>0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Text-CSV>0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=1.52:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Any-Moose>0:devel/p5-Any-Moose \
+		p5-DateTime>0:devel/p5-DateTime \
+		p5-Lingua-EN-Inflect>0:textproc/p5-Lingua-EN-Inflect \
+		p5-Params-Validate>0:devel/p5-Params-Validate \
+		p5-Text-CSV>0:textproc/p5-Text-CSV \
+		p5-URI>0:net/p5-URI \
+		p5-WWW-Mechanize>=1.52:www/p5-WWW-Mechanize \
+		p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Net-YAP/Makefile b/www/p5-Net-YAP/Makefile
index 37414f25a3ec..445b2ccb6062 100644
--- a/www/p5-Net-YAP/Makefile
+++ b/www/p5-Net-YAP/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Conduit to communicate with the Yahoo! Application Platform
 
-BUILD_DEPENDS=	p5-Net-OAuth-Simple>=1.0:${PORTSDIR}/net/p5-Net-OAuth-Simple
+BUILD_DEPENDS=	p5-Net-OAuth-Simple>=1.0:net/p5-Net-OAuth-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Net-eBay/Makefile b/www/p5-Net-eBay/Makefile
index 162b26ba6fbe..28679d10a0df 100644
--- a/www/p5-Net-eBay/Makefile
+++ b/www/p5-Net-eBay/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Perl Interface to XML based eBay API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-DateTime-Precise>=0:${PORTSDIR}/devel/p5-DateTime-Precise \
-		p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format \
-		p5-HTML-PrettyPrinter>=0:${PORTSDIR}/www/p5-HTML-PrettyPrinter \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Text-Format>=0:${PORTSDIR}/textproc/p5-Text-Format \
-		p5-XML-Dumper>=0:${PORTSDIR}/textproc/p5-XML-Dumper \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-DateTime-Precise>=0:devel/p5-DateTime-Precise \
+		p5-HTML-Format>=0:textproc/p5-HTML-Format \
+		p5-HTML-PrettyPrinter>=0:www/p5-HTML-PrettyPrinter \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Text-Format>=0:textproc/p5-Text-Format \
+		p5-XML-Dumper>=0:textproc/p5-XML-Dumper \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/www/p5-Newsletter/Makefile b/www/p5-Newsletter/Makefile
index df13f3cbaa82..82b5efe9e903 100644
--- a/www/p5-Newsletter/Makefile
+++ b/www/p5-Newsletter/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Simple website based Newsletter interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MIME-Explode>0:${PORTSDIR}/mail/p5-MIME-Explode \
-		p5-MIME-Lite>0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-File-Type>0:${PORTSDIR}/devel/p5-File-Type
+BUILD_DEPENDS=	p5-MIME-Explode>0:mail/p5-MIME-Explode \
+		p5-MIME-Lite>0:mail/p5-MIME-Lite \
+		p5-File-Type>0:devel/p5-File-Type
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Nginx-ReadBody/Makefile b/www/p5-Nginx-ReadBody/Makefile
index a57c6ad51f93..28a305661e34 100644
--- a/www/p5-Nginx-ReadBody/Makefile
+++ b/www/p5-Nginx-ReadBody/Makefile
@@ -21,7 +21,7 @@ NGINX_DEVEL_DESC=	Use nginx-devel
 USES=		perl5
 USE_PERL5=	configure
 
-NGINX_DEVEL_RUN_DEPENDS=	nginx:${PORTSDIR}/www/nginx-devel
-NGINX_DEVEL_RUN_DEPENDS_OFF=	nginx:${PORTSDIR}/www/nginx
+NGINX_DEVEL_RUN_DEPENDS=	nginx:www/nginx-devel
+NGINX_DEVEL_RUN_DEPENDS_OFF=	nginx:www/nginx
 
 .include <bsd.port.mk>
diff --git a/www/p5-PHP-Session/Makefile b/www/p5-PHP-Session/Makefile
index 81907cd45659..fb1cbd9c4600 100644
--- a/www/p5-PHP-Session/Makefile
+++ b/www/p5-PHP-Session/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read / write PHP session files
 
-BUILD_DEPENDS=	p5-UNIVERSAL-require>=0.03:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-UNIVERSAL-require>=0.03:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-POE-Component-Client-HTTP/Makefile b/www/p5-POE-Component-Client-HTTP/Makefile
index 89440250302a..3a2d9b5f3c93 100644
--- a/www/p5-POE-Component-Client-HTTP/Makefile
+++ b/www/p5-POE-Component-Client-HTTP/Makefile
@@ -16,12 +16,12 @@ COMMENT=	POE component for non-blocking/concurrent HTTP queries
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1.312:${PORTSDIR}/devel/p5-POE \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1.37:${PORTSDIR}/net/p5-URI \
-		p5-POE-Component-Client-Keepalive>=0.2710:${PORTSDIR}/net/p5-POE-Component-Client-Keepalive
+BUILD_DEPENDS=	p5-POE>=1.312:devel/p5-POE \
+		p5-libwww>=0:www/p5-libwww \
+		p5-URI>=1.37:net/p5-URI \
+		p5-POE-Component-Client-Keepalive>=0.2710:net/p5-POE-Component-Client-Keepalive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-POE-Server-TCP>=1.14:${PORTSDIR}/devel/p5-Test-POE-Server-TCP
+TEST_DEPENDS=	p5-Test-POE-Server-TCP>=1.14:devel/p5-Test-POE-Server-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-POE-Component-Client-UserAgent/Makefile b/www/p5-POE-Component-Client-UserAgent/Makefile
index a41c1fa3a4da..a7d27b881ef9 100644
--- a/www/p5-POE-Component-Client-UserAgent/Makefile
+++ b/www/p5-POE-Component-Client-UserAgent/Makefile
@@ -15,8 +15,8 @@ COMMENT=	LWP and LWP::Parallel based POE component
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-ParallelUA>=0:${PORTSDIR}/www/p5-ParallelUA
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-ParallelUA>=0:www/p5-ParallelUA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-POE-Component-Server-HTTP/Makefile b/www/p5-POE-Component-Server-HTTP/Makefile
index 459087998eae..2adae1d52d6c 100644
--- a/www/p5-POE-Component-Server-HTTP/Makefile
+++ b/www/p5-POE-Component-Server-HTTP/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE Component to create HTTP Servers
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-API-Peek>=0:${PORTSDIR}/devel/p5-POE-API-Peek \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-API-Peek>=0:devel/p5-POE-API-Peek \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-POE-Component-Server-HTTPServer/Makefile b/www/p5-POE-Component-Server-HTTPServer/Makefile
index 537dd18dd335..926c71e54c02 100644
--- a/www/p5-POE-Component-Server-HTTPServer/Makefile
+++ b/www/p5-POE-Component-Server-HTTPServer/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lin-chi@lastamericanempire.com
 COMMENT=	POE Component to server HTTP requests
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-HTML-Template-HashWrapper>=0:${PORTSDIR}/www/p5-HTML-Template-HashWrapper \
-		p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-libwww>=0:www/p5-libwww \
+		p5-libwww>=0:www/p5-libwww \
+		p5-libwww>=0:www/p5-libwww \
+		p5-HTML-Template-HashWrapper>=0:www/p5-HTML-Template-HashWrapper \
+		p5-MIME-Types>=0:mail/p5-MIME-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-POE-Component-Server-PSGI/Makefile b/www/p5-POE-Component-Server-PSGI/Makefile
index 031fcc23d055..a34ab13baeb8 100644
--- a/www/p5-POE-Component-Server-PSGI/Makefile
+++ b/www/p5-POE-Component-Server-PSGI/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to PSGI Server implementation for POE
 
-RUN_DEPENDS=	p5-POEx-Role-PSGIServer>0:${PORTSDIR}/www/p5-POEx-Role-PSGIServer
+RUN_DEPENDS=	p5-POEx-Role-PSGIServer>0:www/p5-POEx-Role-PSGIServer
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-POE-Component-Server-SOAP/Makefile b/www/p5-POE-Component-Server-SOAP/Makefile
index be6075bb7619..315f2cea0075 100644
--- a/www/p5-POE-Component-Server-SOAP/Makefile
+++ b/www/p5-POE-Component-Server-SOAP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Publish POE event handlers via SOAP over HTTP
 
-BUILD_DEPENDS=	p5-SOAP-Lite>=0.55:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-POE-Component-Server-SimpleHTTP>=1.54:${PORTSDIR}/www/p5-POE-Component-Server-SimpleHTTP \
-		p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-SOAP-Lite>=0.55:net/p5-SOAP-Lite \
+		p5-POE-Component-Server-SimpleHTTP>=1.54:www/p5-POE-Component-Server-SimpleHTTP \
+		p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/Makefile b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
index da1c489027dd..8f68e29afa0e 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/Makefile
+++ b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Perl extension to serve HTTP requests in POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.9:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-POE>=0.205:${PORTSDIR}/devel/p5-MooseX-POE \
-		p5-POE>=1.0000:${PORTSDIR}/devel/p5-POE \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Moose>=0.9:devel/p5-Moose \
+		p5-MooseX-POE>=0.205:devel/p5-MooseX-POE \
+		p5-POE>=1.0000:devel/p5-POE \
+		p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-POE-Component-Client-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Client-HTTP \
-		p5-POE-Filter-HTTP-Parser>=1.06:${PORTSDIR}/www/p5-POE-Filter-HTTP-Parser \
-		p5-Test-POE-Client-TCP>0.1:${PORTSDIR}/devel/p5-Test-POE-Client-TCP
+TEST_DEPENDS=	p5-POE-Component-Client-HTTP>=0:www/p5-POE-Component-Client-HTTP \
+		p5-POE-Filter-HTTP-Parser>=1.06:www/p5-POE-Filter-HTTP-Parser \
+		p5-Test-POE-Client-TCP>0.1:devel/p5-Test-POE-Client-TCP
 
 USES=		perl5
 USE_PERL5=	configure
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	SSL
 OPTIONS_DEFAULT=SSL
 
 SSL_DESC=		SSL support (POE::Component::SSLify)
-SSL_BUILD_DEPENDS=	p5-POE-Component-SSLify>=0.04:${PORTSDIR}/security/p5-POE-Component-SSLify
+SSL_BUILD_DEPENDS=	p5-POE-Component-SSLify>=0.04:security/p5-POE-Component-SSLify
 SSL_RUN_DEPENDS=	${SSL_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/www/p5-POE-Filter-HTTP-Parser/Makefile b/www/p5-POE-Filter-HTTP-Parser/Makefile
index 2c16f58c4b2e..c8f56f9539f2 100644
--- a/www/p5-POE-Filter-HTTP-Parser/Makefile
+++ b/www/p5-POE-Filter-HTTP-Parser/Makefile
@@ -9,12 +9,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTTP POE filter for HTTP clients or servers
 
-BUILD_DEPENDS=	p5-POE>=1.003:${PORTSDIR}/devel/p5-POE \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-HTTP-Parser>=0.06:${PORTSDIR}/www/p5-HTTP-Parser
+BUILD_DEPENDS=	p5-POE>=1.003:devel/p5-POE \
+		p5-libwww>=0:www/p5-libwww \
+		p5-HTTP-Parser>=0.06:www/p5-HTTP-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-POE-Client-TCP>=0:${PORTSDIR}/devel/p5-Test-POE-Client-TCP \
-		p5-Test-POE-Server-TCP>=0:${PORTSDIR}/devel/p5-Test-POE-Server-TCP
+TEST_DEPENDS=	p5-Test-POE-Client-TCP>=0:devel/p5-Test-POE-Client-TCP \
+		p5-Test-POE-Server-TCP>=0:devel/p5-Test-POE-Server-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-POEx-Role-PSGIServer/Makefile b/www/p5-POEx-Role-PSGIServer/Makefile
index bba76062e78f..a448d441c615 100644
--- a/www/p5-POEx-Role-PSGIServer/Makefile
+++ b/www/p5-POEx-Role-PSGIServer/Makefile
@@ -12,23 +12,23 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for encapsulated PSGI server behaviors for POE
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Moose-Autobox>0:${PORTSDIR}/devel/p5-Moose-Autobox \
-	p5-MooseX-Declare>0:${PORTSDIR}/devel/p5-MooseX-Declare \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types-Structured>0:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-	p5-POE-Filter-HTTP-Parser>=1.06:${PORTSDIR}/www/p5-POE-Filter-HTTP-Parser \
-	p5-POE>0:${PORTSDIR}/devel/p5-POE \
-	p5-POEx-Role-Streaming>0:${PORTSDIR}/devel/p5-POEx-Role-Streaming \
-	p5-POEx-Role-TCPServer>=1.102740:${PORTSDIR}/net/p5-POEx-Role-TCPServer \
-	p5-POEx-Types>0:${PORTSDIR}/devel/p5-POEx-Types \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-aliased>0:${PORTSDIR}/devel/p5-aliased
+	p5-Plack>0:www/p5-Plack \
+	p5-libwww>0:www/p5-libwww \
+	p5-Moose-Autobox>0:devel/p5-Moose-Autobox \
+	p5-MooseX-Declare>0:devel/p5-MooseX-Declare \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-MooseX-Types-Structured>0:devel/p5-MooseX-Types-Structured \
+	p5-POE-Filter-HTTP-Parser>=1.06:www/p5-POE-Filter-HTTP-Parser \
+	p5-POE>0:devel/p5-POE \
+	p5-POEx-Role-Streaming>0:devel/p5-POEx-Role-Streaming \
+	p5-POEx-Role-TCPServer>=1.102740:net/p5-POEx-Role-TCPServer \
+	p5-POEx-Types>0:devel/p5-POEx-Types \
+	p5-Plack>0:www/p5-Plack \
+	p5-aliased>0:devel/p5-aliased
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-HTTP-Parser-XS>=0:${PORTSDIR}/www/p5-HTTP-Parser-XS \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-HTTP-Parser-XS>=0:www/p5-HTTP-Parser-XS \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-TCP>=0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index a4dc710176eb..5e292ef42ee1 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl5 Parallel LWP User Agent for WWW access
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Parse-HTTP-UserAgent/Makefile b/www/p5-Parse-HTTP-UserAgent/Makefile
index 55a93dfd33d8..73a622191f77 100644
--- a/www/p5-Parse-HTTP-UserAgent/Makefile
+++ b/www/p5-Parse-HTTP-UserAgent/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Parser for the User Agent string
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
diff --git a/www/p5-Path-Class-URI/Makefile b/www/p5-Path-Class-URI/Makefile
index 3c5f55e3c418..a23f79713d85 100644
--- a/www/p5-Path-Class-URI/Makefile
+++ b/www/p5-Path-Class-URI/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for serialize Path::Class objects as file:// URI
 
 RUN_DEPENDS=	\
-	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-	p5-URI>0:${PORTSDIR}/net/p5-URI \
-	p5-Exporter-Lite>0:${PORTSDIR}/devel/p5-Exporter-Lite
+	p5-Path-Class>0:devel/p5-Path-Class \
+	p5-URI>0:net/p5-URI \
+	p5-Exporter-Lite>0:devel/p5-Exporter-Lite
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Perlanet/Makefile b/www/p5-Perlanet/Makefile
index 1508e1d12f49..1307637a4f9b 100644
--- a/www/p5-Perlanet/Makefile
+++ b/www/p5-Perlanet/Makefile
@@ -15,18 +15,18 @@ COMMENT=	Program for creating programs that aggregate web feeds
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CHI>=0:${PORTSDIR}/devel/p5-CHI \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy \
-		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MooseX-ConfigFromFile \
-		p5-MooseX-Traits>=0:${PORTSDIR}/devel/p5-MooseX-Traits \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Feed>=0.22:${PORTSDIR}/textproc/p5-XML-Feed \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-CHI>=0:devel/p5-CHI \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy \
+		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile \
+		p5-MooseX-Traits>=0:devel/p5-MooseX-Traits \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Feed>=0.22:textproc/p5-XML-Feed \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Perlbal-Plugin-PSGI/Makefile b/www/p5-Perlbal-Plugin-PSGI/Makefile
index db38bddacc91..7c8b0b633823 100644
--- a/www/p5-Perlbal-Plugin-PSGI/Makefile
+++ b/www/p5-Perlbal-Plugin-PSGI/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for PSGI web server on Perlbal
 
 RUN_DEPENDS=	\
-	p5-Perlbal>0:${PORTSDIR}/www/perlbal \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-Perlbal>0:www/perlbal \
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-Requires>0:devel/p5-Test-Requires \
+		p5-Test-TCP>=0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-App-Proxy/Makefile b/www/p5-Plack-App-Proxy/Makefile
index ae0610566387..4de682fd4de8 100644
--- a/www/p5-Plack-App-Proxy/Makefile
+++ b/www/p5-Plack-App-Proxy/Makefile
@@ -12,13 +12,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Plack extension for proxy requests
 
 RUN_DEPENDS=	\
-	p5-AnyEvent-HTTP>=1.44:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Plack>=1.0013:${PORTSDIR}/www/p5-Plack
+	p5-AnyEvent-HTTP>=1.44:www/p5-AnyEvent-HTTP \
+	p5-libwww>0:www/p5-libwww \
+	p5-Plack>=1.0013:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Builder-Conditionals/Makefile b/www/p5-Plack-Builder-Conditionals/Makefile
index ed6e22157407..3f8b0e13742f 100644
--- a/www/p5-Plack-Builder-Conditionals/Makefile
+++ b/www/p5-Plack-Builder-Conditionals/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to extend Plack::Builder
 
 RUN_DEPENDS=	\
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Net-CIDR-Lite>0:${PORTSDIR}/net/p5-Net-CIDR-Lite \
-	p5-Plack>=0.9941:${PORTSDIR}/www/p5-Plack
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-Net-CIDR-Lite>0:net/p5-Net-CIDR-Lite \
+	p5-Plack>=0.9941:www/p5-Plack
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile b/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile
index 30021e8b02de..c008aa98065f 100644
--- a/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile
@@ -11,12 +11,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Plack handler to run PSGI apps on AnyEvent::HTTPD
 
 RUN_DEPENDS=	\
-	p5-AnyEvent-HTTPD>0:${PORTSDIR}/www/p5-AnyEvent-HTTPD \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Plack>=0.9903:${PORTSDIR}/www/p5-Plack \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-AnyEvent-HTTPD>0:www/p5-AnyEvent-HTTPD \
+	p5-libwww>0:www/p5-libwww \
+	p5-Plack>=0.9903:www/p5-Plack \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
index abaf2e54b07f..7c412b146ecf 100644
--- a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to reversehttp gateway for PSGI application
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-AnyEvent-ReverseHTTP>0:${PORTSDIR}/www/p5-AnyEvent-ReverseHTTP \
-	p5-Plack>=0.99:${PORTSDIR}/www/p5-Plack
+	p5-AnyEvent>0:devel/p5-AnyEvent \
+	p5-AnyEvent-ReverseHTTP>0:www/p5-AnyEvent-ReverseHTTP \
+	p5-Plack>=0.99:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile b/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
index b48a121b62f5..806322bf4175 100644
--- a/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-AnyEvent-SCGI>0:${PORTSDIR}/www/p5-AnyEvent-SCGI \
-	p5-Plack>=0.9901:${PORTSDIR}/www/p5-Plack
+	p5-AnyEvent-SCGI>0:www/p5-AnyEvent-SCGI \
+	p5-Plack>=0.9901:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/www/p5-Plack-Handler-CLI/Makefile b/www/p5-Plack-Handler-CLI/Makefile
index 10d94f331534..532a40adb4af 100644
--- a/www/p5-Plack-Handler-CLI/Makefile
+++ b/www/p5-Plack-Handler-CLI/Makefile
@@ -11,15 +11,15 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for command line interface to PSGI applications
 
 RUN_DEPENDS=	\
-	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse \
-	p5-Plack>=0.99:${PORTSDIR}/www/p5-Plack \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Mouse>0:devel/p5-Mouse \
+	p5-Plack>=0.99:www/p5-Plack \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-HTTP-Request-AsCGI>0:${PORTSDIR}/www/p5-HTTP-Request-AsCGI \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP \
-	p5-Router-Simple>0:${PORTSDIR}/www/p5-Router-Simple
+	p5-HTTP-Request-AsCGI>0:www/p5-HTTP-Request-AsCGI \
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-TCP>0:devel/p5-Test-TCP \
+	p5-Router-Simple>0:www/p5-Router-Simple
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Plack-Handler-SCGI/Makefile b/www/p5-Plack-Handler-SCGI/Makefile
index 2532178f81e6..5565b99176cd 100644
--- a/www/p5-Plack-Handler-SCGI/Makefile
+++ b/www/p5-Plack-Handler-SCGI/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for PSGI handler on SCGI daemon
 
 RUN_DEPENDS=	\
-	p5-Plack>=0.9901:${PORTSDIR}/www/p5-Plack \
-	p5-SCGI>0:${PORTSDIR}/www/p5-SCGI \
-	p5-Try-Tiny>=0.04:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Plack>=0.9901:www/p5-Plack \
+	p5-SCGI>0:www/p5-SCGI \
+	p5-Try-Tiny>=0.04:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-AMF/Makefile b/www/p5-Plack-Middleware-AMF/Makefile
index de62f64d371e..6a4db541a88e 100644
--- a/www/p5-Plack-Middleware-AMF/Makefile
+++ b/www/p5-Plack-Middleware-AMF/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to use AMF with Plack
 
 RUN_DEPENDS=	\
-	p5-Data-AMF>=0.03:${PORTSDIR}/converters/p5-Data-AMF \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+	p5-Data-AMF>=0.03:converters/p5-Data-AMF \
+	p5-Plack>0:www/p5-Plack \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-AddDefaultCharset/Makefile b/www/p5-Plack-Middleware-AddDefaultCharset/Makefile
index 4afce628d9a7..9d1c7dfd227f 100644
--- a/www/p5-Plack-Middleware-AddDefaultCharset/Makefile
+++ b/www/p5-Plack-Middleware-AddDefaultCharset/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to port Apache2 AddDefaultCharset for Plack
 
 RUN_DEPENDS=	\
-	p5-Plack>=0.9925:${PORTSDIR}/www/p5-Plack
+	p5-Plack>=0.9925:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-Auth-Digest/Makefile b/www/p5-Plack-Middleware-Auth-Digest/Makefile
index 2370cc603a04..eefeea3fab4b 100644
--- a/www/p5-Plack-Middleware-Auth-Digest/Makefile
+++ b/www/p5-Plack-Middleware-Auth-Digest/Makefile
@@ -13,10 +13,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-Digest-HMAC>0:security/p5-Digest-HMAC \
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>=0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/www/p5-Plack-Middleware-AutoRefresh/Makefile b/www/p5-Plack-Middleware-AutoRefresh/Makefile
index 760eb9e87ccc..a625ffbecf67 100644
--- a/www/p5-Plack-Middleware-AutoRefresh/Makefile
+++ b/www/p5-Plack-Middleware-AutoRefresh/Makefile
@@ -11,13 +11,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to reload pages when files are modified
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-AnyEvent-Filesys-Notify>=0:${PORTSDIR}/devel/p5-AnyEvent-Filesys-Notify \
-	p5-File-ShareDir>=1.00:${PORTSDIR}/devel/p5-File-ShareDir \
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-JSON-Any>0:${PORTSDIR}/converters/p5-JSON-Any \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Readonly>0:${PORTSDIR}/devel/p5-Readonly
+	p5-AnyEvent>0:devel/p5-AnyEvent \
+	p5-AnyEvent-Filesys-Notify>=0:devel/p5-AnyEvent-Filesys-Notify \
+	p5-File-ShareDir>=1.00:devel/p5-File-ShareDir \
+	p5-File-Slurp>0:devel/p5-File-Slurp \
+	p5-JSON-Any>0:converters/p5-JSON-Any \
+	p5-Plack>0:www/p5-Plack \
+	p5-Readonly>0:devel/p5-Readonly
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-ConsoleLogger/Makefile b/www/p5-Plack-Middleware-ConsoleLogger/Makefile
index 5252ca955521..c480bdd80a27 100644
--- a/www/p5-Plack-Middleware-ConsoleLogger/Makefile
+++ b/www/p5-Plack-Middleware-ConsoleLogger/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Plack>=0.99:${PORTSDIR}/www/p5-Plack \
-	p5-JavaScript-Value-Escape>0:${PORTSDIR}/lang/p5-JavaScript-Value-Escape
+	p5-Plack>=0.99:www/p5-Plack \
+	p5-JavaScript-Value-Escape>0:lang/p5-JavaScript-Value-Escape
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-CrossOrigin/Makefile b/www/p5-Plack-Middleware-CrossOrigin/Makefile
index 8b15ca43cf17..93a7a22d0fda 100644
--- a/www/p5-Plack-Middleware-CrossOrigin/Makefile
+++ b/www/p5-Plack-Middleware-CrossOrigin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Plack Middleware headers to allow Cross-Origin Resource Sharing
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Plack>=0:${PORTSDIR}/www/p5-Plack
-RUN_DEPENDS=	p5-Plack>=0:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-Plack>=0:www/p5-Plack
+RUN_DEPENDS=	p5-Plack>=0:www/p5-Plack
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Middleware-Debug/Makefile b/www/p5-Plack-Middleware-Debug/Makefile
index 4fbba3617e73..c00721b71fe0 100644
--- a/www/p5-Plack-Middleware-Debug/Makefile
+++ b/www/p5-Plack-Middleware-Debug/Makefile
@@ -12,14 +12,14 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to display information about current request/response
 
 RUN_DEPENDS=	\
-	p5-Class-Method-Modifiers>=1.05:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-	p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
-	p5-File-ShareDir>=1.00:${PORTSDIR}/devel/p5-File-ShareDir \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Text-MicroTemplate>=0.15:${PORTSDIR}/textproc/p5-Text-MicroTemplate \
-	p5-Module-Versions>=0.01:${PORTSDIR}/devel/p5-Module-Versions
+	p5-Class-Method-Modifiers>=1.05:devel/p5-Class-Method-Modifiers \
+	p5-Data-Dump>0:devel/p5-Data-Dump \
+	p5-File-ShareDir>=1.00:devel/p5-File-ShareDir \
+	p5-Plack>0:www/p5-Plack \
+	p5-Text-MicroTemplate>=0.15:textproc/p5-Text-MicroTemplate \
+	p5-Module-Versions>=0.01:devel/p5-Module-Versions
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/www/p5-Plack-Middleware-Deflater/Makefile b/www/p5-Plack-Middleware-Deflater/Makefile
index cd0b09bb6e55..22b181645133 100644
--- a/www/p5-Plack-Middleware-Deflater/Makefile
+++ b/www/p5-Plack-Middleware-Deflater/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to compress response body with Gzip or Deflate
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-IO-Handle-Util>0:${PORTSDIR}/devel/p5-IO-Handle-Util \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+	p5-IO-Handle-Util>0:devel/p5-IO-Handle-Util \
+	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Middleware-Expires/Makefile b/www/p5-Plack-Middleware-Expires/Makefile
index 3bbc7624c93d..9809b15bc1b8 100644
--- a/www/p5-Plack-Middleware-Expires/Makefile
+++ b/www/p5-Plack-Middleware-Expires/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl module mod_expires for Plack
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Plack>=0.9937:${PORTSDIR}/www/p5-Plack \
-		p5-Try-Tiny>=0.06:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Plack>=0.9937:www/p5-Plack \
+		p5-Try-Tiny>=0.06:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Plack-Middleware-ExtDirect/Makefile b/www/p5-Plack-Middleware-ExtDirect/Makefile
index eec59fc5a247..998fa3def2e0 100644
--- a/www/p5-Plack-Middleware-ExtDirect/Makefile
+++ b/www/p5-Plack-Middleware-ExtDirect/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Implement an RPC::ExtDirect gateway using Plack
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconf \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-RPC-ExtDirect>=3.20:${PORTSDIR}/www/p5-RPC-ExtDirect
+BUILD_DEPENDS=	pkg-config:devel/pkgconf \
+		p5-Plack>=0:www/p5-Plack \
+		p5-RPC-ExtDirect>=3.20:www/p5-RPC-ExtDirect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.46:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.46:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Middleware-File-Sass/Makefile b/www/p5-Plack-Middleware-File-Sass/Makefile
index d2d34d17cddd..957f773fc37a 100644
--- a/www/p5-Plack-Middleware-File-Sass/Makefile
+++ b/www/p5-Plack-Middleware-File-Sass/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Sass support for all Plack frameworks
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Text-Sass>0:${PORTSDIR}/textproc/p5-Text-Sass
+	p5-Plack>0:www/p5-Plack \
+	p5-Text-Sass>0:textproc/p5-Text-Sass
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 # Now, sass gem can be used instead of p5-Text-Sass.
 
diff --git a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
index 096cae108d68..c4413151d761 100644
--- a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
+++ b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Sets body for redirect response, if it is not already set
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Plack>=0:www/p5-Plack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message
+TEST_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-ForceEnv/Makefile b/www/p5-Plack-Middleware-ForceEnv/Makefile
index 4f33bae41e63..3b403ce9dbb6 100644
--- a/www/p5-Plack-Middleware-ForceEnv/Makefile
+++ b/www/p5-Plack-Middleware-ForceEnv/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Force set environment variables for testing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Plack>=0.9925:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-Plack>=0.9925:www/p5-Plack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Plack-Middleware-Header/Makefile b/www/p5-Plack-Middleware-Header/Makefile
index 8e8a2b4eeb6c..93596e774de7 100644
--- a/www/p5-Plack-Middleware-Header/Makefile
+++ b/www/p5-Plack-Middleware-Header/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to modify HTTP response headers
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-IEnosniff/Makefile b/www/p5-Plack-Middleware-IEnosniff/Makefile
index e7eec6d95545..6b83a205c07d 100644
--- a/www/p5-Plack-Middleware-IEnosniff/Makefile
+++ b/www/p5-Plack-Middleware-IEnosniff/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to add X-Content-Type-Options:nosniff
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-InteractiveDebugger/Makefile b/www/p5-Plack-Middleware-InteractiveDebugger/Makefile
index fc440b122813..051c9ffe048f 100644
--- a/www/p5-Plack-Middleware-InteractiveDebugger/Makefile
+++ b/www/p5-Plack-Middleware-InteractiveDebugger/Makefile
@@ -11,12 +11,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Awesome Interactive Debugger ala Werkzeug
 
 RUN_DEPENDS=	\
-	p5-Data-Dump-Streamer>0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-	p5-Devel-StackTrace-WithLexicals>=0.08:${PORTSDIR}/devel/p5-Devel-StackTrace-WithLexicals \
-	p5-Eval-WithLexicals>0:${PORTSDIR}/devel/p5-Eval-WithLexicals \
-	p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
-	p5-Plack>=0.9977:${PORTSDIR}/www/p5-Plack \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Data-Dump-Streamer>0:devel/p5-Data-Dump-Streamer \
+	p5-Devel-StackTrace-WithLexicals>=0.08:devel/p5-Devel-StackTrace-WithLexicals \
+	p5-Eval-WithLexicals>0:devel/p5-Eval-WithLexicals \
+	p5-File-ShareDir>0:devel/p5-File-ShareDir \
+	p5-Plack>=0.9977:www/p5-Plack \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-JSConcat/Makefile b/www/p5-Plack-Middleware-JSConcat/Makefile
index c9733af19aaa..44f60cdcbf6c 100644
--- a/www/p5-Plack-Middleware-JSConcat/Makefile
+++ b/www/p5-Plack-Middleware-JSConcat/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to concatenate JavaScripts
 
 RUN_DEPENDS=	\
-	p5-IPC-Run3>0:${PORTSDIR}/devel/p5-IPC-Run3 \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-IPC-Run3>0:devel/p5-IPC-Run3 \
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-MemoryUsage/Makefile b/www/p5-Plack-Middleware-MemoryUsage/Makefile
index ce0021bb1943..7fcd3a370f88 100644
--- a/www/p5-Plack-Middleware-MemoryUsage/Makefile
+++ b/www/p5-Plack-Middleware-MemoryUsage/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for measuring process memory
 
 RUN_DEPENDS=	\
-	p5-B-Size2>=2.01:${PORTSDIR}/devel/p5-B-Size2 \
-	p5-Devel-Symdump>0:${PORTSDIR}/devel/p5-Devel-Symdump \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-B-Size2>=2.01:devel/p5-B-Size2 \
+	p5-Devel-Symdump>0:devel/p5-Devel-Symdump \
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-MethodOverride/Makefile b/www/p5-Plack-Middleware-MethodOverride/Makefile
index 9db03fa84f63..fd562774334d 100644
--- a/www/p5-Plack-Middleware-MethodOverride/Makefile
+++ b/www/p5-Plack-Middleware-MethodOverride/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Override REST methods to Plack apps via POST
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Plack>=0:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-Plack>=0:www/p5-Plack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.06:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+TEST_DEPENDS=	p5-Test-Pod>=1.41:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.06:devel/p5-Test-Pod-Coverage \
+		p5-URI>=0:net/p5-URI
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Middleware-NoMultipleSlashes/Makefile b/www/p5-Plack-Middleware-NoMultipleSlashes/Makefile
index 0308db756150..836f0951afe6 100644
--- a/www/p5-Plack-Middleware-NoMultipleSlashes/Makefile
+++ b/www/p5-Plack-Middleware-NoMultipleSlashes/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Automatically remove multiple slashes in your paths
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Plack>=0:${PORTSDIR}/www/p5-Plack
-RUN_DEPENDS=	p5-Plack>=0:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-Plack>=0:www/p5-Plack
+RUN_DEPENDS=	p5-Plack>=0:www/p5-Plack
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Middleware-Precompressed/Makefile b/www/p5-Plack-Middleware-Precompressed/Makefile
index f63e1505524e..3ae9c2f58d92 100644
--- a/www/p5-Plack-Middleware-Precompressed/Makefile
+++ b/www/p5-Plack-Middleware-Precompressed/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Array-RefElem>0:${PORTSDIR}/misc/p5-Array-RefElem
+	p5-Plack>0:www/p5-Plack \
+	p5-Array-RefElem>0:misc/p5-Array-RefElem
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile b/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
index c348b16f932e..2baf1461f781 100644
--- a/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
+++ b/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Sets removes body for HTTP response if it is not required
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Plack>=0:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-Plack>=0:www/p5-Plack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message
+TEST_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-Reproxy/Makefile b/www/p5-Plack-Middleware-Reproxy/Makefile
index e6d8b8ba59e0..081ab617e8cb 100644
--- a/www/p5-Plack-Middleware-Reproxy/Makefile
+++ b/www/p5-Plack-Middleware-Reproxy/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to handle X-Reproxy-URL from within Plack
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Plack>0:www/p5-Plack \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-TEST-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-TEST-TCP>0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Middleware-ReverseProxy/Makefile b/www/p5-Plack-Middleware-ReverseProxy/Makefile
index ba9e780cedde..7f04cd6edaf9 100644
--- a/www/p5-Plack-Middleware-ReverseProxy/Makefile
+++ b/www/p5-Plack-Middleware-ReverseProxy/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to support app to run as a reverse proxy backend
 
 RUN_DEPENDS=	\
-	p5-Plack>=0.9988:${PORTSDIR}/www/p5-Plack
+	p5-Plack>=0.9988:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-Rewrite/Makefile b/www/p5-Plack-Middleware-Rewrite/Makefile
index f8d2981b773e..2826c48f9d93 100644
--- a/www/p5-Plack-Middleware-Rewrite/Makefile
+++ b/www/p5-Plack-Middleware-Rewrite/Makefile
@@ -14,7 +14,7 @@ COMMENT=	mod_rewrite for Plack
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Plack>=0.9942:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-Plack>=0.9942:www/p5-Plack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile b/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile
index ec9859e03d6b..ab5a0244f458 100644
--- a/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile
+++ b/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile
@@ -14,16 +14,16 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-	p5-Net-CIDR-Lite>0:${PORTSDIR}/net/p5-Net-CIDR-Lite \
-	p5-Parallel-Scoreboard>=0.03:${PORTSDIR}/devel/p5-Parallel-Scoreboard \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Try-Tiny>=0.09:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-JSON>=2.53:converters/p5-JSON \
+	p5-Net-CIDR-Lite>0:net/p5-Net-CIDR-Lite \
+	p5-Parallel-Scoreboard>=0.03:devel/p5-Parallel-Scoreboard \
+	p5-Plack>0:www/p5-Plack \
+	p5-Try-Tiny>=0.09:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 # Tests will fail if not root or 80/tcp is used.
 TEST_DEPENDS=	\
-	p5-Starlet>0:${PORTSDIR}/www/p5-Starlet \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+	p5-Starlet>0:www/p5-Starlet \
+	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=	perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Plack-Middleware-Session/Makefile b/www/p5-Plack-Middleware-Session/Makefile
index 50c922d720b1..0d3b6c86c350 100644
--- a/www/p5-Plack-Middleware-Session/Makefile
+++ b/www/p5-Plack-Middleware-Session/Makefile
@@ -13,16 +13,16 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Cookie-Baker>0:${PORTSDIR}/www/p5-Cookie-Baker \
-	p5-Digest-HMAC>=1.03:${PORTSDIR}/security/p5-Digest-HMAC \
-	p5-Digest-SHA1>0:${PORTSDIR}/security/p5-Digest-SHA1 \
-	p5-Plack>=0.9910:${PORTSDIR}/www/p5-Plack
+	p5-Cookie-Baker>0:www/p5-Cookie-Baker \
+	p5-Digest-HMAC>=1.03:security/p5-Digest-HMAC \
+	p5-Digest-SHA1>0:security/p5-Digest-SHA1 \
+	p5-Plack>=0.9910:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Fatal>=0.006:${PORTSDIR}/devel/p5-Test-Fatal \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+	p5-Test-Fatal>=0.006:devel/p5-Test-Fatal \
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-TCP>0:devel/p5-Test-TCP \
+	p5-YAML>0:textproc/p5-YAML
 
 USES=	perl5
 USE_PERL5=	modbuildtiny
diff --git a/www/p5-Plack-Middleware-SocketIO/Makefile b/www/p5-Plack-Middleware-SocketIO/Makefile
index 69e445189dfe..f38cdf72eac6 100644
--- a/www/p5-Plack-Middleware-SocketIO/Makefile
+++ b/www/p5-Plack-Middleware-SocketIO/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Perl extension for Socket.IO Plack middleware
 LICENSE=	ART20
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Protocol-WebSocket>=0.00901:${PORTSDIR}/www/p5-Protocol-WebSocket \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-AnyEvent>0:devel/p5-AnyEvent \
+	p5-JSON>0:converters/p5-JSON \
+	p5-Plack>0:www/p5-Plack \
+	p5-Protocol-WebSocket>=0.00901:www/p5-Protocol-WebSocket \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-Status/Makefile b/www/p5-Plack-Middleware-Status/Makefile
index e5ccc7955119..c25267a3c28b 100644
--- a/www/p5-Plack-Middleware-Status/Makefile
+++ b/www/p5-Plack-Middleware-Status/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to map urls to status code-driven responses for Plack
 
 RUN_DEPENDS=	\
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-libwww>0:www/p5-libwww \
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-Test-StashWarnings/Makefile b/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
index aff9fa00f3d3..b20b35ab9b94 100644
--- a/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
+++ b/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Test your application's warnings
 
-BUILD_DEPENDS=	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-Plack>0:www/p5-Plack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Plack-Middleware-Throttle/Makefile b/www/p5-Plack-Middleware-Throttle/Makefile
index 4babee356e9c..fe815456147f 100644
--- a/www/p5-Plack-Middleware-Throttle/Makefile
+++ b/www/p5-Plack-Middleware-Throttle/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of rate-limiting incoming HTTP requests for Plack
 
 RUN_DEPENDS=	\
-	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-DateTime>0:devel/p5-DateTime \
+	p5-libwww>0:www/p5-libwww \
+	p5-Moose>0:devel/p5-Moose \
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Middleware-XForwardedFor/Makefile b/www/p5-Plack-Middleware-XForwardedFor/Makefile
index 950445877963..edf7150ae5eb 100644
--- a/www/p5-Plack-Middleware-XForwardedFor/Makefile
+++ b/www/p5-Plack-Middleware-XForwardedFor/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Plack middleware to handle X-Forwarded-For headers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-Netmask>=1.9015:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-		p5-Plack>=0.9913:${PORTSDIR}/www/p5-Plack \
-		p5-Regexp-Common>=2010010201:${PORTSDIR}/textproc/p5-Regexp-Common
+BUILD_DEPENDS=	p5-Net-Netmask>=1.9015:net-mgmt/p5-Net-Netmask \
+		p5-Plack>=0.9913:www/p5-Plack \
+		p5-Regexp-Common>=2010010201:textproc/p5-Regexp-Common
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Plack-Server-Coro/Makefile b/www/p5-Plack-Server-Coro/Makefile
index cc4648339249..609c412b6828 100644
--- a/www/p5-Plack-Server-Coro/Makefile
+++ b/www/p5-Plack-Server-Coro/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Coro cooperative multithread web server
 
 RUN_DEPENDS=	\
-	p5-Coro>0:${PORTSDIR}/devel/p5-Coro \
-	p5-Net-Server-Coro>=0.5:${PORTSDIR}/net/p5-Net-Server-Coro \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-Coro>0:devel/p5-Coro \
+	p5-Net-Server-Coro>=0.5:net/p5-Net-Server-Coro \
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Server-POE/Makefile b/www/p5-Plack-Server-POE/Makefile
index 12a6e62a8288..0cd9224aefcd 100644
--- a/www/p5-Plack-Server-POE/Makefile
+++ b/www/p5-Plack-Server-POE/Makefile
@@ -11,13 +11,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Plack Server implementation for POE
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-POE>0:${PORTSDIR}/devel/p5-POE \
-	p5-POE-Filter-HTTP-Parser>0:${PORTSDIR}/www/p5-POE-Filter-HTTP-Parser
+	p5-Plack>0:www/p5-Plack \
+	p5-libwww>0:www/p5-libwww \
+	p5-POE>0:devel/p5-POE \
+	p5-POE-Filter-HTTP-Parser>0:www/p5-POE-Filter-HTTP-Parser
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-TCP>=0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Plack-Server-ReverseHTTP/Makefile b/www/p5-Plack-Server-ReverseHTTP/Makefile
index 9ab288f8257e..aca4dcd47a3d 100644
--- a/www/p5-Plack-Server-ReverseHTTP/Makefile
+++ b/www/p5-Plack-Server-ReverseHTTP/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of reversehttp gateway for PSGI application
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-AnyEvent-ReverseHTTP>0:${PORTSDIR}/www/p5-AnyEvent-ReverseHTTP \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack
+	p5-AnyEvent>0:devel/p5-AnyEvent \
+	p5-AnyEvent-ReverseHTTP>0:www/p5-AnyEvent-ReverseHTTP \
+	p5-Plack>0:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Plack-Test-ExternalServer/Makefile b/www/p5-Plack-Test-ExternalServer/Makefile
index 3a554d6b1957..81307a19bca8 100644
--- a/www/p5-Plack-Test-ExternalServer/Makefile
+++ b/www/p5-Plack-Test-ExternalServer/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Run HTTP tests on external live servers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Test-TCP>=0:devel/p5-Test-TCP
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-Plack/Makefile b/www/p5-Plack/Makefile
index 539950a7d90f..1f16d0b4763c 100644
--- a/www/p5-Plack/Makefile
+++ b/www/p5-Plack/Makefile
@@ -14,39 +14,39 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Apache-LogFormat-Compiler>=0.12:${PORTSDIR}/www/p5-Apache-LogFormat-Compiler \
-	p5-Cookie-Baker>=0.05:${PORTSDIR}/www/p5-Cookie-Baker \
-	p5-Devel-StackTrace>=1.23:${PORTSDIR}/devel/p5-Devel-StackTrace \
-	p5-Devel-StackTrace-AsHTML>=0.11:${PORTSDIR}/devel/p5-Devel-StackTrace-AsHTML \
-	p5-File-ShareDir>=1.00:${PORTSDIR}/devel/p5-File-ShareDir \
-	p5-Filesys-Notify-Simple>0:${PORTSDIR}/devel/p5-Filesys-Notify-Simple \
-	p5-HTTP-Body>=1.06:${PORTSDIR}/www/p5-HTTP-Body \
-	p5-HTTP-Headers-Fast>=0.17:${PORTSDIR}/www/p5-HTTP-Headers-Fast \
-	p5-HTTP-Tiny>=0.034:${PORTSDIR}/www/p5-HTTP-Tiny \
-	p5-Hash-MultiValue>=0.05:${PORTSDIR}/devel/p5-Hash-MultiValue \
-	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-	p5-Stream-Buffered>=0.02:${PORTSDIR}/devel/p5-Stream-Buffered \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-URI>=1.59:${PORTSDIR}/net/p5-URI
+	p5-Apache-LogFormat-Compiler>=0.12:www/p5-Apache-LogFormat-Compiler \
+	p5-Cookie-Baker>=0.05:www/p5-Cookie-Baker \
+	p5-Devel-StackTrace>=1.23:devel/p5-Devel-StackTrace \
+	p5-Devel-StackTrace-AsHTML>=0.11:devel/p5-Devel-StackTrace-AsHTML \
+	p5-File-ShareDir>=1.00:devel/p5-File-ShareDir \
+	p5-Filesys-Notify-Simple>0:devel/p5-Filesys-Notify-Simple \
+	p5-HTTP-Body>=1.06:www/p5-HTTP-Body \
+	p5-HTTP-Headers-Fast>=0.17:www/p5-HTTP-Headers-Fast \
+	p5-HTTP-Tiny>=0.034:www/p5-HTTP-Tiny \
+	p5-Hash-MultiValue>=0.05:devel/p5-Hash-MultiValue \
+	p5-Path-Class>0:devel/p5-Path-Class \
+	p5-Stream-Buffered>=0.02:devel/p5-Stream-Buffered \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-URI>=1.59:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-	p5-File-ShareDir-Install>=0.03:${PORTSDIR}/devel/p5-File-ShareDir-Install
+	p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install
 TEST_DEPENDS=  \
-	p5-Authen-Simple-Passwd>0:${PORTSDIR}/security/p5-Authen-Simple-Passwd \
-	p5-CGI-Compile>0:${PORTSDIR}/www/p5-CGI-Compile \
-	p5-CGI-Emulate-PSGI>0:${PORTSDIR}/www/p5-CGI-Emulate-PSGI \
-	p5-FCGI>0:${PORTSDIR}/www/p5-FCGI \
-	p5-FCGI-ProcManager>0:${PORTSDIR}/www/p5-FCGI-ProcManager \
-	p5-HTTP-Request-AsCGI>0:${PORTSDIR}/www/p5-HTTP-Request-AsCGI \
-	p5-HTTP-Server-Simple-PSGI>0:${PORTSDIR}/www/p5-HTTP-Server-Simple-PSGI \
-	p5-IO-Handle-Util>0:${PORTSDIR}/devel/p5-IO-Handle-Util \
-	p5-LWP-Protocol-http10>0:${PORTSDIR}/www/p5-LWP-Protocol-http10 \
-	p5-Log-Dispatch-Array>0:${PORTSDIR}/devel/p5-Log-Dispatch-Array \
-	p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl \
-	p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-	p5-Module-Refresh>0:${PORTSDIR}/devel/p5-Module-Refresh \
-	p5-Stream-Buffered>=0.02:${PORTSDIR}/devel/p5-Stream-Buffered \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-TCP>=2.00:${PORTSDIR}/devel/p5-Test-TCP
+	p5-Authen-Simple-Passwd>0:security/p5-Authen-Simple-Passwd \
+	p5-CGI-Compile>0:www/p5-CGI-Compile \
+	p5-CGI-Emulate-PSGI>0:www/p5-CGI-Emulate-PSGI \
+	p5-FCGI>0:www/p5-FCGI \
+	p5-FCGI-ProcManager>0:www/p5-FCGI-ProcManager \
+	p5-HTTP-Request-AsCGI>0:www/p5-HTTP-Request-AsCGI \
+	p5-HTTP-Server-Simple-PSGI>0:www/p5-HTTP-Server-Simple-PSGI \
+	p5-IO-Handle-Util>0:devel/p5-IO-Handle-Util \
+	p5-LWP-Protocol-http10>0:www/p5-LWP-Protocol-http10 \
+	p5-Log-Dispatch-Array>0:devel/p5-Log-Dispatch-Array \
+	p5-Log-Log4perl>0:devel/p5-Log-Log4perl \
+	p5-MIME-Types>0:mail/p5-MIME-Types \
+	p5-Module-Refresh>0:devel/p5-Module-Refresh \
+	p5-Stream-Buffered>=0.02:devel/p5-Stream-Buffered \
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-TCP>=2.00:devel/p5-Test-TCP
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/www/p5-PocketIO/Makefile b/www/p5-PocketIO/Makefile
index 5d48ddf1a385..0bea329735a6 100644
--- a/www/p5-PocketIO/Makefile
+++ b/www/p5-PocketIO/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Socket.IO Plack application
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-		p5-Protocol-SocketIO>=0.04:${PORTSDIR}/www/p5-Protocol-SocketIO \
-		p5-Protocol-WebSocket>=0.00906:${PORTSDIR}/www/p5-Protocol-WebSocket \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-JSON>=2.53:converters/p5-JSON \
+		p5-Protocol-SocketIO>=0.04:www/p5-Protocol-SocketIO \
+		p5-Protocol-WebSocket>=0.00906:www/p5-Protocol-WebSocket \
+		p5-Test-TCP>=0:devel/p5-Test-TCP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Twiggy>=0:${PORTSDIR}/www/p5-Twiggy
+TEST_DEPENDS=	p5-Plack>=0:www/p5-Plack \
+		p5-Twiggy>=0:www/p5-Twiggy
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/www/p5-Pod-Site/Makefile b/www/p5-Pod-Site/Makefile
index 074607b393c1..65845ac929a3 100644
--- a/www/p5-Pod-Site/Makefile
+++ b/www/p5-Pod-Site/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Build browsable HTML documentation for your app
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Object-Tiny>=0:${PORTSDIR}/devel/p5-Object-Tiny
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Object-Tiny>=0:devel/p5-Object-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-File>=0:${PORTSDIR}/devel/p5-Test-File \
-		p5-Test-MockModule>=0.05:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-Test-XPath>=0.12:${PORTSDIR}/lang/p5-Test-XPath
+TEST_DEPENDS=	p5-Test-File>=0:devel/p5-Test-File \
+		p5-Test-MockModule>=0.05:devel/p5-Test-MockModule \
+		p5-Test-XPath>=0.12:lang/p5-Test-XPath
 
 OPTIONS_DEFINE=	PODT
 
@@ -31,8 +31,8 @@ USE_PERL5=	modbuild
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPODT}
-TEST_DEPENDS+=	p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.06:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS+=	p5-Test-Pod>=1.41:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.06:devel/p5-Test-Pod-Coverage
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-PodToHTML/Makefile b/www/p5-PodToHTML/Makefile
index d0c605b52cc8..bd26e5527520 100644
--- a/www/p5-PodToHTML/Makefile
+++ b/www/p5-PodToHTML/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Generating HTML from several files containing POD documentation
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-Format>=0:textproc/p5-HTML-Format
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Protocol-HTTP2/Makefile b/www/p5-Protocol-HTTP2/Makefile
index 6a361208b7d0..60211d9f0c8f 100644
--- a/www/p5-Protocol-HTTP2/Makefile
+++ b/www/p5-Protocol-HTTP2/Makefile
@@ -15,11 +15,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Net-SSLeay>=1.45:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Net-SSLeay>=1.45:security/p5-Net-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-TCP>=0:devel/p5-Test-TCP
 
 NO_ARCH=	yes
 USE_PERL5=	modbuildtiny
diff --git a/www/p5-Protocol-SocketIO/Makefile b/www/p5-Protocol-SocketIO/Makefile
index 69d5eac764d4..484c02da703d 100644
--- a/www/p5-Protocol-SocketIO/Makefile
+++ b/www/p5-Protocol-SocketIO/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Socket.IO protocol implementation
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Protocol-WebSocket/Makefile b/www/p5-Protocol-WebSocket/Makefile
index d333d9230237..59b3b3541e83 100644
--- a/www/p5-Protocol-WebSocket/Makefile
+++ b/www/p5-Protocol-WebSocket/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sec@42.org
 COMMENT=	Client/server WebSocket message and frame parser/constructor
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
-RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Protocol-XMLRPC/Makefile b/www/p5-Protocol-XMLRPC/Makefile
index c8251c1578ce..90a87f7cb67b 100644
--- a/www/p5-Protocol-XMLRPC/Makefile
+++ b/www/p5-Protocol-XMLRPC/Makefile
@@ -14,7 +14,7 @@ COMMENT=	XML-RPC implementation
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-REST-Client/Makefile b/www/p5-REST-Client/Makefile
index 16a13ab792a6..777a86da96ba 100644
--- a/www/p5-REST-Client/Makefile
+++ b/www/p5-REST-Client/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Simple client for interacting with RESTful http/https resources
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>0:security/p5-Crypt-SSLeay \
+		p5-URI>0:net/p5-URI \
+		p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-REST-Google-Apps-Provisioning/Makefile b/www/p5-REST-Google-Apps-Provisioning/Makefile
index 3b6c747e4d4d..46f5b88f55ba 100644
--- a/www/p5-REST-Google-Apps-Provisioning/Makefile
+++ b/www/p5-REST-Google-Apps-Provisioning/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Perl library to Google's RESTful Apps API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-RPC-ExtDirect/Makefile b/www/p5-RPC-ExtDirect/Makefile
index 4a3aa60ff5cd..af0a041a534d 100644
--- a/www/p5-RPC-ExtDirect/Makefile
+++ b/www/p5-RPC-ExtDirect/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl extension for implementing the Ext.Direct remoting protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Attribute-Handlers>=0.93:${PORTSDIR}/devel/p5-Attribute-Handlers \
-		p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON
+BUILD_DEPENDS=	p5-Attribute-Handlers>=0.93:devel/p5-Attribute-Handlers \
+		p5-JSON>=2.53:converters/p5-JSON
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.46:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.46:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-RT-Authen-ExternalAuth/Makefile b/www/p5-RT-Authen-ExternalAuth/Makefile
index 43e1f75b7f4f..f2cc8d1fa149 100644
--- a/www/p5-RT-Authen-ExternalAuth/Makefile
+++ b/www/p5-RT-Authen-ExternalAuth/Makefile
@@ -13,9 +13,9 @@ COMMENT=	RT extension to authenticate users against an external source
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-perl-ldap>0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-Net-SSLeay>0:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-perl-ldap>0:net/p5-perl-ldap \
+		p5-DBI>0:databases/p5-DBI \
+		p5-Net-SSLeay>0:security/p5-Net-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -40,8 +40,8 @@ RT_VER=         ${opt}
 ### Temporary for debugging
 #WRKDIR=         ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER}
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
-RUN_DEPENDS+=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
+BUILD_DEPENDS+=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
+RUN_DEPENDS+=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
 
 MAN3PREFIX=	${PREFIX}
 
diff --git a/www/p5-RT-Client-REST/Makefile b/www/p5-RT-Client-REST/Makefile
index e9769e5a2c64..001cd7e4a27e 100644
--- a/www/p5-RT-Client-REST/Makefile
+++ b/www/p5-RT-Client-REST/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Perl modules designed to talk to RT installation using REST protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-DateParse>0:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-		p5-HTTP-Cookies>0:${PORTSDIR}/www/p5-HTTP-Cookies \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
-TEST_DEPENDS=	p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-DateTime>0:devel/p5-DateTime \
+		p5-DateTime-Format-DateParse>0:devel/p5-DateTime-Format-DateParse \
+		p5-HTTP-Cookies>0:www/p5-HTTP-Cookies \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-URI>0:net/p5-URI
+TEST_DEPENDS=	p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-RT-Extension-LDAPImport/Makefile b/www/p5-RT-Extension-LDAPImport/Makefile
index b86707012035..581dbf6dacdd 100644
--- a/www/p5-RT-Extension-LDAPImport/Makefile
+++ b/www/p5-RT-Extension-LDAPImport/Makefile
@@ -14,8 +14,8 @@ COMMENT=	RT extension to import users from an LDAP store
 LICENSE_COMB=	dual
 LICENSE=	ART10 GPLv1
 
-BUILD_DEPENDS=	p5-perl-ldap>0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-perl-ldap>0:net/p5-perl-ldap \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -40,8 +40,8 @@ RT_VER=         ${opt}
 ### Temporary for debugging
 #WRKDIR=         ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER}
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
-RUN_DEPENDS+=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
+BUILD_DEPENDS+=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
+RUN_DEPENDS+=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
 
 MAN3PREFIX=	${PREFIX}
 
diff --git a/www/p5-RT-Extension-MandatoryOnTransition/Makefile b/www/p5-RT-Extension-MandatoryOnTransition/Makefile
index 2992980a12f1..0068ef942be2 100644
--- a/www/p5-RT-Extension-MandatoryOnTransition/Makefile
+++ b/www/p5-RT-Extension-MandatoryOnTransition/Makefile
@@ -30,8 +30,8 @@ RT_VER=         ${opt}
 ### Temporary for debugging
 #WRKDIR=         ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER}
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
-RUN_DEPENDS=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
+BUILD_DEPENDS=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
+RUN_DEPENDS=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
 
 NO_ARCH=	yes
 
diff --git a/www/p5-RT-Extension-SLA/Makefile b/www/p5-RT-Extension-SLA/Makefile
index 23e5f8675f5f..304870b7505b 100644
--- a/www/p5-RT-Extension-SLA/Makefile
+++ b/www/p5-RT-Extension-SLA/Makefile
@@ -12,7 +12,7 @@ COMMENT=	RT extension to automate due dates using service levels
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Business-Hours>0:${PORTSDIR}/misc/p5-Business-Hours
+BUILD_DEPENDS=	p5-Business-Hours>0:misc/p5-Business-Hours
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	GPLv2
@@ -39,8 +39,8 @@ RT_VER=         ${opt}
 ### Temporary for debugging
 #WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work${RT_VER}
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
-RUN_DEPENDS+=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
+BUILD_DEPENDS+=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
+RUN_DEPENDS+=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
 
 PLIST_SUB+=	RTHOME=share/rt${RT_VER}
 
diff --git a/www/p5-RTx-Calendar/Makefile b/www/p5-RTx-Calendar/Makefile
index 45e587cdbbc7..9921c4e77995 100644
--- a/www/p5-RTx-Calendar/Makefile
+++ b/www/p5-RTx-Calendar/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Calendar extension module for the RT ticketing system
 LICENSE_COMB=	dual
 LICENSE=	ART10 GPLv1
 
-BUILD_DEPENDS=	p5-Date-ICal>0:${PORTSDIR}/devel/p5-Date-ICal      \
-		p5-Data-ICal>0:${PORTSDIR}/deskutils/p5-Data-ICal  \
-		p5-DateTime-Set>0:${PORTSDIR}/devel/p5-DateTime-Set
+BUILD_DEPENDS=	p5-Date-ICal>0:devel/p5-Date-ICal      \
+		p5-Data-ICal>0:deskutils/p5-Data-ICal  \
+		p5-DateTime-Set>0:devel/p5-DateTime-Set
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -37,8 +37,8 @@ RT_VER=		${opt}
 .endif
 .endfor
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
-RUN_DEPENDS+=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
+BUILD_DEPENDS+=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
+RUN_DEPENDS+=	${LOCALBASE}/bin/rt:www/rt${RT_VER}
 
 MAN3PREFIX=	${PREFIX}
 
diff --git a/www/p5-Reaction/Makefile b/www/p5-Reaction/Makefile
index ed6f56ed6162..d37643104515 100644
--- a/www/p5-Reaction/Makefile
+++ b/www/p5-Reaction/Makefile
@@ -11,47 +11,47 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extended MVC framework built upon Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-Component-ACCEPT_CONTEXT>=0.05:${PORTSDIR}/www/p5-Catalyst-Component-ACCEPT_CONTEXT \
-		p5-Catalyst-Component-InstancePerContext>=0.001001:${PORTSDIR}/www/p5-Catalyst-Component-InstancePerContext \
-		p5-Catalyst-Model-DBIC-Schema>=0.23:${PORTSDIR}/www/p5-Catalyst-Model-DBIC-Schema \
-		p5-Catalyst-Plugin-ConfigLoader>=0.23:${PORTSDIR}/www/p5-Catalyst-Plugin-ConfigLoader \
-		p5-Catalyst-Plugin-I18N>=0.09:${PORTSDIR}/www/p5-Catalyst-Plugin-I18N \
-		p5-Catalyst-Plugin-Static-Simple>=0.21:${PORTSDIR}/www/p5-Catalyst-Plugin-Static-Simple \
-		p5-Catalyst-Runtime>=5.80002:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-View-TT>=0.29:${PORTSDIR}/www/p5-Catalyst-View-TT \
-		p5-Config-General>=2.42:${PORTSDIR}/devel/p5-Config-General \
-		p5-Crypt-Eksblowfish>=0.005:${PORTSDIR}/security/p5-Crypt-Eksblowfish \
-		p5-DBIx-Class-IntrospectableM2M>=0.001001:${PORTSDIR}/databases/p5-DBIx-Class-IntrospectableM2M \
-		p5-DBIx-Class>=0.08100:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DateTime-Event-Recurrence>=0.16:${PORTSDIR}/devel/p5-DateTime-Event-Recurrence \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-DateTime>=0.47:${PORTSDIR}/devel/p5-DateTime \
-		p5-Devel-Declare>=0.005000:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Email-Valid>=0.181:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-File-ShareDir>=1:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Method-Signatures-Simple>=0.03:${PORTSDIR}/devel/p5-Method-Signatures-Simple \
-		p5-Moose>=0.74:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-MethodAttributes>=0.18:${PORTSDIR}/devel/p5-MooseX-MethodAttributes \
-		p5-MooseX-Role-Parameterized>=0.24:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-Types-Common>=0.001000:${PORTSDIR}/devel/p5-MooseX-Types-Common \
-		p5-MooseX-Types-DateTime>=0.03:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \
-		p5-MooseX-Types-URI>=0.02:${PORTSDIR}/devel/p5-MooseX-Types-URI \
-		p5-MooseX-Types>=0.10:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Exporter>=0.982:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Name>=0.04:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Template-Toolkit>=2.20:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Time-modules>=2006.0814:${PORTSDIR}/devel/p5-Time-modules \
-		p5-URI>=1.37:${PORTSDIR}/net/p5-URI \
-		p5-aliased>=0.22:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-clean>=0.11:${PORTSDIR}/devel/p5-namespace-clean \
-		p5-signatures>=0.05:${PORTSDIR}/lang/p5-signatures
+BUILD_DEPENDS=	p5-Catalyst-Component-ACCEPT_CONTEXT>=0.05:www/p5-Catalyst-Component-ACCEPT_CONTEXT \
+		p5-Catalyst-Component-InstancePerContext>=0.001001:www/p5-Catalyst-Component-InstancePerContext \
+		p5-Catalyst-Model-DBIC-Schema>=0.23:www/p5-Catalyst-Model-DBIC-Schema \
+		p5-Catalyst-Plugin-ConfigLoader>=0.23:www/p5-Catalyst-Plugin-ConfigLoader \
+		p5-Catalyst-Plugin-I18N>=0.09:www/p5-Catalyst-Plugin-I18N \
+		p5-Catalyst-Plugin-Static-Simple>=0.21:www/p5-Catalyst-Plugin-Static-Simple \
+		p5-Catalyst-Runtime>=5.80002:www/p5-Catalyst-Runtime \
+		p5-Catalyst-View-TT>=0.29:www/p5-Catalyst-View-TT \
+		p5-Config-General>=2.42:devel/p5-Config-General \
+		p5-Crypt-Eksblowfish>=0.005:security/p5-Crypt-Eksblowfish \
+		p5-DBIx-Class-IntrospectableM2M>=0.001001:databases/p5-DBIx-Class-IntrospectableM2M \
+		p5-DBIx-Class>=0.08100:databases/p5-DBIx-Class \
+		p5-DateTime-Event-Recurrence>=0.16:devel/p5-DateTime-Event-Recurrence \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-DateTime>=0.47:devel/p5-DateTime \
+		p5-Devel-Declare>=0.005000:devel/p5-Devel-Declare \
+		p5-Email-Valid>=0.181:mail/p5-Email-Valid \
+		p5-File-ShareDir>=1:devel/p5-File-ShareDir \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Method-Signatures-Simple>=0.03:devel/p5-Method-Signatures-Simple \
+		p5-Moose>=0.74:devel/p5-Moose \
+		p5-MooseX-MethodAttributes>=0.18:devel/p5-MooseX-MethodAttributes \
+		p5-MooseX-Role-Parameterized>=0.24:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Types-Common>=0.001000:devel/p5-MooseX-Types-Common \
+		p5-MooseX-Types-DateTime>=0.03:devel/p5-MooseX-Types-DateTime \
+		p5-MooseX-Types-URI>=0.02:devel/p5-MooseX-Types-URI \
+		p5-MooseX-Types>=0.10:devel/p5-MooseX-Types \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter \
+		p5-Sub-Name>=0.04:devel/p5-Sub-Name \
+		p5-Template-Toolkit>=2.20:www/p5-Template-Toolkit \
+		p5-Time-modules>=2006.0814:devel/p5-Time-modules \
+		p5-URI>=1.37:net/p5-URI \
+		p5-aliased>=0.22:devel/p5-aliased \
+		p5-namespace-clean>=0.11:devel/p5-namespace-clean \
+		p5-signatures>=0.05:lang/p5-signatures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-SQL-Translator>=0.11002:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-Test-Class>=0.31:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Memory-Cycle>=1.04:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-WWW-Mechanize-Catalyst>=0.51:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-SQL-Translator>=0.11002:databases/p5-SQL-Translator \
+		p5-Test-Class>=0.31:devel/p5-Test-Class \
+		p5-Test-Memory-Cycle>=1.04:devel/p5-Test-Memory-Cycle \
+		p5-Test-WWW-Mechanize-Catalyst>=0.51:devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Reddit-Client/Makefile b/www/p5-Reddit-Client/Makefile
index 37d957bc4b2e..08efba49d239 100644
--- a/www/p5-Reddit-Client/Makefile
+++ b/www/p5-Reddit-Client/Makefile
@@ -10,14 +10,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Methods and object wrappers for objects exposed by the Reddit API
 
-BUILD_DEPENDS=	p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture \
-		p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-		p5-URI-Encode>0:${PORTSDIR}/www/p5-URI-Encode \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-File-Path-Expand>=0:${PORTSDIR}/devel/p5-File-Path-Expand
+BUILD_DEPENDS=	p5-IO-Capture>=0:devel/p5-IO-Capture \
+		p5-JSON>=2.53:converters/p5-JSON \
+		p5-URI-Encode>0:www/p5-URI-Encode \
+		p5-URI>0:net/p5-URI \
+		p5-libwww>0:www/p5-libwww \
+		p5-File-Path-Expand>=0:devel/p5-File-Path-Expand
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule
+TEST_DEPENDS=	p5-Test-MockModule>=0:devel/p5-Test-MockModule
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Reddit/Makefile b/www/p5-Reddit/Makefile
index 1e59e1b547ed..54d804927ba7 100644
--- a/www/p5-Reddit/Makefile
+++ b/www/p5-Reddit/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Module for interacting with Reddit
 
-BUILD_DEPENDS=	p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-ExtUtils-MakeMaker>=6.42:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-common-sense>=3.2:${PORTSDIR}/devel/p5-common-sense
-RUN_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-common-sense>=3.2:${PORTSDIR}/devel/p5-common-sense \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-HTTP-Cookies>=6:${PORTSDIR}/www/p5-HTTP-Cookies \
-		p5-libwww>=5.829:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-ExtUtils-MakeMaker>=6.42:devel/p5-ExtUtils-MakeMaker \
+		p5-common-sense>=3.2:devel/p5-common-sense
+RUN_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-common-sense>=3.2:devel/p5-common-sense \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-HTTP-Cookies>=6:www/p5-HTTP-Cookies \
+		p5-libwww>=5.829:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Role-REST-Client/Makefile b/www/p5-Role-REST-Client/Makefile
index 4dcb580f4aa6..99d594e8122a 100644
--- a/www/p5-Role-REST-Client/Makefile
+++ b/www/p5-Role-REST-Client/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Perl extension for Rest Client Role
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Data-Serializer>=0.60:${PORTSDIR}/devel/p5-Data-Serializer \
-		p5-HTTP-Tiny>=0.056:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-Moo>=1.003000:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-HandlesVia>=0.001004:${PORTSDIR}/devel/p5-MooX-HandlesVia \
-		p5-Type-Tiny>=0.024:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-URI-Escape-XS>0.11:${PORTSDIR}/www/p5-URI-Escape-XS \
-		p5-HTTP-Thin>0:${PORTSDIR}/www/p5-HTTP-Thin
+RUN_DEPENDS=	p5-Data-Serializer>=0.60:devel/p5-Data-Serializer \
+		p5-HTTP-Tiny>=0.056:www/p5-HTTP-Tiny \
+		p5-Moo>=1.003000:devel/p5-Moo \
+		p5-MooX-HandlesVia>=0.001004:devel/p5-MooX-HandlesVia \
+		p5-Type-Tiny>=0.024:devel/p5-Type-Tiny \
+		p5-URI-Escape-XS>0.11:www/p5-URI-Escape-XS \
+		p5-HTTP-Thin>0:www/p5-HTTP-Thin
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Rose-HTML-Objects/Makefile b/www/p5-Rose-HTML-Objects/Makefile
index 771f1d2bcbbf..65d89d669203 100644
--- a/www/p5-Rose-HTML-Objects/Makefile
+++ b/www/p5-Rose-HTML-Objects/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Object-oriented interfaces for HTML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone-PP>=0:${PORTSDIR}/devel/p5-Clone-PP \
-		p5-DateTime>=0.20:${PORTSDIR}/devel/p5-DateTime \
-		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-IO-String>=1.08:${PORTSDIR}/devel/p5-IO-String \
-		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Rose-DateTime>=0.532:${PORTSDIR}/devel/p5-Rose-DateTime \
-		p5-Rose-Object>=0.854:${PORTSDIR}/devel/p5-Rose-Object \
-		p5-Rose-URI>=0.021:${PORTSDIR}/net/p5-Rose-URI \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Clone-PP>=0:devel/p5-Clone-PP \
+		p5-DateTime>=0.20:devel/p5-DateTime \
+		p5-Email-Valid>=0:mail/p5-Email-Valid \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-IO-String>=1.08:devel/p5-IO-String \
+		p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Rose-DateTime>=0.532:devel/p5-Rose-DateTime \
+		p5-Rose-Object>=0.854:devel/p5-Rose-Object \
+		p5-Rose-URI>=0.021:net/p5-Rose-URI \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
+TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
 
 PORTSCOUT=	skipv:0.6061
 
diff --git a/www/p5-Router-Boom/Makefile b/www/p5-Router-Boom/Makefile
index 6a99b1c93f22..cfeec394a6a5 100644
--- a/www/p5-Router-Boom/Makefile
+++ b/www/p5-Router-Boom/Makefile
@@ -13,7 +13,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Router-Simple-Sinatraish/Makefile b/www/p5-Router-Simple-Sinatraish/Makefile
index cc5cd19c8aee..687411eb18ef 100644
--- a/www/p5-Router-Simple-Sinatraish/Makefile
+++ b/www/p5-Router-Simple-Sinatraish/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Sinatra-ish routers on Router::Simple
 
 RUN_DEPENDS=	\
-	p5-Router-Simple>=0.09:${PORTSDIR}/www/p5-Router-Simple
+	p5-Router-Simple>=0.09:www/p5-Router-Simple
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Router-Simple/Makefile b/www/p5-Router-Simple/Makefile
index 5bcad7880d92..5da2cb6ffe4e 100644
--- a/www/p5-Router-Simple/Makefile
+++ b/www/p5-Router-Simple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple HTTP Router
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-SOAP-Transport-HTTP-Plack/Makefile b/www/p5-SOAP-Transport-HTTP-Plack/Makefile
index 74159a1dabd9..a3e0464505ab 100644
--- a/www/p5-SOAP-Transport-HTTP-Plack/Makefile
+++ b/www/p5-SOAP-Transport-HTTP-Plack/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension SOAP::Lite transport for Plack
 
 RUN_DEPENDS=	\
-	p5-SOAP-Lite>0:${PORTSDIR}/net/p5-SOAP-Lite \
-	p5-XMLRPC-Lite>0:${PORTSDIR}/net/p5-XMLRPC-Lite
+	p5-SOAP-Lite>0:net/p5-SOAP-Lite \
+	p5-XMLRPC-Lite>0:net/p5-XMLRPC-Lite
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-SRU/Makefile b/www/p5-SRU/Makefile
index f04ec00bc619..4fbcff47f6ab 100644
--- a/www/p5-SRU/Makefile
+++ b/www/p5-SRU/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Search and Retrieval by URL
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CQL-Parser>=1.12:${PORTSDIR}/textproc/p5-CQL-Parser \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-CQL-Parser>=1.12:textproc/p5-CQL-Parser \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-STF-Dispatcher-PSGI/Makefile b/www/p5-STF-Dispatcher-PSGI/Makefile
index 55d33b02387b..3d0b15fdd447 100644
--- a/www/p5-STF-Dispatcher-PSGI/Makefile
+++ b/www/p5-STF-Dispatcher-PSGI/Makefile
@@ -15,14 +15,14 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-HTTP-Date>0:${PORTSDIR}/www/p5-HTTP-Date \
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Plack-Middleware-Header>0:${PORTSDIR}/www/p5-Plack-Middleware-Header
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-HTTP-Date>0:www/p5-HTTP-Date \
+	p5-Plack>0:www/p5-Plack \
+	p5-Plack-Middleware-Header>0:www/p5-Plack-Middleware-Header
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Net-STF-Client>0:${PORTSDIR}/www/p5-Net-STF-Client \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+	p5-Net-STF-Client>0:www/p5-Net-STF-Client \
+	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=	perl5
 USE_PERL5=	modbuild
diff --git a/www/p5-Scrappy/Makefile b/www/p5-Scrappy/Makefile
index e561c036de95..6d16a5265e2d 100644
--- a/www/p5-Scrappy/Makefile
+++ b/www/p5-Scrappy/Makefile
@@ -11,24 +11,24 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	All Powerful Web Harvester, Spider, Scraper fully automated
 
-BUILD_DEPENDS=	p5-File-ShareDir-Install>=0.03:${PORTSDIR}/devel/p5-File-ShareDir-Install \
-		p5-Array-Unique>=0:${PORTSDIR}/devel/p5-Array-Unique \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-SQLite>=0:${PORTSDIR}/devel/p5-DateTime-Format-SQLite \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-File-Util>=0:${PORTSDIR}/devel/p5-File-Util \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-String-TT>=0:${PORTSDIR}/devel/p5-String-TT \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Web-Scraper>=0:${PORTSDIR}/www/p5-Web-Scraper \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install \
+		p5-Array-Unique>=0:devel/p5-Array-Unique \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-File-Util>=0:devel/p5-File-Util \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-String-TT>=0:devel/p5-String-TT \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-Web-Scraper>=0:www/p5-Web-Scraper \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Selenium-Remote-Driver/Makefile b/www/p5-Selenium-Remote-Driver/Makefile
index 8efc8df75d8b..5ca4edbcaf0e 100644
--- a/www/p5-Selenium-Remote-Driver/Makefile
+++ b/www/p5-Selenium-Remote-Driver/Makefile
@@ -15,16 +15,16 @@ COMMENT=	Perl Interface for Selenium Remote Driver
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Archive-Extract>=0.74:${PORTSDIR}/archivers/p5-Archive-Extract \
-		p5-Archive-Zip>=1.39:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-HTTP-Message>=6.06:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=2.90:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=5.829:${PORTSDIR}/www/p5-libwww \
-		p5-Moo>=1:${PORTSDIR}/devel/p5-Moo \
-		p5-Sub-Install>=0.928:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Test-LongString>=0.17:${PORTSDIR}/devel/p5-Test-LongString \
-		p5-Try-Tiny>=0.18:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0.25:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Archive-Extract>=0.74:archivers/p5-Archive-Extract \
+		p5-Archive-Zip>=1.39:archivers/p5-Archive-Zip \
+		p5-HTTP-Message>=6.06:www/p5-HTTP-Message \
+		p5-JSON>=2.90:converters/p5-JSON \
+		p5-libwww>=5.829:www/p5-libwww \
+		p5-Moo>=1:devel/p5-Moo \
+		p5-Sub-Install>=0.928:devel/p5-Sub-Install \
+		p5-Test-LongString>=0.17:devel/p5-Test-LongString \
+		p5-Try-Tiny>=0.18:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0.25:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/www/p5-Session-Storage-Secure/Makefile b/www/p5-Session-Storage-Secure/Makefile
index 8be2719b4450..2a788a931284 100644
--- a/www/p5-Session-Storage-Secure/Makefile
+++ b/www/p5-Session-Storage-Secure/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Perl extension for encrypted, serialized session data with integrity
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	p5-Crypt-CBC>0:${PORTSDIR}/security/p5-Crypt-CBC \
-	p5-Crypt-Rijndael>0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-	p5-Crypt-URandom>0:${PORTSDIR}/security/p5-Crypt-URandom \
-	p5-Math-Random-ISAAC-XS>0:${PORTSDIR}/math/p5-Math-Random-ISAAC-XS \
-	p5-Moo>0:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-Types-MooseLike>=0.16:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-	p5-Sereal-Decoder>0:${PORTSDIR}/converters/p5-Sereal-Decoder \
-	p5-Sereal-Encoder>0:${PORTSDIR}/converters/p5-Sereal-Encoder \
-	p5-String-Compare-ConstantTime>0:${PORTSDIR}/textproc/p5-String-Compare-ConstantTime \
-	p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+	p5-Crypt-CBC>0:security/p5-Crypt-CBC \
+	p5-Crypt-Rijndael>0:security/p5-Crypt-Rijndael \
+	p5-Crypt-URandom>0:security/p5-Crypt-URandom \
+	p5-Math-Random-ISAAC-XS>0:math/p5-Math-Random-ISAAC-XS \
+	p5-Moo>0:devel/p5-Moo \
+	p5-MooX-Types-MooseLike>=0.16:devel/p5-MooX-Types-MooseLike \
+	p5-Sereal-Decoder>0:converters/p5-Sereal-Decoder \
+	p5-Sereal-Encoder>0:converters/p5-Sereal-Encoder \
+	p5-String-Compare-ConstantTime>0:textproc/p5-String-Compare-ConstantTime \
+	p5-namespace-clean>0:devel/p5-namespace-clean
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-	p5-Number-Tolerant>0:${PORTSDIR}/devel/p5-Number-Tolerant
+	p5-Test-Deep>0:devel/p5-Test-Deep \
+	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+	p5-Number-Tolerant>0:devel/p5-Number-Tolerant
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/www/p5-Squatting-On-PSGI/Makefile b/www/p5-Squatting-On-PSGI/Makefile
index a463a6bf5547..c97ed4ca5fb0 100644
--- a/www/p5-Squatting-On-PSGI/Makefile
+++ b/www/p5-Squatting-On-PSGI/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to run Squatting app on PSGI
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Squatting>=0.81:${PORTSDIR}/www/p5-Squatting
+	p5-Plack>0:www/p5-Plack \
+	p5-Squatting>=0.81:www/p5-Squatting
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Squatting/Makefile b/www/p5-Squatting/Makefile
index 4c2d09ea9841..a55020ec1d16 100644
--- a/www/p5-Squatting/Makefile
+++ b/www/p5-Squatting/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Camping-inspired Web Microframework for Perl
 
-COMMON_DEPENDS=	p5-Continuity>=0.991:${PORTSDIR}/www/p5-Continuity \
-		p5-Class-C3-Componentised>0:${PORTSDIR}/devel/p5-Class-C3-Componentised \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Shell-Perl>0:${PORTSDIR}/shells/p5-Shell-Perl \
-		p5-JSON-XS>0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-HTTP-Daemon>0:${PORTSDIR}/www/p5-HTTP-Daemon \
-		p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message
+COMMON_DEPENDS=	p5-Continuity>=0.991:www/p5-Continuity \
+		p5-Class-C3-Componentised>0:devel/p5-Class-C3-Componentised \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Data-Dump>0:devel/p5-Data-Dump \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-Shell-Perl>0:shells/p5-Shell-Perl \
+		p5-JSON-XS>0:converters/p5-JSON-XS \
+		p5-libwww>0:www/p5-libwww \
+		p5-HTTP-Daemon>0:www/p5-HTTP-Daemon \
+		p5-HTTP-Message>0:www/p5-HTTP-Message
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/www/p5-Starlet/Makefile b/www/p5-Starlet/Makefile
index 6d42ed82a550..397c72ac25d5 100644
--- a/www/p5-Starlet/Makefile
+++ b/www/p5-Starlet/Makefile
@@ -15,11 +15,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Parallel-Prefork>=0.13:${PORTSDIR}/devel/p5-Parallel-Prefork \
-	p5-Plack>=0.992:${PORTSDIR}/www/p5-Plack \
-	p5-Server-Starter>=0.06:${PORTSDIR}/net/p5-Server-Starter
+	p5-Parallel-Prefork>=0.13:devel/p5-Parallel-Prefork \
+	p5-Plack>=0.992:www/p5-Plack \
+	p5-Server-Starter>=0.06:net/p5-Server-Starter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>0:devel/p5-Test-TCP
 # TODO: maybe need p5-libwww
 
 USES=	perl5
diff --git a/www/p5-Starman/Makefile b/www/p5-Starman/Makefile
index 6c777a99f00c..819650f5b4f7 100644
--- a/www/p5-Starman/Makefile
+++ b/www/p5-Starman/Makefile
@@ -14,14 +14,14 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
-	p5-HTTP-Parser-XS>0:${PORTSDIR}/www/p5-HTTP-Parser-XS \
-	p5-Net-Server>=2.007:${PORTSDIR}/net/p5-Net-Server \
-	p5-Plack>=0.9971:${PORTSDIR}/www/p5-Plack
+	p5-Data-Dump>0:devel/p5-Data-Dump \
+	p5-HTTP-Parser-XS>0:www/p5-HTTP-Parser-XS \
+	p5-Net-Server>=2.007:net/p5-Net-Server \
+	p5-Plack>=0.9971:www/p5-Plack
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-TCP>=2.00:${PORTSDIR}/devel/p5-Test-TCP
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-TCP>=2.00:devel/p5-Test-TCP
 # TODO: maybe need p5-libwww
 
 USES=	perl5
diff --git a/www/p5-Syntax-Highlight-HTML/Makefile b/www/p5-Syntax-Highlight-HTML/Makefile
index 02bdf82c75a3..8ef3f198580e 100644
--- a/www/p5-Syntax-Highlight-HTML/Makefile
+++ b/www/p5-Syntax-Highlight-HTML/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Syntax::Highlight::HTML - Highlight HTML syntax
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Syntax-Highlight-Shell/Makefile b/www/p5-Syntax-Highlight-Shell/Makefile
index 68abd21a6de3..8910de2dda52 100644
--- a/www/p5-Syntax-Highlight-Shell/Makefile
+++ b/www/p5-Syntax-Highlight-Shell/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Syntax::Highlight::Shell - Highlight shell scripts
 
-BUILD_DEPENDS=	p5-Shell-Parser>=0:${PORTSDIR}/devel/p5-Shell-Parser
+BUILD_DEPENDS=	p5-Shell-Parser>=0:devel/p5-Shell-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Task-Catalyst/Makefile b/www/p5-Task-Catalyst/Makefile
index 3b9bc6da097b..55c7ef8380a3 100644
--- a/www/p5-Task-Catalyst/Makefile
+++ b/www/p5-Task-Catalyst/Makefile
@@ -11,34 +11,34 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	All you need to start with Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst-ActionRole-ACL>=0:${PORTSDIR}/www/p5-Catalyst-ActionRole-ACL \
-		p5-Catalyst-Action-REST>=0:${PORTSDIR}/www/p5-Catalyst-Action-REST \
-		p5-Catalyst-Authentication-Credential-HTTP>=0:${PORTSDIR}/www/p5-Catalyst-Authentication-Credential-HTTP \
-		p5-Catalyst-Authentication-Store-DBIx-Class>=0.106:${PORTSDIR}/www/p5-Catalyst-Authentication-Store-DBIx-Class \
-		p5-Catalyst-Component-InstancePerContext>=0:${PORTSDIR}/www/p5-Catalyst-Component-InstancePerContext \
-		p5-Catalyst-Controller-ActionRole>=0:${PORTSDIR}/www/p5-Catalyst-Controller-ActionRole \
-		p5-Catalyst-Devel>=1.26:${PORTSDIR}/www/p5-Catalyst-Devel \
-		p5-Catalyst-Manual>=5.80:${PORTSDIR}/www/p5-Catalyst-Manual \
-		p5-Catalyst-Model-Adaptor>=0:${PORTSDIR}/www/p5-Catalyst-Model-Adaptor \
-		p5-Catalyst-Model-DBIC-Schema>=0.08:${PORTSDIR}/www/p5-Catalyst-Model-DBIC-Schema \
-		p5-Catalyst-Plugin-Authentication>=0.05:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
-		p5-Catalyst-Plugin-I18N>=0.05:${PORTSDIR}/www/p5-Catalyst-Plugin-I18N \
-		p5-Catalyst-Plugin-Session-State-Cookie>=0.02:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-State-Cookie \
-		p5-Catalyst-Plugin-Session-Store-DBIC>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-Store-DBIC \
-		p5-Catalyst-Plugin-Session-Store-File>=0.07:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-Store-File \
-		p5-Catalyst-Plugin-Session>=0.05:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Plugin-StackTrace>=0.02:${PORTSDIR}/www/p5-Catalyst-Plugin-StackTrace \
-		p5-Catalyst-Runtime>=5.80:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Catalyst-View-Email>=0:${PORTSDIR}/www/p5-Catalyst-View-Email \
-		p5-Catalyst-View-TT>=0.22:${PORTSDIR}/www/p5-Catalyst-View-TT \
-		p5-CatalystX-LeakChecker>=0:${PORTSDIR}/www/p5-CatalystX-LeakChecker \
-		p5-CatalystX-Profile>=0:${PORTSDIR}/www/p5-CatalystX-Profile \
-		p5-CatalystX-REPL>=0:${PORTSDIR}/www/p5-CatalystX-REPL \
-		p5-CatalystX-SimpleLogin>=0:${PORTSDIR}/www/p5-CatalystX-SimpleLogin \
-		p5-FCGI>=0.71:${PORTSDIR}/www/p5-FCGI \
-		p5-FCGI-ProcManager>=0:${PORTSDIR}/www/p5-FCGI-ProcManager \
-		p5-Starman>=0:${PORTSDIR}/www/p5-Starman \
-		p5-local-lib>=0:${PORTSDIR}/devel/p5-local-lib
+BUILD_DEPENDS=	p5-Catalyst-ActionRole-ACL>=0:www/p5-Catalyst-ActionRole-ACL \
+		p5-Catalyst-Action-REST>=0:www/p5-Catalyst-Action-REST \
+		p5-Catalyst-Authentication-Credential-HTTP>=0:www/p5-Catalyst-Authentication-Credential-HTTP \
+		p5-Catalyst-Authentication-Store-DBIx-Class>=0.106:www/p5-Catalyst-Authentication-Store-DBIx-Class \
+		p5-Catalyst-Component-InstancePerContext>=0:www/p5-Catalyst-Component-InstancePerContext \
+		p5-Catalyst-Controller-ActionRole>=0:www/p5-Catalyst-Controller-ActionRole \
+		p5-Catalyst-Devel>=1.26:www/p5-Catalyst-Devel \
+		p5-Catalyst-Manual>=5.80:www/p5-Catalyst-Manual \
+		p5-Catalyst-Model-Adaptor>=0:www/p5-Catalyst-Model-Adaptor \
+		p5-Catalyst-Model-DBIC-Schema>=0.08:www/p5-Catalyst-Model-DBIC-Schema \
+		p5-Catalyst-Plugin-Authentication>=0.05:www/p5-Catalyst-Plugin-Authentication \
+		p5-Catalyst-Plugin-I18N>=0.05:www/p5-Catalyst-Plugin-I18N \
+		p5-Catalyst-Plugin-Session-State-Cookie>=0.02:www/p5-Catalyst-Plugin-Session-State-Cookie \
+		p5-Catalyst-Plugin-Session-Store-DBIC>=0:www/p5-Catalyst-Plugin-Session-Store-DBIC \
+		p5-Catalyst-Plugin-Session-Store-File>=0.07:www/p5-Catalyst-Plugin-Session-Store-File \
+		p5-Catalyst-Plugin-Session>=0.05:www/p5-Catalyst-Plugin-Session \
+		p5-Catalyst-Plugin-StackTrace>=0.02:www/p5-Catalyst-Plugin-StackTrace \
+		p5-Catalyst-Runtime>=5.80:www/p5-Catalyst-Runtime \
+		p5-Catalyst-View-Email>=0:www/p5-Catalyst-View-Email \
+		p5-Catalyst-View-TT>=0.22:www/p5-Catalyst-View-TT \
+		p5-CatalystX-LeakChecker>=0:www/p5-CatalystX-LeakChecker \
+		p5-CatalystX-Profile>=0:www/p5-CatalystX-Profile \
+		p5-CatalystX-REPL>=0:www/p5-CatalystX-REPL \
+		p5-CatalystX-SimpleLogin>=0:www/p5-CatalystX-SimpleLogin \
+		p5-FCGI>=0.71:www/p5-FCGI \
+		p5-FCGI-ProcManager>=0:www/p5-FCGI-ProcManager \
+		p5-Starman>=0:www/p5-Starman \
+		p5-local-lib>=0:devel/p5-local-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Task-Plack/Makefile b/www/p5-Task-Plack/Makefile
index 0fceb6c3297d..df592ca2fae2 100644
--- a/www/p5-Task-Plack/Makefile
+++ b/www/p5-Task-Plack/Makefile
@@ -34,80 +34,80 @@ CGIAPP_DESC=		CGI::Application::PSGI
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFASTCGI}
-DEP+=	p5-FCGI>=0.71:${PORTSDIR}/www/p5-FCGI \
-	p5-FCGI-Client>=0.04:${PORTSDIR}/www/p5-FCGI-Client \
-	p5-FCGI-ProcManager>=0.19:${PORTSDIR}/www/p5-FCGI-ProcManager \
-	p5-Net-FastCGI>=0.11:${PORTSDIR}/www/p5-Net-FastCGI
+DEP+=	p5-FCGI>=0.71:www/p5-FCGI \
+	p5-FCGI-Client>=0.04:www/p5-FCGI-Client \
+	p5-FCGI-ProcManager>=0.19:www/p5-FCGI-ProcManager \
+	p5-Net-FastCGI>=0.11:www/p5-Net-FastCGI
 .endif
 
 .if ${PORT_OPTIONS:MSTACKTRACE}
-DEP+=	p5-Devel-StackTrace-WithLexicals>=0.05:${PORTSDIR}/devel/p5-Devel-StackTrace-WithLexicals
+DEP+=	p5-Devel-StackTrace-WithLexicals>=0.05:devel/p5-Devel-StackTrace-WithLexicals
 .endif
 
 .if ${PORT_OPTIONS:MHANDLEIO}
-DEP+=	p5-IO-Handle-Util>=0.01:${PORTSDIR}/devel/p5-IO-Handle-Util
+DEP+=	p5-IO-Handle-Util>=0.01:devel/p5-IO-Handle-Util
 .endif
 
 .if ${PORT_OPTIONS:MCORE}
-DEP+=	p5-PSGI>=1.03:${PORTSDIR}/www/p5-PSGI \
-	p5-Plack>=0.9934:${PORTSDIR}/www/p5-Plack \
-	p5-CGI-PSGI>=0.11:${PORTSDIR}/www/p5-CGI-PSGI \
-	p5-CGI-Emulate-PSGI>=0.08:${PORTSDIR}/www/p5-CGI-Emulate-PSGI \
-	p5-CGI-Compile>=0.11:${PORTSDIR}/www/p5-CGI-Compile
+DEP+=	p5-PSGI>=1.03:www/p5-PSGI \
+	p5-Plack>=0.9934:www/p5-Plack \
+	p5-CGI-PSGI>=0.11:www/p5-CGI-PSGI \
+	p5-CGI-Emulate-PSGI>=0.08:www/p5-CGI-Emulate-PSGI \
+	p5-CGI-Compile>=0.11:www/p5-CGI-Compile
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
-DEP+=	p5-HTTP-Server-Simple-PSGI>=0.14:${PORTSDIR}/www/p5-HTTP-Server-Simple-PSGI \
-	p5-Starman>=0.2004:${PORTSDIR}/www/p5-Starman \
-	p5-Twiggy>=0.1005:${PORTSDIR}/www/p5-Twiggy \
-	p5-Starlet>=0.08:${PORTSDIR}/www/p5-Starlet \
-	p5-Corona>=0.1004:${PORTSDIR}/www/p5-Corona
+DEP+=	p5-HTTP-Server-Simple-PSGI>=0.14:www/p5-HTTP-Server-Simple-PSGI \
+	p5-Starman>=0.2004:www/p5-Starman \
+	p5-Twiggy>=0.1005:www/p5-Twiggy \
+	p5-Starlet>=0.08:www/p5-Starlet \
+	p5-Corona>=0.1004:www/p5-Corona
 .endif
 
 .if ${PORT_OPTIONS:MEXTRASRV}
-DEP+=	p5-POE-Component-Server-PSGI>=0.5:${PORTSDIR}/www/p5-POE-Component-Server-PSGI \
-	p5-Plack-Handler-AnyEvent-ReverseHTTP>=0.04:${PORTSDIR}/www/p5-Plack-Handler-AnyEvent-ReverseHTTP \
-	p5-Plack-Handler-SCGI>=0.02:${PORTSDIR}/www/p5-Plack-Handler-SCGI \
-	p5-Plack-Handler-AnyEvent-SCGI>=0.02:${PORTSDIR}/www/p5-Plack-Handler-AnyEvent-SCGI \
-	p5-Plack-Handler-AnyEvent-HTTPD>=0.01:${PORTSDIR}/www/p5-Plack-Handler-AnyEvent-HTTPD \
-	p5-Perlbal-Plugin-PSGI>=0.03:${PORTSDIR}/www/p5-Perlbal-Plugin-PSGI
-#	p5-Plack-Handler-Mongrel2>0:${PORTSDIR}/www/p5-Plack-Handler-Mongrel2
+DEP+=	p5-POE-Component-Server-PSGI>=0.5:www/p5-POE-Component-Server-PSGI \
+	p5-Plack-Handler-AnyEvent-ReverseHTTP>=0.04:www/p5-Plack-Handler-AnyEvent-ReverseHTTP \
+	p5-Plack-Handler-SCGI>=0.02:www/p5-Plack-Handler-SCGI \
+	p5-Plack-Handler-AnyEvent-SCGI>=0.02:www/p5-Plack-Handler-AnyEvent-SCGI \
+	p5-Plack-Handler-AnyEvent-HTTPD>=0.01:www/p5-Plack-Handler-AnyEvent-HTTPD \
+	p5-Perlbal-Plugin-PSGI>=0.03:www/p5-Perlbal-Plugin-PSGI
+#	p5-Plack-Handler-Mongrel2>0:www/p5-Plack-Handler-Mongrel2
 .endif
 
 .if ${PORT_OPTIONS:MMIDDLE}
-DEP+=	p5-Plack-Middleware-Deflater>=0.03:${PORTSDIR}/www/p5-Plack-Middleware-Deflater \
-	p5-Plack-Middleware-Session>=0.11:${PORTSDIR}/www/p5-Plack-Middleware-Session \
-	p5-Plack-Middleware-Debug>=0.09:${PORTSDIR}/www/p5-Plack-Middleware-Debug \
-	p5-Plack-Middleware-Header>=0.03:${PORTSDIR}/www/p5-Plack-Middleware-Header \
-	p5-Plack-Middleware-Auth-Digest>=0.03:${PORTSDIR}/www/p5-Plack-Middleware-Auth-Digest \
-	p5-Plack-App-Proxy>=0.15:${PORTSDIR}/www/p5-Plack-App-Proxy \
-	p5-Plack-Middleware-ReverseProxy>=0.06:${PORTSDIR}/www/p5-Plack-Middleware-ReverseProxy \
-	p5-Plack-Middleware-ConsoleLogger>=0.01:${PORTSDIR}/www/p5-Plack-Middleware-ConsoleLogger
+DEP+=	p5-Plack-Middleware-Deflater>=0.03:www/p5-Plack-Middleware-Deflater \
+	p5-Plack-Middleware-Session>=0.11:www/p5-Plack-Middleware-Session \
+	p5-Plack-Middleware-Debug>=0.09:www/p5-Plack-Middleware-Debug \
+	p5-Plack-Middleware-Header>=0.03:www/p5-Plack-Middleware-Header \
+	p5-Plack-Middleware-Auth-Digest>=0.03:www/p5-Plack-Middleware-Auth-Digest \
+	p5-Plack-App-Proxy>=0.15:www/p5-Plack-App-Proxy \
+	p5-Plack-Middleware-ReverseProxy>=0.06:www/p5-Plack-Middleware-ReverseProxy \
+	p5-Plack-Middleware-ConsoleLogger>=0.01:www/p5-Plack-Middleware-ConsoleLogger
 .endif
 
 .if ${PORT_OPTIONS:MEXTRAMID}
-DEP+=	p5-Plack-Middleware-JSConcat>=0.29:${PORTSDIR}/www/p5-Plack-Middleware-JSConcat \
-	p5-Plack-Middleware-Throttle>=0.01:${PORTSDIR}/www/p5-Plack-Middleware-Throttle \
-	p5-Plack-Middleware-Status>=1.101150:${PORTSDIR}/www/p5-Plack-Middleware-Status \
-	p5-Plack-Middleware-AutoRefresh>=0.08:${PORTSDIR}/www/p5-Plack-Middleware-AutoRefresh \
-	p5-Plack-Middleware-File-Sass>=0.01:${PORTSDIR}/www/p5-Plack-Middleware-File-Sass
+DEP+=	p5-Plack-Middleware-JSConcat>=0.29:www/p5-Plack-Middleware-JSConcat \
+	p5-Plack-Middleware-Throttle>=0.01:www/p5-Plack-Middleware-Throttle \
+	p5-Plack-Middleware-Status>=1.101150:www/p5-Plack-Middleware-Status \
+	p5-Plack-Middleware-AutoRefresh>=0.08:www/p5-Plack-Middleware-AutoRefresh \
+	p5-Plack-Middleware-File-Sass>=0.01:www/p5-Plack-Middleware-File-Sass
 .endif
 
 .if ${PORT_OPTIONS:MTOOLS}
-DEP+=	p5-Test-WWW-Mechanize-PSGI>=0.35:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-PSGI \
-	p5-Flea>=0.02:${PORTSDIR}/www/p5-Flea
+DEP+=	p5-Test-WWW-Mechanize-PSGI>=0.35:devel/p5-Test-WWW-Mechanize-PSGI \
+	p5-Flea>=0.02:www/p5-Flea
 .endif
 
 .if ${PORT_OPTIONS:MCATALYST}
-DEP+=	p5-Catalyst-Engine-PSGI>=0.09:${PORTSDIR}/www/p5-Catalyst-Engine-PSGI
+DEP+=	p5-Catalyst-Engine-PSGI>=0.09:www/p5-Catalyst-Engine-PSGI
 .endif
 
 .if ${PORT_OPTIONS:MSQUATTING}
-DEP+=	p5-Squatting-On-PSGI>=0.04:${PORTSDIR}/www/p5-Squatting-On-PSGI
+DEP+=	p5-Squatting-On-PSGI>=0.04:www/p5-Squatting-On-PSGI
 .endif
 
 .if ${PORT_OPTIONS:MCGIAPP}
-DEP+=	p5-CGI-Application-PSGI>=1.00:${PORTSDIR}/www/p5-CGI-Application-PSGI
+DEP+=	p5-CGI-Application-PSGI>=1.00:www/p5-CGI-Application-PSGI
 .endif
 
 BUILD_DEPENDS=	${DEP}
diff --git a/www/p5-Tatsumaki/Makefile b/www/p5-Tatsumaki/Makefile
index 84ab91298a9a..6bf5fb31d240 100644
--- a/www/p5-Tatsumaki/Makefile
+++ b/www/p5-Tatsumaki/Makefile
@@ -15,17 +15,17 @@ COMMENT=	Non-blocking web framework based on Plack and AnyEvent
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-AnyEvent-HTTP>=0:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Text-MicroTemplate>=0:${PORTSDIR}/textproc/p5-Text-MicroTemplate \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Twiggy>=0:${PORTSDIR}/www/p5-Twiggy
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Text-MicroTemplate>=0:textproc/p5-Text-MicroTemplate \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-Twiggy>=0:www/p5-Twiggy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>=0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Template-GD/Makefile b/www/p5-Template-GD/Makefile
index 4403d7a3c507..4714a2003a12 100644
--- a/www/p5-Template-GD/Makefile
+++ b/www/p5-Template-GD/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Template Toolkit plugin to interface with GD modules
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile b/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile
index f917a2d85eef..6e951fc0f985 100644
--- a/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile
+++ b/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Turns a Class-AlzaboWrapper-Cursor object into a TT2 iterator
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-AlzaboWrapper>=0:${PORTSDIR}/devel/p5-Class-AlzaboWrapper \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Class-AlzaboWrapper>=0:devel/p5-Class-AlzaboWrapper \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Multilingual/Makefile b/www/p5-Template-Multilingual/Makefile
index cb87815de659..054800a8312b 100644
--- a/www/p5-Template-Multilingual/Makefile
+++ b/www/p5-Template-Multilingual/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Multilingual templates for Template Toolkit
 
-RUN_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Template-Mustache/Makefile b/www/p5-Template-Mustache/Makefile
index 6bb52c40eb81..c3f588a5d2af 100644
--- a/www/p5-Template-Mustache/Makefile
+++ b/www/p5-Template-Mustache/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kurt.lidl@cello.com
 COMMENT=	Perl version of the fabulous Mustache template language
 
-BUILD_DEPENDS=	p5-YAML-Syck>=1.15:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-YAML-Syck>=1.15:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS:=	p5-Test-Mini-Unit>=v1.0.3:${PORTSDIR}/devel/p5-Test-Mini-Unit
+TEST_DEPENDS:=	p5-Test-Mini-Unit>=v1.0.3:devel/p5-Test-Mini-Unit
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Template-Plugin-Class/Makefile b/www/p5-Template-Plugin-Class/Makefile
index a107b1ce2f41..60e89d134750 100644
--- a/www/p5-Template-Plugin-Class/Makefile
+++ b/www/p5-Template-Plugin-Class/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Allow calling of class methods on arbitrary classes
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-Clickable-Email/Makefile b/www/p5-Template-Plugin-Clickable-Email/Makefile
index aa8664cd3dd8..04046b8527db 100644
--- a/www/p5-Template-Plugin-Clickable-Email/Makefile
+++ b/www/p5-Template-Plugin-Clickable-Email/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	TT plugin to make email addresses into HTML links
 
-BUILD_DEPENDS=	p5-Email-Find>=0:${PORTSDIR}/mail/p5-Email-Find \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Email-Find>=0:mail/p5-Email-Find \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-Clickable/Makefile b/www/p5-Template-Plugin-Clickable/Makefile
index dfc1713b1bbd..5cee80413ee3 100644
--- a/www/p5-Template-Plugin-Clickable/Makefile
+++ b/www/p5-Template-Plugin-Clickable/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	TT plugin to make URLs clickable in HTML
 
-BUILD_DEPENDS=	p5-URI-Find>=0.13:${PORTSDIR}/textproc/p5-URI-Find \
-		p5-Template-Toolkit>=2.07:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-URI-Find>=0.13:textproc/p5-URI-Find \
+		p5-Template-Toolkit>=2.07:www/p5-Template-Toolkit \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-Comma/Makefile b/www/p5-Template-Plugin-Comma/Makefile
index f41c60067f5a..a926e0ba3097 100644
--- a/www/p5-Template-Plugin-Comma/Makefile
+++ b/www/p5-Template-Plugin-Comma/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	TT Plugin to commify numbers
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-FillInForm/Makefile b/www/p5-Template-Plugin-FillInForm/Makefile
index 014f67ad2f11..c56aea4bdfab 100644
--- a/www/p5-Template-Plugin-FillInForm/Makefile
+++ b/www/p5-Template-Plugin-FillInForm/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Template::Plugin::FillInForm - TT plugin for HTML::FillInForm
 
-RUN_DEPENDS=	p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-HTML-FillInForm>=0:www/p5-HTML-FillInForm \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-JSON/Makefile b/www/p5-Template-Plugin-JSON/Makefile
index b080bd6622b5..b5be71f05016 100644
--- a/www/p5-Template-Plugin-JSON/Makefile
+++ b/www/p5-Template-Plugin-JSON/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Adds a .json vmethod for all TT values
 
-BUILD_DEPENDS=	p5-JSON>=2.12:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-		p5-Template-Toolkit>=2.20:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-JSON>=2.12:converters/p5-JSON \
+		p5-Moose>0:devel/p5-Moose \
+		p5-Template-Toolkit>=2.20:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -21,7 +21,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Template-Plugin-JavaScript/Makefile b/www/p5-Template-Plugin-JavaScript/Makefile
index 8ff69e77b195..5211d2073f09 100644
--- a/www/p5-Template-Plugin-JavaScript/Makefile
+++ b/www/p5-Template-Plugin-JavaScript/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Encodes text to be safe in JavaScript
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-MP3/Makefile b/www/p5-Template-Plugin-MP3/Makefile
index 27e24ecafd5f..fa4d825a58d2 100644
--- a/www/p5-Template-Plugin-MP3/Makefile
+++ b/www/p5-Template-Plugin-MP3/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	TT Plugin that wraps around the MP3::Info module
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-MP3-Info>=0:audio/p5-MP3-Info
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-Markdown/Makefile b/www/p5-Template-Plugin-Markdown/Makefile
index 437d6ed6935b..ad5c8816e515 100644
--- a/www/p5-Template-Plugin-Markdown/Makefile
+++ b/www/p5-Template-Plugin-Markdown/Makefile
@@ -14,8 +14,8 @@ COMMENT=	TT plugin for Text::Markdown
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Text-Markdown>=0:${PORTSDIR}/textproc/p5-Text-Markdown
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Text-Markdown>=0:textproc/p5-Text-Markdown
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-Monta/Makefile b/www/p5-Template-Plugin-Monta/Makefile
index 83e913462daf..c5d8cf796fce 100644
--- a/www/p5-Template-Plugin-Monta/Makefile
+++ b/www/p5-Template-Plugin-Monta/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Template-Toolkit plugin to Monta Method
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-Acme-Monta>=0:${PORTSDIR}/www/p5-Acme-Monta
+		p5-Acme-Monta>=0:www/p5-Acme-Monta
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Template-Plugin-Number-Format/Makefile b/www/p5-Template-Plugin-Number-Format/Makefile
index 2b7f12911165..24fc293acd60 100644
--- a/www/p5-Template-Plugin-Number-Format/Makefile
+++ b/www/p5-Template-Plugin-Number-Format/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Plugin/filter interface to Number::Format
 
-RUN_DEPENDS=	p5-Number-Format>0:${PORTSDIR}/textproc/p5-Number-Format \
-		p5-Template-Toolkit>=2.07:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-Number-Format>0:textproc/p5-Number-Format \
+		p5-Template-Toolkit>=2.07:www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-StripScripts/Makefile b/www/p5-Template-Plugin-StripScripts/Makefile
index e60e25e26079..b9abb33e2b4d 100644
--- a/www/p5-Template-Plugin-StripScripts/Makefile
+++ b/www/p5-Template-Plugin-StripScripts/Makefile
@@ -13,8 +13,8 @@ COMMENT=	TT plugin to filter HTML against XSS
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-HTML-StripScripts-Parser>=0.99:${PORTSDIR}/www/p5-HTML-StripScripts-Parser \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-HTML-StripScripts-Parser>=0.99:www/p5-HTML-StripScripts-Parser \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/www/p5-Template-Plugin-Subst/Makefile b/www/p5-Template-Plugin-Subst/Makefile
index 0d5913cf7a64..b64032f4f657 100644
--- a/www/p5-Template-Plugin-Subst/Makefile
+++ b/www/p5-Template-Plugin-Subst/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	TT plugin for s/// functionality in templates
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-VMethods/Makefile b/www/p5-Template-Plugin-VMethods/Makefile
index 7fdbb982f5c9..61864a10415d 100644
--- a/www/p5-Template-Plugin-VMethods/Makefile
+++ b/www/p5-Template-Plugin-VMethods/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Install vmethods for Template-Toolkit
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-Template-Toolkit>0:www/p5-Template-Toolkit
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Template-Provider-Encoding/Makefile b/www/p5-Template-Provider-Encoding/Makefile
index 95d043f1fdae..034c0fce5800 100644
--- a/www/p5-Template-Provider-Encoding/Makefile
+++ b/www/p5-Template-Provider-Encoding/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Explicitly declare encodings of your templates
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-Template-Provider-FromDATA/Makefile b/www/p5-Template-Provider-FromDATA/Makefile
index 3ea70f5aaad6..fe7bc715b854 100644
--- a/www/p5-Template-Provider-FromDATA/Makefile
+++ b/www/p5-Template-Provider-FromDATA/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Load templates from your __DATA__ section
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=2.15:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Template-Toolkit>=2.15:www/p5-Template-Toolkit \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Simple/Makefile b/www/p5-Template-Simple/Makefile
index 4d184b1c6567..67a814c37b33 100644
--- a/www/p5-Template-Simple/Makefile
+++ b/www/p5-Template-Simple/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fast templating module
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Stash-AutoEscape/Makefile b/www/p5-Template-Stash-AutoEscape/Makefile
index 10455163d8f8..c1056ee06572 100644
--- a/www/p5-Template-Stash-AutoEscape/Makefile
+++ b/www/p5-Template-Stash-AutoEscape/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to escape automatically in Template-Toolkit
 
 RUN_DEPENDS=	\
-	p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-	p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+	p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+	p5-Template-Toolkit>0:www/p5-Template-Toolkit \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+TEST_DEPENDS=	p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Template-Timer/Makefile b/www/p5-Template-Timer/Makefile
index 9251f0782b18..4c2fa88f0ae1 100644
--- a/www/p5-Template-Timer/Makefile
+++ b/www/p5-Template-Timer/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Rudimentary profiling for Template Toolkit
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Toolkit-Simple/Makefile b/www/p5-Template-Toolkit-Simple/Makefile
index ec84a86ddd40..431418a1c607 100644
--- a/www/p5-Template-Toolkit-Simple/Makefile
+++ b/www/p5-Template-Toolkit-Simple/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Simple Interface to Template Toolkit
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index cc3075a098ec..bac4abeab6a4 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Extensive Toolkit for template processing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AppConfig>=1.56:${PORTSDIR}/devel/p5-AppConfig
+BUILD_DEPENDS=	p5-AppConfig>=1.56:devel/p5-AppConfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
+TEST_DEPENDS=	p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-Pod-POM>=0:textproc/p5-Pod-POM
 
 OPTIONS_DEFINE=	DATE_CALC IMAGE_INFO IMAGE_SIZE POD_POM
 DATE_CALC_DESC=		With Date::Calc Plugin
@@ -30,17 +30,17 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	TT_ACCEPT=y
 
-DATE_CALC_BUILD_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
-DATE_CALC_RUN_DEPENDS=		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+DATE_CALC_BUILD_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc
+DATE_CALC_RUN_DEPENDS=		p5-Date-Calc>=0:devel/p5-Date-Calc
 
-IMAGE_INFO_BUILD_DEPENDS=	p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
-IMAGE_INFO_RUN_DEPENDS=		p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
+IMAGE_INFO_BUILD_DEPENDS=	p5-Image-Info>=0:graphics/p5-Image-Info
+IMAGE_INFO_RUN_DEPENDS=		p5-Image-Info>=0:graphics/p5-Image-Info
 
-IMAGE_SIZE_BUILD_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size
-IMAGE_SIZE_RUN_DEPENDS=		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size
+IMAGE_SIZE_BUILD_DEPENDS=	p5-Image-Size>=0:graphics/p5-Image-Size
+IMAGE_SIZE_RUN_DEPENDS=		p5-Image-Size>=0:graphics/p5-Image-Size
 
-POD_POM_BUILD_DEPENDS=	p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
-POD_POM_RUN_DEPENDS=	p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
+POD_POM_BUILD_DEPENDS=	p5-Pod-POM>=0:textproc/p5-Pod-POM
+POD_POM_RUN_DEPENDS=	p5-Pod-POM>=0:textproc/p5-Pod-POM
 
 post-patch:
 	@${REINPLACE_CMD} -e '/PREFIX/ s|/usr/local|${PREFIX}/share|' ${WRKSRC}/Makefile.PL
diff --git a/www/p5-Tenjin/Makefile b/www/p5-Tenjin/Makefile
index f1d44bc4a04e..8fce89771638 100644
--- a/www/p5-Tenjin/Makefile
+++ b/www/p5-Tenjin/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for fast templating engine with support for embedded
 
-RUN_DEPENDS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS=	p5-HTML-Parser>0:www/p5-HTML-Parser
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Try-Tiny>0:lang/p5-Try-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Test-HTTP-Server-Simple/Makefile b/www/p5-Test-HTTP-Server-Simple/Makefile
index c344d80fa8c5..4eeece068093 100644
--- a/www/p5-Test-HTTP-Server-Simple/Makefile
+++ b/www/p5-Test-HTTP-Server-Simple/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Test::More functions for HTTP::Server::Simple
 
-BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Test-HTTP/Makefile b/www/p5-Test-HTTP/Makefile
index bd5fe750f957..ae4f44845d27 100644
--- a/www/p5-Test-HTTP/Makefile
+++ b/www/p5-Test-HTTP/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Test HTTP interactions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Field>=0:${PORTSDIR}/devel/p5-Class-Field \
-		p5-libwww>=5.827:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Field>=0:devel/p5-Class-Field \
+		p5-libwww>=5.827:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Test-LWP-UserAgent/Makefile b/www/p5-Test-LWP-UserAgent/Makefile
index dc51c043889e..ac2ca3451307 100644
--- a/www/p5-Test-LWP-UserAgent/Makefile
+++ b/www/p5-Test-LWP-UserAgent/Makefile
@@ -12,21 +12,21 @@ COMMENT=	LWP::UserAgent suitable for simulating and testing network calls
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean \
-		p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI \
+		p5-namespace-clean>=0:devel/p5-namespace-clean \
+		p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-ExtUtils-MakeMaker>=0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-ExtUtils-MakeMaker>=0:devel/p5-ExtUtils-MakeMaker \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Simple>=0:devel/p5-Test-Simple \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/www/p5-Test-Nginx/Makefile b/www/p5-Test-Nginx/Makefile
index a076c55f5f2b..c4d31427bf60 100644
--- a/www/p5-Test-Nginx/Makefile
+++ b/www/p5-Test-Nginx/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Testing modules for Nginx C module development
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString \
-		p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-libwww>=6:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Test-LongString>=0:devel/p5-Test-LongString \
+		p5-Test-Base>=0:devel/p5-Test-Base \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-libwww>=6:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-TestGen4Web-Runner/Makefile b/www/p5-TestGen4Web-Runner/Makefile
index f57376bfcb28..c25512c04914 100644
--- a/www/p5-TestGen4Web-Runner/Makefile
+++ b/www/p5-TestGen4Web-Runner/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	Perl module to replay files recorded with TestGen4Web
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
index eb4a281c1f9d..5eb09e6ea693 100644
--- a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
+++ b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module for processing files with MultiMarkdown syntax for Apache
 
-BUILD_DEPENDS=	p5-Text-MultiMarkdown>=0:${PORTSDIR}/textproc/p5-Text-MultiMarkdown \
-		p5-Text-Typography>=0:${PORTSDIR}/textproc/p5-Text-Typography \
-		${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:${PORTSDIR}/www/mod_perl2
+BUILD_DEPENDS=	p5-Text-MultiMarkdown>=0:textproc/p5-Text-MultiMarkdown \
+		p5-Text-Typography>=0:textproc/p5-Text-Typography \
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_APACHE_RUN=	22+
diff --git a/www/p5-Tie-TinyURL/Makefile b/www/p5-Tie-TinyURL/Makefile
index 6daa564803d6..03ade9c2a583 100644
--- a/www/p5-Tie-TinyURL/Makefile
+++ b/www/p5-Tie-TinyURL/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tied interface to TinyURL.com
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Toader/Makefile b/www/p5-Toader/Makefile
index 182233e05c26..d255104e2cee 100644
--- a/www/p5-Toader/Makefile
+++ b/www/p5-Toader/Makefile
@@ -15,24 +15,24 @@ COMMENT=	CMS meant to be used from the terminal and integrated into a VCS for re
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Tiny>=2.14:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Email-MIME>=1.911:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-Error-Helper>=1.0.0:${PORTSDIR}/devel/p5-Error-Helper \
-		p5-Module-List>=0.003:${PORTSDIR}/devel/p5-Module-List \
-		p5-Text-Template>=1.46:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-Term-CallEditor>=0.61:${PORTSDIR}/devel/p5-Term-CallEditor \
-		p5-File-Path>=2.09:${PORTSDIR}/devel/p5-File-Path \
-		p5-Time-HiRes>=1.9725:${PORTSDIR}/devel/p5-Time-HiRes \
-		p5-TimeDate>=1.20:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Email-Address>=1.89.7:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Pod-Simple>=3.26:${PORTSDIR}/textproc/p5-Pod-Simple \
-		p5-File-Temp>=0.22:${PORTSDIR}/devel/p5-File-Temp \
-		p5-Image-ExifTool>=9.04:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		p5-GD-Thumbnail>=1.41:${PORTSDIR}/graphics/p5-GD-Thumbnail \
-		p5-Text-Tags>=0.04:${PORTSDIR}/textproc/p5-Text-Tags \
-		p5-Pod-WikiDoc>=0.18:${PORTSDIR}/textproc/p5-Pod-WikiDoc \
-		p5-Script-isAperlScript>=1.0.0:${PORTSDIR}/devel/p5-Script-isAperlScript
+BUILD_DEPENDS=	p5-Config-Tiny>=2.14:devel/p5-Config-Tiny \
+		p5-Email-MIME>=1.911:mail/p5-Email-MIME \
+		p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
+		p5-Error-Helper>=1.0.0:devel/p5-Error-Helper \
+		p5-Module-List>=0.003:devel/p5-Module-List \
+		p5-Text-Template>=1.46:textproc/p5-Text-Template \
+		p5-Term-CallEditor>=0.61:devel/p5-Term-CallEditor \
+		p5-File-Path>=2.09:devel/p5-File-Path \
+		p5-Time-HiRes>=1.9725:devel/p5-Time-HiRes \
+		p5-TimeDate>=1.20:devel/p5-TimeDate \
+		p5-Email-Address>=1.89.7:mail/p5-Email-Address \
+		p5-Pod-Simple>=3.26:textproc/p5-Pod-Simple \
+		p5-File-Temp>=0.22:devel/p5-File-Temp \
+		p5-Image-ExifTool>=9.04:graphics/p5-Image-ExifTool \
+		p5-GD-Thumbnail>=1.41:graphics/p5-GD-Thumbnail \
+		p5-Text-Tags>=0.04:textproc/p5-Text-Tags \
+		p5-Pod-WikiDoc>=0.18:textproc/p5-Pod-WikiDoc \
+		p5-Script-isAperlScript>=1.0.0:devel/p5-Script-isAperlScript
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/www/p5-Toadfarm/Makefile b/www/p5-Toadfarm/Makefile
index 4bf5c8e5baea..e8da5b1d4c6b 100644
--- a/www/p5-Toadfarm/Makefile
+++ b/www/p5-Toadfarm/Makefile
@@ -13,8 +13,8 @@ COMMENT=	One Mojolicious app to rule them all
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-File-Which>=1.00:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-Mojolicious>=5.00:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS=	p5-File-Which>=1.00:sysutils/p5-File-Which \
+		p5-Mojolicious>=5.00:www/p5-Mojolicious
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.0801,0.1001,0.1301,0.1601,0.1701,0.2601,0.2602,0.4301
diff --git a/www/p5-Twiggy-TLS/Makefile b/www/p5-Twiggy-TLS/Makefile
index fdd3ddcd890d..ac7994e26007 100644
--- a/www/p5-Twiggy-TLS/Makefile
+++ b/www/p5-Twiggy-TLS/Makefile
@@ -12,14 +12,14 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to extend Twiggy supporting TLS
 
 RUN_DEPENDS=	\
-	p5-Twiggy>=0.1010:${PORTSDIR}/www/p5-Twiggy \
-	p5-Plack>=0.99:${PORTSDIR}/www/p5-Plack \
-	p5-IO-Socket-SSL>=1.62:${PORTSDIR}/security/p5-IO-Socket-SSL
+	p5-Twiggy>=0.1010:www/p5-Twiggy \
+	p5-Plack>=0.99:www/p5-Plack \
+	p5-IO-Socket-SSL>=1.62:security/p5-IO-Socket-SSL
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP \
-	p5-libwww>=6.00:${PORTSDIR}/www/p5-libwww \
-	p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https
+	p5-Test-TCP>0:devel/p5-Test-TCP \
+	p5-libwww>=6.00:www/p5-libwww \
+	p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/www/p5-Twiggy/Makefile b/www/p5-Twiggy/Makefile
index facc772b65f6..87be4a8c29f8 100644
--- a/www/p5-Twiggy/Makefile
+++ b/www/p5-Twiggy/Makefile
@@ -14,14 +14,14 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Plack>=0.99:${PORTSDIR}/www/p5-Plack \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-AnyEvent>0:devel/p5-AnyEvent \
+	p5-libwww>0:www/p5-libwww \
+	p5-Plack>=0.99:www/p5-Plack \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/www/p5-URI-Fetch/Makefile b/www/p5-URI-Fetch/Makefile
index 49f467f59101..bbf578eaeaa0 100644
--- a/www/p5-URI-Fetch/Makefile
+++ b/www/p5-URI-Fetch/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Smart URI fetching/caching
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	CACHE
@@ -26,7 +26,7 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-CACHE_BUILD_DEPENDS=	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache
-CACHE_RUN_DEPENDS=	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache
+CACHE_BUILD_DEPENDS=	p5-Cache>=0:devel/p5-Cache
+CACHE_RUN_DEPENDS=	p5-Cache>=0:devel/p5-Cache
 
 .include <bsd.port.mk>
diff --git a/www/p5-URI-ParseSearchString/Makefile b/www/p5-URI-ParseSearchString/Makefile
index c6ba67b5433e..cbf82ac20fa8 100644
--- a/www/p5-URI-ParseSearchString/Makefile
+++ b/www/p5-URI-ParseSearchString/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Parse Apache referer logs and extract search engine query strings
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 PORTSCOUT=	skipv:3.441,3.442
 
diff --git a/www/p5-URI-Title/Makefile b/www/p5-URI-Title/Makefile
index 4183dd350ac1..7514035c42e2 100644
--- a/www/p5-URI-Title/Makefile
+++ b/www/p5-URI-Title/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Get the titles of things on the web in a sensible way
 
-COMMON_DEPENDS=	p5-File-Type>=0.22:${PORTSDIR}/devel/p5-File-Type \
-		p5-HTML-Parser>=3.45:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Image-Size>0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-MP3-Info>0:${PORTSDIR}/audio/p5-MP3-Info \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+COMMON_DEPENDS=	p5-File-Type>=0.22:devel/p5-File-Type \
+		p5-HTML-Parser>=3.45:www/p5-HTML-Parser \
+		p5-Image-Size>0:graphics/p5-Image-Size \
+		p5-MP3-Info>0:audio/p5-MP3-Info \
+		p5-libwww>0:www/p5-libwww
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/www/p5-URI-ToDisk/Makefile b/www/p5-URI-ToDisk/Makefile
index c5e89a125c93..91fabbdbb22a 100644
--- a/www/p5-URI-ToDisk/Makefile
+++ b/www/p5-URI-ToDisk/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	coryking@mozimedia.com
 COMMENT=	Object for mapping a URI to an on-disk storage directory
 
-BUILD_DEPENDS=	p5-Clone>=0.23:${PORTSDIR}/devel/p5-Clone \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI \
-		p5-Params-Util>=0.31:${PORTSDIR}/devel/p5-Params-Util
-RUN_DEPENDS=	p5-Clone>=0.23:${PORTSDIR}/devel/p5-Clone \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI \
-		p5-Params-Util>=0.31:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Clone>=0.23:devel/p5-Clone \
+		p5-URI>=1.35:net/p5-URI \
+		p5-Params-Util>=0.31:devel/p5-Params-Util
+RUN_DEPENDS=	p5-Clone>=0.23:devel/p5-Clone \
+		p5-URI>=1.35:net/p5-URI \
+		p5-Params-Util>=0.31:devel/p5-Params-Util
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-URL-Encode/Makefile b/www/p5-URL-Encode/Makefile
index ef28a929b291..fbff3b303e8e 100644
--- a/www/p5-URL-Encode/Makefile
+++ b/www/p5-URL-Encode/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 OPTIONS_DEFINE=	XS
-XS_BUILD_DEPENDS=	p5-URL-Encode-XS>=0:${PORTSDIR}/www/p5-URL-Encode-XS
+XS_BUILD_DEPENDS=	p5-URL-Encode-XS>=0:www/p5-URL-Encode-XS
 XS_RUN_DEPENDS=	${XS_BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-VUser-Google-ProvisioningAPI/Makefile b/www/p5-VUser-Google-ProvisioningAPI/Makefile
index bc938d0baa75..c3dffd9845b3 100644
--- a/www/p5-VUser-Google-ProvisioningAPI/Makefile
+++ b/www/p5-VUser-Google-ProvisioningAPI/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Perl module that implements the Google Provisioning API
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Encode>=0:${PORTSDIR}/converters/p5-Encode \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Encode>=0:converters/p5-Encode \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-W3C-LinkChecker/Makefile b/www/p5-W3C-LinkChecker/Makefile
index 4d42e25f0915..f5eb5f8fa3e4 100644
--- a/www/p5-W3C-LinkChecker/Makefile
+++ b/www/p5-W3C-LinkChecker/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Checks the validity of links in an HTML or XHTML document
 
-BUILD_DEPENDS=	p5-CSS-DOM>=0.09:${PORTSDIR}/www/p5-CSS-DOM \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-CSS-DOM>=0.09:www/p5-CSS-DOM \
+		p5-Config-General>=0:devel/p5-Config-General \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-W3C-LogValidator/Makefile b/www/p5-W3C-LogValidator/Makefile
index 6d46dcbfa974..a0865e633187 100644
--- a/www/p5-W3C-LogValidator/Makefile
+++ b/www/p5-W3C-LogValidator/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	toni.viemero@iki.fi
 COMMENT=	Comprehensive validation tool for webmasters and web developers
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		p5-WebService-Validator-CSS-W3C>=0:${PORTSDIR}/www/p5-webservice-validator-css-w3c \
-		p5-WebService-Validator-HTML-W3C>=0:${PORTSDIR}/www/p5-webservice-validator-html-w3c \
-		${LOCALBASE}/bin/checklink:${PORTSDIR}/www/p5-W3C-LinkChecker
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI \
+		p5-Config-General>=0:devel/p5-Config-General \
+		p5-Mail-Sendmail>=0:mail/p5-Mail-Sendmail \
+		p5-WebService-Validator-CSS-W3C>=0:www/p5-webservice-validator-css-w3c \
+		p5-WebService-Validator-HTML-W3C>=0:www/p5-webservice-validator-html-w3c \
+		${LOCALBASE}/bin/checklink:www/p5-W3C-LinkChecker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-AtMovies-TV/Makefile b/www/p5-WWW-AtMovies-TV/Makefile
index 8bc194f46db6..75aceae94c30 100644
--- a/www/p5-WWW-AtMovies-TV/Makefile
+++ b/www/p5-WWW-AtMovies-TV/Makefile
@@ -13,9 +13,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Retrieve TV information from http://www.atmovies.com.tw/
 
-BUILD_DEPENDS=	p5-HTML-TableExtract>=2.1:${PORTSDIR}/www/p5-HTML-TableExtract \
-		p5-Moose>=0.55:${PORTSDIR}/devel/p5-Moose \
-		p5-WWW-Mechanize>=1.34:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-HTML-TableExtract>=2.1:www/p5-HTML-TableExtract \
+		p5-Moose>=0.55:devel/p5-Moose \
+		p5-WWW-Mechanize>=1.34:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Babelfish/Makefile b/www/p5-WWW-Babelfish/Makefile
index 3ccf80a51567..3f427a6cfc9b 100644
--- a/www/p5-WWW-Babelfish/Makefile
+++ b/www/p5-WWW-Babelfish/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to obtain translations from the babelfish server
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-IO-String>=0:devel/p5-IO-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Baseball-NPB/Makefile b/www/p5-WWW-Baseball-NPB/Makefile
index ee1cea4bbe6b..420e7dd8d702 100644
--- a/www/p5-WWW-Baseball-NPB/Makefile
+++ b/www/p5-WWW-Baseball-NPB/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fetches Japanese baseball games information
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Comic/Makefile b/www/p5-WWW-Comic/Makefile
index 04a7441e05a8..6b4ca0275e1f 100644
--- a/www/p5-WWW-Comic/Makefile
+++ b/www/p5-WWW-Comic/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Retrieve comic strip images
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-WWW-Dilbert>=1.19:${PORTSDIR}/www/p5-WWW-Dilbert \
-		p5-WWW-VenusEnvy>=1.10:${PORTSDIR}/www/p5-WWW-VenusEnvy
+BUILD_DEPENDS=	p5-WWW-Dilbert>=1.19:www/p5-WWW-Dilbert \
+		p5-WWW-VenusEnvy>=1.10:www/p5-WWW-VenusEnvy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Contact/Makefile b/www/p5-WWW-Contact/Makefile
index c32b43c67b6d..04f13b0391b6 100644
--- a/www/p5-WWW-Contact/Makefile
+++ b/www/p5-WWW-Contact/Makefile
@@ -15,17 +15,17 @@ COMMENT=	Contact importer for all the major email systems
 LICENSE=	ART20 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-TokeParser-Simple>=0:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Moose>=0.77:${PORTSDIR}/devel/p5-Moose \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-Google-AuthSub>=0:${PORTSDIR}/net/p5-Net-Google-AuthSub \
-		p5-Text-vCard>=0:${PORTSDIR}/textproc/p5-Text-vCard \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-WWW-Mechanize-GZip>=0:${PORTSDIR}/www/p5-WWW-Mechanize-GZip
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Moose>=0.77:devel/p5-Moose \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-Google-AuthSub>=0:net/p5-Net-Google-AuthSub \
+		p5-Text-vCard>=0:textproc/p5-Text-vCard \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-WWW-Mechanize-GZip>=0:www/p5-WWW-Mechanize-GZip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index 1d27970614a3..518478c2e16d 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl extension interface for libcurl
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-TEST_DEPENDS=	p5-Test-CPAN-Meta>=0:${PORTSDIR}/devel/p5-Test-CPAN-Meta \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+LIB_DEPENDS=	libcurl.so:ftp/curl
+TEST_DEPENDS=	p5-Test-CPAN-Meta>=0:devel/p5-Test-CPAN-Meta \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/www/p5-WWW-DHL/Makefile b/www/p5-WWW-DHL/Makefile
index 0fc12e3a6b0a..bc25b6cde310 100644
--- a/www/p5-WWW-DHL/Makefile
+++ b/www/p5-WWW-DHL/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for the DHL online tracking service
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-TokeParser-Simple>=0:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Dilbert/Makefile b/www/p5-WWW-Dilbert/Makefile
index 460ed84f1956..3d7e69adde5e 100644
--- a/www/p5-WWW-Dilbert/Makefile
+++ b/www/p5-WWW-Dilbert/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dilbert of the day comic strip archive and retrieval module
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Facebook-API/Makefile b/www/p5-WWW-Facebook-API/Makefile
index 4851057d076b..31c1ada17320 100644
--- a/www/p5-WWW-Facebook-API/Makefile
+++ b/www/p5-WWW-Facebook-API/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Facebook API implementation in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-JSON-Any>=0:converters/p5-JSON-Any \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-FreeProxy/Makefile b/www/p5-WWW-FreeProxy/Makefile
index 61c1f7876672..45e206eeeb9a 100644
--- a/www/p5-WWW-FreeProxy/Makefile
+++ b/www/p5-WWW-FreeProxy/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Fetch proxies from free proxy lists
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-GitHub-Gist/Makefile b/www/p5-WWW-GitHub-Gist/Makefile
index b946bc9afaa7..70f8067448a7 100644
--- a/www/p5-WWW-GitHub-Gist/Makefile
+++ b/www/p5-WWW-GitHub-Gist/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl interface to Gist
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-Moo>=0:devel/p5-Moo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Google-Calculator/Makefile b/www/p5-WWW-Google-Calculator/Makefile
index 803d942295b7..4dc8aaa1984f 100644
--- a/www/p5-WWW-Google-Calculator/Makefile
+++ b/www/p5-WWW-Google-Calculator/Makefile
@@ -14,10 +14,10 @@ COMMENT=	This module provide simple interface for Google calculator
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Google-News-TW/Makefile b/www/p5-WWW-Google-News-TW/Makefile
index 95b369db6bbe..281566a005c5 100644
--- a/www/p5-WWW-Google-News-TW/Makefile
+++ b/www/p5-WWW-Google-News-TW/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Access to Google's Taiwan News Service (Not Usenet)
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Google-News/Makefile b/www/p5-WWW-Google-News/Makefile
index 4bf28b4f7a9a..1dd4aee3438d 100644
--- a/www/p5-WWW-Google-News/Makefile
+++ b/www/p5-WWW-Google-News/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Access to Google's News Service (Not Usenet)
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-XML-Atom>=0:textproc/p5-XML-Atom \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Google-Notebook/Makefile b/www/p5-WWW-Google-Notebook/Makefile
index 31a3b91f3344..d3206c86dd1b 100644
--- a/www/p5-WWW-Google-Notebook/Makefile
+++ b/www/p5-WWW-Google-Notebook/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Perl interface for Google Notebook
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Google-PageRank/Makefile b/www/p5-WWW-Google-PageRank/Makefile
index 95c9d5aaa749..10df7e8cdb95 100644
--- a/www/p5-WWW-Google-PageRank/Makefile
+++ b/www/p5-WWW-Google-PageRank/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Perl interface for querying Google pagerank
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Google-Video/Makefile b/www/p5-WWW-Google-Video/Makefile
index 5ac5421ffa8d..de77a62f0682 100644
--- a/www/p5-WWW-Google-Video/Makefile
+++ b/www/p5-WWW-Google-Video/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Interface to fetch the Google Video Information
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-HatenaDiary/Makefile b/www/p5-WWW-HatenaDiary/Makefile
index c9f0c0820eb2..e25781ab0b49 100644
--- a/www/p5-WWW-HatenaDiary/Makefile
+++ b/www/p5-WWW-HatenaDiary/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	CRUD interface to Hatena::Diary
 
-BUILD_DEPENDS=	p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-HatenaLogin>=0.02:${PORTSDIR}/www/p5-WWW-HatenaLogin \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Web-Scraper>=0:${PORTSDIR}/www/p5-Web-Scraper
+BUILD_DEPENDS=	p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-HatenaLogin>=0.02:www/p5-WWW-HatenaLogin \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-Web-Scraper>=0:www/p5-Web-Scraper
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-HatenaLogin/Makefile b/www/p5-WWW-HatenaLogin/Makefile
index 97f89bb1e944..a6593bc302e5 100644
--- a/www/p5-WWW-HatenaLogin/Makefile
+++ b/www/p5-WWW-HatenaLogin/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Login/Logout interface to Hatena
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-HatenaStar/Makefile b/www/p5-WWW-HatenaStar/Makefile
index 73ad49241437..26e75a439fdb 100644
--- a/www/p5-WWW-HatenaStar/Makefile
+++ b/www/p5-WWW-HatenaStar/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Perl interface to Hatena::Star
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-HatenaLogin>=0:${PORTSDIR}/www/p5-WWW-HatenaLogin \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-HatenaLogin>=0:www/p5-WWW-HatenaLogin \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-IMDb/Makefile b/www/p5-WWW-IMDb/Makefile
index 434b6e3b8cc7..a8b9360328db 100644
--- a/www/p5-WWW-IMDb/Makefile
+++ b/www/p5-WWW-IMDb/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	IMDb-current
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Perl interface to query the Internet Movie Database(IMDb)
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		perl5
diff --git a/www/p5-WWW-Instapaper-Client/Makefile b/www/p5-WWW-Instapaper-Client/Makefile
index 60f0214b6b7b..a7f7f8fc7eb7 100644
--- a/www/p5-WWW-Instapaper-Client/Makefile
+++ b/www/p5-WWW-Instapaper-Client/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Implementation of the Instapaper client API
 
-BUILD_DEPENDS=	p5-Class-Base>=0:${PORTSDIR}/devel/p5-Class-Base \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Base>=0:devel/p5-Class-Base \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-LongURL/Makefile b/www/p5-WWW-LongURL/Makefile
index 175a16bec852..efb6e5383be6 100644
--- a/www/p5-WWW-LongURL/Makefile
+++ b/www/p5-WWW-LongURL/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Perl interface to the LongURL API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-Any>0:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON-Any>0:converters/p5-JSON-Any \
+		p5-URI>0:net/p5-URI \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-LWP-Online>0:${PORTSDIR}/www/p5-LWP-Online
+TEST_DEPENDS=	p5-LWP-Online>0:www/p5-LWP-Online
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-Mechanize-CGI/Makefile b/www/p5-WWW-Mechanize-CGI/Makefile
index bc455ec8f169..aa98d31299ac 100644
--- a/www/p5-WWW-Mechanize-CGI/Makefile
+++ b/www/p5-WWW-Mechanize-CGI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Use WWW::Mechanize with CGI applications
 
-RUN_DEPENDS=	p5-HTTP-Request-AsCGI>=0.2:${PORTSDIR}/www/p5-HTTP-Request-AsCGI \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+RUN_DEPENDS=	p5-HTTP-Request-AsCGI>=0.2:www/p5-HTTP-Request-AsCGI \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Mechanize-Cached/Makefile b/www/p5-WWW-Mechanize-Cached/Makefile
index 4297194c9cf5..b66cabdbc5ec 100644
--- a/www/p5-WWW-Mechanize-Cached/Makefile
+++ b/www/p5-WWW-Mechanize-Cached/Makefile
@@ -16,19 +16,19 @@ DEPRECATED=	Depends on expiring www/p5-HTTP-CookieMonster
 EXPIRATION_DATE=	2016-04-15
 
 RUN_DEPENDS=	\
-	p5-Cache-Cache>=1.02:${PORTSDIR}/devel/p5-Cache-Cache \
-	p5-Class-Load>0:${PORTSDIR}/devel/p5-Class-Load \
-	p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
-	p5-Devel-SimpleTrace>0:${PORTSDIR}/devel/p5-Devel-SimpleTrace \
-	p5-Find-Lib>0:${PORTSDIR}/devel/p5-Find-Lib \
-	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-	p5-Moo>=1.004005:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-Types-MooseLike>0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-	p5-WWW-Mechanize>0:${PORTSDIR}/www/p5-WWW-Mechanize \
-	p5-LWP-ConsoleLogger>0:${PORTSDIR}/www/p5-LWP-ConsoleLogger \
-	p5-Storable>=2.21:${PORTSDIR}/devel/p5-Storable
+	p5-Cache-Cache>=1.02:devel/p5-Cache-Cache \
+	p5-Class-Load>0:devel/p5-Class-Load \
+	p5-Data-Dump>0:devel/p5-Data-Dump \
+	p5-Devel-SimpleTrace>0:devel/p5-Devel-SimpleTrace \
+	p5-Find-Lib>0:devel/p5-Find-Lib \
+	p5-Path-Class>0:devel/p5-Path-Class \
+	p5-Moo>=1.004005:devel/p5-Moo \
+	p5-MooX-Types-MooseLike>0:devel/p5-MooX-Types-MooseLike \
+	p5-WWW-Mechanize>0:www/p5-WWW-Mechanize \
+	p5-LWP-ConsoleLogger>0:www/p5-LWP-ConsoleLogger \
+	p5-Storable>=2.21:devel/p5-Storable
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>0:devel/p5-Test-Warn
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-Mechanize-DecodedContent/Makefile b/www/p5-WWW-Mechanize-DecodedContent/Makefile
index 71a45e187a69..59bfb8959d4e 100644
--- a/www/p5-WWW-Mechanize-DecodedContent/Makefile
+++ b/www/p5-WWW-Mechanize-DecodedContent/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Decode Mech content using its HTTP response encoding
 
-BUILD_DEPENDS=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-HTTP-Response-Encoding>=0:${PORTSDIR}/www/p5-HTTP-Response-Encoding
+BUILD_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-HTTP-Response-Encoding>=0:www/p5-HTTP-Response-Encoding
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Mechanize-FormFiller/Makefile b/www/p5-WWW-Mechanize-FormFiller/Makefile
index 35292d75c3ff..3eed434a1a78 100644
--- a/www/p5-WWW-Mechanize-FormFiller/Makefile
+++ b/www/p5-WWW-Mechanize-FormFiller/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl framework to automate HTML forms
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Random>=0.05:${PORTSDIR}/devel/p5-Data-Random \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-HTML-Form>=1.038:${PORTSDIR}/www/p5-HTML-Form
+BUILD_DEPENDS=	p5-Data-Random>=0.05:devel/p5-Data-Random \
+		p5-libwww>=0:www/p5-libwww \
+		p5-HTML-Form>=1.038:www/p5-HTML-Form
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Mechanize-GZip/Makefile b/www/p5-WWW-Mechanize-GZip/Makefile
index 3b862d552476..a908343f90fd 100644
--- a/www/p5-WWW-Mechanize-GZip/Makefile
+++ b/www/p5-WWW-Mechanize-GZip/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use WWW::Mechanize by requesting gzip-compression from the webserver
 
-BUILD_DEPENDS=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Mechanize-Meta/Makefile b/www/p5-WWW-Mechanize-Meta/Makefile
index 5b1efabaac62..dc50f45a0eb9 100644
--- a/www/p5-WWW-Mechanize-Meta/Makefile
+++ b/www/p5-WWW-Mechanize-Meta/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	oleg@mamontov.net
 COMMENT=	Adds HEAD tag parsing to WWW::Mechanize
 
-RUN_DEPENDS=	p5-WWW-Mechanize>=1.20:${PORTSDIR}/www/p5-WWW-Mechanize
+RUN_DEPENDS=	p5-WWW-Mechanize>=1.20:www/p5-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Mechanize-PhantomJS/Makefile b/www/p5-WWW-Mechanize-PhantomJS/Makefile
index 06646323d4e9..9c42cfafa66f 100644
--- a/www/p5-WWW-Mechanize-PhantomJS/Makefile
+++ b/www/p5-WWW-Mechanize-PhantomJS/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Automate interaction with javascript websites
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/phantomjs:${PORTSDIR}/lang/phantomjs \
-		p5-WWW-Mechanize>=1.73:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Object-Import>=1.004:${PORTSDIR}/devel/p5-Object-Import \
-		p5-Selenium-Remote-Driver>=0.2202:${PORTSDIR}/www/p5-Selenium-Remote-Driver \
-		p5-HTML-Selector-XPath>=0.14:${PORTSDIR}/www/p5-HTML-Selector-XPath
+BUILD_DEPENDS=	${LOCALBASE}/bin/phantomjs:lang/phantomjs \
+		p5-WWW-Mechanize>=1.73:www/p5-WWW-Mechanize \
+		p5-Object-Import>=1.004:devel/p5-Object-Import \
+		p5-Selenium-Remote-Driver>=0.2202:www/p5-Selenium-Remote-Driver \
+		p5-HTML-Selector-XPath>=0.14:www/p5-HTML-Selector-XPath
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTTP-Daemon>=6.0:${PORTSDIR}/www/p5-HTTP-Daemon \
-		p5-libwww>=5.829:${PORTSDIR}/www/p5-libwww
+TEST_DEPENDS=	p5-HTTP-Daemon>=6.0:www/p5-HTTP-Daemon \
+		p5-libwww>=5.829:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-Mechanize-Pluggable/Makefile b/www/p5-WWW-Mechanize-Pluggable/Makefile
index c06f63469860..0bf829edf0c0 100644
--- a/www/p5-WWW-Mechanize-Pluggable/Makefile
+++ b/www/p5-WWW-Mechanize-Pluggable/Makefile
@@ -11,17 +11,17 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Custmomize WWW::Mechanize via plugins
 
-BUILD_DEPENDS=	p5-Data-Dump-Streamer>=0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		p5-HTML-Form>=1.038:${PORTSDIR}/www/p5-HTML-Form \
-		p5-HTML-Parser>=2.28:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Cookies>=0:${PORTSDIR}/www/p5-HTTP-Cookies \
-		p5-HTTP-Daemon>=0:${PORTSDIR}/www/p5-HTTP-Daemon \
-		p5-HTTP-Message>=1.3:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-URI>=1.25:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=1.66:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-libwww>=6:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
+		p5-HTML-Form>=1.038:www/p5-HTML-Form \
+		p5-HTML-Parser>=2.28:www/p5-HTML-Parser \
+		p5-HTTP-Cookies>=0:www/p5-HTTP-Cookies \
+		p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
+		p5-HTTP-Message>=1.3:www/p5-HTTP-Message \
+		p5-URI>=1.25:net/p5-URI \
+		p5-WWW-Mechanize>=1.66:www/p5-WWW-Mechanize \
+		p5-libwww>=6:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.2:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.2:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile b/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
index c757a6fed120..8e4dcb5dadda 100644
--- a/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
+++ b/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Screen scraper for phpBB installations
 
-BUILD_DEPENDS=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-WWW-Mechanize-Pluggable>=0.10:${PORTSDIR}/www/p5-WWW-Mechanize-Pluggable \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Log-Log4perl>=1.0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Class-Accessor>=0.19:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-WWW-Mechanize-Pluggable>=0.10:www/p5-WWW-Mechanize-Pluggable \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Log-Log4perl>=1.0:devel/p5-Log-Log4perl \
+		p5-Class-Accessor>=0.19:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Mechanize-Shell/Makefile b/www/p5-WWW-Mechanize-Shell/Makefile
index 03b279d8304b..101528bcc4f8 100644
--- a/www/p5-WWW-Mechanize-Shell/Makefile
+++ b/www/p5-WWW-Mechanize-Shell/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Interactive shell for www/p5-WWW-Mechanize
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Display>=0:${PORTSDIR}/www/p5-HTML-Display \
-		p5-HTML-TokeParser-Simple>=2:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
-		p5-Hook-LexWrap>=0.2:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-Term-Shell>=0.02:${PORTSDIR}/devel/p5-Term-Shell \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=1.2:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-WWW-Mechanize-FormFiller>=0.05:${PORTSDIR}/www/p5-WWW-Mechanize-FormFiller \
-		p5-libwww>=5.69:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Display>=0:www/p5-HTML-Display \
+		p5-HTML-TokeParser-Simple>=2:www/p5-HTML-TokeParser-Simple \
+		p5-Hook-LexWrap>=0.2:devel/p5-Hook-LexWrap \
+		p5-Term-Shell>=0.02:devel/p5-Term-Shell \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=1.2:www/p5-WWW-Mechanize \
+		p5-WWW-Mechanize-FormFiller>=0.05:www/p5-WWW-Mechanize-FormFiller \
+		p5-libwww>=5.69:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/www/p5-WWW-Mechanize-SpamCop/Makefile b/www/p5-WWW-Mechanize-SpamCop/Makefile
index 4b5e77c9f1d5..6d17e7664739 100644
--- a/www/p5-WWW-Mechanize-SpamCop/Makefile
+++ b/www/p5-WWW-Mechanize-SpamCop/Makefile
@@ -14,7 +14,7 @@ COMMENT=	SpamCop reporting automation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-WWW-Mechanize-TreeBuilder/Makefile b/www/p5-WWW-Mechanize-TreeBuilder/Makefile
index 92555c14f39e..20d20cb0f958 100644
--- a/www/p5-WWW-Mechanize-TreeBuilder/Makefile
+++ b/www/p5-WWW-Mechanize-TreeBuilder/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Combine WWW::Mechanize and HTML::TreeBuilder
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Moose>=2.1200:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Moose>=2.1200:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Params-Util>0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Test-WWW-Mechanize>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+TEST_DEPENDS=	p5-Params-Util>0:devel/p5-Params-Util \
+		p5-Test-WWW-Mechanize>0:devel/p5-Test-WWW-Mechanize
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-WWW-Mechanize/Makefile b/www/p5-WWW-Mechanize/Makefile
index 30e5332520fc..0c8b22ed7ff9 100644
--- a/www/p5-WWW-Mechanize/Makefile
+++ b/www/p5-WWW-Mechanize/Makefile
@@ -13,21 +13,21 @@ COMMENT=	This module is to help you automate interaction with a website
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI>=4.08:${PORTSDIR}/www/p5-CGI \
-		p5-HTML-Form>=6:${PORTSDIR}/www/p5-HTML-Form \
-		p5-HTML-Parser>=3.33:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTTP-Server-Simple>=0.35:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=5.829:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-CGI>=4.08:www/p5-CGI \
+		p5-HTML-Form>=6:www/p5-HTML-Form \
+		p5-HTML-Parser>=3.33:www/p5-HTML-Parser \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-HTTP-Server-Simple>=0.35:www/p5-HTTP-Server-Simple \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=5.829:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Taint>=0:${PORTSDIR}/devel/p5-Test-Taint \
-		p5-Test-Warn>=0.11:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Taint>=0:devel/p5-Test-Taint \
+		p5-Test-Warn>=0.11:devel/p5-Test-Warn
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-WWW-Mediawiki-Client/Makefile b/www/p5-WWW-Mediawiki-Client/Makefile
index d5fa0e8d47c0..233456b00162 100644
--- a/www/p5-WWW-Mediawiki-Client/Makefile
+++ b/www/p5-WWW-Mediawiki-Client/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Very simple cvs-like interface for Mediawiki websites
 
-BUILD_DEPENDS=	p5-VCS-Lite>0:${PORTSDIR}/devel/p5-VCS-Lite \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-URI>=1.31:${PORTSDIR}/net/p5-URI \
-		p5-Exception-Class>0:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS=	p5-VCS-Lite>0:devel/p5-VCS-Lite \
+		p5-libwww>0:www/p5-libwww \
+		p5-HTML-Parser>0:www/p5-HTML-Parser \
+		p5-XML-LibXML>0:textproc/p5-XML-LibXML \
+		p5-URI>=1.31:net/p5-URI \
+		p5-Exception-Class>0:devel/p5-Exception-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>0:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Differences>0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-Mixi-Scraper/Makefile b/www/p5-WWW-Mixi-Scraper/Makefile
index c8cf328d8470..72d029e3f754 100644
--- a/www/p5-WWW-Mixi-Scraper/Makefile
+++ b/www/p5-WWW-Mixi-Scraper/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Yet another mixi scraper
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find \
-		p5-String-CamelCase>=0:${PORTSDIR}/textproc/p5-String-CamelCase \
-		p5-Test-UseAllModules>=0:${PORTSDIR}/devel/p5-Test-UseAllModules \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Web-Scraper>=0.17:${PORTSDIR}/www/p5-Web-Scraper \
-		p5-WWW-Mechanize>=1.50:${PORTSDIR}/www/p5-WWW-Mechanize
+RUN_DEPENDS=	p5-Module-Find>=0:devel/p5-Module-Find \
+		p5-String-CamelCase>=0:textproc/p5-String-CamelCase \
+		p5-Test-UseAllModules>=0:devel/p5-Test-UseAllModules \
+		p5-URI>=0:net/p5-URI \
+		p5-Web-Scraper>=0.17:www/p5-Web-Scraper \
+		p5-WWW-Mechanize>=1.50:www/p5-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 dos2unix
diff --git a/www/p5-WWW-Mixi/Makefile b/www/p5-WWW-Mixi/Makefile
index 565f1fe77c50..9019ee486ac4 100644
--- a/www/p5-WWW-Mixi/Makefile
+++ b/www/p5-WWW-Mixi/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module of Automated interface to the Mixi
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-				ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+				ja-p5-Jcode>=0:japanese/p5-Jcode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Myspace/Makefile b/www/p5-WWW-Myspace/Makefile
index 33e5c7327410..cfe7f4f7df06 100644
--- a/www/p5-WWW-Myspace/Makefile
+++ b/www/p5-WWW-Myspace/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Access MySpace.com profile information from Perl
 
-BUILD_DEPENDS=	p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-Contextual-Return>=0:${PORTSDIR}/devel/p5-Contextual-Return \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Spiffy>=0.24:${PORTSDIR}/devel/p5-Spiffy \
-		p5-Time-modules>=100.010301:${PORTSDIR}/devel/p5-Time-modules \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=1.2:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-YAML>=0.39:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Config-General>=0:devel/p5-Config-General \
+		p5-Contextual-Return>=0:devel/p5-Contextual-Return \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Spiffy>=0.24:devel/p5-Spiffy \
+		p5-Time-modules>=100.010301:devel/p5-Time-modules \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=1.2:www/p5-WWW-Mechanize \
+		p5-YAML>=0.39:textproc/p5-YAML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-NicoVideo-Download/Makefile b/www/p5-WWW-NicoVideo-Download/Makefile
index 03121a600763..d84aa269b16d 100644
--- a/www/p5-WWW-NicoVideo-Download/Makefile
+++ b/www/p5-WWW-NicoVideo-Download/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Download FLV/MP4/SWF files from nicovideo.jp
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-CGI-Simple>=0:www/p5-CGI-Simple \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-NioTV/Makefile b/www/p5-WWW-NioTV/Makefile
index 47a401d0857d..ec030a617be8 100644
--- a/www/p5-WWW-NioTV/Makefile
+++ b/www/p5-WWW-NioTV/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Retrieve TV information from http://www.niotv.com/
 
-BUILD_DEPENDS=	p5-HTML-SimpleLinkExtor>=1.19:${PORTSDIR}/www/p5-HTML-SimpleLinkExtor \
-		p5-HTML-TableExtract>=2.1:${PORTSDIR}/www/p5-HTML-TableExtract \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moose>=0.54:${PORTSDIR}/devel/p5-Moose \
-		p5-WWW-Mechanize>=1.34:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-HTML-SimpleLinkExtor>=1.19:www/p5-HTML-SimpleLinkExtor \
+		p5-HTML-TableExtract>=2.1:www/p5-HTML-TableExtract \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+		p5-Moose>=0.54:devel/p5-Moose \
+		p5-WWW-Mechanize>=1.34:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-OpenSVN/Makefile b/www/p5-WWW-OpenSVN/Makefile
index e74365a963e7..adb99fa1bfec 100644
--- a/www/p5-WWW-OpenSVN/Makefile
+++ b/www/p5-WWW-OpenSVN/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Automated interface for OpenSVN.csie.org
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-OpenSearch/Makefile b/www/p5-WWW-OpenSearch/Makefile
index 9fba412cb746..fcd3389bcc13 100644
--- a/www/p5-WWW-OpenSearch/Makefile
+++ b/www/p5-WWW-OpenSearch/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Search A9 OpenSearch compatible engines
 
-BUILD_DEPENDS=	p5-URI-Template>=0:${PORTSDIR}/net/p5-URI-Template \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Data-Page>=2.00:${PORTSDIR}/databases/p5-Data-Page \
-		p5-XML-Feed>=0.08:${PORTSDIR}/textproc/p5-XML-Feed \
-		p5-libwww>=5.60:${PORTSDIR}/www/p5-libwww \
-		p5-XML-LibXML>=1.58:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-URI-Template>=0:net/p5-URI-Template \
+		p5-URI>=0:net/p5-URI \
+		p5-Data-Page>=2.00:databases/p5-Data-Page \
+		p5-XML-Feed>=0.08:textproc/p5-XML-Feed \
+		p5-libwww>=5.60:www/p5-libwww \
+		p5-XML-LibXML>=1.58:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile b/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
index 6578c04d5820..49907ee26fd3 100644
--- a/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
+++ b/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Paste to http://pastebin.com from Perl
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Moo>=1.004001:${PORTSDIR}/devel/p5-Moo \
-		p5-WWW-Mechanize>=1.73:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-Moo>=1.004001:devel/p5-Moo \
+		p5-WWW-Mechanize>=1.73:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Plurk/Makefile b/www/p5-WWW-Plurk/Makefile
index a0e62f4ffbb5..20c28b829e8d 100644
--- a/www/p5-WWW-Plurk/Makefile
+++ b/www/p5-WWW-Plurk/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mhsin@mhsin.org
 COMMENT=	Unofficial plurk.com API
 
-RUN_DEPENDS=	p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-HTML-Tiny>=0:${PORTSDIR}/textproc/p5-HTML-Tiny \
-		p5-JSON>=2.00:${PORTSDIR}/converters/p5-JSON \
-		p5-Math-Base36>=0:${PORTSDIR}/math/p5-Math-Base36 \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-HTML-Tiny>=0:textproc/p5-HTML-Tiny \
+		p5-JSON>=2.00:converters/p5-JSON \
+		p5-Math-Base36>=0:math/p5-Math-Base36 \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+BUILD_DEPENDS+=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-Robot/Makefile b/www/p5-WWW-Robot/Makefile
index 66fadc87680c..932df1925635 100644
--- a/www/p5-WWW-Robot/Makefile
+++ b/www/p5-WWW-Robot/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	WWW::Robot - configurable web traversal engine
 
-BUILD_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset
+BUILD_DEPENDS=	p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-libwww>=0:www/p5-libwww \
+		p5-HTML-Tagset>=0:www/p5-HTML-Tagset
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-RobotRules-Parser/Makefile b/www/p5-WWW-RobotRules-Parser/Makefile
index 0e20b3bc71d3..dc861207c4f3 100644
--- a/www/p5-WWW-RobotRules-Parser/Makefile
+++ b/www/p5-WWW-RobotRules-Parser/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Just Parse robots.txt
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-RobotRules/Makefile b/www/p5-WWW-RobotRules/Makefile
index 8f53c13e2e4d..1f9f8aa41a19 100644
--- a/www/p5-WWW-RobotRules/Makefile
+++ b/www/p5-WWW-RobotRules/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Database of robots.txt-derived permissions
 
-BUILD_DEPENDS=	p5-URI>=1.10:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=1.10:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-libwww-5*
diff --git a/www/p5-WWW-Salesforce/Makefile b/www/p5-WWW-Salesforce/Makefile
index 05837a479952..7a51afd14791 100644
--- a/www/p5-WWW-Salesforce/Makefile
+++ b/www/p5-WWW-Salesforce/Makefile
@@ -13,11 +13,11 @@ COMMENT=        Simple abstraction layer between SOAP::Lite and Salesforce.com
 LICENSE=        ART10 GPLv1
 LICENSE_COMB=   dual
 
-BUILD_DEPENDS=	p5-SOAP-Lite>=0.68:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-Crypt-SSLeay>=0.56:${PORTSDIR}/security/p5-Crypt-SSLeay
+BUILD_DEPENDS=	p5-SOAP-Lite>=0.68:net/p5-SOAP-Lite \
+		p5-Crypt-SSLeay>=0.56:security/p5-Crypt-SSLeay
 RUN_DEPENDS:=   ${BUILD_DEPENDS}
-TEST_DEPENDS=   p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=   p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=        yes
 USES=           perl5
diff --git a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile
index 0a57a845adc1..9c722d03553e 100644
--- a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Search driver for the (US) Amazon online catalog
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-WWW-Mechanize>=1.60:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-WWW-Scraper-ISBN>=1:${PORTSDIR}/www/p5-WWW-Scraper-ISBN
+BUILD_DEPENDS=	p5-WWW-Mechanize>=1.60:www/p5-WWW-Mechanize \
+		p5-WWW-Scraper-ISBN>=1:www/p5-WWW-Scraper-ISBN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile b/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile
index c6a586bd4dbf..730c2c671390 100644
--- a/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Search driver for O'Reilly & Associates's online catalog
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-WWW-Scraper-ISBN>=1.00:${PORTSDIR}/www/p5-WWW-Scraper-ISBN
-RUN_DEPENDS=	p5-Template-Extract>=0:${PORTSDIR}/textproc/p5-Template-Extract \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-WWW-Scraper-ISBN>=1.00:${PORTSDIR}/www/p5-WWW-Scraper-ISBN
+BUILD_DEPENDS=	p5-WWW-Scraper-ISBN>=1.00:www/p5-WWW-Scraper-ISBN
+RUN_DEPENDS=	p5-Template-Extract>=0:textproc/p5-Template-Extract \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-WWW-Scraper-ISBN>=1.00:www/p5-WWW-Scraper-ISBN
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-Scraper-ISBN/Makefile b/www/p5-WWW-Scraper-ISBN/Makefile
index e0e00847fc82..be5daf1ef704 100644
--- a/www/p5-WWW-Scraper-ISBN/Makefile
+++ b/www/p5-WWW-Scraper-ISBN/Makefile
@@ -20,8 +20,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502000
-BUILD_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
-RUN_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS+=	p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-WWW-Scripter-Plugin-Ajax/Makefile b/www/p5-WWW-Scripter-Plugin-Ajax/Makefile
index 961687743697..aee2ff98a74d 100644
--- a/www/p5-WWW-Scripter-Plugin-Ajax/Makefile
+++ b/www/p5-WWW-Scripter-Plugin-Ajax/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	WWW::Scripter plugin that provides the XMLHttpRequest object
 
-RUN_DEPENDS=	p5-WWW-Scripter-Plugin-JavaScript>0:${PORTSDIR}/www/p5-WWW-Scripter-Plugin-JavaScript \
-		p5-XML-DOM-Lite>0:${PORTSDIR}/textproc/p5-XML-DOM-Lite
+RUN_DEPENDS=	p5-WWW-Scripter-Plugin-JavaScript>0:www/p5-WWW-Scripter-Plugin-JavaScript \
+		p5-XML-DOM-Lite>0:textproc/p5-XML-DOM-Lite
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Scripter-Plugin-JavaScript/Makefile b/www/p5-WWW-Scripter-Plugin-JavaScript/Makefile
index 07774a04805d..48b85fea3b98 100644
--- a/www/p5-WWW-Scripter-Plugin-JavaScript/Makefile
+++ b/www/p5-WWW-Scripter-Plugin-JavaScript/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	JavaScript plugin for WWW::Scripter
 
-RUN_DEPENDS=	p5-WWW-Scripter>0:${PORTSDIR}/www/p5-WWW-Scripter \
-		p5-JE>0:${PORTSDIR}/www/p5-JE
+RUN_DEPENDS=	p5-WWW-Scripter>0:www/p5-WWW-Scripter \
+		p5-JE>0:www/p5-JE
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Scripter/Makefile b/www/p5-WWW-Scripter/Makefile
index ace9613296f4..08f818be1064 100644
--- a/www/p5-WWW-Scripter/Makefile
+++ b/www/p5-WWW-Scripter/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Module for scripting web sites that have scripts
 
-RUN_DEPENDS=	p5-libwww>=5.829:${PORTSDIR}/www/p5-libwww \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-HTML-DOM>=0:${PORTSDIR}/www/p5-HTML-DOM \
-		p5-CSS-DOM>=0:${PORTSDIR}/www/p5-CSS-DOM
+RUN_DEPENDS=	p5-libwww>=5.829:www/p5-libwww \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-HTML-DOM>=0:www/p5-HTML-DOM \
+		p5-CSS-DOM>=0:www/p5-CSS-DOM
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Search-AltaVista/Makefile b/www/p5-WWW-Search-AltaVista/Makefile
index 67713115005f..3faf3ea18fd8 100644
--- a/www/p5-WWW-Search-AltaVista/Makefile
+++ b/www/p5-WWW-Search-AltaVista/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl WWW::Search class for searching AltaVista
 
-BUILD_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-WWW-Search>=0:${PORTSDIR}/www/p5-WWW-Search
+BUILD_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-WWW-Search>=0:www/p5-WWW-Search
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Search-Google/Makefile b/www/p5-WWW-Search-Google/Makefile
index 5567ca99cf42..ed47c624e869 100644
--- a/www/p5-WWW-Search-Google/Makefile
+++ b/www/p5-WWW-Search-Google/Makefile
@@ -13,9 +13,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl WWW::Search class for searching Google
 
-BUILD_DEPENDS=	p5-WWW-Search>=0:${PORTSDIR}/www/p5-WWW-Search \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-Net-Google>=0:${PORTSDIR}/net/p5-Net-Google
+BUILD_DEPENDS=	p5-WWW-Search>=0:www/p5-WWW-Search \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-Net-Google>=0:net/p5-Net-Google
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Search-MSN/Makefile b/www/p5-WWW-Search-MSN/Makefile
index ba8344fe0545..ac8310cd548f 100644
--- a/www/p5-WWW-Search-MSN/Makefile
+++ b/www/p5-WWW-Search-MSN/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Backend for searching search.msn.com
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-WWW-Search>=0:${PORTSDIR}/www/p5-WWW-Search
+BUILD_DEPENDS=	p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-WWW-Search>=0:www/p5-WWW-Search
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index 2164485c02a1..d1dea0355681 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Perl5 module for WWW searches
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-HTML-Parser>=2.23:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-User>=0:${PORTSDIR}/sysutils/p5-User \
-		p5-libwww>=2:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-HTML-Parser>=2.23:www/p5-HTML-Parser \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-URI>=0:net/p5-URI \
+		p5-User>=0:sysutils/p5-User \
+		p5-libwww>=2:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture \
-		p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Test-File>=0:${PORTSDIR}/devel/p5-Test-File \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-IO-Capture>=0:devel/p5-IO-Capture \
+		p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-Test-File>=0:devel/p5-Test-File \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-WWW-Shorten-0rz/Makefile b/www/p5-WWW-Shorten-0rz/Makefile
index edf7ee6b48c4..edf721ce5850 100644
--- a/www/p5-WWW-Shorten-0rz/Makefile
+++ b/www/p5-WWW-Shorten-0rz/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Shorten URL using 0rz.net
 
-BUILD_DEPENDS=	p5-WWW-Shorten>=0:${PORTSDIR}/www/p5-WWW-Shorten \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-WWW-Shorten>=0:www/p5-WWW-Shorten \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-Shorten-Bitly/Makefile b/www/p5-WWW-Shorten-Bitly/Makefile
index f374977b9b36..ac1aee80480c 100644
--- a/www/p5-WWW-Shorten-Bitly/Makefile
+++ b/www/p5-WWW-Shorten-Bitly/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Abstract interface to bit.ly, one of URL shortening sites
 
-BUILD_DEPENDS=	p5-JSON-Any>=1.18:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-WWW-Shorten>=1.9:${PORTSDIR}/www/p5-WWW-Shorten \
-		p5-XML-Simple>=2.18:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-JSON-Any>=1.18:converters/p5-JSON-Any \
+		p5-WWW-Shorten>=1.9:www/p5-WWW-Shorten \
+		p5-XML-Simple>=2.18:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Shorten-Googl/Makefile b/www/p5-WWW-Shorten-Googl/Makefile
index a0f033ad6068..860d744a0d17 100644
--- a/www/p5-WWW-Shorten-Googl/Makefile
+++ b/www/p5-WWW-Shorten-Googl/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	cowboyneal@gmail.com
 COMMENT=	Perl interface to goo.gl
 
-BUILD_DEPENDS=	p5-WWW-Shorten>=1.98:${PORTSDIR}/www/p5-WWW-Shorten \
-		p5-libwww>=5.75:${PORTSDIR}/www/p5-libwww \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any
+BUILD_DEPENDS=	p5-WWW-Shorten>=1.98:www/p5-WWW-Shorten \
+		p5-libwww>=5.75:www/p5-libwww \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-JSON-Any>=0:converters/p5-JSON-Any
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Shorten-KUSO/Makefile b/www/p5-WWW-Shorten-KUSO/Makefile
index c951b31c39d9..750f2b3850e1 100644
--- a/www/p5-WWW-Shorten-KUSO/Makefile
+++ b/www/p5-WWW-Shorten-KUSO/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Shorten URL using http://KUSO.CC/
 
-BUILD_DEPENDS=	p5-WWW-Shorten>=0:${PORTSDIR}/www/p5-WWW-Shorten
+BUILD_DEPENDS=	p5-WWW-Shorten>=0:www/p5-WWW-Shorten
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Shorten-Yourls/Makefile b/www/p5-WWW-Shorten-Yourls/Makefile
index 18de387f7659..a258675a3a38 100644
--- a/www/p5-WWW-Shorten-Yourls/Makefile
+++ b/www/p5-WWW-Shorten-Yourls/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	beastie@tardisi.com
 COMMENT=	Perl interface to www/yourls, Your Own URL Shortener
 
-BUILD_DEPENDS=	p5-JSON-Any>=1.18:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-WWW-Shorten>=1.9:${PORTSDIR}/www/p5-WWW-Shorten \
-		p5-XML-Simple>=2.18:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-JSON-Any>=1.18:converters/p5-JSON-Any \
+		p5-WWW-Shorten>=1.9:www/p5-WWW-Shorten \
+		p5-XML-Simple>=2.18:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Shorten-isgd/Makefile b/www/p5-WWW-Shorten-isgd/Makefile
index 134d7b26ac34..d6239e8091f8 100644
--- a/www/p5-WWW-Shorten-isgd/Makefile
+++ b/www/p5-WWW-Shorten-isgd/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Abstract interface to is.gd, one of URL shortening sites
 
-BUILD_DEPENDS=	p5-WWW-Shorten>=1.97:${PORTSDIR}/www/p5-WWW-Shorten
+BUILD_DEPENDS=	p5-WWW-Shorten>=1.97:www/p5-WWW-Shorten
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-SourceForge/Makefile b/www/p5-WWW-SourceForge/Makefile
index 91818dbd8cd9..1174519ac3e1 100644
--- a/www/p5-WWW-SourceForge/Makefile
+++ b/www/p5-WWW-SourceForge/Makefile
@@ -13,9 +13,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Retrieve information from SourceForge site
 
-BUILD_DEPENDS=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-HTML-TableExtract>=0:${PORTSDIR}/www/p5-HTML-TableExtract \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-Spinn3r/Makefile b/www/p5-WWW-Spinn3r/Makefile
index d7e799048deb..283a91316bb7 100644
--- a/www/p5-WWW-Spinn3r/Makefile
+++ b/www/p5-WWW-Spinn3r/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to the Spinn3r API
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
+TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-TV/Makefile b/www/p5-WWW-TV/Makefile
index f521e20368e4..ac2f51b45bb1 100644
--- a/www/p5-WWW-TV/Makefile
+++ b/www/p5-WWW-TV/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tolid@tolid.eu.org
 COMMENT=	Perl interface to the database of series/episodes at TV.com
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WWW-TWSMS/Makefile b/www/p5-WWW-TWSMS/Makefile
index 03bb07c01108..66bcede24f34 100644
--- a/www/p5-WWW-TWSMS/Makefile
+++ b/www/p5-WWW-TWSMS/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Perl interface for sending sms by TWSMS
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-TinySong/Makefile b/www/p5-WWW-TinySong/Makefile
index 75c17fbe0656..3bb1ae9331b0 100644
--- a/www/p5-WWW-TinySong/Makefile
+++ b/www/p5-WWW-TinySong/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Get free music links from tinysong.com
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-WWW-Tumblr/Makefile b/www/p5-WWW-Tumblr/Makefile
index 1d5ab41e7556..0abd73c634d6 100644
--- a/www/p5-WWW-Tumblr/Makefile
+++ b/www/p5-WWW-Tumblr/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl interface for the Tumblr API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-		p5-Net-OAuth>0:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>0:www/p5-HTTP-Message \
+		p5-JSON>0:converters/p5-JSON \
+		p5-Moose>0:devel/p5-Moose \
+		p5-Net-OAuth>0:net/p5-Net-OAuth \
+		p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-VenusEnvy/Makefile b/www/p5-WWW-VenusEnvy/Makefile
index 918c65af7bd1..84b0b24044be 100644
--- a/www/p5-WWW-VenusEnvy/Makefile
+++ b/www/p5-WWW-VenusEnvy/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	VenusEnvy comic strip archive and retrieval module
 
-BUILD_DEPENDS=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=5.805:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-WebArchive/Makefile b/www/p5-WWW-WebArchive/Makefile
index 4d32de399207..14416557241e 100644
--- a/www/p5-WWW-WebArchive/Makefile
+++ b/www/p5-WWW-WebArchive/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Retrieve old versions of public web pages from various web archives
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Options>=0:${PORTSDIR}/devel/p5-App-Options \
-		p5-App-Trace>=0:${PORTSDIR}/devel/p5-App-Trace \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS=	p5-App-Options>=0:devel/p5-App-Options \
+		p5-App-Trace>=0:devel/p5-App-Trace \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-WWW-Wikipedia/Makefile b/www/p5-WWW-Wikipedia/Makefile
index 3e9ddfdde2a2..5c5d1ed2d1c4 100644
--- a/www/p5-WWW-Wikipedia/Makefile
+++ b/www/p5-WWW-Wikipedia/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl module of Automated interface to the Wikipedia
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Text-Autoformat>=0:${PORTSDIR}/textproc/p5-Text-Autoformat \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Text-Autoformat>=0:textproc/p5-Text-Autoformat \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-WWW-Yandex-TIC/Makefile b/www/p5-WWW-Yandex-TIC/Makefile
index a891164f578f..df2002a6d56c 100644
--- a/www/p5-WWW-Yandex-TIC/Makefile
+++ b/www/p5-WWW-Yandex-TIC/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Query Yandex Thematic Index of Citing (TIC) for domain
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WWW-iTunesConnect/Makefile b/www/p5-WWW-iTunesConnect/Makefile
index 78a6759b7412..9e92f006aa9e 100644
--- a/www/p5-WWW-iTunesConnect/Makefile
+++ b/www/p5-WWW-iTunesConnect/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bfoz@bfoz.net
 COMMENT=	Client interface for Apple's iTunes Connect service
 
-BUILD_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-libwww>=5.829:${PORTSDIR}/www/p5-libwww \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-HTML-Form>=0:${PORTSDIR}/www/p5-HTML-Form
+BUILD_DEPENDS=	p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-libwww>=5.829:www/p5-libwww \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-HTML-Form>=0:www/p5-HTML-Form
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Web-Query/Makefile b/www/p5-Web-Query/Makefile
index 1ff884dbaa09..dac6446a7850 100644
--- a/www/p5-Web-Query/Makefile
+++ b/www/p5-Web-Query/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Yet another scraping library like jQuery
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Selector-XPath>=0.06:${PORTSDIR}/www/p5-HTML-Selector-XPath \
-		p5-HTML-TreeBuilder-LibXML>=0:${PORTSDIR}/www/p5-HTML-TreeBuilder-LibXML \
-		p5-HTML-TreeBuilder-XPath>=0:${PORTSDIR}/www/p5-HTML-TreeBuilder-XPath \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-Selector-XPath>=0.06:www/p5-HTML-Selector-XPath \
+		p5-HTML-TreeBuilder-LibXML>=0:www/p5-HTML-TreeBuilder-LibXML \
+		p5-HTML-TreeBuilder-XPath>=0:www/p5-HTML-TreeBuilder-XPath \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-Web-Scraper-Config/Makefile b/www/p5-Web-Scraper-Config/Makefile
index 1650619d1eb9..8138c5c91530 100644
--- a/www/p5-Web-Scraper-Config/Makefile
+++ b/www/p5-Web-Scraper-Config/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Run Web::Scraper From Config Files
 
-BUILD_DEPENDS=	p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Data-Visitor>=0:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Web-Scraper>=0:${PORTSDIR}/www/p5-Web-Scraper
-RUN_DEPENDS=	p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Data-Visitor>=0:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Web-Scraper>=0:${PORTSDIR}/www/p5-Web-Scraper
+BUILD_DEPENDS=	p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-Data-Visitor>=0:devel/p5-Data-Visitor \
+		p5-URI>=0:net/p5-URI \
+		p5-Web-Scraper>=0:www/p5-Web-Scraper
+RUN_DEPENDS=	p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-Data-Visitor>=0:devel/p5-Data-Visitor \
+		p5-URI>=0:net/p5-URI \
+		p5-Web-Scraper>=0:www/p5-Web-Scraper
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Web-Scraper/Makefile b/www/p5-Web-Scraper/Makefile
index 12ab13f604d8..344ba2c35dcc 100644
--- a/www/p5-Web-Scraper/Makefile
+++ b/www/p5-Web-Scraper/Makefile
@@ -14,20 +14,20 @@ COMMENT=	Web Scraping Toolkit inspired by Scrapi
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Selector-XPath>=0.03:${PORTSDIR}/www/p5-HTML-Selector-XPath \
-		p5-HTML-Tagset>0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-HTML-TreeBuilder-LibXML>=0.04:${PORTSDIR}/www/p5-HTML-TreeBuilder-LibXML \
-		p5-HTML-TreeBuilder-XPath>=0.08:${PORTSDIR}/www/p5-HTML-TreeBuilder-XPath \
-		p5-HTML-Tree>=3.23:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-XML-XPathEngine>=0.08:${PORTSDIR}/textproc/p5-XML-XPathEngine \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=5.827:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>0:www/p5-HTML-Parser \
+		p5-HTML-Selector-XPath>=0.03:www/p5-HTML-Selector-XPath \
+		p5-HTML-Tagset>0:www/p5-HTML-Tagset \
+		p5-HTML-TreeBuilder-LibXML>=0.04:www/p5-HTML-TreeBuilder-LibXML \
+		p5-HTML-TreeBuilder-XPath>=0.08:www/p5-HTML-TreeBuilder-XPath \
+		p5-HTML-Tree>=3.23:www/p5-HTML-Tree \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+		p5-URI>0:net/p5-URI \
+		p5-XML-XPathEngine>=0.08:textproc/p5-XML-XPathEngine \
+		p5-YAML>0:textproc/p5-YAML \
+		p5-libwww>=5.827:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Base>=0:devel/p5-Test-Base \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5 shebangfix
 USE_PERL5=	modbuildtiny
diff --git a/www/p5-Web-oEmbed/Makefile b/www/p5-Web-oEmbed/Makefile
index 13a102780d7f..160f2909704d 100644
--- a/www/p5-Web-oEmbed/Makefile
+++ b/www/p5-Web-oEmbed/Makefile
@@ -14,11 +14,11 @@ COMMENT=	oEmbed consumer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-XML-LibXML-Simple>=0:${PORTSDIR}/textproc/p5-XML-LibXML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-XML-LibXML-Simple>=0:textproc/p5-XML-LibXML-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/www/p5-WebDAO/Makefile b/www/p5-WebDAO/Makefile
index e2d498cb1c3c..572704a3cb30 100644
--- a/www/p5-WebDAO/Makefile
+++ b/www/p5-WebDAO/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Platform for easy creation of web applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.37:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-HTTP>=0.37:${PORTSDIR}/devel/p5-DateTime-Format-HTTP \
-		p5-FCGI>=0.67:${PORTSDIR}/www/p5-FCGI \
-		p5-HTTP-Body>=1.11:${PORTSDIR}/www/p5-HTTP-Body \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-XML-Flow>=0.86:${PORTSDIR}/textproc/p5-XML-Flow
+BUILD_DEPENDS=	p5-DateTime>=0.37:devel/p5-DateTime \
+		p5-DateTime-Format-HTTP>=0.37:devel/p5-DateTime-Format-HTTP \
+		p5-FCGI>=0.67:www/p5-FCGI \
+		p5-HTTP-Body>=1.11:www/p5-HTTP-Body \
+		p5-URI>=1.36:net/p5-URI \
+		p5-XML-Flow>=0.86:textproc/p5-XML-Flow
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class
+TEST_DEPENDS=	p5-Test-Class>=0:devel/p5-Test-Class
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-WebDriver-Tiny/Makefile b/www/p5-WebDriver-Tiny/Makefile
index 1458aeb1a113..2872c2c00e0e 100644
--- a/www/p5-WebDriver-Tiny/Makefile
+++ b/www/p5-WebDriver-Tiny/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Selenium 2.0 bindings for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/www/p5-WebService-Basecamp/Makefile b/www/p5-WebService-Basecamp/Makefile
index e5fdb8fb298b..471ed2889c87 100644
--- a/www/p5-WebService-Basecamp/Makefile
+++ b/www/p5-WebService-Basecamp/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl interface to the Basecamp API webservice
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-Bloglines/Makefile b/www/p5-WebService-Bloglines/Makefile
index 36def79324ad..5a1b323df550 100644
--- a/www/p5-WebService-Bloglines/Makefile
+++ b/www/p5-WebService-Bloglines/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy-to-use Interface for Bloglines Web Services
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS \
-		p5-XML-RSS-LibXML>=0:${PORTSDIR}/textproc/p5-XML-RSS-LibXML \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-RSS>=0:textproc/p5-XML-RSS \
+		p5-XML-RSS-LibXML>=0:textproc/p5-XML-RSS-LibXML \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-BuzzurlAPI/Makefile b/www/p5-WebService-BuzzurlAPI/Makefile
index 11befd2dcf76..5ba5f52f1637 100644
--- a/www/p5-WebService-BuzzurlAPI/Makefile
+++ b/www/p5-WebService-BuzzurlAPI/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Buzzurl WebService API
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.25:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-YAML-Syck>=0.21:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Readonly>=1.01:${PORTSDIR}/devel/p5-Readonly \
-		p5-UNIVERSAL-require>=0.10:${PORTSDIR}/devel/p5-UNIVERSAL-require
-RUN_DEPENDS=	p5-Class-Accessor>=0.25:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-YAML-Syck>=0.21:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Readonly>=1.01:${PORTSDIR}/devel/p5-Readonly \
-		p5-UNIVERSAL-require>=0.10:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Class-Accessor>=0.25:devel/p5-Class-Accessor \
+		p5-YAML-Syck>=0.21:textproc/p5-YAML-Syck \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Readonly>=1.01:devel/p5-Readonly \
+		p5-UNIVERSAL-require>=0.10:devel/p5-UNIVERSAL-require
+RUN_DEPENDS=	p5-Class-Accessor>=0.25:devel/p5-Class-Accessor \
+		p5-YAML-Syck>=0.21:textproc/p5-YAML-Syck \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Readonly>=1.01:devel/p5-Readonly \
+		p5-UNIVERSAL-require>=0.10:devel/p5-UNIVERSAL-require
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WebService-CIA/Makefile b/www/p5-WebService-CIA/Makefile
index a52a7383e14c..ebc865e385d2 100644
--- a/www/p5-WebService-CIA/Makefile
+++ b/www/p5-WebService-CIA/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Information from the CIA World Factbook
 
-RUN_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
+RUN_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-libwww>=0:www/p5-libwww \
+		p5-MLDBM>=0:databases/p5-MLDBM
 BUILD_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-GData/Makefile b/www/p5-WebService-GData/Makefile
index 12965e099451..3d363ed433ba 100644
--- a/www/p5-WebService-GData/Makefile
+++ b/www/p5-WebService-GData/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Google data protocol v2 base object to inherit from
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2.0:converters/p5-JSON \
+		p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Mock-LWP>=0.05:${PORTSDIR}/devel/p5-Test-Mock-LWP
+TEST_DEPENDS=	p5-Test-Mock-LWP>=0.05:devel/p5-Test-Mock-LWP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WebService-Google-Reader/Makefile b/www/p5-WebService-Google-Reader/Makefile
index 876464becc68..66c28ed61ae8 100644
--- a/www/p5-WebService-Google-Reader/Makefile
+++ b/www/p5-WebService-Google-Reader/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Perl interface to Google Reader
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=6.02:${PORTSDIR}/www/p5-libwww \
-		p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-HTTP-Message>=6:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-HTTP-Date>=6:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Crypt-SSLeay>0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-XML-Atom>0:${PORTSDIR}/textproc/p5-XML-Atom \
-		p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-JSON-XS>=2:converters/p5-JSON-XS \
+		p5-URI>=1.36:net/p5-URI \
+		p5-libwww>=6.02:www/p5-libwww \
+		p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
+		p5-HTTP-Message>=6:www/p5-HTTP-Message \
+		p5-HTTP-Date>=6:www/p5-HTTP-Date \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Crypt-SSLeay>0:security/p5-Crypt-SSLeay \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-XML-Atom>0:textproc/p5-XML-Atom \
+		p5-XML-LibXML>0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-Google-Sets/Makefile b/www/p5-WebService-Google-Sets/Makefile
index 23ed14b5f78e..0443e61dafa2 100644
--- a/www/p5-WebService-Google-Sets/Makefile
+++ b/www/p5-WebService-Google-Sets/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl access to Google Labs Sets site
 
-BUILD_DEPENDS=	p5-libwww>0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-IMDB/Makefile b/www/p5-WebService-IMDB/Makefile
index 9d87d47e0bdf..18194a1ec8ba 100644
--- a/www/p5-WebService-IMDB/Makefile
+++ b/www/p5-WebService-IMDB/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Perl interface to IMDb
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime-Incomplete>=0:${PORTSDIR}/devel/p5-DateTime-Incomplete \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime-Incomplete>=0:devel/p5-DateTime-Incomplete \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-ISBNDB/Makefile b/www/p5-WebService-ISBNDB/Makefile
index bc9faf39b7e7..14c63ecfdd66 100644
--- a/www/p5-WebService-ISBNDB/Makefile
+++ b/www/p5-WebService-ISBNDB/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to access isbndb.com
 
-BUILD_DEPENDS=	p5-Business-ISBN>=1.80:${PORTSDIR}/misc/p5-Business-ISBN \
-		p5-Class-Std>=0.0.8:${PORTSDIR}/devel/p5-Class-Std \
-		p5-Error>=0.17:${PORTSDIR}/lang/p5-Error \
-		p5-libwww>=5.801:${PORTSDIR}/www/p5-libwww \
-		p5-XML-LibXML>=1.58:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-TimeDate>=1.16:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-Business-ISBN>=1.80:misc/p5-Business-ISBN \
+		p5-Class-Std>=0.0.8:devel/p5-Class-Std \
+		p5-Error>=0.17:lang/p5-Error \
+		p5-libwww>=5.801:www/p5-libwww \
+		p5-XML-LibXML>=1.58:textproc/p5-XML-LibXML \
+		p5-TimeDate>=1.16:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-Linode/Makefile b/www/p5-WebService-Linode/Makefile
index a755f9e03513..af1c8d73ceef 100644
--- a/www/p5-WebService-Linode/Makefile
+++ b/www/p5-WebService-Linode/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl Interface to the Linode.com API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Mozilla-CA>=0:${PORTSDIR}/www/p5-Mozilla-CA \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/www/p5-WebService-MoviePosterDB/Makefile b/www/p5-WebService-MoviePosterDB/Makefile
index 0fd565f28a04..3f54f8ef1e89 100644
--- a/www/p5-WebService-MoviePosterDB/Makefile
+++ b/www/p5-WebService-MoviePosterDB/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl interface to MoviePosterDB
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-MusicBrainz/Makefile b/www/p5-WebService-MusicBrainz/Makefile
index 7609bec430b0..b90c2fc4216b 100644
--- a/www/p5-WebService-MusicBrainz/Makefile
+++ b/www/p5-WebService-MusicBrainz/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl interface to MusicBrainz
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-NoPaste/Makefile b/www/p5-WebService-NoPaste/Makefile
index 5f750d89cba7..b5969e1a0b3b 100644
--- a/www/p5-WebService-NoPaste/Makefile
+++ b/www/p5-WebService-NoPaste/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Pastebin web application to upload snippets of text
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-IO-All>=0:devel/p5-IO-All \
+		p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	X11
@@ -28,7 +28,7 @@ USES=		perl5 shebangfix
 
 SHEBANG_FILES=	nopaste
 
-X11_BUILD_DEPENDS=	p5-Clipboard>=0:${PORTSDIR}/x11/p5-Clipboard
+X11_BUILD_DEPENDS=	p5-Clipboard>=0:x11/p5-Clipboard
 X11_EXTRA_PATCHES_OFF=	${FILESDIR}/extrapatch-lib-WebService-NoPaste.pm
 
 post-patch:
diff --git a/www/p5-WebService-Pushover/Makefile b/www/p5-WebService-Pushover/Makefile
index b025e25c790d..6a69599a2f0e 100644
--- a/www/p5-WebService-Pushover/Makefile
+++ b/www/p5-WebService-Pushover/Makefile
@@ -14,20 +14,20 @@ COMMENT=	Interface to Pushover API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WebService-Simple>=0:${PORTSDIR}/www/p5-WebService-Simple
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-URI>=0:net/p5-URI \
+		p5-WebService-Simple>=0:www/p5-WebService-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-Module-Build-Pluggable>=0.10:${PORTSDIR}/devel/p5-Module-Build-Pluggable \
-		p5-Module-Build-Pluggable-ReadmeMarkdownFromPod>=0.04:${PORTSDIR}/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod
-TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Pod-Markdown>=0:${PORTSDIR}/textproc/p5-Pod-Markdown \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fake-HTTPD>=0:${PORTSDIR}/devel/p5-Test-Fake-HTTPD
+BUILD_DEPENDS+=	p5-Module-Build-Pluggable>=0.10:devel/p5-Module-Build-Pluggable \
+		p5-Module-Build-Pluggable-ReadmeMarkdownFromPod>=0.04:devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod
+TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-Pod-Markdown>=0:textproc/p5-Pod-Markdown \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fake-HTTPD>=0:devel/p5-Test-Fake-HTTPD
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-WebService-Rakuten/Makefile b/www/p5-WebService-Rakuten/Makefile
index 6c88ac7a8e2a..751b728cc6c1 100644
--- a/www/p5-WebService-Rakuten/Makefile
+++ b/www/p5-WebService-Rakuten/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Rakuten WebService API
 
-BUILD_DEPENDS=	ja-p5-Unicode-Japanese>=0:${PORTSDIR}/japanese/p5-Unicode-Japanese \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	ja-p5-Unicode-Japanese>=0:japanese/p5-Unicode-Japanese \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS+=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-WebService-Redmine/Makefile b/www/p5-WebService-Redmine/Makefile
index 60f516f2c605..a9a383a63935 100644
--- a/www/p5-WebService-Redmine/Makefile
+++ b/www/p5-WebService-Redmine/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to Redmine
 
-RUN_DEPENDS=	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-JSON-XS>0:${PORTSDIR}/converters/p5-JSON-XS
+RUN_DEPENDS=	p5-libwww>0:www/p5-libwww \
+		p5-JSON-XS>0:converters/p5-JSON-XS
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WebService-Simple/Makefile b/www/p5-WebService-Simple/Makefile
index 6270de6294af..c5877fb7a073 100644
--- a/www/p5-WebService-Simple/Makefile
+++ b/www/p5-WebService-Simple/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Simple Interface To Web Services APIs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-ConfigHash>=0:${PORTSDIR}/devel/p5-Class-Data-ConfigHash \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Hash-MultiValue>=0:${PORTSDIR}/devel/p5-Hash-MultiValue \
-		p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-ConfigHash>=0:devel/p5-Class-Data-ConfigHash \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-Hash-MultiValue>=0:devel/p5-Hash-MultiValue \
+		p5-JSON>=2.0:converters/p5-JSON \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-URI>=1.36:net/p5-URI \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-XML-Feed>=0:${PORTSDIR}/textproc/p5-XML-Feed \
-		p5-XML-Parser-Lite-Tree>=0:${PORTSDIR}/textproc/p5-XML-Parser-Lite-Tree
+TEST_DEPENDS=	p5-XML-Feed>=0:textproc/p5-XML-Feed \
+		p5-XML-Parser-Lite-Tree>=0:textproc/p5-XML-Parser-Lite-Tree
 
 USE_PERL5=	modbuildtiny
 USES=		perl5
diff --git a/www/p5-WebService-Technorati/Makefile b/www/p5-WebService-Technorati/Makefile
index 857b9dfb8003..27a8b257e5a8 100644
--- a/www/p5-WebService-Technorati/Makefile
+++ b/www/p5-WebService-Technorati/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the Technorati web services interface
 
-BUILD_DEPENDS=	p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-XML-XPath>=0:textproc/p5-XML-XPath \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/www/p5-WebService-YouTube/Makefile b/www/p5-WebService-YouTube/Makefile
index b159f7b14a31..d6b6a6783009 100644
--- a/www/p5-WebService-YouTube/Makefile
+++ b/www/p5-WebService-YouTube/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl interface to YouTube
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-libwww>0:www/p5-libwww \
+		p5-URI>0:net/p5-URI \
+		p5-XML-Simple>0:textproc/p5-XML-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-WordPress-XMLRPC/Makefile b/www/p5-WordPress-XMLRPC/Makefile
index d3933842374e..d6bd8ac192fc 100644
--- a/www/p5-WordPress-XMLRPC/Makefile
+++ b/www/p5-WordPress-XMLRPC/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl 5 API to WordPress XML-RPC services
 
-BUILD_DEPENDS=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Yahoo-Lifestyle/Makefile b/www/p5-Yahoo-Lifestyle/Makefile
index 4c95153b2adf..27b530040e69 100644
--- a/www/p5-Yahoo-Lifestyle/Makefile
+++ b/www/p5-Yahoo-Lifestyle/Makefile
@@ -12,10 +12,10 @@ MAINTAINER=	hcchien@hcchien.org
 COMMENT=	Simple interface for Yahoo! Taiwan Lifestyle open APIs
 
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	p5-Yahoo-BBAuth>=0:${PORTSDIR}/security/p5-Yahoo-BBAuth \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+		p5-Test-Simple>=0:devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Yahoo-BBAuth>=0:security/p5-Yahoo-BBAuth \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Yahoo-Search/Makefile b/www/p5-Yahoo-Search/Makefile
index 24a4bb541c37..3d1ea0dcfaa2 100644
--- a/www/p5-Yahoo-Search/Makefile
+++ b/www/p5-Yahoo-Search/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl interface to the Yahoo Search public API
 
-BUILD_DEPENDS=	p5-URI>=1.54:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=5.835:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>=1.54:net/p5-URI \
+		p5-libwww>=5.835:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-ZConf-RSS-GUI-GTK/Makefile b/www/p5-ZConf-RSS-GUI-GTK/Makefile
index bc3e0be251f4..3e0193adae32 100644
--- a/www/p5-ZConf-RSS-GUI-GTK/Makefile
+++ b/www/p5-ZConf-RSS-GUI-GTK/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Provides a GTK backend for ZConf::RSS::GUI
 
-RUN_DEPENDS=	p5-ZConf-RSS>=0:${PORTSDIR}/www/p5-ZConf-RSS \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-ZConf-RSS>=0:www/p5-ZConf-RSS \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-ZConf-RSS/Makefile b/www/p5-ZConf-RSS/Makefile
index ab02c6311025..8bcfe592e41b 100644
--- a/www/p5-ZConf-RSS/Makefile
+++ b/www/p5-ZConf-RSS/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	ZConf backed RSS fetching and viewing
 
-BUILD_DEPENDS=	p5-ZConf>=0:${PORTSDIR}/net/p5-ZConf \
-		p5-ZConf-GUI>=0:${PORTSDIR}/devel/p5-ZConf-GUI \
-		p5-XML-FeedPP>=0:${PORTSDIR}/textproc/p5-XML-FeedPP \
-		p5-Text-NeatTemplate>=0:${PORTSDIR}/textproc/p5-Text-NeatTemplate \
-		p5-HTML-FormatText-WithLinks>=0:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks
+BUILD_DEPENDS=	p5-ZConf>=0:net/p5-ZConf \
+		p5-ZConf-GUI>=0:devel/p5-ZConf-GUI \
+		p5-XML-FeedPP>=0:textproc/p5-XML-FeedPP \
+		p5-Text-NeatTemplate>=0:textproc/p5-Text-NeatTemplate \
+		p5-HTML-FormatText-WithLinks>=0:textproc/p5-HTML-FormatText-WithLinks
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/www/p5-chklinks/Makefile b/www/p5-chklinks/Makefile
index d641e9fa4d52..9fd0e33c9161 100644
--- a/www/p5-chklinks/Makefile
+++ b/www/p5-chklinks/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Non-threaded Perl link checker
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-jQuery-File-Upload/Makefile b/www/p5-jQuery-File-Upload/Makefile
index c860fad38ac0..06df3b6af8bc 100644
--- a/www/p5-jQuery-File-Upload/Makefile
+++ b/www/p5-jQuery-File-Upload/Makefile
@@ -11,12 +11,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for jQuery File Upload plugin
 
 RUN_DEPENDS=	\
-	convert:${PORTSDIR}/graphics/ImageMagick \
-	p5-Data-GUID>0:${PORTSDIR}/devel/p5-Data-GUID \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-	p5-JSON-XS>0:${PORTSDIR}/converters/p5-JSON-XS \
-	p5-Net-SSH2>0:${PORTSDIR}/net/p5-Net-SSH2 \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	convert:graphics/ImageMagick \
+	p5-Data-GUID>0:devel/p5-Data-GUID \
+	p5-JSON>0:converters/p5-JSON \
+	p5-JSON-XS>0:converters/p5-JSON-XS \
+	p5-Net-SSH2>0:net/p5-Net-SSH2 \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index d2457190374d..8a421b30de86 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -24,14 +24,14 @@ CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} \
 
 MAKE_ENV+=     MAKE=${GMAKE} ## MakeMaker blows it without this
 
-BUILD_DEPENDS=	libapreq2>0:${PORTSDIR}/www/libapreq2 \
-		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-ExtUtils-XSBuilder>=0:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
-
-RUN_DEPENDS=	libapreq2>0:${PORTSDIR}/www/libapreq2 \
-		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	libapreq2>0:www/libapreq2 \
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+		p5-ExtUtils-XSBuilder>=0:devel/p5-ExtUtils-XSBuilder \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
+
+RUN_DEPENDS=	libapreq2>0:www/libapreq2 \
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \
diff --git a/www/p5-libservlet/Makefile b/www/p5-libservlet/Makefile
index 92fb69214b33..451b7acab4b0 100644
--- a/www/p5-libservlet/Makefile
+++ b/www/p5-libservlet/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Servlet API for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS=	p5-Exception-Class>=0:devel/p5-Exception-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index bcf163be57b2..29a44b5c07df 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -14,19 +14,19 @@ COMMENT=	Perl5 library for WWW access
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Authen-NTLM>=1.02:${PORTSDIR}/security/p5-Authen-NTLM \
-		p5-Encode-Locale>=0:${PORTSDIR}/converters/p5-Encode-Locale \
-		p5-File-Listing>=6:${PORTSDIR}/sysutils/p5-File-Listing \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Cookies>=6:${PORTSDIR}/www/p5-HTTP-Cookies \
-		p5-HTTP-Daemon>=6:${PORTSDIR}/www/p5-HTTP-Daemon \
-		p5-HTTP-Date>=6:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-HTTP-Message>=6:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-HTTP-Negotiate>=6:${PORTSDIR}/www/p5-HTTP-Negotiate \
-		p5-LWP-MediaTypes>=6:${PORTSDIR}/www/p5-LWP-MediaTypes \
-		p5-Net-HTTP>=6.07:${PORTSDIR}/net/p5-Net-HTTP \
-		p5-URI>=1.10:${PORTSDIR}/net/p5-URI \
-		p5-WWW-RobotRules>=6:${PORTSDIR}/www/p5-WWW-RobotRules
+BUILD_DEPENDS=	p5-Authen-NTLM>=1.02:security/p5-Authen-NTLM \
+		p5-Encode-Locale>=0:converters/p5-Encode-Locale \
+		p5-File-Listing>=6:sysutils/p5-File-Listing \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTTP-Cookies>=6:www/p5-HTTP-Cookies \
+		p5-HTTP-Daemon>=6:www/p5-HTTP-Daemon \
+		p5-HTTP-Date>=6:www/p5-HTTP-Date \
+		p5-HTTP-Message>=6:www/p5-HTTP-Message \
+		p5-HTTP-Negotiate>=6:www/p5-HTTP-Negotiate \
+		p5-LWP-MediaTypes>=6:www/p5-LWP-MediaTypes \
+		p5-Net-HTTP>=6.07:net/p5-Net-HTTP \
+		p5-URI>=1.10:net/p5-URI \
+		p5-WWW-RobotRules>=6:www/p5-WWW-RobotRules
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	HTTPS
@@ -35,7 +35,7 @@ CONFIGURE_ARGS=	--aliases
 USE_PERL5=	configure
 USES=		perl5
 
-HTTPS_BUILD_DEPENDS=	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https
-HTTPS_RUN_DEPENDS=	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https
+HTTPS_BUILD_DEPENDS=	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
+HTTPS_RUN_DEPENDS=	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
 
 .include <bsd.port.mk>
diff --git a/www/p5-pQuery/Makefile b/www/p5-pQuery/Makefile
index 8339fc2ccbc5..ba3b185b16f3 100644
--- a/www/p5-pQuery/Makefile
+++ b/www/p5-pQuery/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv1=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree	
+BUILD_DEPENDS=	p5-HTML-Tree>=0:www/p5-HTML-Tree	
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-webservice-validator-css-w3c/Makefile b/www/p5-webservice-validator-css-w3c/Makefile
index 6f2b2d4feaf2..d4e990d047a1 100644
--- a/www/p5-webservice-validator-css-w3c/Makefile
+++ b/www/p5-webservice-validator-css-w3c/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	toni.viemero@iki.fi
 COMMENT=	Experimental interface to the W3C CSS Validation online service
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-webservice-validator-html-w3c/Makefile b/www/p5-webservice-validator-html-w3c/Makefile
index 91137345a784..d8a08d10e4d4 100644
--- a/www/p5-webservice-validator-html-w3c/Makefile
+++ b/www/p5-webservice-validator-html-w3c/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	toni.viemero@iki.fi
 COMMENT=	Access to the W3Cs online HTML validator
 
-RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/www/pear-HTTP_Client/Makefile b/www/pear-HTTP_Client/Makefile
index cc7524784eae..9496053f7d05 100644
--- a/www/pear-HTTP_Client/Makefile
+++ b/www/pear-HTTP_Client/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	www pear
 MAINTAINER=	joseph@randomnetworks.com
 COMMENT=	PEAR classes for high level HTTP requests
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP \
-		${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP \
-		${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
 
 USES=	pear
 
diff --git a/www/pear-HTTP_Download/Makefile b/www/pear-HTTP_Download/Makefile
index 283fad3ac919..596ef316d030 100644
--- a/www/pear-HTTP_Download/Makefile
+++ b/www/pear-HTTP_Download/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class to send HTTP downloads
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Header.php:${PORTSDIR}/www/pear-HTTP_Header
-RUN_DEPENDS=	${PEARDIR}/HTTP/Header.php:${PORTSDIR}/www/pear-HTTP_Header
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header
+RUN_DEPENDS=	${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header
 
 USES=	pear
 
diff --git a/www/pear-HTTP_FloodControl/Makefile b/www/pear-HTTP_FloodControl/Makefile
index 01e3a2ef4222..be7fb9f1707b 100644
--- a/www/pear-HTTP_FloodControl/Makefile
+++ b/www/pear-HTTP_FloodControl/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR classes to detect and protect from attempts to flood a site
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP
-RUN_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP
+BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP
+RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP
 
 DOCS=		README LICENSE
 OPTIONS_DEFINE=	PEAR_DB PEAR_MDB PEAR_MDB2
@@ -19,9 +19,9 @@ PEAR_MDB2_DESC=	PEAR::MDB2 support
 
 USES=	pear
 
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
 
 post-extract:
 	${MKDIR} ${WRKSRC}/docs
diff --git a/www/pear-HTTP_Header/Makefile b/www/pear-HTTP_Header/Makefile
index 1c7451b84e8f..bc1a8b6e02ee 100644
--- a/www/pear-HTTP_Header/Makefile
+++ b/www/pear-HTTP_Header/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR OO interface to modify and handle HTTP headers and status codes
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP
-RUN_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP
+BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP
+RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP
 
 USES=	pear
 
diff --git a/www/pear-HTTP_Request/Makefile b/www/pear-HTTP_Request/Makefile
index dae6dafb7993..bf97a44af145 100644
--- a/www/pear-HTTP_Request/Makefile
+++ b/www/pear-HTTP_Request/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR classes providing an easy way to perform HTTP requests
 
-BUILD_DEPENDS=	${PEARDIR}/Net/URL.php:${PORTSDIR}/net/pear-Net_URL		\
-		${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/URL.php:${PORTSDIR}/net/pear-Net_URL		\
-		${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/URL.php:net/pear-Net_URL		\
+		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+RUN_DEPENDS=	${PEARDIR}/Net/URL.php:net/pear-Net_URL		\
+		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
 
 USES=	pear
 
diff --git a/www/pear-HTTP_Request2/Makefile b/www/pear-HTTP_Request2/Makefile
index 7fe732e24672..fffa258365dd 100644
--- a/www/pear-HTTP_Request2/Makefile
+++ b/www/pear-HTTP_Request2/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR classes providing an easy way to perform HTTP requests
 
-BUILD_DEPENDS=	${PEARDIR}/Net/URL2.php:${PORTSDIR}/net/pear-Net_URL2
-RUN_DEPENDS=	${PEARDIR}/Net/URL2.php:${PORTSDIR}/net/pear-Net_URL2
+BUILD_DEPENDS=	${PEARDIR}/Net/URL2.php:net/pear-Net_URL2
+RUN_DEPENDS=	${PEARDIR}/Net/URL2.php:net/pear-Net_URL2
 
 OPTIONS_DEFINE=	CURL FILEINFO ZLIB
 CURL_DESC=	PHP CURL extension support
diff --git a/www/pear-HTTP_Server/Makefile b/www/pear-HTTP_Server/Makefile
index 2c20b33152ca..7eb391669d90 100644
--- a/www/pear-HTTP_Server/Makefile
+++ b/www/pear-HTTP_Server/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	www devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	HTTP server class
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP \
-		${PEARDIR}/Net/Server.php:${PORTSDIR}/net/pear-Net_Server
-RUN_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP \
-		${PEARDIR}/Net/Server.php:${PORTSDIR}/net/pear-Net_Server
+BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP \
+		${PEARDIR}/Net/Server.php:net/pear-Net_Server
+RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP \
+		${PEARDIR}/Net/Server.php:net/pear-Net_Server
 
 USES=	pear
 
diff --git a/www/pear-HTTP_WebDAV_Client/Makefile b/www/pear-HTTP_WebDAV_Client/Makefile
index c862994c05ce..ce169314f4ba 100644
--- a/www/pear-HTTP_WebDAV_Client/Makefile
+++ b/www/pear-HTTP_WebDAV_Client/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	WebDAV Stream Wrapper Class
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-RUN_DEPENDS:=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+RUN_DEPENDS:=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
 
 USES=	pear
 
diff --git a/www/pear-Services_Amazon/Makefile b/www/pear-Services_Amazon/Makefile
index 4112736f24b5..32f23388f3a6 100644
--- a/www/pear-Services_Amazon/Makefile
+++ b/www/pear-Services_Amazon/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP interface to Amazon Product Advertising API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 USES=	pear
 
diff --git a/www/pear-Services_Amazon_S3/Makefile b/www/pear-Services_Amazon_S3/Makefile
index 0989c8218fc7..e62a88737aa7 100644
--- a/www/pear-Services_Amazon_S3/Makefile
+++ b/www/pear-Services_Amazon_S3/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP API for Amazon S3 (Simple Storage Service)
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2 \
-		${PEARDIR}/Crypt/HMAC2.php:${PORTSDIR}/security/pear-Crypt_HMAC2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2 \
-		${PEARDIR}/Crypt/HMAC2.php:${PORTSDIR}/security/pear-Crypt_HMAC2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 \
+		${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 \
+		${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2
 
 USE_PHP=	spl
 USES=	pear
diff --git a/www/pear-Services_Blogging/Makefile b/www/pear-Services_Blogging/Makefile
index afef1e149c9f..3b7227e604b4 100644
--- a/www/pear-Services_Blogging/Makefile
+++ b/www/pear-Services_Blogging/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP interface to Blog
 
-BUILD_DEPENDS=	${PEARDIR}/XML/RPC.php:${PORTSDIR}/net/pear-XML_RPC
-RUN_DEPENDS=	${PEARDIR}/XML/RPC.php:${PORTSDIR}/net/pear-XML_RPC
+BUILD_DEPENDS=	${PEARDIR}/XML/RPC.php:net/pear-XML_RPC
+RUN_DEPENDS=	${PEARDIR}/XML/RPC.php:net/pear-XML_RPC
 
 USES=	pear
 
diff --git a/www/pear-Services_Compete/Makefile b/www/pear-Services_Compete/Makefile
index 6dd78fbc8270..47ab5fdb1540 100644
--- a/www/pear-Services_Compete/Makefile
+++ b/www/pear-Services_Compete/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP interface to Compete SnapShop API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
 
 USES=	pear
 
diff --git a/www/pear-Services_Delicious/Makefile b/www/pear-Services_Delicious/Makefile
index 92b8bb4514a1..d25a22f08716 100644
--- a/www/pear-Services_Delicious/Makefile
+++ b/www/pear-Services_Delicious/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Client for the del.icio.us web service
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer \
-		${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer \
-		${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
 
 USES=		dos2unix pear
 USE_PHP=	openssl
diff --git a/www/pear-Services_Facebook/Makefile b/www/pear-Services_Facebook/Makefile
index 542f0bd9a203..2d3d129f0d92 100644
--- a/www/pear-Services_Facebook/Makefile
+++ b/www/pear-Services_Facebook/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP interface to Facebook's API
 
-BUILD_DEPENDS=	${PEARDIR}/Validate.php:${PORTSDIR}/devel/pear-Validate
-RUN_DEPENDS=	${PEARDIR}/Validate.php:${PORTSDIR}/devel/pear-Validate
+BUILD_DEPENDS=	${PEARDIR}/Validate.php:devel/pear-Validate
+RUN_DEPENDS=	${PEARDIR}/Validate.php:devel/pear-Validate
 
 USES=	pear
 USE_PHP=	curl
diff --git a/www/pear-Services_GeoNames/Makefile b/www/pear-Services_GeoNames/Makefile
index a7523d48bbcb..440f18952a3d 100644
--- a/www/pear-Services_GeoNames/Makefile
+++ b/www/pear-Services_GeoNames/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP5 Interface to the GeoNames Public API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
 
 USES=	pear
 
diff --git a/www/pear-Services_OpenSearch/Makefile b/www/pear-Services_OpenSearch/Makefile
index 3ba8a4beafd1..7ee3b7121e57 100644
--- a/www/pear-Services_OpenSearch/Makefile
+++ b/www/pear-Services_OpenSearch/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Search A9 OpenSearch compatible engines
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer \
-		${PEARDIR}/XML/RSS.php:${PORTSDIR}/devel/pear-XML_RSS
+BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer \
+		${PEARDIR}/XML/RSS.php:devel/pear-XML_RSS
 
 USES=	pear
 
diff --git a/www/pear-Services_SharedBook/Makefile b/www/pear-Services_SharedBook/Makefile
index ef34658c3bc1..712671bb9219 100644
--- a/www/pear-Services_SharedBook/Makefile
+++ b/www/pear-Services_SharedBook/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP wrapper for SharedBook Open API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Client.php:${PORTSDIR}/www/pear-HTTP_Client
-RUN_DEPENDS=	${PEARDIR}/HTTP/Client.php:${PORTSDIR}/www/pear-HTTP_Client
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Client.php:www/pear-HTTP_Client
+RUN_DEPENDS=	${PEARDIR}/HTTP/Client.php:www/pear-HTTP_Client
 
 USES=	pear
 
diff --git a/www/pear-Services_ShortURL/Makefile b/www/pear-Services_ShortURL/Makefile
index 1351850d9bcd..d3898d86e990 100644
--- a/www/pear-Services_ShortURL/Makefile
+++ b/www/pear-Services_ShortURL/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	www pear
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Abstract PHP5 interface for shortening and expanding short URLs
 
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
 
 USES=	pear
 USE_PHP=	simplexml pcre spl
diff --git a/www/pear-Services_W3C_CSSValidator/Makefile b/www/pear-Services_W3C_CSSValidator/Makefile
index 1022051f820b..f05722ad6f99 100644
--- a/www/pear-Services_W3C_CSSValidator/Makefile
+++ b/www/pear-Services_W3C_CSSValidator/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP interface to W3C CSS Validator API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
 
 USES=	pear
 
diff --git a/www/pear-Services_W3C_HTMLValidator/Makefile b/www/pear-Services_W3C_HTMLValidator/Makefile
index e13fd87516d9..161635b58190 100644
--- a/www/pear-Services_W3C_HTMLValidator/Makefile
+++ b/www/pear-Services_W3C_HTMLValidator/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Object Oriented Interface to the W3C HTML Validator service
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:${PORTSDIR}/www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
 
 USES=		pear
 
diff --git a/www/pear-Structures_DataGrid_Renderer_Flexy/Makefile b/www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
index 3d5d65b5eb93..01a034654673 100644
--- a/www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
+++ b/www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Renderer for pear-Structures_DataGrid using HTML_Template_Flexy
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/HTML/Template/Flexy.php:${PORTSDIR}/devel/pear-HTML_Template_Flexy \
-		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:${PORTSDIR}/www/pear-Structures_DataGrid_Renderer_Pager
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/HTML/Template/Flexy.php:devel/pear-HTML_Template_Flexy \
+		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager
 
 USES=	pear
 
diff --git a/www/pear-Structures_DataGrid_Renderer_Pager/Makefile b/www/pear-Structures_DataGrid_Renderer_Pager/Makefile
index 956ef423f3e7..accee302399f 100644
--- a/www/pear-Structures_DataGrid_Renderer_Pager/Makefile
+++ b/www/pear-Structures_DataGrid_Renderer_Pager/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Pager Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/Pager/Pager.php:${PORTSDIR}/devel/pear-Pager
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/Pager/Pager.php:devel/pear-Pager
 
 USES=	pear
 
diff --git a/www/pear-Structures_DataGrid_Renderer_Smarty/Makefile b/www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
index 2b37af7c8157..3b82eca53046 100644
--- a/www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
+++ b/www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Smarty Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${LOCALBASE}/share/smarty/Smarty.class.php:${PORTSDIR}/www/smarty2 \
-		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:${PORTSDIR}/www/pear-Structures_DataGrid_Renderer_Pager
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2 \
+		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager
 
 USES=	pear
 
diff --git a/www/pear-UDDI/Makefile b/www/pear-UDDI/Makefile
index 4844f4efb856..08fbf3c5eb6a 100644
--- a/www/pear-UDDI/Makefile
+++ b/www/pear-UDDI/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	www pear finance
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR UDDI for PHP
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
 
 USES=	pear
 
diff --git a/www/pear-XML_GRDDL/Makefile b/www/pear-XML_GRDDL/Makefile
index f9ebd30399a6..f1e0c4d8fd0a 100644
--- a/www/pear-XML_GRDDL/Makefile
+++ b/www/pear-XML_GRDDL/Makefile
@@ -8,14 +8,14 @@ CATEGORIES=	www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP library for dealing with GRDDL
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request \
-		${PEARDIR}/Net/URL.php:${PORTSDIR}/net/pear-Net_URL \
-		${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \
-		${PEARDIR}/Validate.php:${PORTSDIR}/devel/pear-Validate
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request \
-		${PEARDIR}/Net/URL.php:${PORTSDIR}/net/pear-Net_URL \
-		${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \
-		${PEARDIR}/Validate.php:${PORTSDIR}/devel/pear-Validate
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
+		${PEARDIR}/Net/URL.php:net/pear-Net_URL \
+		${PEARDIR}/Log.php:sysutils/pear-Log \
+		${PEARDIR}/Validate.php:devel/pear-Validate
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
+		${PEARDIR}/Net/URL.php:net/pear-Net_URL \
+		${PEARDIR}/Log.php:sysutils/pear-Log \
+		${PEARDIR}/Validate.php:devel/pear-Validate
 
 USES=	pear
 USE_PHP+=	xsl tidy
diff --git a/www/pear-twig/Makefile b/www/pear-twig/Makefile
index 53307cc514c4..bfd41b4f4768 100644
--- a/www/pear-twig/Makefile
+++ b/www/pear-twig/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Flexible, fast, and secure template engine for PHP
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.twig-project.org.reg:${PORTSDIR}/devel/pear-channel-twig
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.twig-project.org.reg:${PORTSDIR}/devel/pear-channel-twig
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
 
 USES=		pear
 PEAR_CHANNEL=	twig
diff --git a/www/pebble/Makefile b/www/pebble/Makefile
index 59cb842faf49..b0e30969218f 100644
--- a/www/pebble/Makefile
+++ b/www/pebble/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight, open source, Java EE blogging tool
 
-PATCH_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
-RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-6.0/bin/catalina.sh:${PORTSDIR}/www/tomcat6
+PATCH_DEPENDS=	zip:archivers/zip \
+		unzip:archivers/unzip
+RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-6.0/bin/catalina.sh:www/tomcat6
 
 USES=		cpe zip:infozip
 CPE_VENDOR=	simon_brown
diff --git a/www/pecl-http/Makefile b/www/pecl-http/Makefile
index 060d19cddefc..bcbb0e0b28cf 100644
--- a/www/pecl-http/Makefile
+++ b/www/pecl-http/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Extended HTTP Support
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:${PORTSDIR}/devel/pecl-raphf \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:${PORTSDIR}/devel/pecl-propro \
-		re2c:${PORTSDIR}/devel/re2c
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:${PORTSDIR}/devel/pecl-raphf \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:${PORTSDIR}/devel/pecl-propro
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libevent.so:${PORTSDIR}/devel/libevent2
+BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf \
+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro \
+		re2c:devel/re2c
+RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf \
+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libevent.so:devel/libevent2
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/www/pecl-http1/Makefile b/www/pecl-http1/Makefile
index a0a533364e2e..02c243da4719 100644
--- a/www/pecl-http1/Makefile
+++ b/www/pecl-http1/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Extended HTTP Support
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/www/pecl-solr/Makefile b/www/pecl-solr/Makefile
index 4d9e8b99201d..73700a3d6a49 100644
--- a/www/pecl-solr/Makefile
+++ b/www/pecl-solr/Makefile
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	gaod@hychen.org
 COMMENT=	The Apache Solr PHP extension
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libxml2.so:textproc/libxml2
 
 USE_PHP=	json
 USE_PHPEXT=	yes
diff --git a/www/pecl-sphinx/Makefile b/www/pecl-sphinx/Makefile
index f25302847237..29244f9278e1 100644
--- a/www/pecl-sphinx/Makefile
+++ b/www/pecl-sphinx/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Sphinx search engine php client
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libsphinxclient.so:${PORTSDIR}/textproc/libsphinxclient
+LIB_DEPENDS=	libsphinxclient.so:textproc/libsphinxclient
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/www/pecl-swish/Makefile b/www/pecl-swish/Makefile
index 9876e7e376b2..5741cb89b612 100644
--- a/www/pecl-swish/Makefile
+++ b/www/pecl-swish/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Swish-e bindings for PHP
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	swish-config:${PORTSDIR}/www/swish-e
-RUN_DEPENDS:=	swish-config:${PORTSDIR}/www/swish-e
+BUILD_DEPENDS=	swish-config:www/swish-e
+RUN_DEPENDS:=	swish-config:www/swish-e
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/www/pecl-varnish/Makefile b/www/pecl-varnish/Makefile
index 54258477af38..56a5c78846fe 100644
--- a/www/pecl-varnish/Makefile
+++ b/www/pecl-varnish/Makefile
@@ -16,7 +16,7 @@ LICENSE=	BSD2CLAUSE
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	varnish4>=0:${PORTSDIR}/www/varnish4
+BUILD_DEPENDS=	varnish4>=0:www/varnish4
 
 USES=	tar:tgz
 USE_PHP=	hash
diff --git a/www/pecl-yaf/Makefile b/www/pecl-yaf/Makefile
index ec88a200aff6..657b9fc14c32 100644
--- a/www/pecl-yaf/Makefile
+++ b/www/pecl-yaf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	MVC framework written as a C PHP extension
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-php-config=${PREFIX}/bin/php-config
diff --git a/www/pecl-yar/Makefile b/www/pecl-yar/Makefile
index 865e6738e7d5..487b7f585125 100644
--- a/www/pecl-yar/Makefile
+++ b/www/pecl-yar/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--with-php-config=${PREFIX}/bin/php-config
 
 OPTIONS_DEFINE=	MSGPACK
 MSGPACK_DESC=	Enable MSGPACK module
-MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:${PORTSDIR}/devel/pecl-msgpack
-MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:${PORTSDIR}/devel/pecl-msgpack
+MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack
+MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack
 
 .include <bsd.port.mk>
diff --git a/www/perlbal/Makefile b/www/perlbal/Makefile
index 811a2d056427..f6d76f2e9889 100644
--- a/www/perlbal/Makefile
+++ b/www/perlbal/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Reverse-proxy load balancer and webserver
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource \
-		p5-Danga-Socket>=1.44:${PORTSDIR}/devel/p5-Danga-Socket \
-		p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-AIO>=0:${PORTSDIR}/devel/p5-IO-AIO \
-		p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-BSD-Resource>=0:devel/p5-BSD-Resource \
+		p5-Danga-Socket>=1.44:devel/p5-Danga-Socket \
+		p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-AIO>=0:devel/p5-IO-AIO \
+		p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/www/photo_gallery/Makefile b/www/photo_gallery/Makefile
index d478124a2acc..466abb486ee4 100644
--- a/www/photo_gallery/Makefile
+++ b/www/photo_gallery/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	bob@bomar.us
 COMMENT=	Simple web based photo gallery
 
-RUN_DEPENDS=	anytopnm:${PORTSDIR}/graphics/netpbm\
-		p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info\
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	anytopnm:graphics/netpbm\
+		p5-Image-Info>=0:graphics/p5-Image-Info\
+		p5-URI>=0:net/p5-URI
 
 USE_APACHE_RUN=	22+
 USES=		perl5 shebangfix tar
diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index ff3216e7b07e..2c803b871ed2 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PHP-based bulletin board / discussion forum system
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear
 
 CONFLICTS=	phpbb-tw-[0-9]*
 
diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile
index b2e9bfbf4889..6528feb160fe 100644
--- a/www/piwigo/Makefile
+++ b/www/piwigo/Makefile
@@ -43,9 +43,9 @@ PLIST_SUB+=	WWWOWN="${WWWOWN}" \
 
 .if ${PORT_OPTIONS:MIMAGICK}
 .if ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	${LOCALBASE}/bin/convert:graphics/ImageMagick
 .else
-RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11
+RUN_DEPENDS+=	${LOCALBASE}/bin/convert:graphics/ImageMagick-nox11
 .endif
 .endif
 
diff --git a/www/planet/Makefile b/www/planet/Makefile
index 0c58efa988ae..0c2716f5158d 100644
--- a/www/planet/Makefile
+++ b/www/planet/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.planetplanet.org/download/
 MAINTAINER=	alan@wave2.co.uk
 COMMENT=	Planet is a flexible feed aggregator - and more!
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/Tidy/Tidy.py:${PORTSDIR}/devel/py-mx-experimental \
-		${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/Tidy/Tidy.py:devel/py-mx-experimental \
+		${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb
 
 USES=		python tar:bzip2
 NO_BUILD=	yes
diff --git a/www/plexwatchweb/Makefile b/www/plexwatchweb/Makefile
index 803ba52a2057..0546c1e9ee64 100644
--- a/www/plexwatchweb/Makefile
+++ b/www/plexwatchweb/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	www
 MAINTAINER=	ultima1252@gmail.com
 COMMENT=	Web front-end for plexWatch
 
-RUN_DEPENDS=	multimedia/plexwatch>=0.1.6:${PORTSDIR}/multimedia/plexwatch
+RUN_DEPENDS=	multimedia/plexwatch>=0.1.6:multimedia/plexwatch
 
 USE_PHP=	curl json session simplexml sqlite3
 
diff --git a/www/plone/Makefile b/www/plone/Makefile
index a4cf78fd8aeb..0a28f9159942 100644
--- a/www/plone/Makefile
+++ b/www/plone/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Plone Content Management System
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:${PORTSDIR}/devel/py-Products.CMFPlacefulWorkflow \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFPlone>=0:${PORTSDIR}/www/py-Products.CMFPlone \
-		${PYTHON_PKGNAMEPREFIX}plone.app.caching>=0:${PORTSDIR}/www/py-plone.app.caching \
-		${PYTHON_PKGNAMEPREFIX}plone.app.dexterity>0:${PORTSDIR}/www/py-plone.app.dexterity \
-		${PYTHON_PKGNAMEPREFIX}plone.app.iterate>=0:${PORTSDIR}/www/py-plone.app.iterate \
-		${PYTHON_PKGNAMEPREFIX}plone.app.openid>=0:${PORTSDIR}/security/py-plone.app.openid \
-		${PYTHON_PKGNAMEPREFIX}plone.app.theming>0:${PORTSDIR}/www/py-plone.app.theming \
-		${PYTHON_PKGNAMEPREFIX}wicked>=0:${PORTSDIR}/textproc/py-wicked
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFPlone>=0:www/py-Products.CMFPlone \
+		${PYTHON_PKGNAMEPREFIX}plone.app.caching>=0:www/py-plone.app.caching \
+		${PYTHON_PKGNAMEPREFIX}plone.app.dexterity>0:www/py-plone.app.dexterity \
+		${PYTHON_PKGNAMEPREFIX}plone.app.iterate>=0:www/py-plone.app.iterate \
+		${PYTHON_PKGNAMEPREFIX}plone.app.openid>=0:security/py-plone.app.openid \
+		${PYTHON_PKGNAMEPREFIX}plone.app.theming>0:www/py-plone.app.theming \
+		${PYTHON_PKGNAMEPREFIX}wicked>=0:textproc/py-wicked
 
 OPTIONS_DEFINE=		LDAP
-LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.ldap>=1.2.6:${PORTSDIR}/www/py-plone.app.ldap
+LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.ldap>=1.2.6:www/py-plone.app.ldap
 
 NO_ARCH=	yes
 USES=		cpe python zip
diff --git a/www/podcastamatic/Makefile b/www/podcastamatic/Makefile
index 62533c434549..208dca93f534 100644
--- a/www/podcastamatic/Makefile
+++ b/www/podcastamatic/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Automates creation of webpage and RSS feed for a podcast
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/gpl.txt
 
-RUN_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
-		p5-MP4-Info>=0:${PORTSDIR}/multimedia/p5-MP4-Info
+RUN_DEPENDS=	p5-MP3-Info>=0:audio/p5-MP3-Info \
+		p5-MP4-Info>=0:multimedia/p5-MP4-Info
 
 USES=		perl5 zip
 USE_PERL5=	run
diff --git a/www/pound/Makefile b/www/pound/Makefile
index 495056e7c293..e25e4cb11312 100644
--- a/www/pound/Makefile
+++ b/www/pound/Makefile
@@ -37,7 +37,7 @@ PCRE_CONFIGURE_ENABLE=	pcreposix
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index c88cab6fc968..0dd980022c1c 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	privoxy-${PORTVERSION}-stable-src
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Privoxy is a web proxy with advanced filtering capabilities
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 WRKSRC=		${WRKDIR}/privoxy-${PORTVERSION}-stable
 
@@ -65,7 +65,7 @@ TOGGLE_CONFIGURE_OFF=	--disable-toggle
 
 PRIVOXY_TOOLS_USES=	perl5
 PRIVOXY_TOOLS_USE=	PERL5=run
-PRIVOXY_TOOLS_RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+PRIVOXY_TOOLS_RUN_DEPENDS=	curl:ftp/curl
 
 post-patch:
 	${REINPLACE_CMD} \
diff --git a/www/publicfile/Makefile b/www/publicfile/Makefile
index b3b6b1d0a3cc..5de88ea54da0 100644
--- a/www/publicfile/Makefile
+++ b/www/publicfile/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://cr.yp.to/publicfile/
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Secure, read-only, anonymous HTTP/FTP server
 
-RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
-		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	setuidgid:sysutils/daemontools \
+		tcpserver:sysutils/ucspi-tcp
 
 OPTIONS_DEFINE=	BASICAUTH COMMONLOG REDIRECT_SLASH ENV_FILETYPES SSL
 BASICAUTH_DESC=		basic HTTP authentication support
@@ -53,14 +53,14 @@ pre-configure::
 .if ${PORT_OPTIONS:MSSL}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/publicfile.sslserver
-RUN_DEPENDS+=	sslserver:${PORTSDIR}/sysutils/ucspi-ssl
+RUN_DEPENDS+=	sslserver:sysutils/ucspi-ssl
 .endif
 
 .if ${PORT_OPTIONS:MBASICAUTH}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} -p1 < \
 		${PATCHDIR}/publicfile-0.52_basicauth.patch
-PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/databases/cdb:extract
+PATCH_DEPENDS+=	${NONEXISTENT}:databases/cdb:extract
 PLIST_SUB+=	BASICAUTH=""
 .else
 PLIST_SUB+=	BASICAUTH="@comment "
diff --git a/www/punbb/Makefile b/www/punbb/Makefile
index e9aafa8bfe5a..3915789c6e3d 100644
--- a/www/punbb/Makefile
+++ b/www/punbb/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Fast and lightweight PHP-powered discussion board
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 
 PORTEXAMPLES=	12_to_1222_update.php example_config.php \
 		turn_off_maintenance_mode.php
diff --git a/www/pwebstats/Makefile b/www/pwebstats/Makefile
index c3f88825bd92..d99ee9686a48 100644
--- a/www/pwebstats/Makefile
+++ b/www/pwebstats/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.gleeson.net/pub/pwebstats/dist/ \
 MAINTAINER=	sexbear@tmu.edu.tw
 COMMENT=	Analyse a web server log
 
-RUN_DEPENDS=	fly:${PORTSDIR}/graphics/fly
+RUN_DEPENDS=	fly:graphics/fly
 
 USES=		perl5
 
diff --git a/www/py-GinGin/Makefile b/www/py-GinGin/Makefile
index 42d7d53350cf..478c71ed40a8 100644
--- a/www/py-GinGin/Makefile
+++ b/www/py-GinGin/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hybrid of WIKI and BLOG system
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mez_xml/__init__.py:${PORTSDIR}/devel/py-mez_xml
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mez_xml/__init__.py:devel/py-mez_xml
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/fcgi.py:${PORTSDIR}/www/py-fcgi
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_SITELIBDIR}/fcgi.py:www/py-fcgi
 
 USES=		python:2 shebangfix
 SHEBANG_FILES=	GinGin/data/config.py.example
diff --git a/www/py-Lightbox/Makefile b/www/py-Lightbox/Makefile
index 827df4c8eb5e..9e1428a9718d 100644
--- a/www/py-Lightbox/Makefile
+++ b/www/py-Lightbox/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Lightbox photo display widget for TurboGears
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:${PORTSDIR}/www/py-turbogears
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scriptaculous>=1.8.1:${PORTSDIR}/www/py-scriptaculous
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:www/py-turbogears
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scriptaculous>=1.8.1:www/py-scriptaculous
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-MechanicalSoup/Makefile b/www/py-MechanicalSoup/Makefile
index 855c3c551616..336ecdbc9240 100644
--- a/www/py-MechanicalSoup/Makefile
+++ b/www/py-MechanicalSoup/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Python library for automating interaction with websites
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>4:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>4:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hickford
diff --git a/www/py-Products.CMFPlone/Makefile b/www/py-Products.CMFPlone/Makefile
index 15bf20e11ccd..afc86f1cc6d1 100644
--- a/www/py-Products.CMFPlone/Makefile
+++ b/www/py-Products.CMFPlone/Makefile
@@ -12,108 +12,108 @@ COMMENT=	Plone Content Management System (core)
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=2.1.3:${PORTSDIR}/devel/py-Products.ATContentTypes \
-		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:${PORTSDIR}/devel/py-Products.Archetypes \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFActionIcons>=0:${PORTSDIR}/devel/py-Products.CMFActionIcons \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:${PORTSDIR}/devel/py-Products.CMFCalendar \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:${PORTSDIR}/devel/py-Products.CMFDiffTool \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:${PORTSDIR}/devel/py-Products.CMFEditions \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:${PORTSDIR}/devel/py-Products.CMFFormController \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:${PORTSDIR}/devel/py-Products.CMFQuickInstallerTool \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:${PORTSDIR}/devel/py-Products.CMFUid \
-		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:${PORTSDIR}/devel/py-Products.DCWorkflow \
-		${PYTHON_PKGNAMEPREFIX}Products.ExtendedPathIndex>=0:${PORTSDIR}/devel/py-Products.ExtendedPathIndex \
-		${PYTHON_PKGNAMEPREFIX}Products.ExternalEditor>=0:${PORTSDIR}/devel/py-Products.ExternalEditor \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:${PORTSDIR}/devel/py-Products.MimetypesRegistry \
-		${PYTHON_PKGNAMEPREFIX}Products.PasswordResetTool>=0:${PORTSDIR}/devel/py-Products.PasswordResetTool \
-		${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:${PORTSDIR}/devel/py-Products.PlacelessTranslationService \
-		${PYTHON_PKGNAMEPREFIX}Products.PloneLanguageTool>=0:${PORTSDIR}/devel/py-Products.PloneLanguageTool \
-		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:${PORTSDIR}/security/py-Products.PlonePAS \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService \
-		${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:${PORTSDIR}/devel/py-Products.PluginRegistry \
-		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:${PORTSDIR}/devel/py-Products.PortalTransforms \
-		${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:${PORTSDIR}/devel/py-Products.ResourceRegistries \
-		${PYTHON_PKGNAMEPREFIX}Products.TinyMCE>=0:${PORTSDIR}/www/py-Products.TinyMCE \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>0:${PORTSDIR}/devel/py-archetypes.querywidget \
-		${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:${PORTSDIR}/devel/py-archetypes.referencebrowserwidget \
-		${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:${PORTSDIR}/security/py-borg.localrole \
-		${PYTHON_PKGNAMEPREFIX}five.customerize>=0:${PORTSDIR}/devel/py-five.customerize \
-		${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/py-five.localsitemanager \
-		${PYTHON_PKGNAMEPREFIX}plone.app.blob>=0:${PORTSDIR}/www/py-plone.app.blob \
-		${PYTHON_PKGNAMEPREFIX}plone.app.collection>0:${PORTSDIR}/www/py-plone.app.collection \
-		${PYTHON_PKGNAMEPREFIX}plone.app.content>=0:${PORTSDIR}/www/py-plone.app.content \
-		${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>0:${PORTSDIR}/www/py-plone.app.contentlisting \
-		${PYTHON_PKGNAMEPREFIX}plone.app.contentmenu>=1.1.6:${PORTSDIR}/www/py-plone.app.contentmenu \
-		${PYTHON_PKGNAMEPREFIX}plone.app.contentrules>=0:${PORTSDIR}/www/py-plone.app.contentrules \
-		${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=0:${PORTSDIR}/www/py-plone.app.controlpanel \
-		${PYTHON_PKGNAMEPREFIX}plone.app.customerize>=0:${PORTSDIR}/www/py-plone.app.customerize \
-		${PYTHON_PKGNAMEPREFIX}plone.app.discussion>=0:${PORTSDIR}/www/py-plone.app.discussion \
-		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:${PORTSDIR}/www/py-plone.app.folder \
-		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
-		${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:${PORTSDIR}/www/py-plone.app.i18n \
-		${PYTHON_PKGNAMEPREFIX}plone.app.jquery>0:${PORTSDIR}/www/py-plone.app.jquery \
-		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:${PORTSDIR}/www/py-plone.app.jquerytools \
-		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.1.7:${PORTSDIR}/www/py-plone.app.layout \
-		${PYTHON_PKGNAMEPREFIX}plone.app.linkintegrity>=1.0.3:${PORTSDIR}/www/py-plone.app.linkintegrity \
-		${PYTHON_PKGNAMEPREFIX}plone.app.locales>=0:${PORTSDIR}/www/py-plone.app.locales \
-		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:${PORTSDIR}/www/py-plone.app.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.redirector>=0:${PORTSDIR}/www/py-plone.app.redirector \
-		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:${PORTSDIR}/www/py-plone.app.registry \
-		${PYTHON_PKGNAMEPREFIX}plone.app.search>0:${PORTSDIR}/www/py-plone.app.search \
-		${PYTHON_PKGNAMEPREFIX}plone.app.upgrade>=0:${PORTSDIR}/www/py-plone.app.upgrade \
-		${PYTHON_PKGNAMEPREFIX}plone.app.users>=0:${PORTSDIR}/www/py-plone.app.users \
-		${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:${PORTSDIR}/www/py-plone.app.uuid \
-		${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=0:${PORTSDIR}/www/py-plone.app.viewletmanager \
-		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
-		${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:${PORTSDIR}/www/py-plone.app.workflow \
-		${PYTHON_PKGNAMEPREFIX}plone.batching>0:${PORTSDIR}/www/py-plone.batching \
-		${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=1.0rc4:${PORTSDIR}/www/py-plone.browserlayer \
-		${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:${PORTSDIR}/www/py-plone.contentrules \
-		${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:${PORTSDIR}/www/py-plone.fieldsets \
-		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:${PORTSDIR}/www/py-plone.i18n \
-		${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:${PORTSDIR}/www/py-plone.indexer \
-		${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:${PORTSDIR}/www/py-plone.intelligenttext \
-		${PYTHON_PKGNAMEPREFIX}plone.locking>=0:${PORTSDIR}/www/py-plone.locking \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>=0:${PORTSDIR}/www/py-plone.portlet.collection \
-		${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:${PORTSDIR}/www/py-plone.portlet.static \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.protect>1.0:${PORTSDIR}/security/py-plone.protect \
-		${PYTHON_PKGNAMEPREFIX}plone.registry>=0:${PORTSDIR}/www/py-plone.registry \
-		${PYTHON_PKGNAMEPREFIX}plone.session>=0:${PORTSDIR}/security/py-plone.session \
-		${PYTHON_PKGNAMEPREFIX}plone.theme>=0:${PORTSDIR}/www/py-plone.theme \
-		${PYTHON_PKGNAMEPREFIX}plonetheme.classic>=0:${PORTSDIR}/www/py-plonetheme.classic \
-		${PYTHON_PKGNAMEPREFIX}plonetheme.sunburst>=0:${PORTSDIR}/www/py-plonetheme.sunburst \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}z3c.autoinclude>=0:${PORTSDIR}/devel/py-z3c.autoinclude \
-		${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:${PORTSDIR}/textproc/py-zope.app.locales \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext \
-		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=2.1.3:devel/py-Products.ATContentTypes \
+		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFActionIcons>=0:devel/py-Products.CMFActionIcons \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \
+		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \
+		${PYTHON_PKGNAMEPREFIX}Products.ExtendedPathIndex>=0:devel/py-Products.ExtendedPathIndex \
+		${PYTHON_PKGNAMEPREFIX}Products.ExternalEditor>=0:devel/py-Products.ExternalEditor \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \
+		${PYTHON_PKGNAMEPREFIX}Products.PasswordResetTool>=0:devel/py-Products.PasswordResetTool \
+		${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService \
+		${PYTHON_PKGNAMEPREFIX}Products.PloneLanguageTool>=0:devel/py-Products.PloneLanguageTool \
+		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
+		${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry \
+		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \
+		${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries \
+		${PYTHON_PKGNAMEPREFIX}Products.TinyMCE>=0:www/py-Products.TinyMCE \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>0:devel/py-archetypes.querywidget \
+		${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \
+		${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole \
+		${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize \
+		${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
+		${PYTHON_PKGNAMEPREFIX}plone.app.blob>=0:www/py-plone.app.blob \
+		${PYTHON_PKGNAMEPREFIX}plone.app.collection>0:www/py-plone.app.collection \
+		${PYTHON_PKGNAMEPREFIX}plone.app.content>=0:www/py-plone.app.content \
+		${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>0:www/py-plone.app.contentlisting \
+		${PYTHON_PKGNAMEPREFIX}plone.app.contentmenu>=1.1.6:www/py-plone.app.contentmenu \
+		${PYTHON_PKGNAMEPREFIX}plone.app.contentrules>=0:www/py-plone.app.contentrules \
+		${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=0:www/py-plone.app.controlpanel \
+		${PYTHON_PKGNAMEPREFIX}plone.app.customerize>=0:www/py-plone.app.customerize \
+		${PYTHON_PKGNAMEPREFIX}plone.app.discussion>=0:www/py-plone.app.discussion \
+		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \
+		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
+		${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n \
+		${PYTHON_PKGNAMEPREFIX}plone.app.jquery>0:www/py-plone.app.jquery \
+		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools \
+		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.1.7:www/py-plone.app.layout \
+		${PYTHON_PKGNAMEPREFIX}plone.app.linkintegrity>=1.0.3:www/py-plone.app.linkintegrity \
+		${PYTHON_PKGNAMEPREFIX}plone.app.locales>=0:www/py-plone.app.locales \
+		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.app.redirector>=0:www/py-plone.app.redirector \
+		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry \
+		${PYTHON_PKGNAMEPREFIX}plone.app.search>0:www/py-plone.app.search \
+		${PYTHON_PKGNAMEPREFIX}plone.app.upgrade>=0:www/py-plone.app.upgrade \
+		${PYTHON_PKGNAMEPREFIX}plone.app.users>=0:www/py-plone.app.users \
+		${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid \
+		${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=0:www/py-plone.app.viewletmanager \
+		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
+		${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow \
+		${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \
+		${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=1.0rc4:www/py-plone.browserlayer \
+		${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules \
+		${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets \
+		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
+		${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer \
+		${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext \
+		${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>=0:www/py-plone.portlet.collection \
+		${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.protect>1.0:security/py-plone.protect \
+		${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \
+		${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \
+		${PYTHON_PKGNAMEPREFIX}plone.theme>=0:www/py-plone.theme \
+		${PYTHON_PKGNAMEPREFIX}plonetheme.classic>=0:www/py-plonetheme.classic \
+		${PYTHON_PKGNAMEPREFIX}plonetheme.sunburst>=0:www/py-plonetheme.sunburst \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}z3c.autoinclude>=0:devel/py-z3c.autoinclude \
+		${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \
+		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 NO_ARCH=	yes
 USES=		python:2.7 zip
diff --git a/www/py-Products.PloneLDAP/Makefile b/www/py-Products.PloneLDAP/Makefile
index 393b5e0434ea..7ddf2d15213b 100644
--- a/www/py-Products.PloneLDAP/Makefile
+++ b/www/py-Products.PloneLDAP/Makefile
@@ -14,8 +14,8 @@ COMMENT=	LDAP/Active Directory support for Plone
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.LDAPMultiPlugins>=1.10:${PORTSDIR}/devel/py-Products.LDAPMultiPlugins \
-		${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:${PORTSDIR}/devel/py-Products.LDAPUserFolder
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.LDAPMultiPlugins>=1.10:devel/py-Products.LDAPMultiPlugins \
+		${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-Products.TinyMCE/Makefile b/www/py-Products.TinyMCE/Makefile
index 47dfd55e0f8a..c356fe1347af 100644
--- a/www/py-Products.TinyMCE/Makefile
+++ b/www/py-Products.TinyMCE/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Adds support for TinyMCE to Plone
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.imaging>=1.0.2:${PORTSDIR}/www/py-plone.app.imaging \
-		${PYTHON_PKGNAMEPREFIX}plone.outputfilters>=0:${PORTSDIR}/www/py-plone.outputfilters \
-		${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:${PORTSDIR}/www/py-plone.namedfile \
-		${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:${PORTSDIR}/www/py-plone.app.layout \
-		${PYTHON_PKGNAMEPREFIX}plone.caching>0:${PORTSDIR}/www/py-plone.caching \
-		${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>0:${PORTSDIR}/devel/py-Products.ResourceRegistries \
-		${PYTHON_PKGNAMEPREFIX}zope.app.content>0:${PORTSDIR}/devel/py-zope.app.content \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.imaging>=1.0.2:www/py-plone.app.imaging \
+		${PYTHON_PKGNAMEPREFIX}plone.outputfilters>=0:www/py-plone.outputfilters \
+		${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile \
+		${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout \
+		${PYTHON_PKGNAMEPREFIX}plone.caching>0:www/py-plone.caching \
+		${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>0:devel/py-Products.ResourceRegistries \
+		${PYTHON_PKGNAMEPREFIX}zope.app.content>0:devel/py-zope.app.content \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema
 
 NO_ARCH=	yes
 USES=		python:2.7 zip
diff --git a/www/py-WebError/Makefile b/www/py-WebError/Makefile
index b73662a1e22d..b646eebe4198 100644
--- a/www/py-WebError/Makefile
+++ b/www/py-WebError/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Web Error handling and exception catching
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7:${PORTSDIR}/www/py-paste \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}Tempita>=0.3:${PORTSDIR}/textproc/py-Tempita \
-		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7:www/py-paste \
+		${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}Tempita>=0.3:textproc/py-Tempita \
+		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-WebTest/Makefile b/www/py-WebTest/Makefile
index 4e5c6c534879..f721c23908a7 100644
--- a/www/py-WebTest/Makefile
+++ b/www/py-WebTest/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Helper to test WSGI applications
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}waitress>0:${PORTSDIR}/www/py-waitress \
-		${PYTHON_PKGNAMEPREFIX}webob>=1.2:${PORTSDIR}/www/py-webob
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}waitress>0:${PORTSDIR}/www/py-waitress \
-		${PYTHON_PKGNAMEPREFIX}webob>=1.2:${PORTSDIR}/www/py-webob
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress \
+		${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress \
+		${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob
 
 USE_GITHUB=	yes
 
diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile
index a4b0510bc8e6..352b5c9c5f67 100644
--- a/www/py-aiohttp/Makefile
+++ b/www/py-aiohttp/Makefile
@@ -13,9 +13,9 @@ COMMENT=	HTTP client/server for asyncio
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py3-chardet
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}gunicorn>0:${PORTSDIR}/www/py-gunicorn
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py3-chardet
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}gunicorn>0:www/py-gunicorn
 
 USES=		python:3.4+
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile
index a13843f784e4..a350a6a8cb58 100644
--- a/www/py-autobahn/Makefile
+++ b/www/py-autobahn/Makefile
@@ -13,12 +13,12 @@ COMMENT=		WebSocket client & server library, WAMP real-time framework
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.6.1:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}txaio>=2.2.0:${PORTSDIR}/devel/py-txaio
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.7.2:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 \
-		${PYTHON_PKGNAMEPREFIX}trollius>0:${PORTSDIR}/devel/py-trollius # Not really a depends, but the test doesnt skip
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}txaio>=2.2.0:devel/py-txaio
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.7.2:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \
+		${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius # Not really a depends, but the test doesnt skip
 
 USES=		python
 USE_GITHUB=	yes
@@ -41,13 +41,13 @@ ASYNCIO_DESC=		asyncio (PEP-3156) Backend (Python 3.x ONLY)
 SERIALIZATION_DESC=	WAMPv2 Binary Serialization
 TWISTED_DESC=		Twisted Backend (Python 2.x ONLY)
 
-ACCELERATE_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}wsaccel>=0.6.2:${PORTSDIR}/www/py-wsaccel \
-				${PYTHON_PKGNAMEPREFIX}ujson>=1.33:${PORTSDIR}/devel/py-ujson
+ACCELERATE_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}wsaccel>=0.6.2:www/py-wsaccel \
+				${PYTHON_PKGNAMEPREFIX}ujson>=1.33:devel/py-ujson
 
-SERIALIZATION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:${PORTSDIR}/devel/py-msgpack-python
+SERIALIZATION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python
 
-TWISTED_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6:${PORTSDIR}/devel/py-zope.interface \
-				${PYTHON_PKGNAMEPREFIX}twisted>=12.1:${PORTSDIR}/devel/py-twisted
+TWISTED_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6:devel/py-zope.interface \
+				${PYTHON_PKGNAMEPREFIX}twisted>=12.1:devel/py-twisted
 
 .include <bsd.port.pre.mk>
 
@@ -59,7 +59,7 @@ BROKEN=	Twisted currently only supports Python 2.x. Disable the TWISTED option a
 .if ${PYTHON_REL} <= 3000
 BROKEN=	ASYNCIO requires Python 3.x. Disable the ASYNCIO option and use TWISTED instead
 .elif ${PYTHON_REL} <= 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:${PORTSDIR}/devel/py-asyncio
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio
 .endif
 .endif
 
diff --git a/www/py-beaker/Makefile b/www/py-beaker/Makefile
index 1870d94dd0c5..4083e4e774df 100644
--- a/www/py-beaker/Makefile
+++ b/www/py-beaker/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Session and Caching library with WSGI Middleware
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}funcsigs>0:${PORTSDIR}/devel/py-funcsigs
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-bjoern/Makefile b/www/py-bjoern/Makefile
index 96e39c07204e..d157c42336dc 100644
--- a/www/py-bjoern/Makefile
+++ b/www/py-bjoern/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fast Python WSGI server
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 USES=	python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-bleach/Makefile b/www/py-bleach/Makefile
index b0ee42190210..fe064c5de847 100644
--- a/www/py-bleach/Makefile
+++ b/www/py-bleach/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Easy whitelist-based HTML-sanitizing tool
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}html5lib>=0.999:${PORTSDIR}/www/py-html5lib
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}html5lib>=0.999:www/py-html5lib
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-blogofile/Makefile b/www/py-blogofile/Makefile
index 9533b968b0b2..183b5069de11 100644
--- a/www/py-blogofile/Makefile
+++ b/www/py-blogofile/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Static website compiler and blog engine
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}textile>0:${PORTSDIR}/www/py-textile \
-		${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdown \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32 \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile \
+		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-bottle-cork/Makefile b/www/py-bottle-cork/Makefile
index fec13a29ddc6..508b957147cd 100644
--- a/www/py-bottle-cork/Makefile
+++ b/www/py-bottle-cork/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Bottle authentication and authorization module
 
 LICENSE=	LGPL3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bottle>0:${PORTSDIR}/www/py-bottle \
-		${PYTHON_PKGNAMEPREFIX}beaker>0:${PORTSDIR}/www/py-beaker
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle \
+		${PYTHON_PKGNAMEPREFIX}beaker>0:www/py-beaker
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FedericoCeratto
@@ -25,9 +25,9 @@ OPTIONS_DEFINE=		SQLITE MONGODB SQLALCHEMY EXAMPLES
 
 .include <bsd.port.options.mk>
 
-SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-MONGODB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>0:${PORTSDIR}/databases/pymongo
-SQLALCHEMY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlalchemy
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+MONGODB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo
+SQLALCHEMY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 post-install:
diff --git a/www/py-cachecontrol/Makefile b/www/py-cachecontrol/Makefile
index 2b6fc2a2503d..be7430aab4cf 100644
--- a/www/py-cachecontrol/Makefile
+++ b/www/py-cachecontrol/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Caching algorithms in httplib2 for use with requests session object
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9:${PORTSDIR}/devel/py-lockfile
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9:devel/py-lockfile
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-cactus/Makefile b/www/py-cactus/Makefile
index 93f6dbcde09e..05eaa622bb61 100644
--- a/www/py-cactus/Makefile
+++ b/www/py-cactus/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Static site generator for designers
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django16>0:${PORTSDIR}/www/py-django16 \
-		${PYTHON_PKGNAMEPREFIX}markdown2>0:${PORTSDIR}/textproc/py-markdown2 \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}boto>=2.4.1:${PORTSDIR}/devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}tornado>=3.2:${PORTSDIR}/www/py-tornado \
-		${PYTHON_PKGNAMEPREFIX}colorlog>0:${PORTSDIR}/devel/py-colorlog \
-		${PYTHON_PKGNAMEPREFIX}colorama>0:${PORTSDIR}/devel/py-colorama \
-		${PYTHON_PKGNAMEPREFIX}django-markwhat>0:${PORTSDIR}/www/py-django-markwhat
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django16>0:www/py-django16 \
+		${PYTHON_PKGNAMEPREFIX}markdown2>0:textproc/py-markdown2 \
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}boto>=2.4.1:devel/py-boto \
+		${PYTHON_PKGNAMEPREFIX}tornado>=3.2:www/py-tornado \
+		${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog \
+		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama \
+		${PYTHON_PKGNAMEPREFIX}django-markwhat>0:www/py-django-markwhat
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index 903d4a719d1b..5c519201681f 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Pythonic, object-oriented web development framework
 
 LICENSE=	BSD3CLAUSE
 
-EXAMPLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:${PORTSDIR}/devel/py-cheetah \
-			${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:${PORTSDIR}/databases/py-sqlobject
+EXAMPLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah \
+			${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/www/py-collective.easytemplate/Makefile b/www/py-collective.easytemplate/Makefile
index 9b34bcb58ad8..8e2285d52562 100644
--- a/www/py-collective.easytemplate/Makefile
+++ b/www/py-collective.easytemplate/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Dynamic HTML generation and scripting for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:${PORTSDIR}/www/py-plone.portlet.static \
-		${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}collective.templateengines>=0.3:${PORTSDIR}/www/py-collective.templateengines
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static \
+		${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}collective.templateengines>=0.3:www/py-collective.templateengines
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-collective.templateengines/Makefile b/www/py-collective.templateengines/Makefile
index 63b049e00a5d..0bf510559791 100644
--- a/www/py-collective.templateengines/Makefile
+++ b/www/py-collective.templateengines/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Template engine abstraction layer for Python
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:${PORTSDIR}/devel/py-Products.CMFCore
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-cookies/Makefile b/www/py-cookies/Makefile
index 6eda55257a3a..f9dc42add2ae 100644
--- a/www/py-cookies/Makefile
+++ b/www/py-cookies/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Friendlier RFC 6265-compliant cookie parser/renderer
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-cssselect/Makefile b/www/py-cssselect/Makefile
index f8185a8227c0..8d34674c2124 100644
--- a/www/py-cssselect/Makefile
+++ b/www/py-cssselect/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 SPHINX_BUILD=	sphinx-build
 
diff --git a/www/py-django-allauth/Makefile b/www/py-django-allauth/Makefile
index 2504c94fea9e..e8efab5c4ce6 100644
--- a/www/py-django-allauth/Makefile
+++ b/www/py-django-allauth/Makefile
@@ -11,7 +11,7 @@ COMMENT=	User registration with social account authentication
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-django-annoying/Makefile b/www/py-django-annoying/Makefile
index 62d7b0502647..9d84a8427886 100644
--- a/www/py-django-annoying/Makefile
+++ b/www/py-django-annoying/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Eliminate annoying things in the Django framework
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 USE_GITHUB=	yes
 
diff --git a/www/py-django-app-plugins/Makefile b/www/py-django-app-plugins/Makefile
index 584aebae4629..ea173617e932 100644
--- a/www/py-django-app-plugins/Makefile
+++ b/www/py-django-app-plugins/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Reusable django application for writing pluggable reusable django applications
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-appconf/Makefile b/www/py-django-appconf/Makefile
index a6fe329dce7f..0af63937ca03 100644
--- a/www/py-django-appconf/Makefile
+++ b/www/py-django-appconf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Helper class for handling configuration defaults gracefully
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-appmedia/Makefile b/www/py-django-appmedia/Makefile
index 07355bdc009d..92b940899927 100644
--- a/www/py-django-appmedia/Makefile
+++ b/www/py-django-appmedia/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	kurt.lidl@cello.com
 COMMENT=	Serve static content from within django app directories
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-assets/Makefile b/www/py-django-assets/Makefile
index 41f990e235ae..a4046e9fd13c 100644
--- a/www/py-django-assets/Makefile
+++ b/www/py-django-assets/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Compress and merge CSS and Javascript files
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}webassets>0:${PORTSDIR}/www/py-webassets
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-auth-ldap/Makefile b/www/py-django-auth-ldap/Makefile
index ad1395091b67..482922d7a690 100644
--- a/www/py-django-auth-ldap/Makefile
+++ b/www/py-django-auth-ldap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	LDAP integration for django.contrib.auth
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18
 
 NO_ARCH=	yes
 USES=		python
@@ -22,9 +22,9 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ldap>0:${PORTSDIR}/net/py-ldap
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap
 .else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyldap>0:${PORTSDIR}/net/py-pyldap
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyldap>0:net/py-pyldap
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/py-django-bitfield/Makefile b/www/py-django-bitfield/Makefile
index 3106dab001ba..1491111d92a4 100644
--- a/www/py-django-bitfield/Makefile
+++ b/www/py-django-bitfield/Makefile
@@ -12,8 +12,8 @@ COMMENT=	BitField in Django
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-django-bootstrap-form/Makefile b/www/py-django-bootstrap-form/Makefile
index abf3013188b7..f1e7d5cf715a 100644
--- a/www/py-django-bootstrap-form/Makefile
+++ b/www/py-django-bootstrap-form/Makefile
@@ -16,6 +16,6 @@ LICENSE=	MIT
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.5:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18
 
 .include <bsd.port.mk>
diff --git a/www/py-django-caching-app-plugins/Makefile b/www/py-django-caching-app-plugins/Makefile
index 6c3128e4664b..5588e340c2b5 100644
--- a/www/py-django-caching-app-plugins/Makefile
+++ b/www/py-django-caching-app-plugins/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Django app for writing pluggable reusable django applications
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=   ${WRKSRC}/LICENSE.rst
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 USES=   python
 USE_PYTHON= distutils autoplist
diff --git a/www/py-django-classy-tags/Makefile b/www/py-django-classy-tags/Makefile
index 34cdf3be679f..0cc219e0e8e9 100644
--- a/www/py-django-classy-tags/Makefile
+++ b/www/py-django-classy-tags/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Class based template tags for Django
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index 56aa6f692f58..69911e269bb4 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Content management system built with the Django framework
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.7.3:${PORTSDIR}/databases/py-south \
-		${PYTHON_PKGNAMEPREFIX}django18>=1.4:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.4.1:${PORTSDIR}/www/py-django-classy-tags \
-		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.5.2:${PORTSDIR}/www/py-django-mptt \
-		${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.6.1:${PORTSDIR}/www/py-django-sekizai \
-		${PYTHON_PKGNAMEPREFIX}html5lib>=0.90:${PORTSDIR}/www/py-html5lib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.7.3:databases/py-south \
+		${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.4.1:www/py-django-classy-tags \
+		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.5.2:www/py-django-mptt \
+		${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.6.1:www/py-django-sekizai \
+		${PYTHON_PKGNAMEPREFIX}html5lib>=0.90:www/py-html5lib
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
@@ -27,8 +27,8 @@ OPTIONS_MULTI=	DATABASE
 OPTIONS_DEFAULT=SQLITE
 OPTIONS_MULTI_DATABASE=MYSQL PGSQL SQLITE
 
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
-SQLIE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
+SQLIE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 .include <bsd.port.mk>
diff --git a/www/py-django-configurations/Makefile b/www/py-django-configurations/Makefile
index 4f0d374c9ccc..1b43abcd5d6c 100644
--- a/www/py-django-configurations/Makefile
+++ b/www/py-django-configurations/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Django project configuration using the composability of Python classes
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-contact-form/Makefile b/www/py-django-contact-form/Makefile
index 1972162d4060..13fbf529c4fb 100644
--- a/www/py-django-contact-form/Makefile
+++ b/www/py-django-contact-form/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Generic contact-form application for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 NO_ARCH=	yes
 
diff --git a/www/py-django-contrib-comments/Makefile b/www/py-django-contrib-comments/Makefile
index 9191cb154dcd..08fd35573fcc 100644
--- a/www/py-django-contrib-comments/Makefile
+++ b/www/py-django-contrib-comments/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Code formerly known as django.contrib.comments
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django16
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django16
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-crispy-forms/Makefile b/www/py-django-crispy-forms/Makefile
index c2990368d1b9..d23673db26f2 100644
--- a/www/py-django-crispy-forms/Makefile
+++ b/www/py-django-crispy-forms/Makefile
@@ -12,7 +12,7 @@ COMMENT=	The best way to have Django DRY forms
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-datetime-widget/Makefile b/www/py-django-datetime-widget/Makefile
index 5be74555f18b..8220db6d8470 100644
--- a/www/py-django-datetime-widget/Makefile
+++ b/www/py-django-datetime-widget/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	melvyn@magemana.nl
 COMMENT=	Simple and clean widget for DateTimeField
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-debug-toolbar/Makefile b/www/py-django-debug-toolbar/Makefile
index 7a76cf58d418..aeb091a7211f 100644
--- a/www/py-django-debug-toolbar/Makefile
+++ b/www/py-django-debug-toolbar/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Configurable set of panels to display debug information
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.4.2:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}sqlparse>0:${PORTSDIR}/databases/py-sqlparse
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.4.2:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-devel/Makefile b/www/py-django-devel/Makefile
index 0f041c53b92a..17151ef03a9f 100644
--- a/www/py-django-devel/Makefile
+++ b/www/py-django-devel/Makefile
@@ -34,10 +34,10 @@ HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/django-admin.1.gz
 
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
-SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup
 
 .include <bsd.port.options.mk>
 
@@ -45,7 +45,7 @@ FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 .	if ! ${PORT_OPTIONS:MDOCS}
 IGNORE=	you cannot build documentation with DOCS option disabled
 .	endif
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile
index 00c7278b9a7a..1881440e6fa6 100644
--- a/www/py-django-dpaste/Makefile
+++ b/www/py-django-dpaste/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Django based pastebin
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.7.4:${PORTSDIR}/www/py-django-mptt \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.7.4:www/py-django-mptt \
+		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests
 
 OPTIONS_DEFINE=		MIGRATIONS
 
 MIGRATIONS_DESC=	Schema and data migration support (via south)
 
-MIGRATIONS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.8.2:${PORTSDIR}/databases/py-south
+MIGRATIONS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.8.2:databases/py-south
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/www/py-django-evolution/Makefile b/www/py-django-evolution/Makefile
index e1776fd46720..73c6f485dc1a 100644
--- a/www/py-django-evolution/Makefile
+++ b/www/py-django-evolution/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Database schema evolution tool for the Django web framework
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 USE_GITHUB=	yes
 
diff --git a/www/py-django-extensions/Makefile b/www/py-django-extensions/Makefile
index 753d32456ab5..2980db3b21c4 100644
--- a/www/py-django-extensions/Makefile
+++ b/www/py-django-extensions/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Global custom management extensions for the Django Framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/www/py-django-filer/Makefile b/www/py-django-filer/Makefile
index da7b3e984322..60f61123e5e5 100644
--- a/www/py-django-filer/Makefile
+++ b/www/py-django-filer/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	xenophon+fbsdports@irtnog.org
 COMMENT=	File and Image Management Application for django
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=0:${PORTSDIR}/graphics/py-django-easy-thumbnails \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=0:graphics/py-django-easy-thumbnails \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-happenings/Makefile b/www/py-django-happenings/Makefile
index d979882cf415..eb8d5f8b17b7 100644
--- a/www/py-django-happenings/Makefile
+++ b/www/py-django-happenings/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Event calendar app for Django
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-haystack/Makefile b/www/py-django-haystack/Makefile
index 46f32e31b39d..5ee2b0669ea6 100644
--- a/www/py-django-haystack/Makefile
+++ b/www/py-django-haystack/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Pluggable search for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django16>=1.6.11:${PORTSDIR}/www/py-django16
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django16>=1.6.11:www/py-django16
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-htmlmin/Makefile b/www/py-django-htmlmin/Makefile
index c317fc7f55a4..3dfb0165bc0c 100644
--- a/www/py-django-htmlmin/Makefile
+++ b/www/py-django-htmlmin/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	HTML minifier for Python
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/element.py:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_SITELIBDIR}/html5lib/html5parser.py:${PORTSDIR}/www/py-html5lib
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/element.py:www/py-beautifulsoup \
+		${PYTHON_SITELIBDIR}/html5lib/html5parser.py:www/py-html5lib
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-json-rpc/Makefile b/www/py-django-json-rpc/Makefile
index d8a614e9f26b..ba960c203ddd 100644
--- a/www/py-django-json-rpc/Makefile
+++ b/www/py-django-json-rpc/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	john@ixsystems.com
 COMMENT=	Simple JSON-RPC implementation for Django
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 LICENSE=	MIT
 
diff --git a/www/py-django-jsonfield/Makefile b/www/py-django-jsonfield/Makefile
index 6530a289285a..c0ede316a2c6 100644
--- a/www/py-django-jsonfield/Makefile
+++ b/www/py-django-jsonfield/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Reusable JSONField model for Django to store ad-hoc data
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-keyedcache/Makefile b/www/py-django-keyedcache/Makefile
index b8b67d25b07d..2e8b33a9b2f4 100644
--- a/www/py-django-keyedcache/Makefile
+++ b/www/py-django-keyedcache/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simplified, speedy way to manage caching in Django apps
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-ldapdb/Makefile b/www/py-django-ldapdb/Makefile
index f4d549e14dbd..965175b07461 100644
--- a/www/py-django-ldapdb/Makefile
+++ b/www/py-django-ldapdb/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Support for django models over LDAP
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6.0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}ldap>=2.0:${PORTSDIR}/net/py-ldap
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6.0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.0:net/py-ldap
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile
index 4f3891c63195..59186c7ccfd4 100644
--- a/www/py-django-livesettings/Makefile
+++ b/www/py-django-livesettings/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Configure Django project settings via admin interface
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile
index 4ac8bb6615bf..3750a7982d24 100644
--- a/www/py-django-markdownx/Makefile
+++ b/www/py-django-markdownx/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Django Markdown editor with image uploads and live preview
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 USE_GITHUB=	yes
 
diff --git a/www/py-django-mezzanine/Makefile b/www/py-django-mezzanine/Makefile
index fe6299ea7f98..35f5a67b1956 100644
--- a/www/py-django-mezzanine/Makefile
+++ b/www/py-django-mezzanine/Makefile
@@ -15,21 +15,21 @@ COMMENT=	Content management platform built using the Django framework
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django16 \
-		${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.3.4:${PORTSDIR}/www/py-django-mezzanine-filebrowser \
-		${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.3.12:${PORTSDIR}/www/py-django-mezzanine-grappelli \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:${PORTSDIR}/devel/py-tzlocal \
-		${PYTHON_PKGNAMEPREFIX}bleach>=1.4:${PORTSDIR}/www/py-bleach \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.1.3:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:${PORTSDIR}/www/py-requests-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}future>=0.9.0:${PORTSDIR}/devel/py-future \
-		${PYTHON_PKGNAMEPREFIX}pillow>=1.3.1:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:${PORTSDIR}/www/py-django-contrib-comments \
-		${PYTHON_PKGNAMEPREFIX}south>=0.7.3:${PORTSDIR}/databases/py-south \
-
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:${PORTSDIR}/devel/pep8 \
-		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:${PORTSDIR}/devel/py-pyflakes
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django16 \
+		${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.3.4:www/py-django-mezzanine-filebrowser \
+		${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.3.12:www/py-django-mezzanine-grappelli \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal \
+		${PYTHON_PKGNAMEPREFIX}bleach>=1.4:www/py-bleach \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.1.3:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future \
+		${PYTHON_PKGNAMEPREFIX}pillow>=1.3.1:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments \
+		${PYTHON_PKGNAMEPREFIX}south>=0.7.3:databases/py-south \
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8 \
+		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes
 
 USES=		gettext python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
index e5df76ca483c..fede5b07f8a2 100644
--- a/www/py-django-mptt/Makefile
+++ b/www/py-django-mptt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Utilities for implementing Modified Preorder Tree Traversal in Django
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18 # >= 1.8
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 # >= 1.8
 
 USE_GITHUB=	yes
 
diff --git a/www/py-django-openid-auth/Makefile b/www/py-django-openid-auth/Makefile
index f4e5515febd4..ab540b380622 100644
--- a/www/py-django-openid-auth/Makefile
+++ b/www/py-django-openid-auth/Makefile
@@ -14,8 +14,8 @@ COMMENT=	OpenID integration for django.contrib.auth
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:${PORTSDIR}/security/py-python-openid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:security/py-python-openid
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/www/py-django-overextends/Makefile b/www/py-django-overextends/Makefile
index 55e3c12e9e4e..3af8c285c6c6 100644
--- a/www/py-django-overextends/Makefile
+++ b/www/py-django-overextends/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Django reusable app enabling circular template inheritance
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.7:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.7:www/py-django18
 
 NO_ARCH=	yes
 
diff --git a/www/py-django-paging/Makefile b/www/py-django-paging/Makefile
index 5b6c4aafc102..7ae73168dd50 100644
--- a/www/py-django-paging/Makefile
+++ b/www/py-django-paging/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	django-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Paging module for Django
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile
index 5158446394d0..c8c97914bac5 100644
--- a/www/py-django-photologue/Makefile
+++ b/www/py-django-photologue/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Powerful image management and gallery application for Django
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:${PORTSDIR}/devel/py-pip
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-sortedm2m>0:${PORTSDIR}/www/py-django-sortedm2m \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}django-sortedm2m>0:www/py-django-sortedm2m \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-picklefield/Makefile b/www/py-django-picklefield/Makefile
index 8a9d4b300405..1e7d5292915c 100644
--- a/www/py-django-picklefield/Makefile
+++ b/www/py-django-picklefield/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Pickled object field for Django
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-pipeline/Makefile b/www/py-django-pipeline/Makefile
index 8c4fb5dfcbbb..20aaba82bf94 100644
--- a/www/py-django-pipeline/Makefile
+++ b/www/py-django-pipeline/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Asset (css/js) packaging library for Django
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/www/py-django-pipeline13/Makefile b/www/py-django-pipeline13/Makefile
index c6fccdaf533e..a9c6f9ae5e8d 100644
--- a/www/py-django-pipeline13/Makefile
+++ b/www/py-django-pipeline13/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Asset (css/js) packaging library for Django
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django16>0:${PORTSDIR}/www/py-django16
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django16>0:www/py-django16
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/www/py-django-piston/Makefile b/www/py-django-piston/Makefile
index e42ef43a2549..f090a9cd71c5 100644
--- a/www/py-django-piston/Makefile
+++ b/www/py-django-piston/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Piston is a Django mini-framework creating APIs
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-profiles/Makefile b/www/py-django-profiles/Makefile
index a0f41f43555c..a63e961d9962 100644
--- a/www/py-django-profiles/Makefile
+++ b/www/py-django-profiles/Makefile
@@ -15,7 +15,7 @@ COMMENT=	User-profile application for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 USES=		python
diff --git a/www/py-django-recaptcha/Makefile b/www/py-django-recaptcha/Makefile
index 346ec24776c3..c29bf263a608 100644
--- a/www/py-django-recaptcha/Makefile
+++ b/www/py-django-recaptcha/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	django-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Django reCAPTCHA form field/widget integration app
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-redis/Makefile b/www/py-django-redis/Makefile
index 26523f16deb5..e94d7bca8608 100644
--- a/www/py-django-redis/Makefile
+++ b/www/py-django-redis/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Full featured Redis cache/session backend for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}redis>=2.9.0:${PORTSDIR}/databases/py-redis
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}redis>=2.9.0:databases/py-redis
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-registration-defaults/Makefile b/www/py-django-registration-defaults/Makefile
index e3341e042911..ab126b172c83 100644
--- a/www/py-django-registration-defaults/Makefile
+++ b/www/py-django-registration-defaults/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Default templates and settings for django-registration
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-registration>=0:${PORTSDIR}/www/py-django-registration
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-registration>=0:www/py-django-registration
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-registration-redux/Makefile b/www/py-django-registration-redux/Makefile
index a4cfdad6e9b4..a054b8d738b0 100644
--- a/www/py-django-registration-redux/Makefile
+++ b/www/py-django-registration-redux/Makefile
@@ -12,7 +12,7 @@ COMMENT=	User-registration application for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.4:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile
index 60cd142a91a3..6567fb945010 100644
--- a/www/py-django-registration/Makefile
+++ b/www/py-django-registration/Makefile
@@ -12,7 +12,7 @@ COMMENT=	User-registration application for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.4:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-reversion/Makefile b/www/py-django-reversion/Makefile
index 66047e5b2443..008e94599e1d 100644
--- a/www/py-django-reversion/Makefile
+++ b/www/py-django-reversion/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provides comprehensive version control facilities to Django apps
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/www/py-django-sekizai/Makefile b/www/py-django-sekizai/Makefile
index 2cbf9de868eb..12a1f4b84e9d 100644
--- a/www/py-django-sekizai/Makefile
+++ b/www/py-django-sekizai/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	xenophon+fbsdports@irtnog.org
 COMMENT=	Block templating system for Django
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:${PORTSDIR}/www/py-django-classy-tags
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:www/py-django-classy-tags
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-signals-ahoy/Makefile b/www/py-django-signals-ahoy/Makefile
index 41cc339ebe78..0f1ed530819c 100644
--- a/www/py-django-signals-ahoy/Makefile
+++ b/www/py-django-signals-ahoy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Extended set of signals for use by Django apps
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-django-simple-captcha/Makefile b/www/py-django-simple-captcha/Makefile
index f89acb2b862a..01bfad544e43 100644
--- a/www/py-django-simple-captcha/Makefile
+++ b/www/py-django-simple-captcha/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Simple, yet powerful, Django captcha application
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-simple-history/Makefile b/www/py-django-simple-history/Makefile
index ce0cb4959adf..682a2800a2b9 100644
--- a/www/py-django-simple-history/Makefile
+++ b/www/py-django-simple-history/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Store model history and view/revert changes from admin site
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18 # >= 1.8
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 # >= 1.8
 
 USE_GITHUB=	yes
 
diff --git a/www/py-django-social-auth/Makefile b/www/py-django-social-auth/Makefile
index 9499b903ea41..a5033323cbf2 100644
--- a/www/py-django-social-auth/Makefile
+++ b/www/py-django-social-auth/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	django-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Setup social authentication/authorization mechanism for Django
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:${PORTSDIR}/security/py-python-social-auth
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:security/py-python-social-auth
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-sortedm2m/Makefile b/www/py-django-sortedm2m/Makefile
index 300f4ab79fd1..4c103e8994be 100644
--- a/www/py-django-sortedm2m/Makefile
+++ b/www/py-django-sortedm2m/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Replacement for Django's many to many field
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-django-statici18n/Makefile b/www/py-django-statici18n/Makefile
index 4ce3ea096ed4..e43c842e5ce2 100644
--- a/www/py-django-statici18n/Makefile
+++ b/www/py-django-statici18n/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Helper for generating Javascript catalog to static files
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:${PORTSDIR}/www/py-django-appconf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-subdomains/Makefile b/www/py-django-subdomains/Makefile
index a2588ebc6152..6bf87ff78942 100644
--- a/www/py-django-subdomains/Makefile
+++ b/www/py-django-subdomains/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rum1cro@yandex.ru
 COMMENT=	Subdomains helpers for the Django framework
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-sudo/Makefile b/www/py-django-sudo/Makefile
index b236664f9e75..aa67aa7630f9 100644
--- a/www/py-django-sudo/Makefile
+++ b/www/py-django-sudo/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	django-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Sudo mode is an extra layer of security for Django
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-tables2/Makefile b/www/py-django-tables2/Makefile
index fb2eb41d8dc6..2d4913430b41 100644
--- a/www/py-django-tables2/Makefile
+++ b/www/py-django-tables2/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Table/data-grid framework for Django
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 NO_ARCH=	yes
 
diff --git a/www/py-django-tagging/Makefile b/www/py-django-tagging/Makefile
index 8f56d87245d2..0c6d311e8f0d 100644
--- a/www/py-django-tagging/Makefile
+++ b/www/py-django-tagging/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Generic tagging application for Django
 LICENSE=	BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-taggit/Makefile b/www/py-django-taggit/Makefile
index 5d42ecdffecd..183fc4a560ad 100644
--- a/www/py-django-taggit/Makefile
+++ b/www/py-django-taggit/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Reusable Django application for simple tagging
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-tastypie/Makefile b/www/py-django-tastypie/Makefile
index acf4d0096237..90d02b6de68a 100644
--- a/www/py-django-tastypie/Makefile
+++ b/www/py-django-tastypie/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Create REST API for Django apps
 
 LICENSE=	BSD3CLAUSE
 
-MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:${PORTSDIR}/devel/py-mimeparse \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil
+MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil
 
 BUILD_DEPENDS=	${MY_DEPENDS}
 
 RUN_DEPENDS?=	${MY_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}django18>=1.5:${PORTSDIR}/www/py-django18
+		${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-templatetag-sugar/Makefile b/www/py-django-templatetag-sugar/Makefile
index ff4de88c1ed7..aa683a3dc6f7 100644
--- a/www/py-django-templatetag-sugar/Makefile
+++ b/www/py-django-templatetag-sugar/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	django-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Library to make writing templatetags in Django sweet
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-threaded-multihost/Makefile b/www/py-django-threaded-multihost/Makefile
index 2380aaee7fe4..03d8d0a3783d 100644
--- a/www/py-django-threaded-multihost/Makefile
+++ b/www/py-django-threaded-multihost/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Multi-host utilities to Django
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/www/py-django-tinymce/Makefile b/www/py-django-tinymce/Makefile
index c766b7ab0b88..3262cc6976ca 100644
--- a/www/py-django-tinymce/Makefile
+++ b/www/py-django-tinymce/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Django application to use TinyMCE editor
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
 
 NO_ARCH=	yes
 
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 058ff81ad325..e3dc889c1168 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -37,10 +37,10 @@ HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/django-admin.1.gz
 
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
-SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup
 
 .include <bsd.port.options.mk>
 
@@ -48,7 +48,7 @@ FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 .	if empty(PORT_OPTIONS:MDOCS)
 IGNORE=	you cannot build documentation with DOCS option disabled
 .	endif
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
diff --git a/www/py-django16-tastypie/Makefile b/www/py-django16-tastypie/Makefile
index b86680cb75c4..691b7db9d66a 100644
--- a/www/py-django16-tastypie/Makefile
+++ b/www/py-django16-tastypie/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Create REST API for Django apps using Django 1.6
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${MY_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}django16>0:${PORTSDIR}/www/py-django16
+		${PYTHON_PKGNAMEPREFIX}django16>0:www/py-django16
 
 MASTERDIR=	${.CURDIR}/../py-django-tastypie
 
diff --git a/www/py-django16/Makefile b/www/py-django16/Makefile
index 1967509da3a0..45513344315e 100644
--- a/www/py-django16/Makefile
+++ b/www/py-django16/Makefile
@@ -40,10 +40,10 @@ PLIST_FILES=	man/man1/daily_cleanup.1.gz \
 		man/man1/django-admin.1.gz \
 		man/man1/gather_profile_stats.1.gz
 
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
-SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup
 
 .include <bsd.port.options.mk>
 
@@ -51,7 +51,7 @@ FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 .	if empty(PORT_OPTIONS:MDOCS)
 IGNORE=	you cannot build documentation with DOCS option disabled
 .	endif
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
diff --git a/www/py-django18/Makefile b/www/py-django18/Makefile
index d938502e1e4d..3ef333f4b9ce 100644
--- a/www/py-django18/Makefile
+++ b/www/py-django18/Makefile
@@ -35,10 +35,10 @@ HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/django-admin.1.gz
 
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
-SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup
 
 .include <bsd.port.options.mk>
 
@@ -46,7 +46,7 @@ FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 .	if empty(PORT_OPTIONS:MDOCS)
 IGNORE=	you cannot build documentation with DOCS option disabled
 .	endif
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
diff --git a/www/py-django19/Makefile b/www/py-django19/Makefile
index b38fa88da991..713074fab896 100644
--- a/www/py-django19/Makefile
+++ b/www/py-django19/Makefile
@@ -35,10 +35,10 @@ HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/django-admin.1.gz
 
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
-SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup
 
 .include <bsd.port.options.mk>
 
@@ -46,7 +46,7 @@ FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 .	if empty(PORT_OPTIONS:MDOCS)
 IGNORE=	you cannot build documentation with DOCS option disabled
 .	endif
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
diff --git a/www/py-django_compressor/Makefile b/www/py-django_compressor/Makefile
index 516c6b112c46..d5fa920e6708 100644
--- a/www/py-django_compressor/Makefile
+++ b/www/py-django_compressor/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Compresses linked and inline JavaScript/CSS into a single cached file
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}versiontools>=1.8.2:${PORTSDIR}/devel/py-versiontools
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-appconf>=0.4:${PORTSDIR}/www/py-django-appconf
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}versiontools>=1.8.2:devel/py-versiontools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-appconf>=0.4:www/py-django-appconf
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -25,9 +25,9 @@ LXML_DESC=		Enable LxmlParser
 HTML5LIB_DESC=		Enable Html5LibParser
 SLIMIT_DESC=		Enable SlimIt JavaScript filter
 
-BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:${PORTSDIR}/www/py-beautifulsoup
-LXML_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
-HTML5LIB_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib
-SLIMIT_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}slimit>=0.8.1:${PORTSDIR}/www/py-slimit
+BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup
+LXML_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
+HTML5LIB_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
+SLIMIT_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}slimit>=0.8.1:www/py-slimit
 
 .include <bsd.port.mk>
diff --git a/www/py-djangotoolbox/Makefile b/www/py-djangotoolbox/Makefile
index 5ddc4ab875b8..5c011e58b779 100644
--- a/www/py-djangotoolbox/Makefile
+++ b/www/py-djangotoolbox/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Common API for running Django on non-relational/NoSQL databases
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-djblets/Makefile b/www/py-djblets/Makefile
index 9b67ee1d42dd..1f0bfdf59c44 100644
--- a/www/py-djblets/Makefile
+++ b/www/py-djblets/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Collection of useful classes and functions for Django
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	uglifyjs:${PORTSDIR}/www/uglifyjs
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django16>=1.6.11:${PORTSDIR}/www/py-django16 \
-		${PYTHON_PKGNAMEPREFIX}django-pipeline13>=1.3.27:${PORTSDIR}/www/py-django-pipeline13 \
-		${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.2:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+BUILD_DEPENDS=	uglifyjs:www/uglifyjs
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django16>=1.6.11:www/py-django16 \
+		${PYTHON_PKGNAMEPREFIX}django-pipeline13>=1.3.27:www/py-django-pipeline13 \
+		${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.2:textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 NO_ARCH=	yes
 USES=		gettext-tools python:-2.7 shebangfix
diff --git a/www/py-dojango/Makefile b/www/py-dojango/Makefile
index 0f299d531d40..0308146145b1 100644
--- a/www/py-dojango/Makefile
+++ b/www/py-dojango/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Django application for building dojo
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6:${PORTSDIR}/www/py-django18
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18
 
 OPTIONS_DEFINE=		JAVA
 
diff --git a/www/py-evernote/Makefile b/www/py-evernote/Makefile
index 5e7bdee5791c..5726a3215193 100644
--- a/www/py-evernote/Makefile
+++ b/www/py-evernote/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Evernote SDK for Python
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oauth2>0:${PORTSDIR}/net/py-oauth2 \
-		${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oauth2>0:net/py-oauth2 \
+		${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-falcon/Makefile b/www/py-falcon/Makefile
index e0ef0dd8098c..111a9e06be66 100644
--- a/www/py-falcon/Makefile
+++ b/www/py-falcon/Makefile
@@ -13,9 +13,9 @@ COMMENT=	High-performance Python framework for building cloud APIs
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	cython>=0.11.2:${PORTSDIR}/lang/cython
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}testtools>=0:${PORTSDIR}/devel/py-testtools \
-		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	cython>=0.11.2:lang/cython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools \
+		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-fedex/Makefile b/www/py-fedex/Makefile
index 12e5e82a4c2a..5131eb7f0a40 100644
--- a/www/py-fedex/Makefile
+++ b/www/py-fedex/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Light wrapper around Fedex's Web Services SOAP API using suds
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}suds>=0:${PORTSDIR}/net/py-suds
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}suds>=0:net/py-suds
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/www/py-feedgenerator/Makefile b/www/py-feedgenerator/Makefile
index b5cc05bccb7e..0e4ebf9574c1 100644
--- a/www/py-feedgenerator/Makefile
+++ b/www/py-feedgenerator/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Standalone version of django.utils.feedgenerator
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-flask-admin/Makefile b/www/py-flask-admin/Makefile
index 02a0a677a159..42a8f4252326 100644
--- a/www/py-flask-admin/Makefile
+++ b/www/py-flask-admin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Flask extension for adding admin interfaces to Flask applications
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}wtforms>0:${PORTSDIR}/textproc/py-wtforms
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-flask-bootstrap/Makefile b/www/py-flask-bootstrap/Makefile
index 172f2a15fb71..089c35dfb803 100644
--- a/www/py-flask-bootstrap/Makefile
+++ b/www/py-flask-bootstrap/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Flask extension that adds Bootstrap to your projects
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:${PORTSDIR}/www/py-flask
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-flask-cache/Makefile b/www/py-flask-cache/Makefile
index 12fcdfab3842..32d609790041 100644
--- a/www/py-flask-cache/Makefile
+++ b/www/py-flask-cache/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Cache support for your Flask application
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.8:${PORTSDIR}/www/py-flask
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-flask-cors/Makefile b/www/py-flask-cors/Makefile
index 39ee9ef94c93..21f47e142f0c 100644
--- a/www/py-flask-cors/Makefile
+++ b/www/py-flask-cors/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Cross-origin resource sharing (CORS) for Flask
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.9:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-flask-flatpages/Makefile b/www/py-flask-flatpages/Makefile
index 9ee1f06d3a6e..6676a31335a1 100644
--- a/www/py-flask-flatpages/Makefile
+++ b/www/py-flask-flatpages/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Provides flat static pages to a Flask application
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml  \
-		${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdown
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml  \
+		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-flask-oauthlib/Makefile b/www/py-flask-oauthlib/Makefile
index 6b05c6d08d67..4cd7fe468d4a 100644
--- a/www/py-flask-oauthlib/Makefile
+++ b/www/py-flask-oauthlib/Makefile
@@ -12,9 +12,9 @@ COMMENT=	OAuthlib for Flask
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}oauthlib>0:${PORTSDIR}/security/py-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:${PORTSDIR}/www/py-requests-oauthlib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-flask-restful/Makefile b/www/py-flask-restful/Makefile
index 8113280aaa97..40f9b8b33e68 100644
--- a/www/py-flask-restful/Makefile
+++ b/www/py-flask-restful/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Simple framework for creating REST APIs with Flask
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aniso8601>0:${PORTSDIR}/devel/py-aniso8601 \
-		${PYTHON_PKGNAMEPREFIX}Flask>0:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aniso8601>0:devel/py-aniso8601 \
+		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-flask-sockets/Makefile b/www/py-flask-sockets/Makefile
index 252857e0859f..dd6e693fd06a 100644
--- a/www/py-flask-sockets/Makefile
+++ b/www/py-flask-sockets/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Elegant WebSockets for your Flask apps
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}gevent>=0:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:${PORTSDIR}/www/py-gevent-websocket
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-flask-uploads/Makefile b/www/py-flask-uploads/Makefile
index ff1d449afd17..b2186b421f75 100644
--- a/www/py-flask-uploads/Makefile
+++ b/www/py-flask-uploads/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Flexible and efficient upload handling for Flask
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask
 
 USES=	python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-flask-wtf/Makefile b/www/py-flask-wtf/Makefile
index c788ad84e403..717e173d55dd 100644
--- a/www/py-flask-wtf/Makefile
+++ b/www/py-flask-wtf/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Simple integration of Flask and WTForms
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}werkzeug>0:${PORTSDIR}/www/py-werkzeug \
-		${PYTHON_PKGNAMEPREFIX}wtforms>0:${PORTSDIR}/textproc/py-wtforms
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:${PORTSDIR}/devel/py-flask-babel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug \
+		${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel
 
 OPTIONS_DEFINE=		TESTS
 TESTS_DESC=		Install test suite dependencies
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index 2ea501bc457e..57adb933f014 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Micro web framework
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}werkzeug>=0.9:${PORTSDIR}/www/py-werkzeug \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.6:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}itsdangerous>=0.21:${PORTSDIR}/security/py-itsdangerous
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}werkzeug>=0.9:www/py-werkzeug \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.6:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}itsdangerous>=0.21:security/py-itsdangerous
 
 USES=	python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile
index 606db5e2456a..acf9f4743d32 100644
--- a/www/py-flexget/Makefile
+++ b/www/py-flexget/Makefile
@@ -14,31 +14,31 @@ COMMENT=	Program to automate downloading from different sources
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paver>=0:${PORTSDIR}/devel/py-paver
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.3:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.5:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_SITELIBDIR}/bs4/__init__.py:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:${PORTSDIR}/www/py-html5lib \
-		${PYTHON_PKGNAMEPREFIX}rss2gen>0:${PORTSDIR}/textproc/py-rss2gen \
-		${PYTHON_PKGNAMEPREFIX}pynzb>0:${PORTSDIR}/news/py-pynzb \
-		${PYTHON_PKGNAMEPREFIX}progressbar>0:${PORTSDIR}/misc/py-progressbar \
-		${PYTHON_PKGNAMEPREFIX}rpyc>0:${PORTSDIR}/devel/py-RPyC \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}Flask>0:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}cherrypy>0:${PORTSDIR}/www/py-cherrypy \
-		${PYTHON_PKGNAMEPREFIX}requests>=1.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:${PORTSDIR}/devel/py-jsonschema \
-		${PYTHON_PKGNAMEPREFIX}tvrage>0:${PORTSDIR}/devel/py-tvrage \
-		${PYTHON_PKGNAMEPREFIX}tmdb3>0:${PORTSDIR}/www/py-tmdb3 \
-		${PYTHON_PKGNAMEPREFIX}apscheduler>0:${PORTSDIR}/devel/py-apscheduler \
-		${PYTHON_PKGNAMEPREFIX}guessit>=0.9.3:${PORTSDIR}/multimedia/py-guessit \
-		${PYTHON_PKGNAMEPREFIX}path.py>=6.2:${PORTSDIR}/devel/py-path.py
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paver>=0:devel/py-paver
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.3:textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.5:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \
+		${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib \
+		${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen \
+		${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb \
+		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
+		${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy \
+		${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema \
+		${PYTHON_PKGNAMEPREFIX}tvrage>0:devel/py-tvrage \
+		${PYTHON_PKGNAMEPREFIX}tmdb3>0:www/py-tmdb3 \
+		${PYTHON_PKGNAMEPREFIX}apscheduler>0:devel/py-apscheduler \
+		${PYTHON_PKGNAMEPREFIX}guessit>=0.9.3:multimedia/py-guessit \
+		${PYTHON_PKGNAMEPREFIX}path.py>=6.2:devel/py-path.py
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-formalchemy/Makefile b/www/py-formalchemy/Makefile
index ab6d4207a197..49aa93cf6f57 100644
--- a/www/py-formalchemy/Makefile
+++ b/www/py-formalchemy/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Toolkit for creating HTML form elements
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.4.5:${PORTSDIR}/databases/py-sqlalchemy06 \
-		${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:${PORTSDIR}/textproc/py-Tempita \
-		${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:${PORTSDIR}/www/py-webhelpers
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.4.5:databases/py-sqlalchemy06 \
+		${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita \
+		${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/www/py-frappe-bench/Makefile b/www/py-frappe-bench/Makefile
index 5d9310b8c141..2ffe89e7dcaf 100644
--- a/www/py-frappe-bench/Makefile
+++ b/www/py-frappe-bench/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Frappe / ERPNext apps setup tool
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}virtualenv>0:${PORTSDIR}/devel/py-virtualenv \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}honcho>0:${PORTSDIR}/sysutils/py-honcho \
-		${PYTHON_PKGNAMEPREFIX}semantic_version>0:${PORTSDIR}/devel/py-semantic_version \
-		${PYTHON_PKGNAMEPREFIX}GitPython>=1.0.1:${PORTSDIR}/devel/py-gitpython \
-		${PYTHON_PKGNAMEPREFIX}pip>0:${PORTSDIR}/devel/py-pip \
-		git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}honcho>0:sysutils/py-honcho \
+		${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version \
+		${PYTHON_PKGNAMEPREFIX}GitPython>=1.0.1:devel/py-gitpython \
+		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip \
+		git:devel/git
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	frappe
diff --git a/www/py-frozen-flask/Makefile b/www/py-frozen-flask/Makefile
index 0c453d95e506..5d0f327a9a87 100644
--- a/www/py-frozen-flask/Makefile
+++ b/www/py-frozen-flask/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Freezes a Flask application into a set of static files
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0:${PORTSDIR}/www/py-flask
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile
index 63c839aa2cf2..819a2cfd73dd 100644
--- a/www/py-funkload/Makefile
+++ b/www/py-funkload/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Functional and load web tester
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils \
-		${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot \
-		${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:${PORTSDIR}/www/py-webunit \
-		tcpwatch.py:${PORTSDIR}/net/tcpwatch
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \
+		${LOCALBASE}/bin/gnuplot:math/gnuplot \
+		${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:www/py-webunit \
+		tcpwatch.py:net/tcpwatch
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-gandi.cli/Makefile b/www/py-gandi.cli/Makefile
index ee050e0bd126..a0cd9f67bfb7 100644
--- a/www/py-gandi.cli/Makefile
+++ b/www/py-gandi.cli/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Gandi command line interface
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}click>=3.1:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}ipy>0:${PORTSDIR}/net-mgmt/py-ipy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}click>=3.1:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
@@ -26,7 +26,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 post-extract:
diff --git a/www/py-gevent-websocket/Makefile b/www/py-gevent-websocket/Makefile
index b86d1b4acbda..0383424eea3e 100644
--- a/www/py-gevent-websocket/Makefile
+++ b/www/py-gevent-websocket/Makefile
@@ -13,7 +13,7 @@ COMMENT=	WebSocket library for the gevent networking library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gevent>=0:${PORTSDIR}/devel/py-gevent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-goobook/Makefile b/www/py-goobook/Makefile
index f7771c12f886..0f53879cd68e 100644
--- a/www/py-goobook/Makefile
+++ b/www/py-goobook/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Search your Google contacts from the command-line or Mutt
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oauth2client>=1.4.12:${PORTSDIR}/security/py-oauth2client \
-		${PYTHON_PKGNAMEPREFIX}gdata>=2.0.18:${PORTSDIR}/devel/py-gdata \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:${PORTSDIR}/www/py-httplib2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oauth2client>=1.4.12:security/py-oauth2client \
+		${PYTHON_PKGNAMEPREFIX}gdata>=2.0.18:devel/py-gdata \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2
 
 NO_ARCH=	yes
 USES=		python:-2.7
diff --git a/www/py-google-api-python-client/Makefile b/www/py-google-api-python-client/Makefile
index e000b79be57b..03df40b2ceca 100644
--- a/www/py-google-api-python-client/Makefile
+++ b/www/py-google-api-python-client/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Google API Client Library for Python
 
 LICENSE=	APACHE20
 
-#BUILD_DEPENDS=	${PKGNAMEPREFIX}oauth2client>=1.4.6:${PORTSDIR}/security/py-oauth2client
-RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0.8:${PORTSDIR}/www/py-httplib2 \
-		${PKGNAMEPREFIX}oauth2client>=1.4.6:${PORTSDIR}/security/py-oauth2client \
-		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:${PORTSDIR}/devel/py-six \
-		${PKGNAMEPREFIX}uritemplate>=0.6:${PORTSDIR}/net/py-uritemplate
+#BUILD_DEPENDS=	${PKGNAMEPREFIX}oauth2client>=1.4.6:security/py-oauth2client
+RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0.8:www/py-httplib2 \
+		${PKGNAMEPREFIX}oauth2client>=1.4.6:security/py-oauth2client \
+		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \
+		${PKGNAMEPREFIX}uritemplate>=0.6:net/py-uritemplate
 
 DJANGO_DESC=	Use the library with Django
-DJANGO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3:${PORTSDIR}/www/py-django18
+DJANGO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18
 
 GAE_DESC=	Use the library with Google App Engine
-GAE_RUN_DEPENDS=	google-appengine>=1.4.3:${PORTSDIR}/www/google-appengine
+GAE_RUN_DEPENDS=	google-appengine>=1.4.3:www/google-appengine
 
 OPTIONS_DEFINE=	DJANGO GAE WEBTEST
 
@@ -31,7 +31,7 @@ USES=		python
 USE_PYTHON=	autoplist distutils
 
 WEBTEST_DESC=	Use WebTest helper to test WSGI apps
-WEBTEST_RUN_DEPENDS=	${PKGNAMEPREFIX}WebTest>=1.3.3:${PORTSDIR}/www/py-WebTest \
-			${PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl
+WEBTEST_RUN_DEPENDS=	${PKGNAMEPREFIX}WebTest>=1.3.3:www/py-WebTest \
+			${PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
 
 .include <bsd.port.mk>
diff --git a/www/py-google/Makefile b/www/py-google/Makefile
index 739cb35e6195..ca04db24883d 100644
--- a/www/py-google/Makefile
+++ b/www/py-google/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python bindings to the Google search engine
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:${PORTSDIR}/www/py-beautifulsoup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-graphite-web/Makefile b/www/py-graphite-web/Makefile
index 11426c564b47..2707b468dacd 100644
--- a/www/py-graphite-web/Makefile
+++ b/www/py-graphite-web/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Enterprise scalable realtime graphing platform
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:${PORTSDIR}/graphics/py-cairo \
-		${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:${PORTSDIR}/databases/py-carbon \
-		${PYTHON_PKGNAMEPREFIX}django18>=1.4:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:${PORTSDIR}/www/py-django-tagging \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		xorg-fonts-truetype>=0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo \
+		${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon \
+		${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype
 
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
 USES=		python:2
diff --git a/www/py-grequests/Makefile b/www/py-grequests/Makefile
index f822bb231bcf..9b2cb33712be 100644
--- a/www/py-grequests/Makefile
+++ b/www/py-grequests/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Requests with Gevent to make asyncronous HTTP requests
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gevent>0:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kennethreitz
diff --git a/www/py-gunicorn/Makefile b/www/py-gunicorn/Makefile
index dee511e8df2a..8e6063e73435 100644
--- a/www/py-gunicorn/Makefile
+++ b/www/py-gunicorn/Makefile
@@ -12,7 +12,7 @@ COMMENT=	WSGI HTTP Server for UNIX
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 OPTIONS_DEFINE=		PROCTITLE
 OPTIONS_DEFAULT=	PROCTITLE
@@ -25,11 +25,11 @@ GEVENT_DESC=	Gevent async worker (Requires Python < 3.x)
 PROCTITLE_DESC=	Custom process titles with setproctitle(3)
 TORNADO_DESC=	Tornado async worker
 
-EVENTLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.7:${PORTSDIR}/net/py-eventlet
-GAIOHTTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>0:${PORTSDIR}/www/py-aiohttp
-GEVENT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gevent>=0.12.2:${PORTSDIR}/devel/py-gevent
-PROCTITLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setproctitle>0:${PORTSDIR}/devel/py-setproctitle
-TORNADO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>=2.2:${PORTSDIR}/www/py-tornado
+EVENTLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.7:net/py-eventlet
+GAIOHTTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp
+GEVENT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gevent>=0.12.2:devel/py-gevent
+PROCTITLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle
+TORNADO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>=2.2:www/py-tornado
 
 USES=			python
 USE_GITHUB=		yes
@@ -46,7 +46,7 @@ NO_ARCH=	yes
 BROKEN=	GAIOHTTP requires Python 3.3+ but this port is building with Python ${PYTHON_VER}. \
 	Disable the GAIOHTTP option or change the version of Python to build with, using DEFAULT_VERSIONS
 .endif
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 .if ${PYTHON_REL} > 3000 && ${PORT_OPTIONS:MGEVENT}
diff --git a/www/py-html5lib/Makefile b/www/py-html5lib/Makefile
index 4d6a37dd53b0..b7f0dcc3035b 100644
--- a/www/py-html5lib/Makefile
+++ b/www/py-html5lib/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python based HTML parser based on the HTML5 spec
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 OPTIONS_DEFINE=	TEST
 
diff --git a/www/py-hyper/Makefile b/www/py-hyper/Makefile
index 07ae6fe48c97..dd0dfbd7d2da 100644
--- a/www/py-hyper/Makefile
+++ b/www/py-hyper/Makefile
@@ -13,9 +13,9 @@ COMMENT=	HTTP/2 Client for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -25,8 +25,8 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} == 3300 || (${PYTHON_VER} == 2.7 && ${PYTHON_REL} < 2709)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openssl>=0.14:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PGNAMEPREFIX}service_identity>=14.0.0:${PORTSDIR}/security/py-service_identity
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \
+		${PYTHON_PGNAMEPREFIX}service_identity>=14.0.0:security/py-service_identity
 .endif
 
 post-extract:
diff --git a/www/py-imdbpy/Makefile b/www/py-imdbpy/Makefile
index de882f69d0ca..18c12a7ba869 100644
--- a/www/py-imdbpy/Makefile
+++ b/www/py-imdbpy/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Retrieve and manage the data of the IMDb movie database
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:${PORTSDIR}/databases/py-sqlalchemy-migrate \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}sqlobject>=0:${PORTSDIR}/databases/py-sqlobject
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:databases/py-sqlalchemy-migrate \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}sqlobject>=0:databases/py-sqlobject
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/www/py-jswebkit/Makefile b/www/py-jswebkit/Makefile
index 2b9281dfaa07..940f29aa32ae 100644
--- a/www/py-jswebkit/Makefile
+++ b/www/py-jswebkit/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WebKit/JavaScriptCore Python bindings
 
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython:lang/cython
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 USES=		pkgconfig python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-pafy/Makefile b/www/py-pafy/Makefile
index 5258ce74fa54..f7de9d2b4b31 100644
--- a/www/py-pafy/Makefile
+++ b/www/py-pafy/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python API for YouTube
 LICENSE=	GPLv3
 
 # At the moment the internal backend does not work
-BUILD_DEPENDS=	youtube_dl>=2016.02.22:${PORTSDIR}/www/youtube_dl
-RUN_DEPENDS=	youtube_dl>=2016.02.22:${PORTSDIR}/www/youtube_dl
+BUILD_DEPENDS=	youtube_dl>=2016.02.22:www/youtube_dl
+RUN_DEPENDS=	youtube_dl>=2016.02.22:www/youtube_dl
 
 USES=	python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile
index 5de74dc32ee9..f0d420956f38 100644
--- a/www/py-paste/Makefile
+++ b/www/py-paste/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Tools for using a Web Server Gateway Interface stack
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-pastedeploy/Makefile b/www/py-pastedeploy/Makefile
index 3f6b884bed42..4dbc911bdd76 100644
--- a/www/py-pastedeploy/Makefile
+++ b/www/py-pastedeploy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Load, configure, and compose WSGI applications and servers
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.6:${PORTSDIR}/www/py-paste
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.6:www/py-paste
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/www/py-pastescript/Makefile b/www/py-pastescript/Makefile
index 4f9892b3013f..60a2ddefbb78 100644
--- a/www/py-pastescript/Makefile
+++ b/www/py-pastescript/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Pluggable command-line frontend
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:${PORTSDIR}/devel/py-cheetah \
-		${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup \
-		${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:${PORTSDIR}/www/py-paste \
-		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.2:${PORTSDIR}/www/py-pastedeploy \
-		${PYTHON_PKGNAMEPREFIX}wsgiutils>0:${PORTSDIR}/devel/py-wsgiutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:devel/py-cheetah \
+		${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup \
+		${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste \
+		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.2:www/py-pastedeploy \
+		${PYTHON_PKGNAMEPREFIX}wsgiutils>0:devel/py-wsgiutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile
index ac99df5b5582..497dca31cc8e 100644
--- a/www/py-pelican/Makefile
+++ b/www/py-pelican/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Static site generator written in Python
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}feedgenerator>=1.6:${PORTSDIR}/www/py-feedgenerator \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}blinker>0:${PORTSDIR}/devel/py-blinker \
-		${PYTHON_PKGNAMEPREFIX}unidecode>0:${PORTSDIR}/converters/py-unidecode \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	rst2html:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}feedgenerator>=1.6:www/py-feedgenerator \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
+		${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_GITHUB=	yes
@@ -32,10 +32,10 @@ OPTIONS_DEFINE=		MARKDOWN SYNTAX
 OPTIONS_DEFAULT=	MARKDOWN SYNTAX
 
 MARKDOWN_DESC=		Markdown markup language format support
-MARKDOWN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdown
+MARKDOWN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown
 
 SYNTAX_DESC=		Syntax Highlighting (via pygments)
-SYNTAX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.4:${PORTSDIR}/textproc/py-pygments
+SYNTAX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.4:textproc/py-pygments
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/www/py-plone.app.blob/Makefile b/www/py-plone.app.blob/Makefile
index 7077e0489f4c..8dd110a155cb 100644
--- a/www/py-plone.app.blob/Makefile
+++ b/www/py-plone.app.blob/Makefile
@@ -12,11 +12,11 @@ COMMENT=	ZODB blob support for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=3.4:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}archetypes.schemaextender>=1.6:${PORTSDIR}/devel/py-archetypes.schemaextender \
-		${PYTHON_PKGNAMEPREFIX}plone.app.imaging>1.0:${PORTSDIR}/www/py-plone.app.imaging \
-		${PYTHON_PKGNAMEPREFIX}plone.scale>=0:${PORTSDIR}/www/py-plone.scale
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=3.4:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}archetypes.schemaextender>=1.6:devel/py-archetypes.schemaextender \
+		${PYTHON_PKGNAMEPREFIX}plone.app.imaging>1.0:www/py-plone.app.imaging \
+		${PYTHON_PKGNAMEPREFIX}plone.scale>=0:www/py-plone.scale
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/www/py-plone.app.caching/Makefile b/www/py-plone.app.caching/Makefile
index 99f0cbfe7409..ab3d44f169fd 100644
--- a/www/py-plone.app.caching/Makefile
+++ b/www/py-plone.app.caching/Makefile
@@ -12,26 +12,26 @@ COMMENT=	Plone UI and default rules for plone.caching/z3c.caching
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}plone.caching>=0:${PORTSDIR}/www/py-plone.caching \
-		${PYTHON_PKGNAMEPREFIX}plone.cachepurging>=0:${PORTSDIR}/www/py-plone.cachepurging \
-		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:${PORTSDIR}/www/py-plone.app.registry \
-		${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:${PORTSDIR}/devel/py-zope.browserresource \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.protect>=0:${PORTSDIR}/security/py-plone.protect \
-		${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:${PORTSDIR}/www/py-plone.registry \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:${PORTSDIR}/www/py-plone.app.z3cform \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:${PORTSDIR}/devel/py-z3c.zcmlhook
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching \
+		${PYTHON_PKGNAMEPREFIX}plone.cachepurging>=0:www/py-plone.cachepurging \
+		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry \
+		${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \
+		${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \
+		${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook
 
 NO_ARCH=	yes
 USES=		python zope zip
diff --git a/www/py-plone.app.collection/Makefile b/www/py-plone.app.collection/Makefile
index dc82ba78ffb0..4acd770c74dd 100644
--- a/www/py-plone.app.collection/Makefile
+++ b/www/py-plone.app.collection/Makefile
@@ -12,24 +12,24 @@ COMMENT=	Tools for constructing navigation and site sections
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=1.0.2:${PORTSDIR}/devel/py-archetypes.querywidget \
-		${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:${PORTSDIR}/www/py-plone.app.contentlisting \
-		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
-		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:${PORTSDIR}/www/py-plone.app.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
-		${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>0:${PORTSDIR}/www/py-plone.portlet.collection \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:${PORTSDIR}/devel/py-Products.Archetypes \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:${PORTSDIR}/devel/py-Products.CMFQuickInstallerTool \
-		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:${PORTSDIR}/devel/py-Products.validation \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=1.0.2:devel/py-archetypes.querywidget \
+		${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting \
+		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
+		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
+		${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>0:www/py-plone.portlet.collection \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \
+		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 NO_ARCH=	yes
 USES=		python zope
diff --git a/www/py-plone.app.content/Makefile b/www/py-plone.app.content/Makefile
index aa37257bcbf9..4a36a3766cea 100644
--- a/www/py-plone.app.content/Makefile
+++ b/www/py-plone.app.content/Makefile
@@ -12,22 +12,22 @@ COMMENT=	Content Views for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.batching>0:${PORTSDIR}/www/py-plone.batching \
-		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:${PORTSDIR}/www/py-plone.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.2.0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \
+		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.2.0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault
 
 NO_ARCH=	yes
 USES=		python:2.7 zope zip
diff --git a/www/py-plone.app.contentlisting/Makefile b/www/py-plone.app.contentlisting/Makefile
index fa200d594cdb..0e1324065044 100644
--- a/www/py-plone.app.contentlisting/Makefile
+++ b/www/py-plone.app.contentlisting/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Listing of content for the Plone CMS
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.app.contentmenu/Makefile b/www/py-plone.app.contentmenu/Makefile
index 24e8074771b8..802349f7a8df 100644
--- a/www/py-plone.app.contentmenu/Makefile
+++ b/www/py-plone.app.contentmenu/Makefile
@@ -12,20 +12,20 @@ COMMENT=	Plone's content menu implementation
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.locking>=0:${PORTSDIR}/www/py-plone.locking \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.app.content>=2.0:${PORTSDIR}/www/py-plone.app.content \
-		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:${PORTSDIR}/devel/py-zope.browsermenu \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.app.content>=2.0:www/py-plone.app.content \
+		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI
 
 NO_ARCH=	yes
 USES=		python zope
diff --git a/www/py-plone.app.contentrules/Makefile b/www/py-plone.app.contentrules/Makefile
index 40ac0c3f5203..52cd09c2d344 100644
--- a/www/py-plone.app.contentrules/Makefile
+++ b/www/py-plone.app.contentrules/Makefile
@@ -12,32 +12,32 @@ COMMENT=	Plone integration for plone.contentrules
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.formlib \
-		${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:${PORTSDIR}/www/py-plone.contentrules \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.stringinterp>=0:${PORTSDIR}/www/py-plone.stringinterp \
-		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
-		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.11.0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
+		${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.stringinterp>=0:www/py-plone.stringinterp \
+		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
+		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.11.0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/www/py-plone.app.controlpanel/Makefile b/www/py-plone.app.controlpanel/Makefile
index 05f13d27cf64..160b4b7d342d 100644
--- a/www/py-plone.app.controlpanel/Makefile
+++ b/www/py-plone.app.controlpanel/Makefile
@@ -12,32 +12,32 @@ COMMENT=	Formlib-based controlpanels for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
-		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
-		${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:${PORTSDIR}/www/py-plone.app.workflow \
-		${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:${PORTSDIR}/www/py-plone.fieldsets \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.protect>=0:${PORTSDIR}/security/py-plone.protect \
-		${PYTHON_PKGNAMEPREFIX}plone.locking>=0:${PORTSDIR}/www/py-plone.locking \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.cachedescriptors>=0:${PORTSDIR}/devel/py-zope.cachedescriptors \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:${PORTSDIR}/devel/py-zope.ramcache \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:${PORTSDIR}/security/py-Products.PlonePAS \
-		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:${PORTSDIR}/devel/py-Products.PortalTransforms \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
+		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
+		${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow \
+		${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \
+		${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.cachedescriptors>=0:devel/py-zope.cachedescriptors \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \
+		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python:2.7 zip zope
diff --git a/www/py-plone.app.customerize/Makefile b/www/py-plone.app.customerize/Makefile
index 0ac42ba6174e..9bf49ffc43f1 100644
--- a/www/py-plone.app.customerize/Makefile
+++ b/www/py-plone.app.customerize/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Integrate five.customerize into Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.customerize>=0:${PORTSDIR}/devel/py-five.customerize \
-		${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=0:${PORTSDIR}/www/py-plone.browserlayer \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize \
+		${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=0:www/py-plone.browserlayer \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.app.dexterity/Makefile b/www/py-plone.app.dexterity/Makefile
index c13a30c1fae9..9046b9d71adb 100644
--- a/www/py-plone.app.dexterity/Makefile
+++ b/www/py-plone.app.dexterity/Makefile
@@ -12,32 +12,32 @@ COMMENT=	Flexible CMF content
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>0:${PORTSDIR}/devel/py-collective.z3cform.datetimewidget \
-		${PYTHON_PKGNAMEPREFIX}plone.app.textfield>0:${PORTSDIR}/www/py-plone.app.textfield \
-		${PYTHON_PKGNAMEPREFIX}plone.behavior>0:${PORTSDIR}/www/py-plone.behavior \
-		${PYTHON_PKGNAMEPREFIX}plone.dexterity>0:${PORTSDIR}/www/py-plone.dexterity \
-		${PYTHON_PKGNAMEPREFIX}plone.formwidget.namedfile>0:${PORTSDIR}/www/py-plone.formwidget.namedfile \
-		${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:${PORTSDIR}/www/py-plone.namedfile \
-		${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:${PORTSDIR}/www/py-plone.rfc822 \
-		${PYTHON_PKGNAMEPREFIX}plone.schemaeditor>0:${PORTSDIR}/www/py-plone.schemaeditor \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}plone.app.content>0:${PORTSDIR}/www/py-plone.app.content \
-		${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:${PORTSDIR}/www/py-plone.app.layout \
-		${PYTHON_PKGNAMEPREFIX}plone.app.uuid>0:${PORTSDIR}/www/py-plone.app.uuid \
-		${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>0:${PORTSDIR}/www/py-plone.app.z3cform \
-		${PYTHON_PKGNAMEPREFIX}plone.autoform>0:${PORTSDIR}/www/py-plone.autoform \
-		${PYTHON_PKGNAMEPREFIX}plone.contentrules>0:${PORTSDIR}/www/py-plone.contentrules \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:${PORTSDIR}/www/py-plone.supermodel \
-		${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:${PORTSDIR}/www/py-plone.z3cform \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>0:${PORTSDIR}/devel/py-z3c.form
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>0:devel/py-collective.z3cform.datetimewidget \
+		${PYTHON_PKGNAMEPREFIX}plone.app.textfield>0:www/py-plone.app.textfield \
+		${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior \
+		${PYTHON_PKGNAMEPREFIX}plone.dexterity>0:www/py-plone.dexterity \
+		${PYTHON_PKGNAMEPREFIX}plone.formwidget.namedfile>0:www/py-plone.formwidget.namedfile \
+		${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile \
+		${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822 \
+		${PYTHON_PKGNAMEPREFIX}plone.schemaeditor>0:www/py-plone.schemaeditor \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content \
+		${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout \
+		${PYTHON_PKGNAMEPREFIX}plone.app.uuid>0:www/py-plone.app.uuid \
+		${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>0:www/py-plone.app.z3cform \
+		${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform \
+		${PYTHON_PKGNAMEPREFIX}plone.contentrules>0:www/py-plone.contentrules \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel \
+		${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/www/py-plone.app.discussion/Makefile b/www/py-plone.app.discussion/Makefile
index 38f9a82a758a..d9e8aca87a28 100644
--- a/www/py-plone.app.discussion/Makefile
+++ b/www/py-plone.app.discussion/Makefile
@@ -12,23 +12,23 @@ COMMENT=	Enhanced discussion support for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}collective.monkeypatcher>=0:${PORTSDIR}/devel/py-collective.monkeypatcher \
-		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:${PORTSDIR}/www/py-plone.app.layout \
-		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:${PORTSDIR}/www/py-plone.app.registry \
-		${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:${PORTSDIR}/www/py-plone.app.uuid \
-		${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:${PORTSDIR}/www/py-plone.app.z3cform \
-		${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:${PORTSDIR}/www/py-plone.indexer \
-		${PYTHON_PKGNAMEPREFIX}plone.registry>=0:${PORTSDIR}/www/py-plone.registry \
-		${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:${PORTSDIR}/www/py-plone.z3cform \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>=2.3.3:${PORTSDIR}/devel/py-z3c.form
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}collective.monkeypatcher>=0:devel/py-collective.monkeypatcher \
+		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout \
+		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry \
+		${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid \
+		${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform \
+		${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer \
+		${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \
+		${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>=2.3.3:devel/py-z3c.form
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/www/py-plone.app.folder/Makefile b/www/py-plone.app.folder/Makefile
index 9e899824eb94..be0565816b1d 100644
--- a/www/py-plone.app.folder/Makefile
+++ b/www/py-plone.app.folder/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Integration package for plone.folder into Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}plone.folder>0:${PORTSDIR}/www/py-plone.folder \
-		${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:${PORTSDIR}/www/py-plone.app.layout
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder \
+		${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout
 
 NO_ARCH=	yes
 USES=		python zip zope
diff --git a/www/py-plone.app.form/Makefile b/www/py-plone.app.form/Makefile
index c8389e5ed64b..245a632b0b97 100644
--- a/www/py-plone.app.form/Makefile
+++ b/www/py-plone.app.form/Makefile
@@ -12,23 +12,23 @@ COMMENT=	zope.formlib integration for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.formlib \
-		${PYTHON_PKGNAMEPREFIX}plone.locking>=0:${PORTSDIR}/www/py-plone.locking \
-		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
+		${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
+		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/www/py-plone.app.imaging/Makefile b/www/py-plone.app.imaging/Makefile
index 74d02c7efc2f..85345125318b 100644
--- a/www/py-plone.app.imaging/Makefile
+++ b/www/py-plone.app.imaging/Makefile
@@ -12,8 +12,8 @@ COMMENT=	User-configurable, blob-aware image scaling for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.scale>0:${PORTSDIR}/www/py-plone.scale \
-		${PYTHON_PKGNAMEPREFIX}z3c.caching>0:${PORTSDIR}/devel/py-z3c.caching
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.scale>0:www/py-plone.scale \
+		${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.app.iterate/Makefile b/www/py-plone.app.iterate/Makefile
index 75409cef3676..a7df6744801f 100644
--- a/www/py-plone.app.iterate/Makefile
+++ b/www/py-plone.app.iterate/Makefile
@@ -12,25 +12,25 @@ COMMENT=	Check-out and check-in staging for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.locking>=0:${PORTSDIR}/www/py-plone.locking \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:${PORTSDIR}/devel/py-Products.Archetypes \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:${PORTSDIR}/devel/py-Products.CMFEditions \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:${PORTSDIR}/devel/py-Products.CMFPlacefulWorkflow \
-		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:${PORTSDIR}/devel/py-Products.DCWorkflow \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow \
+		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python zope
diff --git a/www/py-plone.app.jquery/Makefile b/www/py-plone.app.jquery/Makefile
index f8fea135f491..ff301e98f8da 100644
--- a/www/py-plone.app.jquery/Makefile
+++ b/www/py-plone.app.jquery/Makefile
@@ -12,8 +12,8 @@ COMMENT=	jQuery integration for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.app.jquerytools/Makefile b/www/py-plone.app.jquerytools/Makefile
index 5eb5b68f3bb0..67e6b0cfe87d 100644
--- a/www/py-plone.app.jquerytools/Makefile
+++ b/www/py-plone.app.jquerytools/Makefile
@@ -12,9 +12,9 @@ COMMENT=	jQuery Tools integration for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/www/py-plone.app.layout/Makefile b/www/py-plone.app.layout/Makefile
index e29870761137..8b66ae49ddf0 100644
--- a/www/py-plone.app.layout/Makefile
+++ b/www/py-plone.app.layout/Makefile
@@ -12,26 +12,26 @@ COMMENT=	Layout mechanisms for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=1.2:${PORTSDIR}/www/py-plone.app.viewletmanager \
-		${PYTHON_PKGNAMEPREFIX}plone.app.content>0:${PORTSDIR}/www/py-plone.app.content \
-		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:${PORTSDIR}/www/py-plone.i18n \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.registry>0:${PORTSDIR}/www/py-plone.registry \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=1.2.2:${PORTSDIR}/devel/py-Products.CMFEditions
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=1.2:www/py-plone.app.viewletmanager \
+		${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content \
+		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=1.2.2:devel/py-Products.CMFEditions
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/www/py-plone.app.ldap/Makefile b/www/py-plone.app.ldap/Makefile
index 4e1115d1e29b..f985bbe1631a 100644
--- a/www/py-plone.app.ldap/Makefile
+++ b/www/py-plone.app.ldap/Makefile
@@ -13,16 +13,16 @@ COMMENT=	LDAP control panel for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.PloneLDAP>=1.0:${PORTSDIR}/www/py-Products.PloneLDAP \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}ldap>0:${PORTSDIR}/net/py-ldap \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.PloneLDAP>=1.0:www/py-Products.PloneLDAP \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema
 
 NO_ARCH=	yes
 USES=		python:2.7 zip
diff --git a/www/py-plone.app.linkintegrity/Makefile b/www/py-plone.app.linkintegrity/Makefile
index 992c2f1af875..d1b84225a0c5 100644
--- a/www/py-plone.app.linkintegrity/Makefile
+++ b/www/py-plone.app.linkintegrity/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Manage link integrity in Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.app.portlets/Makefile b/www/py-plone.app.portlets/Makefile
index 4bcc535a6b95..96b1463ec199 100644
--- a/www/py-plone.app.portlets/Makefile
+++ b/www/py-plone.app.portlets/Makefile
@@ -12,39 +12,39 @@ COMMENT=	Plone integration for the basic plone.portlets package
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.formlib \
-		${PYTHON_PKGNAMEPREFIX}five.customerize>=0:${PORTSDIR}/devel/py-five.customerize \
-		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:${PORTSDIR}/www/py-plone.i18n \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>=1.1:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
-		${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:${PORTSDIR}/www/py-plone.app.i18n \
-		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.2:${PORTSDIR}/www/py-plone.app.layout \
-		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
+		${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize \
+		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>=1.1:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
+		${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n \
+		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.2:www/py-plone.app.layout \
+		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/www/py-plone.app.querystring/Makefile b/www/py-plone.app.querystring/Makefile
index 7fddf666f07c..c932b5fb93e9 100644
--- a/www/py-plone.app.querystring/Makefile
+++ b/www/py-plone.app.querystring/Makefile
@@ -12,22 +12,22 @@ COMMENT=	Tools to parse stored queries to actual results
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:${PORTSDIR}/www/py-plone.app.contentlisting \
-		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:${PORTSDIR}/www/py-plone.app.layout \
-		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.1:${PORTSDIR}/www/py-plone.app.registry \
-		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
-		${PYTHON_PKGNAMEPREFIX}plone.batching>0:${PORTSDIR}/www/py-plone.batching \
-		${PYTHON_PKGNAMEPREFIX}plone.registry>0:${PORTSDIR}/www/py-plone.registry \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.globalrequest>0:${PORTSDIR}/devel/py-zope.globalrequest \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting \
+		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout \
+		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.1:www/py-plone.app.registry \
+		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
+		${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \
+		${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.globalrequest>0:devel/py-zope.globalrequest \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.app.redirector/Makefile b/www/py-plone.app.redirector/Makefile
index 4335415d25c3..52a94bfad17a 100644
--- a/www/py-plone.app.redirector/Makefile
+++ b/www/py-plone.app.redirector/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Redirection tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.app.registry/Makefile b/www/py-plone.app.registry/Makefile
index 3ee62f024acb..d3ab57c709b8 100644
--- a/www/py-plone.app.registry/Makefile
+++ b/www/py-plone.app.registry/Makefile
@@ -12,18 +12,18 @@ COMMENT=	Zope 2 and Plone integration for plone.registry
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:${PORTSDIR}/www/py-plone.registry \
-		${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:${PORTSDIR}/www/py-plone.supermodel \
-		${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:${PORTSDIR}/www/py-plone.app.z3cform \
-		${PYTHON_PKGNAMEPREFIX}plone.autoform>=1.0:${PORTSDIR}/www/py-plone.autoform \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry \
+		${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel \
+		${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform \
+		${PYTHON_PKGNAMEPREFIX}plone.autoform>=1.0:www/py-plone.autoform \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/www/py-plone.app.search/Makefile b/www/py-plone.app.search/Makefile
index 9bfe40937408..f216806de569 100644
--- a/www/py-plone.app.search/Makefile
+++ b/www/py-plone.app.search/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Search user interface for Plone CMS
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:${PORTSDIR}/www/py-plone.app.contentlisting
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.app.testing/Makefile b/www/py-plone.app.testing/Makefile
index aa672d2aa472..b2773550a7f9 100644
--- a/www/py-plone.app.testing/Makefile
+++ b/www/py-plone.app.testing/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Testing tools for Plone-the-application, based on plone.testing
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/py-five.localsitemanager \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.testing>=0:${PORTSDIR}/www/py-plone.testing \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.testing>=0:www/py-plone.testing \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 NO_ARCH=	yes
 USES=		python zip zope
diff --git a/www/py-plone.app.textfield/Makefile b/www/py-plone.app.textfield/Makefile
index 98feabcee637..d2abb53043a8 100644
--- a/www/py-plone.app.textfield/Makefile
+++ b/www/py-plone.app.textfield/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Text field with MIME type support
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python:2.7 zip
diff --git a/www/py-plone.app.theming/Makefile b/www/py-plone.app.theming/Makefile
index 61b33c3b89f3..b0a6c9332b6f 100644
--- a/www/py-plone.app.theming/Makefile
+++ b/www/py-plone.app.theming/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Integrates the Diazo theming engine with Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}diazo>=0:${PORTSDIR}/devel/py-diazo \
-		${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}roman>0:${PORTSDIR}/math/py-roman \
-		${PYTHON_PKGNAMEPREFIX}lxml>=2.2.4:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:${PORTSDIR}/www/py-plone.app.registry \
-		${PYTHON_PKGNAMEPREFIX}plone.subrequest>=0:${PORTSDIR}/www/py-plone.subrequest \
-		${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:${PORTSDIR}/www/py-plone.transformchain \
-		${PYTHON_PKGNAMEPREFIX}plone.resource>=1.0:${PORTSDIR}/www/py-plone.resource \
-		${PYTHON_PKGNAMEPREFIX}plone.resourceeditor>0:${PORTSDIR}/www/py-plone.resourceeditor \
-		${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:${PORTSDIR}/devel/py-repoze.xmliter \
-		${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:${PORTSDIR}/devel/py-five.globalrequest \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}diazo>=0:devel/py-diazo \
+		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}roman>0:math/py-roman \
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.2.4:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry \
+		${PYTHON_PKGNAMEPREFIX}plone.subrequest>=0:www/py-plone.subrequest \
+		${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain \
+		${PYTHON_PKGNAMEPREFIX}plone.resource>=1.0:www/py-plone.resource \
+		${PYTHON_PKGNAMEPREFIX}plone.resourceeditor>0:www/py-plone.resourceeditor \
+		${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter \
+		${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.app.upgrade/Makefile b/www/py-plone.app.upgrade/Makefile
index 440664559958..28cf641d0bcf 100644
--- a/www/py-plone.app.upgrade/Makefile
+++ b/www/py-plone.app.upgrade/Makefile
@@ -12,36 +12,36 @@ COMMENT=	Upgrade machinery for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:${PORTSDIR}/security/py-borg.localrole \
-		${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/py-five.localsitemanager \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.session>=0:${PORTSDIR}/security/py-plone.session \
-		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:${PORTSDIR}/www/py-plone.app.folder \
-		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:${PORTSDIR}/www/py-plone.app.portlets \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:${PORTSDIR}/devel/py-zope.ramcache \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:${PORTSDIR}/devel/py-Products.Archetypes \
-		${PYTHON_PKGNAMEPREFIX}Products.contentmigration>=0:${PORTSDIR}/devel/py-Products.contentmigration \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:${PORTSDIR}/devel/py-Products.CMFDiffTool \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:${PORTSDIR}/devel/py-Products.CMFEditions \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:${PORTSDIR}/devel/py-Products.CMFFormController \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:${PORTSDIR}/devel/py-Products.CMFQuickInstallerTool \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:${PORTSDIR}/devel/py-Products.CMFUid \
-		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:${PORTSDIR}/devel/py-Products.DCWorkflow \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:${PORTSDIR}/devel/py-Products.MimetypesRegistry \
-		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:${PORTSDIR}/security/py-Products.PlonePAS \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService \
-		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:${PORTSDIR}/devel/py-Products.PortalTransforms \
-		${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:${PORTSDIR}/devel/py-Products.ResourceRegistries \
-		${PYTHON_PKGNAMEPREFIX}Products.SecureMailHost>=0:${PORTSDIR}/mail/py-Products.SecureMailHost \
-		${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=2.13.4:${PORTSDIR}/devel/py-Products.ZCatalog
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole \
+		${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \
+		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \
+		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
+		${PYTHON_PKGNAMEPREFIX}Products.contentmigration>=0:devel/py-Products.contentmigration \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \
+		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \
+		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
+		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \
+		${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries \
+		${PYTHON_PKGNAMEPREFIX}Products.SecureMailHost>=0:mail/py-Products.SecureMailHost \
+		${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=2.13.4:devel/py-Products.ZCatalog
 
 NO_ARCH=	yes
 USES=		python zope
diff --git a/www/py-plone.app.users/Makefile b/www/py-plone.app.users/Makefile
index 8bdd167734a5..9c4ffb9a97fb 100644
--- a/www/py-plone.app.users/Makefile
+++ b/www/py-plone.app.users/Makefile
@@ -12,20 +12,20 @@ COMMENT=	Users and groups related things
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.formlib \
-		${PYTHON_PKGNAMEPREFIX}plone.protect>=0:${PORTSDIR}/security/py-plone.protect \
-		${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=2.1:${PORTSDIR}/www/py-plone.app.controlpanel \
-		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:${PORTSDIR}/www/py-plone.app.layout \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:${PORTSDIR}/security/py-Products.PlonePAS \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
+		${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \
+		${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=2.1:www/py-plone.app.controlpanel \
+		${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/www/py-plone.app.uuid/Makefile b/www/py-plone.app.uuid/Makefile
index a9b0beb980a4..494c8abe1ac7 100644
--- a/www/py-plone.app.uuid/Makefile
+++ b/www/py-plone.app.uuid/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Plone integration for the basic plone.uuid package
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid \
-		${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:${PORTSDIR}/www/py-plone.indexer \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \
+		${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.app.viewletmanager/Makefile b/www/py-plone.app.viewletmanager/Makefile
index c6769460c095..dc500dba4448 100644
--- a/www/py-plone.app.viewletmanager/Makefile
+++ b/www/py-plone.app.viewletmanager/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Configurable viewlet manager
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>0:${PORTSDIR}/www/py-plone.app.vocabularies
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>0:www/py-plone.app.vocabularies
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.app.vocabularies/Makefile b/www/py-plone.app.vocabularies/Makefile
index 07d2ff4c3d76..a8b31c91f7fe 100644
--- a/www/py-plone.app.vocabularies/Makefile
+++ b/www/py-plone.app.vocabularies/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Collection of generally useful vocabularies
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore
 
 NO_ARCH=	yes
 USES=		python zope
diff --git a/www/py-plone.app.workflow/Makefile b/www/py-plone.app.workflow/Makefile
index e586f430bf6b..3c0f01ac5c1d 100644
--- a/www/py-plone.app.workflow/Makefile
+++ b/www/py-plone.app.workflow/Makefile
@@ -12,23 +12,23 @@ COMMENT=	Workflow and security settings for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}transaction>0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>0:${PORTSDIR}/devel/py-Products.DCWorkflow \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:${PORTSDIR}/devel/py-Products.statusmessages
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>0:devel/py-Products.DCWorkflow \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages
 
 NO_ARCH=	yes
 USES=		python zip zope
diff --git a/www/py-plone.app.z3cform/Makefile b/www/py-plone.app.z3cform/Makefile
index ffaefff1b0a7..a6f68d87a229 100644
--- a/www/py-plone.app.z3cform/Makefile
+++ b/www/py-plone.app.z3cform/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Collection of widgets, templates for use with z3c.form and Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>=0.1:${PORTSDIR}/devel/py-collective.z3cform.datetimewidget \
-		${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0.5.11:${PORTSDIR}/www/py-plone.z3cform \
-		${PYTHON_PKGNAMEPREFIX}plone.protect>0:${PORTSDIR}/security/py-plone.protect \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}z3c.formwidget.query>0:${PORTSDIR}/devel/py-z3c.formwidget.query \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>=0.1:devel/py-collective.z3cform.datetimewidget \
+		${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0.5.11:www/py-plone.z3cform \
+		${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form \
+		${PYTHON_PKGNAMEPREFIX}z3c.formwidget.query>0:devel/py-z3c.formwidget.query \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing
 
 NO_ARCH=	yes
 USES=		python zip zope
diff --git a/www/py-plone.autoform/Makefile b/www/py-plone.autoform/Makefile
index 5bf961591322..7c7c63473dc7 100644
--- a/www/py-plone.autoform/Makefile
+++ b/www/py-plone.autoform/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Tools to construct z3c.form forms
 
 LICENSE=	LGPL20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:${PORTSDIR}/www/py-plone.supermodel \
-		${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:${PORTSDIR}/www/py-plone.z3cform \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel \
+		${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.behavior/Makefile b/www/py-plone.behavior/Makefile
index add0a226ffcd..2c3e33cf8dc4 100644
--- a/www/py-plone.behavior/Makefile
+++ b/www/py-plone.behavior/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Infrastructure for maintaining a registry of available behaviors
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>0:${PORTSDIR}/devel/py-zope.configuration
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>0:devel/py-zope.configuration
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.browserlayer/Makefile b/www/py-plone.browserlayer/Makefile
index ba7395aff6af..64fc54a2b131 100644
--- a/www/py-plone.browserlayer/Makefile
+++ b/www/py-plone.browserlayer/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Browser layer management for Zope 2 applications
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4:${PORTSDIR}/devel/py-Products.GenericSetup \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4:devel/py-Products.GenericSetup \
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.cachepurging/Makefile b/www/py-plone.cachepurging/Makefile
index 5b4f411d1107..3d5a8866e03c 100644
--- a/www/py-plone.cachepurging/Makefile
+++ b/www/py-plone.cachepurging/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Cache purging support for Zope 2 applications
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:${PORTSDIR}/devel/py-five.globalrequest \
-		${PYTHON_PKGNAMEPREFIX}plone.registry>=0:${PORTSDIR}/www/py-plone.registry \
-		${PYTHON_PKGNAMEPREFIX}z3c.caching>0:${PORTSDIR}/devel/py-z3c.caching \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest \
+		${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \
+		${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.caching/Makefile b/www/py-plone.caching/Makefile
index 39d5101e08c1..4e7e3cdb937e 100644
--- a/www/py-plone.caching/Makefile
+++ b/www/py-plone.caching/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Zope 2 integration for z3c.caching
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:${PORTSDIR}/devel/py-z3c.caching \
-		${PYTHON_PKGNAMEPREFIX}plone.registry>=0:${PORTSDIR}/www/py-plone.registry \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:${PORTSDIR}/www/py-plone.transformchain \
-		${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:${PORTSDIR}/devel/py-five.globalrequest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching \
+		${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain \
+		${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.contentrules/Makefile b/www/py-plone.contentrules/Makefile
index f54b8055e25b..7300ad1c9a81 100644
--- a/www/py-plone.contentrules/Makefile
+++ b/www/py-plone.contentrules/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Plone ContentRules Engine
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.dexterity/Makefile b/www/py-plone.dexterity/Makefile
index d54451e2f7ee..4eb011e589aa 100644
--- a/www/py-plone.dexterity/Makefile
+++ b/www/py-plone.dexterity/Makefile
@@ -12,34 +12,34 @@ COMMENT=	Flexible CMF content
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.alterego>0:${PORTSDIR}/www/py-plone.alterego \
-		${PYTHON_PKGNAMEPREFIX}plone.autoform>0:${PORTSDIR}/www/py-plone.autoform \
-		${PYTHON_PKGNAMEPREFIX}plone.behavior>0:${PORTSDIR}/www/py-plone.behavior \
-		${PYTHON_PKGNAMEPREFIX}plone.folder>0:${PORTSDIR}/www/py-plone.folder \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:${PORTSDIR}/www/py-plone.rfc822 \
-		${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:${PORTSDIR}/www/py-plone.supermodel \
-		${PYTHON_PKGNAMEPREFIX}plone.synchronize>0:${PORTSDIR}/www/py-plone.synchronize \
-		${PYTHON_PKGNAMEPREFIX}plone.uuid>0:${PORTSDIR}/www/py-plone.uuid \
-		${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:${PORTSDIR}/www/py-plone.z3cform \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:${PORTSDIR}/devel/py-Products.statusmessages \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:${PORTSDIR}/devel/py-zope.filerepresentation \
-		${PYTHON_PKGNAMEPREFIX}zope.size>0:${PORTSDIR}/devel/py-zope.size \
-		zodb${PYTHON_PKGNAMESUFFIX}>0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.alterego>0:www/py-plone.alterego \
+		${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform \
+		${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior \
+		${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822 \
+		${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel \
+		${PYTHON_PKGNAMEPREFIX}plone.synchronize>0:www/py-plone.synchronize \
+		${PYTHON_PKGNAMEPREFIX}plone.uuid>0:www/py-plone.uuid \
+		${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>0:devel/py-Products.CMFDynamicViewFTI \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation \
+		${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size \
+		zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python zip zope
diff --git a/www/py-plone.fieldsets/Makefile b/www/py-plone.fieldsets/Makefile
index 1ac56e2ce016..78a315b9f55d 100644
--- a/www/py-plone.fieldsets/Makefile
+++ b/www/py-plone.fieldsets/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Allows to group fields into different fieldsets
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.folder/Makefile b/www/py-plone.folder/Makefile
index bd8794475314..92dfdceac47a 100644
--- a/www/py-plone.folder/Makefile
+++ b/www/py-plone.folder/Makefile
@@ -12,14 +12,14 @@ COMMENT=	BTree-based folder implementation with order support
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>0:${PORTSDIR}/devel/py-Products.BTreeFolder2 \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:${PORTSDIR}/devel/py-Products.ZCatalog \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.container>0:${PORTSDIR}/devel/py-zope.container
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>0:devel/py-Products.BTreeFolder2 \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.formwidget.namedfile/Makefile b/www/py-plone.formwidget.namedfile/Makefile
index 36d3d5edde27..014a7d7f8916 100644
--- a/www/py-plone.formwidget.namedfile/Makefile
+++ b/www/py-plone.formwidget.namedfile/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Image widget for z3c.form and Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:${PORTSDIR}/www/py-plone.namedfile \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:${PORTSDIR}/www/py-plone.z3cform
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form \
+		${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.i18n/Makefile b/www/py-plone.i18n/Makefile
index d4def37cbf20..ded09a33f7b7 100644
--- a/www/py-plone.i18n/Makefile
+++ b/www/py-plone.i18n/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Advanced i18n/l10n features
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}unidecode>=0:${PORTSDIR}/converters/py-unidecode
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.indexer/Makefile b/www/py-plone.indexer/Makefile
index 8b1b2ce48bf0..849e683078e6 100644
--- a/www/py-plone.indexer/Makefile
+++ b/www/py-plone.indexer/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Hooks to facilitate managing custom index values
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:${PORTSDIR}/devel/py-Products.ZCatalog
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.locking/Makefile b/www/py-plone.locking/Makefile
index 337ece96870c..1b5e2db516cf 100644
--- a/www/py-plone.locking/Makefile
+++ b/www/py-plone.locking/Makefile
@@ -12,16 +12,16 @@ COMMENT=	WebDAV locking support
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.memoize/Makefile b/www/py-plone.memoize/Makefile
index c58c9481a910..e7805deac687 100644
--- a/www/py-plone.memoize/Makefile
+++ b/www/py-plone.memoize/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Decorators for caching the values of functions and methods
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:${PORTSDIR}/devel/py-zope.ramcache
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.namedfile/Makefile b/www/py-plone.namedfile/Makefile
index b01f7c4d0132..af52ef77f0ec 100644
--- a/www/py-plone.namedfile/Makefile
+++ b/www/py-plone.namedfile/Makefile
@@ -12,11 +12,11 @@ COMMENT=	File types and fields for images, files and blob files with filenames
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.security>0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:${PORTSDIR}/www/py-plone.rfc822
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.outputfilters/Makefile b/www/py-plone.outputfilters/Makefile
index 95e6c69ee374..de1f10957431 100644
--- a/www/py-plone.outputfilters/Makefile
+++ b/www/py-plone.outputfilters/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Transformations applied to HTML in Plone text fields
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:${PORTSDIR}/devel/py-Products.MimetypesRegistry \
-		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:${PORTSDIR}/devel/py-Products.PortalTransforms
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \
+		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.portlet.collection/Makefile b/www/py-plone.portlet.collection/Makefile
index 7c9565e77479..85be9abafa9a 100644
--- a/www/py-plone.portlet.collection/Makefile
+++ b/www/py-plone.portlet.collection/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Portlet that fetches results from a collection
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:${PORTSDIR}/www/py-plone.app.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
-		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
+		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.portlet.static/Makefile b/www/py-plone.portlet.static/Makefile
index 49caf88db6aa..663ab3962f50 100644
--- a/www/py-plone.portlet.static/Makefile
+++ b/www/py-plone.portlet.static/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Simple static HTML portlet for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:${PORTSDIR}/www/py-plone.app.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
-		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:${PORTSDIR}/www/py-plone.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
+		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.portlets/Makefile b/www/py-plone.portlets/Makefile
index 0581622493fe..b5a7c8a9bf2b 100644
--- a/www/py-plone.portlets/Makefile
+++ b/www/py-plone.portlets/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Extension of zope.viewlet to support dynamic portlets
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.registry/Makefile b/www/py-plone.registry/Makefile
index ed41c6510d2c..82ef11d29c8f 100644
--- a/www/py-plone.registry/Makefile
+++ b/www/py-plone.registry/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Registry for storing application settings
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.resource/Makefile b/www/py-plone.resource/Makefile
index 4c07028ec0a2..7f2f21b665bf 100644
--- a/www/py-plone.resource/Makefile
+++ b/www/py-plone.resource/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Publishes directories of static files via the ZPublisher
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:${PORTSDIR}/devel/py-zope.filerepresentation \
-		${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:${PORTSDIR}/devel/py-z3c.caching \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}plone.caching>=0:${PORTSDIR}/www/py-plone.caching
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation \
+		${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching
 
 NO_ARCH=	yes
 USES=		python zip zope
diff --git a/www/py-plone.resourceeditor/Makefile b/www/py-plone.resourceeditor/Makefile
index 7da208796433..a8d95f85e99c 100644
--- a/www/py-plone.resourceeditor/Makefile
+++ b/www/py-plone.resourceeditor/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Resources for integrating ACE into Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}plone.resource>0:${PORTSDIR}/www/py-plone.resource
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}plone.resource>0:www/py-plone.resource
 
 NO_ARCH=	yes
 USES=		python:2.7 zip
diff --git a/www/py-plone.rfc822/Makefile b/www/py-plone.rfc822/Makefile
index 3b187a8b5e90..ef6468935ee1 100644
--- a/www/py-plone.rfc822/Makefile
+++ b/www/py-plone.rfc822/Makefile
@@ -12,10 +12,10 @@ COMMENT=	RFC822 marshalling for zope.schema fields
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.scale/Makefile b/www/py-plone.scale/Makefile
index 825b563d0c46..df72c73952ff 100644
--- a/www/py-plone.scale/Makefile
+++ b/www/py-plone.scale/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Image scaling
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence
 
 NO_ARCH=	yes
 USES=		python:2.7 zip
diff --git a/www/py-plone.schemaeditor/Makefile b/www/py-plone.schemaeditor/Makefile
index ae8ff76c17dd..469256a52f90 100644
--- a/www/py-plone.schemaeditor/Makefile
+++ b/www/py-plone.schemaeditor/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Provides through-the-web editing of a zope schema/interface
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:${PORTSDIR}/www/py-plone.z3cform \
-		${PYTHON_PKGNAMEPREFIX}plone.autoform>0:${PORTSDIR}/www/py-plone.autoform
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form \
+		${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform \
+		${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.stringinterp/Makefile b/www/py-plone.stringinterp/Makefile
index 134c5d0e619a..4e4fb574caf1 100644
--- a/www/py-plone.stringinterp/Makefile
+++ b/www/py-plone.stringinterp/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Adaptable string interpolation
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.subrequest/Makefile b/www/py-plone.subrequest/Makefile
index 68b10a356d75..3ea683a59cbf 100644
--- a/www/py-plone.subrequest/Makefile
+++ b/www/py-plone.subrequest/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Subrequests for Zope2
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:${PORTSDIR}/devel/py-five.globalrequest \
-		${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:${PORTSDIR}/devel/py-zope.globalrequest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest \
+		${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.supermodel/Makefile b/www/py-plone.supermodel/Makefile
index 3cf3cdc311a9..2cb04ac7e8d0 100644
--- a/www/py-plone.supermodel/Makefile
+++ b/www/py-plone.supermodel/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Serialize Zope schema definitions to and from XML
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:${PORTSDIR}/devel/py-z3c.zcmlhook \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.testing/Makefile b/www/py-plone.testing/Makefile
index 9baaf80a3ffa..5c74bbd2db55 100644
--- a/www/py-plone.testing/Makefile
+++ b/www/py-plone.testing/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Testing infrastructure for Zope and Plone projects
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.theme/Makefile b/www/py-plone.theme/Makefile
index 937bc16e6335..29af3781d9de 100644
--- a/www/py-plone.theme/Makefile
+++ b/www/py-plone.theme/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Tools for managing themes in CMF and Plone sites
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.transformchain/Makefile b/www/py-plone.transformchain/Makefile
index e6a07590bcf3..8f51db3ebe51 100644
--- a/www/py-plone.transformchain/Makefile
+++ b/www/py-plone.transformchain/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Hook into repoze.zope2 for third party packages
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-plone.uuid/Makefile b/www/py-plone.uuid/Makefile
index c83d33bbe6fd..2f5e4e661537 100644
--- a/www/py-plone.uuid/Makefile
+++ b/www/py-plone.uuid/Makefile
@@ -13,10 +13,10 @@ COMMENT=	UUIDs for content items
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/www/py-plone.z3cform/Makefile b/www/py-plone.z3cform/Makefile
index bc691e6ed88a..517afe5d198a 100644
--- a/www/py-plone.z3cform/Makefile
+++ b/www/py-plone.z3cform/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Library that allows use of z3c.form with Zope 2 and the CMF
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.batching>0:${PORTSDIR}/www/py-plone.batching \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=3.4:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=3.4:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component
 
 NO_ARCH=	yes
 USES=		python zip zope
diff --git a/www/py-praw/Makefile b/www/py-praw/Makefile
index d87945890422..89c932d42ce3 100644
--- a/www/py-praw/Makefile
+++ b/www/py-praw/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Python Reddit API Wrapper
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=4.0.9:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>=1.10:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}update_checker>=0.11:${PORTSDIR}/devel/py-update_checker
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=4.0.9:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}update_checker>=0.11:devel/py-update_checker
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock
 
 # TEST_DEPENDS to be ported
 # betamax >=0.5.1
diff --git a/www/py-prewikka/Makefile b/www/py-prewikka/Makefile
index f576f1dd60fe..96651ea5cb34 100644
--- a/www/py-prewikka/Makefile
+++ b/www/py-prewikka/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Frontend for the Prelude IDS
 
-BUILD_DEPENDS=	cheetah-compile:${PORTSDIR}/devel/py-cheetah
-LIB_DEPENDS=	libprelude.so:${PORTSDIR}/security/libprelude \
-		libpreludedb.so:${PORTSDIR}/security/libpreludedb
+BUILD_DEPENDS=	cheetah-compile:devel/py-cheetah
+LIB_DEPENDS=	libprelude.so:security/libprelude \
+		libpreludedb.so:security/libpreludedb
 
 USES=		python:2
 USE_PYTHON=	distutils
diff --git a/www/py-puppetboard/Makefile b/www/py-puppetboard/Makefile
index 57721d05205c..74d28ba90234 100644
--- a/www/py-puppetboard/Makefile
+++ b/www/py-puppetboard/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Web interface to PuppetDB
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:${PORTSDIR}/www/py-flask-wtf \
-		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:${PORTSDIR}/textproc/py-MarkupSafe \
-		${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.1.1:${PORTSDIR}/databases/py-pypuppetdb \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf \
+		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe \
+		${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.1.1:databases/py-pypuppetdb \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppet-community
diff --git a/www/py-py-restclient/Makefile b/www/py-py-restclient/Makefile
index da0154c6da02..5bf73828214e 100644
--- a/www/py-py-restclient/Makefile
+++ b/www/py-py-restclient/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python REST Client
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2
+RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile
index 119d9e72bc0f..2c81047fdbf4 100644
--- a/www/py-pyjwt/Makefile
+++ b/www/py-pyjwt/Makefile
@@ -15,9 +15,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # Some tests are skipped without pycrypto, but its not
 # referenced as a requirement anymore. 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}cryptography>0:${PORTSDIR}/security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
@@ -25,7 +25,7 @@ USE_PYTHON=	distutils concurrent autoplist
 OPTIONS_DEFINE=	RSASSA
 
 RSASSA_DESC=		RSASSA-PKCS1 v1.5 signature support
-RSASSA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:${PORTSDIR}/security/py-cryptography
+RSASSA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography
 
 NO_ARCH=	yes
 
diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile
index 3abdcbc48aa7..def088f62a33 100644
--- a/www/py-pylons/Makefile
+++ b/www/py-pylons/Makefile
@@ -11,22 +11,22 @@ DISTNAME=	Pylons-${PORTVERSION}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python based web framework
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:${PORTSDIR}/www/py-paste \
-		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:${PORTSDIR}/www/py-pastedeploy \
-		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.3:${PORTSDIR}/www/py-pastescript \
-		${PYTHON_PKGNAMEPREFIX}beaker>=1.3:${PORTSDIR}/www/py-beaker \
-		${PYTHON_PKGNAMEPREFIX}decorator>=2.3.2:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.1:${PORTSDIR}/www/py-formencode \
-		${PYTHON_PKGNAMEPREFIX}mako>=0.2.4:${PORTSDIR}/textproc/py-mako \
-		${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}routes>=1.12:${PORTSDIR}/www/py-routes \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.8:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:${PORTSDIR}/www/py-webhelpers \
-		${PYTHON_PKGNAMEPREFIX}WebError>=0.10.1:${PORTSDIR}/www/py-WebError \
-		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:${PORTSDIR}/www/py-webob \
-		${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:${PORTSDIR}/www/py-WebTest \
-		${PYTHON_PKGNAMEPREFIX}Tempita>=0.2:${PORTSDIR}/textproc/py-Tempita \
-		${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:${PORTSDIR}/textproc/py-genshi
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste \
+		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:www/py-pastedeploy \
+		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.3:www/py-pastescript \
+		${PYTHON_PKGNAMEPREFIX}beaker>=1.3:www/py-beaker \
+		${PYTHON_PKGNAMEPREFIX}decorator>=2.3.2:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.1:www/py-formencode \
+		${PYTHON_PKGNAMEPREFIX}mako>=0.2.4:textproc/py-mako \
+		${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}routes>=1.12:www/py-routes \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.8:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers \
+		${PYTHON_PKGNAMEPREFIX}WebError>=0.10.1:www/py-WebError \
+		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob \
+		${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:www/py-WebTest \
+		${PYTHON_PKGNAMEPREFIX}Tempita>=0.2:textproc/py-Tempita \
+		${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:textproc/py-genshi
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/www/py-pyocclient/Makefile b/www/py-pyocclient/Makefile
index feecefbff393..9a384562bc24 100644
--- a/www/py-pyocclient/Makefile
+++ b/www/py-pyocclient/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python Owncloud client library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-pyquery/Makefile b/www/py-pyquery/Makefile
index 6d058e900488..5002249080ba 100644
--- a/www/py-pyquery/Makefile
+++ b/www/py-pyquery/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Jquery-like library for python
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:${PORTSDIR}/www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:${PORTSDIR}/www/py-webob
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:${PORTSDIR}/www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:${PORTSDIR}/www/py-webob
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
@@ -27,7 +27,7 @@ USES=		python zip
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_VARS=	PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
 
 post-install-DOCS-on:
diff --git a/www/py-pyramid/Makefile b/www/py-pyramid/Makefile
index 5dc73a656109..a8cd6f1a10fd 100644
--- a/www/py-pyramid/Makefile
+++ b/www/py-pyramid/Makefile
@@ -15,17 +15,17 @@ LICENSE_NAME=	Repoze License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:${PORTSDIR}/www/py-pastedeploy \
-		${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.4:${PORTSDIR}/devel/py-repoze.lru \
-		${PYTHON_PKGNAMEPREFIX}translationstring>=0.4:${PORTSDIR}/textproc/py-translationstring \
-		${PYTHON_PKGNAMEPREFIX}venusian>=1.0:${PORTSDIR}/devel/py-venusian \
-		${PYTHON_PKGNAMEPREFIX}webob>=1.3.1:${PORTSDIR}/www/py-webob \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=3.5.0:${PORTSDIR}/devel/py-zope.deprecation \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8.0:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
+		${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.4:devel/py-repoze.lru \
+		${PYTHON_PKGNAMEPREFIX}translationstring>=0.4:textproc/py-translationstring \
+		${PYTHON_PKGNAMEPREFIX}venusian>=1.0:devel/py-venusian \
+		${PYTHON_PKGNAMEPREFIX}webob>=1.3.1:www/py-webob \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=3.5.0:devel/py-zope.deprecation \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8.0:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-#TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:${PORTSDIR}/www/py-WebTest \
-#		${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:${PORTSDIR}/devel/py-zope.component
+#TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:www/py-WebTest \
+#		${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-pyramid_rpc/Makefile b/www/py-pyramid_rpc/Makefile
index 86157e92e3f2..912ceec55b73 100644
--- a/www/py-pyramid_rpc/Makefile
+++ b/www/py-pyramid_rpc/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	RPC support for the Pyramid web framework
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyramid>=0:${PORTSDIR}/www/py-pyramid
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyramid>=0:www/py-pyramid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/www/py-python-digitalocean/Makefile b/www/py-python-digitalocean/Makefile
index fbc193d6b9c8..bdd5786c2f51 100644
--- a/www/py-python-digitalocean/Makefile
+++ b/www/py-python-digitalocean/Makefile
@@ -12,7 +12,7 @@ COMMENT=	API to manage digitalocean.com droplets
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests
 
 USES=	python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-pywikibot/Makefile b/www/py-pywikibot/Makefile
index d8e672437b0c..b5ac6bd03903 100644
--- a/www/py-pywikibot/Makefile
+++ b/www/py-pywikibot/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Wikipedia bot for Python
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2
+RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -26,11 +26,11 @@ GOOGLE_DESC=	Support for Google search
 MWPARSE_DESC=	Support for MediaWiki parser
 PILLOW_DESC=	Support for image processing via pillow module
 
-ISBN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}stdnum>=0:${PORTSDIR}/devel/py-stdnum
-PYDOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydot>=0:${PORTSDIR}/graphics/py-pydot
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oursql>=0:${PORTSDIR}/databases/py-oursql
-GOOGLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google>=0:${PORTSDIR}/www/py-google
-MWPARSE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mwparserfromhell>=0:${PORTSDIR}/textproc/py-mwparserfromhell
-PILLOW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+ISBN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}stdnum>=0:devel/py-stdnum
+PYDOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oursql>=0:databases/py-oursql
+GOOGLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google>=0:www/py-google
+MWPARSE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mwparserfromhell>=0:textproc/py-mwparserfromhell
+PILLOW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 .include <bsd.port.mk>
diff --git a/www/py-qp/Makefile b/www/py-qp/Makefile
index 6f1d73cf5fa3..60ab5ae5d7ba 100644
--- a/www/py-qp/Makefile
+++ b/www/py-qp/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python web framework to use qpy and durus together
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}durus>=0:${PORTSDIR}/devel/py-durus \
-		${PYTHON_PKGNAMEPREFIX}qpy>=1.7:${PORTSDIR}/www/py-qpy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}durus>=0:devel/py-durus \
+		${PYTHON_PKGNAMEPREFIX}qpy>=1.7:www/py-qpy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile
index 40789f1c8878..276613cbddcb 100644
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtWebKit API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webkit/Makefile b/www/py-qt5-webkit/Makefile
index 94587b33108b..45f4a69206a3 100644
--- a/www/py-qt5-webkit/Makefile
+++ b/www/py-qt5-webkit/Makefile
@@ -6,8 +6,8 @@ CATEGORIES=	www devel python
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWebKit module
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT5_VERSION}:${PORTSDIR}/x11-toolkits/py-qt5-gui
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:devel/py-sip
+RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT5_VERSION}:x11-toolkits/py-qt5-gui
 
 CONFIGURE_ARGS=	--enable QtWebKit
 PYQT_DIST=	yes
@@ -24,7 +24,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtWebKit API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webkitwidgets/Makefile b/www/py-qt5-webkitwidgets/Makefile
index f39549596f42..c33dac5730af 100644
--- a/www/py-qt5-webkitwidgets/Makefile
+++ b/www/py-qt5-webkitwidgets/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtWebKitWidgets API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/www/py-rackspace-monitoring/Makefile b/www/py-rackspace-monitoring/Makefile
index 4f466ad7e849..5ad472628ed5 100644
--- a/www/py-rackspace-monitoring/Makefile
+++ b/www/py-rackspace-monitoring/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python client library for Rackspace Cloud Monitoring
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libcloud>=0.14:${PORTSDIR}/net/py-libcloud
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libcloud>=0.14:net/py-libcloud
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-requestbuilder/Makefile b/www/py-requestbuilder/Makefile
index 0d1580da95b6..bf03290a96e0 100644
--- a/www/py-requestbuilder/Makefile
+++ b/www/py-requestbuilder/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Command line-driven HTTP request builder
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python:-2.7
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-requests-oauth-hook/Makefile b/www/py-requests-oauth-hook/Makefile
index 773746436713..db7c03e3e7a2 100644
--- a/www/py-requests-oauth-hook/Makefile
+++ b/www/py-requests-oauth-hook/Makefile
@@ -15,8 +15,8 @@ BROKEN=		unfetchable
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests1>0:${PORTSDIR}/www/py-requests1 \
-		${PYTHON_PKGNAMEPREFIX}oauth2>0:${PORTSDIR}/net/py-oauth2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests1>0:www/py-requests1 \
+		${PYTHON_PKGNAMEPREFIX}oauth2>0:net/py-oauth2
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-requests-oauthlib/Makefile b/www/py-requests-oauthlib/Makefile
index b0e458bb9ce1..db531e03eea5 100644
--- a/www/py-requests-oauthlib/Makefile
+++ b/www/py-requests-oauthlib/Makefile
@@ -12,9 +12,9 @@ COMMENT=	OAuthlib authentication support for Requests
 
 LICENSE=	ISCL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6.2:${PORTSDIR}/security/py-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:${PORTSDIR}/www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6.2:security/py-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-requests-toolbelt/Makefile b/www/py-requests-toolbelt/Makefile
index 70d956c1fcb0..d7b593188fda 100644
--- a/www/py-requests-toolbelt/Makefile
+++ b/www/py-requests-toolbelt/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Utility belt for advanced users of python-requests
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile
index cb3f86ddb935..2f04ce47d02b 100644
--- a/www/py-requests/Makefile
+++ b/www/py-requests/Makefile
@@ -13,7 +13,7 @@ COMMENT=	HTTP library written in Python for human beings
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-restclient/Makefile b/www/py-restclient/Makefile
index 2b83331f4183..8c9a39c49f7b 100644
--- a/www/py-restclient/Makefile
+++ b/www/py-restclient/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Convenient library for writing REST clients
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2
+RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-rhodecode/Makefile b/www/py-rhodecode/Makefile
index 4703d229ff44..513bf811dae9 100644
--- a/www/py-rhodecode/Makefile
+++ b/www/py-rhodecode/Makefile
@@ -14,29 +14,29 @@ COMMENT=	Fast and powerful management tool for Mercurial and GIT
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:${PORTSDIR}/www/py-pastescript
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylons>=1.0:${PORTSDIR}/www/py-pylons \
-		${PYTHON_PKGNAMEPREFIX}waitress>=0.8.4:${PORTSDIR}/www/py-waitress \
-		${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:${PORTSDIR}/www/py-webob \
-		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:${PORTSDIR}/www/py-formencode \
-		${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:${PORTSDIR}/www/py-webhelpers \
-		${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:${PORTSDIR}/textproc/py-mako \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.10:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.5:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:${PORTSDIR}/textproc/py-whoosh \
-		${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.7:${PORTSDIR}/devel/dulwich \
-		${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:${PORTSDIR}/textproc/py-markdown \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:${PORTSDIR}/security/py-bcrypt \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:${PORTSDIR}/www/py-pastescript \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:${PORTSDIR}/devel/py-repoze.lru \
-		${PYTHON_PKGNAMEPREFIX}celery>=0:${PORTSDIR}/devel/py-celery \
-		mercurial>=2.6:${PORTSDIR}/devel/mercurial
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons \
+		${PYTHON_PKGNAMEPREFIX}waitress>=0.8.4:www/py-waitress \
+		${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob \
+		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode \
+		${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers \
+		${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:textproc/py-mako \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.10:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh \
+		${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.7:devel/dulwich \
+		${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:security/py-bcrypt \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru \
+		${PYTHON_PKGNAMEPREFIX}celery>=0:devel/py-celery \
+		mercurial>=2.6:devel/mercurial
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
@@ -52,11 +52,11 @@ GIT_DESC=	GIT support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ldap>=2.4.6:${PORTSDIR}/net/py-ldap
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ldap>=2.4.6:net/py-ldap
 .endif
 
 .if ${PORT_OPTIONS:MGIT}
-RUN_DEPENDS+=	${LOCALBASE}/bin/git:${PORTSDIR}/devel/git
+RUN_DEPENDS+=	${LOCALBASE}/bin/git:devel/git
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/py-satchmo/Makefile b/www/py-satchmo/Makefile
index 72c9fc0fd274..3dc53a419913 100644
--- a/www/py-satchmo/Makefile
+++ b/www/py-satchmo/Makefile
@@ -17,20 +17,20 @@ EXPIRATION_DATE=	2016-04-01
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.2.3:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1 \
-		${PYTHON_PKGNAMEPREFIX}trml2pdf>=0:${PORTSDIR}/print/py-trml2pdf \
-		${PYTHON_PKGNAMEPREFIX}django-registration>=0.8:${PORTSDIR}/www/py-django-registration \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}sorl-thumbnail<4:${PORTSDIR}/graphics/py-sorl-thumbnail \
-		${PYTHON_PKGNAMEPREFIX}django-caching-app-plugins>=0:${PORTSDIR}/www/py-django-caching-app-plugins \
-		${PYTHON_PKGNAMEPREFIX}django-keyedcache>=0:${PORTSDIR}/www/py-django-keyedcache \
-		${PYTHON_PKGNAMEPREFIX}django-livesettings>=0:${PORTSDIR}/www/py-django-livesettings \
-		${PYTHON_PKGNAMEPREFIX}django-signals-ahoy>=0:${PORTSDIR}/www/py-django-signals-ahoy \
-		${PYTHON_PKGNAMEPREFIX}django-threaded-multihost>=0:${PORTSDIR}/www/py-django-threaded-multihost
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.2.3:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1 \
+		${PYTHON_PKGNAMEPREFIX}trml2pdf>=0:print/py-trml2pdf \
+		${PYTHON_PKGNAMEPREFIX}django-registration>=0.8:www/py-django-registration \
+		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}sorl-thumbnail<4:graphics/py-sorl-thumbnail \
+		${PYTHON_PKGNAMEPREFIX}django-caching-app-plugins>=0:www/py-django-caching-app-plugins \
+		${PYTHON_PKGNAMEPREFIX}django-keyedcache>=0:www/py-django-keyedcache \
+		${PYTHON_PKGNAMEPREFIX}django-livesettings>=0:www/py-django-livesettings \
+		${PYTHON_PKGNAMEPREFIX}django-signals-ahoy>=0:www/py-django-signals-ahoy \
+		${PYTHON_PKGNAMEPREFIX}django-threaded-multihost>=0:www/py-django-threaded-multihost
 
 USES=		gettext python
 USE_PYTHON=	distutils autoplist
@@ -45,15 +45,15 @@ AKISMET_DESC=	Use Akismet for spam filtering on product reviews
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSOUTH}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}south>=0.7.5:${PORTSDIR}/databases/py-south
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}south>=0.7.5:databases/py-south
 .endif
 
 .if ${PORT_OPTIONS:MFEDEX}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}fedex>=1.0.13:${PORTSDIR}/www/py-fedex
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}fedex>=1.0.13:www/py-fedex
 .endif
 
 .if ${PORT_OPTIONS:MAKISMET}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}akismet>=0.2.0:${PORTSDIR}/devel/py-akismet
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}akismet>=0.2.0:devel/py-akismet
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile
index adbdc6ffdf27..5d6aec66670a 100644
--- a/www/py-scrapy/Makefile
+++ b/www/py-scrapy/Makefile
@@ -12,11 +12,11 @@ COMMENT=	High level scraping and web crawling framework
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}w3lib>=1.2:${PORTSDIR}/www/py-w3lib \
-		${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:${PORTSDIR}/www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}queuelib>=1.2.2:${PORTSDIR}/sysutils/py-queuelib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}w3lib>=1.2:www/py-w3lib \
+		${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}queuelib>=1.2.2:sysutils/py-queuelib
 
 USES=		python:2 twisted:run,web
 USE_PYTHON=	distutils autoplist
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=SSL
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/py-scriptaculous/Makefile b/www/py-scriptaculous/Makefile
index aa2b218186d8..0699ca91ea4f 100644
--- a/www/py-scriptaculous/Makefile
+++ b/www/py-scriptaculous/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	Scriptaculous-${PORTVERSION}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Scriptaculous packaged as TurboGears widgets
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:${PORTSDIR}/www/py-turbogears
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:www/py-turbogears
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PYDISTUTILS_PKGNAME=	Scriptaculous
diff --git a/www/py-selector/Makefile b/www/py-selector/Makefile
index fed673553078..08117b202500 100644
--- a/www/py-selector/Makefile
+++ b/www/py-selector/Makefile
@@ -12,7 +12,7 @@ COMMENT=	WSGI request delegation (a.k.a. routing)
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}resolver>=0.2.1:${PORTSDIR}/devel/py-resolver
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}resolver>=0.2.1:devel/py-resolver
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-slimit/Makefile b/www/py-slimit/Makefile
index 9124e411381b..759e0d603c4b 100644
--- a/www/py-slimit/Makefile
+++ b/www/py-slimit/Makefile
@@ -11,8 +11,8 @@ COMMENT=	JavaScript minifier written in Python
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=3.4:${PORTSDIR}/devel/py-ply
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=3.4:${PORTSDIR}/devel/py-ply
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
@@ -21,7 +21,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} >= 3000
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 pre-build:
 	@cd ${WRKSRC} && 2to3-${PYTHON_VER} -w src
 .endif
diff --git a/www/py-slumber/Makefile b/www/py-slumber/Makefile
index 14cf08056cec..53600a6a94bd 100644
--- a/www/py-slumber/Makefile
+++ b/www/py-slumber/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Library that makes consuming a REST API easier and more convenient
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=	YAML
 
 YAML_DESC=		YAML serializer support
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/www/py-splinter/Makefile b/www/py-splinter/Makefile
index a9801cc8a5e7..a003e2b6b462 100644
--- a/www/py-splinter/Makefile
+++ b/www/py-splinter/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Browser abstraction for web acceptance testing
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}selenium>=2.39:${PORTSDIR}/www/py-selenium \
-		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.4:${PORTSDIR}/devel/py-zope.testbrowser \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}cssselect>0:${PORTSDIR}/www/py-cssselect
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}selenium>=2.39:www/py-selenium \
+		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.4:devel/py-zope.testbrowser \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-spyne/Makefile b/www/py-spyne/Makefile
index 4fb528764824..3a5e8098c604 100644
--- a/www/py-spyne/Makefile
+++ b/www/py-spyne/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Transport and architecture agnostic RPC library
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-tgwebservices/Makefile b/www/py-tgwebservices/Makefile
index 96b2d1a62b31..5ca018fd0d33 100644
--- a/www/py-tgwebservices/Makefile
+++ b/www/py-tgwebservices/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	TGWebServices-${PORTVERSION}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Multiprotocol Web Services for TurboGears
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:${PORTSDIR}/www/py-turbogears \
-		${PYTHON_PKGNAMEPREFIX}Genshi>=0.3.6:${PORTSDIR}/textproc/py-genshi
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:www/py-turbogears \
+		${PYTHON_PKGNAMEPREFIX}Genshi>=0.3.6:textproc/py-genshi
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index a67fe19d0edf..381094d7a6da 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python Web Server from FriendFeed
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>0:${PORTSDIR}/security/py-certifi
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -20,15 +20,15 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>0:${PORTSDIR}/devel/py-futures
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
 .endif
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}singledispatch>0:${PORTSDIR}/devel/py-singledispatch
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch
 .endif
 
 .if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:${PORTSDIR}/devel/py-backports_abc
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc
 .endif
 
 post-build:
diff --git a/www/py-trello/Makefile b/www/py-trello/Makefile
index 84a15b6fe51b..cea90d631d7f 100644
--- a/www/py-trello/Makefile
+++ b/www/py-trello/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	Fog Creek Software
 LICENSE_FILE=	${WRKSRC}/PKG-INFO
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0.9.1:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0.9.1:www/py-requests
 
 USES=	python:-2.7 zip
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile
index 3bde9dfcb90b..7ad967b48872 100644
--- a/www/py-turbogears/Makefile
+++ b/www/py-turbogears/Makefile
@@ -11,18 +11,18 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python-Based Framework for Rapid Web Development
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cherrypy>=3.1.2:${PORTSDIR}/www/py-cherrypy \
-		${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.1:${PORTSDIR}/www/py-formencode \
-		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7:${PORTSDIR}/www/py-pastescript \
-		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5a1:${PORTSDIR}/devel/py-PEAK-Rules \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}TurboCheetah>=1.0:${PORTSDIR}/devel/py-turbocheetah \
-		${PYTHON_PKGNAMEPREFIX}TurboKid>=1.0.5:${PORTSDIR}/devel/py-turbokid \
-		${PYTHON_PKGNAMEPREFIX}TurboJson>=1.3:${PORTSDIR}/devel/py-turbojson \
-		${PYTHON_PKGNAMEPREFIX}tgMochiKit>=1.4.2:${PORTSDIR}/devel/py-tgMochiKit \
-		${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:${PORTSDIR}/textproc/py-genshi \
-		${PYTHON_PKGNAMEPREFIX}TGScheduler>0:${PORTSDIR}/devel/py-TGScheduler
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cherrypy>=3.1.2:www/py-cherrypy \
+		${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.1:www/py-formencode \
+		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7:www/py-pastescript \
+		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5a1:devel/py-PEAK-Rules \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}TurboCheetah>=1.0:devel/py-turbocheetah \
+		${PYTHON_PKGNAMEPREFIX}TurboKid>=1.0.5:devel/py-turbokid \
+		${PYTHON_PKGNAMEPREFIX}TurboJson>=1.3:devel/py-turbojson \
+		${PYTHON_PKGNAMEPREFIX}tgMochiKit>=1.4.2:devel/py-tgMochiKit \
+		${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:textproc/py-genshi \
+		${PYTHON_PKGNAMEPREFIX}TGScheduler>0:devel/py-TGScheduler
 
 USES=		gettext python:2
 USE_PYTHON=	distutils autoplist
@@ -41,19 +41,19 @@ post-patch:
 		${WRKSRC}/TurboGears.egg-info/requires.txt
 
 .if ${PORT_OPTIONS:MELIXIR}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Elixir>=0.6.1:${PORTSDIR}/databases/py-Elixir
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Elixir>=0.6.1:databases/py-Elixir
 .endif
 
 .if ${PORT_OPTIONS:MNOSE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>=0.9.1:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>=0.9.1:devel/py-nose
 .endif
 
 .if ${PORT_OPTIONS:MSQLOBJECT}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlobject>=0.10.1:${PORTSDIR}/databases/py-sqlobject
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlobject>=0.10.1:databases/py-sqlobject
 .endif
 
 .if ${PORT_OPTIONS:MSQLALCHEMY}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.3.4:${PORTSDIR}/databases/py-sqlalchemy06
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.3.4:databases/py-sqlalchemy06
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/py-turbogears2/Makefile b/www/py-turbogears2/Makefile
index a7dac9ee6237..2271726a4a70 100644
--- a/www/py-turbogears2/Makefile
+++ b/www/py-turbogears2/Makefile
@@ -10,25 +10,25 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python-Based Framework for Rapid Web Development
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0.9.4:${PORTSDIR}/devel/py-ToscaWidgets \
-		${PYTHON_PKGNAMEPREFIX}Genshi>=0.5.1:${PORTSDIR}/textproc/py-genshi \
-		${PYTHON_PKGNAMEPREFIX}WebFlash>=0.1a8:${PORTSDIR}/www/py-WebFlash \
-		${PYTHON_PKGNAMEPREFIX}WebError>=0.10.1:${PORTSDIR}/www/py-WebError \
-		${PYTHON_PKGNAMEPREFIX}repoze.tm2>=0:${PORTSDIR}/devel/py-repoze.tm2 \
-		${PYTHON_PKGNAMEPREFIX}TurboJson>=1.3.0:${PORTSDIR}/devel/py-turbojson \
-		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.0:${PORTSDIR}/devel/py-repoze.who \
-		${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=1.0.8:${PORTSDIR}/devel/py-repoze.who-testutil \
-		${PYTHON_PKGNAMEPREFIX}repoze.what>=1.0.8:${PORTSDIR}/devel/py-repoze.what \
-		${PYTHON_PKGNAMEPREFIX}repoze.what-pylons>=1.0:${PORTSDIR}/devel/py-repoze.what-pylons \
-		${PYTHON_PKGNAMEPREFIX}repoze.tm2>=1.0:${PORTSDIR}/devel/py-repoze.tm2 \
-		${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}TurboKid>=1.0.4:${PORTSDIR}/devel/py-turbokid \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.4:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}Chameleon>=2.0:${PORTSDIR}/textproc/py-Chameleon \
-		${PYTHON_PKGNAMEPREFIX}mako>=0:${PORTSDIR}/textproc/py-mako \
-		${PYTHON_PKGNAMEPREFIX}Babel>=0.9.4:${PORTSDIR}/devel/py-babel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0.9.4:devel/py-ToscaWidgets \
+		${PYTHON_PKGNAMEPREFIX}Genshi>=0.5.1:textproc/py-genshi \
+		${PYTHON_PKGNAMEPREFIX}WebFlash>=0.1a8:www/py-WebFlash \
+		${PYTHON_PKGNAMEPREFIX}WebError>=0.10.1:www/py-WebError \
+		${PYTHON_PKGNAMEPREFIX}repoze.tm2>=0:devel/py-repoze.tm2 \
+		${PYTHON_PKGNAMEPREFIX}TurboJson>=1.3.0:devel/py-turbojson \
+		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.0:devel/py-repoze.who \
+		${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=1.0.8:devel/py-repoze.who-testutil \
+		${PYTHON_PKGNAMEPREFIX}repoze.what>=1.0.8:devel/py-repoze.what \
+		${PYTHON_PKGNAMEPREFIX}repoze.what-pylons>=1.0:devel/py-repoze.what-pylons \
+		${PYTHON_PKGNAMEPREFIX}repoze.tm2>=1.0:devel/py-repoze.tm2 \
+		${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \
+		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}TurboKid>=1.0.4:devel/py-turbokid \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.4:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}Chameleon>=2.0:textproc/py-Chameleon \
+		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako \
+		${PYTHON_PKGNAMEPREFIX}Babel>=0.9.4:devel/py-babel
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-txrequests/Makefile b/www/py-txrequests/Makefile
index ec9bde7edf41..b599fe5474b4 100644
--- a/www/py-txrequests/Makefile
+++ b/www/py-txrequests/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Asynchronous Python HTTP for Humans
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}twisted>=9.0.0:${PORTSDIR}/devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}twisted>=9.0.0:devel/py-twisted
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-ua-parser/Makefile b/www/py-ua-parser/Makefile
index 7472d40485a2..31d977cc07b2 100644
--- a/www/py-ua-parser/Makefile
+++ b/www/py-ua-parser/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Tools for using a Web Server Gateway Interface stack
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		python
diff --git a/www/py-urlgrabber/Makefile b/www/py-urlgrabber/Makefile
index 05a2923bced8..dd7f220dc298 100644
--- a/www/py-urlgrabber/Makefile
+++ b/www/py-urlgrabber/Makefile
@@ -14,8 +14,8 @@ COMMENT=	High-level cross-protocol url-grabber
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}pycurl>=7.19.0_1:${PORTSDIR}/ftp/py-pycurl
-RUN_DEPENDS=	${PKGNAMEPREFIX}pycurl>=7.19.0_1:${PORTSDIR}/ftp/py-pycurl
+BUILD_DEPENDS=	${PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl
+RUN_DEPENDS=	${PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/www/py-urljr/Makefile b/www/py-urljr/Makefile
index 66d4bb83f5c4..b4197efe3892 100644
--- a/www/py-urljr/Makefile
+++ b/www/py-urljr/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Common interface to HTTP fetchers for PycURL or urllib2
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycurl>=0:${PORTSDIR}/ftp/py-pycurl
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycurl>=0:ftp/py-pycurl
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-user_agent/Makefile b/www/py-user_agent/Makefile
index 551cce7d962c..95b6e465d9a5 100644
--- a/www/py-user_agent/Makefile
+++ b/www/py-user_agent/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Generates random, valid User-Agent values
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-utidy/Makefile b/www/py-utidy/Makefile
index 3e58fbdfe382..d23dea67735b 100644
--- a/www/py-utidy/Makefile
+++ b/www/py-utidy/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python interface to tidy-lib
 
 # XXX Better depend on tidy or tidy-devel???
-LIB_DEPENDS=	libtidy.so:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS=	libtidy.so:www/tidy-lib
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-w3lib/Makefile b/www/py-w3lib/Makefile
index 6a7ec5ffeab1..86f564c9bc0d 100644
--- a/www/py-w3lib/Makefile
+++ b/www/py-w3lib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library of web-related functions
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-webhelpers/Makefile b/www/py-webhelpers/Makefile
index 708a58b38c0f..ab5c5dd82193 100644
--- a/www/py-webhelpers/Makefile
+++ b/www/py-webhelpers/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python helper functions for writing templates in web applications
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}routes>=1.1:${PORTSDIR}/www/py-routes \
-		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:${PORTSDIR}/textproc/py-MarkupSafe
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}routes>=1.1:www/py-routes \
+		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:textproc/py-MarkupSafe
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-webkitgtk/Makefile b/www/py-webkitgtk/Makefile
index 636948d4e26c..fe2ddc573554 100644
--- a/www/py-webkitgtk/Makefile
+++ b/www/py-webkitgtk/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Python bindings for the WebKit GTK+ port
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/www/py-webob/Makefile b/www/py-webob/Makefile
index 919a8e45fade..ff94fc145990 100644
--- a/www/py-webob/Makefile
+++ b/www/py-webob/Makefile
@@ -12,7 +12,7 @@ COMMENT=	WSGI request and response Python object
 
 LICENSE=	MIT
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE= DOCS TESTS
@@ -22,7 +22,7 @@ PORTDOCS=	*
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-TESTS_BUILD_DEPENDS=	nosetests:${PORTSDIR}/devel/py-nose
+TESTS_BUILD_DEPENDS=	nosetests:devel/py-nose
 TESTS_DESC=	Run tests with Nose
 
 .include <bsd.port.options.mk>
diff --git a/www/py-wikipedia/Makefile b/www/py-wikipedia/Makefile
index 73852565bdf1..f8c435441274 100644
--- a/www/py-wikipedia/Makefile
+++ b/www/py-wikipedia/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Wikipedia API for Python
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:${PORTSDIR}/www/py-beautifulsoup \
-	${PYTHON_PKGNAMEPREFIX}requests>=2.7:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup \
+	${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests
 
 USES=	python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-ws4py/Makefile b/www/py-ws4py/Makefile
index 011c2c4655ac..f433298fcfac 100644
--- a/www/py-ws4py/Makefile
+++ b/www/py-ws4py/Makefile
@@ -23,9 +23,9 @@ CHERRYPY_DESC=	CherryPy server support
 GEVENT_DESC=	gevent-based client/server support
 TORNADO_DESC=	Tornado client support
 
-CHERRYPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:${PORTSDIR}/www/py-cherrypy
-GEVENT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:${PORTSDIR}/devel/py-gevent
-TORNADO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>=3.1:${PORTSDIR}/www/py-tornado
+CHERRYPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:www/py-cherrypy
+GEVENT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent
+TORNADO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>=3.1:www/py-tornado
 
 # Do not install files which will not work
 post-patch-CHERRYPY-off:
diff --git a/www/py-zope.app.wsgi/Makefile b/www/py-zope.app.wsgi/Makefile
index ef15dc08c6c9..76caf8e730ad 100644
--- a/www/py-zope.app.wsgi/Makefile
+++ b/www/py-zope.app.wsgi/Makefile
@@ -13,26 +13,26 @@ COMMENT=	WSGI application for the zope.publisher
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}WebTest>=0:${PORTSDIR}/www/py-WebTest \
-		${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.14:${PORTSDIR}/devel/py-zope.app.appsetup \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.error>=0:${PORTSDIR}/devel/py-zope.error \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.session>=0:${PORTSDIR}/security/py-zope.session \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:${PORTSDIR}/devel/py-zope.testbrowser \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest \
+		${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.14:devel/py-zope.app.appsetup \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/pycarddav/Makefile b/www/pycarddav/Makefile
index 4d78a0f4e460..cf5ba140b154 100644
--- a/www/pycarddav/Makefile
+++ b/www/pycarddav/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Simple to use CardDAV CLI client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}vobject>0:${PORTSDIR}/deskutils/py-vobject \
-		${PYTHON_PKGNAMEPREFIX}urwid>0:${PORTSDIR}/devel/py-urwid \
-		${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}vobject>0:deskutils/py-vobject \
+		${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid \
+		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/pylot/Makefile b/www/pylot/Makefile
index 103662ad2e68..385986a7e3bf 100644
--- a/www/pylot/Makefile
+++ b/www/pylot/Makefile
@@ -40,7 +40,7 @@ WX_COMPS=	python:run
 
 .if ${PORT_OPTIONS:MREPORTGRAPHS}
 RUN_DEPENDS+=	${PYNUMPY}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/matplotlib/__init__.py:${PORTSDIR}/math/py-matplotlib
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/qupzilla-qt4/Makefile b/www/qupzilla-qt4/Makefile
index 2d42f1980787..06c8f80df388 100644
--- a/www/qupzilla-qt4/Makefile
+++ b/www/qupzilla-qt4/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Web browser based on WebKit engine and Qt Framework
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 
 CONFLICTS_INSTALL=	${PORTNAME}-qt5*
 
@@ -34,7 +34,7 @@ OPTIONS_SUB=	yes
 DBUS_USE=		QT4=dbus
 DBUS_CONFIGURE_ENV_OFF=	DISABLE_DBUS="true"
 
-GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring
 GNOMEKEYRING_CONFIGURE_ENV=	GNOME_INTEGRATION="true"
 
 KWALLET_USE=		KDE4=kdelibs
diff --git a/www/qupzilla-qt5/Makefile b/www/qupzilla-qt5/Makefile
index 05cced8c03fb..34e3b7ca2b57 100644
--- a/www/qupzilla-qt5/Makefile
+++ b/www/qupzilla-qt5/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Web browser based on WebKit engine and Qt Framework
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 
 CONFLICTS_INSTALL=	${PORTNAME}-qt4*
 
@@ -34,7 +34,7 @@ OPTIONS_SUB=	yes
 DBUS_USE=		QT5=dbus
 DBUS_CONFIGURE_ENV_OFF=	DISABLE_DBUS="true"
 
-GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring
 GNOMEKEYRING_CONFIGURE_ENV=	GNOME_INTEGRATION="true"
 
 KWALLET_USE=		KDE5=wallet
diff --git a/www/radicale/Makefile b/www/radicale/Makefile
index ae66a162c1a7..5c1cfd2b0f9d 100644
--- a/www/radicale/Makefile
+++ b/www/radicale/Makefile
@@ -35,11 +35,11 @@ USES+=		python
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}requests1>=0:${PORTSDIR}/www/py-requests1
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ldap>=0:${PORTSDIR}/net/py-ldap
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap
 .endif
 
 post-patch:
diff --git a/www/redmine-backlogs/Makefile b/www/redmine-backlogs/Makefile
index 98180b740592..c28516d2c732 100644
--- a/www/redmine-backlogs/Makefile
+++ b/www/redmine-backlogs/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Agile plugin for Redmine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-holidays>=1.0.3:${PORTSDIR}/devel/rubygem-holidays \
-		rubygem-icalendar>=0.4.2:${PORTSDIR}/devel/rubygem-icalendar \
-		rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-open-uri-cached>=0:${PORTSDIR}/net/rubygem-open-uri-cached \
-		rubygem-prawn>=0:${PORTSDIR}/print/rubygem-prawn
+RUN_DEPENDS=	rubygem-holidays>=1.0.3:devel/rubygem-holidays \
+		rubygem-icalendar>=0.4.2:devel/rubygem-icalendar \
+		rubygem-nokogiri>=0:textproc/rubygem-nokogiri \
+		rubygem-open-uri-cached>=0:net/rubygem-open-uri-cached \
+		rubygem-prawn>=0:print/rubygem-prawn
 
 NO_ARCH=	yes
 USES=		shebangfix
diff --git a/www/redmine-basecamp/Makefile b/www/redmine-basecamp/Makefile
index 3f7c823ff1b4..3c40ef229d11 100644
--- a/www/redmine-basecamp/Makefile
+++ b/www/redmine-basecamp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Basecamp Theme for Redmine
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	redmine>=0.9:${PORTSDIR}/www/redmine
+RUN_DEPENDS=	redmine>=0.9:www/redmine
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	theill
diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 6fb4524574b8..e285d9e1ee70 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -13,21 +13,21 @@ COMMENT=	Flexible project management web application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
-RUN_DEPENDS=	rubygem-builder>=3.0.0:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-coderay>=1.0.9:${PORTSDIR}/textproc/rubygem-coderay \
-		rubygem-i18n>=0.7.0:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-jquery-rails>=3.1.4:${PORTSDIR}/www/rubygem-jquery-rails \
-		rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-net-ldap>=0.3.1:${PORTSDIR}/net/rubygem-net-ldap \
-		rubygem-rack-openid>=0:${PORTSDIR}/www/rubygem-rack-openid \
-		rubygem-ruby-openid>=2.3.0:${PORTSDIR}/net/rubygem-ruby-openid \
-		rubygem-rails>=3.2.22:${PORTSDIR}/www/rubygem-rails \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rbpdf>=0:${PORTSDIR}/print/rubygem-rbpdf \
-		rubygem-redcarpet>=3.3.2:${PORTSDIR}/textproc/rubygem-redcarpet \
-		rubygem-request_store>=1.1.0:${PORTSDIR}/devel/rubygem-request_store \
-		rubygem-rubytree>=0:${PORTSDIR}/devel/rubygem-rubytree
+RUN_DEPENDS=	rubygem-builder>=3.0.0:devel/rubygem-builder \
+		rubygem-bundler>=0:sysutils/rubygem-bundler \
+		rubygem-coderay>=1.0.9:textproc/rubygem-coderay \
+		rubygem-i18n>=0.7.0:devel/rubygem-i18n \
+		rubygem-jquery-rails>=3.1.4:www/rubygem-jquery-rails \
+		rubygem-mime-types>=0:misc/rubygem-mime-types \
+		rubygem-net-ldap>=0.3.1:net/rubygem-net-ldap \
+		rubygem-rack-openid>=0:www/rubygem-rack-openid \
+		rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \
+		rubygem-rails>=3.2.22:www/rubygem-rails \
+		rubygem-rake>=0:devel/rubygem-rake \
+		rubygem-rbpdf>=0:print/rubygem-rbpdf \
+		rubygem-redcarpet>=3.3.2:textproc/rubygem-redcarpet \
+		rubygem-request_store>=1.1.0:devel/rubygem-request_store \
+		rubygem-rubytree>=0:devel/rubygem-rubytree
 
 NO_ARCH=	yes
 NO_BUILD=	yes
@@ -51,12 +51,12 @@ PASSENGER_DESC=	Use Apache/Nginx WEB server
 MYSQL2_DESC=	MySQL database support (via mysql2 rubygem)
 NO_OPTIONS_SORT=yes
 
-MYSQL_RUN_DEPENDS=	rubygem-mysql>=2.8.1:${PORTSDIR}/databases/rubygem-mysql
-MYSQL2_RUN_DEPENDS=	rubygem-mysql2>=0:${PORTSDIR}/databases/rubygem-mysql2
-PASSENGER_RUN_DEPENDS=	passenger-config:${PORTSDIR}/www/rubygem-passenger
-POSTGRESQL_RUN_DEPENDS=	rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
-RMAGIC_RUN_DEPENDS=	rubygem-rmagick>=2.13.4:${PORTSDIR}/graphics/rubygem-rmagick
-THIN_RUN_DEPENDS=	thin:${PORTSDIR}/www/rubygem-thin
+MYSQL_RUN_DEPENDS=	rubygem-mysql>=2.8.1:databases/rubygem-mysql
+MYSQL2_RUN_DEPENDS=	rubygem-mysql2>=0:databases/rubygem-mysql2
+PASSENGER_RUN_DEPENDS=	passenger-config:www/rubygem-passenger
+POSTGRESQL_RUN_DEPENDS=	rubygem-pg>=0:databases/rubygem-pg
+RMAGIC_RUN_DEPENDS=	rubygem-rmagick>=2.13.4:graphics/rubygem-rmagick
+THIN_RUN_DEPENDS=	thin:www/rubygem-thin
 THIN_SUB_LIST=		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 THIN_VARS=		USE_RC_SUBR=redmine
 
diff --git a/www/redmine/bsd.redmine.mk b/www/redmine/bsd.redmine.mk
index 029b1a9806ad..cdc730b6723f 100644
--- a/www/redmine/bsd.redmine.mk
+++ b/www/redmine/bsd.redmine.mk
@@ -45,7 +45,7 @@
 
 PKGNAMEPREFIX?=	redmine-
 
-RUN_DEPENDS+=	redmine>=2.0:${PORTSDIR}/www/redmine
+RUN_DEPENDS+=	redmine>=2.0:www/redmine
 
 USE_RUBY=	yes
 .if !defined(PLIST)
diff --git a/www/rejik/Makefile b/www/rejik/Makefile
index 92b73f944fbf..0887533db02b 100644
--- a/www/rejik/Makefile
+++ b/www/rejik/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Squid redirector used for blocking unwanted content
 
 LICENSE=	BSD4CLAUSE
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+RUN_DEPENDS=	${LOCALBASE}/sbin/squid:www/squid
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		perl5 tar:tgz
 USE_GCC=	any
diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile
index bea6cc7afb96..f0b1a3d49ac9 100644
--- a/www/rekonq/Makefile
+++ b/www/rekonq/Makefile
@@ -18,8 +18,8 @@ OPTIONS_DEFINE=	OPERA NEPOMUK
 OPTIONS_DEFAULT=	NEPOMUK
 
 OPERA_DESC=	Support for Opera Sync service
-OPERA_LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca \
-			libqoauth.so:${PORTSDIR}/net/qoauth
+OPERA_LIB_DEPENDS=	libqca.so:devel/qca \
+			libqoauth.so:net/qoauth
 OPERA_CMAKE_OFF=	-DWITH_QCA2=off \
 			-DWITH_QtOAuth=off
 
diff --git a/www/reportmagic/Makefile b/www/reportmagic/Makefile
index 9a7bc1453355..964448bcd1c7 100644
--- a/www/reportmagic/Makefile
+++ b/www/reportmagic/Makefile
@@ -14,10 +14,10 @@ DISTNAME=	rmagic-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web site statistics post-processor for Analog
 
-RUN_DEPENDS=	analog:${PORTSDIR}/www/analog \
-		p5-GD-Graph3d>=0:${PORTSDIR}/graphics/p5-GD-Graph3d \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles
+RUN_DEPENDS=	analog:www/analog \
+		p5-GD-Graph3d>=0:graphics/p5-GD-Graph3d \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Config-IniFiles>=0:devel/p5-Config-IniFiles
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	rmagic.pl
diff --git a/www/repos-style/Makefile b/www/repos-style/Makefile
index d8ad93ede5c4..c933161df903 100644
--- a/www/repos-style/Makefile
+++ b/www/repos-style/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/ \
 MAINTAINER=	avk@vl.ru
 COMMENT=	Stylesheet for the Subversion index web page
 
-RUN_DEPENDS=	subversion>=0:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	subversion>=0:devel/subversion
 
 USES=		zip
 NO_BUILD=	YES
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 83768d78dbc6..de91ad7264ec 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -63,7 +63,7 @@ USE_RC_SUBR=	resin3
 
 # Install the Apache plugin if needed
 .if ${PORT_OPTIONS:MAPACHE22}
-BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/www/apache22
+BUILD_DEPENDS+=	${APXS}:www/apache22
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 PLIST_SUB+=	MOD_DIR=libexec/apache22
 # Allow apxs invocations
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index e850bae6ce97..5a78bbd8925a 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -31,7 +31,7 @@ OPTIONS_RADIO=	BACKEND
 BACKEND_DESC=	SSL Backend
 OPTIONS_RADIO_BACKEND=	OPENSSL GNUTLS
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--set-tls=1
 
 OPENSSL_USE=		OPENSSL=yes
diff --git a/www/reviewboard/Makefile b/www/reviewboard/Makefile
index bb63451d08cc..0e3ca51a6e67 100644
--- a/www/reviewboard/Makefile
+++ b/www/reviewboard/Makefile
@@ -15,32 +15,32 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN=		depends on conflicting versions of django
 
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${PYTHON_PKGNAMEPREFIX}django16>=1.6.11:${PORTSDIR}/www/py-django16 \
-		${PYTHON_PKGNAMEPREFIX}django-evolution>=0.6.7:${PORTSDIR}/www/py-django-evolution \
-		${PYTHON_PKGNAMEPREFIX}django-pipeline13>=1.3.27:${PORTSDIR}/www/py-django-pipeline13 \
-		${PYTHON_PKGNAMEPREFIX}djblets>=0.7.9:${PORTSDIR}/www/py-djblets \
-		${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}django-haystack>=2.4.1:${PORTSDIR}/www/py-django-haystack \
-		${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:${PORTSDIR}/textproc/py-markdown \
-		${PYTHON_PKGNAMEPREFIX}python-memcached>0:${PORTSDIR}/databases/py-python-memcached \
-		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.3:${PORTSDIR}/devel/py-mimeparse \
-		${PYTHON_PKGNAMEPREFIX}paramiko>=1.9.0:${PORTSDIR}/security/py-paramiko \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.5:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}recaptcha>0:${PORTSDIR}/www/py-recaptcha \
-		${PYTHON_PKGNAMEPREFIX}futures>=0:${PORTSDIR}/devel/py-futures \
-		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.3:${PORTSDIR}/devel/py-mimeparse
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${PYTHON_PKGNAMEPREFIX}django16>=1.6.7:${PORTSDIR}/www/py-django16 \
-		${PYTHON_PKGNAMEPREFIX}django-evolution>=0.6.7:${PORTSDIR}/www/py-django-evolution \
-		${PYTHON_PKGNAMEPREFIX}djblets>=0.7.7:${PORTSDIR}/www/py-djblets \
-		${PYTHON_PKGNAMEPREFIX}django-haystack>=2.4.1:${PORTSDIR}/www/py-django-haystack \
-		${PYTHON_PKGNAMEPREFIX}futures>=0:${PORTSDIR}/devel/py-futures \
-		${PYTHON_PKGNAMEPREFIX}jsmin>0:${PORTSDIR}/devel/py-jsmin \
-		uglifyjs:${PORTSDIR}/www/uglifyjs
+RUN_DEPENDS=	python:lang/python \
+		${PYTHON_PKGNAMEPREFIX}django16>=1.6.11:www/py-django16 \
+		${PYTHON_PKGNAMEPREFIX}django-evolution>=0.6.7:www/py-django-evolution \
+		${PYTHON_PKGNAMEPREFIX}django-pipeline13>=1.3.27:www/py-django-pipeline13 \
+		${PYTHON_PKGNAMEPREFIX}djblets>=0.7.9:www/py-djblets \
+		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}django-haystack>=2.4.1:www/py-django-haystack \
+		${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown \
+		${PYTHON_PKGNAMEPREFIX}python-memcached>0:databases/py-python-memcached \
+		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.3:devel/py-mimeparse \
+		${PYTHON_PKGNAMEPREFIX}paramiko>=1.9.0:security/py-paramiko \
+		${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}recaptcha>0:www/py-recaptcha \
+		${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures \
+		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.3:devel/py-mimeparse
+BUILD_DEPENDS=	python:lang/python \
+		${PYTHON_PKGNAMEPREFIX}django16>=1.6.7:www/py-django16 \
+		${PYTHON_PKGNAMEPREFIX}django-evolution>=0.6.7:www/py-django-evolution \
+		${PYTHON_PKGNAMEPREFIX}djblets>=0.7.7:www/py-djblets \
+		${PYTHON_PKGNAMEPREFIX}django-haystack>=2.4.1:www/py-django-haystack \
+		${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures \
+		${PYTHON_PKGNAMEPREFIX}jsmin>0:devel/py-jsmin \
+		uglifyjs:www/uglifyjs
 
 USES=		cpe gettext-tools python:2
 CPE_VENDOR=	reviewboard
@@ -55,7 +55,7 @@ OPTIONS_DEFAULT=	SVN
 
 SVN_DESC=	Support reviews for SVN repository
 
-SVN_RUN_DEPENDS=	pysvn>0:${PORTSDIR}/devel/pysvn
+SVN_RUN_DEPENDS=	pysvn>0:devel/pysvn
 
 post-patch:
 	@${REINPLACE_CMD} -e  "s|TIME_ZONE = 'UTC'|TIME_ZONE = 'Etc/UTC'|" ${WRKSRC}/reviewboard/settings.py
diff --git a/www/rnews/Makefile b/www/rnews/Makefile
index 30315b8cf6c4..849d577da0ae 100644
--- a/www/rnews/Makefile
+++ b/www/rnews/Makefile
@@ -28,10 +28,10 @@ USE_PHP+=	gd
 .endif
 
 .if ${PORT_OPTIONS:MMYSQLSERVER}
-RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
+RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:databases/mysql${MYSQL_VER}-server
 .endif
 
-RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+RUN_DEPENDS+=	curl:ftp/curl
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	CHANGELOG INSTALL LICENSE README UPGRADE
diff --git a/www/roundup/Makefile b/www/roundup/Makefile
index d7cdd14aa331..da337e19386e 100644
--- a/www/roundup/Makefile
+++ b/www/roundup/Makefile
@@ -21,15 +21,15 @@ OPTIONS_DEFAULT=SQLITE NLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSQLITE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPRREFIX}psycopg>0:${PORTSDIR}/databases/py-psycopg
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPRREFIX}psycopg>0:databases/py-psycopg
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/www/rssowl/Makefile b/www/rssowl/Makefile
index 5787c7c8d18b..7ca372c2d79d 100644
--- a/www/rssowl/Makefile
+++ b/www/rssowl/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	rssowl_${PORTVERSION:S|.|_|g}_src
 MAINTAINER=	m.sund@arcor.de
 COMMENT=	Portable RSS, RDF, Atom Newsfeeds reader
 
-BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
-RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
+RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
 
 BUILD_WRKSRC=	${WRKSRC}/src
 
diff --git a/www/rssroll/Makefile b/www/rssroll/Makefile
index 5cb4ce855ea2..2e572ce47bb7 100644
--- a/www/rssroll/Makefile
+++ b/www/rssroll/Makefile
@@ -9,9 +9,9 @@ COMMENT=	RSS collector in C
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libxml2.so:textproc/libxml2 \
+		libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	koue
diff --git a/www/rsstail/Makefile b/www/rsstail/Makefile
index f7c7e00633c5..9631cbfe8bce 100644
--- a/www/rsstail/Makefile
+++ b/www/rsstail/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple RSS monitor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmrss.so:${PORTSDIR}/textproc/libmrss
+LIB_DEPENDS=	libmrss.so:textproc/libmrss
 
 MAKE_ENV=	bindir="${PREFIX}/bin" mandir="${MANPREFIX}/man/man1"
 
diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 314189b30ecc..76e216e3bdfb 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -43,7 +43,7 @@ OPTIONS_DEFAULT=	AP_MODFASTCGI GD GPG MYSQL
 USERS?=		www
 GROUPS?=	rt www
 
-RUN_DEPENDS+=	${LOCALBASE}/bin/jsmin:${PORTSDIR}/devel/jsmin
+RUN_DEPENDS+=	${LOCALBASE}/bin/jsmin:devel/jsmin
 
 .include "${.CURDIR}/Makefile.cpan"
 
@@ -73,15 +73,15 @@ AP_MODPERL_CONFIGURE_ON=	--with-apachectl=${LOCALBASE}/sbin/apachectl
 
 AP_MODFASTCGI_DESC=		Deploy with apache and mod_fastcgi
 AP_MODFASTCGI_USE=		APACHE_RUN=22+
-AP_MODFASTCGI_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \
+AP_MODFASTCGI_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi \
 				${FASTCGI_DEPS}
 AP_MODFASTCGI_CONFIGURE_ON=	--with-apachectl=${LOCALBASE}/sbin/apachectl
 
 LIGHTTPD_DESC=			Deploy with lighttpd and mod_fastcgi
-LIGHTTPD_RUN_DEPENDS=		${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
+LIGHTTPD_RUN_DEPENDS=		${LOCALBASE}/sbin/lighttpd:www/lighttpd
 
 SPAWN_FCGI_DESC=		Deploy with spawn_fcgi
-SPAWN_FCGI_RUN_DEPENDS=		${LOCALBASE}/bin/spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
+SPAWN_FCGI_RUN_DEPENDS=		${LOCALBASE}/bin/spawn-fcgi:www/spawn-fcgi
 
 MYSQL_USE=			MYSQL=yes
 MYSQL_RUN_DEPENDS=		${MYSQL_DEPS}
@@ -212,7 +212,7 @@ post-install:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502200
-CORE_DEPS+=	p5-CGI>0:${PORTSDIR}/www/p5-CGI
+CORE_DEPS+=	p5-CGI>0:www/p5-CGI
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/rt40/Makefile.cpan b/www/rt40/Makefile.cpan
index 41c1b9feaa4b..17c93a08c272 100644
--- a/www/rt40/Makefile.cpan
+++ b/www/rt40/Makefile.cpan
@@ -22,120 +22,120 @@
 ### File::Temp			0.22	  core
 ### Sys::Syslog			0.27	  core
 
-CORE_DEPS=	p5-CSS-Squish>=0.06:${PORTSDIR}/textproc/p5-CSS-Squish \
-		p5-Cache-Simple-TimedExpiry>0:${PORTSDIR}/devel/p5-Cache-Simple-TimedExpiry \
-		p5-Class-Accessor>=0.34:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-ReturnValue>=0.40:${PORTSDIR}/devel/p5-Class-ReturnValue \
-		p5-DBI>=1.37:${PORTSDIR}/databases/p5-DBI \
-		p5-DBIx-SearchBuilder>=1.59:${PORTSDIR}/databases/p5-DBIx-SearchBuilder \
-		p5-DateTime-Locale>=0.40:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-DateTime>=0.44:${PORTSDIR}/devel/p5-DateTime \
-		p5-Devel-GlobalDestruction>0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Devel-StackTrace>=1.30:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Email-Address>=1.89.5:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Encode>=2.64:${PORTSDIR}/converters/p5-Encode \
-		p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-HTML-Format>0:${PORTSDIR}/textproc/p5-HTML-Format \
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Quoted>0:${PORTSDIR}/textproc/p5-HTML-Quoted \
-		p5-HTML-Scrubber>=0.08:${PORTSDIR}/www/p5-HTML-Scrubber \
-		p5-HTML-Tree>0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Locale-Maketext-Fuzzy>0:${PORTSDIR}/devel/p5-Locale-Maketext-Fuzzy \
-		p5-Locale-Maketext-Lexicon>=0.32:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-Locale-Maketext>=1.06:${PORTSDIR}/devel/p5-Locale-Maketext \
-		p5-Log-Dispatch>=2.23:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-MIME-Tools>=5.425,2:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Mail-Tools>=1.57:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Module-Versions-Report>=1.05:${PORTSDIR}/devel/p5-Module-Versions-Report \
-		p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		p5-Regexp-Common-net-CIDR>0:${PORTSDIR}/textproc/p5-Regexp-Common-net-CIDR \
-		p5-Regexp-Common>0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Regexp-IPv6>0:${PORTSDIR}/textproc/p5-Regexp-IPv6 \
-		p5-Text-Password-Pronounceable>0:${PORTSDIR}/security/p5-Text-Password-Pronounceable \
-		p5-Text-Quoted>=2.02:${PORTSDIR}/textproc/p5-Text-Quoted \
-		p5-Text-Template>=1.44:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-Text-Wrapper>0:${PORTSDIR}/textproc/p5-Text-Wrapper \
-		p5-Time-modules>0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-Tree-Simple>=1.04:${PORTSDIR}/devel/p5-Tree-Simple \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
-
-MASON_DEPS=	p5-Apache-Session>=1.53:${PORTSDIR}/www/p5-Apache-Session \
-		p5-HTML-Mason>=1.43:${PORTSDIR}/www/p5-HTML-Mason \
-		p5-IPC-Run3>0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-		p5-Text-WikiFormat>=0.76:${PORTSDIR}/textproc/p5-Text-WikiFormat \
-		p5-XML-RSS>=1.05:${PORTSDIR}/textproc/p5-XML-RSS
-
-PSGI_DEPS=	p5-CGI-Emulate-PSGI>0:${PORTSDIR}/www/p5-CGI-Emulate-PSGI \
-		p5-CGI-PSGI>=0.12:${PORTSDIR}/www/p5-CGI-PSGI \
-		p5-HTML-Mason-PSGIHandler>=0.52:${PORTSDIR}/www/p5-HTML-Mason-PSGIHandler \
-		p5-Plack>=0.9971:${PORTSDIR}/www/p5-Plack \
-		p5-Starlet>0:${PORTSDIR}/www/p5-Starlet
-
-MAILGATE_DEPS=	p5-libwww>6.0:${PORTSDIR}/www/p5-libwww
-
-SSL_MAILGATE_DEPS=	p5-Crypt-SSLeay>0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-LWP-Protocol-https>0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Mozilla-CA>0:${PORTSDIR}/www/p5-Mozilla-CA
-
-CLI_DEPS=	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
+CORE_DEPS=	p5-CSS-Squish>=0.06:textproc/p5-CSS-Squish \
+		p5-Cache-Simple-TimedExpiry>0:devel/p5-Cache-Simple-TimedExpiry \
+		p5-Class-Accessor>=0.34:devel/p5-Class-Accessor \
+		p5-Class-ReturnValue>=0.40:devel/p5-Class-ReturnValue \
+		p5-DBI>=1.37:databases/p5-DBI \
+		p5-DBIx-SearchBuilder>=1.59:databases/p5-DBIx-SearchBuilder \
+		p5-DateTime-Locale>=0.40:devel/p5-DateTime-Locale \
+		p5-DateTime>=0.44:devel/p5-DateTime \
+		p5-Devel-GlobalDestruction>0:devel/p5-Devel-GlobalDestruction \
+		p5-Devel-StackTrace>=1.30:devel/p5-Devel-StackTrace \
+		p5-Email-Address>=1.89.5:mail/p5-Email-Address \
+		p5-Encode>=2.64:converters/p5-Encode \
+		p5-File-ShareDir>0:devel/p5-File-ShareDir \
+		p5-HTML-Format>0:textproc/p5-HTML-Format \
+		p5-HTML-Parser>0:www/p5-HTML-Parser \
+		p5-HTML-Quoted>0:textproc/p5-HTML-Quoted \
+		p5-HTML-Scrubber>=0.08:www/p5-HTML-Scrubber \
+		p5-HTML-Tree>0:www/p5-HTML-Tree \
+		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+		p5-Locale-Maketext-Fuzzy>0:devel/p5-Locale-Maketext-Fuzzy \
+		p5-Locale-Maketext-Lexicon>=0.32:devel/p5-Locale-Maketext-Lexicon \
+		p5-Locale-Maketext>=1.06:devel/p5-Locale-Maketext \
+		p5-Log-Dispatch>=2.23:devel/p5-Log-Dispatch \
+		p5-MIME-Tools>=5.425,2:mail/p5-MIME-Tools \
+		p5-Mail-Tools>=1.57:mail/p5-Mail-Tools \
+		p5-Module-Versions-Report>=1.05:devel/p5-Module-Versions-Report \
+		p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR \
+		p5-Regexp-Common-net-CIDR>0:textproc/p5-Regexp-Common-net-CIDR \
+		p5-Regexp-Common>0:textproc/p5-Regexp-Common \
+		p5-Regexp-IPv6>0:textproc/p5-Regexp-IPv6 \
+		p5-Text-Password-Pronounceable>0:security/p5-Text-Password-Pronounceable \
+		p5-Text-Quoted>=2.02:textproc/p5-Text-Quoted \
+		p5-Text-Template>=1.44:textproc/p5-Text-Template \
+		p5-Text-Wrapper>0:textproc/p5-Text-Wrapper \
+		p5-Time-modules>0:devel/p5-Time-modules \
+		p5-Tree-Simple>=1.04:devel/p5-Tree-Simple \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
+
+MASON_DEPS=	p5-Apache-Session>=1.53:www/p5-Apache-Session \
+		p5-HTML-Mason>=1.43:www/p5-HTML-Mason \
+		p5-IPC-Run3>0:devel/p5-IPC-Run3 \
+		p5-JSON>0:converters/p5-JSON \
+		p5-Text-WikiFormat>=0.76:textproc/p5-Text-WikiFormat \
+		p5-XML-RSS>=1.05:textproc/p5-XML-RSS
+
+PSGI_DEPS=	p5-CGI-Emulate-PSGI>0:www/p5-CGI-Emulate-PSGI \
+		p5-CGI-PSGI>=0.12:www/p5-CGI-PSGI \
+		p5-HTML-Mason-PSGIHandler>=0.52:www/p5-HTML-Mason-PSGIHandler \
+		p5-Plack>=0.9971:www/p5-Plack \
+		p5-Starlet>0:www/p5-Starlet
+
+MAILGATE_DEPS=	p5-libwww>6.0:www/p5-libwww
+
+SSL_MAILGATE_DEPS=	p5-Crypt-SSLeay>0:security/p5-Crypt-SSLeay \
+		p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https \
+		p5-Mozilla-CA>0:www/p5-Mozilla-CA
+
+CLI_DEPS=	p5-HTTP-Message>0:www/p5-HTTP-Message \
+		p5-libwww>0:www/p5-libwww \
+		p5-Term-ReadKey>0:devel/p5-Term-ReadKey
 
 # ports to add:
 # Test::Email
 # Test::Builder >= 0.90
-DEV_DEPS=	p5-Email-Abstract>0:${PORTSDIR}/mail/p5-Email-Abstract \
-		p5-HTML-Form>0:${PORTSDIR}/www/p5-HTML-Form \
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Log-Dispatch-Perl>0:${PORTSDIR}/devel/p5-Log-Dispatch-Perl \
-		p5-Module-Refresh>=0.03:${PORTSDIR}/devel/p5-Module-Refresh \
-		p5-String-ShellQuote>0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Expect>=0.31:${PORTSDIR}/devel/p5-Test-Expect \
-		p5-Test-LongString>0:${PORTSDIR}/devel/p5-Test-LongString \
-		p5-Test-MockTime>0:${PORTSDIR}/devel/p5-Test-MockTime \
-		p5-Test-WWW-Mechanize-PSGI>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-PSGI \
-		p5-Test-WWW-Mechanize>=1.30:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
+DEV_DEPS=	p5-Email-Abstract>0:mail/p5-Email-Abstract \
+		p5-HTML-Form>0:www/p5-HTML-Form \
+		p5-HTML-Parser>0:www/p5-HTML-Parser \
+		p5-Log-Dispatch-Perl>0:devel/p5-Log-Dispatch-Perl \
+		p5-Module-Refresh>=0.03:devel/p5-Module-Refresh \
+		p5-String-ShellQuote>0:textproc/p5-String-ShellQuote \
+		p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Test-Expect>=0.31:devel/p5-Test-Expect \
+		p5-Test-LongString>0:devel/p5-Test-LongString \
+		p5-Test-MockTime>0:devel/p5-Test-MockTime \
+		p5-Test-WWW-Mechanize-PSGI>0:devel/p5-Test-WWW-Mechanize-PSGI \
+		p5-Test-WWW-Mechanize>=1.30:devel/p5-Test-WWW-Mechanize \
 		p5-Test-Warn>0:${PORTSDIR}devel/p5-Test-Warn \
-		p5-WWW-Mechanize>=1.52:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Plack-Middleware-Test-StashWarnings>=0.08:${PORTSDIR}/www/p5-Plack-Middleware-Test-StashWarnings     \
-		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+		p5-WWW-Mechanize>=1.52:www/p5-WWW-Mechanize \
+		p5-Plack-Middleware-Test-StashWarnings>=0.08:www/p5-Plack-Middleware-Test-StashWarnings     \
+		p5-XML-Simple>0:textproc/p5-XML-Simple
 
-FASTCGI_DEPS=	p5-FCGI-ProcManager>0:${PORTSDIR}/www/p5-FCGI-ProcManager \
-		p5-FCGI>=0.74:${PORTSDIR}/www/p5-FCGI
+FASTCGI_DEPS=	p5-FCGI-ProcManager>0:www/p5-FCGI-ProcManager \
+		p5-FCGI>=0.74:www/p5-FCGI
 
-MODPERL2_DEPS=	p5-libapreq2>0:${PORTSDIR}/www/p5-libapreq2 \
-		p5-Apache-DBI>0:${PORTSDIR}/www/p5-Apache-DBI
+MODPERL2_DEPS=	p5-libapreq2>0:www/p5-libapreq2 \
+		p5-Apache-DBI>0:www/p5-Apache-DBI
 
-MYSQL_DEPS=	p5-DBD-mysql>=2.1018:${PORTSDIR}/databases/p5-DBD-mysql
+MYSQL_DEPS=	p5-DBD-mysql>=2.1018:databases/p5-DBD-mysql
 
-ORACLE_DEPS=	p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle
+ORACLE_DEPS=	p5-DBD-Oracle>0:databases/p5-DBD-Oracle
 
-PGSQL_DEPS=	p5-DBD-Pg>=3.3.1:${PORTSDIR}/databases/p5-DBD-Pg
+PGSQL_DEPS=	p5-DBD-Pg>=3.3.1:databases/p5-DBD-Pg
 
-SQLITE_DEPS=	p5-DBD-SQLite>=1.00:${PORTSDIR}/databases/p5-DBD-SQLite
+SQLITE_DEPS=	p5-DBD-SQLite>=1.00:databases/p5-DBD-SQLite
 
-GPG_DEPS=	p5-GnuPG-Interface>0:${PORTSDIR}/security/p5-GnuPG-Interface \
-		p5-PerlIO-eol>0:${PORTSDIR}/devel/p5-PerlIO-eol
+GPG_DEPS=	p5-GnuPG-Interface>0:security/p5-GnuPG-Interface \
+		p5-PerlIO-eol>0:devel/p5-PerlIO-eol
 
-ICAL_DEPS=	p5-Data-ICal>0:${PORTSDIR}/deskutils/p5-Data-ICal
+ICAL_DEPS=	p5-Data-ICal>0:deskutils/p5-Data-ICal
 
 SMTP_DEPS=	## -- only needs perl core modules
 
-DASHBOARDS_DEPS=	p5-HTML-RewriteAttributes>=0.05:${PORTSDIR}/textproc/p5-HTML-RewriteAttributes \
-		p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-URI>=1.59:${PORTSDIR}/net/p5-URI
+DASHBOARDS_DEPS=	p5-HTML-RewriteAttributes>=0.05:textproc/p5-HTML-RewriteAttributes \
+		p5-MIME-Types>0:mail/p5-MIME-Types \
+		p5-URI>=1.59:net/p5-URI
 
-GRAPHVIZ_DEPS=	p5-GraphViz>0:${PORTSDIR}/graphics/p5-GraphViz \
-		p5-IPC-Run>=0.90:${PORTSDIR}/devel/p5-IPC-Run
+GRAPHVIZ_DEPS=	p5-GraphViz>0:graphics/p5-GraphViz \
+		p5-IPC-Run>=0.90:devel/p5-IPC-Run
 
-GD_DEPS=	p5-GD>0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>0:${PORTSDIR}/graphics/p5-GD-TextUtil
+GD_DEPS=	p5-GD>0:graphics/p5-GD \
+		p5-GD-Graph>0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>0:graphics/p5-GD-TextUtil
 
-USERLOGO_DEPS=	p5-Convert-Color>0:${PORTSDIR}/graphics/p5-Convert-Color
+USERLOGO_DEPS=	p5-Convert-Color>0:graphics/p5-Convert-Color
 
-HTML_DOC_DEPS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Pod-Simple>=3.24:${PORTSDIR}/textproc/p5-Pod-Simple
+HTML_DOC_DEPS=	p5-HTML-Parser>0:www/p5-HTML-Parser \
+		p5-Pod-Simple>=3.24:textproc/p5-Pod-Simple
diff --git a/www/rt42/Makefile b/www/rt42/Makefile
index 92105cc4c008..3b06dead029d 100644
--- a/www/rt42/Makefile
+++ b/www/rt42/Makefile
@@ -43,7 +43,7 @@ OPTIONS_DEFAULT=	AP_MODFASTCGI GD GPG MYSQL
 USERS?=		www
 GROUPS?=	rt www
 
-RUN_DEPENDS+=	${LOCALBASE}/bin/jsmin:${PORTSDIR}/devel/jsmin
+RUN_DEPENDS+=	${LOCALBASE}/bin/jsmin:devel/jsmin
 
 .include "${.CURDIR}/Makefile.cpan"
 
@@ -69,15 +69,15 @@ AP_MODPERL_RUN_DEPENDS=		${MODPERL2_DEPS}
 
 AP_MODFASTCGI_DESC=		Deploy with apache and mod_fastcgi
 AP_MODFASTCGI_USE=		APACHE_RUN=22+
-AP_MODFASTCGI_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \
+AP_MODFASTCGI_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi \
 				${FASTCGI_DEPS}
 
 LIGHTTPD_DESC=			Deploy with lighttpd and mod_fastcgi
-LIGHTTPD_RUN_DEPENDS=		${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd \
+LIGHTTPD_RUN_DEPENDS=		${LOCALBASE}/sbin/lighttpd:www/lighttpd \
 				${FASTCGI_DEPS}
 
 SPAWN_FCGI_DESC=		Deploy with spawn_fcgi
-SPAWN_FCGI_RUN_DEPENDS=		${LOCALBASE}/bin/spawn-fcgi:${PORTSDIR}/www/spawn-fcgi \
+SPAWN_FCGI_RUN_DEPENDS=		${LOCALBASE}/bin/spawn-fcgi:www/spawn-fcgi \
 				${FASTCGI_DEPS}
 
 MYSQL_RUN_DEPENDS=		${MYSQL_DEPS}
@@ -205,7 +205,7 @@ post-install:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502200
-CORE_DEPS+=     p5-CGI>4.0:${PORTSDIR}/www/p5-CGI
+CORE_DEPS+=     p5-CGI>4.0:www/p5-CGI
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/rt42/Makefile.cpan b/www/rt42/Makefile.cpan
index e1678539d16a..8e45c4b19189 100644
--- a/www/rt42/Makefile.cpan
+++ b/www/rt42/Makefile.cpan
@@ -74,64 +74,64 @@
 ### UNIVERSAL::require
 ### XML::RSS 1.05
 
-CORE_DEPS=	p5-Apache-Session>=1.53:${PORTSDIR}/www/p5-Apache-Session				\
-		p5-CGI-Emulate-PSGI>0:${PORTSDIR}/www/p5-CGI-Emulate-PSGI				\
-		p5-CGI-PSGI>=0.12:${PORTSDIR}/www/p5-CGI-PSGI						\
-		p5-CSS-Squish>=0.06:${PORTSDIR}/textproc/p5-CSS-Squish					\
-		p5-Class-Accessor>=0.34:${PORTSDIR}/devel/p5-Class-Accessor				\
-		p5-Crypt-Eksblowfish>0:${PORTSDIR}/security/p5-Crypt-Eksblowfish			\
-		p5-DBI>=1.37:${PORTSDIR}/databases/p5-DBI						\
-		p5-DBIx-SearchBuilder>=1.66:${PORTSDIR}/databases/p5-DBIx-SearchBuilder			\
-		p5-Data-GUID>0:${PORTSDIR}/devel/p5-Data-GUID						\
-		p5-Date-Extract>=0.02:${PORTSDIR}/devel/p5-Date-Extract					\
-		p5-Date-Manip>0:${PORTSDIR}/devel/p5-Date-Manip						\
-		p5-DateTime>=0.44:${PORTSDIR}/devel/p5-DateTime						\
-		p5-DateTime-Format-Natural>=0.67:${PORTSDIR}/devel/p5-DateTime-Format-Natural		\
-		p5-DateTime-Locale>=0.40:${PORTSDIR}/devel/p5-DateTime-Locale				\
-		p5-DateTime>=0.44:${PORTSDIR}/devel/p5-DateTime						\
-		p5-Devel-GlobalDestruction>0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction		\
-		p5-Devel-StackTrace>=1.30:${PORTSDIR}/devel/p5-Devel-StackTrace				\
-		p5-Email-Address>=1.89.7:${PORTSDIR}/mail/p5-Email-Address				\
-		p5-Email-Address-List>=0.03:${PORTSDIR}/mail/p5-Email-Address-List			\
-		p5-Encode>=2.64:${PORTSDIR}/converters/p5-Encode					\
-		p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir					\
-		p5-HTML-FormatExternal>0:${PORTSDIR}/textproc/p5-HTML-FormatExternal			\
-		p5-HTML-FormatText-WithLinks-AndTables>0:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks-AndTables	\
-		p5-HTML-FormatText-WithLinks>=0.14:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks	\
-		p5-HTML-Mason-PSGIHandler>=0.52:${PORTSDIR}/www/p5-HTML-Mason-PSGIHandler		\
-		p5-HTML-Mason>=1.43:${PORTSDIR}/www/p5-HTML-Mason					\
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser						\
-		p5-HTML-Quoted>0:${PORTSDIR}/textproc/p5-HTML-Quoted					\
-		p5-HTML-Scrubber>=0.08:${PORTSDIR}/www/p5-HTML-Scrubber					\
-		p5-HTTP-Message>=6.0:${PORTSDIR}/www/p5-HTTP-Message					\
-		p5-IPC-Run3>0:${PORTSDIR}/devel/p5-IPC-Run3						\
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON						\
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww							\
-		p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils					\
-		p5-Locale-Maketext-Fuzzy>=0.11:${PORTSDIR}/devel/p5-Locale-Maketext-Fuzzy		\
-		p5-Locale-Maketext-Lexicon>=0.32:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon		\
-		p5-Log-Dispatch>=2.30:${PORTSDIR}/devel/p5-Log-Dispatch					\
-		p5-MIME-Tools>=5.504,2:${PORTSDIR}/mail/p5-MIME-Tools					\
-		p5-Mail-Tools>=2.12:${PORTSDIR}/mail/p5-Mail-Tools					\
-		p5-Module-Refresh>=0.03:${PORTSDIR}/devel/p5-Module-Refresh				\
-		p5-Module-Versions-Report>=1.05:${PORTSDIR}/devel/p5-Module-Versions-Report		\
-		p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR						\
-		p5-Plack>=1.0002:${PORTSDIR}/www/p5-Plack						\
-		p5-Starlet>0:${PORTSDIR}/www/p5-Starlet							\
-		p5-Regexp-Common-net-CIDR>0:${PORTSDIR}/textproc/p5-Regexp-Common-net-CIDR		\
-		p5-Regexp-Common>0:${PORTSDIR}/textproc/p5-Regexp-Common				\
-		p5-Regexp-IPv6>0:${PORTSDIR}/textproc/p5-Regexp-IPv6					\
-		p5-Role-Basic>=0.12:${PORTSDIR}/devel/p5-Role-Basic					\
-		p5-Symbol-Global-Name>=0.05:${PORTSDIR}/devel/p5-Symbol-Global-Name			\
-		p5-Text-Password-Pronounceable>0:${PORTSDIR}/security/p5-Text-Password-Pronounceable	\
-		p5-Text-Quoted>=2.07:${PORTSDIR}/textproc/p5-Text-Quoted				\
-		p5-Text-Template>=1.44:${PORTSDIR}/textproc/p5-Text-Template				\
-		p5-Text-WikiFormat>=0.76:${PORTSDIR}/textproc/p5-Text-WikiFormat			\
-		p5-Text-Wrapper>0:${PORTSDIR}/textproc/p5-Text-Wrapper					\
-		p5-Time-modules>0:${PORTSDIR}/devel/p5-Time-modules					\
-		p5-Tree-Simple>=1.04:${PORTSDIR}/devel/p5-Tree-Simple					\
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require				\
-		p5-XML-RSS>=1.05:${PORTSDIR}/textproc/p5-XML-RSS
+CORE_DEPS=	p5-Apache-Session>=1.53:www/p5-Apache-Session				\
+		p5-CGI-Emulate-PSGI>0:www/p5-CGI-Emulate-PSGI				\
+		p5-CGI-PSGI>=0.12:www/p5-CGI-PSGI						\
+		p5-CSS-Squish>=0.06:textproc/p5-CSS-Squish					\
+		p5-Class-Accessor>=0.34:devel/p5-Class-Accessor				\
+		p5-Crypt-Eksblowfish>0:security/p5-Crypt-Eksblowfish			\
+		p5-DBI>=1.37:databases/p5-DBI						\
+		p5-DBIx-SearchBuilder>=1.66:databases/p5-DBIx-SearchBuilder			\
+		p5-Data-GUID>0:devel/p5-Data-GUID						\
+		p5-Date-Extract>=0.02:devel/p5-Date-Extract					\
+		p5-Date-Manip>0:devel/p5-Date-Manip						\
+		p5-DateTime>=0.44:devel/p5-DateTime						\
+		p5-DateTime-Format-Natural>=0.67:devel/p5-DateTime-Format-Natural		\
+		p5-DateTime-Locale>=0.40:devel/p5-DateTime-Locale				\
+		p5-DateTime>=0.44:devel/p5-DateTime						\
+		p5-Devel-GlobalDestruction>0:devel/p5-Devel-GlobalDestruction		\
+		p5-Devel-StackTrace>=1.30:devel/p5-Devel-StackTrace				\
+		p5-Email-Address>=1.89.7:mail/p5-Email-Address				\
+		p5-Email-Address-List>=0.03:mail/p5-Email-Address-List			\
+		p5-Encode>=2.64:converters/p5-Encode					\
+		p5-File-ShareDir>0:devel/p5-File-ShareDir					\
+		p5-HTML-FormatExternal>0:textproc/p5-HTML-FormatExternal			\
+		p5-HTML-FormatText-WithLinks-AndTables>0:textproc/p5-HTML-FormatText-WithLinks-AndTables	\
+		p5-HTML-FormatText-WithLinks>=0.14:textproc/p5-HTML-FormatText-WithLinks	\
+		p5-HTML-Mason-PSGIHandler>=0.52:www/p5-HTML-Mason-PSGIHandler		\
+		p5-HTML-Mason>=1.43:www/p5-HTML-Mason					\
+		p5-HTML-Parser>0:www/p5-HTML-Parser						\
+		p5-HTML-Quoted>0:textproc/p5-HTML-Quoted					\
+		p5-HTML-Scrubber>=0.08:www/p5-HTML-Scrubber					\
+		p5-HTTP-Message>=6.0:www/p5-HTTP-Message					\
+		p5-IPC-Run3>0:devel/p5-IPC-Run3						\
+		p5-JSON>0:converters/p5-JSON						\
+		p5-libwww>0:www/p5-libwww							\
+		p5-List-MoreUtils>0:lang/p5-List-MoreUtils					\
+		p5-Locale-Maketext-Fuzzy>=0.11:devel/p5-Locale-Maketext-Fuzzy		\
+		p5-Locale-Maketext-Lexicon>=0.32:devel/p5-Locale-Maketext-Lexicon		\
+		p5-Log-Dispatch>=2.30:devel/p5-Log-Dispatch					\
+		p5-MIME-Tools>=5.504,2:mail/p5-MIME-Tools					\
+		p5-Mail-Tools>=2.12:mail/p5-Mail-Tools					\
+		p5-Module-Refresh>=0.03:devel/p5-Module-Refresh				\
+		p5-Module-Versions-Report>=1.05:devel/p5-Module-Versions-Report		\
+		p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR						\
+		p5-Plack>=1.0002:www/p5-Plack						\
+		p5-Starlet>0:www/p5-Starlet							\
+		p5-Regexp-Common-net-CIDR>0:textproc/p5-Regexp-Common-net-CIDR		\
+		p5-Regexp-Common>0:textproc/p5-Regexp-Common				\
+		p5-Regexp-IPv6>0:textproc/p5-Regexp-IPv6					\
+		p5-Role-Basic>=0.12:devel/p5-Role-Basic					\
+		p5-Symbol-Global-Name>=0.05:devel/p5-Symbol-Global-Name			\
+		p5-Text-Password-Pronounceable>0:security/p5-Text-Password-Pronounceable	\
+		p5-Text-Quoted>=2.07:textproc/p5-Text-Quoted				\
+		p5-Text-Template>=1.44:textproc/p5-Text-Template				\
+		p5-Text-WikiFormat>=0.76:textproc/p5-Text-WikiFormat			\
+		p5-Text-Wrapper>0:textproc/p5-Text-Wrapper					\
+		p5-Time-modules>0:devel/p5-Time-modules					\
+		p5-Tree-Simple>=1.04:devel/p5-Tree-Simple					\
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require				\
+		p5-XML-RSS>=1.05:textproc/p5-XML-RSS
 
 ### --- MAILGATE ---
 ### Crypt::SSLeay
@@ -142,10 +142,10 @@ CORE_DEPS=	p5-Apache-Session>=1.53:${PORTSDIR}/www/p5-Apache-Session				\
 ### Net::SSL
 ### Pod::Usage                             perl std
 
-MAILGATE_DEPS=	p5-libwww>6.0:${PORTSDIR}/www/p5-libwww \
-		p5-Crypt-SSLeay>0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-LWP-Protocol-https>0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Mozilla-CA>0:${PORTSDIR}/www/p5-Mozilla-CA
+MAILGATE_DEPS=	p5-libwww>6.0:www/p5-libwww \
+		p5-Crypt-SSLeay>0:security/p5-Crypt-SSLeay \
+		p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https \
+		p5-Mozilla-CA>0:www/p5-Mozilla-CA
 
 ### --- CLI ---
 ### Getopt::Long 2.24                     perl std
@@ -155,9 +155,9 @@ MAILGATE_DEPS=	p5-libwww>6.0:${PORTSDIR}/www/p5-libwww \
 ### Term::ReadLine                        perl std
 ### Text::ParseWords                      perl std
 
-CLI_DEPS=	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
+CLI_DEPS=	p5-HTTP-Message>0:www/p5-HTTP-Message \
+		p5-libwww>0:www/p5-libwww \
+		p5-Term-ReadKey>0:devel/p5-Term-ReadKey
 
 ### --- DEVELOPER ---
 ### Email::Abstract
@@ -183,119 +183,119 @@ CLI_DEPS=	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
 ### WWW::Mechanize 1.52
 ### XML::Simple
 
-DEVELOPER_DEPS=	p5-Email-Abstract>0:${PORTSDIR}/mail/p5-Email-Abstract				\
-		p5-File-Which>0:${PORTSDIR}/sysutils/p5-File-Which				\
-		p5-Locale-PO>0:${PORTSDIR}/devel/p5-Locale-PO					\
-		p5-Log-Dispatch-Perl>0:${PORTSDIR}/devel/p5-Log-Dispatch-Perl			\
-		p5-Mojolicious>0:${PORTSDIR}/www/p5-Mojolicious					\
-		p5-Plack-Middleware-Test-StashWarnings>=0.08:${PORTSDIR}/www/p5-Plack-Middleware-Test-StashWarnings	\
-		p5-Set-Tiny>0:${PORTSDIR}/devel/p5-Set-Tiny					\
-		p5-String-ShellQuote>0:${PORTSDIR}/textproc/p5-String-ShellQuote		\
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep					\
-		p5-Test-Email>0:${PORTSDIR}/mail/p5-Test-Email					\
-		p5-Test-Expect>=0.31:${PORTSDIR}/devel/p5-Test-Expect				\
-		p5-Test-LongString>0:${PORTSDIR}/devel/p5-Test-LongString			\
-		p5-Test-MockTime>0:${PORTSDIR}/devel/p5-Test-MockTime				\
-		p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings			\
-		p5-Test-Pod>0:${PORTSDIR}/devel/p5-Test-Pod                                     \
-		p5-Test-WWW-Mechanize-PSGI>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-PSGI	\
-		p5-Test-WWW-Mechanize>=1.30:${PORTSDIR}/devel/p5-Test-WWW-Mechanize		\
-		p5-Test-Warn>0:${PORTSDIR}/devel/p5-Test-Warn					\
-		p5-WWW-Mechanize>=1.52:${PORTSDIR}/www/p5-WWW-Mechanize				\
-		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+DEVELOPER_DEPS=	p5-Email-Abstract>0:mail/p5-Email-Abstract				\
+		p5-File-Which>0:sysutils/p5-File-Which				\
+		p5-Locale-PO>0:devel/p5-Locale-PO					\
+		p5-Log-Dispatch-Perl>0:devel/p5-Log-Dispatch-Perl			\
+		p5-Mojolicious>0:www/p5-Mojolicious					\
+		p5-Plack-Middleware-Test-StashWarnings>=0.08:www/p5-Plack-Middleware-Test-StashWarnings	\
+		p5-Set-Tiny>0:devel/p5-Set-Tiny					\
+		p5-String-ShellQuote>0:textproc/p5-String-ShellQuote		\
+		p5-Test-Deep>0:devel/p5-Test-Deep					\
+		p5-Test-Email>0:mail/p5-Test-Email					\
+		p5-Test-Expect>=0.31:devel/p5-Test-Expect				\
+		p5-Test-LongString>0:devel/p5-Test-LongString			\
+		p5-Test-MockTime>0:devel/p5-Test-MockTime				\
+		p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings			\
+		p5-Test-Pod>0:devel/p5-Test-Pod                                     \
+		p5-Test-WWW-Mechanize-PSGI>0:devel/p5-Test-WWW-Mechanize-PSGI	\
+		p5-Test-WWW-Mechanize>=1.30:devel/p5-Test-WWW-Mechanize		\
+		p5-Test-Warn>0:devel/p5-Test-Warn					\
+		p5-WWW-Mechanize>=1.52:www/p5-WWW-Mechanize				\
+		p5-XML-Simple>0:textproc/p5-XML-Simple
 
 ### --- FASTCGI ---
 ### FCGI 0.74
 ### FCGI::ProcManager
 
-FASTCGI_DEPS=	p5-FCGI-ProcManager>0:${PORTSDIR}/www/p5-FCGI-ProcManager \
-		p5-FCGI>=0.74:${PORTSDIR}/www/p5-FCGI
+FASTCGI_DEPS=	p5-FCGI-ProcManager>0:www/p5-FCGI-ProcManager \
+		p5-FCGI>=0.74:www/p5-FCGI
 
 
 ### --- MODPERL2 ---
 ### Apache::DBI
 
-MODPERL2_DEPS=	p5-libapreq2>0:${PORTSDIR}/www/p5-libapreq2 \
-		p5-Apache-DBI>0:${PORTSDIR}/www/p5-Apache-DBI
+MODPERL2_DEPS=	p5-libapreq2>0:www/p5-libapreq2 \
+		p5-Apache-DBI>0:www/p5-Apache-DBI
 
 ### --- MYSQL ---
 ### DBD::mysql 2.1018
 
-MYSQL_DEPS=	p5-DBD-mysql>=2.1018:${PORTSDIR}/databases/p5-DBD-mysql
+MYSQL_DEPS=	p5-DBD-mysql>=2.1018:databases/p5-DBD-mysql
 
 ### --- ORACLE ---
 ### DBD::Oracle  (avoid 1.23 -- ports has 1.19)
 
-ORACLE_DEPS=	p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle
+ORACLE_DEPS=	p5-DBD-Oracle>0:databases/p5-DBD-Oracle
 
 ### --- PGSQL ---
 ### DBD::Pg 3.3.1
 
-PGSQL_DEPS=	p5-DBD-Pg>=3.3.1:${PORTSDIR}/databases/p5-DBD-Pg
+PGSQL_DEPS=	p5-DBD-Pg>=3.3.1:databases/p5-DBD-Pg
 
 ### --- SQLITE ---
 ### DBD::SQLite 1.00
 
-SQLITE_DEPS=	p5-DBD-SQLite>=1.00:${PORTSDIR}/databases/p5-DBD-SQLite
+SQLITE_DEPS=	p5-DBD-SQLite>=1.00:databases/p5-DBD-SQLite
 
 ### --- GPG ---
 ### File::Which
 ### GnuPG::Interface
 ### PerlIO::eol
 
-GPG_DEPS=	p5-File-Which>0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-GnuPG-Interface>0:${PORTSDIR}/security/p5-GnuPG-Interface \
-		p5-PerlIO-eol>0:${PORTSDIR}/devel/p5-PerlIO-eol
+GPG_DEPS=	p5-File-Which>0:sysutils/p5-File-Which \
+		p5-GnuPG-Interface>0:security/p5-GnuPG-Interface \
+		p5-PerlIO-eol>0:devel/p5-PerlIO-eol
 
 ### --- SMIME---
 ### Crypt::X509
 ### File::Which
 ### String::ShellQuote
 
-SMIME_DEPS=	p5-Crypt-X509>0:${PORTSDIR}/security/p5-Crypt-X509 \
-		p5-File-Which>0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-String-ShellQuote>0:${PORTSDIR}/textproc/p5-String-ShellQuote
+SMIME_DEPS=	p5-Crypt-X509>0:security/p5-Crypt-X509 \
+		p5-File-Which>0:sysutils/p5-File-Which \
+		p5-String-ShellQuote>0:textproc/p5-String-ShellQuote
 
 ### --- ICAL ---
 ### Data::ICal
 
-ICAL_DEPS=	p5-Data-ICal>0:${PORTSDIR}/deskutils/p5-Data-ICal
+ICAL_DEPS=	p5-Data-ICal>0:deskutils/p5-Data-ICal
 
 ### --- DASHBOARDS ---
 ### MIME::Types
 ### URI 1.59
 ### URI::QueryParam
 
-DASHBOARDS_DEPS=	p5-HTML-RewriteAttributes>=0.05:${PORTSDIR}/textproc/p5-HTML-RewriteAttributes \
-		p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-URI>=1.59:${PORTSDIR}/net/p5-URI
+DASHBOARDS_DEPS=	p5-HTML-RewriteAttributes>=0.05:textproc/p5-HTML-RewriteAttributes \
+		p5-MIME-Types>0:mail/p5-MIME-Types \
+		p5-URI>=1.59:net/p5-URI
 
 ### --- GRAPHVIZ ---
 ### GraphViz
 ### IPC::Run 0.90
 
-GRAPHVIZ_DEPS=	p5-GraphViz>0:${PORTSDIR}/graphics/p5-GraphViz \
-		p5-IPC-Run>=0.90:${PORTSDIR}/devel/p5-IPC-Run
+GRAPHVIZ_DEPS=	p5-GraphViz>0:graphics/p5-GraphViz \
+		p5-IPC-Run>=0.90:devel/p5-IPC-Run
 
 ### -- GD --
 ### GD
 ### GD::Graph 1.47
 ### GD::Text
 
-GD_DEPS=	p5-GD>0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>0:${PORTSDIR}/graphics/p5-GD-TextUtil
+GD_DEPS=	p5-GD>0:graphics/p5-GD \
+		p5-GD-Graph>0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>0:graphics/p5-GD-TextUtil
 
 ### --- USERLOGO ---
 ### Convert::Color
 
-USERLOGO_DEPS=	p5-Convert-Color>0:${PORTSDIR}/graphics/p5-Convert-Color
+USERLOGO_DEPS=	p5-Convert-Color>0:graphics/p5-Convert-Color
 
 ### --- HTML-DOC ---
 ### HTML::Entities
 ### Pod::Simple 3.24                        perl std
 
-HTML_DOC_DEPS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser
+HTML_DOC_DEPS=	p5-HTML-Parser>0:www/p5-HTML-Parser
 
 ### --- AVOID ---
 ###     'DBD::Oracle' => [qw(1.23)],
diff --git a/www/rtv/Makefile b/www/rtv/Makefile
index 27f19e675f7f..f84e3da66caf 100644
--- a/www/rtv/Makefile
+++ b/www/rtv/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Commandline client for reddit
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>=3.2:${PORTSDIR}/www/py-tornado \
-		${PYTHON_PKGNAMEPREFIX}praw>=3.4.0:${PORTSDIR}/www/py-praw \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:${PORTSDIR}/devel/py-kitchen
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>=3.2:www/py-tornado \
+		${PYTHON_PKGNAMEPREFIX}praw>=3.4.0:www/py-praw \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	michael-lazar
diff --git a/www/rubygem-actionpack/Makefile b/www/rubygem-actionpack/Makefile
index 938cf10ccd3f..0b2d9d7c137b 100644
--- a/www/rubygem-actionpack/Makefile
+++ b/www/rubygem-actionpack/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Action Controller and Action View of Rails MVC Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activemodel \
-		rubygem-activesupport>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-builder>=3.0.0:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-erubis>=2.7.0:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-journey>=1.0.4:${PORTSDIR}/www/rubygem-journey \
-		rubygem-rack>=1.4.5:${PORTSDIR}/www/rubygem-rack \
-		rubygem-rack-cache>=1.2:${PORTSDIR}/www/rubygem-rack-cache \
-		rubygem-rack-test>=0.6.1:${PORTSDIR}/www/rubygem-rack-test \
-		rubygem-sprockets22>=2.2.1:${PORTSDIR}/devel/rubygem-sprockets22
+RUN_DEPENDS=	rubygem-activemodel>=${PORTVERSION}:databases/rubygem-activemodel \
+		rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \
+		rubygem-builder>=3.0.0:devel/rubygem-builder \
+		rubygem-erubis>=2.7.0:www/rubygem-erubis \
+		rubygem-journey>=1.0.4:www/rubygem-journey \
+		rubygem-rack>=1.4.5:www/rubygem-rack \
+		rubygem-rack-cache>=1.2:www/rubygem-rack-cache \
+		rubygem-rack-test>=0.6.1:www/rubygem-rack-test \
+		rubygem-sprockets22>=2.2.1:devel/rubygem-sprockets22
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-actionpack4/Makefile b/www/rubygem-actionpack4/Makefile
index 7093ff25ab66..7566bf734e4e 100644
--- a/www/rubygem-actionpack4/Makefile
+++ b/www/rubygem-actionpack4/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Action Controller and Action View of Rails MVC Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionview>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-actionview \
-		rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-rack16>=1.6:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-rack-test>=0.6.2:${PORTSDIR}/www/rubygem-rack-test \
-		rubygem-rails-dom-testing>=1.0.5:${PORTSDIR}/textproc/rubygem-rails-dom-testing \
-		rubygem-rails-html-sanitizer>=1.0.1:${PORTSDIR}/textproc/rubygem-rails-html-sanitizer
+RUN_DEPENDS=	rubygem-actionview>=${PORTVERSION}:devel/rubygem-actionview \
+		rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-rack16>=1.6:www/rubygem-rack16 \
+		rubygem-rack-test>=0.6.2:www/rubygem-rack-test \
+		rubygem-rails-dom-testing>=1.0.5:textproc/rubygem-rails-dom-testing \
+		rubygem-rails-html-sanitizer>=1.0.1:textproc/rubygem-rails-html-sanitizer
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-activeresource/Makefile b/www/rubygem-activeresource/Makefile
index ddf342c5863f..d767ae0cc558 100644
--- a/www/rubygem-activeresource/Makefile
+++ b/www/rubygem-activeresource/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Coherent wrapper object-relational mapping for REST web services
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activemodel>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activemodel \
-		rubygem-activesupport>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport
+RUN_DEPENDS=	rubygem-activemodel>=${PORTVERSION}:databases/rubygem-activemodel \
+		rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-activeresource4/Makefile b/www/rubygem-activeresource4/Makefile
index fd1c9d8a3273..40a8bed4935d 100644
--- a/www/rubygem-activeresource4/Makefile
+++ b/www/rubygem-activeresource4/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Coherent wrapper object-relational mapping for REST web services
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activemodel4>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-rails-observers>=0.1.1:${PORTSDIR}/devel/rubygem-rails-observers
+RUN_DEPENDS=	rubygem-activemodel4>=${PORTVERSION}:databases/rubygem-activemodel4 \
+		rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-rails-observers>=0.1.1:devel/rubygem-rails-observers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-acts-as-taggable-on/Makefile b/www/rubygem-acts-as-taggable-on/Makefile
index 46bc42db6493..48d0fe693a2c 100644
--- a/www/rubygem-acts-as-taggable-on/Makefile
+++ b/www/rubygem-acts-as-taggable-on/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tag a single model on several contexts
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-rails>=3.0:${PORTSDIR}/www/rubygem-rails
+RUN_DEPENDS=	rubygem-rails>=3.0:www/rubygem-rails
 
 NO_ARCH=	yes
 USE_RUBY=	YES
diff --git a/www/rubygem-acts-as-taggable-on3/Makefile b/www/rubygem-acts-as-taggable-on3/Makefile
index 090377bb191e..78d36fe7d003 100644
--- a/www/rubygem-acts-as-taggable-on3/Makefile
+++ b/www/rubygem-acts-as-taggable-on3/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tag a single model on several contexts
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.1.6:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=4.1.6:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-akami/Makefile b/www/rubygem-akami/Makefile
index bae06c13f8ec..3009ded306af 100644
--- a/www/rubygem-akami/Makefile
+++ b/www/rubygem-akami/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for building web service security
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-gyoku>=0.4.6:${PORTSDIR}/devel/rubygem-gyoku
+RUN_DEPENDS=	rubygem-gyoku>=0.4.6:devel/rubygem-gyoku
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-amazon-ecs/Makefile b/www/rubygem-amazon-ecs/Makefile
index 8a9849049ad1..f81b7873b7c5 100644
--- a/www/rubygem-amazon-ecs/Makefile
+++ b/www/rubygem-amazon-ecs/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Generic Amazon E-commerce REST API written in Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		${RUBY_PKGNAMEPREFIX}hmac>=0.3:${PORTSDIR}/security/ruby-hmac
+RUN_DEPENDS=	rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri \
+		${RUBY_PKGNAMEPREFIX}hmac>=0.3:security/ruby-hmac
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-anemone/Makefile b/www/rubygem-anemone/Makefile
index 97f739c68631..9347d136d7c4 100644
--- a/www/rubygem-anemone/Makefile
+++ b/www/rubygem-anemone/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library that allows programs to spider websites
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.3.0:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-robotex>=1.0.0:${PORTSDIR}/www/rubygem-robotex
+RUN_DEPENDS=	rubygem-nokogiri>=1.3.0:textproc/rubygem-nokogiri \
+		rubygem-robotex>=1.0.0:www/rubygem-robotex
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-asana/Makefile b/www/rubygem-asana/Makefile
index 16800725a81f..7feb331982f2 100644
--- a/www/rubygem-asana/Makefile
+++ b/www/rubygem-asana/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Ruby wrapper for the Asana REST API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-faraday>=0.9:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-faraday_middleware>=0.9:${PORTSDIR}/www/rubygem-faraday_middleware \
-		rubygem-faraday_middleware-multi_json>=0.0:${PORTSDIR}/devel/rubygem-faraday_middleware-multi_json \
-		rubygem-oauth2>=1.0:${PORTSDIR}/net/rubygem-oauth2
+RUN_DEPENDS=	rubygem-faraday>=0.9:www/rubygem-faraday \
+		rubygem-faraday_middleware>=0.9:www/rubygem-faraday_middleware \
+		rubygem-faraday_middleware-multi_json>=0.0:devel/rubygem-faraday_middleware-multi_json \
+		rubygem-oauth2>=1.0:net/rubygem-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-async_sinatra/Makefile b/www/rubygem-async_sinatra/Makefile
index 3d86be18b9a2..2f729c6e739c 100644
--- a/www/rubygem-async_sinatra/Makefile
+++ b/www/rubygem-async_sinatra/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Sinatra plugin to provide async responses
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=1.4.1:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-sinatra>=1.3.2:${PORTSDIR}/www/rubygem-sinatra
+RUN_DEPENDS=	rubygem-rack16>=1.4.1:www/rubygem-rack16 \
+		rubygem-sinatra>=1.3.2:www/rubygem-sinatra
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-bootstrap-sass/Makefile b/www/rubygem-bootstrap-sass/Makefile
index 5855d64565af..215714476db1 100644
--- a/www/rubygem-bootstrap-sass/Makefile
+++ b/www/rubygem-bootstrap-sass/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Bootstrap by Twitter
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-autoprefixer-rails>=5.2.1:${PORTSDIR}/textproc/rubygem-autoprefixer-rails \
-		rubygem-sass>=3.3.4:${PORTSDIR}/textproc/rubygem-sass
+RUN_DEPENDS=	rubygem-autoprefixer-rails>=5.2.1:textproc/rubygem-autoprefixer-rails \
+		rubygem-sass>=3.3.4:textproc/rubygem-sass
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-cal-heatmap-rails-rails4/Makefile b/www/rubygem-cal-heatmap-rails-rails4/Makefile
index e2264b327d5e..df6326f01f78 100644
--- a/www/rubygem-cal-heatmap-rails-rails4/Makefile
+++ b/www/rubygem-cal-heatmap-rails-rails4/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Calendar heatmap assets for Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-d3_rails-rails4>=3.4.6:${PORTSDIR}/www/rubygem-d3_rails-rails4
+RUN_DEPENDS=	rubygem-d3_rails-rails4>=3.4.6:www/rubygem-d3_rails-rails4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-cal-heatmap-rails/Makefile b/www/rubygem-cal-heatmap-rails/Makefile
index b20789738033..e583528b3ec0 100644
--- a/www/rubygem-cal-heatmap-rails/Makefile
+++ b/www/rubygem-cal-heatmap-rails/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Calendar heatmap assets for Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-d3_rails>=3.4.6:${PORTSDIR}/www/rubygem-d3_rails
+RUN_DEPENDS=	rubygem-d3_rails>=3.4.6:www/rubygem-d3_rails
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-chosen-rails/Makefile b/www/rubygem-chosen-rails/Makefile
index 3c473ae49b96..ace9513e4d06 100644
--- a/www/rubygem-chosen-rails/Makefile
+++ b/www/rubygem-chosen-rails/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Box enhancer for jQuery and Protoype
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-coffee-rails4>=3.2:${PORTSDIR}/devel/rubygem-coffee-rails4 \
-		rubygem-compass-rails>=2.0.4:${PORTSDIR}/textproc/rubygem-compass-rails \
-		rubygem-railties4>=3.0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-sass-rails5>=3.2:${PORTSDIR}/textproc/rubygem-sass-rails5
+RUN_DEPENDS=	rubygem-coffee-rails4>=3.2:devel/rubygem-coffee-rails4 \
+		rubygem-compass-rails>=2.0.4:textproc/rubygem-compass-rails \
+		rubygem-railties4>=3.0:www/rubygem-railties4 \
+		rubygem-sass-rails5>=3.2:textproc/rubygem-sass-rails5
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-cuba/Makefile b/www/rubygem-cuba/Makefile
index 84c701fb5670..077ac2d74a0c 100644
--- a/www/rubygem-cuba/Makefile
+++ b/www/rubygem-cuba/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Microframework for web applications
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=1.6.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=1.6.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-d3_rails-rails4/Makefile b/www/rubygem-d3_rails-rails4/Makefile
index 59cd2a9086ad..c35fbf4fc711 100644
--- a/www/rubygem-d3_rails-rails4/Makefile
+++ b/www/rubygem-d3_rails-rails4/Makefile
@@ -12,7 +12,7 @@ COMMENT=	JavaScript framework for data visualization
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT_LICENSE
 
-RUN_DEPENDS=	rubygem-railties4>=3.1.0:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-railties4>=3.1.0:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-d3_rails/Makefile b/www/rubygem-d3_rails/Makefile
index 2fcb6502216a..2407bbb36ce2 100644
--- a/www/rubygem-d3_rails/Makefile
+++ b/www/rubygem-d3_rails/Makefile
@@ -11,7 +11,7 @@ COMMENT=	JavaScript framework for data visualization
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT_LICENSE
 
-RUN_DEPENDS=	rubygem-railties>=3.1.0:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-railties>=3.1.0:www/rubygem-railties
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-dashing/Makefile b/www/rubygem-dashing/Makefile
index b2de8b4cac86..948a46325517 100644
--- a/www/rubygem-dashing/Makefile
+++ b/www/rubygem-dashing/Makefile
@@ -12,18 +12,18 @@ COMMENT=	HTML dashboard framwork based on sinatra
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-sass32>=3.2.12:${PORTSDIR}/textproc/rubygem-sass32 \
-		rubygem-coffee-script>=2.3.0:${PORTSDIR}/devel/rubygem-coffee-script \
-		rubygem-execjs>=2.2.2:${PORTSDIR}/devel/rubygem-execjs \
-		rubygem-sinatra>=1.4.5:${PORTSDIR}/www/rubygem-sinatra \
-		rubygem-sinatra-contrib>=1.4.2:${PORTSDIR}/www/rubygem-sinatra-contrib \
-		rubygem-thin>=1.6.2:${PORTSDIR}/www/rubygem-thin \
-		rubygem-rufus-scheduler>=3.0.9:${PORTSDIR}/devel/rubygem-rufus-scheduler \
-		rubygem-thor>=0.19.1:${PORTSDIR}/devel/rubygem-thor \
-		rubygem-sprockets>=2.12.2:${PORTSDIR}/devel/rubygem-sprockets \
-		rubygem-rack15>=1.5.0:${PORTSDIR}/www/rubygem-rack15 \
-		rubygem-rake>=10.3.2:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-bundler>=1.7.3:${PORTSDIR}/sysutils/rubygem-bundler
+RUN_DEPENDS=	rubygem-sass32>=3.2.12:textproc/rubygem-sass32 \
+		rubygem-coffee-script>=2.3.0:devel/rubygem-coffee-script \
+		rubygem-execjs>=2.2.2:devel/rubygem-execjs \
+		rubygem-sinatra>=1.4.5:www/rubygem-sinatra \
+		rubygem-sinatra-contrib>=1.4.2:www/rubygem-sinatra-contrib \
+		rubygem-thin>=1.6.2:www/rubygem-thin \
+		rubygem-rufus-scheduler>=3.0.9:devel/rubygem-rufus-scheduler \
+		rubygem-thor>=0.19.1:devel/rubygem-thor \
+		rubygem-sprockets>=2.12.2:devel/rubygem-sprockets \
+		rubygem-rack15>=1.5.0:www/rubygem-rack15 \
+		rubygem-rake>=10.3.2:devel/rubygem-rake \
+		rubygem-bundler>=1.7.3:sysutils/rubygem-bundler
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-domainatrix/Makefile b/www/rubygem-domainatrix/Makefile
index 4877c043cf96..5685406973ee 100644
--- a/www/rubygem-domainatrix/Makefile
+++ b/www/rubygem-domainatrix/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for parsing domain names and canonicalizing URLs
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-addressable>=0:${PORTSDIR}/www/rubygem-addressable
+RUN_DEPENDS=	rubygem-addressable>=0:www/rubygem-addressable
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-dropzonejs-rails/Makefile b/www/rubygem-dropzonejs-rails/Makefile
index f964e1696372..5192e29b362d 100644
--- a/www/rubygem-dropzonejs-rails/Makefile
+++ b/www/rubygem-dropzonejs-rails/Makefile
@@ -12,7 +12,7 @@ COMMENT=	JS File upload by Matias Meno
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-rails4>=3.1:${PORTSDIR}/www/rubygem-rails4
+RUN_DEPENDS=	rubygem-rails4>=3.1:www/rubygem-rails4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-em-http-request/Makefile b/www/rubygem-em-http-request/Makefile
index cc1ecf4cc44a..f1f9a775606a 100644
--- a/www/rubygem-em-http-request/Makefile
+++ b/www/rubygem-em-http-request/Makefile
@@ -11,11 +11,11 @@ COMMENT=	EventMachine based, async HTTP Request client
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-addressable>=2.3.4:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-cookiejar>=0:${PORTSDIR}/www/rubygem-cookiejar \
-		rubygem-em-socksify>=0.3:${PORTSDIR}/www/rubygem-em-socksify \
-		rubygem-eventmachine>=1.0.3:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-http_parser.rb>=0.6.0:${PORTSDIR}/net/rubygem-http_parser.rb
+RUN_DEPENDS=	rubygem-addressable>=2.3.4:www/rubygem-addressable \
+		rubygem-cookiejar>=0:www/rubygem-cookiejar \
+		rubygem-em-socksify>=0.3:www/rubygem-em-socksify \
+		rubygem-eventmachine>=1.0.3:devel/rubygem-eventmachine \
+		rubygem-http_parser.rb>=0.6.0:net/rubygem-http_parser.rb
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-em-socksify/Makefile b/www/rubygem-em-socksify/Makefile
index 971345697503..1d4dcaab4ab9 100644
--- a/www/rubygem-em-socksify/Makefile
+++ b/www/rubygem-em-socksify/Makefile
@@ -11,7 +11,7 @@ COMMENT=	EventMachine SOCKSify shim: adds SOCKS support to any protocol
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-eventmachine>=1.0.0:${PORTSDIR}/devel/rubygem-eventmachine
+RUN_DEPENDS=	rubygem-eventmachine>=1.0.0:devel/rubygem-eventmachine
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-em-twitter/Makefile b/www/rubygem-em-twitter/Makefile
index 52ba2bb4d4bd..195302874701 100644
--- a/www/rubygem-em-twitter/Makefile
+++ b/www/rubygem-em-twitter/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Twitter Streaming API client for EventMachine
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-buftok>=0.2:${PORTSDIR}/devel/rubygem-buftok \
-		rubygem-eventmachine>=1.0:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-http_parser.rb>=0.6:${PORTSDIR}/net/rubygem-http_parser.rb \
-		rubygem-simple_oauth>=0.2:${PORTSDIR}/net/rubygem-simple_oauth
+RUN_DEPENDS=	rubygem-buftok>=0.2:devel/rubygem-buftok \
+		rubygem-eventmachine>=1.0:devel/rubygem-eventmachine \
+		rubygem-http_parser.rb>=0.6:net/rubygem-http_parser.rb \
+		rubygem-simple_oauth>=0.2:net/rubygem-simple_oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-em-websocket/Makefile b/www/rubygem-em-websocket/Makefile
index 687164861a66..9950396ebd70 100644
--- a/www/rubygem-em-websocket/Makefile
+++ b/www/rubygem-em-websocket/Makefile
@@ -11,8 +11,8 @@ COMMENT=	EventMachine based WebSocket server
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-eventmachine>=0.12.9:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-http_parser.rb>=0.6.0:${PORTSDIR}/net/rubygem-http_parser.rb
+RUN_DEPENDS=	rubygem-eventmachine>=0.12.9:devel/rubygem-eventmachine \
+		rubygem-http_parser.rb>=0.6.0:net/rubygem-http_parser.rb
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-emk-sinatra-url-for/Makefile b/www/rubygem-emk-sinatra-url-for/Makefile
index 7cdae88c8d3d..d116ba6f78a0 100644
--- a/www/rubygem-emk-sinatra-url-for/Makefile
+++ b/www/rubygem-emk-sinatra-url-for/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Construct absolute paths and full URLs for a Sinatra application
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-sinatra>=0.9.1.1:${PORTSDIR}/www/rubygem-sinatra
+RUN_DEPENDS=	rubygem-sinatra>=0.9.1.1:www/rubygem-sinatra
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-ethon/Makefile b/www/rubygem-ethon/Makefile
index 3a3d7c33e8a5..6df82009a043 100644
--- a/www/rubygem-ethon/Makefile
+++ b/www/rubygem-ethon/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Very lightweight libcurl wrapper
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	rubygem-ffi>=1.3.0:${PORTSDIR}/devel/rubygem-ffi
+LIB_DEPENDS=	libcurl.so:ftp/curl
+RUN_DEPENDS=	rubygem-ffi>=1.3.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-faraday/Makefile b/www/rubygem-faraday/Makefile
index cf0deecdada9..555d4083c853 100644
--- a/www/rubygem-faraday/Makefile
+++ b/www/rubygem-faraday/Makefile
@@ -12,7 +12,7 @@ COMMENT=	HTTP/REST API client library in Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-multipart-post>=1.2:${PORTSDIR}/www/rubygem-multipart-post
+RUN_DEPENDS=	rubygem-multipart-post>=1.2:www/rubygem-multipart-post
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-faraday_middleware/Makefile b/www/rubygem-faraday_middleware/Makefile
index 99cb3f7c6d2e..ed4528c4b332 100644
--- a/www/rubygem-faraday_middleware/Makefile
+++ b/www/rubygem-faraday_middleware/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Collection of Ruby Faraday middlewares
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-faraday>=0.7.4:${PORTSDIR}/www/rubygem-faraday
+RUN_DEPENDS=	rubygem-faraday>=0.7.4:www/rubygem-faraday
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-fcgi/Makefile b/www/rubygem-fcgi/Makefile
index eeb83a1da9b2..63e5968a98b0 100644
--- a/www/rubygem-fcgi/Makefile
+++ b/www/rubygem-fcgi/Makefile
@@ -10,7 +10,7 @@ COMMENT=	FastCGI library for Ruby
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
+LIB_DEPENDS=	libfcgi.so:www/fcgi
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-feed-normalizer/Makefile b/www/rubygem-feed-normalizer/Makefile
index ffe07ceb2b56..1119a52f97a3 100644
--- a/www/rubygem-feed-normalizer/Makefile
+++ b/www/rubygem-feed-normalizer/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Extensible wrapper for Atom and RSS parsers
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-RUN_DEPENDS=	rubygem-hpricot>=0.6:${PORTSDIR}/www/rubygem-hpricot \
-		rubygem-simple-rss>=1.1:${PORTSDIR}/www/rubygem-simple-rss
+RUN_DEPENDS=	rubygem-hpricot>=0.6:www/rubygem-hpricot \
+		rubygem-simple-rss>=1.1:www/rubygem-simple-rss
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-feedjira/Makefile b/www/rubygem-feedjira/Makefile
index 95941d44ea5b..a6ffd1ad3ada 100644
--- a/www/rubygem-feedjira/Makefile
+++ b/www/rubygem-feedjira/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Feed fetching and parsing library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-faraday>=0.9:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-faraday_middleware>=0.9:${PORTSDIR}/www/rubygem-faraday_middleware \
-		rubygem-loofah>=2.0:${PORTSDIR}/textproc/rubygem-loofah \
-		rubygem-sax-machine>=1.0:${PORTSDIR}/textproc/rubygem-sax-machine
+RUN_DEPENDS=	rubygem-faraday>=0.9:www/rubygem-faraday \
+		rubygem-faraday_middleware>=0.9:www/rubygem-faraday_middleware \
+		rubygem-loofah>=2.0:textproc/rubygem-loofah \
+		rubygem-sax-machine>=1.0:textproc/rubygem-sax-machine
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-flowdock/Makefile b/www/rubygem-flowdock/Makefile
index ddd2a1a81564..9021b51be947 100644
--- a/www/rubygem-flowdock/Makefile
+++ b/www/rubygem-flowdock/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Gem for Flowdock API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-httparty>=0.7:${PORTSDIR}/www/rubygem-httparty \
-		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-httparty>=0.7:www/rubygem-httparty \
+		rubygem-multi_json>=0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-geminabox/Makefile b/www/rubygem-geminabox/Makefile
index e2bc107b91ec..2d0067e00854 100644
--- a/www/rubygem-geminabox/Makefile
+++ b/www/rubygem-geminabox/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Sinatra based gem hosting app
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-faraday>=0:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-httpclient>=2.2.7:${PORTSDIR}/www/rubygem-httpclient \
-		rubygem-nesty>=0:${PORTSDIR}/devel/rubygem-nesty \
-		rubygem-sinatra>=1.2.7:${PORTSDIR}/www/rubygem-sinatra
+RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-faraday>=0:www/rubygem-faraday \
+		rubygem-httpclient>=2.2.7:www/rubygem-httpclient \
+		rubygem-nesty>=0:devel/rubygem-nesty \
+		rubygem-sinatra>=1.2.7:www/rubygem-sinatra
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-gitlab-flowdock-git-hook/Makefile b/www/rubygem-gitlab-flowdock-git-hook/Makefile
index ef415a0f7eb5..201e21b722c7 100644
--- a/www/rubygem-gitlab-flowdock-git-hook/Makefile
+++ b/www/rubygem-gitlab-flowdock-git-hook/Makefile
@@ -12,9 +12,9 @@ COMMENT=	GitLab-patched Git Post-Receive hook for Flowdock
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-flowdock>=0.7:${PORTSDIR}/www/rubygem-flowdock \
-		rubygem-gitlab-grit>=2.4.1:${PORTSDIR}/textproc/rubygem-gitlab-grit \
-		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-flowdock>=0.7:www/rubygem-flowdock \
+		rubygem-gitlab-grit>=2.4.1:textproc/rubygem-gitlab-grit \
+		rubygem-multi_json>=0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-gitlab-gollum-lib/Makefile b/www/rubygem-gitlab-gollum-lib/Makefile
index 055b52970fde..b9beee06efc7 100644
--- a/www/rubygem-gitlab-gollum-lib/Makefile
+++ b/www/rubygem-gitlab-gollum-lib/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Simple, Git-powered wiki with a sweet API and local frontend
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-github-markdown>=0.5.3:${PORTSDIR}/textproc/rubygem-github-markdown \
-		rubygem-github-markup>=0.7.5:${PORTSDIR}/textproc/rubygem-github-markup \
-		rubygem-gitlab-grit>=2.6.1:${PORTSDIR}/textproc/rubygem-gitlab-grit \
-		rubygem-nokogiri>=1.5.9:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-sanitize>=2.0.3:${PORTSDIR}/textproc/rubygem-sanitize \
-		rubygem-stringex>=1.5.1:${PORTSDIR}/devel/rubygem-stringex
+RUN_DEPENDS=	rubygem-github-markdown>=0.5.3:textproc/rubygem-github-markdown \
+		rubygem-github-markup>=0.7.5:textproc/rubygem-github-markup \
+		rubygem-gitlab-grit>=2.6.1:textproc/rubygem-gitlab-grit \
+		rubygem-nokogiri>=1.5.9:textproc/rubygem-nokogiri \
+		rubygem-sanitize>=2.0.3:textproc/rubygem-sanitize \
+		rubygem-stringex>=1.5.1:devel/rubygem-stringex
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-gitlab-grack/Makefile b/www/rubygem-gitlab-grack/Makefile
index 5ad8789e1d6d..f387663bd37d 100644
--- a/www/rubygem-gitlab-grack/Makefile
+++ b/www/rubygem-gitlab-grack/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby/Rack Git Smart-HTTP Server Handler
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack15>=1.5.1:${PORTSDIR}/www/rubygem-rack15
+RUN_DEPENDS=	rubygem-rack15>=1.5.1:www/rubygem-rack15
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-gollum-grit_adapter/Makefile b/www/rubygem-gollum-grit_adapter/Makefile
index d4686e034599..9a5c2aac5f41 100644
--- a/www/rubygem-gollum-grit_adapter/Makefile
+++ b/www/rubygem-gollum-grit_adapter/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Adapter for Gollum to use Grit at the backend
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-gitlab-grit>=2.7.1:${PORTSDIR}/textproc/rubygem-gitlab-grit
+RUN_DEPENDS=	rubygem-gitlab-grit>=2.7.1:textproc/rubygem-gitlab-grit
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile
index 920635b03806..d0bf386628a0 100644
--- a/www/rubygem-gollum-lib/Makefile
+++ b/www/rubygem-gollum-lib/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Simple, Git-powered wiki with a sweet API and local frontend
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-github-markup>=1.4.0:${PORTSDIR}/textproc/rubygem-github-markup \
-		rubygem-gollum-grit_adapter>=1.0:${PORTSDIR}/www/rubygem-gollum-grit_adapter \
-		rubygem-nokogiri>=1.6.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-rouge>=1.10:${PORTSDIR}/textproc/rubygem-rouge \
-		rubygem-sanitize>=2.1.0:${PORTSDIR}/textproc/rubygem-sanitize \
-		rubygem-stringex>=2.5.1:${PORTSDIR}/devel/rubygem-stringex
+RUN_DEPENDS=	rubygem-github-markup>=1.4.0:textproc/rubygem-github-markup \
+		rubygem-gollum-grit_adapter>=1.0:www/rubygem-gollum-grit_adapter \
+		rubygem-nokogiri>=1.6.4:textproc/rubygem-nokogiri \
+		rubygem-rouge>=1.10:textproc/rubygem-rouge \
+		rubygem-sanitize>=2.1.0:textproc/rubygem-sanitize \
+		rubygem-stringex>=2.5.1:devel/rubygem-stringex
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-gon-rails4/Makefile b/www/rubygem-gon-rails4/Makefile
index 4737a8f640fb..c0bf50e65ad7 100644
--- a/www/rubygem-gon-rails4/Makefile
+++ b/www/rubygem-gon-rails4/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Framework to pass data to JS easily
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=3.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-json>=0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-request_store>=1.0:${PORTSDIR}/devel/rubygem-request_store
+RUN_DEPENDS=	rubygem-actionpack4>=3.0:www/rubygem-actionpack4 \
+		rubygem-json>=0:devel/rubygem-json \
+		rubygem-multi_json>=0:devel/rubygem-multi_json \
+		rubygem-request_store>=1.0:devel/rubygem-request_store
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-gon/Makefile b/www/rubygem-gon/Makefile
index 0b766b0cb8eb..9235e06a4840 100644
--- a/www/rubygem-gon/Makefile
+++ b/www/rubygem-gon/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Framework to pass data to JS easily
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=3.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-json>=0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-request_store>=1.0:${PORTSDIR}/devel/rubygem-request_store
+RUN_DEPENDS=	rubygem-actionpack4>=3.0:www/rubygem-actionpack4 \
+		rubygem-json>=0:devel/rubygem-json \
+		rubygem-multi_json>=0:devel/rubygem-multi_json \
+		rubygem-request_store>=1.0:devel/rubygem-request_store
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-hackpad-cli/Makefile b/www/rubygem-hackpad-cli/Makefile
index e972da058ae3..4e38939e8638 100644
--- a/www/rubygem-hackpad-cli/Makefile
+++ b/www/rubygem-hackpad-cli/Makefile
@@ -11,12 +11,12 @@ COMMENT=	CLI for some remote hackpad operations
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-cliprompt>=0.1.2:${PORTSDIR}/devel/rubygem-cliprompt \
-		rubygem-configstruct>=0.1.0:${PORTSDIR}/devel/rubygem-configstruct \
-		rubygem-oauth>=0.4.7:${PORTSDIR}/net/rubygem-oauth \
-		rubygem-paint>=1.0.0:${PORTSDIR}/devel/rubygem-paint \
-		rubygem-reverse_markdown>=1.0.0:${PORTSDIR}/textproc/rubygem-reverse_markdown \
-		rubygem-thor>=0:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-cliprompt>=0.1.2:devel/rubygem-cliprompt \
+		rubygem-configstruct>=0.1.0:devel/rubygem-configstruct \
+		rubygem-oauth>=0.4.7:net/rubygem-oauth \
+		rubygem-paint>=1.0.0:devel/rubygem-paint \
+		rubygem-reverse_markdown>=1.0.0:textproc/rubygem-reverse_markdown \
+		rubygem-thor>=0:devel/rubygem-thor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-haml-coderay/Makefile b/www/rubygem-haml-coderay/Makefile
index 81aef7c11f22..1cc2067ddf13 100644
--- a/www/rubygem-haml-coderay/Makefile
+++ b/www/rubygem-haml-coderay/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Adds a CodeRay syntax highlighting filter to Haml
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-coderay>=0:${PORTSDIR}/textproc/rubygem-coderay \
-		rubygem-haml>=0:${PORTSDIR}/www/rubygem-haml
+RUN_DEPENDS=	rubygem-coderay>=0:textproc/rubygem-coderay \
+		rubygem-haml>=0:www/rubygem-haml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-haml-contrib/Makefile b/www/rubygem-haml-contrib/Makefile
index d83ab68570b6..4938df06667e 100644
--- a/www/rubygem-haml-contrib/Makefile
+++ b/www/rubygem-haml-contrib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Addons for the Ruby implementation of the Haml template language
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-haml>=4.0.0:${PORTSDIR}/www/rubygem-haml
+RUN_DEPENDS=	rubygem-haml>=4.0.0:www/rubygem-haml
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-haml-rails-rails4/Makefile b/www/rubygem-haml-rails-rails4/Makefile
index 5fce1ac4990b..bb4dfe608f75 100644
--- a/www/rubygem-haml-rails-rails4/Makefile
+++ b/www/rubygem-haml-rails-rails4/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Haml generator for Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=4.0.1:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activesupport4>=4.0.1:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-haml>=4.0.6:${PORTSDIR}/www/rubygem-haml \
-		rubygem-html2haml>=1.0.1:${PORTSDIR}/www/rubygem-html2haml \
-		rubygem-railties4>=4.0.1:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-actionpack4>=4.0.1:www/rubygem-actionpack4 \
+		rubygem-activesupport4>=4.0.1:devel/rubygem-activesupport4 \
+		rubygem-haml>=4.0.6:www/rubygem-haml \
+		rubygem-html2haml>=1.0.1:www/rubygem-html2haml \
+		rubygem-railties4>=4.0.1:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-haml-rails/Makefile b/www/rubygem-haml-rails/Makefile
index 0736850f0e7c..152fa9afca4a 100644
--- a/www/rubygem-haml-rails/Makefile
+++ b/www/rubygem-haml-rails/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Haml generator for Rails
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-actionpack>=3.1:${PORTSDIR}/www/rubygem-actionpack \
-		rubygem-activesupport>=3.1:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-haml>=3.1:${PORTSDIR}/www/rubygem-haml \
-		rubygem-railties>=3.1:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-actionpack>=3.1:www/rubygem-actionpack \
+		rubygem-activesupport>=3.1:devel/rubygem-activesupport \
+		rubygem-haml>=3.1:www/rubygem-haml \
+		rubygem-railties>=3.1:www/rubygem-railties
 
 PORTSCOUT=	limit:0.4
 
diff --git a/www/rubygem-haml/Makefile b/www/rubygem-haml/Makefile
index b89911d63052..a674821cfddf 100644
--- a/www/rubygem-haml/Makefile
+++ b/www/rubygem-haml/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Markup language to describe HTML
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-tilt>=0:${PORTSDIR}/devel/rubygem-tilt
+RUN_DEPENDS=	rubygem-tilt>=0:devel/rubygem-tilt
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-heroku-nav/Makefile b/www/rubygem-heroku-nav/Makefile
index 3e2cb6dc787a..9bfc74abfb6a 100644
--- a/www/rubygem-heroku-nav/Makefile
+++ b/www/rubygem-heroku-nav/Makefile
@@ -16,6 +16,6 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST= yes
 
-RUN_DEPENDS+=	rubygem-sinatra>=0:${PORTSDIR}/www/rubygem-sinatra
+RUN_DEPENDS+=	rubygem-sinatra>=0:www/rubygem-sinatra
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-heroku/Makefile b/www/rubygem-heroku/Makefile
index 565ee3b5c0c1..ae4c388b114b 100644
--- a/www/rubygem-heroku/Makefile
+++ b/www/rubygem-heroku/Makefile
@@ -19,15 +19,15 @@ RUBYGEM_AUTOPLIST= yes
 
 PLIST_FILES=	bin/heroku
 
-RUN_DEPENDS+=	rubygem-heroku-api>=0:${PORTSDIR}/www/rubygem-heroku-api \
-		rubygem-excon>=0:${PORTSDIR}/devel/rubygem-excon \
-		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-launchy>=0:${PORTSDIR}/devel/rubygem-launchy \
-		rubygem-netrc>=0:${PORTSDIR}/net/rubygem-netrc \
-		rubygem-rest-client>=0:${PORTSDIR}/www/rubygem-rest-client \
-		rubygem-rqrcode>=0:${PORTSDIR}/www/rubygem-rqrcode \
-		rubygem-rubyzip>=0:${PORTSDIR}/archivers/rubygem-rubyzip \
-		rubygem-term-ansicolor>=0:${PORTSDIR}/devel/rubygem-term-ansicolor \
-		rubygem-tins>=0:${PORTSDIR}/devel/rubygem-tins
+RUN_DEPENDS+=	rubygem-heroku-api>=0:www/rubygem-heroku-api \
+		rubygem-excon>=0:devel/rubygem-excon \
+		rubygem-multi_json>=0:devel/rubygem-multi_json \
+		rubygem-launchy>=0:devel/rubygem-launchy \
+		rubygem-netrc>=0:net/rubygem-netrc \
+		rubygem-rest-client>=0:www/rubygem-rest-client \
+		rubygem-rqrcode>=0:www/rubygem-rqrcode \
+		rubygem-rubyzip>=0:archivers/rubygem-rubyzip \
+		rubygem-term-ansicolor>=0:devel/rubygem-term-ansicolor \
+		rubygem-tins>=0:devel/rubygem-tins
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-html2haml/Makefile b/www/rubygem-html2haml/Makefile
index 7ae081da20cb..1b287d47b292 100644
--- a/www/rubygem-html2haml/Makefile
+++ b/www/rubygem-html2haml/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Converts HTML into Haml
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-erubis>=2.7.0:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-haml>=4.0.0:${PORTSDIR}/www/rubygem-haml \
-		rubygem-nokogiri>=1.6.0:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-ruby_parser>=3.5:${PORTSDIR}/devel/rubygem-ruby_parser
+RUN_DEPENDS=	rubygem-erubis>=2.7.0:www/rubygem-erubis \
+		rubygem-haml>=4.0.0:www/rubygem-haml \
+		rubygem-nokogiri>=1.6.0:textproc/rubygem-nokogiri \
+		rubygem-ruby_parser>=3.5:devel/rubygem-ruby_parser
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-http-cookie/Makefile b/www/rubygem-http-cookie/Makefile
index a8f678d0466d..a6d69212aaa4 100644
--- a/www/rubygem-http-cookie/Makefile
+++ b/www/rubygem-http-cookie/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby library to handle HTTP Cookies
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-domain_name>=0.5.1:${PORTSDIR}/net/rubygem-domain_name
+RUN_DEPENDS=	rubygem-domain_name>=0.5.1:net/rubygem-domain_name
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-http/Makefile b/www/rubygem-http/Makefile
index c4ef00bd5909..eb454ef7acd0 100644
--- a/www/rubygem-http/Makefile
+++ b/www/rubygem-http/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Simple Ruby DSL for making HTTP requests
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-http-cookie>=1.0:${PORTSDIR}/www/rubygem-http-cookie \
-		rubygem-http-form_data>=1.0.1:${PORTSDIR}/www/rubygem-http-form_data \
-		rubygem-http_parser.rb>=0.6.0:${PORTSDIR}/net/rubygem-http_parser.rb
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable \
+		rubygem-http-cookie>=1.0:www/rubygem-http-cookie \
+		rubygem-http-form_data>=1.0.1:www/rubygem-http-form_data \
+		rubygem-http_parser.rb>=0.6.0:net/rubygem-http_parser.rb
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-http_router/Makefile b/www/rubygem-http_router/Makefile
index 691875b4aa76..6aed86feecb5 100644
--- a/www/rubygem-http_router/Makefile
+++ b/www/rubygem-http_router/Makefile
@@ -11,8 +11,8 @@ COMMENT=	HTTP router for use in Rack
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=1.0.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-url_mount>=0.2.1:${PORTSDIR}/www/rubygem-url-mount
+RUN_DEPENDS=	rubygem-rack16>=1.0.0:www/rubygem-rack16 \
+		rubygem-url_mount>=0.2.1:www/rubygem-url-mount
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-httparty/Makefile b/www/rubygem-httparty/Makefile
index fc0e7ac4f585..8d31a1716a6c 100644
--- a/www/rubygem-httparty/Makefile
+++ b/www/rubygem-httparty/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby Library that Makes HTTP Fun Again
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-json>=1.8:${PORTSDIR}/devel/rubygem-json \
-		rubygem-multi_xml>=0.5.2:${PORTSDIR}/textproc/rubygem-multi_xml
+RUN_DEPENDS=	rubygem-json>=1.8:devel/rubygem-json \
+		rubygem-multi_xml>=0.5.2:textproc/rubygem-multi_xml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-httpi/Makefile b/www/rubygem-httpi/Makefile
index c9ec6413f34a..68906fd912de 100644
--- a/www/rubygem-httpi/Makefile
+++ b/www/rubygem-httpi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for common HTTP client API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack>=1.4.5:${PORTSDIR}/www/rubygem-rack
+RUN_DEPENDS=	rubygem-rack>=1.4.5:www/rubygem-rack
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-innate/Makefile b/www/rubygem-innate/Makefile
index 510a06aedaa1..6f775bef9b93 100644
--- a/www/rubygem-innate/Makefile
+++ b/www/rubygem-innate/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Powerful web-framework wrapper for Rack
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-rack15>=1.5.2:${PORTSDIR}/www/rubygem-rack15
+RUN_DEPENDS=	rubygem-rack15>=1.5.2:www/rubygem-rack15
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-jekyll-watch/Makefile b/www/rubygem-jekyll-watch/Makefile
index c983f426a9ec..fefb4e4e51d4 100644
--- a/www/rubygem-jekyll-watch/Makefile
+++ b/www/rubygem-jekyll-watch/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Handles rebuilding of Jekyll sites when a file changes
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-listen>=3.0:${PORTSDIR}/devel/rubygem-listen
+RUN_DEPENDS=	rubygem-listen>=3.0:devel/rubygem-listen
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-jekyll/Makefile b/www/rubygem-jekyll/Makefile
index 4b05587b8ae0..248f2654575b 100644
--- a/www/rubygem-jekyll/Makefile
+++ b/www/rubygem-jekyll/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Simple, blog aware, static site generator
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-colorator>=0.1:${PORTSDIR}/textproc/rubygem-colorator \
-		rubygem-jekyll-sass-converter>=1.0:${PORTSDIR}/textproc/rubygem-jekyll-sass-converter \
-		rubygem-jekyll-watch>=1.1:${PORTSDIR}/www/rubygem-jekyll-watch \
-		rubygem-kramdown>=1.3:${PORTSDIR}/textproc/rubygem-kramdown \
-		rubygem-liquid>=3.0.0:${PORTSDIR}/textproc/rubygem-liquid \
-		rubygem-mercenary>=0.3.3:${PORTSDIR}/devel/rubygem-mercenary \
-		rubygem-rouge>=1.7:${PORTSDIR}/textproc/rubygem-rouge \
-		rubygem-safe_yaml>=1.0:${PORTSDIR}/devel/rubygem-safe_yaml
+RUN_DEPENDS=	rubygem-colorator>=0.1:textproc/rubygem-colorator \
+		rubygem-jekyll-sass-converter>=1.0:textproc/rubygem-jekyll-sass-converter \
+		rubygem-jekyll-watch>=1.1:www/rubygem-jekyll-watch \
+		rubygem-kramdown>=1.3:textproc/rubygem-kramdown \
+		rubygem-liquid>=3.0.0:textproc/rubygem-liquid \
+		rubygem-mercenary>=0.3.3:devel/rubygem-mercenary \
+		rubygem-rouge>=1.7:textproc/rubygem-rouge \
+		rubygem-safe_yaml>=1.0:devel/rubygem-safe_yaml
 
 CONFLICTS_INSTALL=	rubygem-jekyll2-*
 
diff --git a/www/rubygem-jekyll2/Makefile b/www/rubygem-jekyll2/Makefile
index 128c80491ae0..ce4fd8c91bf8 100644
--- a/www/rubygem-jekyll2/Makefile
+++ b/www/rubygem-jekyll2/Makefile
@@ -14,20 +14,20 @@ COMMENT=	Simple, blog aware, static site generator
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-classifier-reborn>=2.0:${PORTSDIR}/devel/rubygem-classifier-reborn \
-		rubygem-colorator>=0.1:${PORTSDIR}/textproc/rubygem-colorator \
-		rubygem-jekyll-coffeescript>=1.0:${PORTSDIR}/devel/rubygem-jekyll-coffeescript \
-		rubygem-jekyll-gist>=1.0:${PORTSDIR}/textproc/rubygem-jekyll-gist \
-		rubygem-jekyll-paginate>=1.0:${PORTSDIR}/textproc/rubygem-jekyll-paginate \
-		rubygem-jekyll-sass-converter>=1.0:${PORTSDIR}/textproc/rubygem-jekyll-sass-converter \
-		rubygem-jekyll-watch>=1.1:${PORTSDIR}/www/rubygem-jekyll-watch \
-		rubygem-kramdown>=1.3:${PORTSDIR}/textproc/rubygem-kramdown \
-		rubygem-liquid2>=2.6.1:${PORTSDIR}/textproc/rubygem-liquid2 \
-		rubygem-mercenary>=0.3.3:${PORTSDIR}/devel/rubygem-mercenary \
-		rubygem-pygments.rb>=0.6.0:${PORTSDIR}/devel/rubygem-pygments.rb \
-		rubygem-redcarpet>=3.1:${PORTSDIR}/textproc/rubygem-redcarpet \
-		rubygem-safe_yaml>=1.0:${PORTSDIR}/devel/rubygem-safe_yaml \
-		rubygem-toml>=0.1.0:${PORTSDIR}/devel/rubygem-toml
+RUN_DEPENDS=	rubygem-classifier-reborn>=2.0:devel/rubygem-classifier-reborn \
+		rubygem-colorator>=0.1:textproc/rubygem-colorator \
+		rubygem-jekyll-coffeescript>=1.0:devel/rubygem-jekyll-coffeescript \
+		rubygem-jekyll-gist>=1.0:textproc/rubygem-jekyll-gist \
+		rubygem-jekyll-paginate>=1.0:textproc/rubygem-jekyll-paginate \
+		rubygem-jekyll-sass-converter>=1.0:textproc/rubygem-jekyll-sass-converter \
+		rubygem-jekyll-watch>=1.1:www/rubygem-jekyll-watch \
+		rubygem-kramdown>=1.3:textproc/rubygem-kramdown \
+		rubygem-liquid2>=2.6.1:textproc/rubygem-liquid2 \
+		rubygem-mercenary>=0.3.3:devel/rubygem-mercenary \
+		rubygem-pygments.rb>=0.6.0:devel/rubygem-pygments.rb \
+		rubygem-redcarpet>=3.1:textproc/rubygem-redcarpet \
+		rubygem-safe_yaml>=1.0:devel/rubygem-safe_yaml \
+		rubygem-toml>=0.1.0:devel/rubygem-toml
 
 CONFLICTS_INSTALL=	rubygem-jekyll-3.*
 
diff --git a/www/rubygem-jquery-rails/Makefile b/www/rubygem-jquery-rails/Makefile
index 38fc43d044e8..ed92cad8e9f0 100644
--- a/www/rubygem-jquery-rails/Makefile
+++ b/www/rubygem-jquery-rails/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Provides a Rails generator for jQuery
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-railties>=3.0:${PORTSDIR}/www/rubygem-railties \
-		rubygem-thor>=0.14:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-railties>=3.0:www/rubygem-railties \
+		rubygem-thor>=0.14:devel/rubygem-thor
 
 PORTSCOUT=	limit:^3.*
 
diff --git a/www/rubygem-jquery-rails4/Makefile b/www/rubygem-jquery-rails4/Makefile
index c1647feafcf8..39b863526790 100644
--- a/www/rubygem-jquery-rails4/Makefile
+++ b/www/rubygem-jquery-rails4/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Provides a Rails generator for jQuery
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-rails-dom-testing>=1.0:${PORTSDIR}/textproc/rubygem-rails-dom-testing \
-		rubygem-railties4>=4.2.0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-thor>=0.14:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-rails-dom-testing>=1.0:textproc/rubygem-rails-dom-testing \
+		rubygem-railties4>=4.2.0:www/rubygem-railties4 \
+		rubygem-thor>=0.14:devel/rubygem-thor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-jquery-scrollto-rails/Makefile b/www/rubygem-jquery-scrollto-rails/Makefile
index 1f351f61bca3..7773b6a13834 100644
--- a/www/rubygem-jquery-scrollto-rails/Makefile
+++ b/www/rubygem-jquery-scrollto-rails/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Provides jQUery scrollTo for Rails 3 applications
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-railties4>=4.1.4:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-railties4>=4.1.4:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-jquery-turbolinks/Makefile b/www/rubygem-jquery-turbolinks/Makefile
index 654d57fdd27e..f95b1b91ddb8 100644
--- a/www/rubygem-jquery-turbolinks/Makefile
+++ b/www/rubygem-jquery-turbolinks/Makefile
@@ -12,8 +12,8 @@ COMMENT=	jQuery plugin for drop-in fix binded events problem caused by Turbolink
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-railties4>=4.1.6:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-turbolinks>=0:${PORTSDIR}/www/rubygem-turbolinks
+RUN_DEPENDS=	rubygem-railties4>=4.1.6:www/rubygem-railties4 \
+		rubygem-turbolinks>=0:www/rubygem-turbolinks
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-jquery-ui-rails-rails4/Makefile b/www/rubygem-jquery-ui-rails-rails4/Makefile
index 5677ee2253c8..b5ff975ce900 100644
--- a/www/rubygem-jquery-ui-rails-rails4/Makefile
+++ b/www/rubygem-jquery-ui-rails-rails4/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Packaged JavaScript, CSS and image files of jQuery UI for Rails
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-railties4>=4.1.4:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-railties4>=4.1.4:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-jquery-ui-rails/Makefile b/www/rubygem-jquery-ui-rails/Makefile
index 1bed320dc9fa..3c99f1c055c2 100644
--- a/www/rubygem-jquery-ui-rails/Makefile
+++ b/www/rubygem-jquery-ui-rails/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Packaged JavaScript, CSS and image files of jQuery UI for Rails
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-railties>=3.2.16:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-railties>=3.2.16:www/rubygem-railties
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-jruby-rack/Makefile b/www/rubygem-jruby-rack/Makefile
index 7dea7741ee21..eab732ae470a 100644
--- a/www/rubygem-jruby-rack/Makefile
+++ b/www/rubygem-jruby-rack/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java and Ruby library that adapts the Java Servlet API to Rack
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	jruby:${PORTSDIR}/lang/jruby
+RUN_DEPENDS=	jruby:lang/jruby
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-jsobfu/Makefile b/www/rubygem-jsobfu/Makefile
index 5c7ee465bf81..b2b610002f99 100644
--- a/www/rubygem-jsobfu/Makefile
+++ b/www/rubygem-jsobfu/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Javascript code obfuscator
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	rubygem-rkelly-remix>=0.0.6:${PORTSDIR}/www/rubygem-rkelly-remix
+RUN_DEPENDS=	rubygem-rkelly-remix>=0.0.6:www/rubygem-rkelly-remix
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-kaminari-rails4/Makefile b/www/rubygem-kaminari-rails4/Makefile
index ac099b0e47e4..db6b5723286a 100644
--- a/www/rubygem-kaminari-rails4/Makefile
+++ b/www/rubygem-kaminari-rails4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Sophisticated paginator for Rails 4
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=4.0.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activesupport4>=4.0.0:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-actionpack4>=4.0.0:www/rubygem-actionpack4 \
+		rubygem-activesupport4>=4.0.0:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-kaminari/Makefile b/www/rubygem-kaminari/Makefile
index d5745e4fc6b3..df5acd376bae 100644
--- a/www/rubygem-kaminari/Makefile
+++ b/www/rubygem-kaminari/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Sophisticated paginator for Rails 3
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-actionpack>=3.0.0:${PORTSDIR}/www/rubygem-actionpack \
-		rubygem-activesupport>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport
+RUN_DEPENDS=	rubygem-actionpack>=3.0.0:www/rubygem-actionpack \
+		rubygem-activesupport>=3.0.0:devel/rubygem-activesupport
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-kensa/Makefile b/www/rubygem-kensa/Makefile
index 0d21a7872684..fc447212d7de 100644
--- a/www/rubygem-kensa/Makefile
+++ b/www/rubygem-kensa/Makefile
@@ -18,18 +18,18 @@ RUBYGEM_AUTOPLIST= yes
 
 PLIST_FILES=	bin/kensa
 
-RUN_DEPENDS+=	rubygem-launchy22>=0:${PORTSDIR}/devel/rubygem-launchy22 \
-		rubygem-mechanize26>=0:${PORTSDIR}/www/rubygem-mechanize26 \
-		rubygem-rest-client>=0:${PORTSDIR}/www/rubygem-rest-client \
-		rubygem-term-ansicolor>=0:${PORTSDIR}/devel/rubygem-term-ansicolor \
-		rubygem-sinatra>=1.4.2:${PORTSDIR}/www/rubygem-sinatra \
-		rubygem-foreman>=0.63:${PORTSDIR}/devel/rubygem-foreman \
-		rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-thin>=0:${PORTSDIR}/www/rubygem-thin \
-		rubygem-tilt1>=1.4.1:${PORTSDIR}/devel/rubygem-tilt1 \
-		rubygem-haml>=4.0.5:${PORTSDIR}/www/rubygem-haml \
-		rubygem-heroku-nav>=0.2.2:${PORTSDIR}/www/rubygem-heroku-nav \
-		rubygem-json>=1.8.1:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS+=	rubygem-launchy22>=0:devel/rubygem-launchy22 \
+		rubygem-mechanize26>=0:www/rubygem-mechanize26 \
+		rubygem-rest-client>=0:www/rubygem-rest-client \
+		rubygem-term-ansicolor>=0:devel/rubygem-term-ansicolor \
+		rubygem-sinatra>=1.4.2:www/rubygem-sinatra \
+		rubygem-foreman>=0.63:devel/rubygem-foreman \
+		rubygem-bundler>=0:sysutils/rubygem-bundler \
+		rubygem-thin>=0:www/rubygem-thin \
+		rubygem-tilt1>=1.4.1:devel/rubygem-tilt1 \
+		rubygem-haml>=4.0.5:www/rubygem-haml \
+		rubygem-heroku-nav>=0.2.2:www/rubygem-heroku-nav \
+		rubygem-json>=1.8.1:devel/rubygem-json
 
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-layout_yullio_generator/Makefile b/www/rubygem-layout_yullio_generator/Makefile
index 170d8b385f2a..4cba8ad195cc 100644
--- a/www/rubygem-layout_yullio_generator/Makefile
+++ b/www/rubygem-layout_yullio_generator/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Combination of Mollio CSS/HTML template and Yahoo UI grid
 
-RUN_DEPENDS=	rubygem-hoe>=1.1.6:${PORTSDIR}/devel/rubygem-hoe
+RUN_DEPENDS=	rubygem-hoe>=1.1.6:devel/rubygem-hoe
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-less/Makefile b/www/rubygem-less/Makefile
index c99a32f51698..456331e9c017 100644
--- a/www/rubygem-less/Makefile
+++ b/www/rubygem-less/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	RG
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	The LESS Ruby gem compiles LESS code to CSS
 
-RUN_DEPENDS=	rubygem-treetop>=1.4.2:${PORTSDIR}/devel/rubygem-treetop \
-		rubygem-mutter>=0.4.2:${PORTSDIR}/devel/rubygem-mutter
+RUN_DEPENDS=	rubygem-treetop>=1.4.2:devel/rubygem-treetop \
+		rubygem-mutter>=0.4.2:devel/rubygem-mutter
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-lighthouse-api/Makefile b/www/rubygem-lighthouse-api/Makefile
index c65c7d6d86f1..04f0eaf63d0c 100644
--- a/www/rubygem-lighthouse-api/Makefile
+++ b/www/rubygem-lighthouse-api/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Ruby interface for lighthouse ticketing system
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activeresource>=3.0.0:${PORTSDIR}/www/rubygem-activeresource \
-		rubygem-activesupport>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport
+RUN_DEPENDS=	rubygem-activeresource>=3.0.0:www/rubygem-activeresource \
+		rubygem-activesupport>=3.0.0:devel/rubygem-activesupport
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-mechanize/Makefile b/www/rubygem-mechanize/Makefile
index d92638193c2f..def6227a8251 100644
--- a/www/rubygem-mechanize/Makefile
+++ b/www/rubygem-mechanize/Makefile
@@ -12,14 +12,14 @@ COMMENT=	WWW::Mechanize, a handy web browsing ruby object
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.rdoc
 
-RUN_DEPENDS=	rubygem-domain_name>=0.5.1:${PORTSDIR}/net/rubygem-domain_name \
-		rubygem-http-cookie>=1.0.0:${PORTSDIR}/www/rubygem-http-cookie \
-		rubygem-mime-types>=2.0:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-net-http-digest_auth>=1.1.1:${PORTSDIR}/www/rubygem-net-http-digest_auth \
-		rubygem-net-http-persistent>=2.5.2:${PORTSDIR}/www/rubygem-net-http-persistent \
-		rubygem-nokogiri>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-ntlm-http>=0.1.1:${PORTSDIR}/www/rubygem-ntlm-http \
-		rubygem-webrobots>=0.0.9:${PORTSDIR}/www/rubygem-webrobots
+RUN_DEPENDS=	rubygem-domain_name>=0.5.1:net/rubygem-domain_name \
+		rubygem-http-cookie>=1.0.0:www/rubygem-http-cookie \
+		rubygem-mime-types>=2.0:misc/rubygem-mime-types \
+		rubygem-net-http-digest_auth>=1.1.1:www/rubygem-net-http-digest_auth \
+		rubygem-net-http-persistent>=2.5.2:www/rubygem-net-http-persistent \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri \
+		rubygem-ntlm-http>=0.1.1:www/rubygem-ntlm-http \
+		rubygem-webrobots>=0.0.9:www/rubygem-webrobots
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-mechanize26/Makefile b/www/rubygem-mechanize26/Makefile
index 20f2a030f902..1548aef55cbc 100644
--- a/www/rubygem-mechanize26/Makefile
+++ b/www/rubygem-mechanize26/Makefile
@@ -13,14 +13,14 @@ COMMENT=	WWW::Mechanize, a handy web browsing ruby object
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.rdoc
 
-RUN_DEPENDS=	rubygem-domain_name>=0.5.1:${PORTSDIR}/net/rubygem-domain_name \
-		rubygem-http-cookie>=1.0.0:${PORTSDIR}/www/rubygem-http-cookie \
-		rubygem-mime-types1>=0:${PORTSDIR}/misc/rubygem-mime-types1 \
-		rubygem-net-http-digest_auth11>=0:${PORTSDIR}/www/rubygem-net-http-digest_auth11 \
-		rubygem-net-http-persistent25>0:${PORTSDIR}/www/rubygem-net-http-persistent25 \
-		rubygem-nokogiri14>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri14 \
-		rubygem-ntlm-http>=0.1.1:${PORTSDIR}/www/rubygem-ntlm-http \
-		rubygem-webrobots>=0.0.9:${PORTSDIR}/www/rubygem-webrobots
+RUN_DEPENDS=	rubygem-domain_name>=0.5.1:net/rubygem-domain_name \
+		rubygem-http-cookie>=1.0.0:www/rubygem-http-cookie \
+		rubygem-mime-types1>=0:misc/rubygem-mime-types1 \
+		rubygem-net-http-digest_auth11>=0:www/rubygem-net-http-digest_auth11 \
+		rubygem-net-http-persistent25>0:www/rubygem-net-http-persistent25 \
+		rubygem-nokogiri14>=1.4:textproc/rubygem-nokogiri14 \
+		rubygem-ntlm-http>=0.1.1:www/rubygem-ntlm-http \
+		rubygem-webrobots>=0.0.9:www/rubygem-webrobots
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-merb-assets/Makefile b/www/rubygem-merb-assets/Makefile
index 6f8462ad925f..6f2cd49e221c 100644
--- a/www/rubygem-merb-assets/Makefile
+++ b/www/rubygem-merb-assets/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Merb plugin for supporting assets
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-merb-core>=1.1.3:${PORTSDIR}/www/rubygem-merb-core
+RUN_DEPENDS=	rubygem-merb-core>=1.1.3:www/rubygem-merb-core
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-merb-core/Makefile b/www/rubygem-merb-core/Makefile
index 34af48a3bd34..5068e102d586 100644
--- a/www/rubygem-merb-core/Makefile
+++ b/www/rubygem-merb-core/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Merb. Pocket rocket web framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-erubis>=2.6.2:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-extlib>=0.9.13:${PORTSDIR}/devel/rubygem-extlib \
-		rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-rack16>=0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-bundler>=0:sysutils/rubygem-bundler \
+		rubygem-erubis>=2.6.2:www/rubygem-erubis \
+		rubygem-extlib>=0.9.13:devel/rubygem-extlib \
+		rubygem-mime-types>=1.16:misc/rubygem-mime-types \
+		rubygem-rack16>=0:www/rubygem-rack16 \
+		rubygem-rake>=0:devel/rubygem-rake
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-merb-haml/Makefile b/www/rubygem-merb-haml/Makefile
index fcb4182762cb..7a73fc3cc360 100644
--- a/www/rubygem-merb-haml/Makefile
+++ b/www/rubygem-merb-haml/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Merb plugin for HAML support
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-haml>=2.0.3:${PORTSDIR}/www/rubygem-haml \
-		rubygem-merb-core>=1.1.3:${PORTSDIR}/www/rubygem-merb-core
+RUN_DEPENDS=	rubygem-haml>=2.0.3:www/rubygem-haml \
+		rubygem-merb-core>=1.1.3:www/rubygem-merb-core
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-merb-helpers/Makefile b/www/rubygem-merb-helpers/Makefile
index e25fee1a57d5..9170ac522925 100644
--- a/www/rubygem-merb-helpers/Makefile
+++ b/www/rubygem-merb-helpers/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Merb plugin containing view helpers
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-merb-core>=1.1.3:${PORTSDIR}/www/rubygem-merb-core
+RUN_DEPENDS=	rubygem-merb-core>=1.1.3:www/rubygem-merb-core
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-merb-param-protection/Makefile b/www/rubygem-merb-param-protection/Makefile
index 0cc389211fc2..fe94e1893f85 100644
--- a/www/rubygem-merb-param-protection/Makefile
+++ b/www/rubygem-merb-param-protection/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Merb plugin that helps protecting sensible parameters
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-merb-core>=1.1.3:${PORTSDIR}/www/rubygem-merb-core
+RUN_DEPENDS=	rubygem-merb-core>=1.1.3:www/rubygem-merb-core
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-nanoc/Makefile b/www/rubygem-nanoc/Makefile
index c23bfbaafe76..4c02b689bf9d 100644
--- a/www/rubygem-nanoc/Makefile
+++ b/www/rubygem-nanoc/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple but flexible static site generator
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-cri>=2.3:${PORTSDIR}/devel/rubygem-cri
+RUN_DEPENDS=	rubygem-cri>=2.3:devel/rubygem-cri
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-nicovideo/Makefile b/www/rubygem-nicovideo/Makefile
index b563311a6843..cfc9304be1c7 100644
--- a/www/rubygem-nicovideo/Makefile
+++ b/www/rubygem-nicovideo/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Scraping NICONICO DOUGA utility for Ruby
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	rubygem-hoe>=1.7.0:${PORTSDIR}/devel/rubygem-hoe \
-		rubygem-json>=1.1.4:${PORTSDIR}/devel/rubygem-json \
-		rubygem-mechanize>=0.9.2:${PORTSDIR}/www/rubygem-mechanize
+RUN_DEPENDS=	rubygem-hoe>=1.7.0:devel/rubygem-hoe \
+		rubygem-json>=1.1.4:devel/rubygem-json \
+		rubygem-mechanize>=0.9.2:www/rubygem-mechanize
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-octopress/Makefile b/www/rubygem-octopress/Makefile
index 6d5049a778b5..c91101a2eb8d 100644
--- a/www/rubygem-octopress/Makefile
+++ b/www/rubygem-octopress/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Static blogging framework leveraging Jekyll
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-jekyll>=2.0:${PORTSDIR}/www/rubygem-jekyll \
-		rubygem-mercenary>=0.3.2:${PORTSDIR}/devel/rubygem-mercenary \
-		rubygem-octopress-deploy>=0:${PORTSDIR}/net/rubygem-octopress-deploy \
-		rubygem-octopress-escape-code>=2.0:${PORTSDIR}/textproc/rubygem-octopress-escape-code \
-		rubygem-octopress-hooks>=2.0:${PORTSDIR}/devel/rubygem-octopress-hooks \
-		rubygem-redcarpet>=3.0:${PORTSDIR}/textproc/rubygem-redcarpet \
-		rubygem-titlecase>=0:${PORTSDIR}/devel/rubygem-titlecase
+RUN_DEPENDS=	rubygem-jekyll>=2.0:www/rubygem-jekyll \
+		rubygem-mercenary>=0.3.2:devel/rubygem-mercenary \
+		rubygem-octopress-deploy>=0:net/rubygem-octopress-deploy \
+		rubygem-octopress-escape-code>=2.0:textproc/rubygem-octopress-escape-code \
+		rubygem-octopress-hooks>=2.0:devel/rubygem-octopress-hooks \
+		rubygem-redcarpet>=3.0:textproc/rubygem-redcarpet \
+		rubygem-titlecase>=0:devel/rubygem-titlecase
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-pagerduty/Makefile b/www/rubygem-pagerduty/Makefile
index 4cee5901fb17..ebb9b4153a5d 100644
--- a/www/rubygem-pagerduty/Makefile
+++ b/www/rubygem-pagerduty/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lightweight interface for calling the PagerDuty Integration API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-json>=1.7.7:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=1.7.7:devel/rubygem-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 4d4d051135b5..603220e8aae1 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -34,9 +34,9 @@ RUBYGEM_AUTOPLIST=	yes
 USE_APACHE=	22+
 .endif
 
-LIB_DEPENDS+=	libuv.so:${PORTSDIR}/devel/libuv \
-		libcurl.so:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS+= rubygem-rack16>=0:${PORTSDIR}/www/rubygem-rack16
+LIB_DEPENDS+=	libuv.so:devel/libuv \
+		libcurl.so:ftp/curl
+BUILD_DEPENDS+= rubygem-rack16>=0:www/rubygem-rack16
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_LIST+=	GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY}
diff --git a/www/rubygem-pusher-client/Makefile b/www/rubygem-pusher-client/Makefile
index aa3776bb3fbd..76bd9bdb14c0 100644
--- a/www/rubygem-pusher-client/Makefile
+++ b/www/rubygem-pusher-client/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Client for consuming WebSockets from http://pusher.com
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-json>=0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-websocket>=1.0:${PORTSDIR}/www/rubygem-websocket
+RUN_DEPENDS=	rubygem-json>=0:devel/rubygem-json \
+		rubygem-websocket>=1.0:www/rubygem-websocket
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-rabbirack/Makefile b/www/rubygem-rabbirack/Makefile
index 02c13d2364d3..03c8c649ae68 100644
--- a/www/rubygem-rabbirack/Makefile
+++ b/www/rubygem-rabbirack/Makefile
@@ -12,10 +12,10 @@ COMMENT=	RabbiRack is a tool that controls Rabbit by Web browser
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-haml>0:${PORTSDIR}/www/rubygem-haml \
-		rubygem-locale>=2.0.6:${PORTSDIR}/devel/rubygem-locale \
-		rubygem-rabbit>=2.0.0:${PORTSDIR}/misc/rubygem-rabbit \
-		rubygem-sinatra>0:${PORTSDIR}/www/rubygem-sinatra
+RUN_DEPENDS=	rubygem-haml>0:www/rubygem-haml \
+		rubygem-locale>=2.0.6:devel/rubygem-locale \
+		rubygem-rabbit>=2.0.0:misc/rubygem-rabbit \
+		rubygem-sinatra>0:www/rubygem-sinatra
 
 NO_ARCH=	yes
 USES=		gettext
diff --git a/www/rubygem-rack-accept/Makefile b/www/rubygem-rack-accept/Makefile
index b915da9dda8e..7b7a9120f783 100644
--- a/www/rubygem-rack-accept/Makefile
+++ b/www/rubygem-rack-accept/Makefile
@@ -11,7 +11,7 @@ COMMENT=	HTTP Accept* for Ruby/Rack
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=0.4:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=0.4:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rack-attack/Makefile b/www/rubygem-rack-attack/Makefile
index 121768b260a4..9690f172bb86 100644
--- a/www/rubygem-rack-attack/Makefile
+++ b/www/rubygem-rack-attack/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Rack middleware for throttling and blocking abusive requests
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rack-cache/Makefile b/www/rubygem-rack-cache/Makefile
index e008b87a23df..648b05079276 100644
--- a/www/rubygem-rack-cache/Makefile
+++ b/www/rubygem-rack-cache/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Rack middleware to enable HTTP caching
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-rack16>=0.4:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=0.4:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rack-contrib/Makefile b/www/rubygem-rack-contrib/Makefile
index 04dd966e1d32..f1ab14e39544 100644
--- a/www/rubygem-rack-contrib/Makefile
+++ b/www/rubygem-rack-contrib/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Contributed Rack Middleware and Utilities
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-git-version-bump>=0.15:${PORTSDIR}/devel/rubygem-git-version-bump \
-		rubygem-rack16>=1.4:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-git-version-bump>=0.15:devel/rubygem-git-version-bump \
+		rubygem-rack16>=1.4:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rack-mount/Makefile b/www/rubygem-rack-mount/Makefile
index 515a6b76fdeb..d65332aee053 100644
--- a/www/rubygem-rack-mount/Makefile
+++ b/www/rubygem-rack-mount/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Stackable dynamic tree based Rack router
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=1.0.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=1.0.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rack-openid/Makefile b/www/rubygem-rack-openid/Makefile
index eec20b2c51b0..29f9e45df563 100644
--- a/www/rubygem-rack-openid/Makefile
+++ b/www/rubygem-rack-openid/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Provides a more HTTPish API around the ruby-openid library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=1.1.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-ruby-openid>=2.1.8:${PORTSDIR}/net/rubygem-ruby-openid
+RUN_DEPENDS=	rubygem-rack16>=1.1.0:www/rubygem-rack16 \
+		rubygem-ruby-openid>=2.1.8:net/rubygem-ruby-openid
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rack-protection/Makefile b/www/rubygem-rack-protection/Makefile
index 3e7ce9d1d8a0..cc7a7f05944d 100644
--- a/www/rubygem-rack-protection/Makefile
+++ b/www/rubygem-rack-protection/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Collection of Rack middleware to protect against opportunistic attack
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rack-ssl/Makefile b/www/rubygem-rack-ssl/Makefile
index 346d613babb0..75547ebe1508 100644
--- a/www/rubygem-rack-ssl/Makefile
+++ b/www/rubygem-rack-ssl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Rack middleware to force SSL/TLS
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rack-test/Makefile b/www/rubygem-rack-test/Makefile
index f7646e6b15af..df03a28f2b78 100644
--- a/www/rubygem-rack-test/Makefile
+++ b/www/rubygem-rack-test/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Small, simple testing API for Rack apps
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=1.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index c2d06d10c1a3..486a905a9c4b 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -11,29 +11,29 @@ COMMENT=	MVC web application framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-actionmailer>=${PORTVERSION}:${PORTSDIR}/mail/rubygem-actionmailer \
-		rubygem-actionpack>=${PORTVERSION}:${PORTSDIR}/www/rubygem-actionpack \
-		rubygem-activerecord>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activerecord \
-		rubygem-activeresource>=${PORTVERSION}:${PORTSDIR}/www/rubygem-activeresource \
-		rubygem-activesupport>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-bundler>=1.0:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-railties>=${PORTVERSION}:${PORTSDIR}/www/rubygem-railties \
-		rubygem-builder>=3.0.4:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-coffee-rails>=3.2.2:${PORTSDIR}/devel/rubygem-coffee-rails \
-		rubygem-i18n>=0.6.1:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-jquery-rails>=3.1.0:${PORTSDIR}/www/rubygem-jquery-rails \
-		rubygem-json>=1.7.6:${PORTSDIR}/devel/rubygem-json \
-		rubygem-sprockets22>=2.2.2:${PORTSDIR}/devel/rubygem-sprockets22 \
-		rubygem-rack>=1.4.4:${PORTSDIR}/www/rubygem-rack \
-		rubygem-rdoc3>=3.4:${PORTSDIR}/devel/rubygem-rdoc3 \
-		rubygem-rack-test>=0.6.1:${PORTSDIR}/www/rubygem-rack-test \
-		rubygem-rake>=10.1.1:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-sass-rails>=3.2.6:${PORTSDIR}/textproc/rubygem-sass-rails \
-		rubygem-sqlite3>=1.3.9:${PORTSDIR}/databases/rubygem-sqlite3 \
-		rubygem-treetop>=1.4.15:${PORTSDIR}/devel/rubygem-treetop \
-		rubygem-turn>=0.8.3:${PORTSDIR}/devel/rubygem-turn \
-		rubygem-tzinfo03>=0.3.39:${PORTSDIR}/devel/rubygem-tzinfo03 \
-		rubygem-uglifier>=2.5.0:${PORTSDIR}/www/rubygem-uglifier
+RUN_DEPENDS=	rubygem-actionmailer>=${PORTVERSION}:mail/rubygem-actionmailer \
+		rubygem-actionpack>=${PORTVERSION}:www/rubygem-actionpack \
+		rubygem-activerecord>=${PORTVERSION}:databases/rubygem-activerecord \
+		rubygem-activeresource>=${PORTVERSION}:www/rubygem-activeresource \
+		rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \
+		rubygem-bundler>=1.0:sysutils/rubygem-bundler \
+		rubygem-railties>=${PORTVERSION}:www/rubygem-railties \
+		rubygem-builder>=3.0.4:devel/rubygem-builder \
+		rubygem-coffee-rails>=3.2.2:devel/rubygem-coffee-rails \
+		rubygem-i18n>=0.6.1:devel/rubygem-i18n \
+		rubygem-jquery-rails>=3.1.0:www/rubygem-jquery-rails \
+		rubygem-json>=1.7.6:devel/rubygem-json \
+		rubygem-sprockets22>=2.2.2:devel/rubygem-sprockets22 \
+		rubygem-rack>=1.4.4:www/rubygem-rack \
+		rubygem-rdoc3>=3.4:devel/rubygem-rdoc3 \
+		rubygem-rack-test>=0.6.1:www/rubygem-rack-test \
+		rubygem-rake>=10.1.1:devel/rubygem-rake \
+		rubygem-sass-rails>=3.2.6:textproc/rubygem-sass-rails \
+		rubygem-sqlite3>=1.3.9:databases/rubygem-sqlite3 \
+		rubygem-treetop>=1.4.15:devel/rubygem-treetop \
+		rubygem-turn>=0.8.3:devel/rubygem-turn \
+		rubygem-tzinfo03>=0.3.39:devel/rubygem-tzinfo03 \
+		rubygem-uglifier>=2.5.0:www/rubygem-uglifier
 
 # XXX: rails3 gem no longer has a lib/ dir
 # XXX: which breaks devel/ruby-gems specification.
@@ -57,7 +57,7 @@ OPTIONS_DEFINE=	PASSENGER MEMCACHE_CLIENT
 PASSENGER_DESC=	Passenger backend
 MEMCACHE_CLIENT_DESC=	MemCache-Client support
 
-MEMCACHE_CLIENT_RUN_DEPENDS=	rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client
-PASSENGER_RUN_DEPENDS=	rubygem-passenger>=2.2.15:${PORTSDIR}/www/rubygem-passenger
+MEMCACHE_CLIENT_RUN_DEPENDS=	rubygem-memcache-client>=1.2.0:databases/rubygem-memcache-client
+PASSENGER_RUN_DEPENDS=	rubygem-passenger>=2.2.15:www/rubygem-passenger
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-rails4/Makefile b/www/rubygem-rails4/Makefile
index ee74e43bd210..9e91bedc6cc5 100644
--- a/www/rubygem-rails4/Makefile
+++ b/www/rubygem-rails4/Makefile
@@ -12,35 +12,35 @@ COMMENT=	MVC web application framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-actionmailer4>=${PORTVERSION}:${PORTSDIR}/mail/rubygem-actionmailer4 \
-		rubygem-actionpack4>=${PORTVERSION}:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-actionview>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-actionview \
-		rubygem-activejob>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activejob \
-		rubygem-activemodel4>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-activerecord4>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-activeresource4>=4.0.0:${PORTSDIR}/www/rubygem-activeresource4 \
-		rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-builder32>=3.2.2:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-bundler>=1.3.0:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-byebug>=5.0.0:${PORTSDIR}/devel/rubygem-byebug \
-		rubygem-coffee-rails4>=4.0.1:${PORTSDIR}/devel/rubygem-coffee-rails4 \
-		rubygem-execjs>=2.2.1:${PORTSDIR}/devel/rubygem-execjs \
-		rubygem-jbuilder>=2.1.3:${PORTSDIR}/devel/rubygem-jbuilder \
-		rubygem-jquery-rails4>=3.1.2:${PORTSDIR}/www/rubygem-jquery-rails4 \
-		rubygem-railties4>=${PORTVERSION}:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-rake>=10.1.1:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rdoc>=4.0.2:${PORTSDIR}/devel/rubygem-rdoc \
-		rubygem-sass>=3.4.1:${PORTSDIR}/textproc/rubygem-sass \
-		rubygem-sass-rails5>=5.0.3:${PORTSDIR}/textproc/rubygem-sass-rails5 \
-		rubygem-sdoc>=0.4.1:${PORTSDIR}/devel/rubygem-sdoc \
-		rubygem-spring>=1.1.3:${PORTSDIR}/devel/rubygem-spring \
-		rubygem-sqlite3>=1.3.9:${PORTSDIR}/databases/rubygem-sqlite3 \
-		rubygem-sprockets3>=3.0.3:${PORTSDIR}/devel/rubygem-sprockets3 \
-		rubygem-sprockets-rails>=2.0:${PORTSDIR}/devel/rubygem-sprockets-rails \
-		rubygem-thread_safe>=0.3.4:${PORTSDIR}/devel/rubygem-thread_safe \
-		rubygem-turbolinks>=2.3.0:${PORTSDIR}/www/rubygem-turbolinks \
-		rubygem-uglifier>=2.5.0:${PORTSDIR}/www/rubygem-uglifier \
-		rubygem-web-console>=2.1.2:${PORTSDIR}/devel/rubygem-web-console
+RUN_DEPENDS=	rubygem-actionmailer4>=${PORTVERSION}:mail/rubygem-actionmailer4 \
+		rubygem-actionpack4>=${PORTVERSION}:www/rubygem-actionpack4 \
+		rubygem-actionview>=${PORTVERSION}:devel/rubygem-actionview \
+		rubygem-activejob>=${PORTVERSION}:devel/rubygem-activejob \
+		rubygem-activemodel4>=${PORTVERSION}:databases/rubygem-activemodel4 \
+		rubygem-activerecord4>=${PORTVERSION}:databases/rubygem-activerecord4 \
+		rubygem-activeresource4>=4.0.0:www/rubygem-activeresource4 \
+		rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-builder32>=3.2.2:devel/rubygem-builder32 \
+		rubygem-bundler>=1.3.0:sysutils/rubygem-bundler \
+		rubygem-byebug>=5.0.0:devel/rubygem-byebug \
+		rubygem-coffee-rails4>=4.0.1:devel/rubygem-coffee-rails4 \
+		rubygem-execjs>=2.2.1:devel/rubygem-execjs \
+		rubygem-jbuilder>=2.1.3:devel/rubygem-jbuilder \
+		rubygem-jquery-rails4>=3.1.2:www/rubygem-jquery-rails4 \
+		rubygem-railties4>=${PORTVERSION}:www/rubygem-railties4 \
+		rubygem-rake>=10.1.1:devel/rubygem-rake \
+		rubygem-rdoc>=4.0.2:devel/rubygem-rdoc \
+		rubygem-sass>=3.4.1:textproc/rubygem-sass \
+		rubygem-sass-rails5>=5.0.3:textproc/rubygem-sass-rails5 \
+		rubygem-sdoc>=0.4.1:devel/rubygem-sdoc \
+		rubygem-spring>=1.1.3:devel/rubygem-spring \
+		rubygem-sqlite3>=1.3.9:databases/rubygem-sqlite3 \
+		rubygem-sprockets3>=3.0.3:devel/rubygem-sprockets3 \
+		rubygem-sprockets-rails>=2.0:devel/rubygem-sprockets-rails \
+		rubygem-thread_safe>=0.3.4:devel/rubygem-thread_safe \
+		rubygem-turbolinks>=2.3.0:www/rubygem-turbolinks \
+		rubygem-uglifier>=2.5.0:www/rubygem-uglifier \
+		rubygem-web-console>=2.1.2:devel/rubygem-web-console
 
 NO_ARCH=	yes
 USE_RUBY=	yes
@@ -55,7 +55,7 @@ OPTIONS_DEFINE=	PASSENGER MEMCACHE_CLIENT
 PASSENGER_DESC=	Passenger backend
 MEMCACHE_CLIENT_DESC=	MemCache-Client support
 
-MEMCACHE_CLIENT_RUN_DEPENDS=	rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client
-PASSENGER_RUN_DEPENDS=	rubygem-passenger>=2.2.15:${PORTSDIR}/www/rubygem-passenger
+MEMCACHE_CLIENT_RUN_DEPENDS=	rubygem-memcache-client>=1.2.0:databases/rubygem-memcache-client
+PASSENGER_RUN_DEPENDS=	rubygem-passenger>=2.2.15:www/rubygem-passenger
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-rails_autolink/Makefile b/www/rubygem-rails_autolink/Makefile
index 7446496cc135..21894e4bb85e 100644
--- a/www/rubygem-rails_autolink/Makefile
+++ b/www/rubygem-rails_autolink/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Extraction of the auto_link method from rails, removed in 3.1
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rails4>=${PORTVERSION}:${PORTSDIR}/www/rubygem-rails4
+RUN_DEPENDS=	rubygem-rails4>=${PORTVERSION}:www/rubygem-rails4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-railties/Makefile b/www/rubygem-railties/Makefile
index a70820182c8a..ca27da4d4a7b 100644
--- a/www/rubygem-railties/Makefile
+++ b/www/rubygem-railties/Makefile
@@ -10,12 +10,12 @@ COMMENT=	Rails internals bootup, plugins, generators, and rake tasks
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-actionpack>=${PORTVERSION}:${PORTSDIR}/www/rubygem-actionpack \
-		rubygem-activesupport>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-rack-ssl>=1.3.2:${PORTSDIR}/www/rubygem-rack-ssl \
-		rubygem-rake>=0.8.7:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rdoc3>=3.4:${PORTSDIR}/devel/rubygem-rdoc3 \
-		rubygem-thor>=0.14.6:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-actionpack>=${PORTVERSION}:www/rubygem-actionpack \
+		rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \
+		rubygem-rack-ssl>=1.3.2:www/rubygem-rack-ssl \
+		rubygem-rake>=0.8.7:devel/rubygem-rake \
+		rubygem-rdoc3>=3.4:devel/rubygem-rdoc3 \
+		rubygem-thor>=0.14.6:devel/rubygem-thor
 
 CONFLICTS_INSTALL=	rubygem-railties4-[0-9]* rubygem-railties41-[0-9]*
 
diff --git a/www/rubygem-railties4/Makefile b/www/rubygem-railties4/Makefile
index 0ec6e5f45b39..5b9bd28b402e 100644
--- a/www/rubygem-railties4/Makefile
+++ b/www/rubygem-railties4/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Rails internals bootup, plugins, generators, and rake tasks
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-actionpack4>=${PORTVERSION}:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-rake>=0.8.7:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-thor>=0.18.1:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-actionpack4>=${PORTVERSION}:www/rubygem-actionpack4 \
+		rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-rake>=0.8.7:devel/rubygem-rake \
+		rubygem-thor>=0.18.1:devel/rubygem-thor
 
 CONFLICTS_INSTALL=	rubygem-railties-[0-9]* rubygem-railties41-[0-9]*
 
diff --git a/www/rubygem-ramaze/Makefile b/www/rubygem-ramaze/Makefile
index 872bd7b60d69..58f48d468069 100644
--- a/www/rubygem-ramaze/Makefile
+++ b/www/rubygem-ramaze/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ramaze is a simple and modular web framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-innate>=2012.12:${PORTSDIR}/www/rubygem-innate \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-innate>=2012.12:www/rubygem-innate \
+		rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-redis-rack/Makefile b/www/rubygem-redis-rack/Makefile
index 8fce902a4734..a94b0afc995a 100644
--- a/www/rubygem-redis-rack/Makefile
+++ b/www/rubygem-redis-rack/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Redis Store for Rack
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-rack16>=1.5:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-redis-store>=1.1.0:${PORTSDIR}/devel/rubygem-redis-store
+RUN_DEPENDS=	rubygem-rack16>=1.5:www/rubygem-rack16 \
+		rubygem-redis-store>=1.1.0:devel/rubygem-redis-store
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-redis-rails/Makefile b/www/rubygem-redis-rails/Makefile
index 233988da23fb..5cfbd7d81eb3 100644
--- a/www/rubygem-redis-rails/Makefile
+++ b/www/rubygem-redis-rails/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Redis for Ruby on Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-redis-actionpack>=4:${PORTSDIR}/databases/rubygem-redis-actionpack \
-		rubygem-redis-activesupport>=4:${PORTSDIR}/devel/rubygem-redis-activesupport \
-		rubygem-redis-store>=1.1.0:${PORTSDIR}/devel/rubygem-redis-store
+RUN_DEPENDS=	rubygem-redis-actionpack>=4:databases/rubygem-redis-actionpack \
+		rubygem-redis-activesupport>=4:devel/rubygem-redis-activesupport \
+		rubygem-redis-store>=1.1.0:devel/rubygem-redis-store
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-redmine_acts_as_taggable_on/Makefile b/www/rubygem-redmine_acts_as_taggable_on/Makefile
index 8c7b555219e4..ae119153fc8e 100644
--- a/www/rubygem-redmine_acts_as_taggable_on/Makefile
+++ b/www/rubygem-redmine_acts_as_taggable_on/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Allows multiple Redmine plugins to use tags safely
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	rubygem-acts-as-taggable-on>=2.3:${PORTSDIR}/www/rubygem-acts-as-taggable-on
+RUN_DEPENDS=	rubygem-acts-as-taggable-on>=2.3:www/rubygem-acts-as-taggable-on
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-responders-rails3/Makefile b/www/rubygem-responders-rails3/Makefile
index c49e447044b6..d642e244cb0f 100644
--- a/www/rubygem-responders-rails3/Makefile
+++ b/www/rubygem-responders-rails3/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple Ruby DSL for making HTTP requests
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-railties>=3.2.0:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-railties>=3.2.0:www/rubygem-railties
 
 PORTSCOUT=	limit:^1\.[0-9]*
 
diff --git a/www/rubygem-responders/Makefile b/www/rubygem-responders/Makefile
index b9c512ae5624..87b1b83999c0 100644
--- a/www/rubygem-responders/Makefile
+++ b/www/rubygem-responders/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple Ruby DSL for making HTTP requests
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-railties4>=4.2.0:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-railties4>=4.2.0:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-rest-client/Makefile b/www/rubygem-rest-client/Makefile
index cc44716097ce..0021c01b6a5b 100644
--- a/www/rubygem-rest-client/Makefile
+++ b/www/rubygem-rest-client/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	RG
 MAINTAINER=	renchap@cocoa-x.com
 COMMENT=	Simple Simple HTTP and REST client for Ruby
 
-RUN_DEPENDS=	rubygem-http-cookie>=1.0.2:${PORTSDIR}/www/rubygem-http-cookie \
-		rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-netrc>=0.7:${PORTSDIR}/net/rubygem-netrc
+RUN_DEPENDS=	rubygem-http-cookie>=1.0.2:www/rubygem-http-cookie \
+		rubygem-mime-types>=1.16:misc/rubygem-mime-types \
+		rubygem-netrc>=0.7:net/rubygem-netrc
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-rfacebook/Makefile b/www/rubygem-rfacebook/Makefile
index 2e3f114fe650..ca01939a9f68 100644
--- a/www/rubygem-rfacebook/Makefile
+++ b/www/rubygem-rfacebook/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby interface to the Facebook API
 
 LICENSE=	BSD4CLAUSE
 
-RUN_DEPENDS=	rubygem-hpricot>=0.6.0:${PORTSDIR}/www/rubygem-hpricot \
-		rubygem-mocha>=0.5.3:${PORTSDIR}/devel/rubygem-mocha
+RUN_DEPENDS=	rubygem-hpricot>=0.6.0:www/rubygem-hpricot \
+		rubygem-mocha>=0.5.3:devel/rubygem-mocha
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-rfeedfinder/Makefile b/www/rubygem-rfeedfinder/Makefile
index e843eede4e6a..4a871fa33186 100644
--- a/www/rubygem-rfeedfinder/Makefile
+++ b/www/rubygem-rfeedfinder/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	RG
 MAINTAINER=	markun@onohara.to
 COMMENT=	Ruby library to find the feed
 
-RUN_DEPENDS=	rubygem-hpricot>=0.6:${PORTSDIR}/www/rubygem-hpricot \
-		rubygem-htmlentities>=4.0.0:${PORTSDIR}/textproc/rubygem-htmlentities \
-		rubygem-hoe>=1.7.0:${PORTSDIR}/devel/rubygem-hoe
+RUN_DEPENDS=	rubygem-hpricot>=0.6:www/rubygem-hpricot \
+		rubygem-htmlentities>=4.0.0:textproc/rubygem-htmlentities \
+		rubygem-hoe>=1.7.0:devel/rubygem-hoe
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-rqrcode-rails3/Makefile b/www/rubygem-rqrcode-rails3/Makefile
index ff6a08eb5f55..041d73b18aed 100644
--- a/www/rubygem-rqrcode-rails3/Makefile
+++ b/www/rubygem-rqrcode-rails3/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Render QR codes with Rails 3
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rqrcode>=0.4.2:${PORTSDIR}/www/rubygem-rqrcode
+RUN_DEPENDS=	rubygem-rqrcode>=0.4.2:www/rubygem-rqrcode
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-ruby-readability/Makefile b/www/rubygem-ruby-readability/Makefile
index b0acb309032f..a9f8bdc6bd2d 100644
--- a/www/rubygem-ruby-readability/Makefile
+++ b/www/rubygem-ruby-readability/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Readability for Ruby
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-guess_html_encoding>=0.0.4:${PORTSDIR}/devel/rubygem-guess_html_encoding \
-		rubygem-nokogiri>=1.6.0:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-guess_html_encoding>=0.0.4:devel/rubygem-guess_html_encoding \
+		rubygem-nokogiri>=1.6.0:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-savon/Makefile b/www/rubygem-savon/Makefile
index 233f40898913..647766bbecbb 100644
--- a/www/rubygem-savon/Makefile
+++ b/www/rubygem-savon/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Library for SOAP communications
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-builder>=2.1.2:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-nori>=1.0.3:${PORTSDIR}/devel/rubygem-nori \
-		rubygem-httpi>=0.9.0:${PORTSDIR}/www/rubygem-httpi \
-		rubygem-wasabi>=1.0.0:${PORTSDIR}/www/rubygem-wasabi \
-		rubygem-akami>=1.0.0:${PORTSDIR}/www/rubygem-akami \
-		rubygem-gyoku>=0.4.6:${PORTSDIR}/devel/rubygem-gyoku \
-		rubygem-nokogiri>=1.6.1:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
+		rubygem-nori>=1.0.3:devel/rubygem-nori \
+		rubygem-httpi>=0.9.0:www/rubygem-httpi \
+		rubygem-wasabi>=1.0.0:www/rubygem-wasabi \
+		rubygem-akami>=1.0.0:www/rubygem-akami \
+		rubygem-gyoku>=0.4.6:devel/rubygem-gyoku \
+		rubygem-nokogiri>=1.6.1:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-sawyer/Makefile b/www/rubygem-sawyer/Makefile
index 6a98ad4e7fdb..dd2a8d6937ce 100644
--- a/www/rubygem-sawyer/Makefile
+++ b/www/rubygem-sawyer/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Secret User Agent of HTTP
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-addressable>=2.3.5:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-faraday>=0.8:${PORTSDIR}/www/rubygem-faraday
+RUN_DEPENDS=	rubygem-addressable>=2.3.5:www/rubygem-addressable \
+		rubygem-faraday>=0.8:www/rubygem-faraday
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-scrapi/Makefile b/www/rubygem-scrapi/Makefile
index 9d38cd2548b3..95fb4ef1eb5d 100644
--- a/www/rubygem-scrapi/Makefile
+++ b/www/rubygem-scrapi/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	RG
 MAINTAINER=	don@na.rim.or.jp
 COMMENT=	ScrAPI toolkit for Ruby
 
-BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/tidy-1.1.2.gemspec:${PORTSDIR}/textproc/rubygem-tidy \
-		tidy:${PORTSDIR}/www/tidy-lib
+BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/tidy-1.1.2.gemspec:textproc/rubygem-tidy \
+		tidy:www/tidy-lib
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-select2-rails/Makefile b/www/rubygem-select2-rails/Makefile
index c64876dfd1d9..2093010f77fa 100644
--- a/www/rubygem-select2-rails/Makefile
+++ b/www/rubygem-select2-rails/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Implement select2 jQuery library into Rails
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-thor>=0.14:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-thor>=0.14:devel/rubygem-thor
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-selenium-webdriver/Makefile b/www/rubygem-selenium-webdriver/Makefile
index b5e6395c3994..a4202f3d7025 100644
--- a/www/rubygem-selenium-webdriver/Makefile
+++ b/www/rubygem-selenium-webdriver/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Tool for writing automated tests of websites
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-childprocess>=0.5:${PORTSDIR}/devel/rubygem-childprocess \
-		rubygem-rubyzip>=1.0:${PORTSDIR}/archivers/rubygem-rubyzip \
-		rubygem-websocket>=1.0:${PORTSDIR}/www/rubygem-websocket
+RUN_DEPENDS=	rubygem-childprocess>=0.5:devel/rubygem-childprocess \
+		rubygem-rubyzip>=1.0:archivers/rubygem-rubyzip \
+		rubygem-websocket>=1.0:www/rubygem-websocket
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-semantic-ui-sass/Makefile b/www/rubygem-semantic-ui-sass/Makefile
index 2f8b287fb905..5cf98511c9f0 100644
--- a/www/rubygem-semantic-ui-sass/Makefile
+++ b/www/rubygem-semantic-ui-sass/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Semantic UI, converted to Sass and ready to drop into Rails & Compass
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-sass>=3.2:${PORTSDIR}/textproc/rubygem-sass
+RUN_DEPENDS=	rubygem-sass>=3.2:textproc/rubygem-sass
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-sinatra-contrib/Makefile b/www/rubygem-sinatra-contrib/Makefile
index 6a07e2b99596..920c19671ada 100644
--- a/www/rubygem-sinatra-contrib/Makefile
+++ b/www/rubygem-sinatra-contrib/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Collection of useful Sinatra extensions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-backports>=2.0:${PORTSDIR}/devel/rubygem-backports \
-		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack-protection>=0:${PORTSDIR}/www/rubygem-rack-protection \
-		rubygem-rack-test>=0:${PORTSDIR}/www/rubygem-rack-test \
-		rubygem-sinatra>=1.4:${PORTSDIR}/www/rubygem-sinatra \
-		rubygem-tilt>=2.0:${PORTSDIR}/devel/rubygem-tilt
+RUN_DEPENDS=	rubygem-backports>=2.0:devel/rubygem-backports \
+		rubygem-multi_json>=0:devel/rubygem-multi_json \
+		rubygem-rack-protection>=0:www/rubygem-rack-protection \
+		rubygem-rack-test>=0:www/rubygem-rack-test \
+		rubygem-sinatra>=1.4:www/rubygem-sinatra \
+		rubygem-tilt>=2.0:devel/rubygem-tilt
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-sinatra-r18n/Makefile b/www/rubygem-sinatra-r18n/Makefile
index a33db2aee5e1..669ccfba9a21 100644
--- a/www/rubygem-sinatra-r18n/Makefile
+++ b/www/rubygem-sinatra-r18n/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Sinatra extension that provides i18n support to your web application
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-r18n-core=${PORTVERSION}:${PORTSDIR}/devel/rubygem-r18n-core \
-		rubygem-sinatra>=1.3:${PORTSDIR}/www/rubygem-sinatra
+RUN_DEPENDS=	rubygem-r18n-core=${PORTVERSION}:devel/rubygem-r18n-core \
+		rubygem-sinatra>=1.3:www/rubygem-sinatra
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-sinatra-respond_to/Makefile b/www/rubygem-sinatra-respond_to/Makefile
index d0eeabc0d733..821740cbce20 100644
--- a/www/rubygem-sinatra-respond_to/Makefile
+++ b/www/rubygem-sinatra-respond_to/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Respond_to style Rails block for Sinatra
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-sinatra>=1.3:${PORTSDIR}/www/rubygem-sinatra
+RUN_DEPENDS=	rubygem-sinatra>=1.3:www/rubygem-sinatra
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-sinatra/Makefile b/www/rubygem-sinatra/Makefile
index bdba46ecbb2a..301591499a56 100644
--- a/www/rubygem-sinatra/Makefile
+++ b/www/rubygem-sinatra/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Classy web development framework in ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=1.5:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-rack-protection>=1.4:${PORTSDIR}/www/rubygem-rack-protection \
-		rubygem-tilt>=1.3:${PORTSDIR}/devel/rubygem-tilt
+RUN_DEPENDS=	rubygem-rack16>=1.5:www/rubygem-rack16 \
+		rubygem-rack-protection>=1.4:www/rubygem-rack-protection \
+		rubygem-tilt>=1.3:devel/rubygem-tilt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-task_list/Makefile b/www/rubygem-task_list/Makefile
index f5b723ab6f62..850fb4d22171 100644
--- a/www/rubygem-task_list/Makefile
+++ b/www/rubygem-task_list/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GitHub-flavored-Markdown TaskList components
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-html-pipeline1>=0:${PORTSDIR}/textproc/rubygem-html-pipeline1
+RUN_DEPENDS=	rubygem-html-pipeline1>=0:textproc/rubygem-html-pipeline1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-thin/Makefile b/www/rubygem-thin/Makefile
index bf7de7bb63c5..f3d8fd49b4ca 100644
--- a/www/rubygem-thin/Makefile
+++ b/www/rubygem-thin/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Fast and simple Ruby web server
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-daemons>=1.0.9:${PORTSDIR}/devel/rubygem-daemons \
-		rubygem-eventmachine>=1.0.4:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-daemons>=1.0.9:devel/rubygem-daemons \
+		rubygem-eventmachine>=1.0.4:devel/rubygem-eventmachine \
+		rubygem-rack16>=1.0:www/rubygem-rack16
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-tinyatom/Makefile b/www/rubygem-tinyatom/Makefile
index 09d40a1aa224..e239957e73c8 100644
--- a/www/rubygem-tinyatom/Makefile
+++ b/www/rubygem-tinyatom/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Small and easy to use ruby Atom feed generator
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-public_suffix>=0:${PORTSDIR}/dns/rubygem-public_suffix
+RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-public_suffix>=0:dns/rubygem-public_suffix
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-tinymce-rails/Makefile b/www/rubygem-tinymce-rails/Makefile
index 651720d67e3a..1d9be5082fd1 100644
--- a/www/rubygem-tinymce-rails/Makefile
+++ b/www/rubygem-tinymce-rails/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Seamlessly integrates TinyMCE into the Rails asset pipeline
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-railties>=3.1.1:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-railties>=3.1.1:www/rubygem-railties
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-tumblr_client/Makefile b/www/rubygem-tumblr_client/Makefile
index 8f3fcdbbfe73..ebfdbb4c2f10 100644
--- a/www/rubygem-tumblr_client/Makefile
+++ b/www/rubygem-tumblr_client/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Ruby Wrapper for the Tumblr v2 API
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-faraday>=0.9.0:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-faraday_middleware>=0.9.1:${PORTSDIR}/www/rubygem-faraday_middleware \
-		rubygem-json>0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-mime-types>0:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-oauth>0:${PORTSDIR}/net/rubygem-oauth \
-		rubygem-simple_oauth>0:${PORTSDIR}/net/rubygem-simple_oauth
+RUN_DEPENDS=	rubygem-faraday>=0.9.0:www/rubygem-faraday \
+		rubygem-faraday_middleware>=0.9.1:www/rubygem-faraday_middleware \
+		rubygem-json>0:devel/rubygem-json \
+		rubygem-mime-types>0:misc/rubygem-mime-types \
+		rubygem-oauth>0:net/rubygem-oauth \
+		rubygem-simple_oauth>0:net/rubygem-simple_oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-turbolinks/Makefile b/www/rubygem-turbolinks/Makefile
index 2c28193b684c..06d23aa58849 100644
--- a/www/rubygem-turbolinks/Makefile
+++ b/www/rubygem-turbolinks/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Turbolinks makes following links in your web application faster
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS?=	rubygem-coffee-rails4>=4.0.1:${PORTSDIR}/devel/rubygem-coffee-rails4
+RUN_DEPENDS?=	rubygem-coffee-rails4>=4.0.1:devel/rubygem-coffee-rails4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-typhoeus/Makefile b/www/rubygem-typhoeus/Makefile
index e772ebe118ad..0124e60acaea 100644
--- a/www/rubygem-typhoeus/Makefile
+++ b/www/rubygem-typhoeus/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Parallel HTTP request library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-ethon>=0.8.0:${PORTSDIR}/www/rubygem-ethon
+RUN_DEPENDS=	rubygem-ethon>=0.8.0:www/rubygem-ethon
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-uglifier/Makefile b/www/rubygem-uglifier/Makefile
index a683718eed57..2969e169153f 100644
--- a/www/rubygem-uglifier/Makefile
+++ b/www/rubygem-uglifier/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby wrapper for UglifyJS JavaScript compressor
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-execjs>=0.3.0:${PORTSDIR}/devel/rubygem-execjs
+RUN_DEPENDS=	rubygem-execjs>=0.3.0:devel/rubygem-execjs
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-url-mount/Makefile b/www/rubygem-url-mount/Makefile
index 749700dc73f5..db04ceddd351 100644
--- a/www/rubygem-url-mount/Makefile
+++ b/www/rubygem-url-mount/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	rodnic@gmail.com
 COMMENT=	Glue to allow mounted rack applications to know where they're mounted
 
-RUN_DEPENDS=	rubygem-rack>=0:${PORTSDIR}/www/rubygem-rack
+RUN_DEPENDS=	rubygem-rack>=0:www/rubygem-rack
 
 NO_ARCH=	yes
 
diff --git a/www/rubygem-wasabi/Makefile b/www/rubygem-wasabi/Makefile
index 5e9ff1917b7a..b52bc6921c43 100644
--- a/www/rubygem-wasabi/Makefile
+++ b/www/rubygem-wasabi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for simple WSDL parsing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.6.1:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-nokogiri>=1.6.1:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-webkit-gtk/Makefile b/www/rubygem-webkit-gtk/Makefile
index 96094dac3822..52c47d030274 100644
--- a/www/rubygem-webkit-gtk/Makefile
+++ b/www/rubygem-webkit-gtk/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Ruby/WebKitGTK is a Ruby binding of WebKitGTK+
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
-RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection \
-		rubygem-gtk3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk3
+LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
+RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
+		rubygem-gtk3>=${PORTVERSION}:x11-toolkits/rubygem-gtk3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-webkit-gtk2/Makefile b/www/rubygem-webkit-gtk2/Makefile
index e98b6d8abd89..a44ed93dcb21 100644
--- a/www/rubygem-webkit-gtk2/Makefile
+++ b/www/rubygem-webkit-gtk2/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Ruby/WebKitGtk2 is a Ruby binding of WebKitGTK+ for Gtk 2.0 Toolkit
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
-RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection \
-		rubygem-gtk2>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
+RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
+		rubygem-gtk2>=${PORTVERSION}:x11-toolkits/rubygem-gtk2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-webmock/Makefile b/www/rubygem-webmock/Makefile
index 269742ca87cc..0b4015805d19 100644
--- a/www/rubygem-webmock/Makefile
+++ b/www/rubygem-webmock/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Allows stubbing HTTP requests and setting expectations on the requests
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3.6:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-crack>=0.3.2:${PORTSDIR}/devel/rubygem-crack \
-		rubygem-hashdiff>=0:${PORTSDIR}/devel/rubygem-hashdiff
+RUN_DEPENDS=	rubygem-addressable>=2.3.6:www/rubygem-addressable \
+		rubygem-crack>=0.3.2:devel/rubygem-crack \
+		rubygem-hashdiff>=0:devel/rubygem-hashdiff
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/rubygem-yapra/Makefile b/www/rubygem-yapra/Makefile
index 172ec6f37178..69f534978a4e 100644
--- a/www/rubygem-yapra/Makefile
+++ b/www/rubygem-yapra/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Yet Another Pragger implementation
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-mechanize>=0:${PORTSDIR}/www/rubygem-mechanize
+RUN_DEPENDS=	rubygem-mechanize>=0:www/rubygem-mechanize
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/www/sahi/Makefile b/www/sahi/Makefile
index 83d49659cff6..7d45117fd870 100644
--- a/www/sahi/Makefile
+++ b/www/sahi/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Web automation and testing tool
 LICENSE=	APACHE20 MPL
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
@@ -84,17 +84,17 @@ post-install:
 
 .if ${PORT_OPTIONS:MCHROME}
 BROWSER=	chrome
-RUN_DEPENDS+=	chrome:${PORTSDIR}/www/chromium
+RUN_DEPENDS+=	chrome:www/chromium
 .endif
 
 .if ${PORT_OPTIONS:MFIREFOX}
 BROWSER=	firefox
-RUN_DEPENDS+=	firefox:${PORTSDIR}/www/firefox
+RUN_DEPENDS+=	firefox:www/firefox
 .endif
 
 .if ${PORT_OPTIONS:MOPERA}
 BROWSER=	opera
-RUN_DEPENDS+=	opera:${PORTSDIR}/www/opera
+RUN_DEPENDS+=	opera:www/opera
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/sakai/Makefile b/www/sakai/Makefile
index 0f0313abb09e..fbd7b8b3c0de 100644
--- a/www/sakai/Makefile
+++ b/www/sakai/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	Educational Community License version 2
 LICENSE_FILE=	${WRKDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:www/tomcat7
 
 IGNORE=		does not work correctly
 
diff --git a/www/samidare/Makefile b/www/samidare/Makefile
index b9320f637a9b..2e832c84b969 100644
--- a/www/samidare/Makefile
+++ b/www/samidare/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Web page update checker written in Ruby
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/htree.rb:${PORTSDIR}/textproc/ruby-htree
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/htree.rb:textproc/ruby-htree
 
 USES=	gmake
 USE_RUBY=	yes
diff --git a/www/sams2/Makefile b/www/sams2/Makefile
index 08f0155b342b..daaf45c78dde 100644
--- a/www/sams2/Makefile
+++ b/www/sams2/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Squid Accounting Management System
 
 LICENSE=	BSD4CLAUSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER}
+LIB_DEPENDS=	libpcre.so:devel/pcre
+RUN_DEPENDS=	${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
 
 USES=		autoreconf gmake libtool tar:bzip2
 USE_LDCONFIG=	yes
@@ -36,10 +36,10 @@ APACHE_USE=	APACHE=22+
 
 .if ${PORT_OPTIONS:MAPACHE}
 .  if ${PHP_VER} == "54" && (${APACHE_VERSION} >= 24)
-RUN_DEPENDS+=	mod_php5>=0:${PORTSDIR}/www/mod_php5
+RUN_DEPENDS+=	mod_php5>=0:www/mod_php5
 .  endif
 .  if ${PHP_VER} == "55" && (${APACHE_VERSION} >= 24)
-RUN_DEPENDS+=	mod_php55>=0:${PORTSDIR}/www/mod_php55
+RUN_DEPENDS+=	mod_php55>=0:www/mod_php55
 .  endif
 .  if ${APACHE_VERSION} >= 24
 AP24=		""
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 23b846fa94e0..6fcfc67bab9b 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -30,11 +30,11 @@ NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_LIBS=		-lintl
 GD_CONFIGURE_WITH=	gd
-GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
+GD_LIB_DEPENDS=		libgd.so:graphics/gd
 PHP_CONFIGURE_ON=	--enable-sargphp="${ETCDIR}"
 PHP_CONFIGURE_OFF=	--disable-sargphp
 PCRE_CONFIGURE_WITH=	pcre
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 LDAP_USE=		USE_OPENLDAP=yes
 LDAP_CONFIGURE_WITH=	ldap
 ICONV_USES=		iconv
diff --git a/www/seahub/Makefile b/www/seahub/Makefile
index 77cec06ac5df..b853d793e83a 100644
--- a/www/seahub/Makefile
+++ b/www/seahub/Makefile
@@ -39,8 +39,8 @@ COMMENT=	Web frontend for Seafile
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${LOCALBASE}/www/haiwen/seafile-server/seafile/bin/seaf-server:${PORTSDIR}/net-mgmt/seafile \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${LOCALBASE}/www/haiwen/seafile-server/seafile/bin/seaf-server:net-mgmt/seafile \
+		bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
@@ -59,10 +59,10 @@ SEAFDAV_DESC=		Enable Seafile WsgiDav-based support
 SITEPACKAGES_DESC=	Install python packages under thirdpart directory
 
 SEAFOBJ_CONFIGURE_WITH=	seafobj
-SEAFOBJ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}seafobj>0:${PORTSDIR}/www/py-seafobj
+SEAFOBJ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}seafobj>0:www/py-seafobj
 
 SEAFDAV_CONFIGURE_WITH=	seafdav
-SEAFDAV_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}seafdav>0:${PORTSDIR}/www/py-seafdav
+SEAFDAV_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}seafdav>0:www/py-seafdav
 
 NLS_USES=		gettext iconv
 NLS_CONFIGURE_OFF=	--disable-nls
diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile
index b568b70719f3..335bd14802bf 100644
--- a/www/seamonkey-i18n/Makefile
+++ b/www/seamonkey-i18n/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	xpi/${DISTNAME}
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Localized interface for SeaMonkey
 
-EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+EXTRACT_DEPENDS=	zip:archivers/zip
 
 USES=		zip:infozip gecko:seamonkey,build
 USE_XPI=	seamonkey linux-seamonkey
@@ -32,7 +32,7 @@ PLISTF?=	${WRKDIR}/plist_files
 .include <bsd.port.pre.mk>
 
 .ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
+RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:www/xpi-quick-locale-switcher
 .endif
 
 .include "${.CURDIR}/Makefile.lang"
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 2e7ba4a76249..cf96eab9afb7 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -14,24 +14,24 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-BUILD_DEPENDS=	nspr>=4.10.10:${PORTSDIR}/devel/nspr \
-		nss>=3.19.4:${PORTSDIR}/security/nss \
-		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
-		harfbuzz>=0.9.42:${PORTSDIR}/print/harfbuzz \
-		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
-		libvorbis>=1.3.5,3:${PORTSDIR}/audio/libvorbis \
-		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
-		sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
-		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
-		yasm:${PORTSDIR}/devel/yasm \
-		zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
-#		opus>=1.1:${PORTSDIR}/audio/opus \
-
-LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS=	nspr>=4.10.10:devel/nspr \
+		nss>=3.19.4:security/nss \
+		libevent2>=2.0.21_2:devel/libevent2 \
+		soundtouch>=1.8.0:audio/soundtouch \
+		harfbuzz>=0.9.42:print/harfbuzz \
+		graphite2>=1.2.4:graphics/graphite2 \
+		libvorbis>=1.3.5,3:audio/libvorbis \
+		libvpx>=1.3.0:multimedia/libvpx \
+		sqlite3>=3.8.9:databases/sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		v4l_compat>0:multimedia/v4l_compat \
+		autoconf-2.13:devel/autoconf213 \
+		yasm:devel/yasm \
+		zip:archivers/zip \
+		unzip:archivers/unzip
+#		opus>=1.1:audio/opus \
+
+LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 EM_VERSION=	1.9.1
 L_VERSION=	4.4
@@ -88,7 +88,7 @@ MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
 .if ${PORT_OPTIONS:MENIGMAIL}
 MASTER_SITES+=	https://www.enigmail.net/download/source/:enigmail
 DISTFILES+=	${EM_DISTFILE}:enigmail
-RUN_DEPENDS+=	gpg2:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+=	gpg2:security/gnupg
 EM_DISTNAME=	enigmail-${EM_VERSION}
 EM_DISTFILE=	${EM_DISTNAME}.tar.gz
 EM_XPI_FILE=	${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}.xpi
diff --git a/www/serendipity/Makefile b/www/serendipity/Makefile
index f7979739d6af..3e0ca817076b 100644
--- a/www/serendipity/Makefile
+++ b/www/serendipity/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PHP based weblog software
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/docs/LICENSE
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/File/Archive.php:${PORTSDIR}/archivers/pear-File_Archive
+RUN_DEPENDS=	${LOCALBASE}/share/pear/File/Archive.php:archivers/pear-File_Archive
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
@@ -41,7 +41,7 @@ USE_PHP+=	sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MMAGICK}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/serf/Makefile b/www/serf/Makefile
index e44d96e5b525..cdada4419e56 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Serf HTTP client library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+=	libapr-1.so:devel/apr1
 
 USES=		scons tar:bzip2 cpe
 USE_OPENSSL=	yes
@@ -26,8 +26,8 @@ OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 MIT_DESC=		MIT Kerberos (security/krb5)
-MIT_LIB_DEPENDS=	libkrb5.so.3:${PORTSDIR}/security/krb5
-HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:${PORTSDIR}/security/heimdal
+MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
+HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
 
 SCONS_ARGS=	APR=${LOCALBASE}/bin/apr-1-config
 SCONS_ARGS+=	APU=${LOCALBASE}/bin/apu-1-config
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index d399511d546e..97be9d7826ec 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.manyfish.co.uk/${PORTNAME}/ \
 MAINTAINER=	sitecopy@oldach.net
 COMMENT=	Maintains remote websites, uses FTP or WebDAV to sync up w/ local copy
 
-LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libneon.so:www/neon
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/www/siteframe/Makefile b/www/siteframe/Makefile
index 1c59f7310176..8858eda70593 100644
--- a/www/siteframe/Makefile
+++ b/www/siteframe/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Web community content management system in PHP5 and MySQL
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	${LOCALBASE}/share/smarty/Smarty.class.php:${PORTSDIR}/www/smarty2
+RUN_DEPENDS=	${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2
 
 USE_APACHE_RUN=	22+
 USE_PHP=	mysqli simplexml xml session gd
diff --git a/www/slowcgi/Makefile b/www/slowcgi/Makefile
index 0b1fcb415e29..a7f46356e0b2 100644
--- a/www/slowcgi/Makefile
+++ b/www/slowcgi/Makefile
@@ -9,7 +9,7 @@ COMMENT=	FastCGI interface for old CGI programs
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/usr.sbin/${GH_PROJECT}
 
diff --git a/www/smb_auth/Makefile b/www/smb_auth/Makefile
index 644dcb60ac04..257e1f1abff4 100644
--- a/www/smb_auth/Makefile
+++ b/www/smb_auth/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Proxy authentication module against an SMB server
 
 .if !defined(WITHOUT_REGISTER_SAMBA)
-RUN_DEPENDS=	${LOCALBASE}/sbin/smbd:${PORTSDIR}/${SAMBA_PORT}
+RUN_DEPENDS=	${LOCALBASE}/sbin/smbd:${SAMBA_PORT}
 .endif
 
 ALL_TARGET=	smb_auth
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
index bc33bc256e9f..582f7685f1ea 100644
--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@@ -13,16 +13,16 @@ COMMENT=		Groupware server with a focus on scalability and open standards
 
 LICENSE=		GPLv2
 
-LIB_DEPENDS=		libmemcached.so:${PORTSDIR}/databases/libmemcached \
-			libcurl.so:${PORTSDIR}/ftp/curl \
-			libDOM.so:${PORTSDIR}/devel/sope
+LIB_DEPENDS=		libmemcached.so:databases/libmemcached \
+			libcurl.so:ftp/curl \
+			libDOM.so:devel/sope
 
 OPTIONS_DEFINE=		ACTIVESYNC
 OPTIONS_SUB=		yes
 
 ACTIVESYNC_DESC=	Enable support for ActiveSync protocol
 
-ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
+ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 
 USERS=			sogod
 GROUPS=			sogod
diff --git a/www/sogo3/Makefile b/www/sogo3/Makefile
index a7c11506f9c7..d69821f62bc1 100644
--- a/www/sogo3/Makefile
+++ b/www/sogo3/Makefile
@@ -12,17 +12,17 @@ COMMENT=		Groupware server with a focus on scalability and open standards
 
 LICENSE=		GPLv2
 
-LIB_DEPENDS=		libmemcached.so:${PORTSDIR}/databases/libmemcached \
-			libcurl.so:${PORTSDIR}/ftp/curl \
-			libDOM.so:${PORTSDIR}/devel/sope3
-RUN_DEPENDS=		zip:${PORTSDIR}/archivers/zip
+LIB_DEPENDS=		libmemcached.so:databases/libmemcached \
+			libcurl.so:ftp/curl \
+			libDOM.so:devel/sope3
+RUN_DEPENDS=		zip:archivers/zip
 
 OPTIONS_DEFINE=		ACTIVESYNC
 OPTIONS_SUB=		yes
 
 ACTIVESYNC_DESC=	Enable support for ActiveSync protocol
 
-ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
+ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 
 USERS=			sogod
 GROUPS=			sogod
diff --git a/www/spdylay/Makefile b/www/spdylay/Makefile
index e6b9e006ac78..de8f937cc4ed 100644
--- a/www/spdylay/Makefile
+++ b/www/spdylay/Makefile
@@ -13,9 +13,9 @@ COMMENT=	SPDY protocol version 2, 3 and 3.1 implementation in C
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	libevent2>=2.0.8:${PORTSDIR}/devel/libevent2
-LIB_DEPENDS=	libevent_openssl.so:${PORTSDIR}/devel/libevent2
-RUN_DEPENDS=	libevent2>=2.0.8:${PORTSDIR}/devel/libevent2
+BUILD_DEPENDS=	libevent2>=2.0.8:devel/libevent2
+LIB_DEPENDS=	libevent_openssl.so:devel/libevent2
+RUN_DEPENDS=	libevent2>=2.0.8:devel/libevent2
 
 CONFIGURE_ARGS=	--enable-examples \
 		--enable-src
diff --git a/www/spreadlogd/Makefile b/www/spreadlogd/Makefile
index 29cf524060f7..13f8f3e31c9e 100644
--- a/www/spreadlogd/Makefile
+++ b/www/spreadlogd/Makefile
@@ -11,7 +11,7 @@ COMMENT=	The backend of mod_log_spread
 
 LICENSE=	ART10
 
-LIB_DEPENDS=	libspread.so:${PORTSDIR}/net/spread
+LIB_DEPENDS=	libspread.so:net/spread
 
 MAKEFILE=	makefile
 
diff --git a/www/squid/Makefile b/www/squid/Makefile
index e5886bc9bb47..6aff3d59567b 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -81,22 +81,22 @@ AUTH_LDAP_USE=			OPENLDAP=yes
 AUTH_SASL_CFLAGS=		-I${LOCALBASE}/include
 AUTH_SASL_CPPFLAGS=		-I${LOCALBASE}/include
 AUTH_SASL_LDFLAGS=		-L${LOCALBASE}/lib
-AUTH_SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-AUTH_SMB3_RUN_DEPENDS=		smbclient:${PORTSDIR}/net/samba36
-AUTH_SMB4_RUN_DEPENDS=		smbclient:${PORTSDIR}/net/samba42
-AUTH_SQL_RUN_DEPENDS=		p5-DBI>=1.08:${PORTSDIR}/databases/p5-DBI
+AUTH_SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
+AUTH_SMB3_RUN_DEPENDS=		smbclient:net/samba36
+AUTH_SMB4_RUN_DEPENDS=		smbclient:net/samba42
+AUTH_SQL_RUN_DEPENDS=		p5-DBI>=1.08:databases/p5-DBI
 CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
 DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
 ECAP_CFLAGS=			-I${LOCALBASE}/include
 ECAP_CONFIGURE_ENABLE=		ecap
 ECAP_LDFLAGS=			-L${LOCALBASE}/lib
-ECAP_LIB_DEPENDS=		libecap.so:${PORTSDIR}/www/libecap
+ECAP_LIB_DEPENDS=		libecap.so:www/libecap
 ECAP_USES=			pkgconfig:build
 ESI_CFLAGS=			-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 ESI_CONFIGURE_ENABLE=		esi
 ESI_LDFLAGS=			-L${LOCALBASE}/lib
-ESI_LIB_DEPENDS=		libexpat.so:${PORTSDIR}/textproc/expat2 \
-				libxml2.so:${PORTSDIR}/textproc/libxml2
+ESI_LIB_DEPENDS=		libexpat.so:textproc/expat2 \
+				libxml2.so:textproc/libxml2
 FOLLOW_XFF_CONFIGURE_ENABLE=	follow-x-forwarded-for
 HTCP_CONFIGURE_ENABLE=		htcp
 ICAP_CONFIGURE_ENABLE=		icap-client
@@ -106,13 +106,13 @@ IPV6_CONFIGURE_ENABLE=		ipv6
 KQUEUE_CONFIGURE_ENABLE=	kqueue
 LARGEFILE_CONFIGURE_WITH=	large-files
 LAX_HTTP_CONFIGURE_ENABLE=	http-violations
-NETTLE_LIB_DEPENDS=		libnettle.so:${PORTSDIR}/security/nettle
+NETTLE_LIB_DEPENDS=		libnettle.so:security/nettle
 NETTLE_CONFIGURE_OFF=		--without-nettle
 SNMP_CONFIGURE_ENABLE=		snmp
 SSL_CONFIGURE_ENABLE=		ssl
 SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
 STACKTRACES_CONFIGURE_ENABLE=	stacktraces
-STACKTRACES_LIB_DEPENDS=	libunwind.so:${PORTSDIR}/devel/libunwind
+STACKTRACES_LIB_DEPENDS=	libunwind.so:devel/libunwind
 STACKTRACES_CONFIGURE_ON=	--disable-strict-error-checking
 TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent
 TP_IPF_CONFIGURE_ENABLE=	ipf-transparent
diff --git a/www/squidclamav/Makefile b/www/squidclamav/Makefile
index 72bd7eab596c..e738ed2ff386 100644
--- a/www/squidclamav/Makefile
+++ b/www/squidclamav/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Clamav c-icap service and redirector for Squid
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS+=	libicapapi.so:${PORTSDIR}/www/c-icap
+LIB_DEPENDS+=	libicapapi.so:www/c-icap
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-DHAVE_STRNSTR
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index 39474e11b2b5..1bded6fdcf6d 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Fast redirector for squid
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
+RUN_DEPENDS=	${LOCALBASE}/sbin/squid:www/squid
 
 USE_BDB=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/squidstats/Makefile b/www/squidstats/Makefile
index 3ae59a888bf1..c3437ba3c00b 100644
--- a/www/squidstats/Makefile
+++ b/www/squidstats/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	squidstats-r${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of simple statistical analysis bits for Squid
 
-RUN_DEPENDS=	p5-Config-IniFiles>=2.39:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-RRD-Simple>=1.44:${PORTSDIR}/databases/p5-RRD-Simple \
-		p5-SNMP_Session>=1.11:${PORTSDIR}/net-mgmt/p5-SNMP_Session
+RUN_DEPENDS=	p5-Config-IniFiles>=2.39:devel/p5-Config-IniFiles \
+		p5-RRD-Simple>=1.44:databases/p5-RRD-Simple \
+		p5-SNMP_Session>=1.11:net-mgmt/p5-SNMP_Session
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	graph/src/stats.pl.in \
diff --git a/www/subsonic-standalone/Makefile b/www/subsonic-standalone/Makefile
index fa7b3b700e77..b392ceee4d58 100644
--- a/www/subsonic-standalone/Makefile
+++ b/www/subsonic-standalone/Makefile
@@ -29,15 +29,15 @@ APE_DESC=	Depend on mac for Monkey's Audio transcoding #'
 OPTIONS_DEFAULT=	FFMPEG
 OPTIONS_SUB=	yes
 
-FFMPEG_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
-FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
-FAAD_RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad
-XMP_RUN_DEPENDS=	xmp:${PORTSDIR}/audio/xmp
-MPC_RUN_DEPENDS=	mpcdec:${PORTSDIR}/audio/musepack
-APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
+FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
+FLAC_RUN_DEPENDS=	flac:audio/flac
+LAME_RUN_DEPENDS=	lame:audio/lame
+VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools
+FAAC_RUN_DEPENDS=	faac:audio/faac
+FAAD_RUN_DEPENDS=	faad:audio/faad
+XMP_RUN_DEPENDS=	xmp:audio/xmp
+MPC_RUN_DEPENDS=	mpcdec:audio/musepack
+APE_RUN_DEPENDS=	mac:audio/mac
 
 .include <bsd.port.options.mk>
 
diff --git a/www/subsonic/Makefile b/www/subsonic/Makefile
index 90d101be7057..75d9d02e5635 100644
--- a/www/subsonic/Makefile
+++ b/www/subsonic/Makefile
@@ -37,27 +37,27 @@ APE_DESC=	Depend on mac for Monkey's Audio transcoding #'
 OPTIONS_DEFAULT=	FFMPEG JETTY
 OPTIONS_SUB=	yes
 
-RUN_DEPENDS+=	${JAVAJARDIR}/servlet-api.jar:${PORTSDIR}/www/servlet-api \
-	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
-TOMCAT8_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8
-TOMCAT8_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8
-TOMCAT7_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-TOMCAT7_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-TOMCAT6_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-TOMCAT6_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-JETTY_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:${PORTSDIR}/www/jetty8
-JETTY_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:${PORTSDIR}/www/jetty8
-RESIN3_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:${PORTSDIR}/www/resin3
-RESIN3_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:${PORTSDIR}/www/resin3
-FFMPEG_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
-FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
-FAAD_RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad
-XMP_RUN_DEPENDS=	xmp:${PORTSDIR}/audio/xmp
-MPC_RUN_DEPENDS=	mpcdec:${PORTSDIR}/audio/musepack
-APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
+RUN_DEPENDS+=	${JAVAJARDIR}/servlet-api.jar:www/servlet-api \
+	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
+TOMCAT8_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
+TOMCAT8_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
+TOMCAT7_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
+TOMCAT7_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
+TOMCAT6_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6
+TOMCAT6_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6
+JETTY_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
+JETTY_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
+RESIN3_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:www/resin3
+RESIN3_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:www/resin3
+FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
+FLAC_RUN_DEPENDS=	flac:audio/flac
+LAME_RUN_DEPENDS=	lame:audio/lame
+VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools
+FAAC_RUN_DEPENDS=	faac:audio/faac
+FAAD_RUN_DEPENDS=	faad:audio/faad
+XMP_RUN_DEPENDS=	xmp:audio/xmp
+MPC_RUN_DEPENDS=	mpcdec:audio/musepack
+APE_RUN_DEPENDS=	mac:audio/mac
 
 .include <bsd.port.options.mk>
 
diff --git a/www/surf/Makefile b/www/surf/Makefile
index ca02caa958a9..827fff3b119c 100644
--- a/www/surf/Makefile
+++ b/www/surf/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple Web browser based on WebKit/Gtk+
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
-RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
+RUN_DEPENDS=	dmenu:x11/dmenu
 
 USE_GNOME=	gtk20
 USE_XORG=	x11
@@ -37,11 +37,11 @@ OPTIONS_DEFAULT=	GTK2
 # http://surf.suckless.org/patches/smoothscrolling-via-GTK3
 BUILTIN_DOWNLOAD_DESC=	Built-in download support
 BUILTIN_DOWNLOAD_CFLAGS=	-DBUILTIN_DOWNLOAD
-GTK2_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+GTK2_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 GTK2_USE=		gnome=gtk20
 GTK2_MAKE_ENV=		GTKINC="$$(pkg-config --cflags webkit-1.0)" \
 			GTKLIB="$$(pkg-config --libs webkit-1.0)"
-GTK3_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+GTK3_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 GTK3_USE=		gnome=gtk30
 GTK3_MAKE_ENV=		GTKINC="$$(pkg-config --cflags webkitgtk-3.0)" \
 			GTKLIB="$$(pkg-config --libs webkitgtk-3.0)"
diff --git a/www/sventon/Makefile b/www/sventon/Makefile
index 0199b977f222..0b9a2d3f57c4 100644
--- a/www/sventon/Makefile
+++ b/www/sventon/Makefile
@@ -24,8 +24,8 @@ OPTIONS_DEFAULT=	TOMCAT6
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 APPHOME=	${LOCALBASE}/apache-tomcat-6.0
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if !defined(APPHOME)
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 3af17363a493..5c568fadd678 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	swfdec-mozilla-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flash rendering plugin
 
-LIB_DEPENDS=	libswfdec-0.8.so:${PORTSDIR}/graphics/swfdec
+LIB_DEPENDS=	libswfdec-0.8.so:graphics/swfdec
 
 USES=		libtool:keepla pkgconfig webplugin:gecko
 GNU_CONFIGURE=	yes
diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile
index 310b0d01d890..aa0d7cef88c0 100644
--- a/www/swiggle/Makefile
+++ b/www/swiggle/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Swiggle is a commandline web image gallery generator
 
 LICENSE=	BSD4CLAUSE
 
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	libexif.so:graphics/libexif
 
 USES=		jpeg
 
diff --git a/www/swish++/Makefile b/www/swish++/Makefile
index f0296ddb82bd..67fa1789a512 100644
--- a/www/swish++/Makefile
+++ b/www/swish++/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple Web Indexing System for Humans: C++ version
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/Copying
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 USES=		gmake perl5 shebangfix
 SHEBANG_FILES=	scripts/searchc.in scripts/splitmail.in scripts/httpindex.in
diff --git a/www/sxweb/Makefile b/www/sxweb/Makefile
index a39b34f69653..d867aa32dd04 100644
--- a/www/sxweb/Makefile
+++ b/www/sxweb/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://cdn.skylable.com/source/
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	SXDrive Web app
 
-RUN_DEPENDS=	sxinit:${PORTSDIR}/net-mgmt/sx
+RUN_DEPENDS=	sxinit:net-mgmt/sx
 
 USES=		cpe
 USE_PHP=	ctype curl dom gd hash iconv json mbstring mysql mysqli \
diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index 01fbe743b776..181365e00e67 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -11,14 +11,14 @@ MASTER_SITES=	SF/${PORTNAME}/Syndigator/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RSS feed reader based on Gtk2
 
-RUN_DEPENDS=	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Gnome2>=0:${PORTSDIR}/x11-toolkits/p5-Gnome2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Html2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Html2
+RUN_DEPENDS=	p5-Text-Iconv>=0:converters/p5-Text-Iconv \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-XML-RSS>=0:textproc/p5-XML-RSS \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Gnome2>=0:x11-toolkits/p5-Gnome2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Gtk2-Html2>=0:x11-toolkits/p5-Gtk2-Html2
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	syndigator
diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
index ec7579a24f06..cb4eecdd30bd 100644
--- a/www/tclhttpd/Makefile
+++ b/www/tclhttpd/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Http-server implemented in TCL
 
-RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
+RUN_DEPENDS=	dtplite:devel/tcllib
 
 USE_RC_SUBR=	tclhttpd
 GNU_CONFIGURE=	yes
diff --git a/www/tclwebtest/Makefile b/www/tclwebtest/Makefile
index 0241613efe23..57fbb79f38ae 100644
--- a/www/tclwebtest/Makefile
+++ b/www/tclwebtest/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool for issuing HTTP requests and dealing with the result
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	tclsh:${PORTSDIR}/lang/tcl-wrapper
+RUN_DEPENDS=	tclsh:lang/tcl-wrapper
 
 NO_BUILD=	YES
 
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index 8bdc24d80e27..2cdee1849ca9 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Web-based diary system (like weblog) written in Ruby
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-emot>=0.0.4:${PORTSDIR}/textproc/rubygem-emot \
-		rubygem-fastimage>=1.8.1:${PORTSDIR}/graphics/rubygem-fastimage \
-		rubygem-hikidoc>=0.1.0:${PORTSDIR}/textproc/rubygem-hikidoc \
-		rubygem-mail>=2.6.3:${PORTSDIR}/mail/rubygem-mail \
-		rubygem-sprockets3>=3.5.2:${PORTSDIR}/devel/rubygem-sprockets3
+RUN_DEPENDS=	rubygem-emot>=0.0.4:textproc/rubygem-emot \
+		rubygem-fastimage>=1.8.1:graphics/rubygem-fastimage \
+		rubygem-hikidoc>=0.1.0:textproc/rubygem-hikidoc \
+		rubygem-mail>=2.6.3:mail/rubygem-mail \
+		rubygem-sprockets3>=3.5.2:devel/rubygem-sprockets3
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/www/tengine/Makefile b/www/tengine/Makefile
index cd213dd229aa..103214734132 100644
--- a/www/tengine/Makefile
+++ b/www/tengine/Makefile
@@ -18,11 +18,11 @@ USE_GNOME=	libxml2 libxslt
 USE_GITHUB=	yes
 GH_ACCOUNT=	alibaba
 
-LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit \
-		libeio.so:${PORTSDIR}/devel/libeio \
-		libev.so:${PORTSDIR}/devel/libev \
-		libgd.so:${PORTSDIR}/graphics/gd \
-		libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit \
+		libeio.so:devel/libeio \
+		libev.so:devel/libev \
+		libgd.so:graphics/gd \
+		libGeoIP.so:net/GeoIP
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=	\
@@ -339,7 +339,7 @@ CONFIGURE_ARGS+=--with-http_dav_module
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_DAV_EXT}
-LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	libexpat.so:textproc/expat2
 NGINX_DAV_EXT_VERSION=	0.0.2
 GH_ACCOUNT+=	arut:dav_ext
 GH_PROJECT+=	nginx-dav-ext-module:dav_ext
@@ -449,11 +449,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR}
-LIB_DEPENDS+=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-			libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-			libavutil.so:${PORTSDIR}/multimedia/ffmpeg \
-			libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
-			libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
+			libavcodec.so:multimedia/ffmpeg \
+			libavutil.so:multimedia/ffmpeg \
+			libswscale.so:multimedia/ffmpeg \
+			libMagickWand-6.so:graphics/ImageMagick
 USES+=		jpeg
 NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.2.0
 GH_ACCOUNT+=	wandenberg:videothumbextractor
@@ -471,7 +471,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
 .endif
 
 .if ${PORT_OPTIONS:MDRIZZLE}
-LIB_DEPENDS+=	libdrizzle.so:${PORTSDIR}/databases/libdrizzle
+LIB_DEPENDS+=	libdrizzle.so:databases/libdrizzle
 NGINX_DRIZZLE_VERSION=	0.1.6
 GH_ACCOUNT+=	chaoslawful:drizzle
 GH_PROJECT+=	drizzle-nginx-module:drizzle
@@ -524,9 +524,9 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
 
 .if ${PORT_OPTIONS:MMODSECURITY}
 NGINX_MODSECURITY_VERSION=	2.7.5
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-	libcurl.so:${PORTSDIR}/ftp/curl \
-	libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+	libcurl.so:ftp/curl \
+	libapr-1.so:devel/apr1
 USE_APACHE=	22+
 MASTER_SITES+=	http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION}/:modsecurity
 DISTFILES+=	modsecurity-apache_${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity
@@ -654,7 +654,7 @@ CONFIGURE_ARGS+=--with-cpp_test_module
 .endif
 
 .if ${PORT_OPTIONS:MTFS}
-LIB_DEPENDS+=	libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS+=	libyajl.so:devel/yajl
 CONFIGURE_ARGS+=--with-http_tfs_module
 .endif
 
@@ -718,7 +718,7 @@ USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 .if defined(WITH_HTTP_REWRITE)
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 CONFIGURE_ARGS+=--with-pcre
 .else
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nopcre
diff --git a/www/thumbnail_index/Makefile b/www/thumbnail_index/Makefile
index 5ec7fc01cf3e..b937a76d4ea2 100644
--- a/www/thumbnail_index/Makefile
+++ b/www/thumbnail_index/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_10aug1998
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Make an HTML index file for a bunch of images
 
-RUN_DEPENDS=	pnmscale:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	pnmscale:graphics/netpbm
 
 USES=		jpeg:run
 NO_BUILD=	yes
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index ceda349c2cfd..ae9bf732b8c8 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -59,9 +59,9 @@ USE_PHP+=	pdo_pgsql pgsql
 .  endif
 .endif
 
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libstdc++.so:${PORTSDIR}/lang/gcc \
-		libutil.so:${PORTSDIR}/misc/compat8x
+LIB_DEPENDS+=	libcurl.so:ftp/curl \
+		libstdc++.so:lang/gcc \
+		libutil.so:misc/compat8x
 
 SUB_FILES=	pkg-message log.sh test-deps.sh
 SUB_LIST=	"GREP=${GREP}"
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index 1f57cc0f0e13..0faac2714f7a 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -42,7 +42,7 @@ USE_PHP+=	pdo_pgsql pgsql
 .  endif
 .endif
 
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 SUB_FILES=	pkg-message
 
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index 9f6767d1ffe4..b1bc53ad3679 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX?=	-devel
 MAINTAINER?=	thierry@FreeBSD.org
 COMMENT?=	Utility to clean up and pretty print HTML/XHTML/XML
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
 USES=		tar:bzip2
 
diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile
index eade7e941cbd..04484a569597 100644
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.tntnet.org/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Webapplicationserver for C++
 
-LIB_DEPENDS=	libcxxtools.so:${PORTSDIR}/devel/cxxtools
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+LIB_DEPENDS=	libcxxtools.so:devel/cxxtools
+BUILD_DEPENDS=	zip:archivers/zip
 
 USES=		cpe iconv libtool pathfix pkgconfig shebangfix
 SHEBANG_FILES=	tntnet-conf2xml.pl
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--localstatedir=/var
 
 .if defined(WITH_GNUTLS)
 CONFIGURE_ARGS+=	--with-ssl=gnutls
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 .else
 CONFIGURE_ARGS+=	--with-ssl=openssl
 USE_OPENSSL=	yes
diff --git a/www/tokyopromenade/Makefile b/www/tokyopromenade/Makefile
index ab191ebdd67d..caec8d15d935 100644
--- a/www/tokyopromenade/Makefile
+++ b/www/tokyopromenade/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	http://fallabs.com/${PORTNAME}/pkg/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Content management system
 
-BUILD_DEPENDS=	tokyocabinet>=1.4.31:${PORTSDIR}/databases/tokyocabinet \
-		fcgi-devkit>=0:${PORTSDIR}/www/fcgi
-LIB_DEPENDS=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
-RUN_DEPENDS=	spawn-fcgi>=0:${PORTSDIR}/www/spawn-fcgi
+BUILD_DEPENDS=	tokyocabinet>=1.4.31:databases/tokyocabinet \
+		fcgi-devkit>=0:www/fcgi
+LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
+RUN_DEPENDS=	spawn-fcgi>=0:www/spawn-fcgi
 
 OPTIONS_DEFINE=	LUA
 
diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile
index bd3a97848c07..cca6de82234c 100644
--- a/www/tomcat-native/Makefile
+++ b/www/tomcat-native/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tomcat native library
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS=	libapr-1.so:devel/apr1
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/native
 
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 6598b27e2f09..8bab392401e5 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Open-source Java web server by Apache, 7.x branch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	jsvc:${PORTSDIR}/devel/jakarta-commons-daemon
+RUN_DEPENDS=	jsvc:devel/jakarta-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
diff --git a/www/tomcat8/Makefile b/www/tomcat8/Makefile
index eb7112f5c1cf..563436bd47ed 100644
--- a/www/tomcat8/Makefile
+++ b/www/tomcat8/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Open-source Java web server by Apache, 8.x branch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	jsvc:${PORTSDIR}/devel/jakarta-commons-daemon
+RUN_DEPENDS=	jsvc:devel/jakarta-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
diff --git a/www/tomee/Makefile b/www/tomee/Makefile
index d447896d8874..cdc7ad993613 100644
--- a/www/tomee/Makefile
+++ b/www/tomee/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Open-source Java EE Container by Apache
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	jsvc:${PORTSDIR}/devel/jakarta-commons-daemon
+RUN_DEPENDS=	jsvc:devel/jakarta-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
diff --git a/www/trac-OhlohWidgetsMacro/Makefile b/www/trac-OhlohWidgetsMacro/Makefile
index 978a9423c329..72c0a6ed8814 100644
--- a/www/trac-OhlohWidgetsMacro/Makefile
+++ b/www/trac-OhlohWidgetsMacro/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Trac macro to embed Ohloh widgets
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:${PORTSDIR}/devel/py-pycerberus \
-		tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:devel/py-pycerberus \
+		tracd:www/trac
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-TracGoogleAnalytics/Makefile b/www/trac-TracGoogleAnalytics/Makefile
index fbfb62e36984..2eb2d81eaadc 100644
--- a/www/trac-TracGoogleAnalytics/Makefile
+++ b/www/trac-TracGoogleAnalytics/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Trac plugin to enable logging by Google Analytics
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	tracd:${PORTSDIR}/www/trac \
-		${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi
+BUILD_DEPENDS=	tracd:www/trac \
+		${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/www/trac-accountmanager/Makefile b/www/trac-accountmanager/Makefile
index fdc61801b373..73fe63db53a2 100644
--- a/www/trac-accountmanager/Makefile
+++ b/www/trac-accountmanager/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	trac
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Account Manager Plugin for trac
 
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 REV=			12583
diff --git a/www/trac-advancedticketworkflow/Makefile b/www/trac-advancedticketworkflow/Makefile
index 9f80245d0541..bbd14e233e22 100644
--- a/www/trac-advancedticketworkflow/Makefile
+++ b/www/trac-advancedticketworkflow/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Advanced Ticket Workflow Plugin for Trac
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 USES=		python
diff --git a/www/trac-attachmentpolicy/Makefile b/www/trac-attachmentpolicy/Makefile
index 8d383958a394..e1e45ff7c31d 100644
--- a/www/trac-attachmentpolicy/Makefile
+++ b/www/trac-attachmentpolicy/Makefile
@@ -17,7 +17,7 @@ LICENSE=	BSD3CLAUSE
 
 SVN_REV=	12775
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
 USES=		python:2 zip
diff --git a/www/trac-autocomplete/Makefile b/www/trac-autocomplete/Makefile
index d793d2d4db48..08a06e776d42 100644
--- a/www/trac-autocomplete/Makefile
+++ b/www/trac-autocomplete/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	autocompleteusersplugin-r${REL}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin for autocompletion of user names in ticket fields
 
-RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-bzr/Makefile b/www/trac-bzr/Makefile
index aa914aaac0bf..5b3aa4b30f7b 100644
--- a/www/trac-bzr/Makefile
+++ b/www/trac-bzr/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Bazaar-NG plugin for Trac
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac \
-		bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	tracd:www/trac \
+		bzr:devel/bzr
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-ccselector/Makefile b/www/trac-ccselector/Makefile
index b8d99b1587fb..ada82e8b529e 100644
--- a/www/trac-ccselector/Makefile
+++ b/www/trac-ccselector/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visually edit the Trac ticket CC field
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 USES=		python:2
diff --git a/www/trac-childtickets/Makefile b/www/trac-childtickets/Makefile
index 9c1b6c20cb9d..66c2b2c0997f 100644
--- a/www/trac-childtickets/Makefile
+++ b/www/trac-childtickets/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Support for having child-tickets in Trac
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS+=	trac>=0.12:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	trac>=0.12:www/trac
 
 USES=		python:2 zip
 
diff --git a/www/trac-customfieldadmin/Makefile b/www/trac-customfieldadmin/Makefile
index ab5aaa189c94..f82a978468f3 100644
--- a/www/trac-customfieldadmin/Makefile
+++ b/www/trac-customfieldadmin/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web interface to administer Trac ticket custom fields
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USES=		python:2 zip
 
diff --git a/www/trac-datefield/Makefile b/www/trac-datefield/Makefile
index 8c2a439b2615..6f4f3d54ce36 100644
--- a/www/trac-datefield/Makefile
+++ b/www/trac-datefield/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	datefieldplugin-r${REL}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin for creating date fields
 
-RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-defaultcc/Makefile b/www/trac-defaultcc/Makefile
index f20ad76778e1..545f00d66f28 100644
--- a/www/trac-defaultcc/Makefile
+++ b/www/trac-defaultcc/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}plugin-r${REL}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin that adds default CC value for tickets
 
-RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 
diff --git a/www/trac-discussion/Makefile b/www/trac-discussion/Makefile
index aac116abb918..8d850b1e7145 100644
--- a/www/trac-discussion/Makefile
+++ b/www/trac-discussion/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Discussion forum plugin for Trac
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
-		trac-TracSpamFilter>=0.2.1:${PORTSDIR}/www/trac-spam-filter
+RUN_DEPENDS+=	tracd:www/trac \
+		trac-TracSpamFilter>=0.2.1:www/trac-spam-filter
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
@@ -20,7 +20,7 @@ USE_PYTHON=	distutils autoplist
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
diff --git a/www/trac-down/Makefile b/www/trac-down/Makefile
index 44a9ec113048..8c4cd5a632fe 100644
--- a/www/trac-down/Makefile
+++ b/www/trac-down/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	TracDown-${PORTVERSION:E}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Trac plugin for listing released downloads
 
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-downloads/Makefile b/www/trac-downloads/Makefile
index dea5b843cb17..2637d698f88f 100644
--- a/www/trac-downloads/Makefile
+++ b/www/trac-downloads/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	trac
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Trac plugin providing a downloads section
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 TRAC_VERSION=	0.12
 PLUGIN_VERSION=	0.3
diff --git a/www/trac-email2trac/Makefile b/www/trac-email2trac/Makefile
index 32c5cea2b345..b26b84c6c551 100644
--- a/www/trac-email2trac/Makefile
+++ b/www/trac-email2trac/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Convert email to trac tickets
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 CONFLICTS_INSTALL?=	trac-email2trac-postfix-[0-9]*
 
diff --git a/www/trac-estimator/Makefile b/www/trac-estimator/Makefile
index 36a0bf075cca..ae89d9aabe03 100644
--- a/www/trac-estimator/Makefile
+++ b/www/trac-estimator/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce detailed range-based estimations for Trac tickets
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 USES=		python:2
diff --git a/www/trac-fivestarvote/Makefile b/www/trac-fivestarvote/Makefile
index 76ad3bfea250..0e0ee93cab42 100644
--- a/www/trac-fivestarvote/Makefile
+++ b/www/trac-fivestarvote/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Five star plugin for voting on Trac resources
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
@@ -19,7 +19,7 @@ USE_PYTHON=	distutils autoplist
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
diff --git a/www/trac-fullblog/Makefile b/www/trac-fullblog/Makefile
index 68f0492709df..5ac1cb512e90 100644
--- a/www/trac-fullblog/Makefile
+++ b/www/trac-fullblog/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	trac
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin that provides a project Blog
 
-RUN_DEPENDS+=	htmldoc:${PORTSDIR}/textproc/htmldoc \
-		tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	htmldoc:textproc/htmldoc \
+		tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-fullblognotification/Makefile b/www/trac-fullblognotification/Makefile
index b17b840d8f01..d39d63374428 100644
--- a/www/trac-fullblognotification/Makefile
+++ b/www/trac-fullblognotification/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	trac
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin that provides a project Blog
 
-RUN_DEPENDS+=	trac-fullblog>=0.1.1:${PORTSDIR}/www/trac-fullblog
+RUN_DEPENDS+=	trac-fullblog>=0.1.1:www/trac-fullblog
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-gantt/Makefile b/www/trac-gantt/Makefile
index 595ee0e1a15e..566a0273b95b 100644
--- a/www/trac-gantt/Makefile
+++ b/www/trac-gantt/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	dryice@dryice.name
 COMMENT=	Plugin to creates Gantt charts for trac
 
-RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	trac>=0.11:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-graphviz/Makefile b/www/trac-graphviz/Makefile
index 63fada6f5fb9..700f705a164c 100644
--- a/www/trac-graphviz/Makefile
+++ b/www/trac-graphviz/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Graphviz plugin for Trac's wiki
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS+=	urwfonts>0:${PORTSDIR}/x11-fonts/urwfonts \
-		dot:${PORTSDIR}/graphics/graphviz \
-		tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	urwfonts>0:x11-fonts/urwfonts \
+		dot:graphics/graphviz \
+		tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/trac-iniadmin/Makefile b/www/trac-iniadmin/Makefile
index 280b56267ea5..980e669db0e6 100644
--- a/www/trac-iniadmin/Makefile
+++ b/www/trac-iniadmin/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Edit all trac.ini option via the WebAdminPlugin
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 USES=		python
diff --git a/www/trac-keywords/Makefile b/www/trac-keywords/Makefile
index 2dc4f9d21c56..2ef7c272569b 100644
--- a/www/trac-keywords/Makefile
+++ b/www/trac-keywords/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	trackeywordsplugin-r${REL}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin for using pre-configured keywords
 
-RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-keywordsecretticket/Makefile b/www/trac-keywordsecretticket/Makefile
index c2ecaa5c711b..d4645e4f7682 100644
--- a/www/trac-keywordsecretticket/Makefile
+++ b/www/trac-keywordsecretticket/Makefile
@@ -17,7 +17,7 @@ GH_PROJECT=	trac-keyword-secret-ticket-plugin
 GH_TAGNAME=	98edea2
 GITDATE=	20130401
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-ldap/Makefile b/www/trac-ldap/Makefile
index 5f6d62d967f8..64c0d662836e 100644
--- a/www/trac-ldap/Makefile
+++ b/www/trac-ldap/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Trac plugin to use LDAP to store permissions
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
-		trac-accountmanager>0:${PORTSDIR}/www/trac-accountmanager
+RUN_DEPENDS+=	tracd:www/trac \
+		trac-accountmanager>0:www/trac-accountmanager
 
 NO_ARCH=	yes
 PORTSCOUT=	ignore:1
@@ -27,7 +27,7 @@ USE_PYTHON=	distutils autoplist
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
diff --git a/www/trac-ldapauthstore/Makefile b/www/trac-ldapauthstore/Makefile
index 3db272d6a6e9..b8643b374a3e 100644
--- a/www/trac-ldapauthstore/Makefile
+++ b/www/trac-ldapauthstore/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Trac AccountManager plugin using LDAP authentication store
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
-		trac-accountmanager>0:${PORTSDIR}/www/trac-accountmanager \
-		trac-ldap>0:${PORTSDIR}/www/trac-ldap \
-		${PYTHON_PKGNAMEPREFIX}ldap>0:${PORTSDIR}/net/py-ldap
+RUN_DEPENDS+=	tracd:www/trac \
+		trac-accountmanager>0:www/trac-accountmanager \
+		trac-ldap>0:www/trac-ldap \
+		${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap
 
 NO_ARCH=	yes
 PORTSCOUT=	ignore:1
@@ -29,7 +29,7 @@ USE_PYTHON=	distutils autoplist
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
diff --git a/www/trac-mastertickets/Makefile b/www/trac-mastertickets/Makefile
index 18801c94df25..41dea901d763 100644
--- a/www/trac-mastertickets/Makefile
+++ b/www/trac-mastertickets/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Support for ticket dependencies
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS+=	trac>=0.12:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	trac>=0.12:www/trac
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
diff --git a/www/trac-math/Makefile b/www/trac-math/Makefile
index 774935e3bf14..6dc13de95a65 100644
--- a/www/trac-math/Makefile
+++ b/www/trac-math/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Support for LaTeX math formulas in wiki pages
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USE_TEX=	latex
 SUB_FILES=	pkg-message
@@ -23,7 +23,7 @@ USE_PYTHON=	distutils autoplist
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
diff --git a/www/trac-mercurial/Makefile b/www/trac-mercurial/Makefile
index 8051ed4c93a7..ccc68f00e7c9 100644
--- a/www/trac-mercurial/Makefile
+++ b/www/trac-mercurial/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Plugin to use Mercurial instead of Subversion in Trac
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial \
-		tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	hg:devel/mercurial \
+		tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-navadd/Makefile b/www/trac-navadd/Makefile
index 9f79b15b4f9a..b010850c448f 100644
--- a/www/trac-navadd/Makefile
+++ b/www/trac-navadd/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin for adding navigation items into Trac navigation bars
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-permredirect/Makefile b/www/trac-permredirect/Makefile
index 7800656e6582..7d5322c904d8 100644
--- a/www/trac-permredirect/Makefile
+++ b/www/trac-permredirect/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	trac
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Redirect users to the login screen on PermissionError
 
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 REV=			13353
diff --git a/www/trac-privatetickets/Makefile b/www/trac-privatetickets/Makefile
index ea74a94467df..53b1003d5fcb 100644
--- a/www/trac-privatetickets/Makefile
+++ b/www/trac-privatetickets/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	TracPrivateTickets-${PORTVERSION}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Modified ticket security for Trac
 
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-pydotorgtheme/Makefile b/www/trac-pydotorgtheme/Makefile
index 842e4ec942fa..8e0b89228a01 100644
--- a/www/trac-pydotorgtheme/Makefile
+++ b/www/trac-pydotorgtheme/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Theme that emulates the look of python.org
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
-		trac-themeengine>=2.0:${PORTSDIR}/www/trac-themeengine
+RUN_DEPENDS+=	tracd:www/trac \
+		trac-themeengine>=2.0:www/trac-themeengine
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-robotstxt/Makefile b/www/trac-robotstxt/Makefile
index 1be018d0aa1a..61902b4dcd4d 100644
--- a/www/trac-robotstxt/Makefile
+++ b/www/trac-robotstxt/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Allows simple management of a robots.txt
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-scrumburndown/Makefile b/www/trac-scrumburndown/Makefile
index cc2a7bd66df1..e11bdf66e869 100644
--- a/www/trac-scrumburndown/Makefile
+++ b/www/trac-scrumburndown/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin to enable Scrum burndown chart capabilities
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
-		trac-timingandestimation>=0:${PORTSDIR}/www/trac-timingandestimation
+RUN_DEPENDS+=	tracd:www/trac \
+		trac-timingandestimation>=0:www/trac-timingandestimation
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
 USES=		python:2
diff --git a/www/trac-spam-filter/Makefile b/www/trac-spam-filter/Makefile
index 4eb66c1a22d9..348bbac66d40 100644
--- a/www/trac-spam-filter/Makefile
+++ b/www/trac-spam-filter/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	Allow different ways to reject contributions that contain spam
 
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}dev
 
diff --git a/www/trac-subtickets/Makefile b/www/trac-subtickets/Makefile
index 4c9885c2a20c..b9cadd24a558 100644
--- a/www/trac-subtickets/Makefile
+++ b/www/trac-subtickets/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Offers sub-ticket feature for managing tickets
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	itota
diff --git a/www/trac-tags/Makefile b/www/trac-tags/Makefile
index e862f4d90255..18be02034eb5 100644
--- a/www/trac-tags/Makefile
+++ b/www/trac-tags/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	trac
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic tags frontend for trac
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils autoplist
@@ -30,7 +30,7 @@ SVN_REV!=	svn info http://trac-hacks.org/svn/tagsplugin/trunk/ | ${GREP} Revisio
 .endif
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
diff --git a/www/trac-themeengine/Makefile b/www/trac-themeengine/Makefile
index 42b37182d248..e91cd091e307 100644
--- a/www/trac-themeengine/Makefile
+++ b/www/trac-themeengine/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Plugin to simplify distributing and deploying themes and styles
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-ticketimport/Makefile b/www/trac-ticketimport/Makefile
index 4945535739d8..56046be02473 100644
--- a/www/trac-ticketimport/Makefile
+++ b/www/trac-ticketimport/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Import or update tickets from a CSV file or Excel file
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
-		${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:${PORTSDIR}/textproc/py-xlrd
+RUN_DEPENDS+=	tracd:www/trac \
+		${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:textproc/py-xlrd
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
@@ -20,7 +20,7 @@ USE_PYTHON=	distutils autoplist
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
diff --git a/www/trac-tickettemplate/Makefile b/www/trac-tickettemplate/Makefile
index 60385716fbee..15840bde6083 100644
--- a/www/trac-tickettemplate/Makefile
+++ b/www/trac-tickettemplate/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	trac${PORTNAME}plugin-r${REL}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin for making ticket templates
 
-RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-timingandestimation/Makefile b/www/trac-timingandestimation/Makefile
index d14c795d5709..d28177d0f74c 100644
--- a/www/trac-timingandestimation/Makefile
+++ b/www/trac-timingandestimation/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Add estimation and time tracking functionality to Trac
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/branches/trac0.12-Permissions
 USES=		python:2 zip
diff --git a/www/trac-tocmacro/Makefile b/www/trac-tocmacro/Makefile
index 46b4675b6f22..600acffc65e7 100644
--- a/www/trac-tocmacro/Makefile
+++ b/www/trac-tocmacro/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Table of contents macro
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		python
diff --git a/www/trac-tracdragdrop/Makefile b/www/trac-tracdragdrop/Makefile
index 561c0b1abfb9..5ae12118dda1 100644
--- a/www/trac-tracdragdrop/Makefile
+++ b/www/trac-tracdragdrop/Makefile
@@ -17,7 +17,7 @@ LICENSE=	BSD3CLAUSE
 
 SVN_REV=	12822
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
 USES=		python:2 zip
diff --git a/www/trac-tweakui/Makefile b/www/trac-tweakui/Makefile
index 953145d40a33..d6176f977016 100644
--- a/www/trac-tweakui/Makefile
+++ b/www/trac-tweakui/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easily tweak Trac pages with JavaScript expressions
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USES=		dos2unix python zip
 DOS2UNIX_REGEX=	.*\.(css|html|js|py|txt)$
diff --git a/www/trac-vote/Makefile b/www/trac-vote/Makefile
index 89f51183e055..19218fbca1d7 100644
--- a/www/trac-vote/Makefile
+++ b/www/trac-vote/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin for voting on Trac resources
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
@@ -19,7 +19,7 @@ USE_PYTHON=	distutils autoplist
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
diff --git a/www/trac-watchlist/Makefile b/www/trac-watchlist/Makefile
index 6d18f155cae3..7240e47f4514 100644
--- a/www/trac-watchlist/Makefile
+++ b/www/trac-watchlist/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv3
 
 SVN_REV=	11526
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
 USES=		python:2 zip
diff --git a/www/trac-wikigoodies/Makefile b/www/trac-wikigoodies/Makefile
index 70d9f1556734..5a78c2c0c6bd 100644
--- a/www/trac-wikigoodies/Makefile
+++ b/www/trac-wikigoodies/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}plugin.${PORTVERSION}
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Plugin for Trac which extends the Wiki with some goodies
 
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 
diff --git a/www/trac-wikinotification/Makefile b/www/trac-wikinotification/Makefile
index 2ad5fa01725b..7e3912efeb2d 100644
--- a/www/trac-wikinotification/Makefile
+++ b/www/trac-wikinotification/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allow email notifications on wiki page changes
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		python
diff --git a/www/trac-wikitemplates/Makefile b/www/trac-wikitemplates/Makefile
index 688884fa0bcf..d96489a174d6 100644
--- a/www/trac-wikitemplates/Makefile
+++ b/www/trac-wikitemplates/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION:S/p/rc/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Templates for the Trac wiki
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
-#		${PYTHON_SITELIBDIR}/TracCtxtnavAdd-2.0-py${PYTHON_VER}.egg:${PORTSDIR}/www/trac-ctxtnavadd
+RUN_DEPENDS+=	tracd:www/trac
+#		${PYTHON_SITELIBDIR}/TracCtxtnavAdd-2.0-py${PYTHON_VER}.egg:www/trac-ctxtnavadd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
 USES=		python
diff --git a/www/trac-wikitopdf/Makefile b/www/trac-wikitopdf/Makefile
index 8c639cee9bcf..bb43ce90fa1d 100644
--- a/www/trac-wikitopdf/Makefile
+++ b/www/trac-wikitopdf/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin to generate PDF documents from the Wiki
 
-RUN_DEPENDS+=	htmldoc:${PORTSDIR}/textproc/htmldoc \
-		tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	htmldoc:textproc/htmldoc \
+		tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-wysiwyg/Makefile b/www/trac-wysiwyg/Makefile
index ff732e37e9a2..46ed3f3e4a79 100644
--- a/www/trac-wysiwyg/Makefile
+++ b/www/trac-wysiwyg/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	trac
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WYSIWYG editor for Trac wiki
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils autoplist
@@ -31,7 +31,7 @@ SVN_REV!=	svn info ${SVN_URL} | ${GREP} Revision | cut -d' ' -f2
 .endif
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
diff --git a/www/trac-xmlrpc/Makefile b/www/trac-xmlrpc/Makefile
index 5a96e6f3a17c..04d46be87b79 100644
--- a/www/trac-xmlrpc/Makefile
+++ b/www/trac-xmlrpc/Makefile
@@ -16,7 +16,7 @@ LICENSE=	BSD3CLAUSE
 
 SVN_REV=	13203
 
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/trunk
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 70c18a0db0fd..3447e25f403a 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Enhanced wiki and issue tracking system for software projects
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.5:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}Genshi>=0.6:${PORTSDIR}/textproc/py-genshi
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.5:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}Genshi>=0.6:${PORTSDIR}/textproc/py-genshi
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.5:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}Genshi>=0.6:textproc/py-genshi
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.5:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}Genshi>=0.6:textproc/py-genshi
 
 OPTIONS_DEFINE=		DOCUTILS PYGMENTS TZ SVN
 OPTIONS_DEFAULT=	DOCUTILS PYGMENTS TZ SVN SQLITE
@@ -26,12 +26,12 @@ DOCUTILS_DESC=		Allow additional text markup
 PYGMENTS_DESC=		Use generic syntax highlighter
 TZ_DESC=		Process Time Zones
 
-DOCUTILS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.3.9:${PORTSDIR}/textproc/py-docutils
-PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments
-TZ_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
-SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>0:${PORTSDIR}/devel/py-subversion
+DOCUTILS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.3.9:textproc/py-docutils
+PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments
+TZ_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion
 
 PORTEXAMPLES=		*
 PORTDATA=		*
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index bb79e704f8ac..da039b74d034 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Fast, scalable and extensible HTTP proxy server
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libhwloc.so:${PORTSDIR}/devel/hwloc \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libhwloc.so:devel/hwloc \
+		libpcre.so:devel/pcre \
+		libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -60,7 +60,7 @@ SPDY_DESC=	Enable SPDY
 WCCP_CONFIGURE_ENABLE=	wccp
 INTERIM_CONFIGURE_ENABLE=	interim-cache
 SPDY_CONFIGURE_ENABLE=	spdy
-SPDY_LIB_DEPENDS=	libspdylay.so:${PORTSDIR}/www/spdylay
+SPDY_LIB_DEPENDS=	libspdylay.so:www/spdylay
 
 BROKEN_FreeBSD_9=	Trafficserver is only supported on FreeBSD 10.1 or newer
 
diff --git a/www/trytond28_google_maps/Makefile b/www/trytond28_google_maps/Makefile
index 2c9db3db2342..4aedbb512620 100644
--- a/www/trytond28_google_maps/Makefile
+++ b/www/trytond28_google_maps/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tryton Application Platform (Google Maps Module)
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party
+RUN_DEPENDS=	trytond28_party>=2.8.0:finance/trytond28_party
 
 CONFLICTS=	trytond_google_maps-2.[46].*
 
diff --git a/www/twiki-LDAPPasswordChangerPlugin/Makefile b/www/twiki-LDAPPasswordChangerPlugin/Makefile
index 4ed22862a307..b422539f0b66 100644
--- a/www/twiki-LDAPPasswordChangerPlugin/Makefile
+++ b/www/twiki-LDAPPasswordChangerPlugin/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Change TWiki password at a pre-configured LDAP server
 
-RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap
 
 SVNREV=		18108
 
diff --git a/www/twiki-LdapContrib/Makefile b/www/twiki-LdapContrib/Makefile
index 0fbab84d3bdc..bc63dbb0a8e7 100644
--- a/www/twiki-LdapContrib/Makefile
+++ b/www/twiki-LdapContrib/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://protey.ru/freebsd/distfiles/ \
 
 COMMENT=	LDAP services for TWiki
 
-RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap
 
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-MailerContrib/Makefile b/www/twiki-MailerContrib/Makefile
index 39789586539a..9b753fc3b347 100644
--- a/www/twiki-MailerContrib/Makefile
+++ b/www/twiki-MailerContrib/Makefile
@@ -5,7 +5,7 @@ SVNREV=		17641
 
 COMMENT=	E-mail notification of changes
 
-RUN_DEPENDS=	p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-URI>=1.35:net/p5-URI
 
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-MathModePlugin/Makefile b/www/twiki-MathModePlugin/Makefile
index 5f4c9c3e5ff9..86019df39d23 100644
--- a/www/twiki-MathModePlugin/Makefile
+++ b/www/twiki-MathModePlugin/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://protey.ru/freebsd/distfiles/ \
 
 COMMENT=	Include LaTeX formatted math in your TWiki pages
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 USE_TEX=	base latex
 
diff --git a/www/twiki-WysiwygPlugin/Makefile b/www/twiki-WysiwygPlugin/Makefile
index 64799b5fcd9c..7af3b103cb10 100644
--- a/www/twiki-WysiwygPlugin/Makefile
+++ b/www/twiki-WysiwygPlugin/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	1
 
 COMMENT=	Translator framework for Wysiwyg editors
 
-RUN_DEPENDS=	p5-HTML-Parser>=3.28:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS=	p5-HTML-Parser>=3.28:www/p5-HTML-Parser
 
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki/Makefile b/www/twiki/Makefile
index 9bf1a8fed369..3c7301baee2d 100644
--- a/www/twiki/Makefile
+++ b/www/twiki/Makefile
@@ -13,18 +13,18 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flexible, powerful, and easy to use enterprise wiki
 
 RUN_DEPENDS=	\
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		twiki-TWikiUserMappingContrib>=0:${PORTSDIR}/www/twiki-TWikiUserMappingContrib
+		p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-Error>=0:lang/p5-Error \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-CGI-Session>=0:www/p5-CGI-Session \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Locale-Maketext-Lexicon>=0:devel/p5-Locale-Maketext-Lexicon \
+		p5-URI>=0:net/p5-URI \
+		p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		twiki-TWikiUserMappingContrib>=0:www/twiki-TWikiUserMappingContrib
 
 USES=		perl5 tar:tgz
 WRKSRC=	${WRKDIR}/twiki
diff --git a/www/twms/Makefile b/www/twms/Makefile
index bafd3bc2b18e..433da213a116 100644
--- a/www/twms/Makefile
+++ b/www/twms/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tiny WMS server
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyproj/__init__.py:${PORTSDIR}/graphics/py-pyproj \
-		${PYTHON_SITELIBDIR}/web/__init__.py:${PORTSDIR}/www/webpy \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyproj/__init__.py:graphics/py-pyproj \
+		${PYTHON_SITELIBDIR}/web/__init__.py:www/webpy \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 USES=		python tar:bzip2
 NO_BUILD=	yes
diff --git a/www/typo3-lts/Makefile b/www/typo3-lts/Makefile
index 95f69b6a8993..715d72426c02 100644
--- a/www/typo3-lts/Makefile
+++ b/www/typo3-lts/Makefile
@@ -52,9 +52,9 @@ ZLIB_USE=	PHP=zlib
 
 .if ${PORT_OPTIONS:MIMAGICK}
 .if ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .else
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick-nox11
+RUN_DEPENDS+=	convert:graphics/ImageMagick-nox11
 .endif
 .endif
 
diff --git a/www/typo3/Makefile b/www/typo3/Makefile
index 628f6696a19e..30a51aa4bef3 100644
--- a/www/typo3/Makefile
+++ b/www/typo3/Makefile
@@ -48,9 +48,9 @@ ZLIB_USE=	PHP=zlib
 
 .if ${PORT_OPTIONS:MIMAGICK}
 .if ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .else
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick-nox11
+RUN_DEPENDS+=	convert:graphics/ImageMagick-nox11
 .endif
 .endif
 
diff --git a/www/uglifyjs/Makefile b/www/uglifyjs/Makefile
index 379ee74b41d2..9f1fca0f4d5c 100644
--- a/www/uglifyjs/Makefile
+++ b/www/uglifyjs/Makefile
@@ -11,8 +11,8 @@ COMMENT=	JavaScript parser/compressor/beautifier
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	npm>=0:${PORTSDIR}/www/npm
-RUN_DEPENDS=	npm>=0:${PORTSDIR}/www/npm
+BUILD_DEPENDS=	npm>=0:www/npm
+RUN_DEPENDS=	npm>=0:www/npm
 
 NO_BUILD=	yes
 USE_GITHUB=	yes
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index 0ca53e3fabbc..6a5df21eeb4a 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Web interface tools which adhere to the unix philosophy
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
-RUN_DEPENDS=	socat:${PORTSDIR}/net/socat \
-		dmenu:${PORTSDIR}/x11/dmenu
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
+RUN_DEPENDS=	socat:net/socat \
+		dmenu:x11/dmenu
 
 USES=		gmake pkgconfig python:2
 USE_GNOME=	gtk20 pygtk2
diff --git a/www/validator/Makefile b/www/validator/Makefile
index 4bb0c41b9f80..080da3a7194b 100644
--- a/www/validator/Makefile
+++ b/www/validator/Makefile
@@ -12,19 +12,19 @@ DISTFILES=	validator-${PORTVERSION:S/./_/g}.tar.gz sgml-lib-${PORTVERSION:S/./_/
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Markup Validation Service from the World Wide Web Consortium (W3C)
 
-RUN_DEPENDS=	onsgmls:${PORTSDIR}/textproc/opensp \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-Encode-HanExtra>=0:${PORTSDIR}/chinese/p5-Encode-HanExtra \
-		p5-Encode-JIS2K>=0:${PORTSDIR}/converters/p5-Encode-JIS2K \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Encoding>=0:${PORTSDIR}/www/p5-HTML-Encoding \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-libwww>=5.817:${PORTSDIR}/www/p5-libwww \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-SGML-Parser-OpenSP>=0:${PORTSDIR}/textproc/p5-SGML-Parser-OpenSP \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS=	onsgmls:textproc/opensp \
+		p5-Config-General>=0:devel/p5-Config-General \
+		p5-Encode-HanExtra>=0:chinese/p5-Encode-HanExtra \
+		p5-Encode-JIS2K>=0:converters/p5-Encode-JIS2K \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-Encoding>=0:www/p5-HTML-Encoding \
+		p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-libwww>=5.817:www/p5-libwww \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+		p5-SGML-Parser-OpenSP>=0:textproc/p5-SGML-Parser-OpenSP \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 
 USES=		perl5 shebangfix
 NO_BUILD=	yes
@@ -38,12 +38,12 @@ OPTIONS_DEFINE=	HTML_TIDY
 OPTIONS_DEFAULT=HTML_TIDY
 HTML_TIDY_DESC=	Enable HTML Markup Cleaning
 
-HTML_TIDY_RUN_DEPENDS=	p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy
+HTML_TIDY_RUN_DEPENDS=	p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502200
-RUN_DEPENDS+=	p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm
+RUN_DEPENDS+=	p5-CGI.pm>=0:www/p5-CGI.pm
 .endif
 
 post-patch:
diff --git a/www/varnish-libvmod-header/Makefile b/www/varnish-libvmod-header/Makefile
index 5fff0e634c45..4582e4982a61 100644
--- a/www/varnish-libvmod-header/Makefile
+++ b/www/varnish-libvmod-header/Makefile
@@ -14,8 +14,8 @@ LICENSE=	BSD2CLAUSE
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	varnish4>=4.0.2:${PORTSDIR}/www/varnish4 \
-		rst2man:${PORTSDIR}/textproc/py-docutils
+BUILD_DEPENDS=	varnish4>=4.0.2:www/varnish4 \
+		rst2man:textproc/py-docutils
 
 USES=		autoreconf gmake libtool pkgconfig python:2,build
 GNU_CONFIGURE=	yes
diff --git a/www/varnish-libvmod-saintmode/Makefile b/www/varnish-libvmod-saintmode/Makefile
index 22d2203eb6da..500b3aabad85 100644
--- a/www/varnish-libvmod-saintmode/Makefile
+++ b/www/varnish-libvmod-saintmode/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Varnish Module (vmod) for detecting failing backends
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	varnish4>=4.1.0:${PORTSDIR}/www/varnish4 \
-		rst2man:${PORTSDIR}/textproc/py-docutils
+BUILD_DEPENDS=	varnish4>=4.1.0:www/varnish4 \
+		rst2man:textproc/py-docutils
 
 USES=		autoreconf gmake libtool pkgconfig python:2,build
 GNU_CONFIGURE=	yes
diff --git a/www/varnish-nagios/Makefile b/www/varnish-nagios/Makefile
index 611850a39365..e7cb71328139 100644
--- a/www/varnish-nagios/Makefile
+++ b/www/varnish-nagios/Makefile
@@ -13,7 +13,7 @@ LICENSE=	BSD2CLAUSE
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	varnish4>=0:${PORTSDIR}/www/varnish4
+BUILD_DEPENDS=	varnish4>=0:www/varnish4
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-lm
diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile
index e4eb32d47bc6..e441bec8d467 100644
--- a/www/varnish4/Makefile
+++ b/www/varnish4/Makefile
@@ -12,7 +12,7 @@ COMMENT=	High-performance HTTP accelerator
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFLICTS=	varnish-2.* varnish-3.*
 BROKEN_arm=	does not configure
diff --git a/www/vdr-plugin-live/Makefile b/www/vdr-plugin-live/Makefile
index 5158a8565bcd..c0000c740e00 100644
--- a/www/vdr-plugin-live/Makefile
+++ b/www/vdr-plugin-live/Makefile
@@ -13,8 +13,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - live web plugin
 
-LIB_DEPENDS+=	libtntnet.so:${PORTSDIR}/www/tntnet \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libtntnet.so:www/tntnet \
+		libpcre.so:devel/pcre
 
 PATCH_STRIP=	-p1
 PORTDOCS=	COPYING README HISTORY
diff --git a/www/vdradmin-am/Makefile b/www/vdradmin-am/Makefile
index e0eb53c57123..98b03da6129d 100644
--- a/www/vdradmin-am/Makefile
+++ b/www/vdradmin-am/Makefile
@@ -9,21 +9,21 @@ MASTER_SITES=	http://andreas.vdr-developer.org/vdradmin-am/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - webinterface
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Template-Plugin-JavaScript>=0:${PORTSDIR}/www/p5-Template-Plugin-JavaScript \
-		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Template-Plugin-JavaScript>=0:${PORTSDIR}/www/p5-Template-Plugin-JavaScript \
-		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	bash:shells/bash \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		p5-Template-Plugin-JavaScript>=0:www/p5-Template-Plugin-JavaScript \
+		p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-IO-Compress>=0:archivers/p5-IO-Compress \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		p5-Template-Plugin-JavaScript>=0:www/p5-Template-Plugin-JavaScript \
+		p5-Authen-SASL>=0:security/p5-Authen-SASL \
+		p5-IO-Compress>=0:archivers/p5-IO-Compress \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-libwww>=0:www/p5-libwww
 
 DIST_SUBDIR=	vdr
 PATCH_STRIP=	-p1
diff --git a/www/vertx/Makefile b/www/vertx/Makefile
index 6d1e9bfddbd7..e60bf7125666 100644
--- a/www/vertx/Makefile
+++ b/www/vertx/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Effortless asynchronous application development for the modern web
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
@@ -47,8 +47,8 @@ PHP_DESC=	Use PHP to write verticles (experimental)
 RHINO_DESC=	Use Rhino to write verticles
 SCALA_DESC=	Use Scala to write verticles
 
-JYTHON_RUN_DEPENDS=	jython:${PORTSDIR}/lang/jython
-JRUBY_RUN_DEPENDS=	jruby:${PORTSDIR}/lang/jruby
+JYTHON_RUN_DEPENDS=	jython:lang/jython
+JRUBY_RUN_DEPENDS=	jruby:lang/jruby
 
 .include <bsd.port.options.mk>
 
diff --git a/www/vimb-gtk2/Makefile b/www/vimb-gtk2/Makefile
index fe43831d699c..2d508c6f7578 100644
--- a/www/vimb-gtk2/Makefile
+++ b/www/vimb-gtk2/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Vim like browser
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS?=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS?=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fanglingsu
diff --git a/www/vimb-gtk3/Makefile b/www/vimb-gtk3/Makefile
index 9b4803ce21bc..73b6ea8a18bf 100644
--- a/www/vimb-gtk3/Makefile
+++ b/www/vimb-gtk3/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	vimb-gtk3
 
-LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 
 MAKE_ENV=	GTK="3"
 USE_GNOME=	gtk30
diff --git a/www/volta/Makefile b/www/volta/Makefile
index 8b64a375a5fe..e194e3fc2fda 100644
--- a/www/volta/Makefile
+++ b/www/volta/Makefile
@@ -13,7 +13,7 @@ COMMENT=	High performance, low resource URI rewriter for Squid
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
+LIB_DEPENDS=	libcdb.so:databases/tinycdb
 
 USES=		gmake pkgconfig lua tar:tgz
 ALL_TARGET=	${PORTNAME}
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index fd8152a5a2f8..519af24bd771 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -12,7 +12,7 @@ COMMENT?=	Pager/text-based WWW browser
 
 USES=		pkgconfig perl5
 USE_OPENSSL=	yes
-LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	libgc.so:devel/boehm-gc
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/www/w3mir/Makefile b/www/w3mir/Makefile
index 11dc4646d1f0..bd4e814c95e3 100644
--- a/www/w3mir/Makefile
+++ b/www/w3mir/Makefile
@@ -12,7 +12,7 @@ COMMENT=	All-purpose HTTP copying and mirroring tool
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index 2c09124730eb..40a316803a7e 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Python-based WWW gateway to LDAP servers
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.4.0:${PORTSDIR}/net/py-ldap \
-		${PYTHON_SITELIBDIR}/pyweblib/__init__.py:${PORTSDIR}/www/pyweblib \
-		${PYTHON_PKGNAMEPREFIX}ipaddr>0:${PORTSDIR}/devel/py-ipaddr \
-		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.4.0:net/py-ldap \
+		${PYTHON_SITELIBDIR}/pyweblib/__init__.py:www/pyweblib \
+		${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr \
+		${LOCALBASE}/etc/mime.types:misc/mime-support
 
 OPTIONS_DEFINE=	DOCS
 USES=		cpe python:2 shebangfix
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 51ff4b388b45..509bf3dd6f06 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -51,11 +51,11 @@ DISTFILES+=	webalizer-geodb-20150901.tgz:geodb
 
 # slave ports override with languages specific gd
 .if !defined(LIB_DEPENDS)
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/${GD_PORT}
+LIB_DEPENDS+=	libgd.so:${GD_PORT}
 .endif
 
 .if ${PORT_OPTIONS:MGEOIP}
-LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
 .endif
 
 .if ${PORT_OPTIONS:MGEODB}
diff --git a/www/webfs/Makefile b/www/webfs/Makefile
index fe6c7f01da3b..03c12095b4d2 100644
--- a/www/webfs/Makefile
+++ b/www/webfs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://dl.bytesex.org/releases/webfs/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple http server for static content
 
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USES=		gmake
diff --git a/www/webgrind/Makefile b/www/webgrind/Makefile
index 4077e857a343..3df5d74e767d 100644
--- a/www/webgrind/Makefile
+++ b/www/webgrind/Makefile
@@ -26,7 +26,7 @@ NO_ARCH=	yes
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 CALLGRAPH_USES=		python
-CALLGRAPH_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+CALLGRAPH_RUN_DEPENDS=	dot:graphics/graphviz
 
 post-patch-CALLGRAPH-on:
 	@${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' ${WRKSRC}/config.php
diff --git a/www/webinject/Makefile b/www/webinject/Makefile
index 68604974c93c..defe671c9abc 100644
--- a/www/webinject/Makefile
+++ b/www/webinject/Makefile
@@ -11,14 +11,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for automated testing of web applications
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-	        p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Error>=0:lang/p5-Error \
+	        p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 
 #.if !defined(WITHOUT_X11)
 # some work to do here
-#RUN_DEPENDS+=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+#RUN_DEPENDS+=	p5-Tk>=0:x11-toolkits/p5-Tk
 #.endif
 
 USES=		perl5 shebangfix
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 0663667fb941..28094617b480 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -12,17 +12,17 @@ DISTNAME=	${PORTNAME}gtk-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Opensource browser engine using the GTK+ 2 toolkit
 
-BUILD_DEPENDS=	gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \
-		p5-Switch>0:${PORTSDIR}/lang/p5-Switch \
-		geoclue>=0:${PORTSDIR}/net/geoclue
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libicutu.so:${PORTSDIR}/devel/icu \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libwebp.so:${PORTSDIR}/graphics/webp \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+BUILD_DEPENDS=	gtkdoc-rebase:textproc/gtk-doc \
+		p5-Switch>0:lang/p5-Switch \
+		geoclue>=0:net/geoclue
+LIB_DEPENDS=	libenchant.so:textproc/enchant \
+		libsecret-1.so:security/libsecret \
+		libicutu.so:devel/icu \
+		libharfbuzz.so:print/harfbuzz \
+		libwebp.so:graphics/webp \
+		libcurl.so:ftp/curl \
+		libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limit:1.4.*$$
 
@@ -84,7 +84,7 @@ CFLAGS+=	-mminimal-toc
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=0:textproc/flex
 CONFIGURE_ENV+=	FLEX="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 1462c35a89a6..a398cf33ae2a 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -12,17 +12,17 @@ DISTNAME=	${PORTNAME}gtk-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Opensource browser engine using the GTK+ 3 toolkit
 
-BUILD_DEPENDS=	gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \
-		p5-Switch>0:${PORTSDIR}/lang/p5-Switch \
-		geoclue>=0:${PORTSDIR}/net/geoclue
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libicutu.so:${PORTSDIR}/devel/icu \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libwebp.so:${PORTSDIR}/graphics/webp \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+BUILD_DEPENDS=	gtkdoc-rebase:textproc/gtk-doc \
+		p5-Switch>0:lang/p5-Switch \
+		geoclue>=0:net/geoclue
+LIB_DEPENDS=	libenchant.so:textproc/enchant \
+		libsecret-1.so:security/libsecret \
+		libicutu.so:devel/icu \
+		libharfbuzz.so:print/harfbuzz \
+		libwebp.so:graphics/webp \
+		libcurl.so:ftp/curl \
+		libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limit:1.4.*$$
 
@@ -87,7 +87,7 @@ CFLAGS+=	-mminimal-toc
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=0:textproc/flex
 CONFIGURE_ENV+=	FLEX="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/www/webkit-qt4/Makefile b/www/webkit-qt4/Makefile
index c49292c309ad..eb15c2f1f213 100644
--- a/www/webkit-qt4/Makefile
+++ b/www/webkit-qt4/Makefile
@@ -48,7 +48,7 @@ GSTREAMER_USE=	GSTREAMER=yes
 # Base ld(1) segfaults on PowerPC:
 # http://bugs.freebsd.org/173042
 .if ${ARCH} == "powerpc"
-BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils
 .endif
 
 .if ${ARCH} == powerpc64
diff --git a/www/webkit-qt5/Makefile b/www/webkit-qt5/Makefile
index 77235d4beb0d..64c42de4e63a 100644
--- a/www/webkit-qt5/Makefile
+++ b/www/webkit-qt5/Makefile
@@ -9,11 +9,11 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt WebKit implementation
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libicui18n.so:${PORTSDIR}/devel/icu \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libwebp.so:${PORTSDIR}/graphics/webp
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libicui18n.so:devel/icu \
+		libpng.so:graphics/png \
+		libwebp.so:graphics/webp
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 USE_GL=		gl
 USE_GNOME=	libxml2 libxslt
@@ -46,7 +46,7 @@ GSTREAMER_USE=	GNOME=glib20 GSTREAMER1=yes
 # Base ld(1) segfaults on PowerPC (inherited from Qt 4):
 # http://bugs.freebsd.org/173042
 .if ${ARCH} == "powerpc"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
 .endif
 
 post-patch:
diff --git a/www/webkit-sharp/Makefile b/www/webkit-sharp/Makefile
index d7592d001cc1..07e9c962d50d 100644
--- a/www/webkit-sharp/Makefile
+++ b/www/webkit-sharp/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	www
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Mono bindings for Webkit
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:www/webkit-gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
index fd776a532664..e7c3c2121d28 100644
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@@ -12,17 +12,17 @@ DISTNAME=	${PORTNAME}gtk-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Opensource browser engine using the GTK+ 3 toolkit
 
-BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libwebp.so:${PORTSDIR}/graphics/webp \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libicutu.so:${PORTSDIR}/devel/icu \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+BUILD_DEPENDS=	geoclue>=0:net/geoclue
+LIB_DEPENDS=	libenchant.so:textproc/enchant \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libwebp.so:graphics/webp \
+		libpng.so:graphics/png \
+		libsecret-1.so:security/libsecret \
+		libicutu.so:devel/icu \
+		libharfbuzz.so:print/harfbuzz \
+		libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limitw:1,even
 
@@ -60,7 +60,7 @@ CFLAGS+=	-mminimal-toc
 .endif
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=0:textproc/flex
 CONFIGURE_ENV+=	FLEX_PATH="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/www/weblint++/Makefile b/www/weblint++/Makefile
index 67d3744a9f29..6f38fba6993c 100644
--- a/www/weblint++/Makefile
+++ b/www/weblint++/Makefile
@@ -11,21 +11,21 @@ MASTER_SITE_SUBDIR=	CPAN:BDFOY
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTML validator and sanity checker
 
-BUILD_DEPENDS=	p5-ConfigReader-Simple>=1.15:${PORTSDIR}/devel/p5-ConfigReader-Simple \
-		p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-HTML-Lint>0:${PORTSDIR}/www/p5-HTML-Lint \
-		p5-HTML-SimpleLinkExtor>0:${PORTSDIR}/www/p5-HTML-SimpleLinkExtor \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-HTTP-SimpleLinkChecker>0:${PORTSDIR}/www/p5-HTTP-SimpleLinkChecker \
-		p5-HTTP-Size>=0.04:${PORTSDIR}/www/p5-HTTP-Size \
-		p5-Mail-Sendmail>0:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		p5-Text-Diff>0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-Text-Template>0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-ConfigReader-Simple>=1.15:devel/p5-ConfigReader-Simple \
+		p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+		p5-HTML-Lint>0:www/p5-HTML-Lint \
+		p5-HTML-SimpleLinkExtor>0:www/p5-HTML-SimpleLinkExtor \
+		p5-libwww>0:www/p5-libwww \
+		p5-HTTP-SimpleLinkChecker>0:www/p5-HTTP-SimpleLinkChecker \
+		p5-HTTP-Size>=0.04:www/p5-HTTP-Size \
+		p5-Mail-Sendmail>0:mail/p5-Mail-Sendmail \
+		p5-Text-Diff>0:textproc/p5-Text-Diff \
+		p5-Text-Template>0:textproc/p5-Text-Template \
+		p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Manifest>0.91:${PORTSDIR}/devel/p5-Test-Manifest \
-		p5-Test-Pod>=0.90:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-File>0:${PORTSDIR}/devel/p5-Test-File
+TEST_DEPENDS=	p5-Test-Manifest>0.91:devel/p5-Test-Manifest \
+		p5-Test-Pod>=0.90:devel/p5-Test-Pod \
+		p5-Test-File>0:devel/p5-Test-File
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/webstats/Makefile b/www/webstats/Makefile
index b5abe066846b..51dfb9a86408 100644
--- a/www/webstats/Makefile
+++ b/www/webstats/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Automated log file processing
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL
 
-RUN_DEPENDS=	analog:${PORTSDIR}/www/analog \
-		${LOCALBASE}/reportmagic/rmagic.pl:${PORTSDIR}/www/reportmagic
+RUN_DEPENDS=	analog:www/analog \
+		${LOCALBASE}/reportmagic/rmagic.pl:www/reportmagic
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/www/wgetpaste/Makefile b/www/wgetpaste/Makefile
index 07d6fe259310..c56e7845db7d 100644
--- a/www/wgetpaste/Makefile
+++ b/www/wgetpaste/Makefile
@@ -12,8 +12,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Paste to several pastebin services via bash script
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	bash:shells/bash \
+		wget:ftp/wget
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/www/wikicalc/Makefile b/www/wikicalc/Makefile
index 077ce3c787fe..69963d1cb7b7 100644
--- a/www/wikicalc/Makefile
+++ b/www/wikicalc/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.peapodcast.com/sgi/downloads/
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Open Source Wiki-Spreadsheet
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5 shebangfix
 NO_BUILD=	yes
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 04827302c0a8..12ada2d41dd3 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Website META Language, webdesign toolkit for HTML generation
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 RUN_DEPENDS=	\
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-Bit-Vector>=5.2:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-File-PathConvert>0:${PORTSDIR}/devel/p5-File-PathConvert \
-		p5-Image-Size>=2.6:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-Term-ReadKey>=2.11:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-HTML-Clean>0:${PORTSDIR}/www/p5-HTML-Clean \
-		p5-GD>0:${PORTSDIR}/graphics/p5-GD
-BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-Bit-Vector>=5.2:math/p5-Bit-Vector \
+		p5-File-PathConvert>0:devel/p5-File-PathConvert \
+		p5-Image-Size>=2.6:graphics/p5-Image-Size \
+		p5-Term-ReadKey>=2.11:devel/p5-Term-ReadKey \
+		p5-HTML-Clean>0:www/p5-HTML-Clean \
+		p5-GD>0:graphics/p5-GD
+BUILD_DEPENDS=	lynx:www/lynx \
 		${RUN_DEPENDS}
 
 INFO=		logo-apache logo-freebsd logo-gimp logo-htdig logo-linux logo-netbsd \
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index 8a1c99101b2a..604b1cff3348 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C++ WSDL Parser
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index c2ca094e856d..dbdc56c2100e 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Caching proxy server for HTTP and FTP designed for dial-up hosts
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 USES=		perl5 gmake tar:tgz
 
diff --git a/www/xist/Makefile b/www/xist/Makefile
index 828e4aa3aebb..789cdab409fb 100644
--- a/www/xist/Makefile
+++ b/www/xist/Makefile
@@ -14,9 +14,9 @@ COMMENT=	XML-based extensible HTML generator
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssutils>=1.0:${PORTSDIR}/www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.4:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssutils>=1.0:www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.4:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow
 
 USES=		python:3 tar:bzip2
 USE_PYTHON=	autoplist distutils
diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile
index f6bebaa389b0..d4271117a226 100644
--- a/www/xombrero/Makefile
+++ b/www/xombrero/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Minimalists vi-like web browser based on webkit and GTK+
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libsoup-2.4.so:devel/libsoup
 
 USES=		pkgconfig perl5 tar:tgz
 USE_PERL5=	build
@@ -31,11 +31,11 @@ SUB_FILES=	xombrero
 
 .if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	gtk20
-LIB_DEPENDS+=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	libwebkitgtk-1.0.so:www/webkit-gtk2
 MAKE_ENV+=	GTK_VERSION="gtk2"
 .else # GTK3
 USE_GNOME=	gtk30
-LIB_DEPENDS+=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+LIB_DEPENDS+=	libwebkitgtk-3.0.so:www/webkit-gtk3
 MAKE_ENV+=	GTK_VERSION="gtk3"
 .endif
 
diff --git a/www/xpi-sameplace/Makefile b/www/xpi-sameplace/Makefile
index 0815da3f857c..95677fe9681c 100644
--- a/www/xpi-sameplace/Makefile
+++ b/www/xpi-sameplace/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	www
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jabber client
 
-RUN_DEPENDS=	xpi-xmpp4moz>=0.5.2:${PORTSDIR}/www/xpi-xmpp4moz
+RUN_DEPENDS=	xpi-xmpp4moz>=0.5.2:www/xpi-xmpp4moz
 
 XPI_NUM=	3633
 XPI_ID=		sameplace@hyperstruct.net
diff --git a/www/xpi-tagzilla/Makefile b/www/xpi-tagzilla/Makefile
index 66f6cd564115..b7f762bfc7cf 100644
--- a/www/xpi-tagzilla/Makefile
+++ b/www/xpi-tagzilla/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://downloads.mozdev.org/xsidebar/mods/
 MAINTAINER=	lapo@lapo.it
 COMMENT=	Lets you add a tagline to the end of an email or newsgroup posting
 
-RUN_DEPENDS=	${LOCALBASE}/lib/xpi/{DF8E5247-8E0A-4de6-B393-0735A39DFD80}/install.rdf:${PORTSDIR}/www/xpi-jslib
+RUN_DEPENDS=	${LOCALBASE}/lib/xpi/{DF8E5247-8E0A-4de6-B393-0735A39DFD80}/install.rdf:www/xpi-jslib
 
 LICENSE=	MPL # also "GPL" but doesn't specify version and doesn't contain license text
 
diff --git a/www/xpi-yslow/Makefile b/www/xpi-yslow/Makefile
index 753b8c37b78c..d3c612472f5a 100644
--- a/www/xpi-yslow/Makefile
+++ b/www/xpi-yslow/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	www
 MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	Analyzes web pages and why they are slow
 
-RUN_DEPENDS=	xpi-firebug>=1.3.0:${PORTSDIR}/www/xpi-firebug
+RUN_DEPENDS=	xpi-firebug>=1.3.0:www/xpi-firebug
 
 XPI_NUM=	5369
 XPI_ID=		yslow@yahoo-inc.com
diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index 1bcb7c8ba4a4..3764ab109df1 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${DISTVERSION:S/.//}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Webserver with CGI as own user and SSL support
 
-RUN_DEPENDS=	run-mailcap:${PORTSDIR}/misc/mime-support
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+RUN_DEPENDS=	run-mailcap:misc/mime-support
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFLICTS_INSTALL=	xshttpd-[0-9]* publicfile-[0-9]*
 
@@ -30,14 +30,14 @@ BDB_USE=		BDB=5+
 BDB_CONFIGURE_ON=	--with-db-libdir=${BDB_LIB_DIR} \
 			--with-db-include-dir=${BDB_INCLUDE_DIR}
 BDB_CONFIGURE_WITH=	db
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
 LDAP_USE=		openldap
 LDAP_CONFIGURE_WITH=	ldap
 M4_DESC=		Enable configuration preprocessor (m4)
 M4_CONFIGURE_WITH=	preprocessor
 NETPBM_DESC=		Enable NETPBM (for graphical counters)
-NETPBM_RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
+NETPBM_RUN_DEPENDS=	ppmtogif:graphics/netpbm
 PERL_DESC=		Enable persistent Perl interpreter
 PERL_USES=		perl5
 PERL_CONFIGURE_WITH=	perl
diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile
index d5ddc3ec59ec..2cae085e4dd9 100644
--- a/www/xshttpd/Makefile
+++ b/www/xshttpd/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${DISTVERSION:S/.//}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Webserver with CGI as own user and SSL support
 
-RUN_DEPENDS=	run-mailcap:${PORTSDIR}/misc/mime-support \
-		ppmtogif:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	run-mailcap:misc/mime-support \
+		ppmtogif:graphics/netpbm
 
 CONFLICTS_INSTALL=	xshttpd-devel-[0-9]* publicfile-[0-9]*
 
@@ -35,9 +35,9 @@ M4_CONFIG_CONFIGURE_WITH=preprocessor
 PERSISTENT_PERL_DESC=	Enable persistent Perl interpreter
 PERSISTENT_PERL_USES=	perl5
 PERSISTENT_PERL_CONFIGURE_WITH=	perl
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_WITH=	pcre
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
 
 PORTDOCS=	README ChangeLog
diff --git a/www/yabb/Makefile b/www/yabb/Makefile
index fe987c0774b3..93c4760372fe 100644
--- a/www/yabb/Makefile
+++ b/www/yabb/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	YABB PUBLIC LICENCE
 LICENSE_TEXT=	Description of the license can be obtained from the following URL: http://www.yabbforum.com/licenses.php
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
+RUN_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC
 
 USES=		perl5 shebangfix zip
 USE_PERL5=	run
diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index 2cc3d19057d6..d36f5340cb01 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Web server for dynamic content written in Erlang
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_SUB=	yes
diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile
index 79259bff7d2e..0acbe308c809 100644
--- a/www/youtube_dl/Makefile
+++ b/www/youtube_dl/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	The Unlicense
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	zip:archivers/zip
 
 ALL_TARGET=	youtube-dl
 MAKE_ARGS=	PYTHON=${PYTHON_CMD}
@@ -34,8 +34,8 @@ PLIST_FILES=	bin/youtube-dl \
 		%%FISH%%share/fish/completions/youtube-dl.fish \
 		%%ZSH%%share/zsh/site-functions/_youtube-dl
 
-FFMPEG_RUN_DEPENDS=	${LOCALBASE}/bin/ffprobe:${PORTSDIR}/multimedia/ffmpeg
-RTMPDUMP_RUN_DEPENDS=	${LOCALBASE}/bin/rtmpdump:${PORTSDIR}/multimedia/rtmpdump
+FFMPEG_RUN_DEPENDS=	${LOCALBASE}/bin/ffprobe:multimedia/ffmpeg
+RTMPDUMP_RUN_DEPENDS=	${LOCALBASE}/bin/rtmpdump:multimedia/rtmpdump
 
 post-extract:
 	@# remove tarball provided version, build our own
diff --git a/www/zend-framework/Makefile b/www/zend-framework/Makefile
index 1134b4f5e5f2..d5d9f9271228 100644
--- a/www/zend-framework/Makefile
+++ b/www/zend-framework/Makefile
@@ -47,8 +47,8 @@ USE_PHP+=	sqlite
 .else
 USE_PHP+=	sqlite3
 .endif
-RUN_DEPENDS+=	pecl-memcache>=0:${PORTSDIR}/databases/pecl-memcache \
-		pecl-memcached>=0:${PORTSDIR}/databases/pecl-memcached
+RUN_DEPENDS+=	pecl-memcache>=0:databases/pecl-memcache \
+		pecl-memcached>=0:databases/pecl-memcached
 .endif
 .if ${PORT_OPTIONS:MOPTPHP}
 USE_PHP+=	bcmath bitset json posix
diff --git a/www/zend-framework1/Makefile b/www/zend-framework1/Makefile
index 7395d6defc2b..32676fe65eaf 100644
--- a/www/zend-framework1/Makefile
+++ b/www/zend-framework1/Makefile
@@ -60,8 +60,8 @@ USE_PHP+=	sqlite
 .else
 USE_PHP+=	sqlite3
 .endif
-RUN_DEPENDS+=	pecl-memcache>=0:${PORTSDIR}/databases/pecl-memcache \
-		pecl-memcached>=0:${PORTSDIR}/databases/pecl-memcached
+RUN_DEPENDS+=	pecl-memcache>=0:databases/pecl-memcache \
+		pecl-memcached>=0:databases/pecl-memcached
 .endif
 .if ${PORT_OPTIONS:MOPTPHP}
 USE_PHP+=	bcmath bitset json posix
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 8fb6a078f8d8..f8c701f492f7 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -13,72 +13,72 @@ COMMENT=	Object-based web application platform Version 2.13
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=2.13.2:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}Missing>=0:${PORTSDIR}/devel/py-Missing \
-		${PYTHON_PKGNAMEPREFIX}MultiMapping>=0:${PORTSDIR}/devel/py-MultiMapping \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}Products.OFSP>=2.13.2:${PORTSDIR}/devel/py-Products.OFSP \
-		${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=0:${PORTSDIR}/devel/py-Products.ZCatalog \
-		${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:${PORTSDIR}/devel/py-Products.ZCTextIndex \
-		${PYTHON_PKGNAMEPREFIX}Record>=0:${PORTSDIR}/devel/py-Record \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}ZopeUndo>=0:${PORTSDIR}/devel/py-ZopeUndo \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}initgroups>=0:${PORTSDIR}/devel/py-initgroups \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}tempstorage>=0:${PORTSDIR}/devel/py-tempstorage \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zdaemon>=0:${PORTSDIR}/sysutils/py-zdaemon \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \
-		${PYTHON_PKGNAMEPREFIX}zLOG>=0:${PORTSDIR}/devel/py-zLOG \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zope.browsermenu \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:${PORTSDIR}/devel/py-zope.browserresource \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:${PORTSDIR}/devel/py-zope.ptresource \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.sendmail>=0:${PORTSDIR}/mail/py-zope.sendmail \
-		${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:${PORTSDIR}/devel/py-zope.sequencesort \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext \
-		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=3.5.0:${PORTSDIR}/devel/py-zope.tales \
-		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:${PORTSDIR}/devel/py-zope.testbrowser \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>=0:${PORTSDIR}/devel/py-Products.BTreeFolder2 \
-		${PYTHON_PKGNAMEPREFIX}Products.ExternalMethod>=0:${PORTSDIR}/devel/py-Products.ExternalMethod \
-		${PYTHON_PKGNAMEPREFIX}Products.MailHost>=0:${PORTSDIR}/mail/py-Products.MailHost \
-		${PYTHON_PKGNAMEPREFIX}Products.MIMETools>=0:${PORTSDIR}/devel/py-Products.MIMETools \
-		${PYTHON_PKGNAMEPREFIX}Products.PythonScripts>=0:${PORTSDIR}/devel/py-Products.PythonScripts \
-		${PYTHON_PKGNAMEPREFIX}Products.StandardCacheManagers>=0:${PORTSDIR}/devel/py-Products.StandardCacheManagers \
-		${PYTHON_PKGNAMEPREFIX}manuel>=0:${PORTSDIR}/devel/py-manuel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=2.13.2:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing \
+		${PYTHON_PKGNAMEPREFIX}MultiMapping>=0:devel/py-MultiMapping \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		${PYTHON_PKGNAMEPREFIX}Products.OFSP>=2.13.2:devel/py-Products.OFSP \
+		${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=0:devel/py-Products.ZCatalog \
+		${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex \
+		${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}ZopeUndo>=0:devel/py-ZopeUndo \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}initgroups>=0:devel/py-initgroups \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}tempstorage>=0:devel/py-tempstorage \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
+		${PYTHON_PKGNAMEPREFIX}zLOG>=0:devel/py-zLOG \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.sendmail>=0:mail/py-zope.sendmail \
+		${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \
+		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=3.5.0:devel/py-zope.tales \
+		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:devel/py-zope.testbrowser \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>=0:devel/py-Products.BTreeFolder2 \
+		${PYTHON_PKGNAMEPREFIX}Products.ExternalMethod>=0:devel/py-Products.ExternalMethod \
+		${PYTHON_PKGNAMEPREFIX}Products.MailHost>=0:mail/py-Products.MailHost \
+		${PYTHON_PKGNAMEPREFIX}Products.MIMETools>=0:devel/py-Products.MIMETools \
+		${PYTHON_PKGNAMEPREFIX}Products.PythonScripts>=0:devel/py-Products.PythonScripts \
+		${PYTHON_PKGNAMEPREFIX}Products.StandardCacheManagers>=0:devel/py-Products.StandardCacheManagers \
+		${PYTHON_PKGNAMEPREFIX}manuel>=0:devel/py-manuel
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils